fix(build): minor haskell typos/errors

The code was written without having a working compiler, hence some accidental code kinks remained.

.babelrc.license

@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2022 Felix Hamann <felix.hamann@campus.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Sarah Vaupel <vaupel.sarah@campus.lmu.de>
-
-SPDX-License-Identifier: AGPL-3.0-or-later

.eslintrc.json.license

@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2022 Gregor Kleen <gregor.kleen@ifi.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Sarah Vaupel <vaupel.sarah@campus.lmu.de>
-
-SPDX-License-Identifier: AGPL-3.0-or-later

.gitignore

@@ -2,8 +2,10 @@
 dist*
 develop
 node_modules/
-assets/icons
-assets/favicons
+.npm/
+.node_repl_history
+**/assets/icons
+**/assets/favicons
 bin/
 assets/fonts/
 *.hi
@@ -38,22 +40,21 @@ uniworx.nix
 .kateproject
 src/Handler/Assist.bak
 src/Handler/Course.SnapCustom.hs
-frontend/src/env.sass
 *.orig
 /instance
+backend/instance
 .stack-work-*
+.stack-work.lock
 .directory
 tags
 test.log
 *.dump-splices
-/.stack-work.lock
-/.npmrc
-/.npm/
 /config/manifest.json
 tunnel.log
-/static
-/well-known
-/.well-known-cache
+static
+well-known
+.well-known-cache
+manifest.json
 /.nix-well-known
 /**/tmp-*
 /testdata/bigAlloc_*.csv
@@ -67,4 +68,4 @@ tunnel.log
 **/result-*
 .develop.cmd
 /.vscode
-.ghc/ghci_history
+backend/.ghc/ghci_history

.npmrc.gup.license

@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2022 Gregor Kleen <gregor.kleen@ifi.lmu.de>
-
-SPDX-License-Identifier: AGPL-3.0-or-later

CHANGELOG.md

@@ -2,220 +2,16 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [27.4.79](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.78...v27.4.79) (2024-09-10)
+## [27.4.59-0.0.20+145-build-system-rewrite](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/27.4.59-0.0.19+145-build-system-rewrite...27.4.59-0.0.20+145-build-system-rewrite) (2025-03-19)
 
+## [27.4.59-0.0.19+145-build-system-rewrite](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/27.4.59-0.0.18+145-build-system-rewrite...27.4.59-0.0.19+145-build-system-rewrite) (2025-03-17)
+
+## [27.4.59-0.0.18+145-build-system-rewrite](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-g0.0.17...27.4.59-0.0.18+145-build-system-rewrite) (2025-03-17)
 
 ### Bug Fixes
 
