[no ci] prepare new Version

Reviewed-on: #23

.github/workflows/ci.yaml

@@ -11,6 +11,8 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup JDK
         uses: actions/setup-java@v4
@@ -18,8 +20,14 @@ jobs:
           distribution: 'zulu'
           java-version: '21'
 
+      - name: new Version
+        if: github.ref_name == 'main'
+        run: |
+          ./mvnw -B --no-transfer-progress versions:set -DremoveSnapshot
+
       - name: Build Runner
-        run: ./mvnw --no-transfer-progress clean verify -Pnative -Dquarkus.native.remote-container-build=true
+        run: |
+          ./mvnw -B --no-transfer-progress clean verify -Pnative -Dquarkus.native.remote-container-build=true -Djgitver.skip=true
 
       - name: Add coverage to PR
         id: jacoco
@@ -31,6 +39,10 @@ jobs:
           min-coverage-changed-files: 60
           title: ${{ env.REPO }} Coverage
 
+      - id: version
+        name: Version
+        run: echo "VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> ${GITHUB_OUTPUT}
+
       - name: Build Container
         if: github.ref_name == 'main'
         run: docker build -f src/main/docker/Dockerfile.native-micro -t ${{ env.REPO }} .
@@ -38,3 +50,17 @@ jobs:
       - name: Deploy
         if: github.ref_name == 'main'
         run: "docker compose up -d"
+
+      - name: create tag
+        if: github.ref_name == 'main'
+        run: |
+          git config user.email "ci@git.arindy.de"
+          git config user.name "gitea"
+          git add ./pom.xml
+          git commit -m "[no ci] release ${{ steps.version.outputs.VERSION }}"
+          ./mvnw -B --no-transfer-progress clean validate -Pnew-snapshot
+          git add ./pom.xml
+          git commit -m "[no ci] prepare new Version"
+          git tag ${{ steps.version.outputs.VERSION }} -m "release ${{ steps.version.outputs.VERSION }}"
+          git push origin main
+          git push origin ${{ steps.version.outputs.VERSION }}

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.arindy</groupId>
     <artifactId>dice-tower</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.2-SNAPSHOT</version>
 
     <properties>
         <compiler-plugin.version>3.13.0</compiler-plugin.version>
@@ -21,6 +21,13 @@
         <rxjava-version>2.2.8</rxjava-version>
     </properties>
 
+    <scm>
+        <connection>scm:git:https://git.arindy.de/arindy/dice-tower.git</connection>
+        <developerConnection>scm:git:https://git.arindy.de/arindy/dice-tower.git</developerConnection>
+        <url>https://git.arindy.de/arindy/dice-tower</url>
+        <tag>HEAD</tag>
+    </scm>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -267,5 +274,42 @@
                 <quarkus.native.enabled>true</quarkus.native.enabled>
             </properties>
         </profile>
+        <profile>
+            <id>new-snapshot</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <version>3.0.0</version>
+                        <executions>
+                            <execution>
+                                <id>next-version</id>
+                                <goals>
+                                    <goal>parse-version</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>versions-maven-plugin</artifactId>
+                        <version>2.18.0</version>
+                        <executions>
+                            <execution>
+                                <id>release-version</id>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>set</goal>
+                                </goals>
+                                <configuration>
+                                    <newVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.nextIncrementalVersion}-SNAPSHOT</newVersion>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>

src/main/resources/templates/pub/index.html

@@ -7,9 +7,24 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
     <script src="/vendor/color-picker.js"></script>
     <style>
