Merge branch 'dev' into feature/19-runner_certficates

Merge pull request 'Env linking bugfix bugfix/31-env_linking' (#37 ) from bugfix/31-env_linking into dev
Reviewed-on: #37
2021-04-03 16:28:18 +00:00 · 2021-04-03 16:27:56 +00:00 · 2021-04-03 18:11:57 +02:00 · 2021-04-03 18:11:22 +02:00 · 2021-04-03 17:57:24 +02:00 · 2021-04-03 15:26:07 +02:00
7 changed files with 213 additions and 34 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -61,6 +61,31 @@ trigger:
  event:
    - push
 ---
 kind: pipeline
 type: kubernetes
 name: build:testing
 steps:
  - name: build testing
    image: plugins/docker
    depends_on: [clone]
    settings:
      username:
        from_secret: docker_username
      password:
        from_secret: docker_password
      repo: registry.odit.services/lfk/selfservice
      tags:
        - testing
      registry: registry.odit.services
      mtu: 1000
 trigger:
  branch:
    - bugfix/31-env_linking
  event:
    - push
 ---
 kind: pipeline
 type: kubernetes
--- a/index.html
+++ b/index.html
@@ -10,8 +10,8 @@
 <body class="dark:bg-gray-900 text-black dark:text-white p-0">
  <div id="app"></div>
-  <script src="/env.js"></script>
+  <script src="./env.js"></script>
-  <script defer type="module" src="/src/main.js"></script>
+  <script defer type="module" src="./src/main.js"></script>
 </body>
 </html>
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -1,4 +1,5 @@
 {
    "access_is_only_provided_via_your_email_link": "Der Zugang erfolgt nur über den Link, den Sie bei der Registrierung erhalten haben.",
    "already_have_an_account": "Sie haben bereits einen Account?",
    "apartment_suite_etc": "Addresszeile 2",
    "cancel_keep_my_data": "Abbrechen, meine Daten behalten",
@@ -18,10 +19,13 @@
    "imprint": "Impressum",
    "lap_time": "Rundenzeit",
    "lap_times": "Rundenzeiten",
    "lost_your_registration_mail": "Haben Sie Ihre Registrierungsmail verloren?",
    "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",
    "no_laps_scans_were_recorded_yet": "Es wurden noch keine Runden / Scans aufgezeichnet ...",
    "not_registered_yet": "Noch nicht registriert?",
    "organization": "Organisation",
    "ort": "Ort",
    "phone_number": "Telefonnummer",
    "please_provide_a_valid_zipcode": "Bitte geben Sie eine gültige Postleitzahl an...",
@@ -34,7 +38,9 @@
        "register_now": "Jetzt für den Lauf für Kaya! 2021 registrieren."
    },
    "register_now": "Jetzt registrieren!",
    "register_now_small": "Jetzt registrieren",
    "registrieren": "Registrieren",
    "resend_the_registration_mail": "Registrierungsmail erneut versenden",
    "save_changes": "Änderungen speichern",
    "sponsoring": "Sponsoring",
    "strasse": "Straße",
@@ -42,5 +48,7 @@
    "this_is_not_a_valid_international_phone_number": "Dies ist keine gültige internationale Telefonnummer",
    "tos": "AGBs",
    "view_my_data": "Meine Läuferdaten einsehen",
-    "vorname": "Vorname"
+    "vorname": "Vorname",
    "you_have_been_registered": "Sie wurden registriert!",
    "you_have_not_provided_a_valid_access_key": "Sie haben keinen gültigen Zugangsschlüssel angegeben..."
 }
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1,4 +1,5 @@
 {
    "access_is_only_provided_via_your_email_link": "Access is only provided via the link you received upon registration.",
    "all_data_deleted": "All Data deleted!",
    "already_have_an_account": "Already have an account?",
    "apartment_suite_etc": "Apartment, suite, etc.",
@@ -18,10 +19,12 @@
    "imprint": "Imprint",
    "lap_time": "Lap time",
    "lap_times": "Lap times",
    "lost_your_registration_mail": "Lost your registration mail?",
    "main_page_text": "Here you can register for the Lauf Für Kaya! or manage your runner profile.",
    "mittelname": "Middlename",
    "nachname": "Lastname",
    "no_laps_scans_were_recorded_yet": "No laps/ scans were recorded yet...",
    "not_registered_yet": "Not registered yet?",
    "organization": "Organization",
    "ort": "City",
    "phone_number": "Phone Number",
@@ -35,7 +38,9 @@
        "register_now": "Register now for Lauf für Kaya! 2021."
    },
    "register_now": "Register now!",
    "register_now_small": "Register now",
    "registrieren": "Register Now",
    "resend_the_registration_mail": "Resend the registration mail",
    "save_changes": "Save changes",
    "sponsoring": "Sponsoring",
    "strasse": "Street/ Block",
