Merge branch 'dev'

2023-02-03 13:54:34 +01:00
parent fe1bbc7816 f4d1c7b053
commit a1b600df1c
7 changed files with 49 additions and 20 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,28 @@

 All notable changes to this project will be documented in this file. Dates are displayed in UTC.

+#### [0.8.2](https://git.odit.services/lfk/selfservice/compare/0.8.1...0.8.2)
+
+- move /registered/ to props [`c35f943`](https://git.odit.services/lfk/selfservice/commit/c35f943957e5ba84361a437c1d945331248746d1)
+- /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 -&gt; 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)

--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@odit/lfk-selfservice",
-	"version": "0.8.0",
+	"version": "0.8.2",
 	"scripts": {
 		"dev": "vite",
 		"build": "vite build",
--- a/src/locales/de.json
+++ b/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",
@@ -22,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",
@@ -45,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",
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -44,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",
--- a/src/routes.js
+++ b/src/routes.js
@@ -18,7 +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 + '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 },
--- a/src/views/ProfileNone.vue
+++ b/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') }}
-                <br />
+                <!-- {{ $t('you_have_not_provided_a_valid_access_key') }}
+                <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 });
            });
    }
 }
--- a/src/views/Registered.vue
+++ b/src/views/Registered.vue
@@ -2,10 +2,19 @@
  <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>
+      <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>
+</template>
+
+<script setup>
+const props = defineProps({
+  mail: String,
+});
+</script>