-        .w3-theme-l6 { color:#000 !important; background-color:#999999 !important; border-radius: 10px;}
+        .w3-theme-l6 {
-        .w3-theme-l4 { color:#fff !important; background-color:#666666 !important; border-radius: 10px;}
+            color: #000 !important;
-        .w3-theme-l1 { color:#fff !important; background-color:#333333 !important; border-radius: 10px;}
+            background-color: #999999 !important;
+            border-radius: 10px;
+        }
+
+        .w3-theme-l4 {
+            color: #fff !important;
+            background-color: #666666 !important;
+            border-radius: 10px;
+        }
+
+        .w3-theme-l1 {
+            color: #fff !important;
+            background-color: #333333 !important;
+            border-radius: 10px;
+        }
+
         .collapsible {
             background-color: #333333;
             color: black;
@@ -42,6 +57,7 @@
         button:hover {
             background: #444444;
         }
+
         button:active {
             background: #222222;
         }
@@ -122,8 +138,8 @@
             position: fixed;
             border-radius: 0.5rem;
             padding: 15px;
-            color:#fff !important;
+            color: #fff !important;
-            background-color:#333333dd !important
+            background-color: #333333dd !important
         }
 
         #dice-box {
@@ -204,14 +220,50 @@
             -ms-transform: rotate(45deg);
             transform: rotate(45deg);
         }
+
+        #snackbar-container {
+            visibility: hidden;
+            position: fixed;
+            width: 100%;
+            z-index: 1;
+            bottom: 200px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+
+        #snackbar {
+            visibility: hidden;
+            text-align: center;
+            border-radius: 0.5rem;
+            padding: 15px;
+            color: #fff !important;
+            border: #fff 5px solid;
+            background-color: #333333dd !important
+        }
+
+        #snackbar-container.show {
+            visibility: visible;
+        }
+
+        #snackbar.show {
+            visibility: visible;
+            -webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s;
+            animation: fadein 0.5s, fadeout 0.5s 2.5s;
+        }
+
     </style>
 </head>
 <body class="w3-theme-l1">
-<div class="w3-container w3-content" style="height: 95vh; display: flex; flex-direction: column; justify-content: space-between;  padding: 25px">
+<div class="w3-container w3-content"
+     style="height: 95vh; display: flex; flex-direction: column; justify-content: space-between;  padding: 25px">
     <h1 style="text-align: center">Dice-Tower</h1>
-    <div class="w3-panel w3-theme-l4 w3-card w3-display-container" style="padding: 25px; text-align: center; margin-bottom: auto;">
+    <div class="w3-panel w3-theme-l4 w3-card w3-display-container"
-        <label for="name" id="nameLabel">Name </label><input type="text" id="name" style="width: 50%; margin-top: 20px" required onkeyup="start(event)"/><br/>
+         style="padding: 25px; text-align: center; margin-bottom: auto;">
-        <label for="room" id="roomLabel">Room </label><input type="text" id="room" style="width: 50%" required onkeyup="start(event)"/><br/>
+        <label for="name" id="nameLabel">Name </label><input type="text" id="name" style="width: 50%; margin-top: 20px"
+                                                             required onkeyup="start(event)"/><br/>
+        <label for="room" id="roomLabel">Room </label><input type="text" id="room" style="width: 50%" required
+                                                             onkeyup="start(event)"/><br/>
         <div>
             <button id="start" onclick="start()" style="align-self: center; margin-top: 20px">Start 🞂</button>
             <label class="checkbox" id="gm-container">Join as GM
@@ -220,25 +272,34 @@
             </label>
         </div>
     </div>
-    <div id="dice-tower" hidden class="w3-panel w3-theme-l4 w3-card w3-display-container" style="padding: 25px; margin-bottom: auto">
+    <div id="dice-tower" hidden class="w3-panel w3-theme-l4 w3-card w3-display-container"
-        <button type="button" class="collapsible" style="color: white; font-weight: bold">Overlay URLs  <a>🞃</a></button>
+         style="padding: 25px; margin-bottom: auto">
+        <button type="button" class="collapsible" style="color: white; font-weight: bold">Overlay URLs <a>🞃</a></button>
 
         <div class="content">
             <div id="overlay-urls">
                 <div style="display: flex; flex-direction: row; justify-content: space-between; align-items: baseline;">
                     <label for="overlayId" id="overlayLabel">Dice-Overlay </label>
-                    <input type="text" readonly id="overlayId" style="flex-grow: 1"/>
+                    <input type="text" readonly id="overlayId" style="flex-grow: 1" onclick="copyToClipboard(this.id)"/>
-                    <button id="overlay-hint-button" popovertarget="overlay-hint" data-trigger="hover" class="overlayButton">🛈</button>
+                    <button id="overlay-hint-button" popovertarget="overlay-hint" data-trigger="hover"
+                            class="overlayButton">🛈
+                    </button>
                 </div>
             </div>
