refactor: overhaul minimal-deployment compose file

fix: changeset crashes because it uses internal prettier version

refactor: add asdf tool versioning file

fix: iOS build resources

fix: backend tests break every year

refactor: update some backend unit tests

feat: add direnv for nix

feat: update nix flake to not rely on buildFHSUserEnv

feat: enable checkJs by default

feat: custom ion-icon package

feat: custom ion-icon package

feat: custom ion-icon element

feat: custom ion-icon element

feat: custom ion-icon element

feat: custom ion icon element

fix: e2e tests

.changeset/fair-monkeys-tickle.md

@@ -0,0 +1,9 @@
+---
+"@openstapps/node-builder": patch
+"@openstapps/database": patch
+"@openstapps/node-base": patch
+"@openstapps/backend": patch
+"@openstapps/app": patch
+---
+
+pin alpine version to 3.18 and add healthchecks

.gitignore

@@ -102,6 +102,7 @@ typings/
 
 # ignore lib
 lib
+dist
 
 # ignore docs
 docs

.tool-versions

@@ -1,3 +1,3 @@
-nodejs 18.16.1
+nodejs 18.19.1
-pnpm 8.8.0
+pnpm 8.15.4
 python 3.11.5

backend/backend/Dockerfile

@@ -9,6 +9,6 @@ ENV NODE_ENV=production
 WORKDIR /app
 
 EXPOSE 3000
-ENTRYPOINT ["node", "app.js"]
+HEALTHCHECK --interval=10s --timeout=10s --start-period=10s --retries=12 CMD curl -s --fail --request POST --data '{}' --header 'Content-Type: application/json' http://localhost:3000/ >/dev/null || exit 1
 
-HEALTHCHECK --interval=10s --timeout=5s --start-period=10s --retries=12 CMD curl -s --fail --request POST --data '{}' --header 'Content-Type: application/json' http://localhost:3000/ >/dev/null || exit 1
+ENTRYPOINT ["node", "app.js"]

backend/backend/package.json

@@ -64,7 +64,7 @@
     "express-prom-bundle": "6.6.0",
     "express-promise-router": "4.1.1",
     "got": "12.6.0",
-    "moment": "2.29.4",
+    "moment": "2.30.1",
     "morgan": "1.10.0",
     "nock": "13.3.1",
     "node-cache": "5.1.2",
@@ -98,9 +98,9 @@
     "sinon": "15.0.4",
     "sinon-express-mock": "2.2.1",
     "supertest": "6.3.3",
-    "ts-node": "10.9.1",
+    "ts-node": "10.9.2",
     "tsup": "6.7.0",
