Merge branch 'dev' of git.odit.services:lfk/selfservice into dev

close #50

.drone.yml

@@ -1,117 +0,0 @@
----
-kind: secret
-name: docker_username
-get:
-  path: odit-registry-builder
-  name: username
-
----
-kind: secret
-name: docker_password
-get:
-  path: odit-registry-builder
-  name: password
-
----
-kind: secret
-name: git_ssh
-get:
-  path: odit-git-bot
-  name: sshkey
-
----
-kind: pipeline
-type: kubernetes
-name: build:dev
-
-steps:
-  - name: build dev
-    image: plugins/docker
-    depends_on: [clone]
-    settings:
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      repo: registry.odit.services/lfk/selfservice
-      tags:
-        - dev
-      registry: registry.odit.services
-      mtu: 1000
-trigger:
-  branch:
-    - dev
-  event:
-    - push
-
----
-kind: pipeline
-type: kubernetes
-name: build:testing
-
-steps:
-  - name: build testing
-    image: plugins/docker
-    depends_on: [clone]
-    settings:
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      repo: registry.odit.services/lfk/selfservice
-      tags:
-        - testing
-      registry: registry.odit.services
-      mtu: 1000
-trigger:
-  branch:
-    - bugfix/31-env_linking
-  event:
-    - push
-
----
-kind: pipeline
-type: kubernetes
-name: build:latest
-
-steps:
-  - name: build latest
-    image: plugins/docker
-    depends_on: [clone]
-    settings:
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      repo: registry.odit.services/lfk/selfservice
-      tags:
-        - latest
-      registry: registry.odit.services
-      mtu: 1000
-trigger:
-  branch:
-    - main
-  event:
-    - push
-
----
-kind: pipeline
-type: kubernetes
-name: build:tags
-steps:
-  - name: build $DRONE_TAG
-    image: plugins/docker
-    depends_on: [clone]
-    settings:
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      repo: registry.odit.services/lfk/selfservice
-      tags:
-        - '${DRONE_TAG}'
-      registry: registry.odit.services
-      mtu: 1000
-trigger:
-  event:
-  - tag

.woodpecker/build.yml

@@ -0,0 +1,39 @@
+steps:
+  - name: build latest
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      repo: registry.odit.services/lfk/selfservice
+      tags:
+        - latest
+      registry: registry.odit.services
+      platforms: linux/amd64,linux/arm64
+      cache_from: registry.odit.services/lfk/selfservice:latest
+      username:
+        from_secret: odit-registry-builder-username
+      password:
+        from_secret: odit-registry-builder-password
+    secrets:
+      - source: odit-npm-cache-url
+        target: NPM_REGISTRY_URL
+    when:
+      branch: main
+  - name: build dev
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      repo: registry.odit.services/lfk/selfservice
+      tags:
+        - dev
+      registry: registry.odit.services
+      platforms: linux/amd64,linux/arm64
+      cache_from: registry.odit.services/lfk/selfservice:dev
+      username:
+        from_secret: odit-registry-builder-username
+      password:
+        from_secret: odit-registry-builder-password
+    secrets:
+      - source: odit-npm-cache-url
+        target: NPM_REGISTRY_URL
+    when:
+      branch: dev
+when:
+  event: push

.woodpecker/release.yml

@@ -0,0 +1,20 @@
+steps:
+  - name: build tag
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      repo: registry.odit.services/lfk/selfservice
+      tags:
+        - "${CI_COMMIT_TAG}"
+      registry: registry.odit.services
+      platforms: linux/amd64,linux/arm64
+      cache_from: registry.odit.services/lfk/selfservice:latest
+      username:
+        from_secret: odit-registry-builder-username
+      password:
+        from_secret: odit-registry-builder-password
+    secrets:
+      - source: odit-npm-cache-url
+        target: NPM_REGISTRY_URL
+
+when:
+  event: tag

CHANGELOG.md

