Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
d0a6a9ce3f | ||
| 87f4d71cc9 | |||
|
|
53a047217a | ||
|
|
3dbd19ee3b | ||
| c0415561ee | |||
|
|
7b9143c26d | ||
|
|
a21db87b98 | ||
| f1c5792a12 | |||
| d163160eb6 | |||
|
|
1c7e793fb2 | ||
|
|
cb1d34fd09 | ||
| 8a212a5044 | |||
| 09473f627b | |||
|
|
fbfd23d335 |
27
.github/workflows/ci.yaml
vendored
27
.github/workflows/ci.yaml
vendored
@@ -43,7 +43,14 @@ jobs:
|
||||
name: Version
|
||||
run: echo "VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> ${GITHUB_OUTPUT}
|
||||
|
||||
- name: Build Container
|
||||
- name: Build unstable Container
|
||||
if: github.ref_name != 'main'
|
||||
run: |
|
||||
echo ${{secrets.PACKAGES_TOKEN}} | docker login --username ${{ secrets.PACKAGES_USER }} --password-stdin git.arindy.de
|
||||
docker build -f src/main/docker/Dockerfile.native-micro -t git.arindy.de/arindy/dice-tower:unstable -t git.arindy.de/arindy/dice-tower:${{ steps.version.outputs.VERSION }} .
|
||||
docker push git.arindy.de/arindy/dice-tower:unstable
|
||||
|
||||
- name: Build stable Container
|
||||
if: github.ref_name == 'main'
|
||||
run: |
|
||||
echo ${{secrets.PACKAGES_TOKEN}} | docker login --username ${{ secrets.PACKAGES_USER }} --password-stdin git.arindy.de
|
||||
@@ -51,10 +58,28 @@ jobs:
|
||||
docker push git.arindy.de/arindy/dice-tower:${{ steps.version.outputs.VERSION }}
|
||||
docker push git.arindy.de/arindy/dice-tower:latest
|
||||
|
||||
- name: Prepare deploy
|
||||
run: |
|
||||
echo ${{secrets.SSH_KNOWN_HOSTS}} >> ~/.ssh/known_hosts
|
||||
base64 -d <<< ${{secrets.SSH_KEY}} > ./.key
|
||||
chmod 600 ./.key
|
||||
|
||||
- name: Deploy unstable
|
||||
if: github.ref_name != 'main'
|
||||
run: "ssh -i ./.key dice-tower@${{secrets.SSH_HOST}} 'docker compose -f compose.unstable.yml pull && docker compose -f compose.unstable.yml up -d' "
|
||||
|
||||
- name: Deploy
|
||||
if: github.ref_name == 'main'
|
||||
run: "ssh -i ./.key dice-tower@${{secrets.SSH_HOST}} 'docker compose -f compose.yml pull && docker compose -f compose.yml up -d' "
|
||||
|
||||
- name: Deploy local
|
||||
if: github.ref_name == 'main'
|
||||
run: "docker compose up -d"
|
||||
|
||||
- name: clean up
|
||||
run: |
|
||||
rm ./.key
|
||||
|
||||
- name: create tag
|
||||
if: github.ref_name == 'main'
|
||||
run: |
|
||||
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -124,3 +124,5 @@ fabric.properties
|
||||
# Android studio 3.1+ serialized cache file
|
||||
.idea/caches/build_file_checksums.ser
|
||||
|
||||
.key
|
||||
.key/
|
||||
|
||||
2
pom.xml
2
pom.xml
@@ -4,7 +4,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>de.arindy</groupId>
|
||||
<artifactId>dice-tower</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.5</version>
|
||||
|
||||
<properties>
|
||||
<compiler-plugin.version>3.13.0</compiler-plugin.version>
|
||||
|
||||
@@ -181,12 +181,6 @@ document.addEventListener("DOMContentLoaded", async () => {
|
||||
|
||||
document.getElementById('chatOverlayLink').href = url() + '/chatoverlay'
|
||||
|
||||
document.addEventListener("DOMContentLoaded", async () => {
|
||||
if (!localStorage.getItem("userId")) {
|
||||
localStorage.setItem("userId", self.crypto.randomUUID());
|
||||
}
|
||||
})
|
||||
|
||||
configurePopover();
|
||||
})
|
||||
|
||||
|
||||
BIN
src/main/resources/META-INF/resources/rich.png
Normal file
BIN
src/main/resources/META-INF/resources/rich.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 206 KiB |
@@ -3,6 +3,8 @@
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Dice-Tower</title>
|
||||
<meta name="version" content="{version}">
|
||||
|
||||
<link rel="stylesheet" href="/vendor/w3css/4/w3.css">
|
||||
<link rel="stylesheet" href="/vendor/font-awesome/css/fontawesome.css">
|
||||
<link rel="stylesheet" href="/vendor/font-awesome/css/all.css">
|
||||
@@ -11,12 +13,32 @@
|
||||
<script src="/vendor/color-picker.js"></script>
|
||||
<script type="module" src="/dice-preview.js"></script>
|
||||
<script type="text/javascript" src="/app.js"></script>
|
||||
|
||||
<meta name="twitter:card" content="summary_large_image">
|
||||
<meta name="twitter:title" content="Dice-Tower">
|
||||
<meta name="twitter:image" content="{http:request.scheme}://{http:request.authority}/rich.png">
|
||||
<meta name="description" content="Easy to use online dice rolling with customizable overlays.">
|
||||
<meta name="twitter:description" content="Easy to use online dice rolling with customizable overlays.">
|
||||
<meta property="og:url" content="{http:request.absoluteURI}">
|
||||
<meta property="og:image" content="{http:request.scheme}://{http:request.authority}/rich.png">
|
||||
<meta property="og:description" content="Easy to use online dice rolling with customizable overlays.">
|
||||
<meta property="og:title" content="Dice-Tower">
|
||||
<meta property="og:site_name" content="Dice-Tower">
|
||||
<meta property="og:type" content="website">
|
||||
<meta property="twitter:url" content="{http:request.absoluteURI}">
|
||||
<meta property="twitter:domain" content="{http:request.authority}">
|
||||
</head>
|
||||
<body class="w3-theme-l1">
|
||||
<script>
|
||||
if (!localStorage.getItem("userId")) {
|
||||
localStorage.setItem("userId", self.crypto.randomUUID());
|
||||
}
|
||||
</script>
|
||||
<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"><i class="fa-solid fa-dice-d20"></i> Dice-Tower <i class="fa-solid fa-dice-d20"></i>
|
||||
</h1>
|
||||
|
||||
<div class="w3-panel w3-theme-l4 w3-card w3-display-container"
|
||||
style="padding: 25px; text-align: center; margin-bottom: auto;">
|
||||
<h2 id="nameH" popovertarget="room-hint" data-trigger="hover" style="margin: 0" hidden>Name</h2>
|
||||
|
||||
Reference in New Issue
Block a user