🚀Bumped version to v0.7.8

close #44

.drone.yml

@@ -25,23 +25,6 @@ type: kubernetes
 name: build:dev
 
 steps:
-  # - name: run full license export
-  #   depends_on: ["clone"]
-  #   image: node:alpine
-  #   commands:
-  #     - yarn
-  #     - yarn licenses:export
-  # - name: push new licenses file to repo
-  #   depends_on: ["run full license export"]
-  #   image: appleboy/drone-git-push
-  #   settings:
-  #     branch: dev
-  #     commit: true
-  #     commit_message: new license file version [CI SKIP]
-  #     author_email: bot@odit.services
-  #     remote: git@git.odit.services:lfk/selfservice.git
-  #     ssh_key:
-  #       from_secret: git_ssh
   - name: build dev
     image: plugins/docker
     depends_on: [clone]

CHANGELOG.md

@@ -2,8 +2,74 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [0.7.8](https://git.odit.services/lfk/selfservice/compare/0.7.7...0.7.8)
+
+- add barcode to profile [`851190e`](https://git.odit.services/lfk/selfservice/commit/851190e6a7f8b9cccbf05e60f9b50b96c196959c)
+- certificate generation: success toast styling [`1603a09`](https://git.odit.services/lfk/selfservice/commit/1603a097f71ed85c901baf8da04cb06b86474649)
+
+#### [0.7.7](https://git.odit.services/lfk/selfservice/compare/0.7.6...0.7.7)
+
+> 31 January 2023
+
+- 🚀Bumped version to v0.7.7 [`c2b6152`](https://git.odit.services/lfk/selfservice/commit/c2b615294e605db37695b13cec1158f535986911)
+- fix: registration w/o phone [`c647628`](https://git.odit.services/lfk/selfservice/commit/c64762831f1e6dffc9cbc3f531e23435b455a5a9)
+
+#### [0.7.6](https://git.odit.services/lfk/selfservice/compare/0.7.5...0.7.6)
+
+> 31 January 2023
+
+- update texts of pdf generation status toasts [`#44`](https://git.odit.services/lfk/selfservice/issues/44)
+- 🚀Bumped version to v0.7.6 [`9b446ab`](https://git.odit.services/lfk/selfservice/commit/9b446abc1fa231bb1f5a78c545400c617eaa4af5)
+- update release script [`5d974e5`](https://git.odit.services/lfk/selfservice/commit/5d974e562ed1ed5aeac579afe000c2dca945ff71)
+
+#### [0.7.5](https://git.odit.services/lfk/selfservice/compare/0.7.4...0.7.5)
+
+> 30 January 2023
+
+- fix: relativ links [`917cb6b`](https://git.odit.services/lfk/selfservice/commit/917cb6be340844bcc2318bf73cec37c3c831fd5d)
+- 🚀Bumped version to v0.7.5 [`1249248`](https://git.odit.services/lfk/selfservice/commit/1249248a9d3e0d72665bca6871a651f2491a4039)
+- 2023 [`9812d79`](https://git.odit.services/lfk/selfservice/commit/9812d79d4de820ce791f69634c5861f4f04ad7f1)
+- update nginx base [`0bd6d54`](https://git.odit.services/lfk/selfservice/commit/0bd6d543bf60b7a333b96d5d319269d4bf50db96)
+- updated base node image [`92d7bfd`](https://git.odit.services/lfk/selfservice/commit/92d7bfd59407273f86809b53ffc9f67fb8ba0ec7)
+- AGB link [`d159cb5`](https://git.odit.services/lfk/selfservice/commit/d159cb59be35f963abc89c42732ba6110d27830c)
+
+#### [0.7.4](https://git.odit.services/lfk/selfservice/compare/0.7.3...0.7.4)
+
+> 21 April 2021
+
+- Updated dronefile [`9c9ceaa`](https://git.odit.services/lfk/selfservice/commit/9c9ceaa6664f6ea21a536a12f04e552156e81da4)
+- 🚀Bumped version to v0.7.4 [`4663214`](https://git.odit.services/lfk/selfservice/commit/4663214ede3880386b5389885e32c953571290e6)
+
+#### [0.7.3](https://git.odit.services/lfk/selfservice/compare/0.7.2...0.7.3)
+
+> 21 April 2021
+
+- 🚀Bumped version to v0.7.3 [`602d80b`](https://git.odit.services/lfk/selfservice/commit/602d80bd14c4bd00a24b746be1e74d9e41af0445)
+- Merge pull request 'Button fixes bugfix/42-button_links' (#43) from bugfix/42-button_links into dev [`45ee4ab`](https://git.odit.services/lfk/selfservice/commit/45ee4ab81260adf5b938d9f5359d256cce879acb)
+- Removed useless register now button [`1102d29`](https://git.odit.services/lfk/selfservice/commit/1102d29c0e174b7a34fc4d3e6fe32d2dfb276765)
+- Fixed register button link [`020c310`](https://git.odit.services/lfk/selfservice/commit/020c310865912b8f0752069e1c7e2adf71ab9835)
+
+#### [0.7.2](https://git.odit.services/lfk/selfservice/compare/0.7.1...0.7.2)
+
+> 14 April 2021
+
+- 🚀Bumped version to v0.7.2 [`1a3af20`](https://git.odit.services/lfk/selfservice/commit/1a3af200dd41c8cc4271690ed72bef911901ce54)
+- Document generation hotfix 🐞 [`b74bea0`](https://git.odit.services/lfk/selfservice/commit/b74bea03401c672ae774aaddc6da5beb67e2890e)
+
+#### [0.7.1](https://git.odit.services/lfk/selfservice/compare/0.7.0...0.7.1)
+
+> 13 April 2021
+
+- Merge pull request 'bugfix/31-env-js-linking-ci' (#41) from bugfix/31-env-js-linking-ci into dev [`#31`](https://git.odit.services/lfk/selfservice/issues/31)
+- ⏫ dependency bump [`ad13bae`](https://git.odit.services/lfk/selfservice/commit/ad13bae068416bed10d00e6887a05d580a836482)
+- 🚀Bumped version to v0.7.1 [`b0172c5`](https://git.odit.services/lfk/selfservice/commit/b0172c500b0613209ac44e61023043065b3854b0)
+- added 'yarn postbuild' script for fixing env.js in dist/index.html [`51d058b`](https://git.odit.services/lfk/selfservice/commit/51d058bf966c3dcb064562e6bf696a748d0cd148)
+
 #### [0.7.0](https://git.odit.services/lfk/selfservice/compare/0.6.1...0.7.0)
 
+> 6 April 2021
+
+- 🚀Bumped version to v0.7.0 [`152e741`](https://git.odit.services/lfk/selfservice/commit/152e74190d13d30110d494a9062f868390ca19b3)
 - Merge pull request 'Donation list feature/39-donation_list' (#40) from feature/39-donation_list into dev [`4c83e2e`](https://git.odit.services/lfk/selfservice/commit/4c83e2e738a075354383dca4d500808f761247d2)
 - Added total to bottom of page [`89820d4`](https://git.odit.services/lfk/selfservice/commit/89820d44501793365248b8e778522cdc188afa70)
 - Sorted translations 🌍 [`cb1b9d3`](https://git.odit.services/lfk/selfservice/commit/cb1b9d330b28f11cceed9691aee4ccee5246d346)

Dockerfile

@@ -1,9 +1,10 @@
-FROM node:15.9.0-alpine3.13
+FROM registry.odit.services/hub/library/node:15.9.0-alpine3.13
 WORKDIR /app
 COPY . .
 RUN yarn
 RUN yarn build
+RUN yarn postbuild
 # final image
-FROM fholzer/nginx-brotli:v1.19.1
+FROM registry.odit.services/library/nginx-brotli:3.15
 COPY --from=0 /app/dist /usr/share/nginx/html
 COPY ./nginx.conf /etc/nginx/nginx.conf

env_fix.js

@@ -0,0 +1,6 @@
+const fs = require('fs');
+if (fs.existsSync('./dist/index.html')) {
+	const content = fs.readFileSync('./dist/index.html', { encoding: 'utf8' });
+	const newcontent = content.replace(`"/env.js"`, `"./env.js"`);
+	fs.writeFileSync('./dist/index.html', newcontent);
+}

package.json

@@ -1,17 +1,19 @@
 {
 	"name": "@odit/lfk-selfservice",
-	"version": "0.7.0",
+	"version": "0.7.8",
 	"scripts": {
 		"dev": "vite",
 		"build": "vite build",
-		"release": "release-it --only-version"
+		"release": "release-it",
+		"postbuild": "node env_fix.js"
 	},
 	"dependencies": {
-		"marked": "2.0.1",
+		"jsbarcode": "^3.11.5",
+		"marked": "2.0.3",
 		"redaxios": "0.4.1",
 		"toastify-js": "1.10.0",
 		"validator": "13.5.2",
-		"vue-i18n": "9.0.0",
+		"vue-i18n": "9.1.4",
 		"vue-toastification": "2.0.0-rc.1",
 		"vue": "3.0.9",
 		"vue-router": "4.0.5"
@@ -23,10 +25,10 @@
 		"@tailwindcss/line-clamp": "0.2.0",
 		"@tailwindcss/typography": "0.4.0",
 		"@vitejs/plugin-vue": "1.2.1",
-		"@vue/compiler-sfc": "3.0.10",
+		"@vue/compiler-sfc": "3.0.11",
 		"autoprefixer": "10.2.5",
-		"tailwindcss": "2.0.4",
+		"tailwindcss": "2.1.1",
-		"release-it": "14.5.0",
+		"release-it": "14.6.1",
 		"vite": "2.1.5"
 	},
 	"release-it": {
@@ -35,7 +37,7 @@
 			"requireCleanWorkingDir": false,
 			"commitMessage": "🚀Bumped version to v${version}",
 			"requireBranch": "dev",
-			"push": false,
+			"push": true,
 			"tag": true,
 			"tagName": null,
 			"tagAnnotation": "v${version}"

public/env.sample.js

@@ -5,6 +5,8 @@ const config = {
 	baseurl: '',
 	// optional, will fallback to /selfservice/
 	baseurl_selfservice: '/selfservice/',
+	// full url (including fqdn)
+	baseurl_documentserver: 'http://localhost:4010/documents',
 	// optional, will fallback to baseurl_selfservice/imprint
 	url_imprint: '',
 	// optional, will fallback to baseurl_selfservice/privacy

src/components/Footer.vue

@@ -2,7 +2,7 @@
   <footer class="text-gray-400 bg-gray-900 body-font">
     <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 © 2021 + proudly powered by
+        Lauf für Kaya! Selfservice - Copyright © 2023 + proudly powered by
         <a
           class="underline"
           target="_blank"

src/components/Login.vue

@@ -29,7 +29,7 @@
               placeholder="Passwort"
             />
             <div class="absolute inset-y-0 right-0 pr-3 flex items-center text-sm">
-              <a href="./reset" class="text-gray-900 underline">Passwort vergessen?</a>
+              <a href="/selfservice/reset" class="text-gray-900 underline">Passwort vergessen?</a>
             </div>
           </div>
         </div>
@@ -80,7 +80,7 @@
         </div>
         <div class="mt-6">
           <a
-            href="./register"
+            href="/selfservice/register"
             class="block w-full text-center py-2 px-3 border border-gray-300 rounded-md font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm"
           >Account erstellen</a>
         </div>
@@ -101,7 +101,7 @@ function login() {
   axios.get("").then((res) => {
     loading.value = false;
     Toastify({
-      text: "This is a toast",
+      text: "Login läuft...",
       duration: 3000,
     }).showToast();
   });

src/components/LoginForm.vue

@@ -29,7 +29,7 @@
               placeholder="Passwort"
             />
             <div class="absolute inset-y-0 right-0 pr-3 flex items-center text-sm">
-              <a href="./reset" class="text-gray-900 underline">Passwort vergessen?</a>
+              <a href="/selfservice/reset" class="text-gray-900 underline">Passwort vergessen?</a>
             </div>
           </div>
         </div>
@@ -80,7 +80,7 @@
         </div>
         <div class="mt-6">
           <a
-            href="./register"
+            href="/selfservice/register"
             class="block w-full text-center py-2 px-3 border border-gray-300 rounded-md font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm"
           >Account erstellen</a>
         </div>
@@ -101,7 +101,7 @@ function login() {
   axios.get("").then((res) => {
     loading.value = false;
     Toastify({
-      text: "This is a toast",
+      text: "Login läuft...",
       duration: 3000,
     }).showToast();
   });

src/locales/de.json

@@ -38,11 +38,12 @@
     "profile": "Profil",
     "provide_address": "Adresse angeben?",
     "register": {
-        "register_now": "Jetzt für den Lauf für Kaya! 2021 registrieren."
+        "register_now": "Jetzt für den Lauf für Kaya! 2023 registrieren."
     },
     "register_now": "Jetzt registrieren!",
     "register_now_small": "Jetzt registrieren",
     "registrieren": "Registrieren",
+    "registrierungscode": "Registrierungscode",
     "resend_the_registration_mail": "Registrierungsmail erneut versenden",
     "save_changes": "Änderungen speichern",
     "sponsoring": "Sponsoring",

src/locales/en.json

@@ -38,7 +38,7 @@
     "profile": "Profile",
     "provide_address": "Provide a postal address?",
     "register": {
-        "register_now": "Register now for Lauf für Kaya! 2021."
+        "register_now": "Register now for Lauf für Kaya! 2023."
     },
     "register_now": "Register now!",
     "register_now_small": "Register now",

src/views/Home.vue

@@ -11,10 +11,10 @@
         <div class="mt-6 sm:flex place-content-center">
           <a
             class="w-full sm:w-auto inline-flex px-6 py-3 border border-transparent text-base font-semibold rounded-md text-gray-900 bg-white shadow-sm hover:text-gray-600 focus:outline-none focus:text-gray-600 transition ease-in-out duration-150 xl:text-lg xl:py-4"
-            href="./register/"
+            href="/selfservice/register/"
           >{{ $t('register_now') }}</a>
           <a
-            href="./profile/"
+            href="/selfservice/profile/"
             class="mt-4 sm:ml-4 sm:mt-0 w-full sm:w-auto inline-flex px-6 py-3 border border-transparent text-base font-semibold rounded-md text-white bg-gray-800 shadow-sm hover:bg-gray-700 focus:outline-none focus:bg-gray-700 transition ease-in-out duration-150 xl:text-lg xl:py-4"
           >{{ $t('view_my_data') }}</a>
         </div>

src/views/Profile.vue

@@ -153,6 +153,8 @@
                 <form class="form flex flex-wrap w-full">
                   <div class="w-full">
                     <div class="form-element">
+                      <div class="text-lg">{{ $t('registrierungscode') }}</div>
+                      <img alt="Registrierungscode" :src="state.barcode">
                       <div class="text-lg">{{ $t('vorname') }}</div>
                       <p
                         class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
@@ -327,10 +329,18 @@
 
 <script setup>
 import { reactive } from "vue";
-import { useToast } from "vue-toastification";
+import { TYPE, useToast } from "vue-toastification";
 import axios from "redaxios";
+import JsBarcode from "jsbarcode";
+
+function textToBase64Barcode(text){
+  var canvas = document.createElement("canvas");
+  JsBarcode(canvas, text, {format: "CODE128", displayValue:false});
+  return canvas.toDataURL("image/png");
+}
 
 const state = reactive({
+  barcode: "",
   phone: "",
   email: "",
   firstname: "",
@@ -358,8 +368,9 @@ axios.get(`${config.baseurl}api/runners/me/${accesstoken}`)
     state.group = data.group;
     state.sponsorings = data.distanceDonations;
     state.fullobject = data;
+    state.barcode = textToBase64Barcode(state.fullobject.id);
   }).catch((error) => {
-    toast.error("An error occured while loading your profile data");
+    toast.error("Profil konnte nicht geladen werden...");
   })
 axios.get(`${config.baseurl}api/runners/me/${accesstoken}/scans`)
   .then(({ data }) => {
@@ -371,24 +382,24 @@ axios.get(`${config.baseurl}api/runners/me/${accesstoken}/scans`)
     data.filter(s => s.valid === true);
     state.scans = data;
   }).catch((error) => {
-    toast.error("An error occured while loading your profile data");
+    toast.error("Profil konnte nicht geladen werden...");
   })
 function delete_me() {
-  toast("Deletion in progress...");
+  toast("Profil wird gelöscht...");
   let url = `${config.baseurl}api/runners/me/${accesstoken}?force=true`
   axios.delete(url)
     .then(() => {
-      toast("All Data deleted!");
+      toast("Alle Daten gelöscht!");
       location.replace(`${config.baseurl_selfservice}`);
     })
     .catch((error) => {
-      toast.error("An error occured while deleting your profile data");
+      toast.error("Profil konnte nicht gelöscht werden...");
     });
 }
 function get_certificate() {
-  toast("Generation in progress...");
+  toast("Urkunde wird generiert...");
   const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
-  let url = `${config.baseurl}documents/certificates?locale=${browserlocale}&download=true&key=${config.documentserver_key}`;
+  let url = `${config.baseurl_documentserver}certificates?locale=${browserlocale}&download=true&key=${config.documentserver_key}`;
   let postdata = Object.assign({}, state.fullobject);
   postdata.group = {
     name: postdata.group
@@ -400,7 +411,7 @@ function get_certificate() {
     .then((response) => {
       console.log(response)
       if (response.status != "200") {
-        toast.error("An error occured while generateing your certificate!");
+        toast.error("Urkunde konnte nicht generiert werden...");
       } else {
         var fileURL = window.URL.createObjectURL(new Blob([response.data], { type: 'application/pdf' }));
         var fileLink = document.createElement('a');
@@ -411,12 +422,12 @@ function get_certificate() {
 
         fileLink.click();
         fileLink.remove();
-        toast("Document generated!");
+        toast("Urkunde generiert!",{type:TYPE.SUCCESS});
       }
     })
     .catch((err) => {
       console.error(err);
-      toast.error("An error occured while deleting your profile data");
+      toast.error("An error occured while generating your certificate");
     });
 }
 </script>

src/views/ProfileNone.vue

@@ -61,7 +61,7 @@
                 </div>
                 <div class="mt-2">
                     <a
-                        href="./register/"
+                        href="/selfservice/register/"
                         class="text-white block w-full text-center py-2 px-3 border-2 border-gray-300 rounded-md p-1 bg-blue-800 font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm"
                     >{{ $t('register_now_small') }}</a>
                 </div>
@@ -88,16 +88,16 @@ const state = reactive({
 const toast = useToast();
 function resendMail() {
     if (isEmail(user_email.value)) {
-        toast("sending password reset mail...");
+        toast("Login-Link wird angefordert...");
         const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
         axios.post(`${config.baseurl}api/runners/forgot?mail=${user_email.value}&locale=${browserlocale}`)
             .then(({ data }) => {
                 console.log(data);
-                toast("sent password reset mail to " + user_email.value + "!");
+                toast("Login-Link gesendet an " + user_email.value + "!");
             })
             .catch((error) => {
                 console.log(error);
-                toast("user does not exist...");
+                toast("Fehler beim Anfordern des Login-Links...");
             });
     }
 }

src/views/Register.vue

@@ -200,7 +200,7 @@
               <a
                 target="_blank"
                 rel="noreferrer,noopener"
-                href
+                href="https://lauf-fuer-kaya.de/datenschutz/"
                 class="underline"
               >{{ $t('tos') }}</a>
               {{ $t('i_accept_end') }}
@@ -234,22 +234,6 @@
           >{{ $t('registrieren') }}</button>
         </div>
       </div>
-      <div class="mt-6">
-        <div class="relative">
-          <div class="absolute inset-0 flex items-center">
-            <div class="w-full border-t border-gray-300"></div>
-          </div>
-          <div class="relative flex justify-center text-sm">
-            <span class="px-2 bg-white dark:bg-gray-900">{{ $t('already_have_an_account') }}</span>
-          </div>
-        </div>
-        <div class="mt-6">
-          <a
-            href="./login"
-            class="block w-full text-center py-2 px-3 border-2 border-gray-300 rounded-md p-1 dark:bg-gray-800 font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm"
-          >{{ $t('go_to_login') }}</a>
-        </div>
-      </div>
     </div>
   </div>
 </template>
@@ -293,7 +277,7 @@ const state = reactive({
 const toast = useToast();
 function login() {
   userdetails = userdetails.value;
-  if (userdetails.phone === "" || isMobilePhone(userdetails.phone)) {
+  if (userdetails?.phone === "" || isMobilePhone(userdetails.phone)) {
     if (isEmail(userdetails.mail)) {
       let postdata = {
         "email": userdetails.mail,
@@ -317,7 +301,7 @@ function login() {
       if (state.org_name !== '' && state.org_teams.length > 0) {
         postdata.team = org_team.value;
       }
-      toast("registration in progress...");
+      toast("Registrierung läuft...");
       const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
       let url = `${config.baseurl}api/runners/register/?locale=${browserlocale}`;
       if (props.token) {