-* **notifications:** fix [#180](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/180) qualification expiry notification are sent only once ([74f7633](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/74f7633837870448f7cab1013719f42ab49941fe))
-* **supervision:** fix [#181](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/181) by unifying deletion of supervision ([6a070a6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/6a070a67756bd4ef4b9b5efc176f34c7ed183f1a))
+* **static:** fix addStaticContent by using memcached again to supply static files ([570cfc2](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/570cfc238bdccd3438124f96290b9272c8e82f0f))
 
-## [27.4.78](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.77...v27.4.78) (2024-09-05)
-
-
-### Bug Fixes
-
-* **avs:** acs auto synch had inverted success/failure ([4f7855b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/4f7855b9ee7133c5ee7e2ca63d63e5d9f060d62f))
-* **avs:** fix [#124](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/124) avs auto synch filter working ([2a27a1e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2a27a1efa673a4245a7e8667bd30c79ac1891b9c))
-* **avs:** fix [#178](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/178) by deleting old superiors for individual users ([ade27e6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ade27e647913ffe4432b41d585b3e00d1c68d4a0))
-* **avs:** typo in superior remark, towards [#178](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/178) ([3c5edb1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3c5edb1b970c8c154d9957837007815b29e23964))
-* **mail:** fix [#179](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/179) by adding download links for PDF attachments ([620e3e4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/620e3e470080831826ccc960dd876e7bb4fcea03))
-
-## [27.4.77](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.76...v27.4.77) (2024-09-02)
-
-
-### Bug Fixes
-
-* **avs:** attempt LDAP upsert before creating avs users ([cfe2318](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/cfe2318f81c951a7f7310e8bcd9ec25d79417587))
-* **avs:** company superiors are now irregular supervisors and old ones are deleted ([7e5c256](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/7e5c256b4c15a15f7218dd7c1490d5e7add4b1c1))
-* **avs:** fix [#124](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/124) implement automatic avs driving licence synchronisation ([cc5da9a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/cc5da9a2a9bfc8a29f6fe19260bd6dc5412ad4a1))
-* **avs:** switch company did not always increase priority ([8ec2875](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/8ec2875590718f28c3bab8c10141065e11f1405c))
-* **build:** minor linter fix ([be5e609](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/be5e609b1fe879428784d78fa62a559d0764a85a))
-* **firm:** fix [#174](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/174) by adding address search filter to all company view ([40dadd5](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/40dadd58762156005b5889b93a56ffdc044b4460))
-* **firm:** fix [#175](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/175) by separating superiors in firm tables and selections ([8397c46](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/8397c468a04af42ba3baee2f84a0051adbc74374))
-* **ldap:** no more timeout for ldap synch all button ([f946e99](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f946e99da3bc37514a4e3621438ac133cdc16732))
-* **linter:** minor bug in exam-correct.hs ([8bc3663](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/8bc3663ee2e4ded19091ebe350de82cd693093fc))
-* **mail:** display html emails no longer distorts page ([b0972bb](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b0972bb154f453edd545fb4f658d9f5ff79966eb)), closes [#2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/2)
-* **model:** flip erroneous boolean SQL default for CompanyPostalAddress ([b7e5b8f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b7e5b8f111b5115d816d984c6ef2f12edfcef5bb))
-* **user:** fix pagination and count for supervision tables ([9c82558](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9c82558d71a032dad27e892c489c7004d091e088))
-
-## [27.4.76](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.75...v27.4.76) (2024-08-08)
-
-
-### Bug Fixes
-
-* **ap:** disambiguate action message ([8b0466e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/8b0466e74e36e1d0d07518fd317d46b00ab53eff))
-* **avs:** fix [#173](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/173) by not using firm superior email as display email ([43f5c5f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/43f5c5f4854d1ab2af27b479e72a58e2818a5696))
-* **avs:** towards [#117](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/117) update if current value is Nothing even if oldval == newval ([d1fa01f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d1fa01fcc5125c4adee8849f9c944884926f78ad))
-* **avs:** using firm superior as UserEmail is a no-go due to uniqueness constraints ([507a7e0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/507a7e02fc68476d01031dc9f9ee1a669a453ed1))
-* **build:** linter likes it ([f929e03](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f929e03129378e08c8a08ed4bd6f8e8716401813))
-* **course:**  fix [#150](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/150) course edit for associated qualifications requires school admin or lecturer rights ([5b6e4e6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5b6e4e60e7d2957fbce93ee2e2d6d3464b4e3db7))
-* **course:** fix [#148](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/148) course qualification ordering ([cfd2534](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/cfd25348ad3b63ac6bc5031467a3c4ead2e07eed)), closes [#150](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/150)
-* **course:** fix [#149](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/149) course cloning proposes associated qualifications ([e141976](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e1419766f3a06f702abad0ea42f6552305504ba0))
-* **course:** fix [#150](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/150) no longer allow duplicated associated qualifications and orders due to editing existing ([ec02767](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ec027675525b30198378745ed281f60a42471807))
-* **course:** WIP course cloning should propose same associated qualifications, towards [#149](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/149) ([bc47387](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/bc47387c91dda60a2f12e52dba28ea7b079316f0))
-* **lms:** max e-learning tries default removed and info added to lms overview ([11fdcf0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/11fdcf0d445b8cfe97c3a3c26513a9229937c536))
-* **user:** format userDisplayNames having umlaut substitutes with respect to userSurname correctly ([e35a5e9](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e35a5e99a6cea0976fd1c28f919e7d0ac0338503))
-
-## [27.4.75](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.74...v27.4.75) (2024-07-12)
-
-
-### Bug Fixes
-
-* **build:** make linter happy again ([c17c18f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c17c18f9247ef322bc051602a3cb4a52cd50affa))
-* **build:** minor ([ab28c8c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ab28c8c2437680023d80e6ab43113d4328b3a151))
-* **firm:** fix [#157](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/157) by removing redundant duplicated code in firm user and supervision handling ([28e2739](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/28e2739e515700d15c75647c0efe2fe9a9cf15b1))
-* **job:** change some queueJob' to queueJob instead ([fa0541a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/fa0541aa4eaf10f98535a0959593b148b8346109))
-* **lms:** allow 2nd reminders to be independent of renewal period ([d853e85](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d853e8559b753865ee818bf24764f5c8d2e2303f))
-* **lms:** move lms reuse info from QualificationR to LmsR ([468af9d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/468af9de9da44a8ad685ca4bb6890a3e630b58be))
-* **lms:** send second reminder indepentently from renewal period ([a97c3a5](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a97c3a5c9d3cb9dddf90f561712f0845400893bd))
-* **nix:** workaround parsing port numbers failed in nix-shell ([b5215cc](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b5215cc7e8df3a7ad636271c8e6950979b2b8e42))
-* **users:** nameHtml no longer complains about differing case for surname and displayname ([a1668f8](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a1668f891a36b887439afb098f016ef22535af42))
-* **users:** remove users with company post address from list of unreachable users ([c813c66](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c813c665ed306135b7813d91d23310341c689f41))
-
-## [27.4.74](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.73...v27.4.74) (2024-07-04)
-
-
-### Bug Fixes
-
-* **lms:** fix [#161](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/161) lms for multiple joint qualifications ([f869a82](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f869a829d2c1a726930864b3af62d1f0fbebe955))
-
-## [27.4.73](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.72...v27.4.73) (2024-07-03)
-
-
-### Bug Fixes
-
-* **letter:** rephrase some minor letter parts ([0ac75e0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/0ac75e0d5948cb90855d0e36ca8e99c22a0f6fcb))
-
-## [27.4.72](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.71...v27.4.72) (2024-07-02)
-
-
-### Bug Fixes
-
-* **avs:** do not associate users by AvsInfoPersonEmail ([9e2f221](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9e2f2214ce5c7ee1e8d80e6fa75298b7a70d9043))
-* **avs:** fix superfluous quotes for matriculation numbers on newly created users ([ff9014c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ff9014ce05d197c1dc0fce0774a640789cb38b26))
-* **avs:** towards [#169](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/169) - superiors are elevated to max priority for that company ([5bf8539](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5bf85394d4db6de8f10b4e318d667130d37601ac))
-* **firm:** supervisor secondary did not work as intended ([d4f3ce7](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d4f3ce7bf3d208b16f95ab81971b47dfa752939a))
-
-## [27.4.71](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.70...v27.4.71) (2024-06-27)
-
-
-### Bug Fixes
-
-* **avs:** company superior emails become company wide supervisors ([37efc89](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/37efc89e0723452e6d271ba5b43d6bd026642190))
-* **avs:** match mobile number better between LDAP and AVS ([f108c6c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f108c6cfec2d94d866e7c1605b0abe5471fd0f2b))
-* **avs:** new AVS from existing LDAP user no longer misses fields ([2559346](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2559346d963ede802321dfc8cbd2088d9a5de685))
-* **avs:** priority for picking primary email demote superior ([e4fa1dd](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e4fa1ddd6873910bef82d569fe16aca936efc567))
-* **build:** add missing license file ([8721bdb](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/8721bdb3f349658baab144d64c19942bfd7fa49a))
-* **build:** hlint wants a newtype instead ([18cdc52](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/18cdc52df094b9dbccd4f015561367cea59e33fe))
-* **doc:**  fix erroneous unintentional haddock annotations ([3dfc7f8](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3dfc7f8c8b12dd6ef87848a75f1669d700fffe4c))
-* **i18n:** add missing translation for new primary company ([c212f2e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c212f2e8d735616e59c9b8111a34118e3a48fd47))
-* **i18n:** add missing translation for new primary company ([2cc529b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2cc529be39655c317ca028f8f09fa80826ec668d))
-* **ldap:** match mobile number better between LDAP and AVS ([47e5628](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/47e56280fce4ad37e6bc3b9f1c61cb7867069cc5))
-* **letter:** adjust spacing, pin location and interpolation ([d4a0e1f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d4a0e1f201151f76e8e9afd67b456cc878d2afde))
-* **letter:** convenience links working again ([5f1af13](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5f1af130edae7ada2f0c7f7829890bbe0d4f395a))
-* **letter:** expiry and valid dates were wrong ([f8c3663](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f8c36636ff1f2591507e993af32ed01af94cf1fc))
-* **letter:** switch markdown for renewal letter too ([c38e87e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c38e87e1e0e9285a10c00521b7440cd8246af88a))
-* **print:** fix [#167](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/167) by sotring affected user in PrintJob ([73aecc2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/73aecc2df833bdeed93a113b6c756e36b50491b7))
-
-## [27.4.70](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.69...v27.4.70) (2024-06-21)
-
-
-### Bug Fixes
-
-* **build:** hlint wants a newtype instead ([0766351](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/07663516e520814e26740d671325b7cd10855dd4))
-
-## [27.4.69](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.68...v27.4.69) (2024-06-21)
-
-
-### Bug Fixes
-
-* **avs:** fix type causing avs surname upate not working ([822c43c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/822c43c8a7db2086954ad187502ec2c4f1811d17))
-* **avs:** keep company on unchange address/email only if either is non-empty ([766b858](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/766b8589d6945df21fc6ce90d35a004655ffa471))
-* **avs:** synch job deletes used row instead of truncation ([d7acc7a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d7acc7a2d0fe5fc18929a8cb2d9c9f8a259c9944))
-
-## [27.4.68](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.67...v27.4.68) (2024-06-19)
-
-
-### Bug Fixes
-
-* **letter:** minor ([2ae11dc](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2ae11dc25c000486af9acc26439a0580f5c687f2))
-
-## [27.4.67](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.66...v27.4.67) (2024-06-17)
-
-
-### Bug Fixes
-
-* **avs:** fix rare avs update bug involving values optional in avs but compulsory in user entity ([a6d0105](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a6d0105903caba0eb47715eeb217ea2c53d99e23))
-
-## [27.4.66](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.65...v27.4.66) (2024-06-12)
-
-
-### Bug Fixes
-
-* **avs:** fix [#164](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/164) by removing companyPersonalNumber and companyDepartment upon ldap sync expiry ([da74b95](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/da74b957295caefb010c90297af557f997b18e7c))
-* **avs:** fix [#165](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/165) by updating userCompanyDepartmen and userCompanyPersonalNumer ([76e0710](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/76e0710c7b54a40d2c236299ea4fabd009d3f35a))
-* **avs:** repeated avs sync enqueue no longe violates duplicate db uniqueness constraints ([996e6a0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/996e6a0ce563bda96638863efd40ce38fce8ac2b))
-* **avs:** update email on manual company switch ([9fd80f2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9fd80f25526eefce217c659f6ea2991771c11ece)), closes [#164](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/164)
-
-## [27.4.65](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.64...v27.4.65) (2024-06-10)
-
-
-### Bug Fixes
-
-* **avs:** company update no longer fails on duplicate key ([bb101de](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/bb101dee7b40cd3d8ba10a559af642396d5b87b5))
-* **avs:** profile page correctly indicates automatic email and postal addresses ([e553ad4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e553ad4358a71fc96fa946533f0441d4af5202c9))
-* **avs:** steps towards [#164](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/164) ([aa1d230](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/aa1d230e497f0e59dbea9f4fd5c7da773f5a4280))
-* **lette:** adjust window for new pin letters ([6acfd84](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/6acfd849aeb473a018f7a9c34e69f61b3c22b6f8))
-
-## [27.4.64](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.63...v27.4.64) (2024-05-27)
-
-## [27.4.63](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.62...v27.4.63) (2024-05-23)
-
-
-### Bug Fixes
-
-* **avs:** company update checks uniques and ignores those updates if necessary ([9451d90](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9451d90a9e00d08a2a7d169c4674d99ff1018ee9))
-
-## [27.4.62](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.61...v27.4.62) (2024-05-19)
-
-
-### Bug Fixes
-
-* **avs:** avs update on company shorthands working now ([ff2347b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ff2347b1c950c7a2bb281cdcd07a52925e23b9f0))
-* **avs:** deal gracefully with empty card status results ([ccf9340](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ccf934044938277d821eb4b9ea08a8a134e84189))
-
-## [27.4.61](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.60...v27.4.61) (2024-05-06)
-
-
-### Bug Fixes
-
-* **avs:** fix [#76](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/76) allowing company changes and fix [#69](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/69) ([3c4a0b8](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3c4a0b86c1e3d8a28405ab73b964ba1b988d2822))
-* **build:** add missing tex packages ([6750798](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/6750798920dc76882f4e8ef39b47018fb7b77e44))
-* **build:** workaround non modal form result handler ([2fbd281](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2fbd28154cd7aea282eaa2604a42263ac90e3b1e))
-
-## [27.4.60](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.59...v27.4.60) (2024-04-26)
-
-
-### Bug Fixes
-
-* **avs:** disable caching by 0s no longer causes an exception ([d578e80](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d578e80282c8bf6872fa6040514a9d2c85582707))
-* **avs:** fix [#152](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/152) by providing new online avs card filter throughout ([ad2375b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ad2375b338866f37c8b7825a9eab12fa6c9abccb))
-* **avs:** fix [#36](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/36) and remove dead code ([4f8850b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/4f8850b3b4f710f9cf59163175b27599c97ac5c0))
-* **avs:** fix [#69](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/69) by redesigning live avs status page ([697979c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/697979c277ce7198f4573d6cea30373a1fcc17da))
-* **avs:** invalidate contact cache after licence writes ([c382be9](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c382be9325fcc92e13cb5dc2ad7c20b198db26fc))
-* **avs:** several minor bugfixes ([a52c8a6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a52c8a6ad709029a8822d383370b0d2bdd25e7d7)), closes [#158](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/158)
-* **build:** add import needed for production only ([724e4a0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/724e4a0bec343ab9c6d172d8e93b8040bbe3fe7d))
-* **build:** migration needs to check for table existens first ([f439ea4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f439ea45af9b1c4a029fc1b9b6383f3c97194ed0))
-* **build:** minor error non-development code ([66eaa4f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/66eaa4f7dcc124b631414d4a1adbe555a4029100))
-* **build:** missing parameters added ([83afdf7](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/83afdf760f93fc1a553de3a122b444412ed84ba4))
-* **build:** simple type error ([d56a1cd](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d56a1cdd46259418faa737b9bb0a9d9ffba442e0))
-* **build:** type error in test db fill data ([f465cc9](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f465cc972367233a4944dd0aeb81b223a187bb85))
-* **doc:** minor haddock problems ([d4f8a6c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d4f8a6c77b2a4a4540935f7f0beca0d0605508c8))
-* **firm:** supervisor filter acts weird in test environment ([b566e59](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b566e59eb1325485fe26dc4f0b5cb63165c58f74))
-* **i18n:** fix some bad plurals ([890f8ad](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/890f8ad8b60115533faa6b99f4c4504243cbfb1d))
-* **lint:** remove minor superfluous dollar ([64a1233](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/64a123387f3539b73649d02a6ecd97de577097e6))
-* **qualification:** fix [#159](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/159) by removing an misleadingly named column for user qualification table ([fd6a538](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/fd6a5384d3517958a3c7726e32eed3bad197a591))
 ## [v27.4.59-test-g0.0.17](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-f0.0.17...v27.4.59-test-g0.0.17) (2025-02-18)
 
 ## [v27.4.59-test-f0.0.17](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-g0.0.16...v27.4.59-test-f0.0.17) (2025-02-17)

Makefile

@@ -1,91 +1,59 @@
-
 export SHELL=bash
 
-# MAKE=make -f Makefile-loggingsymbols
-# MAKE=make -d
+export CLEAN_DEPENDENCIES ?= false
+export CLEAN_IMAGES ?= false
 
-# System information
-export CPU_CORES = $(shell cat /proc/cpuinfo | grep '^processor' | wc -l)
-
-export CONTAINER_COMMAND ?= podman
-export CONTAINER_BGRUN ?= $(CONTAINER_COMMAND) run -dit --network=host --replace
-export CONTAINER_FGRUN ?= $(CONTAINER_COMMAND) run -it --network=host --replace
-
-export IMAGE_REGISTRY = docker.io
-export MEMCACHED_IMAGE = $(IMAGE_REGISTRY)/memcached:latest
-export MINIO_IMAGE = $(IMAGE_REGISTRY)/minio/minio:latest
-export MAILDEV_IMAGE = $(IMAGE_REGISTRY)/maildev/maildev:latest # TODO: needs different port than 1025 to avoid conflicts
-
-export IN_CONTAINER ?= false
-export IN_CI ?= false
-export CONTAINER_FILE
-export CONTAINER_IDENT
-export CF_PREFIX
-export DEVELOP
-export CONTAINER_ATTACHED
-export CONTAINER_INIT
-export CONTAINER_CLEANUP
-export PROJECT_DIR=/fradrive
-
-export SERVICE
-export SERVICE_VARIANT ?= $(SERVICE)
-export JOB
-export IMAGE
-export SET_IMAGE
-export ENTRYPOINT
-export EXEC_OPTS
-
-export STACK_CORES = $(shell echo $(($(CPU_CORES)/2)))
-export BASE_PORTS
-export UNIWORXDB_OPTS ?= -cf
-export PROD ?= false
+export ENTRYPOINT ?= bash
 export SRC
 
-ifneq ($(PROD),true)
-  export --DEVELOPMENT=--flag uniworx:dev
-endif
-
-export DATE := $(shell date +'%Y-%m-%dT%H-%M-%S')
-
-export CURR_DEV = $(shell cat develop/.current 2>/dev/null)
-export SET_DEVELOP = $(eval DEVELOP=develop/$$(CURR_DEV))
-export NEW_DEVELOP = $(eval DEVELOP=develop/$$(DATE))
-
-
 .PHONY: help
 # HELP: print out this help message
 help:
-	@if [ -z "$$(which perl 2>/dev/null)" ] ; then \
-	  $(CONTAINER_FGRUN) .:/mnt 'debian:12.5' '/mnt/utils/makehelp.pl' '/mnt/Makefile' ; \
-	else \
-	  utils/makehelp.pl Makefile ; \
-	fi
+	docker compose run help
 
 .PHONY: clean
-# HELP: stop all running containers and remove all compilation results in the directory (but leave images including dependencies unharmed)
+# HELP: clean compilation caches
 clean:
-	rm -rf develop
-	-rm -rf node_modules .npm .cache assets/icons assets/favicons static well-known config/manifest.json frontend/src/env.sass
-	-rm -rf .stack-work .stack-work.lock
-	-rm -rf bin .Dockerfile develop
-	-$(CONTAINER_COMMAND) container prune --force
-.PHONY: clean-images
-# HELP: stop all running containers and clean all images from local repositories
-clean-images:
-	rm -rf develop
-	sleep 5
-	-$(CONTAINER_COMMAND) system prune --all --force --volumes
-	-$(CONTAINER_COMMAND) image prune --all --force
-	-$(CONTAINER_COMMAND) volume prune --force
+	$(MAKE) clean-frontend CLEAN_DEPENDENCIES=$(CLEAN_DEPENDENCIES) CLEAN_IMAGES=$(CLEAN_IMAGES) 
+	$(MAKE) clean-backend CLEAN_DEPENDENCIES=$(CLEAN_DEPENDENCIES) CLEAN_IMAGES=$(CLEAN_IMAGES)
 .PHONY: clean-all
-# HELP: like clean but with full container, image, and volume prune
-clean-all: clean
-	-rm -rf .stack
-	$(CONTAINER_COMMAND) system reset --force
+# HELP: clean everything, including dependency and image caches
+clean-all: CLEAN_DEPENDENCIES = true
+clean-all: CLEAN_IMAGES = true
+clean-all: clean ;
 
+.PHONY: clean-%
+# HELP(clean-$SERVICE): invalidate caches for a given service. Supported services: frontend, backend.
+clean-%:
+	$(MAKE) stop-$*
+	@$(MAKE) -- --clean-$*
+	@echo "Cleaned $* build files and binaries."
+ifeq ("$(CLEAN_DEPENDENCIES)", "true")
+	@$(MAKE) -- --clean-$*-deps
+	@echo "Cleaned $* dependencies."
+endif
+ifeq ("$(CLEAN_IMAGES)", "true")
+	$(MAKE) kill-$*
+	docker compose rm --force --volumes
+	docker compose down --rmi 'all' --volumes
+	@echo "Cleaned $* image."
+endif
+--clean-frontend:
+	-rm -rf assets/icons assets/favicons
+	-rm -rf static well-known
+--clean-frontend-deps:
+	-rm -rf frontend/node_modules
+	-rm -rf frontend/.npm
+--clean-backend:
+	-rm -rf backend/.stack-work
+	-rm -rf bin/
+--clean-backend-deps:
+	-rf -rf backend/.stack
+
+
+# TODO: only release when build and tests are passing!!!
 .PHONY: release
 # HELP: create, commit and push a new release
-# TODO: only release when build and tests are passing!!!
 release:
 	VERSION=`./utils/version.pl -changelog CHANGELOG.md -v` ; \
 	git add CHANGELOG.md ; \
@@ -96,346 +64,60 @@ release:
 
 .PHONY: compile
 # HELP: perform full compilation (frontend and backend)
-compile:
-	$(MAKE) compile-frontend
-	$(MAKE) compile-backend
+compile: compile-frontend compile-backend ;
+.PHONY: compile-%
+# HELP(compile-$SERVICE): compile a given service once
+compile-%:
+	docker compose run --remove-orphans --build --no-deps $* make compile
 
 .PHONY: start
 # HELP: start complete development environment with a fresh test database
-start:
-	$(MAKE) start-postgres
-	$(MAKE) start-memcached
-	$(MAKE) start-minio
-	$(MAKE) start-maildev
-	$(MAKE) compile-frontend
-	$(MAKE) compile-uniworxdb
-	$(MAKE) start-backend
-
-.PHONY: %-backend
-%-backend: SERVICE=backend
-%-backend: SERVICE_VARIANT=backend
-%-backend: IMAGE=localhost/fradrive/backend
-%-backend: BASE_PORTS = "DEV_PORT_HTTP=3000" "DEV_PORT_HTTPS=3443"
-
-.PHONY: %-uniworxdb
-%-uniworxdb: SERVICE=backend
-%-uniworxdb: SERVICE_VARIANT=uniworxdb
-%-uniworxdb: IMAGE=localhost/fradrive/backend
-
-.PHONY: %-ghci
-%-ghci: SERVICE=backend
-%-ghci: SERVICE_VARIANT=ghci
-%-ghci: IMAGE=localhost/fradrive/backend
-
-.PHONY: %-hoogle
-%-hoogle: SERVICE=backend
-%-hoogle: SERVICE_VARIANT=hoogle
-%-hoogle: BASE_PORTS = "HOOGLE_PORT=8081"
-%-hoogle: IMAGE=localhost/fradrive/backend
---start-hoogle:
-	HOOGLE_PORT=`cat $(CONTAINER_FILE) | grep 'HOOGLE_PORT=' | sed 's/HOOGLE_PORT=//'` ; \
-	stack $(STACK_CORES) hoogle -- server --local --port $${HOOGLE_PORT}
-
-.PHONY: %-frontend
-%-frontend: SERVICE=frontend
-%-frontend: SERVICE_VARIANT=frontend
-%-frontend: IMAGE=localhost/fradrive/frontend
-
-.PHONY: %-postgres
-%-postgres: SERVICE=postgres
-%-postgres: SERVICE_VARIANT=postgres
-%-postgres: BASE_PORTS = "PGPORT=5432"
-%-postgres: SET_IMAGE=localhost/fradrive/postgres
-
-.PHONY: %-memcached
-%-memcached: SERVICE=memcached
-%-memcached: SERVICE_VARIANT=memcached
-%-memcached: SET_IMAGE=$$(MEMCACHED_IMAGE) --port=`cat $$(CONTAINER_FILE) | grep 'MEMCACHED_PORT=' | sed 's/MEMCACHED_PORT=//'`
-%-memcached: BASE_PORTS = "MEMCACHED_PORT=11211"
-
-.PHONY: %-maildev
-%-maildev: SERVICE=maildev
-%-maildev: SERVICE_VARIANT=maildev
-%-maildev: SET_IMAGE=$$(MAILDEV_IMAGE) --port=`cat $$(CONTAINER_FILE) | grep 'MAILDEV_PORT=' | sed 's/MAILDEV_PORT=//'`
-%-maildev: BASE_PORTS = "MAILDEV_PORT=1025"
-
-.PHONY: %-release
-%-release: PROD=true
-%-release: SERVICE=fradrive
-%-release: SERVICE_VARIANT=fradrive
-%-release: IMAGE=localhost/fradrive/fradrive
-
-.PHONY: %-minio
-%-minio: SERVICE=minio
-%-minio: SERVICE_VARIANT=minio
-%-minio: SET_IMAGE=$$(MINIO_IMAGE) -- server `mktemp` --address=:`cat $$(CONTAINER_FILE) | grep 'UPLOAD_S3_PORT=' | sed 's/UPLOAD_S3_PORT=//'`
-%-minio: BASE_PORTS = "UPLOAD_S3_PORT=9000"
-
+start: start-postgres start-maildev start-memcached start-minio start-backend
+	docker compose exec backend make start
 .PHONY: start-%
-start-%: JOB=start
-start-%: CF_PREFIX = start-
-start-%: CONTAINER_ATTACHED = false
-start-%: --act ;
-
-.PHONY: compile-%
-compile-%: JOB=compile
-compile-%: CF_PREFIX = compile-
-compile-%: CONTAINER_ATTACHED = true
-compile-%: --act ;
-
-.PHONY: dependencies-%
-dependencies-%: JOB=dependencies
-dependencies-%: CF_PREFIX = dependencies-
-dependencies-%: CONTAINER_ATTACHED = true
-dependencies-%: --act ;
-
-.PHONY: test-%
-test-%: JOB=test
-test-%: CF_PREFIX = test-
-test-%: CONTAINER_ATTACHED = true
-test-%: --act ;
-
-.PHONY: lint-%
-lint-%: JOB=lint
-lint-%: CF_PREFIX = lint-
-lint-%: CONTAINER_ATTACHED = true
-lint-%: --act ;
+# HELP(start-$SERVICE): start a given service
+start-%:
+	docker compose up -d --build $*
 
 .PHONY: shell-%
-# HELP(shell-$SERVICE): launch (bash) shell inside a new $SERVICE container
-shell-%: JOB=shell
-shell-%: CF_PREFIX=shell-
-shell-%: CONTAINER_ATTACHED=true
-shell-%: --act ;
+# HELP(shell-$SERVICE): launch a (bash) shell inside a given service
+shell-%:
+	docker compose run --build --no-deps --entrypoint="$(ENTRYPOINT)" $*
 .PHONY: ghci
-# HELP(ghci): launch new backend instance and enter interactive ghci shell
-ghci: shell-ghci;
-
---act: --develop_containerized;
-
---develop_%: PORTS = $(foreach PORT,$(BASE_PORTS),$(shell utils/next_free_port.pl $(PORT)))
---develop_%: --ensure-develop
-	DEVELOP=develop/`cat develop/.current` ; \
-	CONTAINER_IDENT=$(CF_PREFIX)$(SERVICE_VARIANT) ; \
-	CONTAINER_FILE=$${DEVELOP}/$${CONTAINER_IDENT} ; \
-	if [[ -e $${CONTAINER_FILE} ]]; then \
-	  >&2 echo "Another $* service is already running! Use \"make new-develop\" to start a new develop instance despite currently running services." ; \
-	  exit 1 ; \
-	fi ; \
-	echo "$(PORTS)" | sed 's/ /\n/g' > $${CONTAINER_FILE} ; \
-	$(MAKE) -- --$* CONTAINER_FILE=$${CONTAINER_FILE} CONTAINER_IDENT=$${CONTAINER_IDENT} JOB=$(JOB)
-
-.PHONY: rebuild-%
-# HELP(rebuild-{backend,frontend,database,memcached,minio}): force-rebuild a given container image
-rebuild-%:
-	$(MAKE) -- --image-build SERVICE=$* NO_CACHE=--no-cache
---image-build:
-ifeq "$(IMAGE)" "localhost/fradrive/$(SERVICE)"
-	rm -f .Dockerfile
-	ln -s docker/$(SERVICE)/Dockerfile .Dockerfile
-	PROJECT_DIR=/fradrive; \
-	if [ "$(IN_CONTAINER)" == "false" ] ; then \
-	  $(CONTAINER_COMMAND) build $(NO_CACHE) \
-	    -v $(PWD):$${PROJECT_DIR}:rw \
-		--build-arg PROJECT_DIR=$${PROJECT_DIR} \
-	    --env IN_CONTAINER=true \
-		--env JOB=$(JOB) \
-		--tag fradrive/$(SERVICE) \
-		--file $(PWD)/.Dockerfile ; \
-	fi
-else
-	:
-endif
-
---containerized: --image-build
-	DEVELOP=`cat develop/.current` ; \
-	./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" "$(CONTAINER_INIT)" "$(CONTAINER_CLEANUP)" & \
-	CONTAINER_NAME=fradrive.$(CURR_DEV).$(CONTAINER_IDENT) ; \
-	if ! [ -z "$(SET_IMAGE)" ] ; \
-	  then \
-	    IMAGE="$(SET_IMAGE)" ; \
-	  else \
-	    IMAGE=$(IMAGE) ; \
-		MAKECALL="make -- --$(JOB)-$(SERVICE_VARIANT) IN_CONTAINER=true" ; \
-	fi ; \
-	CONTAINER_ID=`$(CONTAINER_BGRUN) \
-	  -v $(PWD):$(PROJECT_DIR):rw \
-	  --env IN_CONTAINER=true \
-	  --env CONTAINER_FILE=$(CONTAINER_FILE) \
-	  --env CONTAINER_NAME=$${CONTAINER_NAME} \
-	  --env JOB=$(JOB) \
-	  --env SRC=$(SRC) \
-	  --name $${CONTAINER_NAME} \
-	  $${IMAGE} \
-	  $${MAKECALL} \
-	` ; \
-	printf "CONTAINER_ID=$${CONTAINER_ID}" >> "$(CONTAINER_FILE)" ; \
-	if [[ "true" == "$(CONTAINER_ATTACHED)" ]] ; then \
-	  $(CONTAINER_COMMAND) attach $${CONTAINER_ID} || : ; \
-	fi
-
-# For Reverse Proxy Problem see: https://groups.google.com/g/yesodweb/c/2EO53kSOuy0/m/Lw6tq2VYat4J
-# HELP(start-backend): start development instance
---start-backend: --dependencies-backend
-	export YESOD_IP_FROM_HEADER=true; \
-	export DEV_PORT_HTTP=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTP=' | sed 's/DEV_PORT_HTTP=//'`; \
-	export DEV_PORT_HTTPS=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTPS=' | sed 's/DEV_PORT_HTTPS=//'`; \
-	export HOST=127.0.0.1 ; \
-	export PORT=$${PORT:-$${DEV_PORT_HTTP}} ; \
-	export DETAILED_LOGGING=$${DETAILED_LOGGING:-true} ; \
-	export LOG_ALL=$${LOG_ALL:-false} ; \
-	export LOGLEVEL=$${LOGLEVEL:-info} ; \
-	export DUMMY_LOGIN=$${DUMMY_LOGIN:-true} ; \
-	export SERVER_SESSION_ACID_FALLBACK=$${SERVER_SESSION_ACID_FALLBACK:-true} ; \
-	export SERVER_SESSION_COOKIES_SECURE=$${SERVER_SESSION_COOKIES_SECURE:-false} ; \
-	export COOKIES_SECURE=$${COOKIES_SECURE:-false} ; \
-	export ALLOW_DEPRECATED=$${ALLOW_DEPRECATED:-true} ; \
-	export ENCRYPT_ERRORS=$${ENCRYPT_ERRORS:-false} ; \
-	export RIBBON=$${RIBBON:-$${HOST:-localhost}} ; \
-	export APPROOT=$${APPROOT:-http://localhost:$${DEV_PORT_HTTP}} ; \
-	export AVSPASS=$${AVSPASS:-nopasswordset} ; \
-	stack $(STACK_CORES) exec --local-bin-path $$(pwd)/bin --copy-bins -- yesod devel -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}"
-# HELP(compile-backend): compile backend binaries
---compile-backend: --dependencies-backend
-	stack build $(STACK_CORES) --fast --profile --library-profiling --executable-profiling --flag uniworx:-library-only $(--DEVELOPMENT) --local-bin-path $$(pwd)/bin --copy-bins
-# HELP(dependencies-backend): (re-)build backend dependencies
---dependencies-backend: #uniworx.cabal
-	chown -R `id -un`:`id -gn` "$(PROJECT_DIR)"; \
-	stack install hpack; stack install yesod-bin; \
-	stack build -j2 --only-dependencies
-# HELP(lint-backend): lint backend
---lint-backend:
-	stack build $(STACK_CORES) --test --fast --flag uniworx:library-only $(--DEVELOPMENT) uniworx:test:hlint
-# HELP(test-backend): test backend
---test-backend:
-	stack build $(STACK_CORES) --test --coverage --fast --flag uniworx:library-only $(--DEVELOPMENT)
-# uniworx.cabal:
-# 	stack exec -- hpack --force
-
-# HELP(compile-frontend): compile frontend assets
---compile-frontend: --dependencies-frontend
-	npm run build
---start-frontend: --compile-frontend;
---dependencies-frontend: node_modules assets esbuild.config.mjs frontend/src/env.sass;
-node_modules: package.json package-lock.json
-	npm install --cache .npm --prefer-offline
-package-lock.json: package.json
-	npm install --cache .npm --prefer-offline
-assets: assets/favicons assets/icons;
-assets/favicons:
-	./utils/faviconize.pl assets/favicon.svg long assets/favicons
-assets/icons: node_modules assets/icons-src/fontawesome.json
-	./utils/renamer.pl node_modules/@fortawesome/fontawesome-free/svgs/solid assets/icons-src/fontawesome.json assets/icons/fradrive
-	./utils/renamer.pl node_modules/@fortawesome/fontawesome-free/svgs/regular assets/icons-src/fontawesome.json assets/icons/fradrive
-	-cp assets/icons-src/*.svg assets/icons/fradrive
-frontend/src/env.sass:
-	echo "\$$path: '$${PROJECT_DIR}'" > frontend/src/env.sass
-static: --dependencies-frontend
-	npm run build
-well-known: static;
---lint-frontend: --compile-frontend
-	npm run lint
---test-frontend: --compile-frontend
-	npm run test
-
-# HELP(compile-uniworxdb): clear and fill database. requires running postgres instance (use "make start-postgres" to start one)
-# TODO (db-m-$MIGRATION-backend): apply migration (see src/Model/Migration/Definition.hs for list of available migrations)
---compile-uniworxdb: --compile-backend
-	SERVER_SESSION_ACID_FALLBACK=${SERVER_SESSION_ACID_FALLBACK:-true} ; \
-	AVSPASS=${AVSPASS:-nopasswordset} ; \
-	./bin/uniworxdb $(UNIWORXDB_OPTS)
-
-# HELP(shell-ghci): enter ghci shell. Use "make ghci SRC=<MODULE_FILE.hs>" to load specific source modules."
---shell-ghci:
-	stack ghci -- $(SRC)
-# --main-is uniworx:exe:uniworx
-
-# HELP(shell-{backend,frontend,memcached,minio,postgres}): enter (bash) shell inside a new container of a given service
---shell-%:
-	/bin/bash
-
-# HELP(start-minio): start minio service
-
-.PHONY: status
-# HELP: print develop status: running containers, used ports
-status:
-	@./utils/develop-status.pl -a
-
-.PHONY: log-%
-# HELP(log-$(JOB)-$(SERVICE)): inspect output of a given service. The service must be currently running When a service supports multiple running instances in one develop (i.e. backend), you need to specify the exact instance by its associated file (e.g. backend-1, backend-2, etc.), please check the contents of the develop/ directory for a list of running instances.
-log-%:
-	DEVELOP=develop/`cat develop/.current` ; \
-	SEARCH_FILE="$${DEVELOP}/$*" ; \
-	if [[ ! -e "$${SEARCH_FILE}" ]] ; then \
-	  SEARCH_FILE="$${DEVELOP}/.exited.$*" ; \
-	fi ; \
-	if [[ -e "$${SEARCH_FILE}" ]] ; then \
-	  $(CONTAINER_COMMAND) logs --follow `cat "$${SEARCH_FILE}" | grep CONTAINER_ID= | sed 's/^CONTAINER_ID=//'` ; \
-	else \
-	  >&2 echo "Cannot show log: No develop file found for '$*'" ; \
-	  exit 1 ; \
-	fi
-
-.PHONY: enter
-# HELP: launch (bash) shell inside a currently running container. Use ./enter shell wrapper for more convenient usage, possibly with tab-completion in the future
-enter: --ensure-develop
-	$(MAKE) -- --enter
-
-.PHONY: psql
-# HELP: enter psql (postgresql) cli inside a currently running database container
-psql: ENTRYPOINT=/usr/bin/psql -d uniworx
-psql: EXEC_OPTS=--user postgres
-psql: --ensure-develop
-	$(MAKE) -- --enter CONTAINER_FILE=develop/`cat develop/.current`/start-postgres
-
---enter:
-	CONTAINER_ID=`cat $(CONTAINER_FILE) | grep 'CONTAINER_ID=' | sed 's/CONTAINER_ID=//'` ; \
-	$(CONTAINER_COMMAND) exec -it $(EXEC_OPTS) $${CONTAINER_ID} $(if $(ENTRYPOINT),$(ENTRYPOINT),/bin/bash)
+# HELP: launch ghci instance. Use in combination with SRC to specify the modules to be loaded by ghci: make ghci SRC=src/SomeModule.hs
+ghci: ENTRYPOINT=stack ghci $(SRC)
+ghci: shell-backend ;
 
 .PHONY: stop
-# HELP: stop all currently running develop instances
+# HELP: stop all services
 stop:
-	rm -rf develop
+	docker compose down
 .PHONY: stop-%
-# HELP(stop-SERVICE): stop all currently running develop instances of a given service (i.e. backend,frontend,uniworxdb,hoogle,postgres,...)
-# HELP(stop-JOB): stop all currently running develop instances of a given job (i.e. compile,start,test,lint)
-stop-compile: CF_PREFIX=compile-
-stop-start: CF_PREFIX=start-
-stop-test: CF_PREFIX=test-
-stop-lint: CF_PREFIX=lint-
-stop-%: --stop;
---stop:
-	$(SET_DEVELOP)
-ifdef CF_PREFIX
-	rm -rf $(DEVELOP)/$(CF_PREFIX)*
-endif
-ifdef SERVICE_VARIANT
-	rm -rf $(DEVELOP)/*-$(SERVICE_VARIANT)
-endif
+# HELP(stop-$SERVICE): stop a given service
+stop-%:
+	docker compose down $*
+.PHONY: kill-%
+# HELP(kill-$SERVICE): kill a given service the hard way. Use this if the servive does not respond to stop.
+kill-%:
+	docker compose kill $*
 
-.PHONY: new-develop
-# HELP: instantiate new development bundle, i.e. create new directory under develop/
-new-develop:
-	$(NEW_DEVELOP)
-	mkdir -p $(DEVELOP)
-	$(MAKE) develop/.current
-.PHONY: switch-develop
-# HELP: switch current develop instance to DEVELOP=...
-switch-develop:
-	if ! [ -e develop/$(DEVELOP) ]; then \
-	  echo "Specified develop $(DEVELOP) does not exist! Not switching." ; \
-	  exit 1 ; \
-	fi ; \
-	echo "$(DEVELOP)" > develop/.current
---ensure-develop:
-	if ! [[ -e develop ]]; then \
-	  $(MAKE) new-develop; \
-	fi
-	$(MAKE) develop/.current
-	$(SET_DEVELOP)
-.PHONY: develop/.current
-develop/.current:
-	ls -1 develop | tail -n1 > develop/.current
+.PHONY: status
+# HELP: print an overview of currently running services and their health
+status:
+	docker compose ps
+.PHONY: top
+# HELP: print an overview of the ressource usage of the currently running services
+top:
+	docker compose stats
+.PHONY: list-projects
+# HELP: list all currently running projects on this machine
+list-projects:
+	docker compose ls
+
+.PHONY: log-%
+# HELP(log-$SERVICE): follow the output of a given service. Service must be running.
+log-%:
+	docker compose logs --follow --timestamps $*
 
 .PHONY: --%
 .SUFFIXES: # Delete all default suffixes

backend/Dockerfile

@@ -0,0 +1,40 @@
+ARG FROM_IMG=docker.io/library/debian
+ARG FROM_TAG=12.5
+
+FROM ${FROM_IMG}:${FROM_TAG}
+
+ENV LANG=de_DE.UTF-8
+
+# basic dependencies
+RUN apt-get -y update && apt-get -y install git
+RUN apt-get -y update && apt-get -y install haskell-stack
+RUN apt-get -y update && apt-get -y install llvm
+RUN apt-get -y update && apt-get install -y --no-install-recommends locales locales-all
+
+# compile-time dependencies
+RUN apt-get -y update && apt-get install -y libpq-dev libsodium-dev
+RUN apt-get -y update && apt-get -y install g++ libghc-zlib-dev libpq-dev libsodium-dev pkg-config
+RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
+
+# run-time dependencies for uniworx binary
+RUN apt-get -y update && apt-get -y install fonts-roboto
+# RUN apt-get -y update && apt-get -y install pdftk
+# RUN apt-get -y update && apt-get -y install \
+# texlive texlive-latex-recommended texlive-luatex texlive-plain-generic texlive-lang-german texlive-lang-english
+RUN apt-get -y update && apt-get -y install texlive
+# RUN ls /usr/local/texlive
+# RUN chown -hR root /usr/local/texlive/2018
+# RUN tlmgr init-usertree
+# RUN tlmgr option repository ftp://tug.org/historic/systems/texlive/2018/tlnet-final
+# RUN tlmgr update --self --all
+
+ARG PROJECT_DIR=/fradrive
+ENV PROJECT_DIR=${PROJECT_DIR}
+# RUN mkdir -p "${PROJECT_DIR}"; chmod -R 777 "${PROJECT_DIR}"
+WORKDIR ${PROJECT_DIR}
+ENV HOME=${PROJECT_DIR}
+ENV STACK_ROOT="${PROJECT_DIR}/.stack"
+
+ENV STACK_SRC=""
+ENV STACK_ENTRY="ghci ${STACK_SRC}"
+ENTRYPOINT stack ${STACK_ENTRY}

backend/Makefile

@@ -0,0 +1,51 @@
+export CPU_CORES = $(shell cat /proc/cpuinfo | grep '^processor' | wc -l)
+export STACK_CORES = $(shell echo $(($(CPU_CORES)/2)))
+
+ifeq ($(PROD),true)
+export --DEVELOPMENT=--flag uniworx:-dev
+else
+export --DEVELOPMENT=--flag uniworx:dev
+endif
+
+.PHONY: dependencies
+dependencies:
+	stack install hpack; stack install yesod-bin; \
+	stack build -j2 --only-dependencies
+
+.PHONY: compile
+compile: dependencies
+	stack build $(STACK_CORES) --fast --profile --library-profiling --executable-profiling --flag uniworx:-library-only $(--DEVELOPMENT) --local-bin-path $$(pwd)/bin --copy-bins
+
+.PHONY: lint
+lint:
+	stack build $(STACK_CORES) --test --fast --flag uniworx:library-only $(--DEVELOPMENT) uniworx:test:hlint
+
+.PHONY: test
+test:
+	stack build $(STACK_CORES) --test --coverage --fast --flag uniworx:library-only $(--DEVELOPMENT)
+
+# For Reverse Proxy Problem see: https://groups.google.com/g/yesodweb/c/2EO53kSOuy0/m/Lw6tq2VYat4J
+.PHONY: start
+start: dependencies
+	export YESOD_IP_FROM_HEADER=true; \
+	export DEV_PORT_HTTP=3000; \
+	export DEV_PORT_HTTPS=3443; \
+	export HOST=127.0.0.1 ; \
+	export PORT=$${PORT:-$${DEV_PORT_HTTP}} ; \
+	export DETAILED_LOGGING=$${DETAILED_LOGGING:-true} ; \
+	export LOG_ALL=$${LOG_ALL:-false} ; \
+	export LOGLEVEL=$${LOGLEVEL:-info} ; \
+	export DUMMY_LOGIN=$${DUMMY_LOGIN:-true} ; \
+	export SERVER_SESSION_ACID_FALLBACK=$${SERVER_SESSION_ACID_FALLBACK:-true} ; \
+	export SERVER_SESSION_COOKIES_SECURE=$${SERVER_SESSION_COOKIES_SECURE:-false} ; \
+	export COOKIES_SECURE=$${COOKIES_SECURE:-false} ; \
+	export ALLOW_DEPRECATED=$${ALLOW_DEPRECATED:-true} ; \
+	export ENCRYPT_ERRORS=$${ENCRYPT_ERRORS:-false} ; \
+	export RIBBON=$${RIBBON:-$${HOST:-localhost}} ; \
+	export APPROOT=$${APPROOT:-http://localhost:$${DEV_PORT_HTTP}} ; \
+	export AVSPASS=$${AVSPASS:-nopasswordset} ; \
+	stack $(STACK_CORES) exec --local-bin-path $$(pwd)/bin --copy-bins -- yesod devel -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}"
+
+.PHONY: clean
+clean:
+	rm -rf .stack-work .stack uniworx.cabal .ghc

backend/messages/uniworx/categories/courses/tutorial/de-de-formal.msg

@@ -47,9 +47,11 @@ TutorialUserDeregister: Vom Kurs abmelden
 TutorialUserSendMail: Mitteilung verschicken
 TutorialUserPrintQualification: Zertifikat drucken
 TutorialUserGrantQualification: Qualifikation vergeben
+TutorialUserGrantQualificationDateTooltip: Leer lassen, um das Ablaufdatum auf das heutige Datum plus Standardgültigkeitsdauer zu setzen.
+TutorialUserGrantQualificationDateError qsh@QualificationShorthand: Qualifikation #{qsh} hat keine Standardgültigkeitsdauer, daher ist ein explizites Ablaufdatum erforderlich!
 TutorialUserRenewQualification: Qualifikation regulär verlängern
-TutorialUserRenewedQualification n@Int: Qualifikation für #{tshow n} Kurs-#{pluralDE n "Teilnehmer:in" "Teilnehmer:innen"} regulär verlängert
-TutorialUserGrantedQualification n@Int: Qualifikation erfolgreich an #{tshow n} Kurs-#{pluralDE n "Teilnehmer:in" "Teilnehmer:innen"} vergeben
+TutorialUserRenewedQualification qsh@QualificationShorthand n@Int: Qualifikation #{qsh} für #{tshow n} Kurs-#{pluralDE n "Teilnehmer:in" "Teilnehmer:innen"} regulär verlängert.
+TutorialUserGrantedQualification qsh@QualificationShorthand day@Text n@Int: Qualifikation #{qsh} bis #{day} erfolgreich an #{tshow n} Kurs-#{pluralDE n "Teilnehmer:in" "Teilnehmer:innen"} vergeben.
 TutorialUserAssignExam: Zur Prüfung einteilen
 TutorialUserExamAssignedFor n@Int m@Int p@Text: #{n}/#{m} zur Prüfung #{p} eingeteilt
 CommTutorial: Kursmitteilung

backend/messages/uniworx/categories/courses/tutorial/en-eu.msg

@@ -43,14 +43,15 @@ TutorInviteHeading tutn: Invitation to be instructor for #{tutn}
 TutorInviteExplanation: You were invited to be a instructor.
 TutorCorrectorInvitationAccepted shn: You are now a corrector for #{shn}
 TutorialUsersDeregistered count: Successfully deregistered #{show count} participants from course
-
 TutorialUserDeregister: Deregister from course
 TutorialUserSendMail: Send mail
 TutorialUserPrintQualification: Print certificate
 TutorialUserGrantQualification: Grant qualification
+TutorialUserGrantQualificationDateTooltip: Leave blank for expiry on today's date plus standard qualification valid duration.
+TutorialUserGrantQualificationDateError qsh@QualificationShorthand: Qualification #{qsh} has no standard valid duration. Please provide an explicit expiry date!
 TutorialUserRenewQualification: Renew qualification
-TutorialUserRenewedQualification n@Int: Successfully renewed qualification #{tshow n} course #{pluralEN n "user" "users"}
-TutorialUserGrantedQualification n: Successfully granted qualification #{tshow n} course #{pluralEN n "user" "users"}
+TutorialUserRenewedQualification qsh n: Successfully renewed #{qsh} qualification for #{pluralENsN n "course participant"}
+TutorialUserGrantedQualification qsh day n: Successfully granted #{qsh} qualification until #{day} to #{pluralENsN n "course participant"}
 TutorialUserAssignExam: Register for examination
 TutorialUserExamAssignedFor n@Int m@Int p@Text: #{n}/#{m} enrolled for exam #{p}
 CommTutorial: Course message