Compare commits

..

10 Commits

Author SHA1 Message Date
240f44df60 🚀Bumped version to v0.11.3
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-07 15:17:49 +02:00
677e65f44a chore(deps): pnpm@8.1.1 2023-04-07 15:17:27 +02:00
772eca64bb fix(Footer): darkmode colors in lightmode
Some checks failed
continuous-integration/drone/push Build is failing
2023-04-07 15:15:26 +02:00
25d25401df fix: registration code white bg
close #50
2023-04-07 15:13:44 +02:00
cac5103d52 switched drone to kaniko with cache
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-29 20:20:06 +02:00
6aca13f0cb Pinned pnpm and lockfile 2023-03-29 20:17:33 +02:00
78fea1ea04 Switched dockerfile to pnpm with cache 2023-03-29 20:17:18 +02:00
fa51b31fe4 🚀Bumped version to v0.11.2
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-15 19:27:59 +01:00
b9624aa5ad Added footer to every page 2023-03-15 19:27:40 +01:00
09e48e771f Accept tos to accept privacy_policy 2023-03-15 19:22:35 +01:00
12 changed files with 588 additions and 588 deletions

View File

@@ -14,10 +14,10 @@ get:
--- ---
kind: secret kind: secret
name: git_ssh name: npm_url
get: get:
path: odit-git-bot path: odit-npm-cache
name: sshkey name: url
--- ---
kind: pipeline kind: pipeline
@@ -25,69 +25,50 @@ type: kubernetes
name: build:dev name: build:dev
steps: steps:
- name: build dev - name: docker dev
image: plugins/docker image: registry.odit.services/library/drone-kaniko
depends_on: [clone] depends_on: [clone]
settings: settings:
username: username:
from_secret: docker_username from_secret: docker_username
password: password:
from_secret: docker_password from_secret: docker_password
repo: registry.odit.services/lfk/selfservice build_args:
- NPM_REGISTRY_URL:
from_secret: npm_url
repo: lfk/selfservice
tags: tags:
- dev - dev
cache: true
registry: registry.odit.services registry: registry.odit.services
mtu: 1000
trigger: trigger:
branch: branch:
- dev - dev
event: event:
- push - 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 kind: pipeline
type: kubernetes type: kubernetes
name: build:latest name: build:latest
steps: steps:
- name: build latest - name: docker latest
image: plugins/docker image: registry.odit.services/library/drone-kaniko
depends_on: [clone] depends_on: [clone]
settings: settings:
username: username:
from_secret: docker_username from_secret: docker_username
password: password:
from_secret: docker_password from_secret: docker_password
repo: registry.odit.services/lfk/selfservice build_args:
- NPM_REGISTRY_URL:
from_secret: npm_url
repo: lfk/selfservice
tags: tags:
- latest - latest
cache: true
registry: registry.odit.services registry: registry.odit.services
mtu: 1000
trigger: trigger:
branch: branch:
- main - main
@@ -99,19 +80,22 @@ kind: pipeline
type: kubernetes type: kubernetes
name: build:tags name: build:tags
steps: steps:
- name: build $DRONE_TAG - name: docker release
image: plugins/docker image: registry.odit.services/library/drone-kaniko
depends_on: [clone] depends_on: [clone]
settings: settings:
username: username:
from_secret: docker_username from_secret: docker_username
password: password:
from_secret: docker_password from_secret: docker_password
repo: registry.odit.services/lfk/selfservice build_args:
- NPM_REGISTRY_URL:
from_secret: npm_url
repo: lfk/selfservice
tags: tags:
- '${DRONE_TAG}' - "${DRONE_TAG}"
cache: true
registry: registry.odit.services registry: registry.odit.services
mtu: 1000
trigger: trigger:
event: event:
- tag - tag

View File