@@ -44,5 +49,6 @@
    "tos": "Terms of Service",
    "view_my_data": "View my data",
    "vorname": "Firstname",
-    "you_have_been_registered": "You have been registered!"
+    "you_have_been_registered": "You have been registered!",
    "you_have_not_provided_a_valid_access_key": "You have not provided a valid access key..."
 }
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -11,10 +11,10 @@
        <div class="mt-6 sm:flex place-content-center">
          <a
            class="w-full sm:w-auto inline-flex px-6 py-3 border border-transparent text-base font-semibold rounded-md text-gray-900 bg-white shadow-sm hover:text-gray-600 focus:outline-none focus:text-gray-600 transition ease-in-out duration-150 xl:text-lg xl:py-4"
-            href="./register"
+            href="./register/"
          >{{ $t('register_now') }}</a>
          <a
-            href="./profile"
+            href="./profile/"
            class="mt-4 sm:ml-4 sm:mt-0 w-full sm:w-auto inline-flex px-6 py-3 border border-transparent text-base font-semibold rounded-md text-white bg-gray-800 shadow-sm hover:bg-gray-700 focus:outline-none focus:bg-gray-700 transition ease-in-out duration-150 xl:text-lg xl:py-4"
          >{{ $t('view_my_data') }}</a>
        </div>
--- a/src/views/Profile.vue
+++ b/src/views/Profile.vue
@@ -16,6 +16,7 @@
            <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"
              @click="get_certificate"
            >
              <svg
                xmlns="http://www.w3.org/2000/svg"
@@ -258,6 +259,7 @@ const state = reactive({
  group: "",
  activetab: "profile",
  delete_active: false,
  fullobject: {}
 })
 const toast = useToast();
 const props = defineProps({
@@ -272,6 +274,7 @@ axios.get(`${config.baseurl}api/runners/me/${accesstoken}`)
    state.middlename = data.middlename;
    state.lastname = data.lastname;
    state.group = data.group;
    state.fullobject = data;
  }).catch((error) => {
    toast.error("An error occured while loading your profile data");
  })
