Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
240f44df60 | |||
677e65f44a | |||
772eca64bb | |||
25d25401df | |||
cac5103d52 | |||
6aca13f0cb | |||
78fea1ea04 |
66
.drone.yml
66
.drone.yml
@ -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
|
12
CHANGELOG.md
12
CHANGELOG.md
@ -2,9 +2,21 @@
|
|||||||
|
|
||||||
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)
|
#### [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)
|
- 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)
|
- 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)
|
||||||
|
15
Dockerfile
15
Dockerfile
@ -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
|
@ -1,12 +1,15 @@
|
|||||||
{
|
{
|
||||||
"name": "@odit/lfk-selfservice",
|
"name": "@odit/lfk-selfservice",
|
||||||
"version": "0.11.2",
|
"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
1001
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@ -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
|
||||||
|
@ -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"
|
||||||
/>
|
/>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user