@@ -2,9 +2,29 @@
All notable changes to this project will be documented in this file. Dates are displayed in UTC. All notable changes to this project will be documented in this file. Dates are displayed in UTC.
#### [0.11.3](https://git.odit.services/lfk/selfservice/compare/0.11.2...0.11.3)
- fix: registration code white bg [`#50`](https://git.odit.services/lfk/selfservice/issues/50)
- Pinned pnpm and lockfile [`6aca13f`](https://git.odit.services/lfk/selfservice/commit/6aca13f0cb1bc8fa43f0f09c554cec0758acd7a1)
- switched drone to kaniko with cache [`cac5103`](https://git.odit.services/lfk/selfservice/commit/cac5103d52427e777e4c3624ebb253ad7bd393d6)
- Switched dockerfile to pnpm with cache [`78fea1e`](https://git.odit.services/lfk/selfservice/commit/78fea1ea045a7281fe0a2841fc4d5f1505dcb3cf)
- chore(deps): pnpm@8.1.1 [`677e65f`](https://git.odit.services/lfk/selfservice/commit/677e65f44ae4bcc6f9af4732d813f337da0c51d2)
- fix(Footer): darkmode colors in lightmode [`772eca6`](https://git.odit.services/lfk/selfservice/commit/772eca64bb38ce1cf1ea1b58859dd744588a88e1)
#### [0.11.2](https://git.odit.services/lfk/selfservice/compare/0.11.1...0.11.2)
> 15 March 2023
- Added footer to every page [`b9624aa`](https://git.odit.services/lfk/selfservice/commit/b9624aa5ad57002852c84081fc710c2e977251bd)
- 🚀Bumped version to v0.11.2 [`fa51b31`](https://git.odit.services/lfk/selfservice/commit/fa51b31fe41d41b3ec9becad07ddab4cf73be051)
- 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) #### [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) - 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) #### [0.11.0](https://git.odit.services/lfk/selfservice/compare/0.10.0...0.11.0)

View File

@@ -1,11 +1,12 @@
FROM registry.odit.services/hub/library/node:19.5.0-alpine3.17 FROM registry.odit.services/hub/library/node:19.5.0-alpine3.17 as build
ARG NPM_REGISTRY_URL=https://registry.npmjs.org
WORKDIR /app WORKDIR /app
RUN npm i -g pnpm@7
COPY . . COPY . .
RUN pnpm i --frozen-lockfile RUN npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@8
RUN pnpm build RUN pnpm i && pnpm build && pnpm postbuild
RUN pnpm postbuild
# final image # final image
FROM registry.odit.services/library/nginx-brotli:3.15 FROM registry.odit.services/library/nginx-brotli:3.15 as final
COPY --from=0 /app/dist /usr/share/nginx/html COPY --from=build /app/dist /usr/share/nginx/html
COPY ./nginx.conf /etc/nginx/nginx.conf COPY ./nginx.conf /etc/nginx/nginx.conf

View File

@@ -1,12 +1,15 @@
{ {
"name": "@odit/lfk-selfservice", "name": "@odit/lfk-selfservice",
"version": "0.11.1", "version": "0.11.3",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"build": "vite build", "build": "vite build",
"release": "release-it", "release": "release-it",
"postbuild": "node env_fix.js" "postbuild": "node env_fix.js"
}, },
"engines": {
"pnpm": "8.1.1"
},
"dependencies": { "dependencies": {
"bwip-js": "3.2.2", "bwip-js": "3.2.2",
"marked": "2.0.3", "marked": "2.0.3",

1001
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,5 @@
<template> <template>
<footer class="text-gray-400 bg-gray-900 body-font"> <footer>
<div class="container px-5 py-8 mx-auto flex items-center sm:flex-row flex-col"> <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"> <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 © 2023 + proudly powered by Lauf für Kaya! Selfservice - Copyright © 2023 + proudly powered by

View File

@@ -9,15 +9,18 @@
<div class="mx-auto prose" v-html="content"></div> <div class="mx-auto prose" v-html="content"></div>
</div> </div>
</section> </section>
<Footer></Footer>
</template> </template>
<style src="../simple.css"> <style src="../simple.css">
</style> </style>
<script> <script>
import marked from "marked"; import marked from "marked";
import Footer from "@/components/Footer.vue";
export default { export default {
components: {Footer},
data() { data() {
return { return {
content: "" content: "",
} }
}, },
async beforeMount() { async beforeMount() {

View File

@@ -9,12 +9,15 @@
<div class="mx-auto prose" v-html="content"></div> <div class="mx-auto prose" v-html="content"></div>
</div> </div>
</section> </section>
<Footer></Footer>
</template> </template>
<style src="../simple.css"> <style src="../simple.css">
</style> </style>
<script> <script>
import marked from "marked"; import marked from "marked";
import Footer from "@/components/Footer.vue";
export default { export default {
components: {Footer},
data() { data() {
return { return {
content: "" content: ""

View File

@@ -289,7 +289,7 @@
<div class="form-element"> <div class="form-element">
<div class="text-lg">{{ $t("registrierungscode") }}</div> <div class="text-lg">{{ $t("registrierungscode") }}</div>
<img <img
class="w-full md:w-auto mb-2" class="w-full md:w-auto mb-2 bg-white p-2"
alt="Registrierungscode" alt="Registrierungscode"
:src="state.barcode" :src="state.barcode"
/> />
@@ -639,51 +639,7 @@
</div> </div>
</div> </div>
<!-- --> <!-- -->
<footer <Footer></Footer>
class="
p-4
bg-white
rounded-lg
shadow
md:flex md:items-center md:justify-between md:p-6
dark:bg-gray-800
"
>
<span class="text-sm text-gray-500 sm:text-center dark:text-gray-400"
><span class="font-bold">LfK! 2023</span> -
<a
class="underline"
href="https://odit.services/?ref=lfk"
target="_blank"
>powered by ODIT.Services</a
>
</span>
<ul
class="
flex flex-wrap
items-center
mt-3
text-sm text-gray-500
dark:text-gray-400
sm:mt-0
"
>
<li>
<a
href="https://lauf-fuer-kaya.de/impressum/"
class="mr-4 hover:underline md:mr-6"
>Impressum</a
>
</li>
<li>
<a
href="https://lauf-fuer-kaya.de/datenschutz/"
class="mr-4 hover:underline md:mr-6"
>Datenschutz</a
>
</li>
</ul>
</footer>
</div> </div>
</template> </template>
@@ -692,6 +648,7 @@ import { reactive } from "vue";
import { TYPE, useToast } from "vue-toastification"; import { TYPE, useToast } from "vue-toastification";
import axios from "redaxios"; import axios from "redaxios";
import bwipjs from "bwip-js"; import bwipjs from "bwip-js";
import Footer from "@/components/Footer.vue";
function textToBase64Barcode(text) { function textToBase64Barcode(text) {
const canvas = document.createElement("canvas"); const canvas = document.createElement("canvas");

View File

@@ -68,6 +68,7 @@
</div> </div>
</div> </div>
</div> </div>
<Footer></Footer>
</template> </template>
<script setup> <script setup>
@@ -77,6 +78,7 @@ import isEmail from 'validator/es/lib/isEmail';
import isMobilePhone from 'validator/es/lib/isMobilePhone'; import isMobilePhone from 'validator/es/lib/isMobilePhone';
import isPostalCode from 'validator/es/lib/isPostalCode'; import isPostalCode from 'validator/es/lib/isPostalCode';
import { TYPE, useToast } from "vue-toastification"; import { TYPE, useToast } from "vue-toastification";
import Footer from "@/components/Footer.vue";
let user_email = ref(""); let user_email = ref("");
// //

View File

@@ -389,13 +389,13 @@
for="agb_accepted" for="agb_accepted"
class="font-medium text-gray-400 select-none" class="font-medium text-gray-400 select-none"
> >
{{ $t("i_accept", { tos: $t("tos") }) }} {{ $t("i_accept", { tos: $t("privacy_policy") }) }}
<a <a
target="_blank" target="_blank"
rel="noreferrer,noopener" rel="noreferrer,noopener"
href="https://lauf-fuer-kaya.de/datenschutz/" href="https://lauf-fuer-kaya.de/datenschutz/"
class="underline" class="underline"
>{{ $t("tos") }}</a >{{ $t("privacy_policy") }}</a
> >
{{ $t("i_accept_end") }} {{ $t("i_accept_end") }}
<span class="font-bold">*</span> <span class="font-bold">*</span>
@@ -453,6 +453,7 @@
</div> </div>
</div> </div>
</div> </div>
<Footer></Footer>
</template> </template>
<script setup> <script setup>
@@ -462,6 +463,7 @@ import isEmail from "validator/es/lib/isEmail";
import isMobilePhone from "validator/es/lib/isMobilePhone"; import isMobilePhone from "validator/es/lib/isMobilePhone";
import isPostalCode from "validator/es/lib/isPostalCode"; import isPostalCode from "validator/es/lib/isPostalCode";
import { TYPE, useToast } from "vue-toastification"; import { TYPE, useToast } from "vue-toastification";
import Footer from "@/components/Footer.vue";
const props = defineProps({ const props = defineProps({
token: String, token: String,

View File

@@ -11,9 +11,11 @@
</p> </p>
</div> </div>
</div> </div>
<Footer></Footer>
</template> </template>
<script setup> <script setup>
import Footer from "@/components/Footer.vue";
const props = defineProps({ const props = defineProps({
mail: String, mail: String,
}); });