-            <div style="display: flex; flex-direction: row; justify-content: space-between; align-items: baseline;" hidden id="all-results-urls">
+            <div style="display: flex; flex-direction: row; justify-content: space-between; align-items: baseline;"
-                <label for="resultsId">All-Results-Overlay </label><input type="text" readonly id="resultsId" style="flex-grow: 1"/><button popovertarget="all-results-hint" data-trigger="hover" class="overlayButton">🛈</button>
+                 hidden id="all-results-urls">
+                <label for="resultsId">All-Results-Overlay </label>
+                <input type="text" readonly id="resultsId" style="flex-grow: 1" onclick="copyToClipboard(this.id)"/>
+                <button popovertarget="all-results-hint" data-trigger="hover" class="overlayButton">🛈</button>
             </div>
             <div style="display: flex; flex-direction: row; justify-content: space-between; align-items: baseline;">
-                <label for="myResultsId">My-Results-Overlay </label><input type="text" readonly id="myResultsId" style="flex-grow: 1"/><button popovertarget="my-results-hint" data-trigger="hover" class="overlayButton">🛈</button>
+                <label for="myResultsId">My-Results-Overlay </label>
+                <input type="text" readonly id="myResultsId" style="flex-grow: 1" onclick="copyToClipboard(this.id)"/>
+                <button popovertarget="my-results-hint" data-trigger="hover" class="overlayButton">🛈</button>
             </div>
         </div>
-        <button type="button" class="collapsible" style="color: white; font-weight: bold">Customize Dice  <a>🞃</a></button>
+        <button type="button" class="collapsible" style="color: white; font-weight: bold">Customize Dice <a>🞃</a>
+        </button>
         <div class="content">
             <label for="theme">Theme </label>
             <select name="theme" id="theme" style="margin: 25px">
@@ -261,9 +322,13 @@
         </div>
         <div style="display: flex; flex-direction: row; justify-content: space-between; align-items: center; margin: 20px 25px;">
             <label style="font-size: x-large; font-weight: bold;">Roll </label>
-            <button style="border: transparent; border-radius: 100%; font-size: x-large; font-weight: bold; height: 50px; width: 50px" onclick="removeDice()">-</button>
+            <button style="border: transparent; border-radius: 100%; font-size: x-large; font-weight: bold; height: 50px; width: 50px"
+                    onclick="removeDice()">-
+            </button>
             <label style="font-size: x-large; font-weight: bold;" id="dice-amount">1</label>
-            <button style="border: transparent; border-radius: 100%; font-size: x-large; font-weight: bold; height: 50px; width: 50px" onclick="addDice()">+</button>
+            <button style="border: transparent; border-radius: 100%; font-size: x-large; font-weight: bold; height: 50px; width: 50px"
+                    onclick="addDice()">+
+            </button>
             <button style="font-size: x-large; font-weight: bold;" onclick="rollEasy('d4')">D4</button>
             <button style="font-size: x-large; font-weight: bold;" onclick="rollEasy('d6')">D6</button>
             <button style="font-size: x-large; font-weight: bold;" onclick="rollEasy('d8')">D8</button>
@@ -287,8 +352,10 @@
             </label>
         </div>
     </div>
-    <div id="results" hidden class="w3-panel w3-theme-l6 w3-card w3-display-container" style="padding: 25px; flex-grow: 1; margin-bottom: auto">
+    <div id="results" hidden class="w3-panel w3-theme-l6 w3-card w3-display-container"
-        <iframe id="resultFrame" title="results" style="width: 100%; height: 85%; overflow: hidden; border: 0" onload="this.height=this.contentWindow.document.body.scrollHeight;" ></iframe>
+         style="padding: 25px; flex-grow: 1; margin-bottom: auto">
+        <iframe id="resultFrame" title="results" style="width: 100%; height: 85%; overflow: hidden; border: 0"
+                onload="this.height=this.contentWindow.document.body.scrollHeight;"></iframe>
     </div>
 
     <div popover id="overlay-hint" class="tooltip">
@@ -296,7 +363,9 @@
         <p>Query Params you can Change:</p>
         <ul>
             <li><strong>scale</strong> changes the size of the dice (any value over 1)</li>
