From 36baf174a52e3a5ce21294f7d4e899d6893fd517 Mon Sep 17 00:00:00 2001
From: Philipp Dormann <philipp@philippdormann.de>
Date: Wed, 24 Mar 2021 17:38:51 +0100
Subject: [PATCH 1/5] =?UTF-8?q?=E2=8F=AB=20dependency=20bump?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index db9b0fc..97685c0 100644
--- a/package.json
+++ b/package.json
@@ -20,13 +20,13 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^1.1.5",
-    "@vue/compiler-sfc": "^3.0.6",
-    "autoprefixer": "^10.2.4",
-    "postcss": "^8.2.6",
-    "release-it": "^14.4.1",
-    "tailwindcss": "^2.0.3",
-    "vite": "^2.0.3",
-    "vite-plugin-windicss": "^0.5.4"
+    "@vue/compiler-sfc": "^3.0.7",
+    "autoprefixer": "^10.2.5",
+    "postcss": "^8.2.8",
+    "release-it": "^14.5.0",
+    "tailwindcss": "^2.0.4",
+    "vite": "^2.1.2",
+    "vite-plugin-windicss": "^0.9.11"
   },
   "release-it": {
     "git": {

From 18d1ddacf7e99e67e6572533ebd9add3d0c0592f Mon Sep 17 00:00:00 2001
From: Philipp Dormann <philipp@philippdormann.de>
Date: Thu, 25 Mar 2021 19:29:37 +0100
Subject: [PATCH 2/5] basic /register/:token route

ref #15
---
 src/components/Register.vue | 16 +++++++++++++++-
 src/main.js                 |  1 +
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/components/Register.vue b/src/components/Register.vue
index 9de89c4..dd2b3e9 100644
--- a/src/components/Register.vue
+++ b/src/components/Register.vue
@@ -219,16 +219,30 @@
 </template>
 
 <script setup>
-import { computed, ref, reactive, watch } from "vue";
+import { computed, ref, reactive, defineProps } from "vue";
 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";
 
+const props = defineProps({
+  token: String
+})
+if (props.token) {
+  axios.get(`${config.baseurl}api/organizations/selfservice/${props.token}`)
+    .then(({ data }) => {
+      console.log(data);
+    })
+    .catch((error) => {
+      console.log(error);
+    });
+}
+
 let userdetails = ref({ firstname: "", lastname: "", middlename: "", mail: "", phone: "", address: { street: "", address2: "", city: "", zipcode: "" } });
 let provide_address = ref(false);
 let agb_accepted = ref(false);
+let firma = ref("");
 // 
 const state = reactive({
   submit_enabled: computed(() => agb_accepted.value === true && (isMobilePhone(userdetails.value.phone) || !userdetails.value.phone.trim()) && isEmail(userdetails.value.mail)
diff --git a/src/main.js b/src/main.js
index 0611093..5e25b3f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -36,6 +36,7 @@ if (typeof config !== 'undefined') {
 			{ path: '/imprint', component: Imprint },
 			{ path: '/privacy', component: Privacy },
 			{ path: '/register', component: Register },
+			{ path: '/register/:token', component: Register, props: true },
 			{ path: '/profile', component: Profile }
 		];
 	}

From 79d8545ed6b2e0e64ca02194bc7009b48d2c8f2d Mon Sep 17 00:00:00 2001
From: Philipp Dormann <philipp@philippdormann.de>
Date: Thu, 25 Mar 2021 19:36:31 +0100
Subject: [PATCH 3/5] working path params for org registration

ref #15
---
 src/components/Register.vue | 12 ++++++++----
 src/main.js                 |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/Register.vue b/src/components/Register.vue
index dd2b3e9..fe95628 100644
--- a/src/components/Register.vue
+++ b/src/components/Register.vue
@@ -6,6 +6,10 @@
         class="sm:text-3xl text-2xl font-medium title-font mb-4 text-center"
       >Lauf für Kaya! - {{ $t('registrieren') }}</h1>
       <p class="mx-auto leading-relaxed text-base text-center">{{ $t('register.register_now') }}</p>
+      <p
+        v-if="state.org_name !== ''"
+        class="mx-auto leading-relaxed text-base text-center"
+      >Organization: {{ state.org_name }}</p>
       <div class="mt-4">
         <label for="first_name" class="block font-medium">
           {{ $t('vorname') }}
@@ -233,6 +237,7 @@ if (props.token) {
   axios.get(`${config.baseurl}api/organizations/selfservice/${props.token}`)
     .then(({ data }) => {
       console.log(data);
+      state.org_name = data.name;
     })
     .catch((error) => {
       console.log(error);
@@ -242,9 +247,9 @@ if (props.token) {
 let userdetails = ref({ firstname: "", lastname: "", middlename: "", mail: "", phone: "", address: { street: "", address2: "", city: "", zipcode: "" } });
 let provide_address = ref(false);
 let agb_accepted = ref(false);
-let firma = ref("");
 // 
 const state = reactive({
+  org_name: "",
   submit_enabled: computed(() => agb_accepted.value === true && (isMobilePhone(userdetails.value.phone) || !userdetails.value.phone.trim()) && isEmail(userdetails.value.mail)
     && userdetails.value.firstname
     && userdetails.value.lastname && (provide_address.value === false || provide_address.value === true && (userdetails.value.address.street.trim() && userdetails.value.address.city.trim() && isPostalCode(userdetails.value.address.zipcode, "DE"))))
@@ -275,9 +280,8 @@ function login() {
       }
       toast("registration in progress...");
       axios.post(`${config.baseurl}api/runners/register`, postdata)
-        .then((response) => {
-          response = response.data;
-          const token = response.token;
+        .then(({ data }) => {
+          const token = data.token;
           const userid = JSON.parse(atob(token.split(".")[1])).id;
           console.log({ token });
           console.log({ userid });
diff --git a/src/main.js b/src/main.js
index 5e25b3f..c2e9b13 100644
--- a/src/main.js
+++ b/src/main.js
@@ -25,7 +25,7 @@ const EnvError = import('./components/EnvError.vue');
 const Home = import('./components/Home.vue');
 const Imprint = import('./components/Imprint.vue');
 const Privacy = import('./components/Privacy.vue');
-const Register = import('./components/Register.vue');
+const Register = () => import('./components/Register.vue');
 const Profile = () => import('./components/Profile.vue');
 //
 let routes = [ { path: '/:pathMatch(.*)*', component: EnvError } ];

From a39cf75c7fc2e29a5a1a34a7db39355e59ce9476 Mon Sep 17 00:00:00 2001
From: Philipp Dormann <philipp@philippdormann.de>
Date: Thu, 25 Mar 2021 19:49:35 +0100
Subject: [PATCH 4/5] move profile to path param

ref #15
---
 src/components/Profile.vue  | 9 ++++++---
 src/components/Register.vue | 9 +++++----
 src/main.js                 | 2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/components/Profile.vue b/src/components/Profile.vue
index 47fe1ff..1b6fdff 100644
--- a/src/components/Profile.vue
+++ b/src/components/Profile.vue
@@ -187,8 +187,11 @@ const state = reactive({
   activetab: "profile",
 })
 const toast = useToast();
-const token = location.hash.substr(1).split('&')[0].split('=')[1];
-axios.get(`${config.baseurl}api/runners/me/${token}`)
+const props = defineProps({
+  token: String
+})
+const accesstoken = atob(props.token);
+axios.get(`${config.baseurl}api/runners/me/${accesstoken}`)
   .then(({ data }) => {
     state.phone = data.phone;
     state.email = data.email;
@@ -199,7 +202,7 @@ axios.get(`${config.baseurl}api/runners/me/${token}`)
   }).catch((error) => {
     toast.error("An error occured while loading your profile data");
   })
-axios.get(`${config.baseurl}api/runners/me/${token}/scans`)
+axios.get(`${config.baseurl}api/runners/me/${accesstoken}/scans`)
   .then(({ data }) => {
     data.map(function(s) {
       s.lapTime = Math.floor(s.lapTime / 60) + 'min ' + (Math.floor(s.lapTime % 60) + "").padStart(2, "0") + "s"
diff --git a/src/components/Register.vue b/src/components/Register.vue
index fe95628..a490ad8 100644
--- a/src/components/Register.vue
+++ b/src/components/Register.vue
@@ -10,6 +10,7 @@
         v-if="state.org_name !== ''"
         class="mx-auto leading-relaxed text-base text-center"
       >Organization: {{ state.org_name }}</p>
+      <p v-else class="mx-auto leading-relaxed text-base text-center">Bürgerlauf</p>
       <div class="mt-4">
         <label for="first_name" class="block font-medium">
           {{ $t('vorname') }}
@@ -234,6 +235,7 @@ const props = defineProps({
   token: String
 })
 if (props.token) {
+  props.token = atob(props.token);
   axios.get(`${config.baseurl}api/organizations/selfservice/${props.token}`)
     .then(({ data }) => {
       console.log(data);
@@ -281,10 +283,9 @@ function login() {
       toast("registration in progress...");
       axios.post(`${config.baseurl}api/runners/register`, postdata)
         .then(({ data }) => {
-          const token = data.token;
-          const userid = JSON.parse(atob(token.split(".")[1])).id;
-          console.log({ token });
-          console.log({ userid });
+          const token = btoa(data.token);
+          // const userid = JSON.parse(atob(token.split(".")[1])).id;
+          location.replace("../profile/" + token)
           // 
           toast.success("You have been registered!");
         })
diff --git a/src/main.js b/src/main.js
index c2e9b13..05eae0f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,7 +37,7 @@ if (typeof config !== 'undefined') {
 			{ path: '/privacy', component: Privacy },
 			{ path: '/register', component: Register },
 			{ path: '/register/:token', component: Register, props: true },
-			{ path: '/profile', component: Profile }
+			{ path: '/profile/:token', component: Profile, props: true }
 		];
 	}
 }

From 7904151a52af1a1592706e6a468943c8e9c57518 Mon Sep 17 00:00:00 2001
From: Philipp Dormann <philipp@philippdormann.de>
Date: Thu, 25 Mar 2021 19:51:44 +0100
Subject: [PATCH 5/5] enable org registration

ref #15
---
 src/components/Login.vue     | 3 ---
 src/components/LoginForm.vue | 3 ---
 src/components/Register.vue  | 8 +++++---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/components/Login.vue b/src/components/Login.vue
index ef0c89a..e1f680f 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -97,11 +97,8 @@ import Toastify from "toastify-js";
 let mail = ref("");
 let loading = ref(false);
 function login() {
-  console.log("ihi");
-  console.log(mail.value);
   loading.value = true;
   axios.get("").then((res) => {
-    console.log(res.data);
     loading.value = false;
     Toastify({
       text: "This is a toast",
diff --git a/src/components/LoginForm.vue b/src/components/LoginForm.vue
index 9444c6e..49ed64b 100644
--- a/src/components/LoginForm.vue
+++ b/src/components/LoginForm.vue
@@ -97,11 +97,8 @@ import Toastify from "toastify-js";
 let mail = ref("");
 let loading = ref(false);
 function login() {
-  console.log("ihi");
-  console.log(mail.value);
   loading.value = true;
   axios.get("").then((res) => {
-    console.log(res.data);
     loading.value = false;
     Toastify({
       text: "This is a toast",
diff --git a/src/components/Register.vue b/src/components/Register.vue
index a490ad8..7394087 100644
--- a/src/components/Register.vue
+++ b/src/components/Register.vue
@@ -238,7 +238,6 @@ if (props.token) {
   props.token = atob(props.token);
   axios.get(`${config.baseurl}api/organizations/selfservice/${props.token}`)
     .then(({ data }) => {
-      console.log(data);
       state.org_name = data.name;
     })
     .catch((error) => {
@@ -281,10 +280,13 @@ function login() {
         }
       }
       toast("registration in progress...");
-      axios.post(`${config.baseurl}api/runners/register`, postdata)
+      let url = `${config.baseurl}api/runners/register`;
+      if (props.token) {
+        url = `${config.baseurl}api/runners/register/${props.token}`
+      }
+      axios.post(url, postdata)
         .then(({ data }) => {
           const token = btoa(data.token);
-          // const userid = JSON.parse(atob(token.split(".")[1])).id;
           location.replace("../profile/" + token)
           // 
           toast.success("You have been registered!");