🚀Bumped version to v0.7.5

Reviewed-on: #43

.drone.yml

@@ -25,23 +25,6 @@ type: kubernetes
 name: build:dev
 
 steps:
-  # - name: run full license export
-  #   depends_on: ["clone"]
-  #   image: node:alpine
-  #   commands:
-  #     - yarn
-  #     - yarn licenses:export
-  # - name: push new licenses file to repo
-  #   depends_on: ["run full license export"]
-  #   image: appleboy/drone-git-push
-  #   settings:
-  #     branch: dev
-  #     commit: true
-  #     commit_message: new license file version [CI SKIP]
-  #     author_email: bot@odit.services
-  #     remote: git@git.odit.services:lfk/selfservice.git
-  #     ssh_key:
-  #       from_secret: git_ssh
   - name: build dev
     image: plugins/docker
     depends_on: [clone]

CHANGELOG.md

@@ -2,8 +2,66 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [0.7.5](https://git.odit.services/lfk/selfservice/compare/0.7.4...0.7.5)
+
+- fix: relativ links [`917cb6b`](https://git.odit.services/lfk/selfservice/commit/917cb6be340844bcc2318bf73cec37c3c831fd5d)
+- 2023 [`9812d79`](https://git.odit.services/lfk/selfservice/commit/9812d79d4de820ce791f69634c5861f4f04ad7f1)
+- update nginx base [`0bd6d54`](https://git.odit.services/lfk/selfservice/commit/0bd6d543bf60b7a333b96d5d319269d4bf50db96)
+- updated base node image [`92d7bfd`](https://git.odit.services/lfk/selfservice/commit/92d7bfd59407273f86809b53ffc9f67fb8ba0ec7)
+- AGB link [`d159cb5`](https://git.odit.services/lfk/selfservice/commit/d159cb59be35f963abc89c42732ba6110d27830c)
+
+#### [0.7.4](https://git.odit.services/lfk/selfservice/compare/0.7.3...0.7.4)
+
+> 21 April 2021
+
+- Updated dronefile [`9c9ceaa`](https://git.odit.services/lfk/selfservice/commit/9c9ceaa6664f6ea21a536a12f04e552156e81da4)
+- 🚀Bumped version to v0.7.4 [`4663214`](https://git.odit.services/lfk/selfservice/commit/4663214ede3880386b5389885e32c953571290e6)
+
+#### [0.7.3](https://git.odit.services/lfk/selfservice/compare/0.7.2...0.7.3)
+
+> 21 April 2021
+
+- 🚀Bumped version to v0.7.3 [`602d80b`](https://git.odit.services/lfk/selfservice/commit/602d80bd14c4bd00a24b746be1e74d9e41af0445)
+- Merge pull request 'Button fixes bugfix/42-button_links' (#43) from bugfix/42-button_links into dev [`45ee4ab`](https://git.odit.services/lfk/selfservice/commit/45ee4ab81260adf5b938d9f5359d256cce879acb)
+- Removed useless register now button [`1102d29`](https://git.odit.services/lfk/selfservice/commit/1102d29c0e174b7a34fc4d3e6fe32d2dfb276765)
+- Fixed register button link [`020c310`](https://git.odit.services/lfk/selfservice/commit/020c310865912b8f0752069e1c7e2adf71ab9835)
+
+#### [0.7.2](https://git.odit.services/lfk/selfservice/compare/0.7.1...0.7.2)
+
+> 14 April 2021
+
+- 🚀Bumped version to v0.7.2 [`1a3af20`](https://git.odit.services/lfk/selfservice/commit/1a3af200dd41c8cc4271690ed72bef911901ce54)
+- Document generation hotfix 🐞 [`b74bea0`](https://git.odit.services/lfk/selfservice/commit/b74bea03401c672ae774aaddc6da5beb67e2890e)
+
+#### [0.7.1](https://git.odit.services/lfk/selfservice/compare/0.7.0...0.7.1)
+
+> 13 April 2021
+
+- Merge pull request 'bugfix/31-env-js-linking-ci' (#41) from bugfix/31-env-js-linking-ci into dev [`#31`](https://git.odit.services/lfk/selfservice/issues/31)
+- ⏫ dependency bump [`ad13bae`](https://git.odit.services/lfk/selfservice/commit/ad13bae068416bed10d00e6887a05d580a836482)
+- 🚀Bumped version to v0.7.1 [`b0172c5`](https://git.odit.services/lfk/selfservice/commit/b0172c500b0613209ac44e61023043065b3854b0)
+- added 'yarn postbuild' script for fixing env.js in dist/index.html [`51d058b`](https://git.odit.services/lfk/selfservice/commit/51d058bf966c3dcb064562e6bf696a748d0cd148)
+
+#### [0.7.0](https://git.odit.services/lfk/selfservice/compare/0.6.1...0.7.0)
+
+> 6 April 2021
+
+- 🚀Bumped version to v0.7.0 [`152e741`](https://git.odit.services/lfk/selfservice/commit/152e74190d13d30110d494a9062f868390ca19b3)
+- Merge pull request 'Donation list feature/39-donation_list' (#40) from feature/39-donation_list into dev [`4c83e2e`](https://git.odit.services/lfk/selfservice/commit/4c83e2e738a075354383dca4d500808f761247d2)
+- Added total to bottom of page [`89820d4`](https://git.odit.services/lfk/selfservice/commit/89820d44501793365248b8e778522cdc188afa70)
+- Sorted translations 🌍 [`cb1b9d3`](https://git.odit.services/lfk/selfservice/commit/cb1b9d330b28f11cceed9691aee4ccee5246d346)
+- Added basic sponsoring table [`f141130`](https://git.odit.services/lfk/selfservice/commit/f141130db5ede60a623747f4e324f66259e5bc75)
+- Added translations 🌍 [`d713fbe`](https://git.odit.services/lfk/selfservice/commit/d713fbef94e75fbbc62254ea8f0ca50dc4e93d79)
+- Now w/ formatted currency amount [`815a36f`](https://git.odit.services/lfk/selfservice/commit/815a36f20271f47f49c3814b001c3404d43113cd)
+- Fixed spaces in name [`baa6da3`](https://git.odit.services/lfk/selfservice/commit/baa6da3dd06c493fccc61945b9bcbd9b2e79d910)
+- Updated env description [`5a123b0`](https://git.odit.services/lfk/selfservice/commit/5a123b0cf89f49d450becbbc03b28c5bb6416b7c)
+- added distance formatting [`121022c`](https://git.odit.services/lfk/selfservice/commit/121022c8434484a363a3f2ea68aba4d8ef7cad2d)
+
 #### [0.6.1](https://git.odit.services/lfk/selfservice/compare/0.6.0...0.6.1)
 
+> 6 April 2021
+
+- 🚀Bumped version to v0.6.1 [`f5ae214`](https://git.odit.services/lfk/selfservice/commit/f5ae2145df07413329f60c229d9571fd1de2ca79)
 - Fixed imprint/privacy default links [`96c0e56`](https://git.odit.services/lfk/selfservice/commit/96c0e5698697361e65c5aa80c9a0aada5c3d5f30)
 
 #### [0.6.0](https://git.odit.services/lfk/selfservice/compare/0.5.1...0.6.0)

Dockerfile

@@ -1,9 +1,10 @@
-FROM node:15.9.0-alpine3.13
+FROM registry.odit.services/hub/library/node:15.9.0-alpine3.13
 WORKDIR /app
 COPY . .
 RUN yarn
 RUN yarn build
+RUN yarn postbuild
 # final image
-FROM fholzer/nginx-brotli:v1.19.1
+FROM registry.odit.services/library/nginx-brotli:3.15
 COPY --from=0 /app/dist /usr/share/nginx/html
 COPY ./nginx.conf /etc/nginx/nginx.conf

env_fix.js

@@ -0,0 +1,6 @@
+const fs = require('fs');
+if (fs.existsSync('./dist/index.html')) {
+	const content = fs.readFileSync('./dist/index.html', { encoding: 'utf8' });
+	const newcontent = content.replace(`"/env.js"`, `"./env.js"`);
+	fs.writeFileSync('./dist/index.html', newcontent);
+}

package.json

@@ -1,17 +1,18 @@
 {
 	"name": "@odit/lfk-selfservice",
-	"version": "0.6.1",
+	"version": "0.7.5",
 	"scripts": {
 		"dev": "vite",
 		"build": "vite build",
-		"release": "release-it --only-version"
+		"release": "release-it --only-version",
+		"postbuild": "node env_fix.js"
 	},
 	"dependencies": {
-		"marked": "2.0.1",
+		"marked": "2.0.3",
 		"redaxios": "0.4.1",
 		"toastify-js": "1.10.0",
 		"validator": "13.5.2",
-		"vue-i18n": "9.0.0",
+		"vue-i18n": "9.1.4",
 		"vue-toastification": "2.0.0-rc.1",
 		"vue": "3.0.9",
 		"vue-router": "4.0.5"
@@ -23,10 +24,10 @@
 		"@tailwindcss/line-clamp": "0.2.0",
 		"@tailwindcss/typography": "0.4.0",
 		"@vitejs/plugin-vue": "1.2.1",
-		"@vue/compiler-sfc": "3.0.10",
+		"@vue/compiler-sfc": "3.0.11",
 		"autoprefixer": "10.2.5",
-		"tailwindcss": "2.0.4",
-		"release-it": "14.5.0",
+		"tailwindcss": "2.1.1",
+		"release-it": "14.6.1",
 		"vite": "2.1.5"
 	},
 	"release-it": {

public/env.sample.js

@@ -5,6 +5,8 @@ const config = {
 	baseurl: '',
 	// optional, will fallback to /selfservice/
 	baseurl_selfservice: '/selfservice/',
+	// full url (including fqdn)
+	baseurl_documentserver: 'http://localhost:4010/documents',
 	// optional, will fallback to baseurl_selfservice/imprint
 	url_imprint: '',
 	// optional, will fallback to baseurl_selfservice/privacy

src/components/Footer.vue

@@ -2,7 +2,7 @@
   <footer class="text-gray-400 bg-gray-900 body-font">
     <div class="container px-5 py-8 mx-auto flex items-center sm:flex-row flex-col">
       <p class="text-sm text-gray-400 sm:ml-4 sm:pl-4 sm:py-2 sm:mt-0 mt-4">
-        Lauf für Kaya! Selfservice - Copyright © 2021 + proudly powered by
+        Lauf für Kaya! Selfservice - Copyright © 2023 + proudly powered by
         <a
           class="underline"
           target="_blank"

src/components/Login.vue

@@ -29,7 +29,7 @@
               placeholder="Passwort"
             />
             <div class="absolute inset-y-0 right-0 pr-3 flex items-center text-sm">
-              <a href="./reset" class="text-gray-900 underline">Passwort vergessen?</a>
+              <a href="/selfservice/reset" class="text-gray-900 underline">Passwort vergessen?</a>
             </div>
           </div>
         </div>
@@ -80,7 +80,7 @@
         </div>
         <div class="mt-6">
           <a
-            href="./register"
+            href="/selfservice/register"
             class="block w-full text-center py-2 px-3 border border-gray-300 rounded-md font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm"
           >Account erstellen</a>
         </div>

src/components/LoginForm.vue

@@ -29,7 +29,7 @@
               placeholder="Passwort"
             />
             <div class="absolute inset-y-0 right-0 pr-3 flex items-center text-sm">
-              <a href="./reset" class="text-gray-900 underline">Passwort vergessen?</a>
+              <a href="/selfservice/reset" class="text-gray-900 underline">Passwort vergessen?</a>
             </div>
           </div>
         </div>
@@ -80,7 +80,7 @@
         </div>
         <div class="mt-6">
           <a
-            href="./register"
+            href="/selfservice/register"
             class="block w-full text-center py-2 px-3 border border-gray-300 rounded-md font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm"
           >Account erstellen</a>
         </div>

src/locales/de.json

@@ -38,7 +38,7 @@
     "profile": "Profil",
     "provide_address": "Adresse angeben?",
     "register": {
-    "register_now": "Jetzt für den Lauf für Kaya! 2021 registrieren."
+        "register_now": "Jetzt für den Lauf für Kaya! 2023 registrieren."
     },
     "register_now": "Jetzt registrieren!",
     "register_now_small": "Jetzt registrieren",
@@ -50,9 +50,9 @@
     "the_system_is_not_properly_configured_please_contact_the_system_administrator_for_help": "Das System ist nicht richtig konfiguriert. Bitte wenden Sie sich an den Systemadministrator, um Hilfe zu erhalten.",
     "this_is_not_a_valid_international_phone_number": "Dies ist keine gültige internationale Telefonnummer",
     "tos": "AGBs",
+    "total": "Gesamt",
     "view_my_data": "Meine Läuferdaten einsehen",
     "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...",
-  "total": "Gesamt"
+    "you_have_not_provided_a_valid_access_key": "Sie haben keinen gültigen Zugangsschlüssel angegeben..."
 }

src/locales/en.json

@@ -38,7 +38,7 @@
     "profile": "Profile",
     "provide_address": "Provide a postal address?",
     "register": {
-    "register_now": "Register now for Lauf für Kaya! 2021."
+        "register_now": "Register now for Lauf für Kaya! 2023."
     },
     "register_now": "Register now!",
     "register_now_small": "Register now",
@@ -50,9 +50,9 @@
     "the_system_is_not_properly_configured_please_contact_the_system_administrator_for_help": "The system is not properly configured. Please contact the system administrator for help.",
     "this_is_not_a_valid_international_phone_number": "This is not a valid international phone number",
     "tos": "Terms of Service",
+    "total": "Total",
     "view_my_data": "View my data",
     "vorname": "Firstname",
     "you_have_been_registered": "You have been registered!",
-  "you_have_not_provided_a_valid_access_key": "You have not provided a valid access key...",
-  "total": "Total"
+    "you_have_not_provided_a_valid_access_key": "You have not provided a valid access key..."
 }

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="/selfservice/register/"
           >{{ $t('register_now') }}</a>
           <a
-            href="./profile/"
+            href="/selfservice/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>

src/views/Profile.vue

@@ -388,7 +388,7 @@ function delete_me() {
 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 url = `${config.baseurl_documentserver}certificates?locale=${browserlocale}&download=true&key=${config.documentserver_key}`;
   let postdata = Object.assign({}, state.fullobject);
   postdata.group = {
     name: postdata.group
@@ -416,7 +416,7 @@ function get_certificate() {
     })
     .catch((err) => {
       console.error(err);
-      toast.error("An error occured while deleting your profile data");
+      toast.error("An error occured while generating your certificate");
     });
 }
 </script>

src/views/ProfileNone.vue

@@ -61,7 +61,7 @@
                 </div>
                 <div class="mt-2">
                     <a
-                        href="./register/"
+                        href="/selfservice/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>

src/views/Register.vue

@@ -200,7 +200,7 @@
               <a
                 target="_blank"
                 rel="noreferrer,noopener"
-                href
+                href="https://lauf-fuer-kaya.de/datenschutz/"
                 class="underline"
               >{{ $t('tos') }}</a>
               {{ $t('i_accept_end') }}
@@ -234,22 +234,6 @@
           >{{ $t('registrieren') }}</button>
         </div>
       </div>
-      <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('already_have_an_account') }}</span>
-          </div>
-        </div>
-        <div class="mt-6">
-          <a
-            href="./login"
-            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('go_to_login') }}</a>
-        </div>
-      </div>
     </div>
   </div>
 </template>