@@ -298,4 +301,38 @@ function delete_me() {
      toast.error("An error occured while deleting your profile data");
    });
 }
 function get_certificate() {
  toast("Generation in progress...");
  const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
  let url = `${config.baseurl}documents/certificates?locale=${browserlocale}&download=true&key=${config.documentserver_key}`;
  let postdata = Object.assign({}, state.fullobject);
  postdata.group = {
    name: postdata.group
  }
  postdata = [postdata]
  axios.post(url, postdata, {
    responseType: "blob"
  })
    .then((response) => {
      console.log(response)
      if (response.status != "200") {
        toast.error("An error occured while generateing your 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("Document generated!");
      }
    })
    .catch((err) => {
      console.error(err);
      toast.error("An error occured while deleting your profile data");
    });
 }
 </script>
--- a/src/views/ProfileNone.vue
+++ b/src/views/ProfileNone.vue
@@ -1 +1,104 @@
-<template>You have not provided a valid access key...</template>
+<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! - {{ $t('profile') }}</h1>
            <p class="mx-auto leading-relaxed text-base text-center">
                {{ $t('you_have_not_provided_a_valid_access_key') }}
                <br />
                {{ $t('access_is_only_provided_via_your_email_link') }}
            </p>
            <div class="mt-6">
                <div class="relative">
                    <div class="absolute inset-0 flex items-center">
                        <div class="w-full border-t border-gray-300"></div>
                    </div>
                    <div class="relative flex justify-center text-sm">
                        <span
                            class="px-2 bg-white dark:bg-gray-900"
                        >{{ $t('lost_your_registration_mail') }}</span>
                    </div>
                </div>
                <div class="mt-4">
                    <label for="email_address" class="block font-medium">
                        {{ $t('e_mail_adress') }}
                        <span class="font-bold">*</span>
                    </label>
                    <input
                        v-model="user_email"
                        name="email_address"
                        id="email_address"
                        autocomplete="off"
                        :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)"
                        class="text-sm"
                    >{{ $t('please_provide_valid_mail') }}</p>
                </div>
                <div class="mt-2">
                    <a
                        :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>
                </div>
            </div>
            <div class="mt-12">
                <div class="relative">
                    <div class="absolute inset-0 flex items-center">
                        <div class="w-full border-t border-gray-300"></div>
                    </div>
                    <div class="relative flex justify-center text-sm">
                        <span class="px-2 bg-white dark:bg-gray-900">{{ $t('not_registered_yet') }}</span>
                    </div>
                </div>
                <div class="mt-2">
                    <a
                        href="./register/"
                        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('register_now_small') }}</a>
                </div>
            </div>
        </div>
    </div>
 </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 { useToast } from "vue-toastification";
 let user_email = ref("");
 // 
 const state = reactive({
    org_name: "",
    org_teams: [],
    submit_enabled: computed(() => isEmail(user_email.value))
 })
 const toast = useToast();
 function resendMail() {
    if (isEmail(user_email.value)) {
        toast("sending password reset mail...");
        const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
        axios.post(`${config.baseurl}api/runners/forgot?mail=${user_email.value}&locale=${browserlocale}`)
            .then(({ data }) => {
                console.log(data);
                toast("sent password reset mail to " + user_email.value + "!");
            })
            .catch((error) => {
                console.log(error);
                toast("user does not exist...");
            });
    }
 }
 </script>
Author	SHA1	Message	Date
Nicolai Ort	7064a5bd82	Merge branch 'dev' into feature/19-runner_certficates	2021-04-03 16:28:18 +00:00
Nicolai Ort	fd6bd88d42	Merge pull request 'Env linking bugfix bugfix/31-env_linking' (#37 ) from bugfix/31-env_linking into dev All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #37	2021-04-03 16:27:56 +00:00
Nicolai Ort	f0a7f35dec	Renoved fixed data ref #19	2021-04-03 18:11:57 +02:00
Nicolai Ort	b938cfc49e	Fixed blob handling ref #19	2021-04-03 18:11:22 +02:00
Nicolai Ort	f6334397dc	first part of certificate generation with manual data ref #19	2021-04-03 17:57:24 +02:00
Nicolai Ort	544542ac1e	Added building pipeline for current branch All checks were successful continuous-integration/drone/push Build is passing Details ref #31	2021-04-03 15:26:07 +02:00
Nicolai Ort	67c0dae537	Now manually linking env and main ref #31	2021-04-03 15:24:52 +02:00
Philipp Dormann	cd6a139daf	Merge pull request 'feature/30-profile-forgot-link' (#35 ) from feature/30-profile-forgot-link into dev Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #35 close #30	2021-04-02 19:00:50 +00:00
Nicolai Ort	ec44a8b63e	Merge branch 'dev' into feature/30-profile-forgot-link # Conflicts: # src/locales/en.json # src/views/Home.vue	2021-04-01 19:58:37 +02:00
Nicolai Ort	713db5e1e8	Removed useless code ref #30	2021-04-01 19:55:23 +02:00
Nicolai Ort	0795ea318d	Fixed post url and body ref #30	2021-04-01 19:55:01 +02:00
Philipp Dormann	30f3a51ef8	add forgot view + action ref #30	2021-04-01 19:22:23 +02:00
Philipp Dormann	60dea511b9	🐞 fix home routes ref #30	2021-04-01 19:07:14 +02:00
Philipp Dormann	863568d7d0	basic ProfileNone layout ref #30	2021-04-01 19:07:04 +02:00