🚀Bumped version to v0.8.3

Reviewed-on: #47

CHANGELOG.md

@@ -2,10 +2,63 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [0.8.3](https://git.odit.services/lfk/selfservice/compare/0.8.2...0.8.3)
+
+- fix: registration code (broke in merge) [`123509d`](https://git.odit.services/lfk/selfservice/commit/123509d0a6d15fe254e28f7a316bd6c260fe7bd2)
+- wip: fix registration code [`51f8d0f`](https://git.odit.services/lfk/selfservice/commit/51f8d0fb42d0dbba268799eb9385686d22fd2284)
+
+#### [0.8.2](https://git.odit.services/lfk/selfservice/compare/0.8.1...0.8.2)
+
+> 3 February 2023
+
+- move /registered/ to props [`c35f943`](https://git.odit.services/lfk/selfservice/commit/c35f943957e5ba84361a437c1d945331248746d1)
+- 🚀Bumped version to v0.8.2 [`f4d1c7b`](https://git.odit.services/lfk/selfservice/commit/f4d1c7b053d1e7210911772bde1b2d80a30ab225)
+- /profile/ text cleanups [`64e6ef8`](https://git.odit.services/lfk/selfservice/commit/64e6ef8cec38a8193c4fb28c5f1b26ee0e4d5063)
+- /profile/ move from anchor tag to button [`ac75828`](https://git.odit.services/lfk/selfservice/commit/ac75828309043532c6ab8aad63e0c40edf450459)
+- /profile/ toast styles [`c7f3a89`](https://git.odit.services/lfk/selfservice/commit/c7f3a893af8705af12f2e7ae7e40197ca4c28666)
+- /profile/ dont instantly show mail format error [`ab9b400`](https://git.odit.services/lfk/selfservice/commit/ab9b400fff1b421a41dd27479a81fb5e3740b9ef)
+- /profile/ autocomplete mail [`30fd7ea`](https://git.odit.services/lfk/selfservice/commit/30fd7ead0833b0b3ab4e5509608aa92112151380)
+
+#### [0.8.1](https://git.odit.services/lfk/selfservice/compare/0.8.0...0.8.1)
+
+> 2 February 2023
+
+- 🚀Bumped version to v0.8.1 [`292e440`](https://git.odit.services/lfk/selfservice/commit/292e44057aee9ef57a51aa9fa0372c3678b81de0)
+- Adjusted button text [`20fca67`](https://git.odit.services/lfk/selfservice/commit/20fca6794dd7e0c714cd09c80a68b1d3592ab09c)
+- Switched request login link api path to login (backend v13.0.0) [`8139d63`](https://git.odit.services/lfk/selfservice/commit/8139d637151c8c0184e4a98f151991b429d0a70c)
+
+#### [0.8.0](https://git.odit.services/lfk/selfservice/compare/0.7.11...0.8.0)
+
+> 2 February 2023
+
+- 🚀Bumped version to v0.8.0 [`7051909`](https://git.odit.services/lfk/selfservice/commit/7051909bf960fb44b43e979ac4d304dff9ef2ec4)
+- Merge pull request 'dont autologin on register -> require mail link' (#47) from feature/46-dont-autologin-on-register-require-mail-link into dev [`f7a0682`](https://git.odit.services/lfk/selfservice/commit/f7a0682c3392b8882be4a676882c8a49d55bd5fe)
+- add /registered/?mail route [`eb20b54`](https://git.odit.services/lfk/selfservice/commit/eb20b547e79d352f3b7cd1b5ce7b7dbfcf8c19f7)
+
+#### [0.7.11](https://git.odit.services/lfk/selfservice/compare/0.7.10...0.7.11)
+
+> 2 February 2023
+
+- Profile: improved mobile responsiveness/ design + toast clear [`077b33f`](https://git.odit.services/lfk/selfservice/commit/077b33f03180d0bd6c45becaaa63d3408c645deb)
+- 🚀Bumped version to v0.7.11 [`c63adf5`](https://git.odit.services/lfk/selfservice/commit/c63adf557bcb29c8eccc05d5a83d476c75380d95)
+- fix: registration code download button style [`52a6b3d`](https://git.odit.services/lfk/selfservice/commit/52a6b3dc776b806eaa8fee058a1c381ab63a8ea5)
+
+#### [0.7.10](https://git.odit.services/lfk/selfservice/compare/0.7.9...0.7.10)
+
+> 1 February 2023
+
+- Configureable barcode format via bwp-js [`9e06c46`](https://git.odit.services/lfk/selfservice/commit/9e06c464118c5b5d0cd78c8b8379523bf3bfdbd4)
+- Added download for registration code [`53800b4`](https://git.odit.services/lfk/selfservice/commit/53800b4fa355bb972e51e71b5b1f98772deed114)
+- 🚀Bumped version to v0.7.10 [`8b5e1ca`](https://git.odit.services/lfk/selfservice/commit/8b5e1cac1353373b13cf9d570deb7cadcd437247)
+- Pinned version [`6438288`](https://git.odit.services/lfk/selfservice/commit/64382880c40ba5c1e3c9004ce7fc65099849cd44)
+
 #### [0.7.9](https://git.odit.services/lfk/selfservice/compare/0.7.8...0.7.9)
 
+> 1 February 2023
+
 - migrate to bwip-js [`8cfddb5`](https://git.odit.services/lfk/selfservice/commit/8cfddb502964be7edf45cdc524344ea2f7f20142)
 - fix codeconfig.height [`9b261bf`](https://git.odit.services/lfk/selfservice/commit/9b261bf20023561a7c9691dff33c9a6d2b5c0cac)
+- 🚀Bumped version to v0.7.9 [`debbd92`](https://git.odit.services/lfk/selfservice/commit/debbd9219cb53dbd48cf0cb7bee329b765ce4647)
 - drop jsbarcode [`713dd15`](https://git.odit.services/lfk/selfservice/commit/713dd153126851e8cf1045bf5ba3ca702a39c738)
 
 #### [0.7.8](https://git.odit.services/lfk/selfservice/compare/0.7.7...0.7.8)

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@odit/lfk-selfservice",
-	"version": "0.7.9",
+	"version": "0.8.3",
 	"scripts": {
 		"dev": "vite",
 		"build": "vite build",
@@ -8,7 +8,7 @@
 		"postbuild": "node env_fix.js"
 	},
 	"dependencies": {
-		"bwip-js": "^3.2.2",
+		"bwip-js": "3.2.2",
 		"marked": "2.0.3",
 		"redaxios": "0.4.1",
 		"toastify-js": "1.10.0",

public/env.sample.js

@@ -12,5 +12,5 @@ const config = {
 	// optional, will fallback to baseurl_selfservice/imprint
 	url_imprint: '',
 	// optional, will fallback to baseurl_selfservice/privacy
-	url_privacy: ''
+	url_privacy: '',
 };

src/locales/de.json

@@ -1,5 +1,5 @@
 {
-    "access_is_only_provided_via_your_email_link": "Der Zugang erfolgt nur über den Link, den Sie bei der Registrierung erhalten haben.",
+    "access_is_only_provided_via_your_email_link": "Der Zugang erfolgt über den Link, den Sie bei der Registrierung erhalten haben.",
     "already_have_an_account": "Sie haben bereits einen Account?",
     "amount_per_kilometer_in_eur": "Betrag pro Kilometer (in €)",
     "apartment_suite_etc": "Addresszeile 2",
@@ -13,6 +13,7 @@
     "deletion_in_progress": "Daten werden gelöscht...",
     "distance": "Distanz",
     "download_certificate": "Urkunde herunterladen",
+    "download_registrationcode": "Registrierungscode herunterladen",
     "e_mail_adress": "E-Mail Adresse",
     "go_to_login": "Zum Login",
     "i_accept": "Ich habe die ",
@@ -21,7 +22,7 @@
     "imprint": "Impressum",
     "lap_time": "Rundenzeit",
     "lap_times": "Rundenzeiten",
-    "lost_your_registration_mail": "Haben Sie Ihre Registrierungsmail verloren?",
+    "lost_your_registration_mail": "Brauchen Sie einen neuen Login-Link?",
     "main_page_text": "Hier können Sie sich für den Lauf Für Kaya! registrieren oder ihr Läuferprofil verwalten.",
     "mittelname": "Mittelname",
     "nachname": "Nachname",
@@ -44,7 +45,7 @@
     "register_now_small": "Jetzt registrieren",
     "registrieren": "Registrieren",
     "registrierungscode": "Registrierungscode",
-    "resend_the_registration_mail": "Registrierungsmail erneut versenden",
+    "resend_the_registration_mail": "Login-Link anfordern",
     "save_changes": "Änderungen speichern",
     "sponsoring": "Sponsoring",
     "strasse": "Straße",

src/locales/en.json

@@ -13,6 +13,7 @@
     "deletion_in_progress": "Deletion in progress...",
     "distance": "Distance",
     "download_certificate": "Download certificate",
+    "download_registrationcode": "Download registrationcode",
     "e_mail_adress": "mail address",
     "go_to_login": "Go To Login",
     "i_accept": "I have read and accepted the ",
@@ -43,7 +44,7 @@
     "register_now": "Register now!",
     "register_now_small": "Register now",
     "registrieren": "Register Now",
-    "resend_the_registration_mail": "Resend the registration mail",
+    "resend_the_registration_mail": "Send me a login link",
     "save_changes": "Save changes",
     "sponsoring": "Sponsoring",
     "strasse": "Street/ Block",

src/routes.js

@@ -3,6 +3,7 @@ import Home from './views/Home.vue';
 import Imprint from './views/Imprint.vue';
 import Privacy from './views/Privacy.vue';
 import Register from './views/Register.vue';
+import Registered from './views/Registered.vue';
 import Profile from './views/Profile.vue';
 import ProfileNone from './views/ProfileNone.vue';
 
@@ -17,6 +18,7 @@ export const routes = [
 	{ path: config.baseurl_selfservice + 'privacy/', component: Privacy },
 	{ path: config.baseurl_selfservice + 'register', component: Register },
 	{ path: config.baseurl_selfservice + 'register/', component: Register },
+	{ path: config.baseurl_selfservice + 'registered/:mail', component: Registered, props: true },
 	{ path: config.baseurl_selfservice + 'register/:token', component: Register, props: true },
 	{ path: config.baseurl_selfservice + 'profile', component: Profile },
 	{ path: config.baseurl_selfservice + 'profile/', component: ProfileNone },

src/views/Profile.vue

@@ -38,6 +38,46 @@
                 rounded-md
                 bg-blue-500
                 hover:bg-blue-600 hover:shadow-lg
+                w-full
+                md:w-auto
+                mb-1
+                md:mr-1
+              "
+              @click="get_registration"
+            >
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                width="24"
+                height="24"
+                viewBox="0 0 24 24"
+                fill="none"
+                stroke="currentColor"
+                stroke-width="2"
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                class="feather feather-download"
+                style="display: inline; height: 1rem; vertical-align: sub"
+              >
+                <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />
+                <polyline points="7 10 12 15 17 10" />
+                <line x1="12" y1="15" x2="12" y2="3" />
+              </svg>
+              {{ $t("download_registrationcode") }}
+            </button>
+            <button
+              type="button"
+              class="
+                focus:border-black focus:ring-2 focus:ring-black
+                text-white text-sm
+                py-2.5
+                px-5
+                rounded-md
+                bg-blue-500
+                hover:bg-blue-600 hover:shadow-lg
+                w-full
+                md:w-auto
+                mb-1
+                md:mr-1
               "
               @click="get_certificate"
             >
@@ -70,7 +110,8 @@
                 rounded-md
                 bg-red-600
                 hover:bg-red-700 hover:shadow-lg
-                ml-1
+                w-full
+                md:w-auto
               "
               @click="
                 () => {
@@ -599,17 +640,18 @@ import bwipjs from "bwip-js";
 function textToBase64Barcode(text) {
   const canvas = document.createElement("canvas");
   let codeconfig = {
-    bcid: config.code_format || "code128",
+    bcid: config.code_format || "code39",
-    text: `${text}` || "?",
+    text: `${text}`,
     scale: 3,
     includetext: false,
+    textxalign: "center",
+    backgroundcolor: "ffffff",
   };
-  if (codeconfig.bcid === "code128" || codeconfig.bcid === "ean13") {
+  if (codeconfig.bcid === "code39" || codeconfig.bcid === "code128"|| codeconfig.bcid === "ean13") {
-    codeconfig.height = 10; // bar height in mm
+    codeconfig.height = 10;
   }
   bwipjs.toCanvas(canvas, codeconfig);
-  const base64 = canvas.toDataURL("image/png");
+  return canvas.toDataURL("image/png");
-  return base64;
 }
 
 const state = reactive({
@@ -642,9 +684,10 @@ axios
     state.group = data.group;
     state.sponsorings = data.distanceDonations;
     state.fullobject = data;
-    state.barcode = textToBase64Barcode(data.id);
+    state.barcode = textToBase64Barcode(data.id ?? "???");
   })
   .catch((error) => {
+    toast.clear();
     toast.error("Profil konnte nicht geladen werden...");
   });
 axios
@@ -670,15 +713,18 @@ axios
     toast.error("Profil konnte nicht geladen werden...");
   });
 function delete_me() {
+  toast.clear();
   toast("Profil wird gelöscht...");
   let url = `${config.baseurl}api/runners/me/${accesstoken}?force=true`;
   axios
     .delete(url)
     .then(() => {
+      toast.clear();
       toast("Alle Daten gelöscht!");
       location.replace(`${config.baseurl_selfservice}`);
     })
     .catch((error) => {
+      toast.clear();
       toast.error("Profil konnte nicht gelöscht werden...");
     });
 }
@@ -714,12 +760,24 @@ function get_certificate() {
 
         fileLink.click();
         fileLink.remove();
+        toast.clear();
         toast("Urkunde generiert!", { type: TYPE.SUCCESS });
       }
     })
     .catch((err) => {
       console.error(err);
-      toast.error("An error occured while generating your certificate");
+      toast.clear();
+      toast.error("Urkunde konnte nicht generiert werden...");
     });
 }
+function get_registration() {
+  toast.clear();
+  toast("Registrierungscode wird generiert...");
+  var a = document.createElement("a");
+  a.href = state.barcode;
+  a.download = "LfK23_Registrierungscode.png";
+  a.click();
+  toast.clear();
+  toast("Registrierungscode generiert!", { type: TYPE.SUCCESS });
+}
 </script>

src/views/ProfileNone.vue

@@ -6,8 +6,8 @@
                 class="sm:text-3xl text-2xl font-medium title-font mb-4 text-center"
             >Lauf für Kaya! - {{ $t('profile') }}</h1>
             <p class="mx-auto leading-relaxed text-base text-center">
-                {{ $t('you_have_not_provided_a_valid_access_key') }}
+                <!-- {{ $t('you_have_not_provided_a_valid_access_key') }}
-                <br />
+                <br /> -->
                 {{ $t('access_is_only_provided_via_your_email_link') }}
             </p>
             <div class="mt-6">
@@ -30,24 +30,24 @@
                         v-model="user_email"
                         name="email_address"
                         id="email_address"
-                        autocomplete="off"
+                        autocomplete="email"
                         :placeholder="[[$t('e_mail_adress')]]"
                         type="email"
                         :class="{ 'border-red-500': (!isEmail(user_email)), 'border-green-300': (isEmail(user_email)) }"
                         class="dark:bg-gray-800 mt-1 block w-full shadow-sm sm:text-sm border-2 bg-gray-50 text-gray-500 rounded-md p-2"
                     />
                     <p
-                        v-if="!isEmail(user_email)"
+                        v-if="!isEmail(user_email)&&user_email!==''"
                         class="text-sm"
                     >{{ $t('please_provide_valid_mail') }}</p>
                 </div>
                 <div class="mt-2">
-                    <a
+                    <button
                         :disabled="(!state.submit_enabled)"
                         :class="{ 'opacity-50': (!state.submit_enabled), 'cursor-not-allowed': (!state.submit_enabled) }"
                         @click="resendMail"
                         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('resend_the_registration_mail') }}</a>
+                    >{{ $t('resend_the_registration_mail') }}</button>
                 </div>
             </div>
             <div class="mt-12">
@@ -76,7 +76,7 @@ import axios from "redaxios";
 import isEmail from 'validator/es/lib/isEmail';
 import isMobilePhone from 'validator/es/lib/isMobilePhone';
 import isPostalCode from 'validator/es/lib/isPostalCode';
-import { useToast } from "vue-toastification";
+import { TYPE, useToast } from "vue-toastification";
 
 let user_email = ref("");
 // 
@@ -90,14 +90,14 @@ function resendMail() {
     if (isEmail(user_email.value)) {
         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}`)
+        axios.post(`${config.baseurl}api/runners/login?mail=${user_email.value}&locale=${browserlocale}`)
             .then(({ data }) => {
                 console.log(data);
                 toast("Login-Link gesendet an " + user_email.value + "!");
             })
             .catch((error) => {
                 console.log(error);
-                toast("Fehler beim Anfordern des Login-Links...");
+                toast("Fehler beim Anfordern des Login-Links...", { type: TYPE.ERROR });
             });
     }
 }

src/views/Register.vue

@@ -308,10 +308,8 @@ function login() {
         url = `${config.baseurl}api/runners/register/${props.token}/?locale=${browserlocale}`
       }
       axios.post(url, postdata)
-        .then(({ data }) => {
+        .then(() => {
-          const token = btoa(data.token);
+          location.replace(`${config.baseurl_selfservice}registered/?mail=${encodeURIComponent(postdata.email)}`);
-          // alert(token);
-          location.replace(`${config.baseurl_selfservice}profile/${token}`);
         })
         .catch((error) => {
           console.log(error);

src/views/Registered.vue

@@ -0,0 +1,20 @@
+<template>
+  <div class="min-h-screen flex items-center justify-center">
+    <div class="max-w-md w-full py-12 px-6">
+      <img class="mx-auto h-24 w-auto" src="/favicon.png" alt />
+      <h1 class="sm:text-3xl text-2xl font-medium title-font mb-4 text-center">
+        Lauf für Kaya! - Registriert
+      </h1>
+      <p class="mx-auto leading-relaxed text-base text-center">
+        Bitte klicken Sie zum Fortfahren auf den Link, den wir an
+        <b class="font-bold">{{ $props.mail }}</b> geschickt haben.
+      </p>
+    </div>
+  </div>
+</template>
+
+<script setup>
+const props = defineProps({
+  mail: String,
+});
+</script>