Skip to content

Commit 6b15e0e

Browse files
authored
Merge pull request #8 from HardMax71/dev
misc fixes
2 parents 0005a41 + 10dd020 commit 6b15e0e

File tree

8 files changed

+42
-22
lines changed

8 files changed

+42
-22
lines changed

.github/workflows/publish-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
type=semver,pattern={{version}}
6969
type=semver,pattern={{major}}.{{minor}}
7070
type=semver,pattern={{major}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.') }}
71-
type=ref,event=branch
71+
type=raw,value=0.1.${{ github.run_number }},enable=${{ github.ref == 'refs/heads/main' }}
7272
type=sha,prefix=sha-
7373
flavor: |
7474
latest=auto

.github/workflows/tests.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@ jobs:
3131
sed -i "s|TEXT_LLM_API_KEY=.*|TEXT_LLM_API_KEY=$TEXT_LLM_API_KEY|" backend/.env
3232
sed -i "s|OCR_LLM_API_KEY=.*|OCR_LLM_API_KEY=$OCR_LLM_API_KEY|" backend/.env
3333
34+
- name: Setup Node.js
35+
uses: actions/setup-node@v4
36+
with:
37+
node-version: '20'
38+
39+
- name: Install frontend dependencies
40+
run: npm ci
41+
working-directory: ./frontend
42+
3443
- name: Start all services
3544
run: docker compose up -d --wait
3645

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
</a>
2121
<br/>
2222
<a href="https://github.com/HardMax71/ResuMariner/pkgs/container/resumariner-backend">
23-
<img src="https://ghcr-badge.egpl.dev/hardmax71/resumariner-backend/latest_tag?label=backend" alt="Backend Version" />
23+
<img src="https://ghcr-badge.egpl.dev/hardmax71/resumariner-backend/latest_tag?label=backend&ignore=sha-*,latest" alt="Backend Version" />
2424
</a>
2525
<a href="https://github.com/HardMax71/ResuMariner/pkgs/container/resumariner-frontend">
26-
<img src="https://ghcr-badge.egpl.dev/hardmax71/resumariner-frontend/latest_tag?label=frontend" alt="Frontend Version" />
26+
<img src="https://ghcr-badge.egpl.dev/hardmax71/resumariner-frontend/latest_tag?label=frontend&ignore=sha-*,latest" alt="Frontend Version" />
2727
</a>
2828
</p>
2929

docker-compose.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ services:
176176
- "5173:5173"
177177
volumes:
178178
- ./frontend:/app
179-
- /app/node_modules
180179
environment:
181180
- VITE_API_BASE_URL=${VITE_API_BASE_URL}
182181
- VITE_GRAFANA_URL=${VITE_GRAFANA_URL}

frontend/package-lock.json

Lines changed: 15 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919
"@emotion/react": "^11.13.3",
2020
"@emotion/styled": "^11.13.0",
2121
"react-error-boundary": "^4.1.2",
22-
"plantuml-encoder": "^1.4.0"
22+
"pako": "^2.1.0"
2323
},
2424
"devDependencies": {
25+
"@types/pako": "^2.0.3",
2526
"@vitejs/plugin-react": "4.3.2",
2627
"@types/react": "18.3.7",
2728
"@types/react-dom": "18.3.0",

frontend/src/components/PlantUMLDiagram.tsx

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,37 @@
11
import { useEffect, useState } from "react";
2-
import plantumlEncoder from "plantuml-encoder";
2+
import pako from "pako";
33

44
interface PlantUMLDiagramProps {
55
src: string;
66
alt?: string;
77
caption?: string;
8+
format?: "svg" | "png";
89
}
910

10-
export default function PlantUMLDiagram({ src, alt = "PlantUML Diagram", caption }: PlantUMLDiagramProps) {
11+
function encodeForKroki(source: string): string {
12+
const data = new TextEncoder().encode(source);
13+
const compressed = pako.deflate(data, { level: 9 });
14+
const base64 = btoa(String.fromCharCode(...compressed));
15+
return base64.replace(/\+/g, "-").replace(/\//g, "_");
16+
}
17+
18+
export default function PlantUMLDiagram({ src, alt = "PlantUML Diagram", caption, format = "svg" }: PlantUMLDiagramProps) {
1119
const [imageUrl, setImageUrl] = useState<string>("");
1220

1321
useEffect(() => {
1422
const fetchAndEncode = async () => {
1523
try {
1624
const response = await fetch(src);
1725
const pumlContent = await response.text();
18-
const encoded = plantumlEncoder.encode(pumlContent);
19-
setImageUrl(`https://www.plantuml.com/plantuml/png/${encoded}`);
26+
const encoded = encodeForKroki(pumlContent);
27+
setImageUrl(`https://kroki.io/plantuml/${format}/${encoded}`);
2028
} catch (error) {
2129
console.error("Error loading PlantUML diagram:", error);
2230
}
2331
};
2432

2533
fetchAndEncode();
26-
}, [src]);
34+
}, [src, format]);
2735

2836
if (!imageUrl) {
2937
return (

frontend/src/types/plantuml-encoder.d.ts

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)