Merge branch 'dev'

Merge pull request 'sync - 0.4.5' (#34 ) from dev into main
2023-02-03 13:54:34 +01:00 · 2023-02-02 00:21:22 +01:00 · 2021-04-01 16:46:05 +00:00
14 changed files with 134 additions and 455 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,56 +2,9 @@

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

-#### [0.11.2](https://git.odit.services/lfk/selfservice/compare/0.11.1...0.11.2)
-
- Added footer to every page [`b9624aa`](https://git.odit.services/lfk/selfservice/commit/b9624aa5ad57002852c84081fc710c2e977251bd)
- Accept tos to accept privacy_policy [`09e48e7`](https://git.odit.services/lfk/selfservice/commit/09e48e771f4c0db4a7dbb898b05b347f1aad2292)
-
-#### [0.11.1](https://git.odit.services/lfk/selfservice/compare/0.11.0...0.11.1)
-
-> 18 February 2023
-
- Profile: add "---" if no data set [`659fa77`](https://git.odit.services/lfk/selfservice/commit/659fa77dca3b527d896d752386e91a167a1b8f4f)
- 🚀Bumped version to v0.11.1 [`8364321`](https://git.odit.services/lfk/selfservice/commit/8364321a7cb6a0037ee0c5055b028c4cf883fb10)
-
-#### [0.11.0](https://git.odit.services/lfk/selfservice/compare/0.10.0...0.11.0)
-
-> 3 February 2023
-
- pnpm migration [`a3a1e89`](https://git.odit.services/lfk/selfservice/commit/a3a1e89aa14798e1d180697f91809e282a229f23)
- 🚀Bumped version to v0.11.0 [`10c9127`](https://git.odit.services/lfk/selfservice/commit/10c9127256edf2cbad1dc6690d5f4e87c32f6396)
-
-#### [0.10.0](https://git.odit.services/lfk/selfservice/compare/0.9.0...0.10.0)
-
-> 3 February 2023
-
- text cleanups + footer [`eccce07`](https://git.odit.services/lfk/selfservice/commit/eccce0795b6960aa3a2e9368de5ae4bdf80997d7)
- updated nginx config for cache busting [`8e2b355`](https://git.odit.services/lfk/selfservice/commit/8e2b355466e9a37510be8bf03311d6b28e1a0d9f)
- improved profile page padding + full width registration code for easier scanning [`54540be`](https://git.odit.services/lfk/selfservice/commit/54540be6e12ed85afc96061b8548cd4ec6700eec)
- 🚀Bumped version to v0.10.0 [`5587175`](https://git.odit.services/lfk/selfservice/commit/5587175534188e05ab43d0eed9745484e01edb63)
-
-#### [0.9.0](https://git.odit.services/lfk/selfservice/compare/0.8.3...0.9.0)
-
-> 3 February 2023
-
- wip: error registration ui feedback [`9ac14e8`](https://git.odit.services/lfk/selfservice/commit/9ac14e8a5d740fb4cd87645e69b2cfde73e4acc7)
- wip: registration confirmation ui [`8928f84`](https://git.odit.services/lfk/selfservice/commit/8928f841dcd370daf28416adbf1adbe16fa4d76f)
- 🚀Bumped version to v0.9.0 [`3392a2e`](https://git.odit.services/lfk/selfservice/commit/3392a2e68edb8fcf2aa6dd4b962abbf6ac27a414)
-
-#### [0.8.3](https://git.odit.services/lfk/selfservice/compare/0.8.2...0.8.3)
-
-> 3 February 2023
-
- fix: registration code (broke in merge) [`123509d`](https://git.odit.services/lfk/selfservice/commit/123509d0a6d15fe254e28f7a316bd6c260fe7bd2)
- 🚀Bumped version to v0.8.3 [`4a5b9d2`](https://git.odit.services/lfk/selfservice/commit/4a5b9d25698931158a602b2159b4e6c4fa129e8e)
- 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)
--- a/9
+++ b/9
@@ -1,10 +1,9 @@
-FROM registry.odit.services/hub/library/node:19.5.0-alpine3.17
+FROM registry.odit.services/hub/library/node:15.9.0-alpine3.13
 WORKDIR /app
-RUN npm i -g pnpm@7
 COPY . .
-RUN pnpm i --frozen-lockfile
-RUN pnpm build
-RUN pnpm postbuild
+RUN yarn
+RUN yarn build
+RUN yarn postbuild
 # final image
 FROM registry.odit.services/library/nginx-brotli:3.15
 COPY --from=0 /app/dist /usr/share/nginx/html
--- a/nginx.conf
+++ b/nginx.conf
@@ -7,21 +7,15 @@ http {
        error_page 404 /index.html;
        root /usr/share/nginx/html;
        location / {
-            rewrite /register/(.*) /$1 break;
-            rewrite /profile/(.*) /$1 break;
+            rewrite /register/(.*) /$1  break;
+            rewrite /profile/(.*) /$1  break;

            try_files $uri $uri/ /index.html;
-
-            add_header Last-Modified $date_gmt;
-            add_header Cache-Control 'private no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
-            if_modified_since off;
-            expires off;
-            etag off;
        }

        location ~* \.(?:ico|css|gif|jpe?g|png)$ {
-            rewrite /register/(.*) /$1 break;
-            rewrite /profile/(.*) /$1 break;
+            rewrite /register/(.*) /$1  break;
+            rewrite /profile/(.*) /$1  break;

            expires 1y;
            add_header Pragma public;
@@ -41,24 +35,24 @@ http {
        gzip_buffers 16 8k;
        gzip_http_version 1.1;
        gzip_types application/javascript
-        application/rss+xml
-        application/vnd.ms-fontobject
-        application/x-font
-        application/x-font-opentype
-        application/x-font-otf
-        application/x-font-truetype
-        application/x-font-ttf
-        application/x-javascript
-        application/xhtml+xml
-        application/xml
-        font/opentype
-        font/otf
-        font/ttf
-        image/svg+xml
-        image/x-icon
-        text/css
-        text/javascript
-        text/plain
-        text/xml;
+            application/rss+xml
+            application/vnd.ms-fontobject
+            application/x-font
+            application/x-font-opentype
+            application/x-font-otf
+            application/x-font-truetype
+            application/x-font-ttf
+            application/x-javascript
+            application/xhtml+xml
+            application/xml
+            font/opentype
+            font/otf
+            font/ttf
+            image/svg+xml
+            image/x-icon
+            text/css
+            text/javascript
+            text/plain
+            text/xml;
    }
 }
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@odit/lfk-selfservice",
-	"version": "0.11.2",
+	"version": "0.8.2",
 	"scripts": {
 		"dev": "vite",
 		"build": "vite build",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,7 +9,8 @@ specifiers:
  '@vitejs/plugin-vue': 1.2.1
  '@vue/compiler-sfc': 3.0.11
  autoprefixer: 10.2.5
-  bwip-js: 3.2.2
+  bwip-js: ^3.2.2
+  jsbarcode: ^3.11.5
  marked: 2.0.3
  redaxios: 0.4.1
  release-it: 14.6.1
@@ -24,6 +25,7 @@ specifiers:

 dependencies:
  bwip-js: 3.2.2
+  jsbarcode: 3.11.5
  marked: 2.0.3
  redaxios: 0.4.1
  toastify-js: 1.10.0
@@ -1863,6 +1865,11 @@ packages:
    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
    dev: true

+  /jsbarcode/3.11.5:
+    resolution: {integrity: sha512-zv3KsH51zD00I/LrFzFSM6dst7rDn0vIMzaiZFL7qusTjPZiPtxg3zxetp0RR7obmjTw4f6NyGgbdkBCgZUIrA==}
+    hasBin: true
+    dev: false
+
  /json-buffer/3.0.0:
    resolution: {integrity: sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==}
    dev: true
--- a/public/env.sample.js
+++ b/public/env.sample.js
@@ -13,4 +13,5 @@ const config = {
 	url_imprint: '',
 	// optional, will fallback to baseurl_selfservice/privacy
 	url_privacy: '',
+	codeformat: 'code39'
 };
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -5,7 +5,7 @@
    "apartment_suite_etc": "Addresszeile 2",
    "cancel_keep_my_data": "Abbrechen, meine Daten behalten",
    "configuration_error": "Konfigurationsfehler",
-    "confirm_delete_all_of_my_data": "Bestätigen, meine Daten löschen",
+    "confirm_delete_all_of_my_data": "Bestätigung, meine gesamten Daten löschen",
    "confirm_personal_data": "Hiermit bestätige ich die Vollständigkeit und Richtigkeit der oben genannten Angaben",
    "current_total_amount_in_eur": "Aktueller Gesamtbetrag (in €)",
    "delete_all_of_my_data": "Meine gesamten Daten löschen",
--- a/src/routes.js
+++ b/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 },
--- a/src/views/Imprint.vue
+++ b/src/views/Imprint.vue
@@ -9,18 +9,15 @@
      <div class="mx-auto prose" v-html="content"></div>
    </div>
  </section>
-  <Footer></Footer>
 </template>
 <style src="../simple.css">
 </style>
 <script>
 import marked from "marked";
-import Footer from "@/components/Footer.vue";
 export default {
-  components: {Footer},
  data() {
    return {
-      content: "",
+      content: ""
    }
  },
  async beforeMount() {
--- a/src/views/Privacy.vue
+++ b/src/views/Privacy.vue
@@ -9,15 +9,12 @@
      <div class="mx-auto prose" v-html="content"></div>
    </div>
  </section>
-  <Footer></Footer>
 </template>
 <style src="../simple.css">
 </style>
 <script>
 import marked from "marked";
-import Footer from "@/components/Footer.vue";
 export default {
-  components: {Footer},
  data() {
    return {
      content: ""
--- a/src/views/Profile.vue
+++ b/src/views/Profile.vue
@@ -150,10 +150,6 @@
                py-2.5
                px-5
                rounded-md
-                mb-1
-                md:mb-auto
-                w-full
-                md:w-auto
                bg-blue-500
                hover:bg-blue-600 hover:shadow-lg
              "
@@ -192,11 +188,9 @@
                py-2.5
                px-5
                rounded-md
-                w-full
-                md:w-auto
                bg-red-600
                hover:bg-red-700 hover:shadow-lg
-                md:ml-1
+                ml-1
              "
              @click="delete_me"
            >
@@ -226,7 +220,7 @@
      </div>
    </section>
    <div class="flex flex-wrap">
-      <div class="w-full">
+      <div class="w-full p-4">
        <div class="flex flex-wrap flex-col w-full tabs">
          <div class="flex lg:flex-wrap flex-row lg:space-x-2">
            <div class="flex-none">
@@ -288,11 +282,7 @@
                  <div class="w-full">
                    <div class="form-element">
                      <div class="text-lg">{{ $t("registrierungscode") }}</div>
-                      <img
-                        class="w-full md:w-auto mb-2"
-                        alt="Registrierungscode"
-                        :src="state.barcode"
-                      />
+                      <img alt="Registrierungscode" :src="state.barcode" />
                      <div class="text-lg">{{ $t("vorname") }}</div>
                      <p
                        class="
@@ -311,7 +301,7 @@
                          duration-200
                          ease-in-out
                        "
-                        v-text="state.firstname || '---'"
+                        v-text="state.firstname"
                      />
                    </div>
                    <div class="form-element">
@@ -333,7 +323,7 @@
                          duration-200
                          ease-in-out
                        "
-                        v-text="state.middlename || '---'"
+                        v-text="state.middlename"
                      />
                    </div>
                    <div class="form-element">
@@ -355,7 +345,7 @@
                          duration-200
                          ease-in-out
                        "
-                        v-text="state.lastname || '---'"
+                        v-text="state.lastname"
                      />
                    </div>
                    <div class="form-element">
@@ -377,7 +367,7 @@
                          duration-200
                          ease-in-out
                        "
-                        v-text="state.email || '---'"
+                        v-text="state.email"
                      />
                    </div>
                    <div class="form-element">
@@ -399,7 +389,7 @@
                          duration-200
                          ease-in-out
                        "
-                        v-text="state.phone || '---'"
+                        v-text="state.phone"
                      />
                    </div>
                  </div>
@@ -638,8 +628,6 @@
        </div>
      </div>
    </div>
-    <!--  -->
-    <Footer></Footer>
  </div>
 </template>

@@ -648,26 +636,19 @@ import { reactive } from "vue";
 import { TYPE, useToast } from "vue-toastification";
 import axios from "redaxios";
 import bwipjs from "bwip-js";
-import Footer from "@/components/Footer.vue";

 function textToBase64Barcode(text) {
-  const canvas = document.createElement("canvas");
-  let codeconfig = {
-    bcid: config.code_format || "code39",
-    text: `${text}`,
+  var canvas = document.createElement("canvas");
+  bwipjs.toCanvas(canvas, {
+    bcid: config.codeformat || "code39",
+    text: text,
    scale: 3,
-    includetext: false,
+    height: 10,
+    // width: 10,
+    includetext: true,
    textxalign: "center",
    backgroundcolor: "ffffff",
-  };
-  if (
-    codeconfig.bcid === "code39" ||
-    codeconfig.bcid === "code128" ||
-    codeconfig.bcid === "ean13"
-  ) {
-    codeconfig.height = 10;
-  }
-  bwipjs.toCanvas(canvas, codeconfig);
+  });
  return canvas.toDataURL("image/png");
 }

@@ -768,13 +749,13 @@ 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();
--- a/src/views/ProfileNone.vue
+++ b/src/views/ProfileNone.vue
@@ -68,7 +68,6 @@
            </div>
        </div>
    </div>
-    <Footer></Footer>
 </template>
  
  <script setup>
@@ -78,7 +77,6 @@ import isEmail from 'validator/es/lib/isEmail';
 import isMobilePhone from 'validator/es/lib/isMobilePhone';
 import isPostalCode from 'validator/es/lib/isPostalCode';
 import { TYPE, useToast } from "vue-toastification";
-import Footer from "@/components/Footer.vue";

 let user_email = ref("");
 // 
--- a/src/views/Register.vue
+++ b/src/views/Register.vue
@@ -1,73 +1,33 @@
 <template>
-  <div
-    class="min-h-screen flex items-center justify-center"
-    v-if="registrationState === 'registered'"
-  >
+  <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">{{ userdetails.mail }}</b> geschickt haben.
-      </p>
-    </div>
-  </div>
-  <div class="min-h-screen flex items-center justify-center" v-else>
-    <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! - {{ $t("registrieren") }}
-      </h1>
-      <p class="mx-auto leading-relaxed text-base text-center">
-        {{ $t("register.register_now") }}
-      </p>
+      <h1
+        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"
-      >
-        {{ $t("organization") }}: {{ state.org_name }}
-      </p>
+      >{{ $t('organization') }}: {{ state.org_name }}</p>
      <p
        v-if="state.org_name !== '' && state.org_teams.length > 0"
        class="mx-auto leading-relaxed text-base text-center"
-      >
-        Team:
-      </p>
+      >Team:</p>
      <select
        v-model="org_team"
        v-if="state.org_name !== '' && state.org_teams.length > 0"
-        class="
-          w-full
-          border
-          bg-white
-          rounded
-          px-3
-          py-2
-          outline-none
-          block
-          mt-1
-          text-sm
-          dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700
-          form-select
-          focus:border-purple-400 focus:outline-none focus:shadow-outline-purple
-          dark:focus:shadow-outline-gray
-        "
+        class="w-full border bg-white rounded px-3 py-2 outline-none block mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-select focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
      >
-        <option v-for="t in state.org_teams" :key="t.id" :value="t.id">
-          {{ t.name }}
-        </option>
+        <option v-for="t in state.org_teams" :key="t.id" :value="t.id">{{ t.name }}</option>
      </select>
      <p
        v-if="state.org_name === ''"
        class="mx-auto leading-relaxed text-base text-center"
-      >
-        Bürgerlauf
-      </p>
+      >Bürgerlauf</p>
      <div class="mt-4">
        <label for="first_name" class="block font-medium">
-          {{ $t("vorname") }}
+          {{ $t('vorname') }}
          <span class="font-bold">*</span>
        </label>
        <input
@@ -77,28 +37,11 @@
          autocomplete="off"
          :placeholder="[[$t('vorname')]]"
          type="text"
-          :class="{
-            'border-red-500': !userdetails.firstname.trim(),
-            'border-green-300': userdetails.firstname.trim(),
-          }"
-          class="
-            dark:bg-gray-800
-            mt-1
-            block
-            w-full
-            shadow-sm
-            sm:text-sm
-            border-gray-300 border-2
-            bg-gray-50
-            text-gray-500
-            rounded-md
-            p-2
-          "
+          :class="{ 'border-red-500': (!userdetails.firstname.trim()), 'border-green-300': (userdetails.firstname.trim()) }"
+          class="dark:bg-gray-800 mt-1 block w-full shadow-sm sm:text-sm border-gray-300 border-2 bg-gray-50 text-gray-500 rounded-md p-2"
        />
        <!--  -->
-        <label for="middle_name" class="block font-medium">{{
-          $t("mittelname")
-        }}</label>
+        <label for="middle_name" class="block font-medium">{{ $t('mittelname') }}</label>
        <input
          v-model="userdetails.middlename"
          name="middlename"
@@ -106,23 +49,11 @@
          autocomplete="off"
          :placeholder="[[$t('mittelname')]]"
          type="text"
-          class="
-            dark:bg-gray-800
-            mt-1
-            block
-            w-full
-            shadow-sm
-            sm:text-sm
-            border-gray-300 border-2
-            bg-gray-50
-            text-gray-500
-            rounded-md
-            p-2
-          "
+          class="dark:bg-gray-800 mt-1 block w-full shadow-sm sm:text-sm border-gray-300 border-2 bg-gray-50 text-gray-500 rounded-md p-2"
        />
        <!--  -->
        <label for="last_name" class="block font-medium">
-          {{ $t("nachname") }}
+          {{ $t('nachname') }}
          <span class="font-bold">*</span>
        </label>
        <input
@@ -132,27 +63,12 @@
          autocomplete="off"
          :placeholder="[[$t('nachname')]]"
          type="text"
-          :class="{
-            'border-red-500': !userdetails.lastname.trim(),
-            'border-green-300': userdetails.lastname.trim(),
-          }"
-          class="
-            dark:bg-gray-800
-            mt-1
-            block
-            w-full
-            shadow-sm
-            sm:text-sm
-            border-gray-300 border-2
-            bg-gray-50
-            text-gray-500
-            rounded-md
-            p-2
-          "
+          :class="{ 'border-red-500': (!userdetails.lastname.trim()), 'border-green-300': (userdetails.lastname.trim()) }"
+          class="dark:bg-gray-800 mt-1 block w-full shadow-sm sm:text-sm border-gray-300 border-2 bg-gray-50 text-gray-500 rounded-md p-2"
        />
        <!--  -->
        <label for="email_address" class="block font-medium">
-          {{ $t("e_mail_adress") }}
+          {{ $t('e_mail_adress') }}
          <span class="font-bold">*</span>
        </label>
        <input
@@ -162,31 +78,12 @@
          autocomplete="off"
          :placeholder="[[$t('e_mail_adress')]]"
          type="email"
-          :class="{
-            'border-red-500': !isEmail(userdetails.mail),
-            'border-green-300': isEmail(userdetails.mail),
-          }"
-          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
-          "
+          :class="{ 'border-red-500': (!isEmail(userdetails.mail)), 'border-green-300': (isEmail(userdetails.mail)) }"
+          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(userdetails.mail)" class="text-sm">
-          {{ $t("please_provide_valid_mail") }}
-        </p>
+        <p v-if="!isEmail(userdetails.mail)" class="text-sm">{{ $t('please_provide_valid_mail') }}</p>
        <!--  -->
-        <label for="phone" class="select-none block font-medium">{{
-          $t("phone_number")
-        }}</label>
+        <label for="phone" class="select-none block font-medium">{{ $t('phone_number') }}</label>
        <input
          v-model="userdetails.phone"
          name="phone"
@@ -194,32 +91,13 @@
          autocomplete="off"
          :placeholder="[[$t('phone_number')]]"
          type="text"
-          :class="{
-            'border-red-500':
-              !isMobilePhone(userdetails.phone) && userdetails.phone.trim(),
-            'border-green-300':
-              isMobilePhone(userdetails.phone) && userdetails.phone.trim(),
-          }"
-          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
-          "
+          :class="{ 'border-red-500': (!isMobilePhone(userdetails.phone) && userdetails.phone.trim()), 'border-green-300': (isMobilePhone(userdetails.phone) && userdetails.phone.trim()) }"
+          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="!isMobilePhone(userdetails.phone) && userdetails.phone.trim()"
+          v-if="(!isMobilePhone(userdetails.phone) && userdetails.phone.trim())"
          class="text-sm"
-        >
-          {{ $t("this_is_not_a_valid_international_phone_number") }}
-        </p>
+        >{{ $t('this_is_not_a_valid_international_phone_number') }}</p>
        <!--  -->
        <div class="grid grid-cols-6 mt-6">
          <div class="col-span-6"></div>
@@ -237,14 +115,13 @@
              <label
                for="address_activated"
                class="font-medium text-gray-400 select-none"
-                >{{ $t("provide_address") }}</label
-              >
+              >{{ $t('provide_address') }}</label>
            </div>
          </div>
          <div v-if="provide_address === true" class="col-span-6">
            <div class="col-span-6">
              <label for="street" class="block font-medium">
-                {{ $t("strasse") }}
+                {{ $t('strasse') }}
                <span class="font-bold">*</span>
              </label>
              <input
@@ -254,29 +131,12 @@
                :placeholder="[[$t('strasse')]]"
                id="street"
                autocomplete="street-address"
-                :class="{
-                  'border-red-500': !userdetails.address.street.trim(),
-                  'border-green-300': userdetails.address.street.trim(),
-                }"
-                class="
-                  dark:bg-gray-800
-                  mt-1
-                  block
-                  w-full
-                  shadow-sm
-                  sm:text-sm
-                  border-gray-300 border-2
-                  bg-gray-50
-                  text-gray-500
-                  rounded-md
-                  p-2
-                "
+                :class="{ 'border-red-500': (!userdetails.address.street.trim()), 'border-green-300': (userdetails.address.street.trim()) }"
+                class="dark:bg-gray-800 mt-1 block w-full shadow-sm sm:text-sm border-gray-300 border-2 bg-gray-50 text-gray-500 rounded-md p-2"
              />
            </div>
            <div class="col-span-6">
-              <label for="address2" class="block font-medium">{{
-                $t("apartment_suite_etc")
-              }}</label>
+              <label for="address2" class="block font-medium">{{ $t('apartment_suite_etc') }}</label>
              <input
                v-model="userdetails.address.address2"
                type="text"
@@ -284,24 +144,12 @@
                :placeholder="[[$t('apartment_suite_etc')]]"
                id="address2"
                autocomplete="street-address"
-                class="
-                  dark:bg-gray-800
-                  mt-1
-                  block
-                  w-full
-                  shadow-sm
-                  sm:text-sm
-                  border-gray-300 border-2
-                  bg-gray-50
-                  text-gray-500
-                  rounded-md
-                  p-2
-                "
+                class="dark:bg-gray-800 mt-1 block w-full shadow-sm sm:text-sm border-gray-300 border-2 bg-gray-50 text-gray-500 rounded-md p-2"
              />
            </div>
            <div class="col-span-6 sm:col-span-6 lg:col-span-2">
              <label for="city" class="block font-medium">
-                {{ $t("ort") }}
+                {{ $t('ort') }}
                <span class="font-bold">*</span>
              </label>
              <input
@@ -310,28 +158,13 @@
                name="city"
                :placeholder="[[$t('ort')]]"
                id="city"
-                :class="{
-                  'border-red-500': !userdetails.address.city.trim(),
-                  'border-green-300': userdetails.address.city.trim(),
-                }"
-                class="
-                  dark:bg-gray-800
-                  mt-1
-                  block
-                  w-full
-                  shadow-sm
-                  sm:text-sm
-                  border-gray-300 border-2
-                  bg-gray-50
-                  text-gray-500
-                  rounded-md
-                  p-2
-                "
+                :class="{ 'border-red-500': (!userdetails.address.city.trim()), 'border-green-300': (userdetails.address.city.trim()) }"
+                class="dark:bg-gray-800 mt-1 block w-full shadow-sm sm:text-sm border-gray-300 border-2 bg-gray-50 text-gray-500 rounded-md p-2"
              />
            </div>
            <div class="col-span-6 sm:col-span-3 lg:col-span-2">
              <label for="postal_code" class="block font-medium">
-                {{ $t("plz") }}
+                {{ $t('plz') }}
                <span class="font-bold">*</span>
              </label>
              <input
@@ -341,37 +174,14 @@
                :placeholder="[[$t('plz')]]"
                id="postal_code"
                autocomplete="postal-code"
-                :class="{
-                  'border-red-500': !isPostalCode(
-                    userdetails.address.zipcode,
-                    'DE'
-                  ),
-                  'border-green-300': isPostalCode(
-                    userdetails.address.zipcode,
-                    'DE'
-                  ),
-                }"
-                class="
-                  dark:bg-gray-800
-                  mt-1
-                  block
-                  w-full
-                  shadow-sm
-                  sm:text-sm
-                  border-gray-300 border-2
-                  bg-gray-50
-                  text-gray-500
-                  rounded-md
-                  p-2
-                "
+                :class="{ 'border-red-500': (!isPostalCode(userdetails.address.zipcode, 'DE')), 'border-green-300': (isPostalCode(userdetails.address.zipcode, 'DE')) }"
+                class="dark:bg-gray-800 mt-1 block w-full shadow-sm sm:text-sm border-gray-300 border-2 bg-gray-50 text-gray-500 rounded-md p-2"
              />
            </div>
            <p
              v-if="!isPostalCode(userdetails.address.zipcode, 'DE')"
              class="text-sm"
-            >
-              {{ $t("please_provide_a_valid_zipcode") }}
-            </p>
+            >{{ $t('please_provide_a_valid_zipcode') }}</p>
          </div>
        </div>
        <div class="flex items-start mt-6">
@@ -385,19 +195,15 @@
            />
          </div>
          <div class="ml-3 text-sm">
-            <label
-              for="agb_accepted"
-              class="font-medium text-gray-400 select-none"
-            >
-              {{ $t("i_accept", { tos: $t("privacy_policy") }) }}
+            <label for="agb_accepted" class="font-medium text-gray-400 select-none">
+              {{ $t('i_accept', { tos: $t('tos') }) }}
              <a
                target="_blank"
                rel="noreferrer,noopener"
                href="https://lauf-fuer-kaya.de/datenschutz/"
                class="underline"
-                >{{ $t("privacy_policy") }}</a
-              >
-              {{ $t("i_accept_end") }}
+              >{{ $t('tos') }}</a>
+              {{ $t('i_accept_end') }}
              <span class="font-bold">*</span>
            </label>
          </div>
@@ -413,11 +219,8 @@
            />
          </div>
          <div class="ml-3 text-sm">
-            <label
-              for="data_confirmed"
-              class="font-medium text-gray-400 select-none"
-            >
-              {{ $t("confirm_personal_data") }}
+            <label for="data_confirmed" class="font-medium text-gray-400 select-none">
+              {{ $t('confirm_personal_data') }}
              <span class="font-bold">*</span>
            </label>
          </div>
@@ -425,52 +228,29 @@
        <div class="mt-6">
          <button
            @click="login"
-            :disabled="!state.submit_enabled"
-            :class="{
-              'opacity-50': !state.submit_enabled,
-              'cursor-not-allowed': !state.submit_enabled,
-            }"
-            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("registrieren") }}
-          </button>
+            :disabled="(!state.submit_enabled)"
+            :class="{ 'opacity-50': (!state.submit_enabled), 'cursor-not-allowed': (!state.submit_enabled) }"
+            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('registrieren') }}</button>
        </div>
      </div>
    </div>
  </div>
-  <Footer></Footer>
 </template>

 <script setup>
 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 { TYPE, useToast } from "vue-toastification";
-import Footer from "@/components/Footer.vue";
+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,
-});
+  token: String
+})
 if (props.token) {
-  axios
-    .get(`${config.baseurl}api/organizations/selfservice/${props.token}`)
+  axios.get(`${config.baseurl}api/organizations/selfservice/${props.token}`)
    .then(({ data }) => {
      state.org_name = data.name;
      state.org_teams = data.teams;
@@ -481,51 +261,31 @@ if (props.token) {
    });
 }

-let userdetails = ref({
-  firstname: "",
-  lastname: "",
-  middlename: "",
-  mail: "",
-  phone: "",
-  address: { street: "", address2: "", city: "", zipcode: "" },
-});
+let userdetails = ref({ firstname: "", lastname: "", middlename: "", mail: "", phone: "", address: { street: "", address2: "", city: "", zipcode: "" } });
 let provide_address = ref(false);
 let agb_accepted = ref(false);
 let data_confirmed = ref(false);
 let org_team = ref("");
-let registrationState = ref("pending");
-//
+// 
 const state = reactive({
  org_name: "",
  org_teams: [],
-  submit_enabled: computed(
-    () =>
-      agb_accepted.value === true &&
-      data_confirmed.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")))
-  ),
-});
+  submit_enabled: computed(() => agb_accepted.value === true && data_confirmed.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"))))
+})
 const toast = useToast();
 function login() {
  userdetails = userdetails.value;
  if (userdetails?.phone === "" || isMobilePhone(userdetails.phone)) {
    if (isEmail(userdetails.mail)) {
      let postdata = {
-        email: userdetails.mail,
-        firstname: userdetails.firstname,
-        middlename: userdetails.middlename,
-        lastname: userdetails.lastname,
-        address: {},
-      };
+        "email": userdetails.mail,
+        "firstname": userdetails.firstname,
+        "middlename": userdetails.middlename,
+        "lastname": userdetails.lastname,
+        "address": {}
+      }
      if (isMobilePhone(userdetails.phone)) {
        postdata.phone = userdetails.phone;
      }
@@ -536,31 +296,23 @@ function login() {
          city: userdetails.address.city,
          postalcode: userdetails.address.zipcode,
          country: "DE",
-        };
+        }
      }
-      if (state.org_name !== "" && state.org_teams.length > 0) {
+      if (state.org_name !== '' && state.org_teams.length > 0) {
        postdata.team = org_team.value;
      }
      toast("Registrierung läuft...");
-      const browserlocale = (
-        (navigator.languages && navigator.languages[0]) ||
-        ""
-      ).substr(0, 2);
+      const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
      let url = `${config.baseurl}api/runners/register/?locale=${browserlocale}`;
      if (props.token) {
-        url = `${config.baseurl}api/runners/register/${props.token}/?locale=${browserlocale}`;
+        url = `${config.baseurl}api/runners/register/${props.token}/?locale=${browserlocale}`
      }
-      registrationState.value = "loading";
-      axios
-        .post(url, postdata)
+      axios.post(url, postdata)
        .then(() => {
-          registrationState.value = "registered";
+          location.replace(`${config.baseurl_selfservice}registered/?mail=${encodeURIComponent(postdata.email)}`);
        })
        .catch((error) => {
          console.log(error);
-          if (error.data.message === "E-Mail already registered") {
-            toast("bereits registriert...", { type: TYPE.ERROR });
-          }
        });
    }
  }
--- a/src/views/Registered.vue
+++ b/src/views/Registered.vue
@@ -11,11 +11,9 @@
      </p>
    </div>
  </div>
-  <Footer></Footer>
 </template>

 <script setup>
-import Footer from "@/components/Footer.vue";
 const props = defineProps({
  mail: String,
 });
Author	SHA1	Message	Date
Philipp Dormann	a1b600df1c	Merge branch 'dev' All checks were successful continuous-integration/drone/push Build is passing Details	2023-02-03 13:54:34 +01:00
Philipp Dormann	fe1bbc7816	Merge branch 'dev' All checks were successful continuous-integration/drone/push Build is passing Details	2023-02-02 00:21:22 +01:00
Philipp Dormann	7ae0081d69	Merge pull request 'sync - 0.4.5' (#34 ) from dev into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #34	2021-04-01 16:46:05 +00:00