@@ -2,11 +2,45 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [0.11.3](https://git.odit.services/lfk/selfservice/compare/0.11.2...0.11.3)
+
+- fix: registration code white bg [`#50`](https://git.odit.services/lfk/selfservice/issues/50)
+- Pinned pnpm and lockfile [`6aca13f`](https://git.odit.services/lfk/selfservice/commit/6aca13f0cb1bc8fa43f0f09c554cec0758acd7a1)
+- switched drone to kaniko with cache [`cac5103`](https://git.odit.services/lfk/selfservice/commit/cac5103d52427e777e4c3624ebb253ad7bd393d6)
+- Switched dockerfile to pnpm with cache [`78fea1e`](https://git.odit.services/lfk/selfservice/commit/78fea1ea045a7281fe0a2841fc4d5f1505dcb3cf)
+- chore(deps): pnpm@8.1.1 [`677e65f`](https://git.odit.services/lfk/selfservice/commit/677e65f44ae4bcc6f9af4732d813f337da0c51d2)
+- fix(Footer): darkmode colors in lightmode [`772eca6`](https://git.odit.services/lfk/selfservice/commit/772eca64bb38ce1cf1ea1b58859dd744588a88e1)
+
+#### [0.11.2](https://git.odit.services/lfk/selfservice/compare/0.11.1...0.11.2)
+
+> 15 March 2023
+
+- Added footer to every page [`b9624aa`](https://git.odit.services/lfk/selfservice/commit/b9624aa5ad57002852c84081fc710c2e977251bd)
+- 🚀Bumped version to v0.11.2 [`fa51b31`](https://git.odit.services/lfk/selfservice/commit/fa51b31fe41d41b3ec9becad07ddab4cf73be051)
+- Accept tos to accept privacy_policy [`09e48e7`](https://git.odit.services/lfk/selfservice/commit/09e48e771f4c0db4a7dbb898b05b347f1aad2292)
+
+#### [0.11.1](https://git.odit.services/lfk/selfservice/compare/0.11.0...0.11.1)
+
+> 18 February 2023
+
+- Profile: add "---" if no data set [`659fa77`](https://git.odit.services/lfk/selfservice/commit/659fa77dca3b527d896d752386e91a167a1b8f4f)
+- 🚀Bumped version to v0.11.1 [`8364321`](https://git.odit.services/lfk/selfservice/commit/8364321a7cb6a0037ee0c5055b028c4cf883fb10)
+
+#### [0.11.0](https://git.odit.services/lfk/selfservice/compare/0.10.0...0.11.0)
+
+> 3 February 2023
+
+- pnpm migration [`a3a1e89`](https://git.odit.services/lfk/selfservice/commit/a3a1e89aa14798e1d180697f91809e282a229f23)
+- 🚀Bumped version to v0.11.0 [`10c9127`](https://git.odit.services/lfk/selfservice/commit/10c9127256edf2cbad1dc6690d5f4e87c32f6396)
+
 #### [0.10.0](https://git.odit.services/lfk/selfservice/compare/0.9.0...0.10.0)
 
+> 3 February 2023
+
 - text cleanups + footer [`eccce07`](https://git.odit.services/lfk/selfservice/commit/eccce0795b6960aa3a2e9368de5ae4bdf80997d7)
 - updated nginx config for cache busting [`8e2b355`](https://git.odit.services/lfk/selfservice/commit/8e2b355466e9a37510be8bf03311d6b28e1a0d9f)
 - improved profile page padding + full width registration code for easier scanning [`54540be`](https://git.odit.services/lfk/selfservice/commit/54540be6e12ed85afc96061b8548cd4ec6700eec)
+- 🚀Bumped version to v0.10.0 [`5587175`](https://git.odit.services/lfk/selfservice/commit/5587175534188e05ab43d0eed9745484e01edb63)
 
 #### [0.9.0](https://git.odit.services/lfk/selfservice/compare/0.8.3...0.9.0)
 

Dockerfile

@@ -1,10 +1,12 @@
-FROM registry.odit.services/hub/library/node:15.9.0-alpine3.13
+FROM registry.odit.services/hub/library/node:19.5.0-alpine3.17 as build
+ARG NPM_REGISTRY_URL=https://registry.npmjs.org
 WORKDIR /app
+
 COPY . .
-RUN yarn
+RUN npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@8
-RUN yarn build
+RUN pnpm i && pnpm build && pnpm postbuild
-RUN yarn postbuild
+
 # final image
-FROM registry.odit.services/library/nginx-brotli:3.15
+FROM registry.odit.services/library/nginx-brotli:3.15 as final
-COPY --from=0 /app/dist /usr/share/nginx/html
+COPY --from=build /app/dist /usr/share/nginx/html
 COPY ./nginx.conf /etc/nginx/nginx.conf

package.json

@@ -1,12 +1,15 @@
 {
 	"name": "@odit/lfk-selfservice",
-	"version": "0.10.0",
+	"version": "0.11.3",
 	"scripts": {
 		"dev": "vite",
 		"build": "vite build",
 		"release": "release-it",
 		"postbuild": "node env_fix.js"
 	},
+	"engines": {
+		"pnpm": "8.1.1"
+	},
 	"dependencies": {
 		"bwip-js": "3.2.2",
 		"marked": "2.0.3",

src/components/Footer.vue

@@ -1,5 +1,5 @@
 <template>
-  <footer class="text-gray-400 bg-gray-900 body-font">
+  <footer>
     <div class="container px-5 py-8 mx-auto flex items-center sm:flex-row flex-col">
       <p class="text-sm text-gray-400 sm:ml-4 sm:pl-4 sm:py-2 sm:mt-0 mt-4">
         Lauf für Kaya! Selfservice - Copyright © 2023 + proudly powered by

src/views/Imprint.vue

@@ -9,15 +9,18 @@
       <div class="mx-auto prose" v-html="content"></div>
     </div>
   </section>
+  <Footer></Footer>
 </template>
 <style src="../simple.css">
 </style>
 <script>
 import marked from "marked";
+import Footer from "@/components/Footer.vue";
 export default {
+  components: {Footer},
   data() {
     return {
-      content: ""
+      content: "",
     }
   },
   async beforeMount() {

src/views/Privacy.vue

@@ -9,12 +9,15 @@
       <div class="mx-auto prose" v-html="content"></div>
     </div>
   </section>
+  <Footer></Footer>
 </template>
 <style src="../simple.css">
 </style>
 <script>
 import marked from "marked";
+import Footer from "@/components/Footer.vue";
 export default {
+  components: {Footer},
   data() {
     return {
       content: ""

src/views/Profile.vue

@@ -289,7 +289,7 @@
                     <div class="form-element">
                       <div class="text-lg">{{ $t("registrierungscode") }}</div>
                       <img
-                        class="w-full md:w-auto mb-2"
+                        class="w-full md:w-auto mb-2 bg-white p-2"
                         alt="Registrierungscode"
                         :src="state.barcode"
                       />
@@ -311,7 +311,7 @@
                           duration-200
                           ease-in-out
                         "
-                        v-text="state.firstname"
+                        v-text="state.firstname || '---'"
                       />
                     </div>
                     <div class="form-element">
@@ -333,7 +333,7 @@
                           duration-200
                           ease-in-out
                         "
-                        v-text="state.middlename"
+                        v-text="state.middlename || '---'"
                       />
                     </div>
                     <div class="form-element">
@@ -355,7 +355,7 @@
                           duration-200
                           ease-in-out
                         "
-                        v-text="state.lastname"
+                        v-text="state.lastname || '---'"
                       />
                     </div>
                     <div class="form-element">
@@ -377,7 +377,7 @@
                           duration-200
                           ease-in-out
                         "
-                        v-text="state.email"
+                        v-text="state.email || '---'"
                       />
                     </div>
                     <div class="form-element">
@@ -399,7 +399,7 @@
                           duration-200
                           ease-in-out
                         "
-                        v-text="state.phone"
+                        v-text="state.phone || '---'"
                       />
                     </div>
                   </div>
@@ -639,51 +639,7 @@
       </div>
     </div>
     <!--  -->
-    <footer
+    <Footer></Footer>
-      class="
-        p-4
-        bg-white
-        rounded-lg
-        shadow
-        md:flex md:items-center md:justify-between md:p-6
-        dark:bg-gray-800
-      "
-    >
-      <span class="text-sm text-gray-500 sm:text-center dark:text-gray-400"
-        ><span class="font-bold">LfK! 2023</span> -
-        <a
-          class="underline"
-          href="https://odit.services/?ref=lfk"
-          target="_blank"
-          >powered by ODIT.Services</a
-        >
-      </span>
-      <ul
-        class="
-          flex flex-wrap
-          items-center
-          mt-3
-          text-sm text-gray-500
-          dark:text-gray-400
-          sm:mt-0
-        "
-      >
-        <li>
-          <a
-            href="https://lauf-fuer-kaya.de/impressum/"
-            class="mr-4 hover:underline md:mr-6"
-            >Impressum</a
-          >
-        </li>
-        <li>
-          <a
-            href="https://lauf-fuer-kaya.de/datenschutz/"
-            class="mr-4 hover:underline md:mr-6"
-            >Datenschutz</a
-          >
-        </li>
-      </ul>
-    </footer>
   </div>
 </template>
 
@@ -692,6 +648,7 @@ import { reactive } from "vue";
 import { TYPE, useToast } from "vue-toastification";
 import axios from "redaxios";
 import bwipjs from "bwip-js";
+import Footer from "@/components/Footer.vue";
 
 function textToBase64Barcode(text) {
   const canvas = document.createElement("canvas");

src/views/ProfileNone.vue

@@ -68,6 +68,7 @@
             </div>
         </div>
     </div>
+    <Footer></Footer>
 </template>
   
   <script setup>
@@ -77,6 +78,7 @@ import isEmail from 'validator/es/lib/isEmail';
 import isMobilePhone from 'validator/es/lib/isMobilePhone';
 import isPostalCode from 'validator/es/lib/isPostalCode';
 import { TYPE, useToast } from "vue-toastification";
+import Footer from "@/components/Footer.vue";
 
 let user_email = ref("");
 // 

src/views/Register.vue

@@ -389,13 +389,13 @@
               for="agb_accepted"
               class="font-medium text-gray-400 select-none"
             >
-              {{ $t("i_accept", { tos: $t("tos") }) }}
+              {{ $t("i_accept", { tos: $t("privacy_policy") }) }}
               <a
                 target="_blank"
                 rel="noreferrer,noopener"
                 href="https://lauf-fuer-kaya.de/datenschutz/"
                 class="underline"
-                >{{ $t("tos") }}</a
+                >{{ $t("privacy_policy") }}</a
               >
               {{ $t("i_accept_end") }}
               <span class="font-bold">*</span>
@@ -453,6 +453,7 @@
       </div>
     </div>
   </div>
+  <Footer></Footer>
 </template>
 
 <script setup>
@@ -462,6 +463,7 @@ import isEmail from "validator/es/lib/isEmail";
 import isMobilePhone from "validator/es/lib/isMobilePhone";
 import isPostalCode from "validator/es/lib/isPostalCode";
 import { TYPE, useToast } from "vue-toastification";
+import Footer from "@/components/Footer.vue";
 
 const props = defineProps({
   token: String,

src/views/Registered.vue

@@ -11,9 +11,11 @@
       </p>
     </div>
   </div>
+  <Footer></Footer>
 </template>
 
 <script setup>
+import Footer from "@/components/Footer.vue";
 const props = defineProps({
   mail: String,
 });