-            <li><strong>clearAfter</strong> time until dice are cleared (in seconds; remove param or set -1 to keep the dice)</li>
+            <li><strong>clearAfter</strong> time until dice are cleared (in seconds; remove param or set -1 to keep the
+                dice)
+            </li>
         </ul>
     </div>
     <div popover id="all-results-hint" class="tooltip">
@@ -318,13 +387,18 @@
             <ul>
                 <li>
                     Join a room by entering your character name and the name of the room.<br/>
-                    <strong>If you are a GM, make sure to join the room first or let all other players rejoin to get all Overlay-URLs.</strong>
+                    <strong>If you are a GM, make sure to join the room first or let all other players rejoin to get all
+                        Overlay-URLs.</strong>
                 </li>
 
                 <li>Open your Dice-Overlay either in a new Tab or as a browser source in OBS</li>
                 <ul>
-                    <li style="color: red; font-weight: bold">Only the last loaded instance of that overlay rolls the dice!</li>
+                    <li style="color: red; font-weight: bold">Only the last loaded instance of that overlay rolls the
-                    <li>You can configure your Overlay with query parameters (more information at the info element next to the link)</li>
+                        dice!
+                    </li>
+                    <li>You can configure your Overlay with query parameters (more information at the info element next
+                        to the link)
+                    </li>
                 </ul>
                 <li>Configure your dice</li>
                 <li>Save your dice configuration</li>
@@ -333,6 +407,9 @@
         </div>
     </div>
 </div>
+<div id="snackbar-container">
+    <div id="snackbar">.. they see them rolling</div>
+</div>
 <script>
     function addDice() {
         let amount = +document.getElementById('dice-amount').innerText
@@ -345,13 +422,15 @@
             document.getElementById('dice-amount').innerText = amount - 1
         }
     }
+
     function url() {
         return window.location.protocol + '//' + window.location.hostname + (window.location.port?.length > 0 ? ':' + window.location.port : '');
     }
+
     function start(event) {
         console.log(document.getElementById('gm').checked)
 
-        if((!event || event.keyCode === 13) && document.getElementById('name').value.length > 0 && document.getElementById('room').value.length > 0) {
+        if ((!event || event.keyCode === 13) && document.getElementById('name').value.length > 0 && document.getElementById('room').value.length > 0) {
             document.getElementById('overlayId').value = url() + '/overlay/' + document.getElementById('room').value + ':' + localStorage.getItem('userId') + '?scale=7&clearAfter=30';
             document.getElementById('resultsId').value = url() + '/overlay/' + document.getElementById('room').value + '/results';
             document.getElementById('myResultsId').value = document.getElementById('resultsId').value + '?name=' + encodeURIComponent(document.getElementById('name').value) + '&user=' + localStorage.getItem('userId');
@@ -365,7 +444,7 @@
             document.getElementById('how-to').hidden = true;
             document.getElementById('results').hidden = false;
             document.getElementById('all-results').hidden = !document.getElementById('gm').checked;
-            document.getElementById('all-results-urls').style.display = document.getElementById('gm').checked ? 'fles': 'none';
+            document.getElementById('all-results-urls').style.display = document.getElementById('gm').checked ? 'fles' : 'none';
             document.getElementById('nameLabel').innerHTML = '<strong style="font-size:x-large;">' + document.getElementById('name').value + '</strong>';
             document.getElementById('roomLabel').innerHTML = '<strong style="font-size:medium;">' + document.getElementById('room').value + '</strong>';
             document.getElementById('overlayLabel').innerHTML = 'Dice-Overlay for <strong>' + document.getElementById('name').value + '</strong>';
@@ -384,11 +463,11 @@
                 name: document.getElementById('name').value,
                 overlay: document.getElementById('overlayId').value,
                 id: document.getElementById('room').value + ':' + localStorage.getItem('userId')
-            } ))
+            }))
-            if(document.getElementById('gm').checked) {
+            if (document.getElementById('gm').checked) {
                 document.getElementById('resultSwitch').checked = true;
                 document.getElementById('resultFrame').src = document.getElementById('resultsId').value;
-                const evtSource = new EventSource(url() + '/dice/'+  document.getElementById('room').value + '/users');
+                const evtSource = new EventSource(url() + '/dice/' + document.getElementById('room').value + '/users');
                 evtSource.addEventListener('message', function (event) {
                     let data = JSON.parse(event.data);
                     if (data.id !== document.getElementById('room').value + ':' + localStorage.getItem('userId')) {
@@ -409,6 +488,7 @@
                         newInput.id = data.id + 'url';
                         newInput.style.flexGrow = '1';
                         newInput.value = data.overlay;
+                        newInput.onclick = () => copyToClipboard(newInput.id)
                         let hint = document.getElementById('overlay-hint-button').cloneNode(true);
                         newOverlay.appendChild(newLabel);
                         newOverlay.appendChild(newInput);
@@ -427,7 +507,7 @@
     }
 
     function roll(event) {
-        if((!event || event.keyCode === 13) && document.getElementById('command').value?.length > 0) {
+        if ((!event || event.keyCode === 13) && document.getElementById('command').value?.length > 0) {
             let httpRequest = new XMLHttpRequest();
             httpRequest.open('POST', url() + '/dice/' + document.getElementById('room').value + ':' + localStorage.getItem(`userId`))
             httpRequest.setRequestHeader('Content-Type', 'application/json')
@@ -436,7 +516,7 @@
                 command: document.getElementById('command').value,
                 themeColor: document.getElementById('themeColor').value,
                 theme: document.getElementById('theme').value
-            } ))
+            }))
         }
     }
 