-    "typescript": "5.1.6"
+    "typescript": "5.4.2"
   },
   "tsup": {
     "entry": [

backend/database/Dockerfile

@@ -14,6 +14,6 @@ RUN chown elasticsearch:elasticsearch config/elasticsearch.yml
 
 USER elasticsearch
 
-CMD ["/usr/share/elasticsearch/bin/elasticsearch"]
+HEALTHCHECK --interval=10s --timeout=10s --start-period=60s --retries=12 CMD curl --fail -s http://localhost:9200/ >/dev/null || exit 1
 
-HEALTHCHECK --interval=10s --timeout=5s --start-period=60s --retries=12 CMD curl --fail -s http://localhost:9200/ >/dev/null || exit 1
+CMD ["/usr/share/elasticsearch/bin/elasticsearch"]

backend/database/config/elasticsearch.yml

@@ -3,4 +3,4 @@ discovery.type: "single-node"
 cluster.routing.allocation.disk.threshold_enabled: false
 network.bind_host: 0.0.0.0
 xpack.security.enabled: false
-ingest.geoip.downloader.enabled: false
+ingest.geoip.downloader.enabled: false

backend/proxy/config/default.cjs

@@ -16,7 +16,7 @@
 
 // ESM is not supported, and cts is not detected, so we use type-checked cjs instead.
 /** @type {import('../src/common').ConfigFile} */
-const configFile = {
+module.exports = {
   activeVersions: ['1\\.0\\.\\d+', '2\\.0\\.\\d+'],
   hiddenRoutes: ['/bulk'],
   logFormat: 'default',
@@ -31,5 +31,3 @@ const configFile = {
     dhparam: '/etc/nginx/certs/dhparam.pem',
   },
 };
-
-export default configFile;

backend/proxy/package.json

@@ -50,8 +50,8 @@
     "dockerode": "3.3.5",
     "is-cidr": "4.0.2",
     "mustache": "4.2.0",
-    "semver": "7.5.4",
+    "semver": "7.6.0",
-    "typescript": "5.1.6"
+    "typescript": "5.4.2"
   },
   "devDependencies": {
     "@openstapps/api-cli": "workspace:*",
@@ -65,7 +65,7 @@
     "@types/mustache": "4.2.2",
     "@types/node": "18.15.3",
     "@types/proxyquire": "1.3.28",
-    "@types/semver": "7.5.6",
+    "@types/semver": "7.5.8",
     "@types/sha1": "1.1.3",
     "@types/sinon": "10.0.14",
     "@types/sinon-chai": "3.2.9",
@@ -75,7 +75,7 @@
     "mocha-junit-reporter": "2.2.0",
     "sinon": "15.0.4",
     "sinon-chai": "3.7.0",
-    "ts-node": "10.9.1",
+    "ts-node": "10.9.2",
     "tsup": "6.7.0"
   },
   "tsup": {

configuration/eslint-config/package.json

@@ -18,16 +18,15 @@
   "devDependencies": {
     "@openstapps/tsconfig": "workspace:*",
     "@types/node": "18.15.3",
-    "eslint": "8.43.0",
+    "eslint": "8.57.0",
-    "typescript": "5.1.6"
+    "typescript": "5.4.2"
   },
   "peerDependencies": {
-    "@typescript-eslint/eslint-plugin": "5.60.1",
+    "@typescript-eslint/eslint-plugin": "7.2.0",
-    "@typescript-eslint/parser": "5.60.1",
+    "@typescript-eslint/parser": "7.2.0",
-    "eslint": "8.43.0",
+    "eslint": "8.57.0",
-    "eslint-config-prettier": "8.8.0",
+    "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-jsdoc": "46.4.2",
+    "eslint-plugin-jsdoc": "48.2.1",
-    "eslint-plugin-prettier": "4.2.1",
+    "eslint-plugin-unicorn": "51.0.1"
-    "eslint-plugin-unicorn": "47.0.0"
   }
 }

configuration/projectmanagement/package.json

@@ -43,8 +43,8 @@
     "@openstapps/logger": "workspace:*",
     "@slack/web-api": "6.8.1",
     "commander": "10.0.0",
-    "date-fns": "2.30.0",
+    "date-fns": "3.6.0",
-    "glob": "10.2.7",
+    "glob": "10.3.10",
     "mustache": "4.2.0"
   },
   "devDependencies": {
@@ -53,7 +53,7 @@
     "@openstapps/tsconfig": "workspace:*",
     "@types/chai": "4.3.5",
     "@types/chai-as-promised": "7.1.5",
-    "@types/glob": "8.0.1",
+    "@types/glob": "8.1.0",
     "@types/mocha": "10.0.1",
     "@types/mustache": "4.2.2",
     "@types/node": "18.15.3",
@@ -63,9 +63,9 @@
     "chai-as-promised": "7.1.1",
     "mocha": "10.2.0",
     "mocha-junit-reporter": "2.2.0",
-    "ts-node": "10.9.1",
+    "ts-node": "10.9.2",
     "tsup": "6.7.0",
-    "typescript": "5.1.6"
+    "typescript": "5.4.2"
   },
   "tsup": {
     "entry": [

examples/minimal-connector/package.json

@@ -53,9 +53,9 @@
     "mocha": "10.2.0",
     "mocha-junit-reporter": "2.2.0",
     "nock": "13.3.1",
-    "ts-node": "10.9.1",
+    "ts-node": "10.9.2",
     "tsup": "6.7.0",
-    "typescript": "5.1.6"
+    "typescript": "5.4.2"
   },
   "tsup": {
     "entry": [

examples/minimal-plugin/package.json

@@ -35,7 +35,7 @@
     "@openstapps/logger": "workspace:*",
     "commander": "10.0.0",
     "express": "4.18.2",
-    "ts-node": "10.9.1"
+    "ts-node": "10.9.2"
   },
   "devDependencies": {
     "@openstapps/eslint-config": "workspace:*",
@@ -44,7 +44,7 @@
     "@types/express": "4.17.17",
     "@types/node": "18.15.3",
     "tsup": "6.7.0",
-    "typescript": "5.1.6"
+    "typescript": "5.4.2"
   },
   "tsup": {
     "entry": [

frontend/app/.browserslistrc

@@ -5,10 +5,4 @@
 # You can see what browsers were selected by your queries by running:
 #   npx browserslist
 
-> 0.5%
+> 0.5% in DE and last 2 major versions and supports es6 and not dead
-last 2 versions
-Firefox ESR
-not dead
-not kaios 2.5
-not op_mini all
-not IE 9-11

frontend/app/.prettierignore

@@ -11,6 +11,7 @@ log.txt
 *.sublime-workspace
 .vscode/*
 npm-debug.log*
+.browser-data
 
 # This file is sometimes created automatically, even though
 # we actually use the capacitor.config.ts

frontend/app/Dockerfile

@@ -1,7 +1,7 @@
 # Creates a docker image with only the app as an executable unit
 # Dependencies need to be installed beforehand
 # Needs to be build beforehand
-FROM node:18-alpine
+FROM node:18-alpine3.18
 
 WORKDIR /app
 COPY www/ /app/www

frontend/app/ICONS.md

@@ -21,10 +21,10 @@ as usual.
 
 The modified `ion-icon` comes with a few extra features:
 
-- `[fill]` controls the fill color of the icon.
+- `[style.--fill]` controls the fill color of the icon.
-- `[weight]` controls the font weight of the icon.
+- `[style.--weight]` controls the font weight of the icon.
-- `[size]` controls the font size of the icon.
+- `[style.--size]` controls the font size of the icon.
-- `[grade]` controls the font grade of the icon.
+- `[style.--grade]` controls the font grade of the icon.
 
 All of these attributes are animated as described
 [here](https://developers.google.com/fonts/docs/material_symbols).
@@ -50,11 +50,10 @@ the config file.
 Icon font minification is done automatically, but requires you to
 follow a few simple rules:
 
-1. Use the tagged template literal for referencing icon names in
+1. Use the Proxy object to reference icon names in TypeScript files and code
-   TypeScript files and code
 
 ```ts
-SCIcon`icon_name`;
+SCIcon.icon_name;
 ```
 
 2. When using `ion-icon` in HTML, reference either icons that went through

frontend/app/angular.json

@@ -97,20 +97,20 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "app:build"
+            "buildTarget": "app:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "app:build:production"
+              "buildTarget": "app:build:production"
             },
             "development": {
-              "browserTarget": "app:build:development"
+              "buildTarget": "app:build:development"
             },
             "ci": {
-              "browserTarget": "app:build"
+              "buildTarget": "app:build"
             },
             "fake": {
-              "browserTarget": "app:build:fake"
+              "buildTarget": "app:build:fake"
             }
           },
           "defaultConfiguration": "development"

frontend/app/cypress/integration/dashboard.spec.ts

@@ -173,7 +173,7 @@ describe('dashboard', async function () {
       cy.visit('/overview');
 
       cy.get('ion-searchbar').click({scrollBehavior: 'center'});
-      cy.url().should('eq', Cypress.config().baseUrl + '/search');
+      cy.url().should('include', '/search');
       cy.get('ion-searchbar').should('not.have.value');
       cy.get('ion-searchbar input.searchbar-input').should('have.focus');
 

frontend/app/cypress/integration/favorites.spec.ts

@@ -16,7 +16,7 @@
 describe('favorites', function () {
   beforeEach(() => {
     cy.interceptSearch({
-      extends: {query: 'test'},
+      extends: {query: 'a'},
       fixture: 'search/generic',
       alias: 'search',
     });
@@ -29,7 +29,7 @@ describe('favorites', function () {
   it('should add a favorite', function () {
     cy.visit('/search');
     cy.patchSearchPage();
-    cy.get('ion-searchbar').type('test');
+    cy.get('ion-searchbar').type('a');
     let text!: string;
     cy.get('stapps-data-list-item')
       .first()
@@ -40,9 +40,7 @@ describe('favorites', function () {
             text = it;
           });
         cy.get('stapps-favorite-button').click();
-        cy.get('stapps-favorite-button > ion-button > ion-icon')
+        cy.get('stapps-favorite-button > ion-button > ion-icon').should('have.class', 'selected');
-          .invoke('attr', 'ng-reflect-fill')
-          .should('eq', 'true');
       });
     cy.visit('/favorites');
     cy.get('stapps-data-list-item').within(() => {

frontend/app/package.json

@@ -21,7 +21,7 @@
     "build:prod": "ng build --configuration=production",
     "build:stats": "ng build --configuration=production --stats-json",
     "changelog": "conventional-changelog -p angular -i src/assets/about/CHANGELOG.md -s -r 0",
-    "check-icons": "ts-node-esm scripts/check-icon-correctness.ts",
+    "check-icons": "ts-node scripts/check-icon-correctness.ts",
     "chromium:no-cors": "chromium --disable-web-security --user-data-dir=\".browser-data/chromium\"",
     "chromium:virtual-host": "chromium --host-resolver-rules=\"MAP mobile.app.uni-frankfurt.de:* localhost:8100\" --ignore-certificate-errors",
     "cypress:open": "cypress open",
@@ -52,34 +52,34 @@
     "test:integration": "sh integration-test.sh"
   },
   "dependencies": {
-    "@angular/animations": "16.1.4",
+    "@angular/animations": "17.3.0",
-    "@angular/cdk": "16.1.4",
+    "@angular/cdk": "17.3.0",
-    "@angular/common": "16.1.4",
+    "@angular/common": "17.3.0",
-    "@angular/core": "16.1.4",
+    "@angular/core": "17.3.0",
-    "@angular/forms": "16.1.4",
+    "@angular/forms": "17.3.0",
-    "@angular/platform-browser": "16.1.4",
+    "@angular/platform-browser": "17.3.0",
-    "@angular/router": "16.1.4",
+    "@angular/router": "17.3.0",
-    "@asymmetrik/ngx-leaflet": "16.0.1",
+    "@asymmetrik/ngx-leaflet": "17.0.0",
-    "@asymmetrik/ngx-leaflet-markercluster": "16.0.0",
+    "@asymmetrik/ngx-leaflet-markercluster": "17.0.0",
-    "@awesome-cordova-plugins/calendar": "5.45.0",
+    "@awesome-cordova-plugins/calendar": "6.6.0",
-    "@awesome-cordova-plugins/core": "5.45.0",
+    "@awesome-cordova-plugins/core": "6.6.0",
-    "@capacitor/app": "5.0.6",
+    "@capacitor/app": "5.0.7",
-    "@capacitor/browser": "5.1.0",
+    "@capacitor/browser": "5.2.0",
-    "@capacitor/clipboard": "5.0.6",
+    "@capacitor/clipboard": "5.0.7",
-    "@capacitor/core": "5.5.0",
+    "@capacitor/core": "5.7.3",
-    "@capacitor/device": "5.0.6",
+    "@capacitor/device": "5.0.7",
-    "@capacitor/dialog": "5.0.6",
+    "@capacitor/dialog": "5.0.7",
-    "@capacitor/filesystem": "5.1.4",
+    "@capacitor/filesystem": "5.2.1",
-    "@capacitor/geolocation": "5.0.6",
+    "@capacitor/geolocation": "5.0.7",
-    "@capacitor/haptics": "5.0.6",
+    "@capacitor/haptics": "5.0.7",
-    "@capacitor/keyboard": "5.0.6",
+    "@capacitor/keyboard": "5.0.8",
-    "@capacitor/local-notifications": "5.0.6",
+    "@capacitor/local-notifications": "5.0.7",
-    "@capacitor/network": "5.0.6",
+    "@capacitor/network": "5.0.7",
-    "@capacitor/preferences": "5.0.6",
+    "@capacitor/preferences": "5.0.7",
-    "@capacitor/share": "5.0.6",
+    "@capacitor/share": "5.0.7",
-    "@capacitor/splash-screen": "5.0.6",
+    "@capacitor/splash-screen": "5.0.7",
     "@ionic-native/core": "5.36.0",
-    "@ionic/angular": "7.1.3",
+    "@ionic/angular": "7.8.0",
     "@ionic/storage-angular": "4.0.0",
     "@ngx-translate/core": "15.0.0",
     "@ngx-translate/http-loader": "8.0.0",
@@ -87,104 +87,105 @@
     "@openstapps/api": "workspace:*",
     "@openstapps/collection-utils": "workspace:*",
     "@openstapps/core": "workspace:*",
-    "@transistorsoft/capacitor-background-fetch": "5.1.1",
+    "@transistorsoft/capacitor-background-fetch": "5.2.0",
-    "@types/dom-view-transitions": "1.0.1",
+    "@types/dom-view-transitions": "1.0.4",
     "capacitor-secure-storage-plugin": "0.9.0",
     "cordova-plugin-calendar": "5.1.6",
-    "date-fns": "2.30.0",
+    "date-fns": "3.6.0",
     "deepmerge": "4.3.1",
     "form-data": "4.0.0",
     "geojson": "0.5.0",
     "ionic-appauth": "0.9.0",
+    "ionicons": "7.2.1",
     "jsonpath-plus": "6.0.1",
-    "leaflet": "1.9.3",
+    "leaflet": "1.9.4",
     "leaflet.markercluster": "1.5.3",
-    "material-symbols": "0.10.0",
+    "material-symbols": "0.17.0",
-    "moment": "2.29.4",
+    "moment": "2.30.1",
-    "ngx-date-fns": "10.0.1",
+    "ngx-date-fns": "11.0.0",
     "ngx-logger": "5.0.12",
-    "ngx-markdown": "16.0.0",
+    "ngx-markdown": "17.1.1",
     "ngx-moment": "6.0.2",
     "opening_hours": "3.8.0",
     "rxjs": "7.8.1",
-    "semver": "7.5.4",
+    "semver": "7.6.0",
     "swiper": "8.4.5",
-    "tslib": "2.4.1",
+    "tslib": "2.6.2",
-    "zone.js": "0.13.1"
+    "zone.js": "0.14.4"
   },
   "devDependencies": {
-    "@angular-devkit/architect": "0.1601.4",
+    "@angular-devkit/architect": "0.1703.0",
-    "@angular-devkit/build-angular": "16.1.4",
+    "@angular-devkit/build-angular": "17.3.0",
-    "@angular-devkit/core": "16.1.4",
+    "@angular-devkit/core": "17.3.0",
-    "@angular-devkit/schematics": "16.1.4",
+    "@angular-devkit/schematics": "17.3.0",
-    "@angular-eslint/builder": "16.1.0",
+    "@angular-eslint/builder": "17.3.0",
-    "@angular-eslint/eslint-plugin": "16.1.0",
+    "@angular-eslint/eslint-plugin": "17.3.0",
-    "@angular-eslint/eslint-plugin-template": "16.1.0",
+    "@angular-eslint/eslint-plugin-template": "17.3.0",
-    "@angular-eslint/schematics": "16.1.0",
+    "@angular-eslint/schematics": "17.3.0",
-    "@angular-eslint/template-parser": "16.1.0",
+    "@angular-eslint/template-parser": "17.3.0",
-    "@angular/cli": "16.1.4",
+    "@angular/cli": "17.3.0",
-    "@angular/compiler": "16.1.4",
+    "@angular/compiler": "17.3.0",
-    "@angular/compiler-cli": "16.1.4",
+    "@angular/compiler-cli": "17.3.0",
-    "@angular/language-service": "16.1.4",
+    "@angular/language-server": "17.3.0",
-    "@angular/platform-browser-dynamic": "16.1.4",
+    "@angular/language-service": "17.3.0",
-    "@capacitor/android": "5.5.0",
+    "@angular/platform-browser-dynamic": "17.3.0",
-    "@capacitor/assets": "3.0.1",
+    "@capacitor/android": "5.7.3",
-    "@capacitor/cli": "5.5.0",
+    "@capacitor/assets": "3.0.4",
-    "@capacitor/ios": "5.5.0",
+    "@capacitor/cli": "5.7.3",
-    "@compodoc/compodoc": "1.1.19",
+    "@capacitor/ios": "5.7.3",
-    "@cypress/schematic": "1.7.0",
+    "@compodoc/compodoc": "1.1.23",
-    "@ionic/angular-toolkit": "10.0.0",
+    "@cypress/schematic": "2.5.1",
-    "@ionic/cli": "7.1.1",
+    "@ionic/angular-toolkit": "11.0.1",
+    "@ionic/cli": "7.2.0",
     "@openstapps/prettier-config": "workspace:*",
     "@openstapps/tsconfig": "workspace:*",
-    "@types/fontkit": "1.8.0",
+    "@types/fontkit": "2.0.7",
     "@types/geojson": "1.0.6",
-    "@types/glob": "8.0.1",
+    "@types/glob": "8.1.0",
-    "@types/jasmine": "4.3.1",
+    "@types/jasmine": "5.1.4",
-    "@types/jasminewd2": "2.0.10",
+    "@types/jasminewd2": "2.0.13",
     "@types/jsonpath": "0.2.0",
-    "@types/karma": "6.3.4",
+    "@types/karma": "6.3.8",
-    "@types/karma-coverage": "2.0.1",
+    "@types/karma-coverage": "2.0.3",
-    "@types/karma-jasmine": "4.0.2",
+    "@types/karma-jasmine": "4.0.5",
-    "@types/leaflet": "1.9.0",
+    "@types/leaflet": "1.9.8",
-    "@types/leaflet.markercluster": "1.5.1",
+    "@types/leaflet.markercluster": "1.5.4",
     "@types/node": "18.15.3",
-    "@types/semver": "7.5.6",
+    "@types/semver": "7.5.8",
-    "@typescript-eslint/eslint-plugin": "5.60.1",
+    "@typescript-eslint/eslint-plugin": "7.2.0",
-    "@typescript-eslint/parser": "5.60.1",
+    "@typescript-eslint/parser": "7.2.0",
     "cordova-res": "0.15.4",
-    "cypress": "13.2.0",
+    "cypress": "13.7.0",
-    "eslint": "8.43.0",
+    "eslint": "8.57.0",
-    "eslint-plugin-jsdoc": "46.4.2",
+    "eslint-plugin-jsdoc": "48.2.1",
-    "eslint-plugin-prettier": "4.2.1",
+    "eslint-plugin-prettier": "5.1.3",
-    "eslint-plugin-unicorn": "47.0.0",
+    "eslint-plugin-unicorn": "51.0.1",
     "fast-deep-equal": "3.1.3",
     "fontkit": "2.0.2",
-    "glob": "10.2.7",
+    "glob": "10.3.10",
     "http-server": "14.1.1",
     "is-docker": "2.2.1",
-    "jasmine-core": "5.0.1",
+    "jasmine-core": "5.1.2",
     "jasmine-spec-reporter": "7.0.0",
     "jetifier": "2.0.0",
-    "junit-report-merger": "6.0.2",
+    "junit-report-merger": "6.0.3",
-    "karma": "6.4.2",
+    "karma": "6.4.3",
     "karma-chrome-launcher": "3.2.0",
     "karma-coverage": "2.2.1",
     "karma-jasmine": "5.1.0",
     "karma-junit-reporter": "2.0.1",
     "karma-mocha-reporter": "2.2.5",
     "license-checker": "25.0.1",
-    "stylelint": "15.10.1",
+    "stylelint": "16.2.1",
-    "stylelint-config-clean-order": "5.0.1",
+    "stylelint-config-clean-order": "5.4.1",
     "stylelint-config-prettier-scss": "1.0.0",
-    "stylelint-config-recommended-scss": "12.0.0",
+    "stylelint-config-recommended-scss": "14.0.0",
-    "stylelint-config-standard-scss": "10.0.0",
+    "stylelint-config-standard-scss": "13.0.0",
     "surge": "0.23.1",
-    "ts-node": "10.9.1",
+    "ts-node": "10.9.2",
-    "typescript": "5.1.6",
+    "typescript": "5.4.2",
-    "webpack-bundle-analyzer": "4.7.0"
+    "webpack-bundle-analyzer": "4.10.1"
   },
-  "prettier": "@openstapps/prettier-config",
   "cordova": {
     "plugins": {},
     "platforms": [

frontend/app/prettier.config.mjs

@@ -1,3 +1,4 @@
+// @ts-check
 /*
  * Copyright (C) 2022 StApps
  * This program is free software: you can redistribute it and/or modify it
@@ -25,7 +26,6 @@ const config = {
       },
     },
   ],
-  ignorePath: ['.prettierignore', '../../.gitignore'],
 };
 
 export default config;

frontend/app/src/app/animation/fab-expand.ts

@@ -14,7 +14,7 @@
  */
 
 import {AnimationBuilder, AnimationController} from '@ionic/angular';
-import {AnimationOptions} from '@ionic/angular/providers/nav-controller';
+import {AnimationOptions} from '@ionic/angular/common/providers/nav-controller';
 import {iosDuration, iosEasing, mdDuration, mdEasing} from './easings';
 
 /**

frontend/app/src/app/app.module.ts

@@ -25,7 +25,6 @@ import moment from 'moment';
 import 'moment/min/locales';
 import {LoggerModule, NGXLogger, NgxLoggerLevel} from 'ngx-logger';
 import SwiperCore, {FreeMode, Navigation} from 'swiper';
-
 import {environment} from '../environments/environment';
 import {AppRoutingModule} from './app-routing.module';
 import {AppComponent} from './app.component';
@@ -62,12 +61,12 @@ import {RoutingStackService} from './util/routing-stack.service';
 import {SCLanguageCode, SCSettingValue} from '@openstapps/core';
 import {DefaultAuthService} from './modules/auth/default-auth.service';
 import {PAIAAuthService} from './modules/auth/paia/paia-auth.service';
-import {IonIconModule} from './util/ion-icon/ion-icon.module';
 import {NavigationModule} from './modules/menu/navigation/navigation.module';
 import {browserFactory, SimpleBrowser} from './util/browser.factory';
 import {getDateFnsLocale} from './translation/dfns-locale';
 import {setDefaultOptions} from 'date-fns';
 import {DateFnsConfigurationService} from 'ngx-date-fns';
+import {SCIcon} from './util/ion-icon/icon';
 import {Capacitor} from '@capacitor/core';
 import {SplashScreen} from '@capacitor/splash-screen';
 
@@ -155,8 +154,9 @@ export function createTranslateLoader(http: HttpClient) {
     DashboardModule,
     DataModule,
     HebisModule,
-    IonicModule.forRoot(),
+    IonicModule.forRoot({
-    IonIconModule,
+      backButtonIcon: SCIcon.arrow_back,
+    }),
     JobModule,
     FavoritesModule,
     LibraryModule,

frontend/app/src/app/modules/about/about-licenses.html

@@ -1,17 +1,17 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
 <ion-header>
   <ion-toolbar color="primary" mode="ios">
@@ -24,28 +24,29 @@
 </ion-header>
 <ion-content parallax>
   <div class="licenses-content">
-    <ion-card
+    @for (license of licenses; track license) {
-      *ngFor="let license of licenses"
+      <ion-card [href]="license.url || license.repository" rel="external" target="_blank">
-      [href]="license.url || license.repository"
+        <ion-card-header>
-      rel="external"
+          <ion-card-title>
-      target="_blank"
+            {{ license.name }}
-    >
+            <ion-icon
-      <ion-card-header>
+              [size]="16"
-        <ion-card-title>
+              [style.--weight]="300"
-          {{ license.name }}
+              class="supertext-icon"
-          <ion-icon [size]="16" [weight]="300" class="supertext-icon" name="open_in_browser"></ion-icon>
+              name="open_in_browser"
-        </ion-card-title>
+            ></ion-icon>
-
+          </ion-card-title>
-        <ion-card-subtitle *ngIf="license.authors || license.publisher">
+          @if (license.authors || license.publisher) {
-          {{ license.authors || license.publisher }}
+            <ion-card-subtitle> {{ license.authors || license.publisher }} </ion-card-subtitle>
-        </ion-card-subtitle>
+          }
-      </ion-card-header>
+        </ion-card-header>
-      <ion-card-content>
+        <ion-card-content>
-        <ion-chip (click)="$event.preventDefault(); viewLicense(license)">
+          <ion-chip (click)="$event.preventDefault(); viewLicense(license)">
-          <ion-icon name="copyright"></ion-icon>
+            <ion-icon name="copyright"></ion-icon>
-          <ion-label>{{ license.licenses }} License</ion-label>
+            <ion-label>{{ license.licenses }} License</ion-label>
-        </ion-chip>
+          </ion-chip>
-      </ion-card-content>
+        </ion-card-content>
-    </ion-card>
+      </ion-card>
+    }
   </div>
 </ion-content>

frontend/app/src/app/modules/about/about-page/about-page-content.html

@@ -1,41 +1,56 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
-<markdown *ngIf="content.type === 'markdown'" [data]="'value' | translateSimple : content"></markdown>
+@if (content.type === 'markdown') {
-<div *ngIf="content.type ==='section'">
+  <markdown [data]="'value' | translateSimple: content"></markdown>
-  <ion-card *ngIf="content.card; else noCard">
+}
-    <ion-card-header>
+@if (content.type === 'section') {
-      <ion-card-title>{{ 'title' | translateSimple : content }}</ion-card-title>
+  <div>
-    </ion-card-header>
+    @if (content.card) {
-    <ion-card-content>
+      <ion-card>
+        <ion-card-header>
+          <ion-card-title>{{ 'title' | translateSimple: content }}</ion-card-title>
+        </ion-card-header>
+        <ion-card-content>
+          <about-page-content [content]="content.content"></about-page-content>
+        </ion-card-content>
+      </ion-card>
+    } @else {
+      <h2>{{ 'title' | translateSimple: content }}</h2>
       <about-page-content [content]="content.content"></about-page-content>
-    </ion-card-content>
+    }
-  </ion-card>
+  </div>
-  <ng-template #noCard>
+}
-    <h2>{{ 'title' | translateSimple : content }}</h2>
+@if (content.type === 'table') {
-    <about-page-content [content]="content.content"></about-page-content>
+  <ion-grid>
-  </ng-template>
+    @for (row of content.rows; track row) {
-</div>
+      <ion-row>
-<ion-grid *ngIf="content.type === 'table'">
+        @for (col of row; track col) {
-  <ion-row *ngFor="let row of content.rows">
+          <ion-col>
-    <ion-col *ngFor="let col of row">
+            <about-page-content [content]="col"></about-page-content>
-      <about-page-content [content]="col"></about-page-content>
+          </ion-col>
-    </ion-col>
+        }
-  </ion-row>
+      </ion-row>
-</ion-grid>
+    }
-<ion-item *ngIf="content.type === 'router link'" [routerLink]="content.link">
+  </ion-grid>
-  <ion-icon *ngIf="content.icon" [name]="content.icon" slot="start"></ion-icon>
+}
-  <ion-label>{{ 'title' | translateSimple : content }}</ion-label>
+@if (content.type === 'router link') {
-</ion-item>
+  <ion-item [routerLink]="content.link">
+    @if (content.icon) {
+      <ion-icon [name]="content.icon" slot="start"></ion-icon>
+    }
+    <ion-label>{{ 'title' | translateSimple: content }}</ion-label>
+  </ion-item>
+}

frontend/app/src/app/modules/about/about-page/about-page.html

@@ -1,32 +1,37 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
 <ion-header>
   <ion-toolbar color="primary" mode="ios">
     <ion-buttons slot="start">
       <ion-back-button></ion-back-button>
     </ion-buttons>
-    <ion-title *ngIf="content; else titleLoading">{{ 'title' | translateSimple : content }}</ion-title>
+    @if (content) {
-    <ng-template #titleLoading>
+      <ion-title>{{ 'title' | translateSimple: content }}</ion-title>
+    } @else {
       <ion-title><ion-skeleton-text animated="true"></ion-skeleton-text></ion-title>
-    </ng-template>
+    }
   </ion-toolbar>
 </ion-header>
-<ion-content parallax *ngIf="content">
+@if (content) {
-  <ion-text>{{ 'about.VERSION_INFO' | translate: {name, version, stappsVersion} }}</ion-text>
+  <ion-content parallax>
-  <div class="page-content">
+    <ion-text>{{ 'about.VERSION_INFO' | translate: {name, version, stappsVersion} }}</ion-text>
-    <about-page-content *ngFor="let element of content.content" [content]="element"></about-page-content>
+    <div class="page-content">
-  </div>
+      @for (element of content.content; track element) {
-</ion-content>
+        <about-page-content [content]="element"></about-page-content>
+      }
+    </div>
+  </ion-content>
+}

frontend/app/src/app/modules/about/about.module.ts

@@ -29,7 +29,6 @@ import {ScrollingModule} from '@angular/cdk/scrolling';
 import {AboutLicenseModalComponent} from './about-license-modal.component';
 import {AboutChangelogComponent} from './about-changelog.component';
 import {UtilModule} from '../../util/util.module';
-import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
 
 const settingsRoutes: Routes = [
   {path: 'about', component: AboutPageComponent},
@@ -53,9 +52,8 @@ const settingsRoutes: Routes = [
   ],
   imports: [
     CommonModule,
-    IonIconModule,
     FormsModule,
-    IonicModule.forRoot(),
+    IonicModule,
     TranslateModule.forChild(),
     ThingTranslateModule.forChild(),
     RouterModule.forChild(settingsRoutes),

frontend/app/src/app/modules/about/release-notes.component.ts

@@ -5,7 +5,6 @@ import {ThingTranslateModule} from '../../translation/thing-translate.module';
 import {IonicModule, ModalController} from '@ionic/angular';
 import {TranslateModule} from '@ngx-translate/core';
 import {UtilModule} from '../../util/util.module';
-import {CommonModule} from '@angular/common';
 
 @Component({
   selector: 'stapps-release-notes',
@@ -13,7 +12,7 @@ import {CommonModule} from '@angular/common';
   styleUrls: ['release-notes.scss'],
   standalone: true,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [UtilModule, MarkdownModule, ThingTranslateModule, IonicModule, TranslateModule, CommonModule],
+  imports: [UtilModule, MarkdownModule, ThingTranslateModule, IonicModule, TranslateModule],
 })
 export class ReleaseNotesComponent {
   @Input() versionInfos: SCAppVersionInfo[];

frontend/app/src/app/modules/about/release-notes.html

@@ -1,18 +1,20 @@
 <ion-header>
   <ion-toolbar>
-    <ion-title><span class="ion-text-wrap">{{'releaseNotes.TITLE_UPDATED' | translate}}</span></ion-title>
+    <ion-title
+      ><span class="ion-text-wrap">{{ 'releaseNotes.TITLE_UPDATED' | translate }}</span></ion-title
+    >
     <ion-buttons slot="end">
-      <ion-button [strong]="true" (click)="modalController.dismiss()"
+      <ion-button [strong]="true" (click)="modalController.dismiss()">{{
-        >{{'modal.DISMISS_NEUTRAL' | translate}}</ion-button
+        'modal.DISMISS_NEUTRAL' | translate
-      >
+      }}</ion-button>
     </ion-buttons>
   </ion-toolbar>
 </ion-header>
 <ion-content parallax>
-  <ng-container *ngFor="let versionInfo of versionInfos">
+  @for (versionInfo of versionInfos; track versionInfo) {
     <markdown
       class="content-card ion-padding"
       [data]="'releaseNotes' | translateSimple: versionInfo"
     ></markdown>
-  </ng-container>
+  }
 </ion-content>

frontend/app/src/app/modules/assessments/assessments.module.ts

@@ -35,7 +35,6 @@ import {AssessmentsProvider} from './assessments.provider';
 import {AssessmentsSimpleDataListComponent} from './list/assessments-simple-data-list.component';
 import {ProtectedRoutes} from '../auth/protected.routes';
 import {AssessmentsTreeListComponent} from './list/assessments-tree-list.component';
-import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
 import {UtilModule} from '../../util/util.module';
 
 const routes: ProtectedRoutes = [
@@ -69,7 +68,6 @@ const routes: ProtectedRoutes = [
   imports: [
     CommonModule,
     FormsModule,
-    IonIconModule,
     IonicModule,
     RouterModule.forChild(routes),
     TranslateModule,

frontend/app/src/app/modules/assessments/page/assessments-page.html

@@ -36,7 +36,7 @@
           class="ion-text-wrap"
           *ngIf="assessments[key].courseOfStudy | async as course; else defaultLabel"
         >
-          {{ 'name' | thingTranslate : course }} ({{ 'academicDegree' | thingTranslate : course }})
+          {{ 'name' | thingTranslate: course }} ({{ 'academicDegree' | thingTranslate: course }})
         </ion-label>
       </div>
       <ng-template #defaultLabel>

frontend/app/src/app/modules/assessments/types/assessment/assessment-base-info.html

@@ -14,8 +14,12 @@
   -->
 
 <ion-label [color]="passed ? undefined : 'danger'"
-  >{{ (_item.grade | isNumeric) ? (_item.grade | numberLocalized :
+  >{{
-  'minimumFractionDigits:1,maximumFractionDigits:1') : '' }} {{ 'status' | thingTranslate : _item | titlecase
+    (_item.grade | isNumeric)
-  }}, {{ 'attempt' | propertyNameTranslate : _item }} {{ _item.attempt }}
+      ? (_item.grade | numberLocalized: 'minimumFractionDigits:1,maximumFractionDigits:1')
+      : ''
+  }}
+  {{ 'status' | thingTranslate: _item | titlecase }}, {{ 'attempt' | propertyNameTranslate: _item }}
+  {{ _item.attempt }}
 </ion-label>
-<ion-note> {{ _item.ects }} {{ 'ects' | propertyNameTranslate : _item }}</ion-note>
+<ion-note> {{ _item.ects }} {{ 'ects' | propertyNameTranslate: _item }}</ion-note>

frontend/app/src/app/modules/assessments/types/assessment/assessment-detail.html

@@ -1,24 +1,28 @@
 <!--
-  ~ Copyright (C) 2022 StApps
+~ Copyright (C) 2022 StApps
-  ~  This program is free software: you can redistribute it and/or modify it
+~  This program is free software: you can redistribute it and/or modify it
-  ~  under the terms of the GNU General Public License as published by the Free
+~  under the terms of the GNU General Public License as published by the Free
-  ~  Software Foundation, version 3.
+~  Software Foundation, version 3.
-  ~
+~
-  ~  This program is distributed in the hope that it will be useful, but WITHOUT
+~  This program is distributed in the hope that it will be useful, but WITHOUT
-  ~  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~  more details.
+~  more details.
-  ~
+~
-  ~  You should have received a copy of the GNU General Public License along with
+~  You should have received a copy of the GNU General Public License along with
-  ~  this program. If not, see <https://www.gnu.org/licenses/>.
+~  this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
 <ion-card>
   <ion-card-content>
-    <ion-note *ngIf="item.courseOfStudy as courseOfStudy">
+    @if (item.courseOfStudy; as courseOfStudy) {
-      {{ $any('courseOfStudy' | propertyNameTranslate : item) | titlecase }}: {{ 'name' | thingTranslate :
+      <ion-note>
-      $any(courseOfStudy) }} ({{ 'academicDegree' | thingTranslate : $any(courseOfStudy) }})
+        {{ $any('courseOfStudy' | propertyNameTranslate: item) | titlecase }}:
-    </ion-note>
+        {{ 'name' | thingTranslate: $any(courseOfStudy) }} ({{
+          'academicDegree' | thingTranslate: $any(courseOfStudy)
+        }})
+      </ion-note>
+    }
   </ion-card-content>
 </ion-card>
 <ion-list class="container">

frontend/app/src/app/modules/assessments/types/assessment/assessment-list-item.html

@@ -14,6 +14,6 @@
   -->
 
 <div class="container">
-  <h2 class="name">{{ 'name' | thingTranslate : item }} {{ item.date ? (item.date | amDateFormat) : '' }}</h2>
+  <h2 class="name">{{ 'name' | thingTranslate: item }} {{ item.date ? (item.date | amDateFormat) : '' }}</h2>
   <assessment-base-info [item]="item"></assessment-base-info>
 </div>

frontend/app/src/app/modules/calendar/add-event-review-modal.html

@@ -1,17 +1,17 @@
 <!--
-  ~ Copyright (C) 2022 StApps
+~ Copyright (C) 2022 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 <div>
   <ion-card-header>
     <ion-card-title>{{ 'schedule.toCalendar.reviewModal.TITLE' | translate }}</ion-card-title>
@@ -22,50 +22,63 @@
 
   <ion-card-content>
     <ion-list lines="none">
-      <ion-item-group *ngFor="let event of iCalEvents">
+      @for (event of iCalEvents; track event) {
-        <ion-item-divider>
+        <ion-item-group>
-          <ion-label>{{ event.title }}</ion-label>
+          <ion-item-divider>
-          <ion-note slot="start" *ngIf="event.events.length > 1">
+            <ion-label>{{ event.title }}</ion-label>
-            <ion-icon name="insert_page_break"></ion-icon>
+            @if (event.events.length > 1) {
-          </ion-note>
+              <ion-note slot="start">
-        </ion-item-divider>
+                <ion-icon name="insert_page_break"></ion-icon>
-        <ion-item *ngFor="let iCalEvent of event.events">
+              </ion-note>
-          <ion-label>
+            }
-            <s *ngIf="iCalEvent.cancelled; else date"
+          </ion-item-divider>
-              ><ng-container [ngTemplateOutlet]="date"></ng-container>
+          @for (iCalEvent of event.events; track iCalEvent) {
-            </s>
+            <ion-item>
-            <ng-template #date> {{ moment(iCalEvent.start) | amDateFormat : 'll, HH:mm' }} </ng-template>
+              <ion-label>
-          </ion-label>
+                @if (iCalEvent.cancelled) {
-          <ion-note *ngIf="iCalEvent.rrule">
+                  <s><ng-container [ngTemplateOutlet]="date"></ng-container> </s>
-            {{ iCalEvent.rrule.interval }} {{ iCalEvent.rrule.freq | sentencecase }}
+                } @else {
-          </ion-note>
+                  {{ moment(iCalEvent.start) | amDateFormat: 'll, HH:mm' }}
-          <ion-icon *ngIf="iCalEvent.rrule" name="event_repeat"></ion-icon>
+                }
-        </ion-item>
+                <ng-template #date> {{ moment(iCalEvent.start) | amDateFormat: 'll, HH:mm' }} </ng-template>
-      </ion-item-group>
+              </ion-label>
+              @if (iCalEvent.rrule) {
+                <ion-note>
+                  {{ iCalEvent.rrule.interval }} {{ iCalEvent.rrule.freq | sentencecase }}
+                </ion-note>
+              }
+              @if (iCalEvent.rrule) {
+                <ion-icon name="event_repeat"></ion-icon>
+              }
+            </ion-item>
+          }
+        </ion-item-group>
+      }
     </ion-list>
   </ion-card-content>
 
   <div class="horizontal-flex">
     <ion-item lines="none">
-      <ion-checkbox [(ngModel)]="includeCancelled"
+      <ion-checkbox [(ngModel)]="includeCancelled">{{
-        >{{ 'schedule.toCalendar.reviewModal.INCLUDE_CANCELLED' | translate }}</ion-checkbox
+        'schedule.toCalendar.reviewModal.INCLUDE_CANCELLED' | translate
-      >
+      }}</ion-checkbox>
     </ion-item>
   </div>
   <div class="horizontal-flex">
     <ion-button fill="clear" (click)="export()">
       {{ 'share' | translate }}
-      <ion-icon slot="end" md="share" ios="ios_share"></ion-icon>
+      <ion-icon slot="end" name="share"></ion-icon>
     </ion-button>
-    <ion-button fill="outline" (click)="download()" *ngIf="isWeb; else exportButton">
+    @if (isWeb) {
-      {{ 'schedule.toCalendar.reviewModal.DOWNLOAD' | translate }}
+      <ion-button fill="outline" (click)="download()">
-      <ion-icon slot="end" name="download"></ion-icon>
+        {{ 'schedule.toCalendar.reviewModal.DOWNLOAD' | translate }}
-    </ion-button>
+        <ion-icon slot="end" name="download"></ion-icon>
-    <ng-template #exportButton>
+      </ion-button>
+    } @else {
       <ion-button fill="outline" (click)="toCalendar()">
         {{ 'schedule.toCalendar.reviewModal.EXPORT' | translate }}
         <ion-icon slot="end" name="event_upcoming"></ion-icon>
       </ion-button>
-    </ng-template>
+    }
   </div>
 </div>

frontend/app/src/app/modules/calendar/calendar.module.ts

@@ -25,15 +25,13 @@ import {FormsModule} from '@angular/forms';
 import {CommonModule} from '@angular/common';
 import {MomentModule} from 'ngx-moment';
 import {UtilModule} from '../../util/util.module';
-import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
 
 @NgModule({
   declarations: [AddEventReviewModalComponent],
   imports: [
-    IonicModule.forRoot(),
+    IonicModule,
     TranslateModule.forChild(),
     ThingTranslateModule.forChild(),
-    IonIconModule,
     FormsModule,
     CommonModule,
     MomentModule,

frontend/app/src/app/modules/catalog/catalog.component.html

@@ -1,17 +1,17 @@
 <!--
-  ~ Copyright (C) 2022 StApps
+~ Copyright (C) 2022 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
 <ion-header>
   <ion-toolbar color="primary" mode="ios">
@@ -23,33 +23,45 @@
   </ion-toolbar>
   <ion-toolbar color="primary" mode="md">
     <ion-segment (ionChange)="segmentChanged($event)" [value]="selectedSemesterUID" mode="md">
-      <ion-segment-button *ngFor="let semester of availableSemesters" [value]="semester.uid">
+      @for (semester of availableSemesters; track semester) {
-        <ion-label>{{ semester.acronym }}</ion-label>
+        <ion-segment-button [value]="semester.uid">
-      </ion-segment-button>
+          <ion-label>{{ semester.acronym }}</ion-label>
+        </ion-segment-button>
+      }
     </ion-segment>
   </ion-toolbar>
 </ion-header>
 
 <ion-content>
-  <ion-list *ngIf="catalogs && catalogs.length > 0">
+  @if (catalogs && catalogs.length > 0) {
-    <ion-item *ngFor="let catalog of catalogs" button="true" lines="inset" (click)="notifySelect(catalog)">
+    <ion-list>
-      <ion-label>
+      @for (catalog of catalogs; track catalog) {
-        <h2>{{ catalog.name }}</h2>
+        <ion-item button="true" lines="inset" (click)="notifySelect(catalog)">
-      </ion-label>
-    </ion-item>
-  </ion-list>
-  <ion-list *ngIf="!catalogs">
-    <stapps-skeleton-list-item *ngFor="let skeleton of [].constructor(10)"> </stapps-skeleton-list-item>
-  </ion-list>
-  <ion-grid *ngIf="catalogs && catalogs.length === 0">
-    <ion-row>
-      <ion-col>
-        <div class="ion-text-center margin-top">
           <ion-label>
-            {{ 'catalog.detail.EMPTY_SEMESTER' | translate }}
+            <h2>{{ catalog.name }}</h2>
           </ion-label>
-        </div>
+        </ion-item>
-      </ion-col>
+      }
-    </ion-row>
+    </ion-list>
-  </ion-grid>
+  }
+  @if (!catalogs) {
+    <ion-list>
+      @for (skeleton of [].constructor(10); track skeleton) {
+        <stapps-skeleton-list-item> </stapps-skeleton-list-item>
+      }
+    </ion-list>
+  }
+  @if (catalogs && catalogs.length === 0) {
+    <ion-grid>
+      <ion-row>
+        <ion-col>
+          <div class="ion-text-center margin-top">
+            <ion-label>
+              {{ 'catalog.detail.EMPTY_SEMESTER' | translate }}
+            </ion-label>
+          </div>
+        </ion-col>
+      </ion-row>
+    </ion-grid>
+  }
 </ion-content>

frontend/app/src/app/modules/catalog/catalog.module.ts

@@ -23,7 +23,6 @@ import {DataModule} from '../data/data.module';
 import {SettingsProvider} from '../settings/settings.provider';
 import {CatalogComponent} from './catalog.component';
 import {UtilModule} from '../../util/util.module';
-import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
 
 const catalogRoutes: Routes = [
   {path: 'catalog', component: CatalogComponent},
@@ -36,11 +35,10 @@ const catalogRoutes: Routes = [
 @NgModule({
   declarations: [CatalogComponent],
   imports: [
-    IonicModule.forRoot(),
+    IonicModule,
     FormsModule,
     TranslateModule.forChild(),
     RouterModule.forChild(catalogRoutes),
-    IonIconModule,
     CommonModule,
     MomentModule,
     DataModule,

frontend/app/src/app/modules/dashboard/dashboard.component.html

@@ -20,7 +20,7 @@
 </ion-header>
 <div #schedule class="schedule">
   <a [routerLink]="['/schedule/week-overview']">
-    <ion-icon [size]="36" [weight]="300" name="calendar_month"></ion-icon>
+    <ion-icon [size]="36" [style.--weight]="300" name="calendar_month"></ion-icon>
     <ion-label [innerHTML]="'schedule.recurring' | translate"></ion-label>
   </a>
   <!-- Avoid structural directives here, they might interfere with the collapse animation -->

frontend/app/src/app/modules/dashboard/dashboard.module.ts

@@ -30,7 +30,6 @@ import {MensaSectionContentComponent} from './sections/mensa-section/mensa-secti
 import {FavoritesSectionComponent} from './sections/favorites-section/favorites-section.component';
 import {ThingTranslateModule} from '../../translation/thing-translate.module';
 import {UtilModule} from '../../util/util.module';
-import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
 import {NewsModule} from '../news/news.module';
 import {JobSectionComponent} from './sections/jobs-section/job-section.component';
 import {JobModule} from '../jobs/jobs.module';
@@ -56,8 +55,7 @@ const catalogRoutes: Routes = [
     JobSectionComponent,
   ],
   imports: [
-    IonicModule.forRoot(),
+    IonicModule,
-    IonIconModule,
     FormsModule,
     TranslateModule.forChild(),
     RouterModule.forChild(catalogRoutes),

frontend/app/src/app/modules/dashboard/sections/favorites-section/favorites-section.component.html

@@ -1,32 +1,34 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
 <stapps-section [title]="'dashboard.favorites.title' | translate">
   <ion-button slot="button-end" fill="clear" color="medium" [routerLink]="['/favorites']">
     <ion-icon slot="icon-only" name="search" [size]="24"></ion-icon>
   </ion-button>
-  <simple-swiper *ngIf="items | async as items; else noItems" @fade>
+  @if (items | async; as items) {
-    <stapps-data-list-item
+    <simple-swiper @fade>
-      *ngFor="let item of items"
+      @for (item of items; track item) {
-      [hideThumbnail]="true"
+        <stapps-data-list-item
-      [listItemEndInteraction]="false"
+          [hideThumbnail]="true"
-      [item]="item"
+          [listItemEndInteraction]="false"
-      appearance="square"
+          [item]="item"
-    ></stapps-data-list-item>
+          appearance="square"
-  </simple-swiper>
+        ></stapps-data-list-item>
-  <ng-template #noItems>
+      }
+    </simple-swiper>
+  } @else {
     <ion-item class="nothing-selected" lines="none">
       <ion-label class="ion-text-wrap">
         {{ 'dashboard.favorites.no_favorite_prefix' | translate }}
@@ -34,5 +36,5 @@
         {{ 'dashboard.favorites.no_favorite_suffix' | translate }}
       </ion-label>
     </ion-item>
-  </ng-template>
+  }
 </stapps-section>

frontend/app/src/app/modules/dashboard/sections/jobs-section/job-section.component.html

@@ -1,43 +1,44 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
 <stapps-section [title]="'dashboard.jobs.title' | translate">
   <ion-button slot="button-end" fill="clear" color="medium" [routerLink]="['/jobs']">
     <ion-icon slot="icon-only" name="search" [size]="24"></ion-icon>
   </ion-button>
-  <simple-swiper *ngIf="jobs | async as jobs; else noItems" @fade>
+  @if (jobs | async; as jobs) {
-    <stapps-data-list-item
+    <simple-swiper @fade>
-      *ngFor="let item of jobs"
+      @for (item of jobs; track item) {
-      [hideThumbnail]="true"
+        <stapps-data-list-item
-      [item]="item"
+          [hideThumbnail]="true"
-      appearance="square"
+          [item]="item"
-    ></stapps-data-list-item>
+          appearance="square"
-    <ion-item [routerLink]="['/jobs']" class="more-jobs" lines="none">
+        ></stapps-data-list-item>
-      <ion-label>{{ 'dashboard.jobs.title' | translate | titlecase }}</ion-label>
+      }
-      <ion-icon color="medium" name="read_more" [size]="40"></ion-icon>
+      <ion-item [routerLink]="['/jobs']" class="more-jobs" lines="none">
-    </ion-item>
+        <ion-label>{{ 'dashboard.jobs.title' | translate | titlecase }}</ion-label>
-  </simple-swiper>
+        <ion-icon color="medium" name="read_more" [size]="40"></ion-icon>
-  <ng-template #noItems>
+      </ion-item>
+    </simple-swiper>
+  } @else {
     <ion-item class="nothing-selected" lines="none">
       <ion-label class="ion-text-wrap">
         {{ 'dashboard.jobs.noJobs' | translate }}
       </ion-label>
     </ion-item>
-
     <ion-button slot="button-end" fill="clear" color="medium" [routerLink]="['/jobs']">
       <ion-icon slot="icon-only" name="search" [size]="24"></ion-icon>
     </ion-button>
-  </ng-template>
+  }
 </stapps-section>

frontend/app/src/app/modules/dashboard/sections/mensa-section/mensa-section-content.component.html

@@ -1,33 +1,37 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
-<ng-container *ngIf="dishes | async as dishes; else loading">
+@if (dishes | async; as dishes) {
-  <simple-swiper *ngIf="dishes.length > 0" @fade>
+  @if (dishes.length > 0) {
-    <stapps-data-list-item
+    <simple-swiper @fade>
-      *ngFor="let dish of dishes"
+      @for (dish of dishes; track dish) {
-      [hideThumbnail]="true"
+        <stapps-data-list-item
-      [item]="dish"
+          [hideThumbnail]="true"
-      appearance="square"
+          [item]="dish"
-    ></stapps-data-list-item>
+          appearance="square"
-  </simple-swiper>
+        ></stapps-data-list-item>
-  <ion-item class="no-dishes" *ngIf="!dishes || dishes.length === 0" lines="none">
+      }
-    <ion-label>
+    </simple-swiper>
-      {{ 'dashboard.canteens.no_dishes_available' | translate }}
+  }
-    </ion-label>
+  @if (!dishes || dishes.length === 0) {
-  </ion-item>
+    <ion-item class="no-dishes" lines="none">
-</ng-container>
+      <ion-label>
-<ng-template #loading>
+        {{ 'dashboard.canteens.no_dishes_available' | translate }}
+      </ion-label>
+    </ion-item>
+  }
+} @else {
   <div class="placeholder"></div>
-</ng-template>
+}

frontend/app/src/app/modules/dashboard/sections/mensa-section/mensa-section.component.html

@@ -1,21 +1,21 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
-<ng-container *ngIf="items | async as items">
+@if (items | async; as items) {
-  <ng-container *ngIf="items.length !== 0; else nothingSelected">
+  @if (items.length !== 0) {
-    <ng-container *ngFor="let item of items">
+    @for (item of items; track item) {
       <stapps-section @fade [item]="item" [title]="'name' | thingTranslate: item">
         <ion-button slot="button-end" fill="clear" color="medium" (click)="favoritesService.delete(item)">
           <ion-icon slot="icon-only" name="delete" [size]="24"></ion-icon>
@@ -23,9 +23,8 @@
         <stapps-opening-hours slot="subtitle" [openingHours]="$any(item).openingHours"></stapps-opening-hours>
         <stapps-mensa-section-content [item]="item"></stapps-mensa-section-content>
       </stapps-section>
-    </ng-container>
+    }
-  </ng-container>
+  } @else {
-  <ng-template #nothingSelected>
     <stapps-section [title]="'dashboard.canteens.title' | translate">
       <ion-item class="nothing-selected" lines="none">
         <ion-label class="ion-text-wrap">
@@ -35,5 +34,5 @@
         </ion-label>
       </ion-item>
     </stapps-section>
-  </ng-template>
+  }
-</ng-container>
+}

frontend/app/src/app/modules/dashboard/sections/news-section/news-section.component.html

@@ -1,29 +1,33 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
 <stapps-section [title]="'dashboard.news.title' | translate">
   <ion-button size="small" slot="button-end" fill="clear" color="medium" [routerLink]="['/news']">
     <ion-icon slot="icon-only" name="read_more"></ion-icon>
   </ion-button>
-  <simple-swiper class="news-swiper card-swiper" *ngIf="news | async as news" @fade>
+  @if (news | async; as news) {
-    <stapps-news-item *ngFor="let newsItem of news" [item]="newsItem"> </stapps-news-item>
+    <simple-swiper class="news-swiper card-swiper" @fade>
-    <ion-item [routerLink]="['/news']" class="more-news" lines="none">
+      @for (newsItem of news; track newsItem) {
-      <ion-label>{{ 'dashboard.news.moreNews' | translate | titlecase }}</ion-label>
+        <stapps-news-item [item]="newsItem"> </stapps-news-item>
-      <ion-thumbnail class="ion-margin-end">
+      }
-        <ion-icon color="medium" name="read_more" [size]="150"></ion-icon>
+      <ion-item [routerLink]="['/news']" class="more-news" lines="none">
-      </ion-thumbnail>
+        <ion-label>{{ 'dashboard.news.moreNews' | translate | titlecase }}</ion-label>
-    </ion-item>
+        <ion-thumbnail class="ion-margin-end">
-  </simple-swiper>
+          <ion-icon color="medium" name="read_more" [size]="150"></ion-icon>
+        </ion-thumbnail>
+      </ion-item>
+    </simple-swiper>
+  }
 </stapps-section>

frontend/app/src/app/modules/dashboard/sections/news-section/news-section.component.scss

@@ -63,10 +63,10 @@ simple-swiper {
   .title {
     overflow: hidden;
     display: -webkit-box;
+    -webkit-box-orient: vertical;
 
     white-space: break-spaces;
 
-    -webkit-box-orient: vertical;
     -webkit-line-clamp: 3;
   }
 

frontend/app/src/app/modules/dashboard/sections/search-section/search-route-transition.ts

@@ -14,7 +14,7 @@
  */
 
 import {AnimationController} from '@ionic/angular';
-import {AnimationOptions} from '@ionic/angular/providers/nav-controller';
+import {AnimationOptions} from '@ionic/angular/common/providers/nav-controller';
 
 /**
  *

frontend/app/src/app/modules/data/chips/action-chip-list.html

@@ -1,19 +1,25 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
-<stapps-locate-action-chip *ngIf="applicable.locate" [item]="item"></stapps-locate-action-chip>
+@if (applicable.locate) {
-<stapps-navigate-action-chip *ngIf="applicable.navigate" [item]="$any(item)"></stapps-navigate-action-chip>
+  <stapps-locate-action-chip [item]="item"></stapps-locate-action-chip>
+}
+@if (applicable.navigate) {
+  <stapps-navigate-action-chip [item]="$any(item)"></stapps-navigate-action-chip>
+}
 <!-- Add Event Chip needs to load data and should be the last -->
-<stapps-add-event-action-chip *ngIf="applicable.event" [item]="item"></stapps-add-event-action-chip>
+@if (applicable.event) {
+  <stapps-add-event-action-chip [item]="item"></stapps-add-event-action-chip>
+}

frontend/app/src/app/modules/data/chips/data/add-event-action-chip.component.ts

@@ -60,7 +60,7 @@ export class AddEventActionChipComponent {
   /**
    * Current state of icon fill
    */
-  iconFill: boolean;
+  iconFill: 1 | 0;
 
   /**
    * Label

frontend/app/src/app/modules/data/chips/data/add-event-action-chip.config.ts

@@ -24,31 +24,31 @@ export enum AddEventStates {
 
 export const AddEventStatesMap = {
   [AddEventStates.ADDED_ALL]: {
-    icon: SCIcon`event_available`,
+    icon: SCIcon.event_available,
-    fill: true,
+    fill: 1,
     label: 'data.chips.add_events.ADDED_ALL',
     disabled: false,
     color: 'success',
   },
   [AddEventStates.ADDED_SOME]: {
-    icon: SCIcon`event`,
+    icon: SCIcon.event,
-    fill: true,
+    fill: 1,
     label: 'data.chips.add_events.ADDED_SOME',
     disabled: false,
     color: 'success',
   },
   [AddEventStates.REMOVED_ALL]: {
-    icon: SCIcon`calendar_today`,
+    icon: SCIcon.calendar_today,
-    fill: false,
+    fill: 0,
     label: 'data.chips.add_events.REMOVED_ALL',
     disabled: false,
     color: 'primary',
   },
   [AddEventStates.UNAVAILABLE]: {
-    icon: SCIcon`event_busy`,
+    icon: SCIcon.event_busy,
-    fill: false,
+    fill: 0,
     label: 'data.chips.add_events.UNAVAILABLE',
     disabled: true,
     color: 'dark',
   },
-};
+} as const;

frontend/app/src/app/modules/data/chips/data/add-event-action-chip.html

@@ -1,57 +1,57 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
 <div class="stack-children">
-  <ion-chip
+  @if (associatedDateSeries | async; as associatedDateSeries) {
-    *ngIf="associatedDateSeries | async as associatedDateSeries; else loading"
+    <ion-chip
-    @chipTransition
+      @chipTransition
-    [disabled]="disabled"
+      [disabled]="disabled"
-    (click)="$event.stopPropagation(); editModal.present()"
+      (click)="$event.stopPropagation(); editModal.present()"
-    [color]="color"
+      [color]="color"
-    [outline]="true"
+      [outline]="true"
-  >
+    >
-    <ion-icon [name]="icon" [fill]="iconFill"></ion-icon>
+      <ion-icon [name]="icon" [style.--fill]="iconFill"></ion-icon>
-    <ion-label>{{ label | translate }}</ion-label>
+      <ion-label>{{ label | translate }}</ion-label>
-    <stapps-edit-modal #editModal (save)="selection.save()">
+      <stapps-edit-modal #editModal (save)="selection.save()">
-      <ng-template>
+        <ng-template>
-        <ion-content parallax [parallaxSize]="160" class="ion-padding modal-content">
+          <ion-content parallax [parallaxSize]="160" class="ion-padding modal-content">
-          <stapps-edit-event-selection
+            <stapps-edit-event-selection
-            #selection
+              #selection
-            [items]="associatedDateSeries"
+              [items]="associatedDateSeries"
-            (modified)="editModal.pendingChanges = true"
+              (modified)="editModal.pendingChanges = true"
-          ></stapps-edit-event-selection>
+            ></stapps-edit-event-selection>
-        </ion-content>
+          </ion-content>
-        <ion-footer mode="ios">
+          <ion-footer mode="ios">
-          <ion-toolbar color="light">
+            <ion-toolbar color="light">
-            <ion-button
+              <ion-button
-              slot="end"
+                slot="end"
-              fill="clear"
+                fill="clear"
-              (click)="export()"
+                (click)="export()"
-              [disabled]="!(selection.selection.indeterminate || selection.selection.checked)"
+                [disabled]="!(selection.selection.indeterminate || selection.selection.checked)"
-            >
+              >
-              {{ 'schedule.toCalendar.reviewModal.DOWNLOAD' | translate | titlecase }}
+                {{ 'schedule.toCalendar.reviewModal.DOWNLOAD' | translate | titlecase }}
-              <ion-icon slot="end" name="download"></ion-icon>
+                <ion-icon slot="end" name="download"></ion-icon>
-            </ion-button>
+              </ion-button>
-          </ion-toolbar>
+            </ion-toolbar>
-        </ion-footer>
+          </ion-footer>
-      </ng-template>
+        </ng-template>
-    </stapps-edit-modal>
+      </stapps-edit-modal>
-  </ion-chip>
+    </ion-chip>
-  <ng-template #loading>
+  } @else {
     <ion-chip @chipSkeletonTransition>
       <ion-skeleton-text animated="true"></ion-skeleton-text>
     </ion-chip>
-  </ng-template>
+  }
 </div>

frontend/app/src/app/modules/data/chips/data/add-event-action-chip.scss

@@ -23,8 +23,7 @@
 
 .stack-children {
   display: grid;
-  align-items: start;
+  place-items: start start;
-  justify-items: start;
 }
 
 .stack-children > * {

frontend/app/src/app/modules/data/chips/data/navigate-action-chip.html

@@ -14,5 +14,5 @@
   -->
 <ion-chip [color]="'primary'" [outline]="true" [geoNavigation]="place">
   <ion-icon name="directions"></ion-icon>
-  <ion-label>{{'map.directions.TITLE' | translate}}</ion-label>
+  <ion-label>{{ 'map.directions.TITLE' | translate }}</ion-label>
 </ion-chip>

frontend/app/src/app/modules/data/chips/edit-event-selection.html

@@ -1,17 +1,17 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
 <ion-item class="list-header" lines="none">
   <ion-checkbox
@@ -22,7 +22,7 @@
     <ion-list-header> {{ 'data.chips.add_events.popover.ALL' | translate }} </ion-list-header>
   </ion-checkbox>
 </ion-item>
-<ng-container *ngFor="let frequency of selection.children">
+@for (frequency of selection.children; track frequency) {
   <ion-list inset="true" lines="full">
     <ion-item lines="none" class="list-header">
       <ion-checkbox
@@ -31,48 +31,55 @@
         (ionChange)="modified.emit(); frequency.click()"
       >
         <ion-list-header>
-          {{ frequency.children[0].item.repeatFrequency ? (frequency.children[0].item.repeatFrequency |
+          {{
-          durationLocalized: true | sentencecase) : ('data.chips.add_events.popover.SINGLE' | translate |
+            frequency.children[0].item.repeatFrequency
-          titlecase) }}
+              ? (frequency.children[0].item.repeatFrequency | durationLocalized: true | sentencecase)
+              : ('data.chips.add_events.popover.SINGLE' | translate | titlecase)
+          }}
         </ion-list-header>
       </ion-checkbox>
     </ion-item>
-    <ion-item *ngFor="let date of frequency.children">
+    @for (date of frequency.children; track date) {
-      <ion-checkbox
+      <ion-item>
-        [checked]="date.selected"
+        <ion-checkbox
-        (ionChange)="modified.emit(); date.selected = !date.selected; frequency.notifyChildChanged()"
+          [checked]="date.selected"
-      >
+          (ionChange)="modified.emit(); date.selected = !date.selected; frequency.notifyChildChanged()"
-        <ng-container *ngIf="date.item.dates.length > 1; else single_event">
+        >
-          <ion-text>
+          @if (date.item.dates.length > 1) {
-            {{ date.item.dates[0] | amDateFormat: 'dddd, LT' }} - {{ date.item.dates[0] | amAdd:
+            <ion-text>
-            date.item.duration | amDateFormat: 'LT' }}
+              {{ date.item.dates[0] | amDateFormat: 'dddd, LT' }} -
-          </ion-text>
+              {{ date.item.dates[0] | amAdd: date.item.duration | amDateFormat: 'LT' }}
-          <br />
-          <ion-text>
-            {{ date.item.dates[0] | amDateFormat: 'LL' }} - {{ date.item.dates[date.item.dates.length - 1] |
-            amDateFormat: 'LL' }}
-          </ion-text>
-        </ng-container>
-        <ng-template #single_event>
-          <ion-text *ngIf="date.item.dates[0] as time; else noDates">
-            {{ time | amDateFormat: 'LL, LT' }} - {{ time | amAdd: date.item.duration | amDateFormat: 'LT' }}
-          </ion-text>
-          <ng-template #noDates>
-            <ion-text color="danger">{{ 'data.chips.add_events.popover.DATA_ERROR' | translate }}</ion-text>
-            <br />
-            <ion-text *ngFor="let id of date.item.identifiers | keyvalue">
-              {{ id.key }}: {{ id.value }}
             </ion-text>
-          </ng-template>
+            <br />
-        </ng-template>
+            <ion-text>
-        <ng-container class="ion-align-items-center" *ngIf="date.item.inPlace">
+              {{ date.item.dates[0] | amDateFormat: 'LL' }} -
-          <br />
+              {{ date.item.dates[date.item.dates.length - 1] | amDateFormat: 'LL' }}
-          <ion-text color="medium" class="place">
+            </ion-text>
-            <ion-icon name="pin_drop"></ion-icon>
+          } @else {
-            <span> {{ 'inPlace.name' | thingTranslate: date.item }}</span>
+            @if (date.item.dates[0]; as time) {
-          </ion-text>
+              <ion-text>
-        </ng-container>
+                {{ time | amDateFormat: 'LL, LT' }} -
-      </ion-checkbox>
+                {{ time | amAdd: date.item.duration | amDateFormat: 'LT' }}
-    </ion-item>
+              </ion-text>
+            } @else {
+              <ion-text color="danger">{{ 'data.chips.add_events.popover.DATA_ERROR' | translate }}</ion-text>
+              <br />
+              @for (id of date.item.identifiers | keyvalue; track id) {
+                <ion-text> {{ id.key }}: {{ id.value }} </ion-text>
+              }
+            }
+          }
+          @if (date.item.inPlace) {
+            <ng-container class="ion-align-items-center">
+              <br />
+              <ion-text color="medium" class="place">
+                <ion-icon name="pin_drop"></ion-icon>
+                <span> {{ 'inPlace.name' | thingTranslate: date.item }}</span>
+              </ion-text>
+            </ng-container>
+          }
+        </ion-checkbox>
+      </ion-item>
+    }
   </ion-list>
-</ng-container>
+}

frontend/app/src/app/modules/data/chips/filter/chip-filter.component.html

@@ -1,19 +0,0 @@
-<!--
-  ~ Copyright (C) 2022 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
-  ~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
-
-<ion-chip *ngIf="displayValue" [class.active]="active" (click)="emitToggle(value)">
-  <ion-icon class="ion-color" name="check_circle" [fill]="true" *ngIf="active"></ion-icon>
-  <ion-label>{{ displayValue }}</ion-label>
-</ion-chip>

frontend/app/src/app/modules/data/data-icon.config.ts

@@ -16,35 +16,35 @@ import {SCThingType} from '@openstapps/core';
 import {SCIcon} from '../../util/ion-icon/icon';
 
 export const DataIcons: Record<SCThingType, string> = {
-  'academic event': SCIcon`school`,
+  'academic event': SCIcon.school,
-  'assessment': SCIcon`fact_check`,
+  'assessment': SCIcon.fact_check,
-  'article': SCIcon`article`,
+  'article': SCIcon.article,
-  'book': SCIcon`book`,
+  'book': SCIcon.book,
-  'building': SCIcon`location_city`,
+  'building': SCIcon.location_city,
-  'certification': SCIcon`contract`,
+  'certification': SCIcon.contract,
-  'catalog': SCIcon`inventory_2`,
+  'catalog': SCIcon.inventory_2,
-  'contact point': SCIcon`contact_page`,
+  'contact point': SCIcon.contact_page,
-  'course of study': SCIcon`school`,
+  'course of study': SCIcon.school,
-  'date series': SCIcon`event`,
+  'date series': SCIcon.event,
-  'dish': SCIcon`lunch_dining`,
+  'dish': SCIcon.lunch_dining,
-  'favorite': SCIcon`favorite`,
+  'favorite': SCIcon.favorite,
-  'floor': SCIcon`foundation`,
+  'floor': SCIcon.foundation,
-  'id card': SCIcon`badge`,
+  'id card': SCIcon.badge,
-  'message': SCIcon`newspaper`,
+  'message': SCIcon.newspaper,
-  'organization': SCIcon`business_center`,
+  'organization': SCIcon.business_center,
-  'periodical': SCIcon`feed`,
+  'periodical': SCIcon.feed,
-  'person': SCIcon`person`,
+  'person': SCIcon.person,
-  'point of interest': SCIcon`pin_drop`,
+  'point of interest': SCIcon.pin_drop,
-  'publication event': SCIcon`campaign`,
+  'publication event': SCIcon.campaign,
-  'room': SCIcon`meeting_room`,
+  'room': SCIcon.meeting_room,
-  'semester': SCIcon`date_range`,
+  'semester': SCIcon.date_range,
-  'setting': SCIcon`settings`,
+  'setting': SCIcon.settings,
-  'sport course': SCIcon`sports_soccer`,
+  'sport course': SCIcon.sports_soccer,
-  'study module': SCIcon`view_module`,
+  'study module': SCIcon.view_module,
-  'ticket': SCIcon`confirmation_number`,
+  'ticket': SCIcon.confirmation_number,
-  'todo': SCIcon`task`,
+  'todo': SCIcon.task,
-  'tour': SCIcon`tour`,
+  'tour': SCIcon.tour,
-  'video': SCIcon`movie`,
+  'video': SCIcon.movie,
-  'diff': SCIcon`difference`,
+  'diff': SCIcon.difference,
-  'job posting': SCIcon`work`,
+  'job posting': SCIcon.work,
 };

frontend/app/src/app/modules/data/data.module.ts

@@ -24,7 +24,6 @@ import {MarkdownModule} from 'ngx-markdown';
 import {MomentModule} from 'ngx-moment';
 import {ThingTranslateModule} from '../../translation/thing-translate.module';
 import {SimpleBrowser, browserFactory} from '../../util/browser.factory';
-import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
 import {RoutingStackService} from '../../util/routing-stack.service';
 import {UtilModule} from '../../util/util.module';
 import {CalendarService} from '../calendar/calendar.service';
@@ -188,11 +187,10 @@ import {ShareButtonComponent} from './elements/share-button.component';
     DataRoutingModule,
     FormsModule,
     HttpClientModule,
-    IonicModule.forRoot(),
+    IonicModule,
     LeafletModule,
     MarkdownModule.forRoot(),
     MenuModule,
-    IonIconModule,
     MomentModule.forRoot({
       relativeTimeThresholdOptions: {
         m: 59,

frontend/app/src/app/modules/data/detail/data-detail-content.html

@@ -1,105 +1,112 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
-<ion-header *ngIf="showModalHeader" translucent>
+@if (showModalHeader) {
-  <ion-toolbar color="primary" mode="ios">
+  <ion-header translucent>
-    <ion-title>{{ 'name' | thingTranslate : item }}</ion-title>
+    <ion-toolbar color="primary" mode="ios">
-    <ion-buttons slot="end">
+      <ion-title>{{ 'name' | thingTranslate: item }}</ion-title>
-      <ion-button (click)="modalController.dismiss()">{{ 'app.ui.CLOSE' | translate }}</ion-button>
+      <ion-buttons slot="end">
-    </ion-buttons>
+        <ion-button (click)="modalController.dismiss()">{{ 'app.ui.CLOSE' | translate }}</ion-button>
-  </ion-toolbar>
+      </ion-buttons>
-</ion-header>
+    </ion-toolbar>
-
+  </ion-header>
-<stapps-title-card *ngIf="!showModalHeader" [item]="item"> </stapps-title-card>
+}
+@if (!showModalHeader) {
+  <stapps-title-card [item]="item"> </stapps-title-card>
+}
 <ng-container *ngTemplateOutlet="contentTemplateRef || defaultContent; context: {$implicit: item}">
 </ng-container>
 <stapps-origin-detail [origin]="item.origin"></stapps-origin-detail>
 
 <ng-template #defaultContent>
-  <div [ngSwitch]="item.type" class="content-switch">
+  <div class="content-switch">
-    <stapps-article-detail-content
+    @switch (item.type) {
-      [item]="$any(item)"
+      @case ('article') {
-      *ngSwitchCase="'article'"
+        <stapps-article-detail-content [item]="$any(item)"></stapps-article-detail-content>
-    ></stapps-article-detail-content>
+      }
-    <stapps-catalog-detail-content
+      @case ('catalog') {
-      [item]="$any(item)"
+        <stapps-catalog-detail-content [item]="$any(item)"></stapps-catalog-detail-content>
-      *ngSwitchCase="'catalog'"
+      }
-    ></stapps-catalog-detail-content>
+      @case ('date series') {
-    <stapps-date-series-detail-content
+        <stapps-date-series-detail-content [item]="$any(item)"></stapps-date-series-detail-content>
-      [item]="$any(item)"
+      }
-      *ngSwitchCase="'date series'"
+      @case ('dish') {
-    ></stapps-date-series-detail-content>
+        <stapps-dish-detail-content [item]="$any(item)"></stapps-dish-detail-content>
-    <stapps-dish-detail-content [item]="$any(item)" *ngSwitchCase="'dish'"></stapps-dish-detail-content>
+      }
-    <stapps-event-detail-content
+      @case ('academic event') {
-      [item]="$any(item)"
+        <stapps-event-detail-content [item]="$any(item)"></stapps-event-detail-content>
-      *ngSwitchCase="'academic event'"
+      }
-    ></stapps-event-detail-content>
+      @case ('sport course') {
-    <stapps-event-detail-content
+        <stapps-event-detail-content [item]="$any(item)"></stapps-event-detail-content>
-      [item]="$any(item)"
+      }
-      *ngSwitchCase="'sport course'"
+      @case ('favorite') {
-    ></stapps-event-detail-content>
+        <stapps-favorite-detail-content [item]="$any(item)"></stapps-favorite-detail-content>
-    <stapps-favorite-detail-content
+      }
-      [item]="$any(item)"
+      @case ('message') {
-      *ngSwitchCase="'favorite'"
+        <stapps-message-detail-content [item]="$any(item)"></stapps-message-detail-content>
-    ></stapps-favorite-detail-content>
+      }
-    <stapps-message-detail-content
+      @case ('job posting') {
-      [item]="$any(item)"
+        <stapps-job-posting-detail-content [item]="$any(item)"></stapps-job-posting-detail-content>
-      *ngSwitchCase="'message'"
+      }
-    ></stapps-message-detail-content>
+      @case ('person') {
-    <stapps-job-posting-detail-content
+        <stapps-person-detail-content [item]="$any(item)"></stapps-person-detail-content>
-      [item]="$any(item)"
+      }
-      *ngSwitchCase="'job posting'"
+      @case ('building') {
-    ></stapps-job-posting-detail-content>
+        <stapps-place-detail-content [item]="$any(item)"></stapps-place-detail-content>
-    <stapps-person-detail-content [item]="$any(item)" *ngSwitchCase="'person'"></stapps-person-detail-content>
+      }
-    <stapps-place-detail-content [item]="$any(item)" *ngSwitchCase="'building'"></stapps-place-detail-content>
+      @case ('floor') {
-    <stapps-place-detail-content [item]="$any(item)" *ngSwitchCase="'floor'"></stapps-place-detail-content>
+        <stapps-place-detail-content [item]="$any(item)"></stapps-place-detail-content>
-    <stapps-place-detail-content
+      }
-      [item]="$any(item)"
+      @case ('point of interest') {
-      *ngSwitchCase="'point of interest'"
+        <stapps-place-detail-content [item]="$any(item)"></stapps-place-detail-content>
-    ></stapps-place-detail-content>
+      }
-    <stapps-place-detail-content
+      @case ('room') {
-      [item]="$any(item)"
+        <stapps-place-detail-content
-      [openAsModal]="openAsModal"
+          [item]="$any(item)"
-      *ngSwitchCase="'room'"
+          [openAsModal]="openAsModal"
-    ></stapps-place-detail-content>
+        ></stapps-place-detail-content>
-    <stapps-semester-detail-content
+      }
-      [item]="$any(item)"
+      @case ('semester') {
-      *ngSwitchCase="'semester'"
+        <stapps-semester-detail-content [item]="$any(item)"></stapps-semester-detail-content>
-    ></stapps-semester-detail-content>
+      }
-    <stapps-video-detail-content [item]="$any(item)" *ngSwitchCase="'video'"></stapps-video-detail-content>
+      @case ('video') {
-    <ng-container *ngSwitchDefault>
+        <stapps-video-detail-content [item]="$any(item)"></stapps-video-detail-content>
-      <ion-item class="ion-text-wrap" lines="inset">
+      }
-        <ion-thumbnail slot="start" class="ion-margin-end">
+      @default {
-          <ion-icon [name]="item.type | dataIcon"></ion-icon>
+        <ion-item class="ion-text-wrap" lines="inset">
-        </ion-thumbnail>
+          <ion-thumbnail slot="start" class="ion-margin-end">
-        <ion-grid>
+            <ion-icon [name]="item.type | dataIcon"></ion-icon>
-          <ion-row>
+          </ion-thumbnail>
-            <ion-col>
+          <ion-grid>
-              <div class="ion-text-wrap">
+            <ion-row>
-                <h2 class="name">{{ item.name }}</h2>
+              <ion-col>
-                <ion-note>{{ item.type }}</ion-note>
+                <div class="ion-text-wrap">
-              </div>
+                  <h2 class="name">{{ item.name }}</h2>
-            </ion-col>
+                  <ion-note>{{ item.type }}</ion-note>
-          </ion-row>
+                </div>
-        </ion-grid>
+              </ion-col>
-      </ion-item>
+            </ion-row>
-      <stapps-simple-card
+          </ion-grid>
-        *ngIf="item.description"
+        </ion-item>
-        [title]="$any('description' | propertyNameTranslate : item) | titlecase"
+        @if (item.description) {
-        [content]="'description' | thingTranslate : item"
+          <stapps-simple-card
-      ></stapps-simple-card>
+            [title]="$any('description' | propertyNameTranslate: item) | titlecase"
-    </ng-container>
+            [content]="'description' | thingTranslate: item"
+          ></stapps-simple-card>
+        }
+      }
+    }
   </div>
 </ng-template>

frontend/app/src/app/modules/data/detail/data-detail-content.scss

@@ -41,8 +41,7 @@ stapps-origin-detail {
 
     width: 100%;
     height: fit-content;
-    margin-block-start: calc((var(--header-spacing-bottom) - var(--spacing-xl)) * -1);
+    margin-block: calc((var(--header-spacing-bottom) - var(--spacing-xl)) * -1) var(--spacing-xl);
-    margin-block-end: var(--spacing-xl);
 
     background-color: var(--ion-card-background);
 

frontend/app/src/app/modules/data/detail/data-detail.html

@@ -1,40 +1,51 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
-<ion-header *ngIf="defaultHeader">
+@if (defaultHeader) {
-  <ion-toolbar color="primary" mode="ios">
+  <ion-header>
-    <ion-buttons slot="start" *ngIf="!isModal">
+    <ion-toolbar color="primary" mode="ios">
-      <ion-back-button></ion-back-button>
+      @if (!isModal) {
-    </ion-buttons>
+        <ion-buttons slot="start">
-    <ion-title
+          <ion-back-button></ion-back-button>
-      *ngIf="item"
+        </ion-buttons>
-      [style.opacity]="(collapse ? '1' : '0') + '!important'"
+      }
-      [style.translate]="collapse ? '0' : '0 10px'"
+      @if (item) {
-      >{{ 'name' | thingTranslate: item }}</ion-title
+        <ion-title
-    >
+          [style.opacity]="(collapse ? '1' : '0') + '!important'"
-    <ion-buttons [slot]="isModal ? 'start' : 'primary'">
+          [style.translate]="collapse ? '0' : '0 10px'"
-      <stapps-share-button *ngIf="item" [title]="'name' | thingTranslate: item"></stapps-share-button>
+          >{{ 'name' | thingTranslate: item }}</ion-title
-      <stapps-favorite-button *ngIf="item" [item]="$any(item)"></stapps-favorite-button>
+        >
-    </ion-buttons>
+      }
-    <ion-buttons slot="end" *ngIf="isModal">
+      <ion-buttons [slot]="isModal ? 'start' : 'primary'">
-      <ion-button fill="clear" (click)="modalController.dismiss()">
+        @if (item) {
-        <ion-label>{{ 'modal.DISMISS' | translate }}</ion-label>
+          <stapps-share-button [title]="'name' | thingTranslate: item"></stapps-share-button>
-      </ion-button>
+        }
-    </ion-buttons>
+        @if (item) {
-  </ion-toolbar>
+          <stapps-favorite-button [item]="$any(item)"></stapps-favorite-button>
-</ion-header>
+        }
+      </ion-buttons>
+      @if (isModal) {
+        <ion-buttons slot="end">
+          <ion-button fill="clear" (click)="modalController.dismiss()">
+            <ion-label>{{ 'modal.DISMISS' | translate }}</ion-label>
+          </ion-button>
+        </ion-buttons>
+      }
+    </ion-toolbar>
+  </ion-header>
+}
 <ng-content select="[header]"></ng-content>
 <ion-content
   parallax
@@ -42,31 +53,31 @@
   [scrollEvents]="true"
   (ionScroll)="collapse = $any($event).detail.scrollTop > 50"
 >
-  <ng-container [ngSwitch]="true">
+  @switch (true) {
-    <ng-container *ngSwitchCase="!item && (isDisconnected | async)">
+    @case (!item && (isDisconnected | async)) {
       <div class="centered-message-container">
         <ion-icon name="signal_disconnected"></ion-icon>
         <ion-label> {{ 'data.detail.COULD_NOT_CONNECT' | translate }} </ion-label>
       </div>
-    </ng-container>
+    }
-    <ng-container *ngSwitchCase="item === null">
+    @case (item === null) {
       <div class="centered-message-container">
         <ion-icon name="link_off"></ion-icon>
         <ion-label> {{ 'data.detail.NOT_FOUND' | translate }} </ion-label>
       </div>
-    </ng-container>
+    }
-    <ng-container *ngSwitchCase="!item && item !== null">
+    @case (!item && item !== null) {
       <stapps-skeleton-list-item></stapps-skeleton-list-item>
       <stapps-skeleton-simple-card></stapps-skeleton-simple-card>
-    </ng-container>
+    }
-    <ng-container *ngSwitchDefault>
+    @default {
-      <ng-container *ngIf="item">
+      @if (item) {
         <stapps-data-path [item]="item" [autoRouting]="autoRouteDataPath"></stapps-data-path>
         <stapps-data-detail-content
           [item]="item"
           [contentTemplateRef]="contentTemplateRef"
         ></stapps-data-detail-content>
-      </ng-container>
+      }
-    </ng-container>
+    }
-  </ng-container>
+  }
 </ion-content>

frontend/app/src/app/modules/data/detail/data-path.html

@@ -1,19 +1,19 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
-<ng-container *ngIf="path | async as stack">
+@if (path | async; as stack) {
   <ion-breadcrumbs
     color="light"
     [itemsBeforeCollapse]="1"
@@ -21,21 +21,23 @@
     [maxItems]="maxItems"
     (ionCollapsedClick)="maxItems = undefined"
   >
-    <ion-breadcrumb *ngFor="let fragment of stack">
+    @for (fragment of stack; track fragment) {
-      <ion-label
+      <ion-breadcrumb>
-        (click)="dataRoutingService.emitPathEvent(fragment)"
+        <ion-label
-        [style.max-width]="
+          (click)="dataRoutingService.emitPathEvent(fragment)"
-          stack.length === 1
+          [style.max-width]="
-            ? '100%'
+            stack.length === 1
-            : stack.length === 2
+              ? '100%'
-            ? '40vw'
+              : stack.length === 2
-            : (($width | async) ?? 0) >= 768
+                ? '40vw'
-            ? '30vw'
+                : (($width | async) ?? 0) >= 768
-            : 'calc(100vw - 120px)'
+                  ? '30vw'
-        "
+                  : 'calc(100vw - 120px)'
-        class="crumb-label"
+          "
-        >{{ 'name' | thingTranslate : $any(fragment) }}</ion-label
+          class="crumb-label"
-      >
+          >{{ 'name' | thingTranslate: $any(fragment) }}</ion-label
-    </ion-breadcrumb>
+        >
+      </ion-breadcrumb>
+    }
   </ion-breadcrumbs>
-</ng-container>
+}

frontend/app/src/app/modules/data/elements/address-detail.html

@@ -1,17 +1,17 @@
 <!--
-  ~ Copyright (C) 2022 StApps
+~ Copyright (C) 2022 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
 <ion-card>
   <ion-card-header>{{ 'data.detail.address.TITLE' | translate | titlecase }}</ion-card-header>
@@ -29,18 +29,22 @@
         <ion-col>{{ 'data.detail.address.CITY' | translate | titlecase }}:</ion-col>
         <ion-col width-60 text-right> {{ address.addressLocality }} </ion-col>
       </ion-row>
-      <ion-row *ngIf="address.addressRegion">
+      @if (address.addressRegion) {
-        <ion-col>{{ 'data.detail.address.REGION' | translate | titlecase }}:</ion-col>
+        <ion-row>
-        <ion-col width-60 text-right> {{ address.addressRegion }} </ion-col>
+          <ion-col>{{ 'data.detail.address.REGION' | translate | titlecase }}:</ion-col>
-      </ion-row>
+          <ion-col width-60 text-right> {{ address.addressRegion }} </ion-col>
+        </ion-row>
+      }
       <ion-row>
         <ion-col>{{ 'data.detail.address.COUNTRY' | translate | titlecase }}:</ion-col>
         <ion-col width-60 text-right> {{ address.addressCountry }} </ion-col>
       </ion-row>
-      <ion-row *ngIf="address.postOfficeBoxNumber">
+      @if (address.postOfficeBoxNumber) {
-        <ion-col>{{ 'data.detail.address.POST_OFFICE_BOX' | translate | titlecase }}</ion-col>
+        <ion-row>
-        <ion-col width-60 text-right> {{ address.postOfficeBoxNumber }} </ion-col>
+          <ion-col>{{ 'data.detail.address.POST_OFFICE_BOX' | translate | titlecase }}</ion-col>
-      </ion-row>
+          <ion-col width-60 text-right> {{ address.postOfficeBoxNumber }} </ion-col>
+        </ion-row>
+      }
     </ion-grid>
   </ion-card-content>
 </ion-card>

frontend/app/src/app/modules/data/elements/certifications-in-detail.html

@@ -1,22 +1,22 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 <ion-card>
   <ion-card-header>{{ 'data.types.certification.TITLE' | translate }}</ion-card-header>
   <ion-card-content>
     <div class="certification-list">
-      <ng-container *ngFor="let cert of certifications">
+      @for (cert of certifications; track cert) {
         <img
           (click)="popover.present($event)"
           [width]="72"
@@ -31,7 +31,7 @@
             </ion-content>
           </ng-template>
         </ion-popover>
-      </ng-container>
+      }
     </div>
     <ion-note>
       <stapps-external-link

frontend/app/src/app/modules/data/elements/favorite-button.component.html

@@ -16,7 +16,7 @@
 <ion-button (click)="toggle($event)" color="medium" size="small" fill="clear">
   <ion-icon
     slot="icon-only"
-    [fill]="(isFavorite$ | async) ?? false"
+    [style.--fill]="(isFavorite$ | async) ? 1 : 0"
     [class.selected]="isFavorite$ | async"
     name="grade"
   ></ion-icon>

frontend/app/src/app/modules/data/elements/long-inline-text.html

@@ -1,28 +1,34 @@
 <!--
-  ~ Copyright (C) 2022 StApps
+~ Copyright (C) 2022 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
-<ng-container *ngIf="text !== undefined">
+@if (text !== undefined) {
   <span class="ion-hide-sm-up">
-    {{ text | slice : 0 : size }}
+    {{ text | slice: 0 : size }}
-    <span *ngIf="text.length > size" class="ion-hide-sm-up">…</span>
+    @if (text.length > size) {
+      <span class="ion-hide-sm-up">…</span>
+    }
   </span>
   <span class="ion-hide-sm-down ion-hide-md-up">
-    {{ text | slice : 0 : size * 2 }}
+    {{ text | slice: 0 : size * 2 }}
-    <span *ngIf="text.length > size * 2" class="ion-hide-sm-down ion-hide-md-up"> … </span>
+    @if (text.length > size * 2) {
+      <span class="ion-hide-sm-down ion-hide-md-up"> … </span>
+    }
   </span>
   <span class="ion-hide-md-down">
-    {{ text | slice : 0 : size * 3 }}
+    {{ text | slice: 0 : size * 3 }}
-    <span *ngIf="text.length > size * 3" class="ion-hide-md-down">…</span>
+    @if (text.length > size * 3) {
+      <span class="ion-hide-md-down">…</span>
+    }
   </span>
-</ng-container>
+}

frontend/app/src/app/modules/data/elements/offers-detail.html

@@ -1,60 +1,74 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
 <ion-card>
   <ion-card-header>{{ 'data.detail.offers.TITLE' | translate | titlecase }}</ion-card-header>
   <ion-card-content>
-    <div *ngFor="let offer of offers">
+    @for (offer of offers; track offer) {
-      <ion-grid>
+      <div>
-        <ion-row>
+        <ion-grid>
-          <ion-col *ngIf="offer.inPlace">
+          <ion-row>
-            <ion-icon name="pin_drop"></ion-icon>
+            @if (offer.inPlace) {
-            <a [routerLink]="['/data-detail', offer.inPlace.uid]">
+              <ion-col>
-              {{ 'name' | thingTranslate : offer.inPlace }}
+                <ion-icon name="pin_drop"></ion-icon>
-            </a>
+                <a [routerLink]="['/data-detail', offer.inPlace.uid]">
-          </ion-col>
+                  {{ 'name' | thingTranslate: offer.inPlace }}
-          <ion-col *ngIf="offer.availabilityRange">
+                </a>
-            <span
+              </ion-col>
-              *ngIf="offer.availabilityRange.gt ? offer.availabilityRange.gt : offer.availabilityRange.gte"
+            }
-            >
+            @if (offer.availabilityRange) {
-              {{ (offer.availabilityRange.gt ? offer.availabilityRange.gt : offer.availabilityRange.gte) |
+              <ion-col>
-              amDateFormat : 'll' }}
+                @if (offer.availabilityRange.gt ? offer.availabilityRange.gt : offer.availabilityRange.gte) {
-            </span>
+                  <span>
-          </ion-col>
+                    {{
-        </ion-row>
+                      (offer.availabilityRange.gt ? offer.availabilityRange.gt : offer.availabilityRange.gte)
-      </ion-grid>
+                        | amDateFormat: 'll'
-      <ion-grid *ngIf="offer.prices && offer.availability !== 'out of stock'">
+                    }}
-        <ion-row *ngFor="let group of $any(offer.prices) | keyvalue">
+                  </span>
-          <ng-container *ngIf="group.key !== 'default'">
+                }
-            <ion-col>{{ 'data.detail.offers.' + group.key | translate }} </ion-col>
+              </ion-col>
-            <ion-col width-20 text-right>
+            }
-              <p>{{ $any(group.value) | currency : 'EUR' : 'symbol' : undefined : 'de' }}</p>
+          </ion-row>
-            </ion-col>
+        </ion-grid>
-          </ng-container>
+        @if (offer.prices && offer.availability !== 'out of stock') {
-        </ion-row>
+          <ion-grid>
-      </ion-grid>
+            @for (group of $any(offer.prices) | keyvalue; track group) {
-      <ion-grid *ngIf="offer.availability === 'out of stock'">
+              <ion-row>
-        <ion-row>
+                @if (group.key !== 'default') {
-          <ion-col></ion-col>
+                  <ion-col>{{ 'data.detail.offers.' + group.key | translate }} </ion-col>
-          <ion-col width-20 text-right>
+                  <ion-col width-20 text-right>
-            <ion-text color="danger">
+                    <p>{{ $any(group.value) | currency: 'EUR' : 'symbol' : undefined : 'de' }}</p>
-              <p>{{ 'data.detail.offers.sold_out' | translate }}</p>
+                  </ion-col>
-            </ion-text>
+                }
-          </ion-col>
+              </ion-row>
-        </ion-row>
+            }
-      </ion-grid>
+          </ion-grid>
-    </div>
+        }
+        @if (offer.availability === 'out of stock') {
+          <ion-grid>
+            <ion-row>
+              <ion-col></ion-col>
+              <ion-col width-20 text-right>
+                <ion-text color="danger">
+                  <p>{{ 'data.detail.offers.sold_out' | translate }}</p>
+                </ion-text>
+              </ion-col>
+            </ion-row>
+          </ion-grid>
+        }
+      </div>
+    }
   </ion-card-content>
 </ion-card>

frontend/app/src/app/modules/data/elements/offers-in-list.component.ts

@@ -13,20 +13,19 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 import {Component, Input} from '@angular/core';
-import {SCAcademicPriceGroup, SCThingThatCanBeOfferedOffer} from '@openstapps/core';
+import {
+  SCAcademicPriceGroup,
+  SCThingThatCanBeOfferedAvailability,
+  SCThingThatCanBeOfferedOffer,
+} from '@openstapps/core';
 import {SettingsProvider} from '../../settings/settings.provider';
 
-/**
- * TODO
- */
 @Component({
   selector: 'stapps-offers-in-list',
   templateUrl: 'offers-in-list.html',
+  styleUrls: ['offers-in-list.scss'],
 })
 export class OffersInListComponent {
-  /**
-   * TODO
-   */
   @Input() set offers(it: Array<SCThingThatCanBeOfferedOffer<SCAcademicPriceGroup>>) {
     this._offers = it;
     this.price = it[0].prices?.default;
@@ -34,13 +33,14 @@ export class OffersInListComponent {
       this.price = it[0].prices?.[(group.value as string).replace(/s$/, '') as never];
     });
 
-    const availabilities = new Set(it.map(offer => offer.availability));
+    if (it.length === 1) {
-    this.soldOut = availabilities.has('out of stock') && availabilities.size === 1;
+      this.availability = it[0].availability;
+    }
   }
 
   price?: number;
 
-  soldOut: boolean;
+  availability: SCThingThatCanBeOfferedAvailability;
 
   _offers: Array<SCThingThatCanBeOfferedOffer<SCAcademicPriceGroup>>;
 

frontend/app/src/app/modules/data/elements/offers-in-list.html

@@ -1,28 +1,32 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
-<div>
+@if (price) {
-  <ion-text *ngIf="price && !soldOut" style="white-space: nowrap">
+  <ion-badge
-    <h2>{{ price | currency : 'EUR' : 'symbol' : undefined : 'de' }}</h2>
+    [color]="
-  </ion-text>
+      availability === 'out of stock'
-  <ion-text *ngIf="soldOut" color="danger" class="sold-out" style="white-space: nowrap">
+        ? 'danger'
-    <h2>{{ 'data.detail.offers.sold_out' | translate }}</h2>
+        : availability === 'limited availability'
-  </ion-text>
+          ? 'warning'
-  <p *ngIf="_offers[0].inPlace && !soldOut" class="place" style="white-space: nowrap">
+          : 'primary'
-    <ion-icon name="pin_drop"></ion-icon>{{ _offers[0].inPlace.name }}<span *ngIf="_offers.length > 1"
+    "
-      >...</span
+  >
-    >
+    {{
-  </p>
+      availability === 'out of stock'
-</div>
+        ? ('data.detail.offers.sold_out' | translate)
+        : (price | currency: 'EUR' : 'symbol' : undefined : 'de')
+    }}
+  </ion-badge>
+}

frontend/app/src/app/modules/data/elements/offers-in-list.scss

@@ -0,0 +1,14 @@
+:host {
+  display: contents;
+}
+
+ion-badge {
+  translate: 0 0.25em;
+
+  display: inline-block;
+
+  margin-top: -0.25em;
+  padding: 0.25em;
+
+  font-size: 0.8em;
+}

frontend/app/src/app/modules/data/elements/origin-detail.html

@@ -1,65 +1,84 @@
 <!--
-  ~ Copyright (C) 2022 StApps
+~ Copyright (C) 2022 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
-<ion-card *ngIf="origin.type === 'user'">
+@if (origin.type === 'user') {
-  <ion-card-header
+  <ion-card>
-    >{{ 'data.types.origin.TITLE' | translate | titlecase }}: {{ 'data.types.origin.USER' | translate |
+    <ion-card-header
-    titlecase }}</ion-card-header
+      >{{ 'data.types.origin.TITLE' | translate | titlecase }}:
-  >
+      {{ 'data.types.origin.USER' | translate | titlecase }}</ion-card-header
-  <ion-card-content>
+    >
-    <p>
+    <ion-card-content>
-      {{ 'data.types.origin.detail.CREATED' | translate | titlecase }}: {{ origin.created | amDateFormat :
+      <p>
-      'll' }}
+        {{ 'data.types.origin.detail.CREATED' | translate | titlecase }}:
-    </p>
+        {{ origin.created | amDateFormat: 'll' }}
-    <p *ngIf="origin.updated">
+      </p>
-      {{ 'data.types.origin.detail.UPDATED' | translate | titlecase }}: {{ origin.updated | amDateFormat :
+      @if (origin.updated) {
-      'll' }}
+        <p>
-    </p>
+          {{ 'data.types.origin.detail.UPDATED' | translate | titlecase }}:
-    <p *ngIf="origin.modified">
+          {{ origin.updated | amDateFormat: 'll' }}
-      {{ 'data.types.origin.detail.MODIFIED' | translate | titlecase }}: {{ origin.modified | amDateFormat :
+        </p>
-      'll' }}
+      }
-    </p>
+      @if (origin.modified) {
-    <p *ngIf="origin.maintainer">
+        <p>
-      {{ 'data.types.origin.detail.MAINTAINER' | translate }}:
+          {{ 'data.types.origin.detail.MODIFIED' | translate | titlecase }}:
-      <a [routerLink]="['/data-detail', origin.maintainer.uid]">{{ origin.maintainer.name }}</a>
+          {{ origin.modified | amDateFormat: 'll' }}
-    </p>
+        </p>
-  </ion-card-content>
+      }
-</ion-card>
+      @if (origin.maintainer) {
-
+        <p>
-<ion-card *ngIf="origin.type === 'remote'">
+          {{ 'data.types.origin.detail.MAINTAINER' | translate }}:
-  <ion-card-header
+          <a [routerLink]="['/data-detail', origin.maintainer.uid]">{{ origin.maintainer.name }}</a>
-    >{{ 'data.types.origin.TITLE' | translate | titlecase }}: {{ 'data.types.origin.REMOTE' | translate |
+        </p>
-    titlecase }}</ion-card-header
+      }
-  >
+    </ion-card-content>
-  <ion-card-content>
+  </ion-card>
-    <p>
+}
-      {{ 'data.types.origin.detail.INDEXED' | translate | titlecase }}: {{ origin.indexed | amDateFormat :
+@if (origin.type === 'remote') {
-      'll' }}
+  <ion-card>
-    </p>
+    <ion-card-header
-    <p *ngIf="origin.modified">
+      >{{ 'data.types.origin.TITLE' | translate | titlecase }}:
-      {{ 'data.types.origin.detail.MODIFIED' | translate | titlecase }}: {{ origin.modified | amDateFormat :
+      {{ 'data.types.origin.REMOTE' | translate | titlecase }}</ion-card-header
-      'll' }}
+    >
-    </p>
+    <ion-card-content>
-    <p *ngIf="origin.name">{{ 'data.types.origin.detail.MAINTAINER' | translate }}: {{ origin.name }}</p>
+      <p>
-    <p *ngIf="origin.maintainer">
+        {{ 'data.types.origin.detail.INDEXED' | translate | titlecase }}:
-      {{ 'data.types.origin.detail.MAINTAINER' | translate | titlecase }}:
+        {{ origin.indexed | amDateFormat: 'll' }}
-      <a [routerLink]="['/data-detail', origin.maintainer.uid]">{{ origin.maintainer.name }}</a>
+      </p>
-    </p>
+      @if (origin.modified) {
-    <p *ngIf="origin.responsibleEntity">
+        <p>
-      {{ 'data.types.origin.detail.RESPONSIBLE' | translate | titlecase }}:
+          {{ 'data.types.origin.detail.MODIFIED' | translate | titlecase }}:
-      <a [routerLink]="['/data-detail', origin.responsibleEntity.uid]">{{ origin.responsibleEntity.name }}</a>
+          {{ origin.modified | amDateFormat: 'll' }}
-    </p>
+        </p>
-  </ion-card-content>
+      }
-</ion-card>
+      @if (origin.name) {
+        <p>{{ 'data.types.origin.detail.MAINTAINER' | translate }}: {{ origin.name }}</p>
+      }
+      @if (origin.maintainer) {
+        <p>
+          {{ 'data.types.origin.detail.MAINTAINER' | translate | titlecase }}:
+          <a [routerLink]="['/data-detail', origin.maintainer.uid]">{{ origin.maintainer.name }}</a>
+        </p>
+      }
+      @if (origin.responsibleEntity) {
+        <p>
+          {{ 'data.types.origin.detail.RESPONSIBLE' | translate | titlecase }}:
+          <a [routerLink]="['/data-detail', origin.responsibleEntity.uid]">{{
+            origin.responsibleEntity.name
+          }}</a>
+        </p>
+      }
+    </ion-card-content>
+  </ion-card>
+}

frontend/app/src/app/modules/data/elements/origin-in-list.html

@@ -1,7 +1,10 @@
-<div *ngIf="origin.type === 'user'">
+@if (origin.type === 'user') {
-  <p>{{ origin.created | dateFormat }}</p>
+  <div>
-</div>
+    <p>{{ origin.created | dateFormat }}</p>
-
+  </div>
-<div *ngIf="origin.type === 'remote'">
+}
-  <p>{{ origin.indexed | dateFormat }}</p>
+@if (origin.type === 'remote') {
-</div>
+  <div>
+    <p>{{ origin.indexed | dateFormat }}</p>
+  </div>
+}

frontend/app/src/app/modules/data/elements/rating.html

@@ -1,40 +1,39 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
-<ion-button
+@if (canBeRated | async) {
-  *ngIf="canBeRated | async"
+  <ion-button
-  fill="clear"
+    fill="clear"
-  (click)="$event.stopPropagation(); performRating.next(true)"
+    (click)="$event.stopPropagation(); performRating.next(true)"
-  [disabled]="wasAlreadyRated | async"
+    [disabled]="wasAlreadyRated | async"
->
+  >
-  <ion-icon slot="icon-only" color="medium" name="thumbs_up_down"></ion-icon>
+    <ion-icon slot="icon-only" color="medium" name="thumbs_up_down"></ion-icon>
-</ion-button>
+  </ion-button>
-
+}
-<div
+@if ((performRating | async) && (wasAlreadyRated | async) !== true) {
-  class="rating-stars"
+  <div class="rating-stars" [@rating]="(userRating | async) === undefined ? 'abandoned' : 'rated'">
-  *ngIf="(performRating | async) && (wasAlreadyRated | async) !== true"
+    @for (i of [5, 4, 3, 2, 1]; track i) {
-  [@rating]="(userRating | async) === undefined ? 'abandoned' : 'rated'"
+      <ion-icon
->
+        [class.rated-value]="(userRating | async) === i"
-  <ion-icon
+        (click)="$event.stopPropagation(); userRating.next(i)"
-    [class.rated-value]="(userRating | async) === i"
+        slot="icon-only"
-    *ngFor="let i of [5, 4, 3, 2, 1]"
+        [size]="32"
-    (click)="$event.stopPropagation(); userRating.next(i)"
+        color="medium"
-    slot="icon-only"
+        name="grade"
-    [size]="32"
+      ></ion-icon>
-    color="medium"
+    }
-    name="grade"
+    <label class="thank-you">{{ 'ratings.thank_you' | translate }}</label>
-  ></ion-icon>
+  </div>
-  <label class="thank-you">{{ 'ratings.thank_you' | translate }}</label>
+}
-</div>

frontend/app/src/app/modules/data/elements/share-button.html

@@ -1,4 +1,4 @@
 <ion-button size="small" fill="clear" (click)="share() && toast.present()">
-  <ion-icon [size]="24" slot="icon-only" name="share" ios="ios_share"></ion-icon>
+  <ion-icon [size]="24" slot="icon-only" name="share"></ion-icon>
 </ion-button>
 <ion-toast [message]="'toast.TITLE_COPIED' | translate" #toast [duration]="2000"></ion-toast>

frontend/app/src/app/modules/data/elements/simple-card.html

@@ -1,38 +1,39 @@
 <!--
-  ~ Copyright (C) 2022 StApps
+~ Copyright (C) 2022 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
 <ion-card>
   <ion-card-header>{{ title }}</ion-card-header>
   <ion-card-content>
-    <ng-container *ngIf="isString(content); else list">
+    @if (isString(content)) {
-      <ng-container *ngIf="isMarkdown; else plainText">
+      @if (isMarkdown) {
         <markdown [data]="content"></markdown>
-      </ng-container>
+      } @else {
-      <ng-template #plainText>
         <p>{{ content }}</p>
-      </ng-template>
+      }
-    </ng-container>
+    } @else {
-    <ng-template #list>
+      @if (content && isThing(content[0])) {
-      <ng-container *ngIf="content && isThing(content[0]); else textList">
+        @for (thing of $any(content); track thing) {
-        <a [routerLink]="['/data-detail', thing.uid]" *ngFor="let thing of $any(content)">
+          <a [routerLink]="['/data-detail', thing.uid]">
-          <p>{{ 'name' | thingTranslate : thing }}</p>
+            <p>{{ 'name' | thingTranslate: thing }}</p>
-        </a>
+          </a>
-      </ng-container>
+        }
-      <ng-template #textList>
+      } @else {
-        <p *ngFor="let text of $any(content)">{{ text }}</p>
+        @for (text of $any(content); track text) {
-      </ng-template>
+          <p>{{ text }}</p>
-    </ng-template>
+        }
+      }
+    }
   </ion-card-content>
 </ion-card>

frontend/app/src/app/modules/data/elements/skeleton-list-item.html

@@ -1,7 +1,9 @@
 <ion-item>
-  <ion-thumbnail *ngIf="!hideThumbnail" slot="start" class="ion-margin-end">
+  @if (!hideThumbnail) {
-    <ion-skeleton-text animated></ion-skeleton-text>
+    <ion-thumbnail slot="start" class="ion-margin-end">
-  </ion-thumbnail>
+      <ion-skeleton-text animated></ion-skeleton-text>
+    </ion-thumbnail>
+  }
   <ion-grid>
     <ion-row>
       <ion-col>

frontend/app/src/app/modules/data/elements/skeleton-simple-card.html

@@ -1,14 +1,14 @@
 <ion-card>
-  <ion-card-header *ngIf="title">
+  @if (title) {
-    <ion-skeleton-text animated style="width: 15%"></ion-skeleton-text>
+    <ion-card-header>
-  </ion-card-header>
+      <ion-skeleton-text animated style="width: 15%"></ion-skeleton-text>
+    </ion-card-header>
+  }
   <ion-card-content>
     <p>
-      <ion-skeleton-text
+      @for (line of [].constructor(lines); track line) {
-        *ngFor="let line of [].constructor(lines)"
+        <ion-skeleton-text animated style="width: 85%"></ion-skeleton-text>
-        animated
+      }
-        style="width: 85%"
-      ></ion-skeleton-text>
     </p>
   </ion-card-content>
 </ion-card>

frontend/app/src/app/modules/data/elements/title-card.component.html

@@ -1,49 +1,50 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 <ion-card>
   <ion-card-header>
     <ion-card-title>
       <h1>
-        <ng-container *ngIf="$any(item).honorificPrefix">{{
+        @if ($any(item).honorificPrefix) {
-          'honorificPrefix' | thingTranslate: item
+          {{ 'honorificPrefix' | thingTranslate: item }}
-        }}</ng-container>
+        }
         {{ 'name' | thingTranslate: item }}
-        <ng-container *ngIf="$any(item).honorificSuffix">{{
+        @if ($any(item).honorificSuffix) {
-          'honorificSuffix' | thingTranslate: item
+          {{ 'honorificSuffix' | thingTranslate: item }}
-        }}</ng-container>
+        }
       </h1>
     </ion-card-title>
   </ion-card-header>
   <ion-card-content>
-    <div *ngIf="$any(item).openingHours as openingHours" class="opening-hours">
+    @if ($any(item).openingHours; as openingHours) {
-      <stapps-opening-hours [openingHours]="openingHours"></stapps-opening-hours>
+      <div class="opening-hours">
-    </div>
+        <stapps-opening-hours [openingHours]="openingHours"></stapps-opening-hours>
-    <!-- TODO obviously this is bad style. Tbd where to put the differentiation. Job Postings always have a description, but it's going to be shown in `stapps-job-posting-detail-content` anyways, no need to repeat here. For this view, I would use other fields of the schema.org JobPosting like the `ThingWithCategory.category` -->
-    <div *ngIf="item.description && item.type !== 'job posting'" class="description">
-      <div class="text-accordion" [style.-webkit-line-clamp]="descriptionLinesToDisplay" #accordionTextArea>
-        {{ 'description' | thingTranslate: item }}
       </div>
-    </div>
+    }
+    <!-- TODO obviously this is bad style. Tbd where to put the differentiation. Job Postings always have a description, but it's going to be shown in `stapps-job-posting-detail-content` anyways, no need to repeat here. For this view, I would use other fields of the schema.org JobPosting like the `ThingWithCategory.category` -->
+    @if (item.description && item.type !== 'job posting') {
+      <div class="description">
+        <div class="text-accordion" [style.-webkit-line-clamp]="descriptionLinesToDisplay" #accordionTextArea>
+          {{ 'description' | thingTranslate: item }}
+        </div>
+      </div>
+    }
     <!-- TODO see above -->
-    <ion-button
+    @if (item.description && item.type !== 'job posting' && buttonShown) {
-      expand="full"
+      <ion-button expand="full" fill="clear" (click)="toggleDescriptionAccordion()">
-      fill="clear"
+        <ion-icon [name]="buttonState" size="large"></ion-icon>
-      *ngIf="item.description && item.type !== 'job posting' && buttonShown"
+      </ion-button>
-      (click)="toggleDescriptionAccordion()"
+    }
-    >
-      <ion-icon [name]="buttonState" size="large"></ion-icon>
-    </ion-button>
   </ion-card-content>
 </ion-card>

frontend/app/src/app/modules/data/elements/title-card.component.scss

@@ -16,9 +16,8 @@
 .text-accordion {
   overflow: hidden;
   display: -webkit-box;
-  text-overflow: ellipsis;
-
   -webkit-box-orient: vertical;
+  text-overflow: ellipsis;
 }
 
 ion-card {

frontend/app/src/app/modules/data/elements/title-card.component.ts

@@ -16,10 +16,11 @@
 import {Component, ElementRef, HostListener, Input, OnChanges, OnInit, ViewChild} from '@angular/core';
 import {SCThings} from '@openstapps/core';
 import {SCIcon} from '../../../util/ion-icon/icon';
+import {MaterialSymbol} from 'material-symbols';
 
 const AccordionButtonState = {
-  collapsed: SCIcon`expand_more`,
+  collapsed: SCIcon.expand_more,
-  expanded: SCIcon`expand_less`,
+  expanded: SCIcon.expand_less,
 };
 
 @Component({
@@ -35,7 +36,7 @@ export class TitleCardComponent implements OnInit, OnChanges {
 
   @ViewChild('accordionTextArea') accordionTextArea: ElementRef;
 
-  buttonState = AccordionButtonState.collapsed;
+  buttonState: MaterialSymbol = AccordionButtonState.collapsed;
 
   buttonShown = true;
 

frontend/app/src/app/modules/data/list/data-list-item-host-default.html

@@ -1,22 +1,24 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
-<h2>{{ 'name' | thingTranslate : item }}</h2>
+<h2>{{ 'name' | thingTranslate: item }}</h2>
-<p *ngIf="item.description">
+@if (item.description) {
-  <stapps-long-inline-text
+  <p>
-    [text]="'description' | thingTranslate : item"
+    <stapps-long-inline-text
-    [size]="80"
+      [text]="'description' | thingTranslate: item"
-  ></stapps-long-inline-text>
+      [size]="80"
-</p>
+    ></stapps-long-inline-text>
+  </p>
+}

frontend/app/src/app/modules/data/list/data-list-item.html

@@ -1,17 +1,17 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
 <ion-item
   class="ion-text-wrap ion-margin"
@@ -20,33 +20,29 @@
   detail="false"
   (click)="notifySelect()"
 >
-  <div class="item-height-placeholder"></div>
+  @if (!hideThumbnail) {
-  <ion-thumbnail slot="start" *ngIf="!hideThumbnail" class="ion-margin-end">
+    <ion-thumbnail slot="start" class="ion-margin-end">
-    <ion-icon color="dark" [name]="item.type | dataIcon" [size]="36"></ion-icon>
+      <ion-icon color="dark" [name]="item.type | dataIcon" [size]="36"></ion-icon>
-  </ion-thumbnail>
+    </ion-thumbnail>
-  <ng-container *ngIf="contentTemplateRef; else defaultContent">
+  }
-    <ion-label class="ion-text-wrap" [ngSwitch]="true">
+  @if (contentTemplateRef) {
-      <div>
+    <ng-container *ngTemplateOutlet="contentTemplateRef; context: {$implicit: item}"></ng-container>
-        <ng-container *ngTemplateOutlet="contentTemplateRef; context: {$implicit: item}"></ng-container>
+  } @else {
-      </div>
-    </ion-label>
-  </ng-container>
-
-  <ng-container *ngIf="listItemEndInteraction" [ngSwitch]="item.type">
-    <stapps-rating *ngSwitchCase="'dish'" [item]="$any(item)"></stapps-rating>
-    <stapps-favorite-button *ngSwitchDefault [item]="$any(item)"></stapps-favorite-button>
-  </ng-container>
-</ion-item>
-
-<ng-template #defaultContent>
-  <ion-label class="ion-text-wrap">
     <div>
       <ng-template [dataListItemHost]="item"></ng-template>
-      <stapps-action-chip-list
+      @if (listItemChipInteraction && appearance !== 'square') {
-        *ngIf="listItemChipInteraction && appearance !== 'square'"
+        <stapps-action-chip-list [item]="item"></stapps-action-chip-list>
-        slot="end"
+      }
-        [item]="item"
-      ></stapps-action-chip-list>
     </div>
-  </ion-label>
+  }
-</ng-template>
+  @if (listItemEndInteraction) {
+    @switch (item.type) {
+      @case ('dish') {
+        <stapps-rating slot="end" [item]="$any(item)"></stapps-rating>
+      }
+      @default {
+        <stapps-favorite-button slot="end" [item]="$any(item)"></stapps-favorite-button>
+      }
+    }
+  }
+</ion-item>

frontend/app/src/app/modules/data/list/data-list-item.scss

@@ -20,46 +20,72 @@
 
 ion-item::part(native) {
   height: 100%;
+  padding: var(--spacing-sm);
 }
 
 ion-item {
   --border-color: transparent;
   --inner-padding-end: 0;
-  --padding-start: 0;
   @include border-radius-in-parallax(var(--border-radius-default));
 
   overflow: hidden;
+  height: 100%;
   margin: var(--spacing-sm);
 
   ion-thumbnail {
     --ion-margin: var(--spacing-xs);
 
-    margin-inline-start: var(--spacing-md);
+    margin-block: auto;
+    margin-inline: var(--spacing-md);
     padding: 0;
   }
-
-  ion-label {
-    width: 100%;
-    margin-right: 0;
-    padding-left: var(--spacing-sm);
-
-    div {
-      display: flex;
-      flex-direction: column;
-    }
-  }
 }
 
 .ion-text-wrap ::ng-deep ion-label {
   display: -webkit-box;
+  -webkit-box-orient: vertical;
   white-space: normal !important;
 
-  -webkit-box-orient: vertical;
   -webkit-line-clamp: 3;
 }
 
+[slot='end'] {
+  margin-block: auto;
+  margin-inline-start: 0;
+}
+
+stapps-action-chip-list {
+  float: bottom;
+}
+
+ion-item ::ng-deep {
+  stapps-long-inline-text,
+  .title {
+    overflow: hidden;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+
+    white-space: break-spaces;
+
+    -webkit-line-clamp: 2;
+  }
+
+  .title-sub {
+    overflow: hidden;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+
+    margin-block: var(--spacing-xs);
+
+    white-space: break-spaces;
+
+    -webkit-line-clamp: 1;
+  }
+}
+
 :host.square ::ng-deep {
   ion-item {
+    align-items: flex-start;
     margin: 0;
   }
 
@@ -74,19 +100,12 @@ ion-item {
     flex-grow: 0;
   }
 
-  stapps-long-inline-text,
   .title {
-    overflow: hidden;
+    height: 2.5em;
-    display: -webkit-box;
-
-    white-space: break-spaces;
-
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
   }
 
-  .title-sub {
+  .title ~ :last-child {
-    display: none;
+    margin-right: 42px;
   }
 
   stapps-rating,

frontend/app/src/app/modules/data/list/data-list.html

@@ -1,31 +1,31 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
-<ng-container *ngIf="itemStream | async as items">
+@if (itemStream | async; as items) {
   <ng-content select="[header]"></ng-content>
   <ion-list [style.display]="items && items.length ? 'block' : 'none'">
-    <ng-container *ngFor="let item of items">
+    @for (item of items; track item) {
       <ng-container
         *ngTemplateOutlet="listItemTemplateRef || defaultListItem; context: {$implicit: item}"
       ></ng-container>
-    </ng-container>
+    }
     <ion-infinite-scroll (ionInfinite)="notifyLoadMore()">
       <ion-infinite-scroll-content></ion-infinite-scroll-content>
     </ion-infinite-scroll>
   </ion-list>
-</ng-container>
+}
 <div [style.display]="!loading && items && items.length === 0 ? 'block' : 'none'">
   <ion-label class="centered-message-container">
     {{ 'search.nothing_found' | translate | titlecase }}

frontend/app/src/app/modules/data/list/food-data-list.component.ts

@@ -12,109 +12,94 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-import {Component, OnInit} from '@angular/core';
+import {Component} from '@angular/core';
-import {MapPosition} from '../../map/position.service';
+import {PositionService} from '../../map/position.service';
-import {SearchPageComponent} from './search-page.component';
 import {Geolocation} from '@capacitor/geolocation';
-import {BehaviorSubject} from 'rxjs';
+import {BehaviorSubject, catchError} from 'rxjs';
 import {pauseWhen} from '../../../util/rxjs/pause-when';
+import {SCSearchFilter} from '@openstapps/core';
+import {ContextMenuService} from '../../menu/context/context-menu.service';
 import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
 
 /**
  * Presents a list of places for eating/drinking
  */
 @Component({
-  templateUrl: 'search-page.html',
+  templateUrl: 'food-data-list.html',
-  styleUrls: ['../../data/list/search-page.scss'],
 })
-export class FoodDataListComponent extends SearchPageComponent implements OnInit {
+export class FoodDataListComponent {
-  title = 'canteens.title';
-
-  showNavigation = false;
-
   isNotInView$ = new BehaviorSubject(true);
 
-  /**
+  forcedFilter: SCSearchFilter = {
-   * Sets the forced filter to present only places for eating/drinking
+    arguments: {
-   */
+      filters: [
-  ngOnInit() {
+        {
-    this.positionService
+          arguments: {
-      .watchCurrentLocation({enableHighAccuracy: false, maximumAge: 1000})
+            field: 'categories',
-      .pipe(pauseWhen(this.isNotInView$), takeUntilDestroyed(this.destroy$))
+            value: 'canteen',
-      .subscribe({
+          },
-        next: (position: MapPosition) => {
+          type: 'value',
-          this.positionService.position = position;
         },
-        error: async _error => {
+        {
-          this.positionService.position = undefined;
+          arguments: {
+            field: 'categories',
+            value: 'student canteen',
+          },
+          type: 'value',
+        },
+        {
+          arguments: {
+            field: 'categories',
+            value: 'cafe',
+          },
+          type: 'value',
+        },
+        {
+          arguments: {
+            field: 'categories',
+            value: 'restaurant',
+          },
+          type: 'value',
+        },
+      ],
+      operation: 'or',
+    },
+    type: 'boolean',
+  };
+
+  constructor(positionService: PositionService, contextMenuService: ContextMenuService) {
+    positionService
+      .watchCurrentLocation({enableHighAccuracy: false, maximumAge: 1000})
+      .pipe(
+        pauseWhen(this.isNotInView$),
+        takeUntilDestroyed(),
+        catchError(async _error => {
+          await Geolocation.checkPermissions();
+        }),
+      )
+      .subscribe({
+        next(position) {
+          if (!position) return;
+          positionService.position = position;
+          contextMenuService.sortQuery.next([
+            {
+              type: 'distance',
+              order: 'asc',
+              arguments: {
+                field: 'geo',
+                position: [position.longitude, position.latitude],
+              },
+            },
+          ]);
+        },
+        async error() {
+          positionService.position = undefined;
           await Geolocation.checkPermissions();
         },
       });
-    this.showDefaultData = true;
-
-    this.sortQuery = [
-      {
-        arguments: {field: 'name'},
-        order: 'asc',
-        type: 'ducet',
-      },
-    ];
-
-    this.forcedFilter = {
-      arguments: {
-        filters: [
-          {
-            arguments: {
-              field: 'categories',
-              value: 'canteen',
-            },
-            type: 'value',
-          },
-          {
-            arguments: {
-              field: 'categories',
-              value: 'student canteen',
-            },
-            type: 'value',
-          },
-          {
-            arguments: {
-              field: 'categories',
-              value: 'cafe',
-            },
-            type: 'value',
-          },
-          {
-            arguments: {
-              field: 'categories',
-              value: 'restaurant',
-            },
-            type: 'value',
-          },
-        ],
-        operation: 'or',
-      },
-      type: 'boolean',
-    };
-
-    if (this.positionService.position) {
-      this.sortQuery = [
-        {
-          type: 'distance',
-          order: 'asc',
-          arguments: {
-            field: 'geo',
-            position: [this.positionService.position.longitude, this.positionService.position.latitude],
-          },
-        },
-      ];
-    }
-
-    super.ngOnInit();
   }
 
-  async ionViewWillEnter() {
+  ionViewWillEnter() {
-    await super.ionViewWillEnter();
     this.isNotInView$.next(false);
   }
 

frontend/app/src/app/modules/data/list/food-data-list.html

@@ -0,0 +1,7 @@
+<stapps-search-page
+  [title]="'canteens.title' | translate"
+  [navigation]="[]"
+  [showDefaultData]="true"
+  [forcedFilter]="forcedFilter"
+>
+</stapps-search-page>

frontend/app/src/app/modules/data/list/search-page-switch-animation.ts

@@ -15,7 +15,7 @@
 
 import type {AnimationBuilder} from '@ionic/angular';
 import {AnimationController} from '@ionic/angular';
-import type {AnimationOptions} from '@ionic/angular/providers/nav-controller';
+import type {AnimationOptions} from '@ionic/angular/common/providers/nav-controller';
 
 /**
  *

frontend/app/src/app/modules/data/list/search-page.component.ts

@@ -55,17 +55,18 @@ export class SearchPageComponent implements OnInit {
 
   @Input() backUrl?: string;
 
-  isHebisAvailable = false;
-
   /**
    * Signalizes that the data is being loaded
    */
   loading = false;
 
   /**
-   * Display the navigation between default and library search
+   * Navigation elements between search pages
    */
-  @Input() showNavigation = true;
+  @Input() navigation: Array<{label: string; routerLink?: string[]}> = [
+    {label: 'search.type'},
+    {label: 'hebisSearch.type', routerLink: ['/hebis-search']},
+  ];
 
   /**
    * Show default data (e.g. when there is user interaction)
@@ -82,6 +83,8 @@ export class SearchPageComponent implements OnInit {
    */
   @Input() showTopToolbar = true;
 
+  @Input() showContextMenu = true;
+
   /**
    * Api query filter
    */
@@ -110,7 +113,7 @@ export class SearchPageComponent implements OnInit {
   /**
    * Page size of queries
    */
-  pageSize = 30;
+  @Input() pageSize = 30;
 
   /**
    * Search value from search bar
@@ -343,8 +346,13 @@ export class SearchPageComponent implements OnInit {
         });
     }
     try {
-      const features = this.configProvider.getValue('features') as SCFeatureConfiguration;
+      // TODO: make this hack more generic
-      this.isHebisAvailable = !!features.plugins?.['hebis-plugin']?.urlPath;
+      if (this.navigation[1]?.routerLink?.[0] === '/hebis-search') {
+        const features = this.configProvider.getValue('features') as SCFeatureConfiguration;
+        if (features.plugins?.['hebis-plugin']?.urlPath === undefined) {
+          this.navigation = [];
+        }
+      }
     } catch (error) {
       this.logger.error(error);
     }

frontend/app/src/app/modules/data/list/search-page.html

@@ -1,26 +1,30 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
-<stapps-context contentId="data-list"></stapps-context>
+@if (showContextMenu) {
+  <stapps-context contentId="data-list"></stapps-context>
+}
 <ion-header>
-  <ion-toolbar color="primary" mode="ios" *ngIf="showDrawer && showTopToolbar">
+  @if (showDrawer && showTopToolbar) {
-    <ion-buttons slot="start">
+    <ion-toolbar color="primary" mode="ios">
-      <ion-back-button [defaultHref]="backUrl"></ion-back-button>
+      <ion-buttons slot="start">
-    </ion-buttons>
+        <ion-back-button [defaultHref]="backUrl"></ion-back-button>
-    <ion-title>{{ title | translate }}</ion-title>
+      </ion-buttons>
-  </ion-toolbar>
+      <ion-title>{{ title | translate }}</ion-title>
+    </ion-toolbar>
+  }
   <ion-toolbar color="primary">
     <ion-searchbar
       (ngModelChange)="searchStringChanged($event)"
@@ -35,24 +39,33 @@
       class="filterable"
       [autofocus]="!showDefaultData"
     >
-      <ion-menu-button menu="context" auto-hide="false">
+      @if (showContextMenu) {
-        <ion-icon name="tune"></ion-icon>
+        <ion-menu-button menu="context" auto-hide="false">
-      </ion-menu-button>
+          <ion-icon name="tune"></ion-icon>
+        </ion-menu-button>
+      }
     </ion-searchbar>
   </ion-toolbar>
-  <ion-toolbar color="primary" class="category-tab" *ngIf="showNavigation && isHebisAvailable">
+  @if (navigation.length > 0) {
-    <ion-buttons class="ion-justify-content-between">
+    <ion-toolbar color="primary" class="category-tab">
-      <ion-button class="button-active" size="large">{{ 'search.type' | translate }}</ion-button>
+      <ion-buttons class="ion-justify-content-between">
-      <ion-button
+        @for (target of navigation; track target) {
-        [routerLink]="['/hebis-search']"
+          @if (target.routerLink) {
-        queryParamsHandling="merge"
+            <ion-button
-        [routerAnimation]="routeAnimation"
+              [routerLink]="target.routerLink"
-        fill="outline"
+              queryParamsHandling="merge"
-        size="large"
+              [routerAnimation]="routeAnimation"
-        >{{ 'hebisSearch.type' | translate }}
+              fill="outline"
-      </ion-button>
+              size="large"
-    </ion-buttons>
+              >{{ target.label | translate }}
-  </ion-toolbar>
+            </ion-button>
+          } @else {
+            <ion-button class="button-active" size="large">{{ target.label | translate }}</ion-button>
+          }
+        }
+      </ion-buttons>
+    </ion-toolbar>
+  }
 </ion-header>
 
 <ion-content class="content">

frontend/app/src/app/modules/data/list/search-page.scss

@@ -22,6 +22,9 @@
 
 ion-toolbar {
   --ion-color-base: none !important;
+
+  // account for back button
+  min-height: 42px;
 }
 
 ion-toolbar:first-of-type {

frontend/app/src/app/modules/data/list/simple-data-list.html

@@ -1,47 +1,44 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
-<ng-container *ngIf="items | async as items; else loading">
+@if (items | async; as items) {
   <ion-list>
-    <ng-container *ngIf="!listHeader; else header"></ng-container>
+    @if (!listHeader) {
-    <ng-container *ngFor="let item of items">
+    } @else {
+      <ion-list-header lines="inset">
+        <ion-text color="dark">
+          <h3>{{ listHeader }}</h3>
+        </ion-text>
+      </ion-list-header>
+    }
+    @for (item of items; track item) {
       <ng-container
         *ngTemplateOutlet="listItemTemplateRef || defaultListItem; context: {$implicit: item}"
       ></ng-container>
-    </ng-container>
+    }
   </ion-list>
-  <ion-label class="empty-list-message" *ngIf="emptyListMessage && items.length === 0"
+  @if (emptyListMessage && items.length === 0) {
-    >{{ emptyListMessage }}</ion-label
+    <ion-label class="empty-list-message">{{ emptyListMessage }}</ion-label>
-  >
+  }
-</ng-container>
+} @else {
-<ng-template #loading>
   <ion-list>
-    <stapps-skeleton-list-item
+    @for (skeleton of [].constructor(skeletonItems); track skeleton) {
-      [hideThumbnail]="singleType"
+      <stapps-skeleton-list-item [hideThumbnail]="singleType"> </stapps-skeleton-list-item>
-      *ngFor="let skeleton of [].constructor(skeletonItems)"
+    }
-    >
-    </stapps-skeleton-list-item>
   </ion-list>
-</ng-template>
+}
-<ng-template #header>
-  <ion-list-header lines="inset">
-    <ion-text color="dark">
-      <h3>{{ listHeader }}</h3>
-    </ion-text>
-  </ion-list-header>
-</ng-template>
 <ng-template let-item #defaultListItem>
   <stapps-data-list-item [item]="item" [hideThumbnail]="singleType"></stapps-data-list-item>
 </ng-template>

frontend/app/src/app/modules/data/list/tree-list-fragment.html

@@ -1,40 +1,48 @@
 <!--
-  ~ Copyright (C) 2022 StApps
+~ Copyright (C) 2022 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
-<ion-accordion-group *ngIf="entries as entries" [readonly]="true" [value]="entries" [multiple]="true">
+@if (entries; as entries) {
-  <ion-accordion *ngFor="let entry of entries" [value]="entry">
+  <ion-accordion-group [readonly]="true" [value]="entries" [multiple]="true">
-    <div *ngIf="groupMap[entry[0]] as header" slot="header" class="tree-indicator">
+    @for (entry of entries; track entry) {
-      <ng-container
+      <ion-accordion [value]="entry">
-        *ngTemplateOutlet="listItemTemplateRef || defaultListItem; context: {$implicit: header}"
+        @if (groupMap[entry[0]]; as header) {
-      ></ng-container>
+          <div slot="header" class="tree-indicator">
-    </div>
+            <ng-container
-    <ion-list slot="content" lines="none">
+              *ngTemplateOutlet="listItemTemplateRef || defaultListItem; context: {$implicit: header}"
-      <div *ngFor="let item of entry[1]._ || []" class="tree-indicator">
+            ></ng-container>
-        <ng-container
+          </div>
-          *ngTemplateOutlet="listItemTemplateRef || defaultListItem; context: {$implicit: item}"
+        }
-        ></ng-container>
+        <ion-list slot="content" lines="none">
-      </div>
+          @for (item of entry[1]._ || []; track item) {
-      <tree-list-fragment
+            <div class="tree-indicator">
-        [groupMap]="groupMap"
+              <ng-container
-        [items]="entry[1]"
+                *ngTemplateOutlet="listItemTemplateRef || defaultListItem; context: {$implicit: item}"
-        [singleType]="singleType"
+              ></ng-container>
-        [listItemTemplateRef]="listItemTemplateRef"
+            </div>
-      ></tree-list-fragment>
+          }
-    </ion-list>
+          <tree-list-fragment
-  </ion-accordion>
+            [groupMap]="groupMap"
-</ion-accordion-group>
+            [items]="entry[1]"
+            [singleType]="singleType"
+            [listItemTemplateRef]="listItemTemplateRef"
+          ></tree-list-fragment>
+        </ion-list>
+      </ion-accordion>
+    }
+  </ion-accordion-group>
+}
 
 <ng-template let-item #defaultListItem>
   <stapps-data-list-item [item]="item" [hideThumbnail]="singleType"></stapps-data-list-item>

frontend/app/src/app/modules/data/list/tree-list.html

@@ -1,22 +1,23 @@
 <!--
-  ~ Copyright (C) 2022 StApps
+~ Copyright (C) 2022 StApps
-  ~  This program is free software: you can redistribute it and/or modify it
+~  This program is free software: you can redistribute it and/or modify it
-  ~  under the terms of the GNU General Public License as published by the Free
+~  under the terms of the GNU General Public License as published by the Free
-  ~  Software Foundation, version 3.
+~  Software Foundation, version 3.
-  ~
+~
-  ~  This program is distributed in the hope that it will be useful, but WITHOUT
+~  This program is distributed in the hope that it will be useful, but WITHOUT
-  ~  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~  more details.
+~  more details.
-  ~
+~
-  ~  You should have received a copy of the GNU General Public License along with
+~  You should have received a copy of the GNU General Public License along with
-  ~  this program. If not, see <https://www.gnu.org/licenses/>.
+~  this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
-<tree-list-fragment
+@if (_groups | async; as groups) {
-  *ngIf="_groups | async as groups"
+  <tree-list-fragment
-  [items]="groups"
+    [items]="groups"
-  [groupMap]="_groupItems!"
+    [groupMap]="_groupItems!"
-  [singleType]="singleType"
+    [singleType]="singleType"
-  [listItemTemplateRef]="listItemTemplateRef"
+    [listItemTemplateRef]="listItemTemplateRef"
-></tree-list-fragment>
+  ></tree-list-fragment>
+}

frontend/app/src/app/modules/data/types/article/article-detail-content.html

@@ -1,92 +1,105 @@
 <!--
-  ~ Copyright (C) 2022 StApps
+~ Copyright (C) 2022 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
-<ion-card *ngIf="item.sameAs">
+@if (item.sameAs) {
-  <ion-card-header>{{ 'hebisSearch.detail.title' | translate | sentencecase }}</ion-card-header>
+  <ion-card>
-  <ion-card-content>
+    <ion-card-header>{{ 'hebisSearch.detail.title' | translate | sentencecase }}</ion-card-header>
-    <stapps-external-link [text]="'name' | thingTranslate : item" [link]="item.sameAs"></stapps-external-link>
+    <ion-card-content>
-  </ion-card-content>
+      <stapps-external-link
-</ion-card>
+        [text]="'name' | thingTranslate: item"
-
+        [link]="item.sameAs"
-<stapps-simple-card
+      ></stapps-external-link>
-  *ngIf="!item.sameAs"
+    </ion-card-content>
-  [title]="'name' | propertyNameTranslate : item | sentencecase"
+  </ion-card>
-  [content]="'name' | thingTranslate : item"
+}
->
+@if (!item.sameAs) {
-</stapps-simple-card>
+  <stapps-simple-card
-
+    [title]="'name' | propertyNameTranslate: item | sentencecase"
-<stapps-simple-card
+    [content]="'name' | thingTranslate: item"
-  *ngIf="item.description"
+  >
-  [title]="'hebisSearch.detail.description' | translate | sentencecase"
+  </stapps-simple-card>
-  [content]="item.description"
+}
-></stapps-simple-card>
+@if (item.description) {
-
+  <stapps-simple-card
-<stapps-simple-card
+    [title]="'hebisSearch.detail.description' | translate | sentencecase"
-  *ngIf="item.sourceOrganization"
+    [content]="item.description"
-  [title]="'sourceOrganization' | propertyNameTranslate : item | sentencecase"
+  ></stapps-simple-card>
-  [content]="item.sourceOrganization"
+}
-></stapps-simple-card>
+@if (item.sourceOrganization) {
-
+  <stapps-simple-card
-<ion-card *ngIf="item.authors && item.authors.length > 0">
+    [title]="'sourceOrganization' | propertyNameTranslate: item | sentencecase"
-  <ion-card-header>{{ 'authors' | propertyNameTranslate : item | sentencecase }}</ion-card-header>
+    [content]="item.sourceOrganization"
-  <ion-card-content>
+  ></stapps-simple-card>
-    <ion-label *ngFor="let author of item.authors">{{ 'name' | thingTranslate : author }}</ion-label>
+}
-  </ion-card-content>
+@if (item.authors && item.authors.length > 0) {
-</ion-card>
+  <ion-card>
-
+    <ion-card-header>{{ 'authors' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
-<stapps-simple-card
+    <ion-card-content>
-  *ngIf="item.firstPublished && !item.lastPublished"
+      @for (author of item.authors; track author) {
-  [title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
+        <ion-label>{{ 'name' | thingTranslate: author }}</ion-label>
-  [content]="item.firstPublished"
+      }
->
+    </ion-card-content>
-</stapps-simple-card>
+  </ion-card>
-
+}
-<stapps-simple-card
+@if (item.firstPublished && !item.lastPublished) {
-  *ngIf="item.firstPublished && item.lastPublished"
+  <stapps-simple-card
-  [title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
+    [title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
-  [content]="[item.firstPublished, item.lastPublished] | join : ' - '"
+    [content]="item.firstPublished"
->
+  >
-</stapps-simple-card>
+  </stapps-simple-card>
-
+}
-<ion-card *ngIf="item.publications">
+@if (item.firstPublished && item.lastPublished) {
-  <ion-card-header>{{ 'publications' | propertyNameTranslate : item | sentencecase }}</ion-card-header>
+  <stapps-simple-card
-  <ion-card-content>
+    [title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
-    <p *ngFor="let publication of item.publications">
+    [content]="[item.firstPublished, item.lastPublished] | join: ' - '"
-      {{ publication.locations | join : ', ' }} {{ publication.locations && publication.publisher ? ':' : ''
+  >
-      }} {{ publication.publisher }}
+  </stapps-simple-card>
-    </p>
+}
-  </ion-card-content>
+@if (item.publications) {
-</ion-card>
+  <ion-card>
-
+    <ion-card-header>{{ 'publications' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
-<stapps-simple-card
+    <ion-card-content>
-  *ngIf="item.reference"
+      @for (publication of item.publications; track publication) {
-  [title]="'reference' | propertyNameTranslate : item | sentencecase"
+        <p>
-  [content]="item.reference"
+          {{ publication.locations | join: ', ' }}
-></stapps-simple-card>
+          {{ publication.locations && publication.publisher ? ':' : '' }} {{ publication.publisher }}
-
+        </p>
-<stapps-simple-card
+      }
-  *ngIf="item.isPartOf"
+    </ion-card-content>
-  [title]="'isPartOf' | propertyNameTranslate : item | sentencecase"
+  </ion-card>
-  [content]="item.isPartOf.name"
+}
-></stapps-simple-card>
+@if (item.reference) {
-<ion-card *ngIf="item.categories">
+  <stapps-simple-card
-  <ion-card-header>{{ 'categories' | propertyNameTranslate : item | sentencecase }}</ion-card-header>
+    [title]="'reference' | propertyNameTranslate: item | sentencecase"
-  <ion-card-content>
+    [content]="item.reference"
-    <ion-chip [color]="'primary'">
+  ></stapps-simple-card>
-      <ion-icon [name]="item.type | dataIcon"></ion-icon>
+}
-      <ion-label>{{ 'categories' | thingTranslate : item }}</ion-label>
+@if (item.isPartOf) {
-    </ion-chip>
+  <stapps-simple-card
-  </ion-card-content>
+    [title]="'isPartOf' | propertyNameTranslate: item | sentencecase"
-</ion-card>
+    [content]="item.isPartOf.name"
+  ></stapps-simple-card>
+}
+@if (item.categories) {
+  <ion-card>
+    <ion-card-header>{{ 'categories' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
+    <ion-card-content>
+      <ion-chip [color]="'primary'">
+        <ion-icon [name]="item.type | dataIcon"></ion-icon>
+        <ion-label>{{ 'categories' | thingTranslate: item }}</ion-label>
+      </ion-chip>
+    </ion-card-content>
+  </ion-card>
+}

frontend/app/src/app/modules/data/types/article/article-item.component.ts

@@ -22,6 +22,7 @@ import {DataListItemComponent} from '../../list/data-list-item.component';
 @Component({
   selector: 'stapps-article-item',
   templateUrl: 'article-list-item.html',
+  styleUrl: 'article-list-item.scss',
 })
 export class ArticleListItemComponent extends DataListItemComponent {
   /**

frontend/app/src/app/modules/data/types/article/article-list-item.html

@@ -1,35 +1,32 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
-<ion-grid>
+<ion-label class="title">{{ 'name' | thingTranslate: item }}</ion-label>
-  <ion-row>
+<p class="title-sub">
-    <ion-col>
+  @for (author of item.authors; track author) {
-      <h2 class="name">{{ 'name' | thingTranslate : item }}</h2>
+    {{ 'name' | thingTranslate: author }}
-      <p>
+  }
-        <ng-container *ngFor="let author of item.authors">
+  @if (item.authors && item.authors && item.firstPublished) {
-          {{ 'name' | thingTranslate : author }}</ng-container
+    ,&nbsp;
-        ><ng-container *ngIf="item.authors && item.authors && item.firstPublished">,&nbsp;</ng-container>
+  }
-        <ng-container *ngIf="item.firstPublished && !item.lastPublished; else dateRange"
+  @if (item.firstPublished && !item.lastPublished) {
-          >{{ item.firstPublished }}</ng-container
+    {{ item.firstPublished }}
-        ><ng-template #dateRange
+  } @else {
-          ><ng-container *ngIf="item.firstPublished && item.lastPublished"
+    @if (item.firstPublished && item.lastPublished) {
-            >{{ [item.firstPublished, item.lastPublished] | join : ' - ' }}</ng-container
+      {{ [item.firstPublished, item.lastPublished] | join: ' - ' }}
-          ></ng-template
+    }
-        >
+  }
-      </p>
+</p>
-      <ion-note> {{ 'categories' | thingTranslate : item }} </ion-note>
+<ion-note> {{ 'categories' | thingTranslate: item }} </ion-note>
-    </ion-col>
-  </ion-row>
-</ion-grid>

frontend/app/src/app/modules/data/types/article/article-list-item.scss

@@ -0,0 +1,3 @@
+p.title-sub {
+  white-space: unset;
+}

frontend/app/src/app/modules/data/types/book/book-detail-content.html

@@ -1,91 +1,104 @@
 <!--
-  ~ Copyright (C) 2022 StApps
+~ Copyright (C) 2022 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
-<ion-card *ngIf="item.sameAs">
+@if (item.sameAs) {
-  <ion-card-header>{{ 'hebisSearch.detail.title' | translate | sentencecase }}</ion-card-header>
+  <ion-card>
-  <ion-card-content>
+    <ion-card-header>{{ 'hebisSearch.detail.title' | translate | sentencecase }}</ion-card-header>
-    <stapps-external-link [text]="'name' | thingTranslate : item" [link]="item.sameAs"></stapps-external-link>
+    <ion-card-content>
-  </ion-card-content>
+      <stapps-external-link
-</ion-card>
+        [text]="'name' | thingTranslate: item"
-
+        [link]="item.sameAs"
-<stapps-simple-card
+      ></stapps-external-link>
-  *ngIf="!item.sameAs"
+    </ion-card-content>
-  [title]="'name' | propertyNameTranslate : item | sentencecase"
+  </ion-card>
-  [content]="'name' | thingTranslate : item"
+}
->
+@if (!item.sameAs) {
-</stapps-simple-card>
+  <stapps-simple-card
-
+    [title]="'name' | propertyNameTranslate: item | sentencecase"
-<stapps-simple-card
+    [content]="'name' | thingTranslate: item"
-  *ngIf="item.edition"
+  >
-  [title]="'edition' | propertyNameTranslate : item | sentencecase"
+  </stapps-simple-card>
-  [content]="'edition' | thingTranslate : item"
+}
->
+@if (item.edition) {
-</stapps-simple-card>
+  <stapps-simple-card
-
+    [title]="'edition' | propertyNameTranslate: item | sentencecase"
-<stapps-simple-card
+    [content]="'edition' | thingTranslate: item"
-  *ngIf="item.description"
+  >
-  [title]="'hebisSearch.detail.description' | translate | sentencecase"
+  </stapps-simple-card>
-  [content]="item.description"
+}
-></stapps-simple-card>
+@if (item.description) {
-
+  <stapps-simple-card
-<stapps-simple-card
+    [title]="'hebisSearch.detail.description' | translate | sentencecase"
-  *ngIf="item.sourceOrganization"
+    [content]="item.description"
-  [title]="'sourceOrganization' | propertyNameTranslate : item | sentencecase"
+  ></stapps-simple-card>
-  [content]="item.sourceOrganization"
+}
-></stapps-simple-card>
+@if (item.sourceOrganization) {
-
+  <stapps-simple-card
-<ion-card *ngIf="item.authors && item.authors.length > 0">
+    [title]="'sourceOrganization' | propertyNameTranslate: item | sentencecase"
-  <ion-card-header>{{ 'authors' | propertyNameTranslate : item | sentencecase }}</ion-card-header>
+    [content]="item.sourceOrganization"
-  <ion-card-content>
+  ></stapps-simple-card>
-    <ion-label *ngFor="let author of item.authors">{{ 'name' | thingTranslate : author }}</ion-label>
+}
-  </ion-card-content>
+@if (item.authors && item.authors.length > 0) {
-</ion-card>
+  <ion-card>
-
+    <ion-card-header>{{ 'authors' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
-<stapps-simple-card
+    <ion-card-content>
-  *ngIf="item.ISBNs"
+      @for (author of item.authors; track author) {
-  [title]="'ISBNs' | propertyNameTranslate : item | sentencecase"
+        <ion-label>{{ 'name' | thingTranslate: author }}</ion-label>
-  [content]="item.ISBNs"
+      }
->
+    </ion-card-content>
-</stapps-simple-card>
+  </ion-card>
-<stapps-simple-card
+}
-  *ngIf="item.firstPublished && !item.lastPublished"
+@if (item.ISBNs) {
-  [title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
+  <stapps-simple-card [title]="'ISBNs' | propertyNameTranslate: item | sentencecase" [content]="item.ISBNs">
-  [content]="item.firstPublished"
+  </stapps-simple-card>
->
+}
-</stapps-simple-card>
+@if (item.firstPublished && !item.lastPublished) {
-<stapps-simple-card
+  <stapps-simple-card
-  *ngIf="item.firstPublished && item.lastPublished"
+    [title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
-  [title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
+    [content]="item.firstPublished"
-  [content]="[item.firstPublished, item.lastPublished] | join : ' - '"
+  >
->
+  </stapps-simple-card>
-</stapps-simple-card>
+}
-<ion-card *ngIf="item.publications">
+@if (item.firstPublished && item.lastPublished) {
-  <ion-card-header>{{ 'publications' | propertyNameTranslate : item | sentencecase }}</ion-card-header>
+  <stapps-simple-card
-  <ion-card-content>
+    [title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
-    <p *ngFor="let publication of item.publications">
+    [content]="[item.firstPublished, item.lastPublished] | join: ' - '"
-      {{ publication.locations | join : ', ' }} {{ publication.locations && publication.publisher ? ':' : ''
+  >
-      }} {{ publication.publisher }}
+  </stapps-simple-card>
-    </p>
+}
-  </ion-card-content>
+@if (item.publications) {
-</ion-card>
+  <ion-card>
-<ion-card *ngIf="item.categories">
+    <ion-card-header>{{ 'publications' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
-  <ion-card-header>{{ 'categories' | propertyNameTranslate : item | sentencecase }}</ion-card-header>
+    <ion-card-content>
-  <ion-card-content>
+      @for (publication of item.publications; track publication) {
-    <ion-chip [color]="'primary'">
+        <p>
-      <ion-icon [name]="item.type | dataIcon"></ion-icon>
+          {{ publication.locations | join: ', ' }}
-      <ion-label>{{ 'categories' | thingTranslate : item }}</ion-label>
+          {{ publication.locations && publication.publisher ? ':' : '' }} {{ publication.publisher }}
-    </ion-chip>
+        </p>
-  </ion-card-content>
+      }
-</ion-card>
+    </ion-card-content>
+  </ion-card>
+}
+@if (item.categories) {
+  <ion-card>
+    <ion-card-header>{{ 'categories' | propertyNameTranslate: item | sentencecase }}</ion-card-header>
+    <ion-card-content>
+      <ion-chip [color]="'primary'">
+        <ion-icon [name]="item.type | dataIcon"></ion-icon>
+        <ion-label>{{ 'categories' | thingTranslate: item }}</ion-label>
+      </ion-chip>
+    </ion-card-content>
+  </ion-card>
+}

frontend/app/src/app/modules/data/types/book/book-list-item.component.ts

@@ -22,6 +22,7 @@ import {DataListItemComponent} from '../../list/data-list-item.component';
 @Component({
   selector: 'stapps-book-list-item',
   templateUrl: 'book-list-item.html',
+  styleUrl: 'book-list-item.scss',
 })
 export class BookListItemComponent extends DataListItemComponent {
   /**

frontend/app/src/app/modules/data/types/book/book-list-item.html

@@ -1,35 +1,32 @@
 <!--
-  ~ Copyright (C) 2023 StApps
+~ Copyright (C) 2023 StApps
-  ~ This program is free software: you can redistribute it and/or modify it
+~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
+~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, version 3.
+~ Software Foundation, version 3.
-  ~
+~
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT
+~ This program is distributed in the hope that it will be useful, but WITHOUT
-  ~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  ~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
+~ more details.
-  ~
+~
-  ~ You should have received a copy of the GNU General Public License along with
+~ You should have received a copy of the GNU General Public License along with
-  ~ this program. If not, see <https://www.gnu.org/licenses/>.
+~ this program. If not, see <https://www.gnu.org/licenses/>.
-  -->
+-->
 
-<ion-grid>
+<ion-label class="title">{{ 'name' | thingTranslate: item }}</ion-label>
-  <ion-row>
+<p class="title-sub">
-    <ion-col>
+  @for (author of item.authors; track author) {
-      <h2 class="name">{{ 'name' | thingTranslate : item }}</h2>
+    {{ 'name' | thingTranslate: author }}
-      <p>
+  }
-        <ng-container *ngFor="let author of item.authors">
+  @if (item.authors && item.authors && item.firstPublished) {
-          {{ 'name' | thingTranslate : author }}</ng-container
+    ,&nbsp;
-        ><ng-container *ngIf="item.authors && item.authors && item.firstPublished">,&nbsp;</ng-container>
+  }
-        <ng-container *ngIf="item.firstPublished && !item.lastPublished; else dateRange"
+  @if (item.firstPublished && !item.lastPublished) {
-          >{{ item.firstPublished }}</ng-container
+    {{ item.firstPublished }}
-        ><ng-template #dateRange
+  } @else {
-          ><ng-container *ngIf="item.firstPublished && item.lastPublished"
+    @if (item.firstPublished && item.lastPublished) {
-            >{{ [item.firstPublished, item.lastPublished] | join : ' - ' }}</ng-container
+      {{ [item.firstPublished, item.lastPublished] | join: ' - ' }}
-          ></ng-template
+    }
-        >
+  }
-      </p>
+</p>
-      <ion-note> {{ 'categories' | thingTranslate : item }} </ion-note>
+<ion-note> {{ 'categories' | thingTranslate: item }} </ion-note>
-    </ion-col>
-  </ion-row>
-</ion-grid>