SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'main' into module/journal

Browse Source
This commit is contained in:
Stephan Richter
2026-01-09 08:23:46 +01:00
parent a4fffbe91b 1187956625
commit 6668e29923
7 changed files with 123 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
.gitea/workflows/docker.yaml Normal file
View File

@@ -0,0 +1,76 @@
name: Build Docker Image
run-name: ${{ gitea.actor }} building ${{ gitea.ref_name }}
on:
push:
branches:
- main
- dev
jobs:
Docker-Build:
runs-on: ubuntu-latest
steps:
- name: Clone Repository
uses: actions/checkout@v4
- name: Build docker image
run: docker build -t umbrella .
- name: Store tag date
run: |
TAG=$(date +%Y%m%d_%H%M)_${{ gitea.ref_name }}
echo $TAG > /tmp/tag
echo Using '"'$TAG'"' as tag.
- name: Tag image for upload
run: |
TAG=$(cat /tmp/tag)
docker tag umbrella ${{ secrets.REGISTRY_PATH }}/umbrella:${{ gitea.ref_name }}
docker tag umbrella ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG
- name: Login to registry
uses: docker/login-action@v2
with:
registry: ${{ secrets.REGISTRY_PATH }}
username: ${{ secrets.REGISTRY_USER }}
password: ${{ secrets.REGISTRY_PASS }}
- name: Push to registry
run: |
TAG=$(cat /tmp/tag)
docker push ${{ secrets.REGISTRY_PATH }}/umbrella:${{ gitea.ref_name }}
docker push ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG
- name: Restart vj.srsoftware.de
if: github.ref == 'refs/heads/main'
run: |
curl -X POST -H "Authorization: Bearer ${{ secrets.MAKE_BEARER }}" -d vj_start https://make.srsoftware.de/launch
Clean-Registry:
runs-on: ubuntu-latest
steps:
- name: Get tag list
run: |
TAGS="$(curl -s -u "${{ secrets.REGISTRY_USER }}:${{ secrets.REGISTRY_PASS }}" https://${{ secrets.REGISTRY_PATH }}/v2/umbrella/tags/list | jq -r ".tags[]")"
COUNT=$(echo "$TAGS" | wc -l)
if [ $COUNT -gt 10 ]; then
REMAIN=$((COUNT - 10))
echo "$TAGS" | head -n $REMAIN > /tmp/old_tags
else
echo less than 10 tags, skipping cleanup
echo "" > /tmp/old_tags
fi
- name: Remove tags
run: |
cat /tmp/old_tags | while read TAG; do
if [ -n "$TAG" ]; then
DIGEST=$(curl -u "${{ secrets.REGISTRY_USER }}:${{ secrets.REGISTRY_PASS }}" -sS -H 'Accept: application/vnd.docker.distribution.manifest.v2+json' -o /dev/null -w '%header{Docker-Content-Digest}' https://${{ secrets.REGISTRY_PATH }}/v2/umbrella/manifests/$TAG)
if [ -n "$DIGEST" ]; then
echo about to delete $TAG
curl -u "${{ secrets.REGISTRY_USER }}:${{ secrets.REGISTRY_PASS }}" -sS -X DELETE https://${{ secrets.REGISTRY_PATH }}/v2/umbrella/manifests/$DIGEST
else
echo failed to get digest for $TAG
fi
fi
done

29
Dockerfile Normal file
View File

@@ -0,0 +1,29 @@
FROM alpine:3.22 AS svelte_build
RUN apk add bash git npm
RUN adduser -Dh /home/svelte svelte
ADD . /home/svelte/Umbrella
RUN chown -R svelte /home/svelte/Umbrella
USER svelte
WORKDIR /home/svelte/Umbrella/frontend
RUN npm install && npm run build
FROM alpine AS java_build
RUN apk add bash git gradle fontconfig font-opensans openjdk21-jre
ADD . /Umbrella
WORKDIR /Umbrella
COPY --from=svelte_build /home/svelte/Umbrella/frontend/dist web/src/main/resources/web
RUN gradle --no-daemon build
FROM alpine
RUN apk add bash fontconfig font-opensans graphviz openjdk21-jre weasyprint
RUN adduser -D umbrella
COPY --from=java_build /Umbrella/backend/build/libs/backend.jar /home/umbrella/jar/
RUN chown -R umbrella /home/umbrella
ADD https://github.com/plantuml/plantuml/releases/download/v1.2025.10/plantuml-1.2025.10.jar /home/umbrella/plantuml.jar
USER umbrella
WORKDIR /home/umbrella
RUN mkdir .config && ln -s /host/config.json .config/Umbrella.json
EXPOSE 80
CMD java -jar jar/backend.jar

3
frontend/index.html
View File

@@ -9,6 +9,7 @@
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
<script type="module" src="/src/main.js"></script> <script type="module" src="/src/main.js">
</script>
</body> </body>
</html> </html>

7
frontend/src/routes/time/Index.svelte
View File

@@ -20,7 +20,7 @@
let projects = {}; let projects = {};
let project_filter = $state(null); let project_filter = $state(null);
if (router.hasQueryParam('project')) project_filter = router.getQueryParam('project'); if (router.hasQueryParam('project')) project_filter = router.getQueryParam('project');
let sortedTimes = $derived.by(() => Object.values(times).map(time => ({ let sortedTimes = $derived.by(() => Object.values(times).filter(match_prj_filter).map(time => ({
...time, ...time,
start: display(time.start_time), start: display(time.start_time),
end: display(time.end_time), end: display(time.end_time),
@@ -52,6 +52,7 @@
} }
function calcYearMap(){ function calcYearMap(){
console.log('calcYearMap called');
let result = { let result = {
months : {}, months : {},
years : {} years : {}
@@ -123,7 +124,7 @@
function match_prj_filter(time){ function match_prj_filter(time){
if (!project_filter) return true; if (!project_filter) return true;
for (var tid of time.task_ids){ for (var tid of time.task_ids){
if (project_filter == tasks[tid].project_id) return true; if (tasks[tid] && project_filter == tasks[tid].project_id) return true;
} }
return false; return false;
} }
@@ -258,7 +259,6 @@
</thead> </thead>
<tbody> <tbody>
{#each sortedTimes as time,line} {#each sortedTimes as time,line}
{#if match_prj_filter(time)}
<tr class={selected[time.id]?'selected':''}> <tr class={selected[time.id]?'selected':''}>
{#if timeMap.years[line]} {#if timeMap.years[line]}
<td class="year" rowspan={timeMap.years[line]} onclick={e => toggleRange(time.start.substring(0,4))} title={time.start.substring(0,4)} > <td class="year" rowspan={timeMap.years[line]} onclick={e => toggleRange(time.start.substring(0,4))} title={time.start.substring(0,4)} >
@@ -321,7 +321,6 @@
</td> </td>
{/if} {/if}
</tr> </tr>
{/if}
{/each} {/each}
</tbody> </tbody>
</table> </table>

4
web/src/main/resources/web/css/bloodshed.css
View File

@@ -153,6 +153,10 @@ li.task > button{
display: none; display: none;
} }
li.task > button:nth-child(2){
display: initial;
}
li.task{ li.task{
padding: 5px 0; padding: 5px 0;
} }

4
web/src/main/resources/web/css/default.css
View File

@@ -240,6 +240,10 @@ li.task > button{
display: none; display: none;
} }
li.task > button:nth-child(2){
display: initial;
}
li.task{ li.task{
padding: 5px 0; padding: 5px 0;
} }

5
web/src/main/resources/web/css/winter.css
View File

@@ -19,6 +19,7 @@ body {
code { code {
font-size: 16px; font-size: 16px;
} }
fieldset { fieldset {
border: 1px solid; border: 1px solid;
border-radius: 4px; border-radius: 4px;
@@ -152,6 +153,10 @@ li.task > button{
display: none; display: none;
} }
li.task > button:nth-child(2){
display: initial;
}
li.task{ li.task{
padding: 5px 0; padding: 5px 0;
} }