@@ -465,11 +545,11 @@
 
         popover.forEach((e) => {
             const target = document.querySelector("#" + e.getAttribute("popovertarget"));
-            e.addEventListener("mouseover",()=>{
+            e.addEventListener("mouseover", () => {
                 target.showPopover();
             });
 
-            e.addEventListener("mouseout",()=>{
+            e.addEventListener("mouseout", () => {
                 target.hidePopover();
             });
         });
@@ -477,7 +557,7 @@
 
     showPopover();
 
-    document.getElementById('resultSwitch').addEventListener('change', function() {
+    document.getElementById('resultSwitch').addEventListener('change', function () {
         if (!this.checked) {
             document.getElementById('resultFrame').src = document.getElementById('myResultsId').value;
         } else {
@@ -485,15 +565,36 @@
         }
     })
 
-    document.addEventListener("DOMContentLoaded", async() => {
+    document.addEventListener("DOMContentLoaded", async () => {
         if (!localStorage.getItem("userId")) {
             localStorage.setItem("userId", self.crypto.randomUUID());
         }
     })
+
+    function copyToClipboard(id) {
+        let copyText = document.getElementById(id);
+        copyText.select();
+        copyText.setSelectionRange(0, 99999);
+        navigator.clipboard.writeText(copyText.value);
+        showSnackbar("Link copied to clipboard: <br/>" + copyText.value);
+    }
+
+    function showSnackbar(message) {
+        let snackbar = document.getElementById("snackbar");
+        let snackbarContainer = document.getElementById("snackbar-container");
+        snackbar.innerHTML = message;
+        snackbar.className = "show";
+        snackbarContainer.className = "show";
+        setTimeout(function () {
+            snackbar.className = snackbar.className.replace("show", "");
+            snackbarContainer.className = snackbarContainer.className.replace("show", "");
+        }, 5000);
+    }
 </script>
 <script type="module">
     import DiceBox from "/vendor/dice-box/dice-box.es.js";
-    document.addEventListener("DOMContentLoaded", async() => {
+
+    document.addEventListener("DOMContentLoaded", async () => {
         document.getElementById('preview').onclick = async () => {
             document.getElementById('dice-box').replaceChildren(...[])
             const diceBox = new DiceBox("#dice-box", {
@@ -503,13 +604,14 @@
                 scale: 14
             });
             await diceBox.init()
-            diceBox.roll(['1d2','1d4','1d6','1d8','1d10','1d12','1d20','1d100']);
+            diceBox.roll(['1d2', '1d4', '1d6', '1d8', '1d10', '1d12', '1d20', '1d100']);
         }
     })
 
 </script>
 </body>
 <footer class="w3-theme-l1 w3-center w3-padding-16">
-    <a href="https://git.arindy.de/arindy/dice-tower" target="_blank" class="w3-hover-text-black">Dice-Tower on my GitTea</a>
+    <a href="https://git.arindy.de/arindy/dice-tower" target="_blank" class="w3-hover-text-black">Dice-Tower on my
+        GitTea</a>
 </footer>
 </html>