From 1eab5353810a0a351cfc72b493c5156f55a4c9d2 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Mon, 2 Dec 2024 11:54:05 +0100 Subject: [PATCH] wip: general updates --- Dockerfile | 13 +- README.md | 17 - index.html | 2 +- package.json | 6 +- pnpm-lock.yaml | 128 +++----- public/{favicon.png => favicon-lfk.png} | Bin public/favicon.ico | Bin 4286 -> 0 bytes src/components/Login.vue | 2 +- src/locales/de.json | 3 +- src/locales/en.json | 104 +++--- src/views/Home.vue | 2 +- src/views/Imprint.vue | 10 +- src/views/Privacy.vue | 12 +- src/views/Profile.vue | 420 +++++++----------------- src/views/ProfileNone.vue | 50 +-- src/views/Register.vue | 252 ++++---------- src/views/Registered.vue | 22 -- 17 files changed, 324 insertions(+), 719 deletions(-) rename public/{favicon.png => favicon-lfk.png} (100%) delete mode 100644 public/favicon.ico delete mode 100644 src/views/Registered.vue diff --git a/Dockerfile b/Dockerfile index 07adae3..35b7d7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,13 @@ -FROM registry.odit.services/hub/library/node:23.3.0-alpine3.20 AS build -ARG NPM_REGISTRY_URL=https://registry.npmjs.org +FROM node:23.3.0-alpine3.20 AS build +# FROM registry.odit.services/hub/library/node:23.3.0-alpine3.20 AS build +# ARG NPM_REGISTRY_URL=https://registry.npmjs.org WORKDIR /app - COPY . . -RUN npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@9 -RUN pnpm i && pnpm build && pnpm postbuild +# RUN npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@9 +RUN npm i -g pnpm@9 +RUN pnpm i --frozen-lockfile +RUN pnpm build +RUN pnpm postbuild # final image FROM registry.odit.services/library/nginx-brotli:3.15 AS final diff --git a/README.md b/README.md index 773bb9c..4540bb0 100644 --- a/README.md +++ b/README.md @@ -2,23 +2,6 @@ runner selfservice portal -## ⚡ Development -### Requirements -- Node.js v14.16.0 or newer -- yarn package manager >= v1.22.10 < 2 - -### Recommended Extensions -- will be automatically recommended via `./vscode/extensions.json` -- we also provide a config for i18n-ally in the `./vscode/` folder - -### Fastest Dev Environment -- You can install the [Remote - Containers](https://github.com/Microsoft/vscode-remote-release) extension and use all recommended extensions and editor settings via the provided `./devcontainer/` config - -### Manual Dev Environment -``` -yarn && yarn dev --open -``` - ## 🔨 Environment config - copy the `/public/env.sample.js` file to `/public/env.js` - set the required environment variables diff --git a/index.html b/index.html index 3947c44..27938b4 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - + Lauf für Kaya! - Selfservice diff --git a/package.json b/package.json index d6c1d55..960bf70 100644 --- a/package.json +++ b/package.json @@ -11,14 +11,14 @@ "dependencies": { "@fontsource/athiti": "^5.1.0", "@tailwindcss/vite": "4.0.0-beta.4", - "bwip-js": "3.2.2", - "marked": "2.0.3", + "bwip-js": "4.5.1", + "marked": "15.0.3", "redaxios": "0.5.1", "tailwindcss": "4.0.0-beta.4", "toastify-js": "1.12.0", "validator": "13.12.0", "vue": "3.5.13", - "vue-i18n": "9.1.4", + "vue-i18n": "10.0.5", "vue-router": "4.5.0", "vue-toastification": "2.0.0-rc.1" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 17ffb32..aaeaa16 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,11 +15,11 @@ importers: specifier: 4.0.0-beta.4 version: 4.0.0-beta.4(@babel/core@7.26.0)(postcss-load-config@4.0.2(postcss@8.4.49))(postcss@8.4.49)(svelte@5.3.1)(vite@6.0.2(@types/node@18.11.18)(jiti@2.4.1)(lightningcss@1.28.2)(yaml@2.6.1)) bwip-js: - specifier: 3.2.2 - version: 3.2.2 + specifier: 4.5.1 + version: 4.5.1 marked: - specifier: 2.0.3 - version: 2.0.3 + specifier: 15.0.3 + version: 15.0.3 redaxios: specifier: 0.5.1 version: 0.5.1 @@ -36,8 +36,8 @@ importers: specifier: 3.5.13 version: 3.5.13 vue-i18n: - specifier: 9.1.4 - version: 9.1.4(vue@3.5.13) + specifier: 10.0.5 + version: 10.0.5(vue@3.5.13) vue-router: specifier: 4.5.0 version: 4.5.0(vue@3.5.13) @@ -360,33 +360,17 @@ packages: resolution: {integrity: sha512-tKd+jsmhq21AP1LhexC0pPwsCxEhGgAkg28byjJAd+xhmIs8LUX8JbUc3vBf3PhLxWiB5EvyBE5X7JSPAqMAqg==} engines: {node: '>=18'} - '@intlify/core-base@9.1.4': - resolution: {integrity: sha512-zDc1amVaqpiS3c9mmEpwbatORjS1g+GhYXai/x58q4nsGw5EODwFEabP7jqNczVTP6Oc8o/C5sVwCbcgXoCwPQ==} - engines: {node: '>= 10'} + '@intlify/core-base@10.0.5': + resolution: {integrity: sha512-F3snDTQs0MdvnnyzTDTVkOYVAZOE/MHwRvF7mn7Jw1yuih4NrFYLNYIymGlLmq4HU2iIdzYsZ7f47bOcwY73XQ==} + engines: {node: '>= 16'} - '@intlify/devtools-if@9.1.4': - resolution: {integrity: sha512-fw/LF2vRxm9OxR6btnvO/weUEMzMLkioNMjSgy83bZLsL2SyOj0pm7LiwVxiTcf3vDykC5AhiACp2q8RdeVoZQ==} - engines: {node: '>= 10'} + '@intlify/message-compiler@10.0.5': + resolution: {integrity: sha512-6GT1BJ852gZ0gItNZN2krX5QAmea+cmdjMvsWohArAZ3GmHdnNANEcF9JjPXAMRtQ6Ux5E269ymamg/+WU6tQA==} + engines: {node: '>= 16'} - '@intlify/message-compiler@9.1.4': - resolution: {integrity: sha512-4YsNMmwKrvH0UjhhCC3f3jt2YFIDKTcXiqgbNFw0SRILDgu00yD0nIR+E+LRrC3wRjhYoaYecmoOhhfqsGm/mQ==} - engines: {node: '>= 10'} - - '@intlify/message-resolver@9.1.4': - resolution: {integrity: sha512-FZ6dZrc44HaoqaAyP5fkYA3inGrfwDgB9ErPulG/lOzwQrBwnOws9vwB5GfuGEK9Q97ksT/4hXK0Vvn2r0L+zA==} - engines: {node: '>= 10'} - - '@intlify/runtime@9.1.4': - resolution: {integrity: sha512-NRQkuKpyF61jduFE9CGulzlnmdOTKKHYVCMMaDlnzbVY2nfCElkozZbpCC13iBaDnksWmIab5THve8KewYkbQA==} - engines: {node: '>= 10'} - - '@intlify/shared@9.1.4': - resolution: {integrity: sha512-2rlkzmgj6fdSW8gsVtuw0vebMMGXGvRI3CwsshtAdShwea1bUuHtjJqze0ZhiVaRi87yAl4U5CaGC/t721TD5Q==} - engines: {node: '>= 10'} - - '@intlify/vue-devtools@9.1.4': - resolution: {integrity: sha512-nUWlNIAKuZY5enD5CqKMXWKN8Viv6g1tIP/rddESrJCJnXIIReRGVXA1wL0zFNlYLuslj6d+rQjuVWUKDJOAlg==} - engines: {node: '>= 10'} + '@intlify/shared@10.0.5': + resolution: {integrity: sha512-bmsP4L2HqBF6i6uaMqJMcFBONVjKt+siGluRq4Ca4C0q7W2eMaVZr8iCgF9dKbcVXutftkC7D6z2SaSMmLiDyA==} + engines: {node: '>= 16'} '@jridgewell/gen-mapping@0.3.5': resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} @@ -717,9 +701,6 @@ packages: '@vue/compiler-ssr@3.5.13': resolution: {integrity: sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==} - '@vue/devtools-api@6.5.0': - resolution: {integrity: sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==} - '@vue/devtools-api@6.6.4': resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==} @@ -858,8 +839,8 @@ packages: resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==} engines: {node: '>=18'} - bwip-js@3.2.2: - resolution: {integrity: sha512-70aY2FSRVd1u6q8iXY+HDQDm6598lQt/toSNLrKeQhbmzw75y40Hmg85MTDtVv1NElbRPNtsX9aPuOQVsFuOzA==} + bwip-js@4.5.1: + resolution: {integrity: sha512-83yQCKiIftz5YonnsTh6wIkFoHHWl+B/XaGWD1UdRw7aB6XP9JtyYP9n8sRy3m5rzL+Ch/RUPnu28UW0RrPZUA==} hasBin: true callsites@3.1.0: @@ -1087,8 +1068,8 @@ packages: resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==} engines: {node: '>=8.6.0'} - fastq@1.15.0: - resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==} + fastq@1.17.1: + resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==} figures@6.1.0: resolution: {integrity: sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==} @@ -1510,9 +1491,9 @@ packages: magic-string@0.30.14: resolution: {integrity: sha512-5c99P1WKTed11ZC0HMJOj6CDIue6F8ySu+bJL+85q1zBEIY8IklrJ1eiKC2NDRh3Ct3FcvmJPyQHb9erXMTJNw==} - marked@2.0.3: - resolution: {integrity: sha512-5otztIIcJfPc2qGTN8cVtOJEjNJZ0jwa46INMagrYfk0EvqtRuEHLsEe0LrFS0/q+ZRKT0+kXK7P2T1AN5lWRA==} - engines: {node: '>= 8.16.2'} + marked@15.0.3: + resolution: {integrity: sha512-Ai0cepvl2NHnTcO9jYDtcOEtVBNVYR31XnEA3BndO7f5As1wzpcOceSUM8FDkNLJNIODcLpDTWay/qQhqbuMvg==} + engines: {node: '>= 18'} hasBin: true merge-stream@2.0.0: @@ -2128,9 +2109,9 @@ packages: yaml: optional: true - vue-i18n@9.1.4: - resolution: {integrity: sha512-cHedbwyialWgNnJ8xhKgjHTjwOe5zPcqNMqc69TiXLlK4up6HHRDAqIOX/k6wWb8wP1OA4kq74/pnA0GubcWyg==} - engines: {node: '>= 10'} + vue-i18n@10.0.5: + resolution: {integrity: sha512-9/gmDlCblz3i8ypu/afiIc/SUIfTTE1mr0mZhb9pk70xo2csHAM9mp2gdQ3KD2O0AM3Hz/5ypb+FycTj/lHlPQ==} + engines: {node: '>= 16'} peerDependencies: vue: ^3.0.0 @@ -2488,40 +2469,17 @@ snapshots: '@inquirer/figures@1.0.8': {} - '@intlify/core-base@9.1.4': + '@intlify/core-base@10.0.5': dependencies: - '@intlify/devtools-if': 9.1.4 - '@intlify/message-compiler': 9.1.4 - '@intlify/message-resolver': 9.1.4 - '@intlify/runtime': 9.1.4 - '@intlify/shared': 9.1.4 - '@intlify/vue-devtools': 9.1.4 + '@intlify/message-compiler': 10.0.5 + '@intlify/shared': 10.0.5 - '@intlify/devtools-if@9.1.4': + '@intlify/message-compiler@10.0.5': dependencies: - '@intlify/shared': 9.1.4 + '@intlify/shared': 10.0.5 + source-map-js: 1.2.1 - '@intlify/message-compiler@9.1.4': - dependencies: - '@intlify/message-resolver': 9.1.4 - '@intlify/shared': 9.1.4 - source-map: 0.6.1 - - '@intlify/message-resolver@9.1.4': {} - - '@intlify/runtime@9.1.4': - dependencies: - '@intlify/message-compiler': 9.1.4 - '@intlify/message-resolver': 9.1.4 - '@intlify/shared': 9.1.4 - - '@intlify/shared@9.1.4': {} - - '@intlify/vue-devtools@9.1.4': - dependencies: - '@intlify/message-resolver': 9.1.4 - '@intlify/runtime': 9.1.4 - '@intlify/shared': 9.1.4 + '@intlify/shared@10.0.5': {} '@jridgewell/gen-mapping@0.3.5': dependencies: @@ -2550,7 +2508,7 @@ snapshots: '@nodelib/fs.walk@1.2.8': dependencies: '@nodelib/fs.scandir': 2.1.5 - fastq: 1.15.0 + fastq: 1.17.1 '@octokit/auth-token@4.0.0': {} @@ -2843,8 +2801,6 @@ snapshots: '@vue/compiler-dom': 3.5.13 '@vue/shared': 3.5.13 - '@vue/devtools-api@6.5.0': {} - '@vue/devtools-api@6.6.4': {} '@vue/devtools-core@7.6.7(vite@6.0.2(@types/node@18.11.18)(jiti@2.4.1)(lightningcss@1.28.2)(yaml@2.6.1))(vue@3.5.13)': @@ -3008,7 +2964,7 @@ snapshots: dependencies: run-applescript: 7.0.0 - bwip-js@3.2.2: {} + bwip-js@4.5.1: {} callsites@3.1.0: {} @@ -3247,7 +3203,7 @@ snapshots: merge2: 1.4.1 micromatch: 4.0.8 - fastq@1.15.0: + fastq@1.17.1: dependencies: reusify: 1.0.4 @@ -3604,7 +3560,7 @@ snapshots: dependencies: '@jridgewell/sourcemap-codec': 1.5.0 - marked@2.0.3: {} + marked@15.0.3: {} merge-stream@2.0.0: {} @@ -3999,7 +3955,8 @@ snapshots: source-map-js@1.2.1: {} - source-map@0.6.1: {} + source-map@0.6.1: + optional: true speakingurl@14.0.1: {} @@ -4197,12 +4154,11 @@ snapshots: lightningcss: 1.28.2 yaml: 2.6.1 - vue-i18n@9.1.4(vue@3.5.13): + vue-i18n@10.0.5(vue@3.5.13): dependencies: - '@intlify/core-base': 9.1.4 - '@intlify/shared': 9.1.4 - '@intlify/vue-devtools': 9.1.4 - '@vue/devtools-api': 6.5.0 + '@intlify/core-base': 10.0.5 + '@intlify/shared': 10.0.5 + '@vue/devtools-api': 6.6.4 vue: 3.5.13 vue-router@4.5.0(vue@3.5.13): diff --git a/public/favicon.png b/public/favicon-lfk.png similarity index 100% rename from public/favicon.png rename to public/favicon-lfk.png diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index df36fcfb72584e00488330b560ebcf34a41c64c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4286 zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56 zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei z@g6Xq-pDoPl=MANPiR7%172VA%r)kevtV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp= zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8 zx!=3<4seY*%=OlbCbcae?5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3 z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD zsW0Ab)ZK@0cIW%W7z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6 z={Xwx{TKxD#iCLfl2vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S diff --git a/src/components/Login.vue b/src/components/Login.vue index 7c165ab..df1757d 100644 --- a/src/components/Login.vue +++ b/src/components/Login.vue @@ -1,7 +1,7 @@ - + \ No newline at end of file