Merge pull request 'dont autologin on register -> require mail link' (#47) from feature/46-dont-autologin-on-register-require-mail-link into dev

Reviewed-on: #47

CHANGELOG.md

@@ -2,10 +2,27 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [0.7.11](https://git.odit.services/lfk/selfservice/compare/0.7.10...0.7.11)
+
+- Profile: improved mobile responsiveness/ design + toast clear [`077b33f`](https://git.odit.services/lfk/selfservice/commit/077b33f03180d0bd6c45becaaa63d3408c645deb)
+- 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,52 +1,52 @@
-{
+{
-	"name": "@odit/lfk-selfservice",
+	"name": "@odit/lfk-selfservice",
-	"version": "0.7.9",
+	"version": "0.7.11",
-	"scripts": {
+	"scripts": {
-		"dev": "vite",
+		"dev": "vite",
-		"build": "vite build",
+		"build": "vite build",
-		"release": "release-it",
+		"release": "release-it",
-		"postbuild": "node env_fix.js"
+		"postbuild": "node env_fix.js"
-	},
+	},
-	"dependencies": {
+	"dependencies": {
-		"bwip-js": "^3.2.2",
+		"bwip-js": "3.2.2",
-		"marked": "2.0.3",
+		"marked": "2.0.3",
-		"redaxios": "0.4.1",
+		"redaxios": "0.4.1",
-		"toastify-js": "1.10.0",
+		"toastify-js": "1.10.0",
-		"validator": "13.5.2",
+		"validator": "13.5.2",
-		"vue-i18n": "9.1.4",
+		"vue-i18n": "9.1.4",
-		"vue-toastification": "2.0.0-rc.1",
+		"vue-toastification": "2.0.0-rc.1",
-		"vue": "3.0.9",
+		"vue": "3.0.9",
-		"vue-router": "4.0.5"
+		"vue-router": "4.0.5"
-	},
+	},
-	"devDependencies": {
+	"devDependencies": {
-		"@tailwindcss/jit": "0.1.18",
+		"@tailwindcss/jit": "0.1.18",
-		"@tailwindcss/aspect-ratio": "0.2.0",
+		"@tailwindcss/aspect-ratio": "0.2.0",
-		"@tailwindcss/forms": "0.3.2",
+		"@tailwindcss/forms": "0.3.2",
-		"@tailwindcss/line-clamp": "0.2.0",
+		"@tailwindcss/line-clamp": "0.2.0",
-		"@tailwindcss/typography": "0.4.0",
+		"@tailwindcss/typography": "0.4.0",
-		"@vitejs/plugin-vue": "1.2.1",
+		"@vitejs/plugin-vue": "1.2.1",
-		"@vue/compiler-sfc": "3.0.11",
+		"@vue/compiler-sfc": "3.0.11",
-		"autoprefixer": "10.2.5",
+		"autoprefixer": "10.2.5",
-		"tailwindcss": "2.1.1",
+		"tailwindcss": "2.1.1",
-		"release-it": "14.6.1",
+		"release-it": "14.6.1",
-		"vite": "2.1.5"
+		"vite": "2.1.5"
-	},
+	},
-	"release-it": {
+	"release-it": {
-		"git": {
+		"git": {
-			"commit": true,
+			"commit": true,
-			"requireCleanWorkingDir": false,
+			"requireCleanWorkingDir": false,
-			"commitMessage": "🚀Bumped version to v${version}",
+			"commitMessage": "🚀Bumped version to v${version}",
-			"requireBranch": "dev",
+			"requireBranch": "dev",
-			"push": true,
+			"push": true,
-			"tag": true,
+			"tag": true,
-			"tagName": null,
+			"tagName": null,
-			"tagAnnotation": "v${version}"
+			"tagAnnotation": "v${version}"
-		},
+		},
-		"npm": {
+		"npm": {
-			"publish": false
+			"publish": false
-		},
+		},
-		"hooks": {
+		"hooks": {
-			"after:bump": "npx auto-changelog --commit-limit false -p -u --hide-credit && git add CHANGELOG.md && node order_i18n.js  && git add src/locales"
+			"after:bump": "npx auto-changelog --commit-limit false -p -u --hide-credit && git add CHANGELOG.md && node order_i18n.js  && git add src/locales"
-		}
+		}
-	}
+	}
-}
+}

public/env.sample.js

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

src/locales/de.json

@@ -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 ",

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 ",

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/', component: Registered },
 	{ 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="
                 () => {
@@ -597,19 +638,18 @@ import axios from "redaxios";
 import bwipjs from "bwip-js";
 
 function textToBase64Barcode(text) {
-  const canvas = document.createElement("canvas");
+  var canvas = document.createElement("canvas");
-  let codeconfig = {
+  bwipjs.toCanvas(canvas, {
-    bcid: config.code_format || "code128",
+    bcid: config.codeformat || "code39",
-    text: `${text}` || "?",
+    text: text,
     scale: 3,
-    includetext: false,
+    height: 10,
-  };
+    // width: 10,
-  if (codeconfig.bcid === "code128" || codeconfig.bcid === "ean13") {
+    includetext: true,
-    codeconfig.height = 10; // bar height in mm
+    textxalign: "center",
-  }
+    backgroundcolor: "ffffff",
-  bwipjs.toCanvas(canvas, codeconfig);
+  });
-  const base64 = canvas.toDataURL("image/png");
+  return canvas.toDataURL("image/png");
-  return base64;
 }
 
 const state = reactive({
@@ -642,9 +682,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 +711,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...");
     });
 }
@@ -705,21 +749,33 @@ function get_certificate() {
       } else {
         var fileURL = window.URL.createObjectURL(
           new Blob([response.data], { type: "application/pdf" })
-        );
+          );
         var fileLink = document.createElement("a");
 
         fileLink.href = fileURL;
         fileLink.setAttribute("download", "Certificate.pdf");
         document.body.appendChild(fileLink);
-
+        
         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/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,11 @@
+<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">{{ this.$route.query.mail }}</b> geschickt haben.</p>
+    </div>
+  </div>
+</template>