diff --git a/.drone.yml b/.drone.yml index 4917c26..2172bfe 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,109 +1,117 @@ ---- -kind: secret -name: docker_username -get: - path: odit-registry-builder - name: username - ---- -kind: secret -name: docker_password -get: - path: odit-registry-builder - name: password - ---- -kind: secret -name: git_ssh -get: - path: odit-git-bot - name: sshkey - ---- -kind: pipeline -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] - settings: - username: - from_secret: docker_username - password: - from_secret: docker_password - repo: registry.odit.services/lfk/selfservice - tags: - - dev - registry: registry.odit.services - mtu: 1000 -trigger: - branch: - - dev - event: - - push - ---- -kind: pipeline -type: kubernetes -name: build:latest - -steps: - - name: build latest - image: plugins/docker - depends_on: [clone] - settings: - username: - from_secret: docker_username - password: - from_secret: docker_password - repo: registry.odit.services/lfk/selfservice - tags: - - latest - registry: registry.odit.services - mtu: 1000 -trigger: - branch: - - main - event: - - push - ---- -kind: pipeline -type: kubernetes -name: build:tags -steps: - - name: build $DRONE_TAG - image: plugins/docker - depends_on: [clone] - settings: - username: - from_secret: docker_username - password: - from_secret: docker_password - repo: registry.odit.services/lfk/selfservice - tags: - - '${DRONE_TAG}' - registry: registry.odit.services - mtu: 1000 -trigger: - event: +--- +kind: secret +name: docker_username +get: + path: odit-registry-builder + name: username + +--- +kind: secret +name: docker_password +get: + path: odit-registry-builder + name: password + +--- +kind: secret +name: git_ssh +get: + path: odit-git-bot + name: sshkey + +--- +kind: pipeline +type: kubernetes +name: build:dev + +steps: + - name: build dev + image: plugins/docker + depends_on: [clone] + settings: + username: + from_secret: docker_username + password: + from_secret: docker_password + repo: registry.odit.services/lfk/selfservice + tags: + - dev + registry: registry.odit.services + mtu: 1000 +trigger: + branch: + - dev + 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 +name: build:latest + +steps: + - name: build latest + image: plugins/docker + depends_on: [clone] + settings: + username: + from_secret: docker_username + password: + from_secret: docker_password + repo: registry.odit.services/lfk/selfservice + tags: + - latest + registry: registry.odit.services + mtu: 1000 +trigger: + branch: + - main + event: + - push + +--- +kind: pipeline +type: kubernetes +name: build:tags +steps: + - name: build $DRONE_TAG + image: plugins/docker + depends_on: [clone] + settings: + username: + from_secret: docker_username + password: + from_secret: docker_password + repo: registry.odit.services/lfk/selfservice + tags: + - '${DRONE_TAG}' + registry: registry.odit.services + mtu: 1000 +trigger: + event: - tag \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index ec7fec0..88f0822 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,180 @@ All notable changes to this project will be documented in this file. Dates are displayed in UTC. +#### [0.8.0](https://git.odit.services/lfk/selfservice/compare/0.7.11...0.8.0) + +- Merge pull request 'dont autologin on register -> require mail link' (#47) from feature/46-dont-autologin-on-register-require-mail-link into dev [`f7a0682`](https://git.odit.services/lfk/selfservice/commit/f7a0682c3392b8882be4a676882c8a49d55bd5fe) +- add /registered/?mail route [`eb20b54`](https://git.odit.services/lfk/selfservice/commit/eb20b547e79d352f3b7cd1b5ce7b7dbfcf8c19f7) + +#### [0.7.11](https://git.odit.services/lfk/selfservice/compare/0.7.10...0.7.11) + +> 2 February 2023 + +- Profile: improved mobile responsiveness/ design + toast clear [`077b33f`](https://git.odit.services/lfk/selfservice/commit/077b33f03180d0bd6c45becaaa63d3408c645deb) +- 🚀Bumped version to v0.7.11 [`c63adf5`](https://git.odit.services/lfk/selfservice/commit/c63adf557bcb29c8eccc05d5a83d476c75380d95) +- fix: registration code download button style [`52a6b3d`](https://git.odit.services/lfk/selfservice/commit/52a6b3dc776b806eaa8fee058a1c381ab63a8ea5) + +#### [0.7.10](https://git.odit.services/lfk/selfservice/compare/0.7.9...0.7.10) + +> 1 February 2023 + +- Configureable barcode format via bwp-js [`9e06c46`](https://git.odit.services/lfk/selfservice/commit/9e06c464118c5b5d0cd78c8b8379523bf3bfdbd4) +- Added download for registration code [`53800b4`](https://git.odit.services/lfk/selfservice/commit/53800b4fa355bb972e51e71b5b1f98772deed114) +- 🚀Bumped version to v0.7.10 [`8b5e1ca`](https://git.odit.services/lfk/selfservice/commit/8b5e1cac1353373b13cf9d570deb7cadcd437247) +- Pinned version [`6438288`](https://git.odit.services/lfk/selfservice/commit/64382880c40ba5c1e3c9004ce7fc65099849cd44) + +#### [0.7.9](https://git.odit.services/lfk/selfservice/compare/0.7.8...0.7.9) + +> 1 February 2023 + +- migrate to bwip-js [`8cfddb5`](https://git.odit.services/lfk/selfservice/commit/8cfddb502964be7edf45cdc524344ea2f7f20142) +- fix codeconfig.height [`9b261bf`](https://git.odit.services/lfk/selfservice/commit/9b261bf20023561a7c9691dff33c9a6d2b5c0cac) +- 🚀Bumped version to v0.7.9 [`debbd92`](https://git.odit.services/lfk/selfservice/commit/debbd9219cb53dbd48cf0cb7bee329b765ce4647) +- drop jsbarcode [`713dd15`](https://git.odit.services/lfk/selfservice/commit/713dd153126851e8cf1045bf5ba3ca702a39c738) + +#### [0.7.8](https://git.odit.services/lfk/selfservice/compare/0.7.7...0.7.8) + +> 1 February 2023 + +- add barcode to profile [`851190e`](https://git.odit.services/lfk/selfservice/commit/851190e6a7f8b9cccbf05e60f9b50b96c196959c) +- 🚀Bumped version to v0.7.8 [`e5a01bc`](https://git.odit.services/lfk/selfservice/commit/e5a01bcd7629164655cacd10dd1f014260c67c4b) +- certificate generation: success toast styling [`1603a09`](https://git.odit.services/lfk/selfservice/commit/1603a097f71ed85c901baf8da04cb06b86474649) + +#### [0.7.7](https://git.odit.services/lfk/selfservice/compare/0.7.6...0.7.7) + +> 31 January 2023 + +- 🚀Bumped version to v0.7.7 [`c2b6152`](https://git.odit.services/lfk/selfservice/commit/c2b615294e605db37695b13cec1158f535986911) +- 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) + +#### [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) + +> 3 April 2021 + +- 🚀Bumped version to v0.6.0 [`bc1de2a`](https://git.odit.services/lfk/selfservice/commit/bc1de2acdcbf8f3319026887cb6b3d594fcd63dc) +- first part of certificate generation with manual data [`f633439`](https://git.odit.services/lfk/selfservice/commit/f6334397dc99cd38d31ef524bc26ba7d386b33dd) +- Renoved fixed data [`f0a7f35`](https://git.odit.services/lfk/selfservice/commit/f0a7f35dec07508a07d4c11abda297ad0bf91187) +- Revert "🚀Bumped version to v0.6.0" [`145b499`](https://git.odit.services/lfk/selfservice/commit/145b49906bdf2d75abf93e1779f188a691a3a909) +- 🚀Bumped version to v0.6.0 [`0a62e8f`](https://git.odit.services/lfk/selfservice/commit/0a62e8f5d1929bfe9a53a9709a3031f06a2487c3) +- Merge pull request 'Certificate download feature/19-runner_certficates' (#38) from feature/19-runner_certficates into dev [`53eeb6b`](https://git.odit.services/lfk/selfservice/commit/53eeb6be3ddf4735a11b6c4636c28b4d16aa58ee) +- Fixed blob handling [`b938cfc`](https://git.odit.services/lfk/selfservice/commit/b938cfc49e269e76761a752f8257ebbab88f6959) +- Reverted relative linking fix [`c3b2b93`](https://git.odit.services/lfk/selfservice/commit/c3b2b93d90102b4e31cfce15220acfc8fe48a7c5) + +#### [0.5.1](https://git.odit.services/lfk/selfservice/compare/0.5.0...0.5.1) + +> 3 April 2021 + +- Merge pull request 'feature/30-profile-forgot-link' (#35) from feature/30-profile-forgot-link into dev [`#30`](https://git.odit.services/lfk/selfservice/issues/30) +- 🚀Bumped version to v0.5.1 [`1a3c9ed`](https://git.odit.services/lfk/selfservice/commit/1a3c9edeb3987907ffe2223da8f3be079a1c80d2) +- Merge pull request 'Env linking bugfix bugfix/31-env_linking' (#37) from bugfix/31-env_linking into dev [`fd6bd88`](https://git.odit.services/lfk/selfservice/commit/fd6bd88d4238cca2a2755ab1bc51ff7870bef947) +- basic ProfileNone layout [`863568d`](https://git.odit.services/lfk/selfservice/commit/863568d7d0e132dd1b7d13a2cb1afe8db02c472c) +- add forgot view + action [`30f3a51`](https://git.odit.services/lfk/selfservice/commit/30f3a51ef82ad966225abc6fd95508af56106924) +- Added building pipeline for current branch [`544542a`](https://git.odit.services/lfk/selfservice/commit/544542ac1e9717506676c1495c2d530eca833d31) +- Removed useless code [`713db5e`](https://git.odit.services/lfk/selfservice/commit/713db5e1e8fed5f38b3a5d19cfe870eff16eeda1) +- Now manually linking env and main [`67c0dae`](https://git.odit.services/lfk/selfservice/commit/67c0dae537df5842e89c0ed040c0fef02df01b69) +- Fixed post url and body [`0795ea3`](https://git.odit.services/lfk/selfservice/commit/0795ea318d80b764eee89462ad87da86aa7ce0ae) +- 🐞 fix home routes [`60dea51`](https://git.odit.services/lfk/selfservice/commit/60dea511b9fbb6d206ee531618e788e686fa6b5a) + +#### [0.5.0](https://git.odit.services/lfk/selfservice/compare/0.4.5...0.5.0) + +> 1 April 2021 + +- 🚀Bumped version to v0.5.0 [`676f0e8`](https://git.odit.services/lfk/selfservice/commit/676f0e83393be823ccb612846650a9a98bf7f0b3) +- Revert "🚀Bumped version to v0.5.0" [`27fd8f9`](https://git.odit.services/lfk/selfservice/commit/27fd8f9a9106294ae6522f2fff42dfbf84f06f82) +- 🚀Bumped version to v0.5.0 [`b8c1b8c`](https://git.odit.services/lfk/selfservice/commit/b8c1b8c43b6d050d239d836bbb6ace2504fdcd21) +- Merge pull request 'Runner self deletion feature/21-user_deletion' (#36) from feature/21-user_deletion into dev [`bd512e0`](https://git.odit.services/lfk/selfservice/commit/bd512e0651363f1f2543136d354d9ada9990d83d) +- Sorted translations [`cf0437c`](https://git.odit.services/lfk/selfservice/commit/cf0437c3a738d42154ed1336d6020b88661b462f) +- Added translations 🌍 [`ba3dedb`](https://git.odit.services/lfk/selfservice/commit/ba3dedb1643e2d5f1c2ab92224a11c1c8a82ae71) +- Added confirmation for profile deletion [`8773239`](https://git.odit.services/lfk/selfservice/commit/8773239244c064a888a4ad1f66298f2811fcc2ae) +- Added confirmation for profile deletion [`85b0549`](https://git.odit.services/lfk/selfservice/commit/85b0549a11927758c579cd08bc8015ae00105a84) +- Updated icons [`d710d4b`](https://git.odit.services/lfk/selfservice/commit/d710d4b68ff0e9515eb4a0a4ea0def7b3552e599) +- Added data deletion button [`619078c`](https://git.odit.services/lfk/selfservice/commit/619078cce8281bef520b05bf3e735c26d0752375) +- Content i18n run 🌍 [`175bb16`](https://git.odit.services/lfk/selfservice/commit/175bb168ae134009c26072b76cd74948aecc189f) +- Implemented basic deletion [`fc04e71`](https://git.odit.services/lfk/selfservice/commit/fc04e713110df161c481cb9a3b64e78b30d4f79b) +- Added translations [`8a24505`](https://git.odit.services/lfk/selfservice/commit/8a24505d64832001d6a44800f61f7e0705892046) +- Updated toasts and removed useless code [`7440fc4`](https://git.odit.services/lfk/selfservice/commit/7440fc404ea2a8e68e7ce896e8369700069b2021) +- Added error toast [`9751c2e`](https://git.odit.services/lfk/selfservice/commit/9751c2e9fd99650efab4d5edce3909c907ea9391) +- Merge pull request 'RELEASE 0.3.0' (#25) from dev into main [`1c19657`](https://git.odit.services/lfk/selfservice/commit/1c196579356a70f9d761f7f69d79033157570076) + #### [0.4.5](https://git.odit.services/lfk/selfservice/compare/0.4.4...0.4.5) +> 1 April 2021 + - Merge pull request 'feature/32-registration-language' (#33) from feature/32-registration-language into dev [`#32`](https://git.odit.services/lfk/selfservice/issues/32) +- 🚀Bumped version to v0.4.5 [`efcb7f5`](https://git.odit.services/lfk/selfservice/commit/efcb7f56745aa3f347eb98399ee1bcb68a157e9d) - 🐞 fix /profile/ router on register [`52a0828`](https://git.odit.services/lfk/selfservice/commit/52a082841d47d1ed9c0997776a0784285a3f6ba7) - pass browser locale to api/runners/register/ [`e3f7497`](https://git.odit.services/lfk/selfservice/commit/e3f7497af5860b2472b6cdfd33090b9d68b9fb49) diff --git a/Dockerfile b/Dockerfile index 71e6dca..ad8eec7 100644 --- a/Dockerfile +++ b/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 \ No newline at end of file diff --git a/env_fix.js b/env_fix.js new file mode 100644 index 0000000..ffceb6c --- /dev/null +++ b/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); +} diff --git a/index.html b/index.html index 955cb15..3947c44 100644 --- a/index.html +++ b/index.html @@ -1,17 +1,17 @@ - - - -
- - - -