Compare commits
13 Commits
Author | SHA1 | Date | |
---|---|---|---|
c2b615294e
|
|||
c64762831f
|
|||
9b446abc1f
|
|||
5d974e562e
|
|||
a030f6b738
|
|||
1249248a9d
|
|||
0bd6d543bf
|
|||
92d7bfd594
|
|||
917cb6be34
|
|||
d159cb59be
|
|||
9812d79d4d
|
|||
4663214ede | |||
9c9ceaa666 |
17
.drone.yml
17
.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]
|
||||
|
33
CHANGELOG.md
33
CHANGELOG.md
@@ -2,8 +2,41 @@
|
||||
|
||||
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
|
||||
|
||||
#### [0.7.7](https://git.odit.services/lfk/selfservice/compare/0.7.6...0.7.7)
|
||||
|
||||
- fix: registration w/o phone [`c647628`](https://git.odit.services/lfk/selfservice/commit/c64762831f1e6dffc9cbc3f531e23435b455a5a9)
|
||||
|
||||
#### [0.7.6](https://git.odit.services/lfk/selfservice/compare/0.7.5...0.7.6)
|
||||
|
||||
> 31 January 2023
|
||||
|
||||
- update texts of pdf generation status toasts [`#44`](https://git.odit.services/lfk/selfservice/issues/44)
|
||||
- 🚀Bumped version to v0.7.6 [`9b446ab`](https://git.odit.services/lfk/selfservice/commit/9b446abc1fa231bb1f5a78c545400c617eaa4af5)
|
||||
- update release script [`5d974e5`](https://git.odit.services/lfk/selfservice/commit/5d974e562ed1ed5aeac579afe000c2dca945ff71)
|
||||
|
||||
#### [0.7.5](https://git.odit.services/lfk/selfservice/compare/0.7.4...0.7.5)
|
||||
|
||||
> 30 January 2023
|
||||
|
||||
- fix: relativ links [`917cb6b`](https://git.odit.services/lfk/selfservice/commit/917cb6be340844bcc2318bf73cec37c3c831fd5d)
|
||||
- 🚀Bumped version to v0.7.5 [`1249248`](https://git.odit.services/lfk/selfservice/commit/1249248a9d3e0d72665bca6871a651f2491a4039)
|
||||
- 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)
|
||||
|
@@ -1,10 +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
|
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"name": "@odit/lfk-selfservice",
|
||||
"version": "0.7.3",
|
||||
"version": "0.7.7",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "vite build",
|
||||
"release": "release-it --only-version",
|
||||
"release": "release-it",
|
||||
"postbuild": "node env_fix.js"
|
||||
},
|
||||
"dependencies": {
|
||||
@@ -36,7 +36,7 @@
|
||||
"requireCleanWorkingDir": false,
|
||||
"commitMessage": "🚀Bumped version to v${version}",
|
||||
"requireBranch": "dev",
|
||||
"push": false,
|
||||
"push": true,
|
||||
"tag": true,
|
||||
"tagName": null,
|
||||
"tagAnnotation": "v${version}"
|
||||
|
@@ -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"
|
||||
|
@@ -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>
|
||||
@@ -101,7 +101,7 @@ function login() {
|
||||
axios.get("").then((res) => {
|
||||
loading.value = false;
|
||||
Toastify({
|
||||
text: "This is a toast",
|
||||
text: "Login läuft...",
|
||||
duration: 3000,
|
||||
}).showToast();
|
||||
});
|
||||
|
@@ -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>
|
||||
@@ -101,7 +101,7 @@ function login() {
|
||||
axios.get("").then((res) => {
|
||||
loading.value = false;
|
||||
Toastify({
|
||||
text: "This is a toast",
|
||||
text: "Login läuft...",
|
||||
duration: 3000,
|
||||
}).showToast();
|
||||
});
|
||||
|
@@ -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",
|
||||
|
@@ -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",
|
||||
|
@@ -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>
|
||||
|
@@ -359,7 +359,7 @@ axios.get(`${config.baseurl}api/runners/me/${accesstoken}`)
|
||||
state.sponsorings = data.distanceDonations;
|
||||
state.fullobject = data;
|
||||
}).catch((error) => {
|
||||
toast.error("An error occured while loading your profile data");
|
||||
toast.error("Profil konnte nicht geladen werden...");
|
||||
})
|
||||
axios.get(`${config.baseurl}api/runners/me/${accesstoken}/scans`)
|
||||
.then(({ data }) => {
|
||||
@@ -371,22 +371,22 @@ axios.get(`${config.baseurl}api/runners/me/${accesstoken}/scans`)
|
||||
data.filter(s => s.valid === true);
|
||||
state.scans = data;
|
||||
}).catch((error) => {
|
||||
toast.error("An error occured while loading your profile data");
|
||||
toast.error("Profil konnte nicht geladen werden...");
|
||||
})
|
||||
function delete_me() {
|
||||
toast("Deletion in progress...");
|
||||
toast("Profil wird gelöscht...");
|
||||
let url = `${config.baseurl}api/runners/me/${accesstoken}?force=true`
|
||||
axios.delete(url)
|
||||
.then(() => {
|
||||
toast("All Data deleted!");
|
||||
toast("Alle Daten gelöscht!");
|
||||
location.replace(`${config.baseurl_selfservice}`);
|
||||
})
|
||||
.catch((error) => {
|
||||
toast.error("An error occured while deleting your profile data");
|
||||
toast.error("Profil konnte nicht gelöscht werden...");
|
||||
});
|
||||
}
|
||||
function get_certificate() {
|
||||
toast("Generation in progress...");
|
||||
toast("Urkunde wird generiert...");
|
||||
const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
|
||||
let url = `${config.baseurl_documentserver}certificates?locale=${browserlocale}&download=true&key=${config.documentserver_key}`;
|
||||
let postdata = Object.assign({}, state.fullobject);
|
||||
@@ -400,7 +400,7 @@ function get_certificate() {
|
||||
.then((response) => {
|
||||
console.log(response)
|
||||
if (response.status != "200") {
|
||||
toast.error("An error occured while generateing your certificate!");
|
||||
toast.error("Urkunde konnte nicht generiert werden...");
|
||||
} else {
|
||||
var fileURL = window.URL.createObjectURL(new Blob([response.data], { type: 'application/pdf' }));
|
||||
var fileLink = document.createElement('a');
|
||||
@@ -411,7 +411,7 @@ function get_certificate() {
|
||||
|
||||
fileLink.click();
|
||||
fileLink.remove();
|
||||
toast("Document generated!");
|
||||
toast("Urkunde generiert!");
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
|
@@ -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>
|
||||
@@ -88,16 +88,16 @@ const state = reactive({
|
||||
const toast = useToast();
|
||||
function resendMail() {
|
||||
if (isEmail(user_email.value)) {
|
||||
toast("sending password reset mail...");
|
||||
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}`)
|
||||
.then(({ data }) => {
|
||||
console.log(data);
|
||||
toast("sent password reset mail to " + user_email.value + "!");
|
||||
toast("Login-Link gesendet an " + user_email.value + "!");
|
||||
})
|
||||
.catch((error) => {
|
||||
console.log(error);
|
||||
toast("user does not exist...");
|
||||
toast("Fehler beim Anfordern des Login-Links...");
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@@ -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') }}
|
||||
@@ -277,7 +277,7 @@ const state = reactive({
|
||||
const toast = useToast();
|
||||
function login() {
|
||||
userdetails = userdetails.value;
|
||||
if (userdetails.phone === "" || isMobilePhone(userdetails.phone)) {
|
||||
if (userdetails?.phone === "" || isMobilePhone(userdetails.phone)) {
|
||||
if (isEmail(userdetails.mail)) {
|
||||
let postdata = {
|
||||
"email": userdetails.mail,
|
||||
@@ -301,7 +301,7 @@ function login() {
|
||||
if (state.org_name !== '' && state.org_teams.length > 0) {
|
||||
postdata.team = org_team.value;
|
||||
}
|
||||
toast("registration in progress...");
|
||||
toast("Registrierung läuft...");
|
||||
const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
|
||||
let url = `${config.baseurl}api/runners/register/?locale=${browserlocale}`;
|
||||
if (props.token) {
|
||||
|
Reference in New Issue
Block a user