fix: potential fixes

.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

.envrc

@@ -1 +0,0 @@
-use flake

.gitignore

@@ -24,7 +24,6 @@ report-junit.xml
 # NixOS flake
 result
 hsperfdata_root
-.direnv/
 
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov

.syncpackrc.cjs

@@ -2,13 +2,7 @@
 
 /** @type {import('syncpack').RcFile} */
 const config = {
-  semverGroups: [
+  semverRange: '',
-    {
-      range: '',
-      dependencies: ['**'],
-      packages: ['**'],
-    }
-  ],
   source: ['package.json', '**/package.json'],
   indent: '  ',
   sortFirst: [
@@ -55,7 +49,7 @@ const config = {
     {
       label: 'Packages should use workspace version',
       dependencies: ['@openstapps/**'],
-      dependencyTypes: ['prod', 'dev', 'peer'],
+      dependencyTypes: ['prod', 'dev'],
       packages: ['**'],
       pinVersion: 'workspace:*',
     },

.tool-versions

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

backend/backend/CHANGELOG.md

@@ -1,33 +1,5 @@
 # @openstapps/backend
 
-## 3.3.0
-
-### Minor Changes
-
-- 688bc5f2: v3.3.0 changes
-
-### Patch Changes
-
-- Updated dependencies [688bc5f2]
-  - @openstapps/core@3.3.0
-  - @openstapps/core-tools@3.3.0
-  - @openstapps/logger@3.0.0
-
-## 3.2.0
-
-### Minor Changes
-
-- 912ae422: Add the ability to filter by existence of a field
-
-### Patch Changes
-
-- 689ac68b: pin alpine version to 3.18 and add healthchecks
-- e8d72683: Backend unit tests break every year
-- Updated dependencies [912ae422]
-  - @openstapps/core@4.0.0
-  - @openstapps/core-tools@3.0.0
-  - @openstapps/logger@3.0.0
-
 ## 3.1.2
 
 ### Patch Changes

backend/backend/config/b-tu/elasticsearchrc.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 /**
  * This is the database configuration for the technical university of berlin
  *

backend/backend/config/default/app/language-setting.js

@@ -1,3 +1,4 @@
+// @ts-check
 import {SCSettingInputType, SCThingOriginType, SCThingType} from '@openstapps/core';
 
 /** @type {import('@openstapps/core').SCLanguageSetting}  */

backend/backend/config/default/app/menu.js

@@ -1,3 +1,4 @@
+// @ts-check
 /** @type {import('@openstapps/core').SCAppConfigurationMenuCategory[]} */
 const menus = [
   {

backend/backend/config/default/app/user-group-setting.js

@@ -1,3 +1,4 @@
+// @ts-check
 import {SCSettingInputType, SCThingOriginType, SCThingType} from '@openstapps/core';
 
 /** @type {import('@openstapps/core').SCUserGroupSetting} */

backend/backend/config/default/backend/aggregations.js

@@ -1,3 +1,4 @@
+// @ts-check
 import {SCThingType} from '@openstapps/core';
 
 /** @type {import('@openstapps/core').SCBackendAggregationConfiguration[]} */

backend/backend/config/default/backend/boostings.js

@@ -1,3 +1,4 @@
+// @ts-check
 import {
   month,
   sommerRange,

backend/backend/config/default/backend/index.js

@@ -1,3 +1,4 @@
+// @ts-check
 import {SCThingType} from '@openstapps/core';
 import aggregations from './aggregations.js';
 import boostings from './boostings.js';
@@ -16,7 +17,7 @@ export const backend = {
   hiddenTypes: [SCThingType.DateSeries, SCThingType.Diff, SCThingType.Floor],
   mappingIgnoredTags: ['minlength', 'pattern', 'see', 'tjs-format'],
   maxMultiSearchRouteQueries: 5,
-  maxRequestBodySize: 2e6,
+  maxRequestBodySize: 2 * 10 ** 6,
   name: 'Goethe-Universität Frankfurt am Main',
   namespace: '909a8cbc-8520-456c-b474-ef1525f14209',
   sortableFields: [

backend/backend/config/default/backendrc.js

@@ -1,3 +1,4 @@
+// @ts-check
 import app from './app/index.js';
 import {backend, internal} from './backend/index.js';
 

backend/backend/config/default/elasticsearchrc.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 /**
  * This is the default configuration for elasticsearch (a database)
  *

backend/backend/config/default/tools/markdown.js

@@ -1,3 +1,4 @@
+// @ts-check
 import {readFile} from 'fs/promises';
 import {SCAboutPageContentType} from '@openstapps/core';
 

backend/backend/config/default/tools/semester-acronym.js

@@ -1,3 +1,4 @@
+// @ts-check
 /**
  * Generates a range of numbers that represent consecutive calendar months
  *

backend/backend/config/default/tools/version.js

@@ -1,3 +1,4 @@
+// @ts-check
 import {readFile, readdir} from 'fs/promises';
 import url from 'url';
 import path from 'path';

backend/backend/config/f-u/about-pages/about.js

@@ -1,3 +1,4 @@
+// @ts-check
 import {SCAboutPageContentType} from '@openstapps/core';
 import {markdown} from '../../default/tools/markdown.js';
 

backend/backend/config/f-u/about-pages/imprint.js

@@ -1,3 +1,4 @@
+// @ts-check
 import {SCAboutPageContentType} from '@openstapps/core';
 
 /** @type {import('@openstapps/core').SCAboutPage} */

backend/backend/config/f-u/about-pages/index.js

@@ -1,3 +1,4 @@
+// @ts-check
 import about from './about.js';
 import imprint from './imprint.js';
 import privacy from './privacy.js';

backend/backend/config/f-u/about-pages/privacy.js

@@ -1,3 +1,4 @@
+// @ts-check
 import {markdown} from '../../default/tools/markdown.js';
 
 /** @type {import('@openstapps/core').SCAboutPage} */

backend/backend/config/f-u/backendrc.js

@@ -1,3 +1,4 @@
+// @ts-check
 import aboutPages from './about-pages/index.js';
 import defaultApp from '../default/app/index.js';
 import {backend as defaultBackend, internal as defaultInternal} from '../default/backend/index.js';

backend/backend/config/f-u/version-history/2.5.0.de.md

@@ -1,15 +0,0 @@
-# Goethe-Uni App 2.5
-
-Die Goethe-Uni App ist noch besser geworden!
-
-## Komplett neue Kartenansicht
-
-Wir haben die Karte überarbeitet, um eine klarere und schnellere Übersicht zu bieten.
-
-## Deutschlandticket mit an Bord
-
-Wenn du das Upgrade des Semesterticket zum Deutschlandticket gemacht hast und eingeloggt bist, findet es sich jetzt auch in der App.
-
-## Bibliotheksdienste sind wieder voll funktionsfähig
-
-Aufgrund einiger Adhoc-Änderungen im Bibliothekssystem haben wir die App so angepasst, dass sie damit umgehen kann.

backend/backend/config/f-u/version-history/2.5.0.en.md

@@ -1,15 +0,0 @@
-# Goethe-Uni App 2.5
-
-The Goethe-Uni App got even better!
-
-## Completely new map view
-
-We overhauled the map to offer you a clearer and faster and overview.
-
-## Deutschlandticket included
-
-If you upgraded your Semesterticket to a Deutschlandticket it will now reside in the App if you are logged in.
-
-## Library services are fully functional again
-
-Due to some adhoc changes in the library system we adjusted the app to handle them properly.

backend/backend/config/f-u/version-history/index.js

@@ -1,3 +1,4 @@
+// @ts-check
 import {versions} from '../../default/tools/version.js';
 
 /** @type {import('@openstapps/core').SCAppVersionInfo[]} */

backend/backend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/backend",
   "description": "A reference implementation for a StApps backend",
-  "version": "3.3.0",
+  "version": "3.1.2",
   "private": true,
   "type": "module",
   "license": "AGPL-3.0-only",
@@ -40,7 +40,7 @@
     "start:debug": "cross-env STAPPS_LOG_LEVEL=31 NODE_CONFIG_ENV=elasticsearch ALLOW_NO_TRANSPORT=true node app.js",
     "test": "pnpm run test:unit",
     "test:integration": "sh integration-test.sh",
-    "test:unit": "cross-env NODE_CONFIG_ENV=elasticsearch ALLOW_NO_TRANSPORT=true STAPPS_LOG_LEVEL=0 mocha --exit"
+    "test:unit": "cross-env NODE_CONFIG_ENV=elasticsearch ALLOW_NO_TRANSPORT=true STAPPS_LOG_LEVEL=0 c8 mocha"
   },
   "dependencies": {
     "@elastic/elasticsearch": "8.4.0",
@@ -64,7 +64,7 @@
     "express-prom-bundle": "6.6.0",
     "express-promise-router": "4.1.1",
     "got": "12.6.0",
-    "moment": "2.30.1",
+    "moment": "2.29.4",
     "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.2",
+    "ts-node": "10.9.1",
     "tsup": "6.7.0",
-    "typescript": "5.4.2"
+    "typescript": "5.1.6"
   },
   "tsup": {
     "entry": [

backend/backend/src/notification/mail-queue.ts

@@ -16,7 +16,7 @@
  */
 import {Logger, SMTP} from '@openstapps/logger';
 import {MailOptions} from 'nodemailer/lib/sendmail-transport';
-import Queue from 'promise-queue';
+
 /**
  * A queue that can send mails in serial
  */
@@ -32,80 +32,45 @@ export class MailQueue {
   static readonly VERIFICATION_TIMEOUT = 5000;
 
   /**
-   * A queue that saves mails, before the transport is ready. When
+   * A promise that resolves when the last mail was sent
-   * the transport gets ready this mails are getting pushed in to
-   * the normal queue.
    */
-  dryQueue: MailOptions[];
+  last?: Promise<string>;
-
-  /**
-   * A queue that saves mails, that are being sent in series
-   */
-  queue: Queue;
-
-  /**
-   * A counter for the number of verifications that failed
-   */
-  verificationCounter: number;
 
   /**
    * Creates a mail queue
    * @param transport Transport which is used for sending mails
    */
-  constructor(private readonly transport: SMTP) {
+  constructor(private readonly transport: SMTP) {}
-    this.queue = new Queue(1);
-
-    // this queue saves all request when the transport is not ready yet
-    this.dryQueue = [];
-
-    this.verificationCounter = 0;
-
-    // if the transport can be verified it should check if it was done...
-    this.checkForVerification();
-  }
 
   /**
-   * Adds a mail into the queue so it gets send when the queue is ready
+   * Wait for the transport to be verified
-   * @param mail Information required for sending a mail
    */
-  private async addToQueue(mail: MailOptions) {
+  private async waitForVerification() {
-    return this.queue.add<string>(() => this.transport.sendMail(mail));
+    for (let i = 0; i < MailQueue.MAX_VERIFICATION_ATTEMPTS; i++) {
-  }
+      if (this.transport.isVerified()) {
-
+        Logger.ok('Transport for mail queue was verified. We can send mails now');
-  /**
+        return;
-   * Verify the given transport
-   */
-  private checkForVerification() {
-    if (this.verificationCounter >= MailQueue.MAX_VERIFICATION_ATTEMPTS) {
-      throw new Error('Failed to initialize the SMTP transport for the mail queue');
-    }
-
-    if (this.transport.isVerified()) {
-      Logger.ok('Transport for mail queue was verified. We can send mails now');
-      // if the transport finally was verified send all our mails from the dry queue
-      for (const mail of this.dryQueue) {
-        void this.addToQueue(mail);
       }
-    } else {
+      await new Promise(resolve => setTimeout(resolve, MailQueue.VERIFICATION_TIMEOUT));
-      this.verificationCounter++;
+      Logger.warn('Transport not verified yet. Trying to send mails here...');
-      setTimeout(() => {
-        Logger.warn('Transport not verified yet. Trying to send mails here...');
-        this.checkForVerification();
-      }, MailQueue.VERIFICATION_TIMEOUT);
     }
+    throw new Error('Failed to initialize the SMTP transport for the mail queue');
   }
 
   /**
    * Push a mail into the queue so it gets send when the queue is ready
    * @param mail Information required for sending a mail
    */
-  public async push(mail: MailOptions) {
+  public async push(mail: MailOptions): Promise<string> {
-    if (this.transport.isVerified()) {
+    const previousQueue = this.last ?? this.waitForVerification();
-      await this.addToQueue(mail);
+    this.last = previousQueue.then(() =>
-    } else {
+      Promise.race([
-      // the transport has verification, but is not verified yet
+        this.transport.sendMail(mail),
-      // push to a dry queue which gets pushed to the real queue when the transport is verified
+        new Promise<string>((_, reject) =>
-      this.dryQueue.push(mail);
+          setTimeout(() => reject(new Error('Timeout')), MailQueue.VERIFICATION_TIMEOUT),
-    }
+        ),
+      ]),
+    );
+    return this.last;
   }
 }

backend/backend/src/storage/database.ts

@@ -13,34 +13,15 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import {
+import {SCConfigFile, SCSearchQuery, SCSearchResponse, SCThings, SCUuid} from '@openstapps/core';
-  SCConfigFile,
-  SCPlace,
-  SCPlaceWithoutReferences,
-  SCSearchQuery,
-  SCSearchResponse,
-  SCThingWithCategoriesWithoutReferences,
-  SCThings,
-  SCUuid,
-} from '@openstapps/core';
 import {MailQueue} from '../notification/mail-queue.js';
 import {Bulk} from './bulk-storage.js';
-import {FeatureCollection, Point, Polygon} from 'geojson';
 
 /**
  * Creates an instance of a database
  */
 export type DatabaseConstructor = new (config: SCConfigFile, mailQueue?: MailQueue) => Database;
 
-export type SupplementaryGeoJSON = FeatureCollection<Point | Polygon, SupplementaryGeoJSONThing>;
-export type SupplementaryGeoJSONThing = Pick<
-  Extract<SCThings, SCPlace>,
-  Exclude<
-    keyof SCPlaceWithoutReferences | keyof SCThingWithCategoriesWithoutReferences<never, never>,
-    'geo' | 'origin' | 'translations'
-  >
->;
-
 /**
  * Defines what one database class needs to have defined
  */
@@ -101,9 +82,4 @@ export interface Database {
    * @param params Parameters which form a search query to search the backend data
    */
   search(parameters: SCSearchQuery): Promise<SCSearchResponse>;
-
-  /**
-   * Get geo info for display on a map
-   */
-  geo(): Promise<SupplementaryGeoJSON>;
 }

backend/backend/src/storage/elasticsearch/elasticsearch.ts

@@ -26,7 +26,7 @@ import {Logger} from '@openstapps/logger';
 import moment from 'moment';
 import {MailQueue} from '../../notification/mail-queue.js';
 import {Bulk} from '../bulk-storage.js';
-import {Database, SupplementaryGeoJSON, SupplementaryGeoJSONThing} from '../database.js';
+import {Database} from '../database.js';
 import {parseAggregations} from './aggregations.js';
 import * as Monitoring from './monitoring.js';
 import {buildQuery} from './query/query.js';
@@ -46,7 +46,6 @@ import {
 } from './util/index.js';
 import {noUndefined} from './util/no-undefined.js';
 import {retryCatch, RetryOptions} from './util/retry.js';
-import {Feature, Point, Polygon} from 'geojson';
 
 /**
  * A database interface for elasticsearch
@@ -406,49 +405,4 @@ export class Elasticsearch implements Database {
       },
     };
   }
-
-  async geo(): Promise<SupplementaryGeoJSON> {
-    const searchResponse = await this.client.search<Extract<SCThings, {geo: unknown}>>({
-      body: {
-        query: {
-          exists: {
-            field: 'geo',
-          },
-        },
-      },
-      from: 0,
-      allow_no_indices: true,
-      index: ACTIVE_INDICES_ALIAS,
-      size: 1,
-    });
-
-    return {
-      type: 'FeatureCollection',
-      features: searchResponse.hits.hits
-        .map(thing => {
-          return thing._source?.geo
-            ? ({
-                id: Number(thing._source.identifiers?.['OSM']) || undefined,
-                type: 'Feature',
-                geometry: thing._source.geo.polygon ?? thing._source.geo.point,
-                properties: {
-                  name: thing._source.name,
-                  sameAs: thing._source.sameAs,
-                  image: thing._source.image,
-                  alternateNames: thing._source.alternateNames,
-                  description: thing._source.description,
-                  identifiers: thing._source.identifiers,
-                  categories: thing._source.categories,
-                  categorySpecificValues: thing._source.categorySpecificValues,
-                  openingHours: thing._source.openingHours,
-                  address: thing._source.address,
-                  uid: thing._source.uid,
-                  type: thing._source.type,
-                },
-              } satisfies Feature<Polygon | Point, SupplementaryGeoJSONThing>)
-            : undefined;
-        })
-        .filter(noUndefined),
-    };
-  }
 }

backend/backend/src/storage/elasticsearch/query/filters/geo.ts

@@ -19,29 +19,14 @@ import {QueryDslSpecificQueryContainer} from '../../types/util.js';
  * Converts a geo filter to elasticsearch syntax
  * @param filter A search filter for the retrieval of the data
  */
-export function buildGeoFilter(filter: SCGeoFilter): QueryDslSpecificQueryContainer<'bool'> {
+export function buildGeoFilter(filter: SCGeoFilter): QueryDslSpecificQueryContainer<'geo_shape'> {
   return {
-    bool: {
+    geo_shape: {
-      should: [
+      ignore_unmapped: true,
-        {
+      [`${filter.arguments.field}.polygon`]: {
-          geo_shape: {
+        shape: filter.arguments.shape,
-            ignore_unmapped: true,
+        relation: filter.arguments.spatialRelation,
-            [`${filter.arguments.field}.polygon`]: {
+      },
-              shape: filter.arguments.shape,
-              relation: filter.arguments.spatialRelation,
-            },
-          },
-        } satisfies QueryDslSpecificQueryContainer<'geo_shape'>,
-        {
-          geo_shape: {
-            ignore_unmapped: true,
-            [`${filter.arguments.field}.point`]: {
-              shape: filter.arguments.shape,
-              relation: filter.arguments.spatialRelation,
-            },
-          },
-        } satisfies QueryDslSpecificQueryContainer<'geo_shape'>,
-      ],
     },
   };
 }

backend/backend/src/storage/elasticsearch/query/filters/value.ts

@@ -21,31 +21,16 @@ import {QueryDslSpecificQueryContainer} from '../../types/util.js';
  */
 export function buildValueFilter(
   filter: SCSearchValueFilter,
-):
+): QueryDslSpecificQueryContainer<'term'> | QueryDslSpecificQueryContainer<'terms'> {
-  | QueryDslSpecificQueryContainer<'exists'>
+  return Array.isArray(filter.arguments.value)
-  | QueryDslSpecificQueryContainer<'term'>
+    ? {
-  | QueryDslSpecificQueryContainer<'terms'> {
+        terms: {
-  switch (typeof filter.arguments.value) {
+          [`${filter.arguments.field}.raw`]: filter.arguments.value,
-    case 'undefined': {
-      return {
-        exists: {
-          field: filter.arguments.field,
         },
-      };
+      }
-    }
+    : {
-    case 'string': {
-      return {
         term: {
           [`${filter.arguments.field}.raw`]: filter.arguments.value,
         },
       };
-    }
-    case 'object': {
-      return {
-        terms: {
-          [`${filter.arguments.field}.raw`]: filter.arguments.value,
-        },
-      };
-    }
-  }
 }

backend/backend/test/common.ts

@@ -22,7 +22,7 @@ import http from 'http';
 import {MailQueue} from '../src/notification/mail-queue.js';
 import {Bulk, BulkStorage} from '../src/storage/bulk-storage.js';
 import getPort from 'get-port';
-import {Database, SupplementaryGeoJSON} from '../src/storage/database.js';
+import {Database} from '../src/storage/database.js';
 import {v4} from 'uuid';
 import {backendConfig} from '../src/config.js';
 import {getIndexUID} from '../src/storage/elasticsearch/util/index.js';
@@ -58,6 +58,7 @@ export async function startApp(): Promise<Express> {
  * An elasticsearch mock
  */
 export class ElasticsearchMock implements Database {
+  // @ts-expect-error never read
   private bulk: Bulk | undefined;
 
   private storageMock = new Map<string, SCThings>();
@@ -66,10 +67,6 @@ export class ElasticsearchMock implements Database {
     // Nothing to do here
   }
 
-  geo(): Promise<SupplementaryGeoJSON> {
-    throw new Error('Method not implemented.');
-  }
-
   bulkCreated(bulk: Bulk): Promise<void> {
     this.bulk = bulk;
     return Promise.resolve(undefined);

backend/backend/test/notification/mail-queue.spec.ts

@@ -44,7 +44,7 @@ describe('MailQueue', async function () {
       clock.tick(MailQueue.VERIFICATION_TIMEOUT * (MailQueue.MAX_VERIFICATION_ATTEMPTS + 1));
     };
 
-    expect(() => test()).to.throw();
+    expect(test).to.throw();
     expect(loggerStub.callCount).to.be.equal(MailQueue.MAX_VERIFICATION_ATTEMPTS);
   });
 

backend/backend/test/routes/bulk-route.spec.ts

@@ -14,7 +14,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 import {
-  SCBook,
   SCBulkAddRoute,
   SCBulkDoneRoute,
   SCBulkRequest,
@@ -24,30 +23,29 @@ import {
 import {expect} from 'chai';
 import {bulk, DEFAULT_TEST_TIMEOUT} from '../common.js';
 import {testApp} from '../tests-setup.js';
+import {readFile} from 'fs/promises';
 import {v4} from 'uuid';
-import bookFile from '@openstapps/core/test/resources/indexable/Book.2.json' assert {type: 'json'};
 
-const book = bookFile.instance as SCBook;
+const book = JSON.parse(
+  await readFile('node_modules/@openstapps/core/test/resources/indexable/Book.2.json', 'utf8'),
+).instance;
 
 describe('Bulk routes', async function () {
   // increase timeout for the suite
   this.timeout(DEFAULT_TEST_TIMEOUT);
 
-  let request: SCBulkRequest;
+  const request: SCBulkRequest = {
-  let bulkRoute: SCBulkRoute;
+    expiration: bulk.expiration,
-  let bulkAddRoute: SCBulkAddRoute;
+    source: bulk.source,
-  let bulkDoneRoute: SCBulkDoneRoute;
+    type: bulk.type,
+  };
+  const bulkRoute = new SCBulkRoute();
+  const bulkAddRoute = new SCBulkAddRoute();
+  const bulkDoneRoute = new SCBulkDoneRoute();
 
-  before(function () {
+  // afterEach(async function() {
-    request = {
+  // TODO: Delete saved bulks
-      expiration: bulk.expiration,
+  // });
-      source: bulk.source,
-      type: bulk.type,
-    };
-    bulkRoute = new SCBulkRoute();
-    bulkAddRoute = new SCBulkAddRoute();
-    bulkDoneRoute = new SCBulkDoneRoute();
-  });
 
   it('should create bulk', async function () {
     const {status, body, error} = await testApp

backend/backend/test/routes/index-route.spec.ts

@@ -21,12 +21,7 @@ import {expect} from 'chai';
 describe('Index route', async function () {
   // increase timeout for the suite
   this.timeout(DEFAULT_TEST_TIMEOUT);
-
+  const indexRoute = new SCIndexRoute();
-  let indexRoute: SCIndexRoute;
-
-  before(function () {
-    indexRoute = new SCIndexRoute();
-  });
 
   it('should respond with both app and backend configuration', async function () {
     const request: SCIndexRequest = {};

backend/backend/test/routes/plugin-register-route.spec.ts

@@ -30,11 +30,15 @@ import chaiAsPromised from 'chai-as-promised';
 import {DEFAULT_TEST_TIMEOUT} from '../common.js';
 import {testApp} from '../tests-setup.js';
 import {backendConfig} from '../../src/config.js';
-import registerRequest from '@openstapps/core/test/resources/PluginRegisterRequest.1.json' assert {type: 'json'};
+import {readFile} from 'fs/promises';
 
 // for using promises in expectations (to.eventually.be...)
 use(chaiAsPromised);
 
+const registerRequest = JSON.parse(
+  await readFile('node_modules/@openstapps/core/test/resources/PluginRegisterRequest.1.json', 'utf8'),
+);
+
 // cast it because of "TS2322: Type 'string' is not assignable to type '"add"'"
 export const registerAddRequest: SCPluginAdd = registerRequest.instance as SCPluginAdd;
 

backend/backend/test/routes/route.spec.ts

@@ -47,8 +47,8 @@ describe('Create route', async function () {
   const statusCodeSuccess = 222;
   const bodySuccess = {foo: true};
   const sandbox = sinon.createSandbox();
-  let validationError: SCValidationErrorResponse;
+  const validationError = new SCValidationErrorResponse([]);
-  let internalServerError: SCInternalServerErrorResponse;
+  const internalServerError = new SCInternalServerErrorResponse();
 
   beforeEach(function () {
     app = express();
@@ -64,9 +64,6 @@ describe('Create route', async function () {
     handler = (_request, _app) => {
       return Promise.resolve(bodySuccess);
     };
-
-    validationError = new SCValidationErrorResponse([]);
-    internalServerError = new SCInternalServerErrorResponse();
   });
 
   afterEach(function () {

backend/backend/test/routes/search-route.spec.ts

@@ -29,21 +29,14 @@ import {backendConfig} from '../../src/config.js';
 describe('Search route', async function () {
   // increase timeout for the suite
   this.timeout(DEFAULT_TEST_TIMEOUT);
-  let searchRoute: SCSearchRoute;
+  const searchRoute = new SCSearchRoute();
-  let multiSearchRoute: SCMultiSearchRoute;
+  const multiSearchRoute = new SCMultiSearchRoute();
-  let syntaxError: SCSyntaxErrorResponse;
+  const syntaxError = new SCSyntaxErrorResponse('Foo Message');
-  let methodNotAllowedError: SCMethodNotAllowedErrorResponse;
+  const methodNotAllowedError = new SCMethodNotAllowedErrorResponse();
-  let tooManyRequestsError: SCTooManyRequestsErrorResponse;
+  const tooManyRequestsError = new SCTooManyRequestsErrorResponse();
-
-  before(function () {
-    searchRoute = new SCSearchRoute();
-    multiSearchRoute = new SCMultiSearchRoute();
-    syntaxError = new SCSyntaxErrorResponse('Foo Message');
-    methodNotAllowedError = new SCMethodNotAllowedErrorResponse();
-    tooManyRequestsError = new SCTooManyRequestsErrorResponse();
-  });
 
   it('should reject GET, PUT with a valid search query', async function () {
+    // const expectedParams = JSON.parse(JSON.stringify(defaultParams));
     const {status} = await testApp.get('/search').set('Accept', 'application/json').send({
       query: 'Some search terms',
     });

backend/backend/test/routes/thing-update-route.spec.ts

@@ -13,25 +13,23 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import {SCBook, SCThingUpdateRoute} from '@openstapps/core';
+import {SCThingUpdateRoute} from '@openstapps/core';
 import chaiAsPromised from 'chai-as-promised';
 import {bulkStorageMock, DEFAULT_TEST_TIMEOUT} from '../common.js';
 import {expect, use} from 'chai';
 import {testApp} from '../tests-setup.js';
-import bookFile from '@openstapps/core/test/resources/indexable/Book.1.json' assert {type: 'json'};
+import {readFile} from 'fs/promises';
 
 use(chaiAsPromised);
 
-const book = bookFile.instance as SCBook;
+const book = JSON.parse(
+  await readFile('node_modules/@openstapps/core/test/resources/indexable/Book.1.json', 'utf8'),
+).instance;
 
 describe('Thing update route', async function () {
   // increase timeout for the suite
   this.timeout(DEFAULT_TEST_TIMEOUT);
-  let thingUpdateRoute: SCThingUpdateRoute;
+  const thingUpdateRoute = new SCThingUpdateRoute();
-
-  before(function () {
-    thingUpdateRoute = new SCThingUpdateRoute();
-  });
 
   it('should update a thing', async function () {
     const thingUpdateRouteurlPath = thingUpdateRoute.urlPath

backend/backend/test/storage/elasticsearch/elasticsearch.spec.ts

@@ -49,11 +49,8 @@ import {
 } from '../../../src/storage/elasticsearch/util/index.js';
 import cron from 'node-cron';
 import {query} from './query.js';
-import messageFile from '@openstapps/core/test/resources/indexable/Message.1.json' assert {type: 'json'};
+import message from '@openstapps/core/test/resources/indexable/Message.1.json' assert {type: 'json'};
-import bookFile from '@openstapps/core/test/resources/indexable/Book.1.json' assert {type: 'json'};
+import book from '@openstapps/core/test/resources/indexable/Book.1.json' assert {type: 'json'};
-
-const message = messageFile.instance as SCMessage;
-const book = bookFile.instance as SCBook;
 
 use(chaiAsPromised);
 
@@ -70,16 +67,7 @@ describe('Elasticsearch', function () {
   const sandbox = sinon.createSandbox();
 
   before(function () {
-    // eslint-disable-next-line no-console
     sandbox.stub(fs, 'readFileSync').returns('{}');
-    sandbox.stub(backendConfig.internal.boostings.default[0], 'fields').value({
-      'academicTerms.acronym': {
-        'SS 2023': 1.05,
-        'WS 2023/24': 1.1,
-        'SoSe 2023': 1.05,
-        'WiSe 2023/24': 1.1,
-      },
-    });
   });
   after(function () {
     sandbox.restore();
@@ -273,7 +261,7 @@ describe('Elasticsearch', function () {
         return expect(es.init()).to.be.rejected;
       });
 
-      it('should setup the monitoring if there is monitoring is set and mail queue is defined', function () {
+      it('should setup the monitoring if there is monitoring is set and mail queue is defined', async function () {
         const config: SCConfigFile = {
           ...backendConfig,
           internal: {
@@ -295,7 +283,7 @@ describe('Elasticsearch', function () {
         const cronSetupStub = sandbox.stub(cron, 'schedule');
 
         const es = new Elasticsearch(config, new MailQueue(getTransport(false) as unknown as SMTP));
-        es.init();
+        await es.init();
 
         expect(cronSetupStub.called).to.be.true;
       });
@@ -449,7 +437,7 @@ describe('Elasticsearch', function () {
           _id: '',
           _index: '',
           _score: 0,
-          _source: message,
+          _source: message.instance as SCMessage,
         };
         sandbox.stub(es.client, 'search').resolves(searchResponse(foundObject));
 
@@ -479,7 +467,7 @@ describe('Elasticsearch', function () {
         const object: SearchHit<SCMessage> = {
           _id: '',
           _index: oldIndex,
-          _source: message,
+          _source: message.instance as SCMessage,
         };
         sandbox.stub(es.client, 'search').resolves(searchResponse<SCMessage>(object));
         sandbox.stub(es, 'prepareBulkWrite').resolves(index);
@@ -493,7 +481,7 @@ describe('Elasticsearch', function () {
         sandbox.stub(es.client, 'create').resolves({result: 'not_found'} as CreateResponse);
 
         await es.init();
-        return expect(es.post(message, bulk)).to.rejectedWith('creation');
+        return expect(es.post(message.instance as SCMessage, bulk)).to.rejectedWith('creation');
       });
 
       it('should create a new object', async function () {
@@ -506,11 +494,11 @@ describe('Elasticsearch', function () {
         });
 
         await es.init();
-        await es.post(message, bulk);
+        await es.post(message.instance as SCMessage, bulk);
 
         expect(createStub.called).to.be.true;
         expect(caughtParameter.document).to.be.eql({
-          ...message,
+          ...message.instance,
           creation_date: caughtParameter.document.creation_date,
         });
       });
@@ -531,7 +519,7 @@ describe('Elasticsearch', function () {
           _id: '',
           _index: getIndex(),
           _score: 0,
-          _source: message,
+          _source: message.instance as SCMessage,
         };
         sandbox.stub(es.client, 'search').resolves(searchResponse());
 
@@ -545,7 +533,7 @@ describe('Elasticsearch', function () {
           _id: '',
           _index: getIndex(),
           _score: 0,
-          _source: message,
+          _source: message.instance as SCMessage,
         };
         sandbox.stub(es.client, 'search').resolves(searchResponse(object));
         // @ts-expect-error unused
@@ -568,13 +556,13 @@ describe('Elasticsearch', function () {
         _id: '123',
         _index: getIndex(),
         _score: 0,
-        _source: message,
+        _source: message.instance as SCMessage,
       };
       const objectBook: SearchHit<SCBook> = {
         _id: '321',
         _index: getIndex(),
         _score: 0,
-        _source: book,
+        _source: book.instance as SCBook,
       };
       const fakeEsAggregations = {
         '@all': {

backend/backend/test/storage/elasticsearch/query.spec.ts

@@ -479,39 +479,18 @@ describe('Query', function () {
     it('should build geo filter for shapes and points', function () {
       const filter = buildFilter(searchFilters.geoPoint);
       const expectedFilter = {
-        bool: {
+        geo_shape: {
-          should: [
+          'geo.polygon': {
-            {
+            relation: undefined,
-              geo_shape: {
+            shape: {
-                'geo.polygon': {
+              type: 'envelope',
-                  relation: undefined,
+              coordinates: [
-                  shape: {
+                [50.123, 8.123],
-                    coordinates: [
+                [50.123, 8.123],
-                      [50.123, 8.123],
+              ],
-                      [50.123, 8.123],
-                    ],
-                    type: 'envelope',
-                  },
-                },
-                'ignore_unmapped': true,
-              },
             },
-            {
+          },
-              geo_shape: {
+          'ignore_unmapped': true,
-                'geo.point': {
-                  relation: undefined,
-                  shape: {
-                    coordinates: [
-                      [50.123, 8.123],
-                      [50.123, 8.123],
-                    ],
-                    type: 'envelope',
-                  },
-                },
-                'ignore_unmapped': true,
-              },
-            },
-          ],
         },
       };
 
@@ -521,39 +500,18 @@ describe('Query', function () {
     it('should build geo filter for shapes only', function () {
       const filter = buildFilter(searchFilters.geoShape);
       const expectedFilter = {
-        bool: {
+        geo_shape: {
-          should: [
+          'geo.polygon': {
-            {
+            relation: 'contains',
-              geo_shape: {
+            shape: {
-                'geo.polygon': {
+              type: 'envelope',
-                  relation: 'contains',
+              coordinates: [
-                  shape: {
+                [50.123, 8.123],
-                    coordinates: [
+                [50.123, 8.123],
-                      [50.123, 8.123],
+              ],
-                      [50.123, 8.123],
-                    ],
-                    type: 'envelope',
-                  },
-                },
-                'ignore_unmapped': true,
-              },
             },
-            {
+          },
-              geo_shape: {
+          'ignore_unmapped': true,
-                'geo.point': {
-                  relation: 'contains',
-                  shape: {
-                    coordinates: [
-                      [50.123, 8.123],
-                      [50.123, 8.123],
-                    ],
-                    type: 'envelope',
-                  },
-                },
-                'ignore_unmapped': true,
-              },
-            },
-          ],
         },
       };
 

backend/backend/tsconfig.json

@@ -2,7 +2,9 @@
   "extends": "@openstapps/tsconfig",
   "compilerOptions": {
     "resolveJsonModule": true,
-    "useUnknownInCatchVariables": false
+    "useUnknownInCatchVariables": false,
+    "allowJs": true,
+    "checkJs": true
   },
-  "exclude": ["lib", "app.js"]
+  "exclude": ["app.js", "lib/"]
 }

backend/database/CHANGELOG.md

@@ -1,11 +1,5 @@
 # @openstapps/database
 
-## 3.2.0
-
-### Patch Changes
-
-- 689ac68b: pin alpine version to 3.18 and add healthchecks
-
 ## 3.0.0
 
 ### Patch Changes

backend/database/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openstapps/database",
-  "version": "3.2.0",
+  "version": "3.0.0",
   "private": true,
   "files": [
     "config",

backend/proxy/bin/run-docker.sh

@@ -1,2 +1,2 @@
 nginx &
-node ./lib/cli.js
+node ./app.js

backend/proxy/config/default.js

@@ -14,9 +14,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-// ESM is not supported, and cts is not detected, so we use type-checked cjs instead.
 /** @type {import('../src/common').ConfigFile} */
-module.exports = {
+const configFile = {
   activeVersions: ['1\\.0\\.\\d+', '2\\.0\\.\\d+'],
   hiddenRoutes: ['/bulk'],
   logFormat: 'default',
@@ -31,3 +30,5 @@ module.exports = {
     dhparam: '/etc/nginx/certs/dhparam.pem',
   },
 };
+
+export default configFile;

backend/proxy/package.json

@@ -46,12 +46,11 @@
     "@types/dockerode": "3.3.17",
     "@types/node": "18.15.3",
     "@types/sha1": "1.1.3",
-    "config": "3.3.9",
     "dockerode": "3.3.5",
     "is-cidr": "4.0.2",
     "mustache": "4.2.0",
-    "semver": "7.6.0",
+    "semver": "7.5.4",
-    "typescript": "5.4.2"
+    "typescript": "5.1.6"
   },
   "devDependencies": {
     "@openstapps/api-cli": "workspace:*",
@@ -59,13 +58,12 @@
     "@openstapps/prettier-config": "workspace:*",
     "@openstapps/tsconfig": "workspace:*",
     "@types/chai": "4.3.5",
-    "@types/config": "3.3.0",
     "@types/dockerode": "3.3.17",
     "@types/mocha": "10.0.1",
     "@types/mustache": "4.2.2",
     "@types/node": "18.15.3",
     "@types/proxyquire": "1.3.28",
-    "@types/semver": "7.5.8",
+    "@types/semver": "7.5.6",
     "@types/sha1": "1.1.3",
     "@types/sinon": "10.0.14",
     "@types/sinon-chai": "3.2.9",
@@ -75,7 +73,7 @@
     "mocha-junit-reporter": "2.2.0",
     "sinon": "15.0.4",
     "sinon-chai": "3.7.0",
-    "ts-node": "10.9.2",
+    "ts-node": "10.9.1",
     "tsup": "6.7.0"
   },
   "tsup": {

backend/proxy/src/common.ts

@@ -14,7 +14,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 import {Logger, SMTP} from '@openstapps/logger';
-import config from 'config';
 import {existsSync} from 'fs';
 
 // set transport on logger
@@ -163,7 +162,7 @@ ssl_stapling_verify on;`;
 /**
  * Config file
  */
-export const configFile: ConfigFile = config.util.toObject();
+export const configFile: ConfigFile = await import('../config/default.js').then(it => it.default);
 
 /**
  * Check if path is a specific file type

backend/proxy/tsconfig.json

@@ -1,4 +1,4 @@
 {
   "extends": "@openstapps/tsconfig",
-  "exclude": ["config", "lib", "app.js"]
+  "exclude": ["./config/", "./lib/"]
 }

configuration/eslint-config/copyright-header-rule.js

@@ -1,3 +1,4 @@
+// @ts-check
 const fs = require("fs");
 const path = require("node:path");
 const child_process = require("child_process");

configuration/eslint-config/copyright-header-rule.spec.js

@@ -1,3 +1,4 @@
+// @ts-check
 "use strict"
 
 const rule = require('./copyright-header-rule')

configuration/eslint-config/index.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 /** @type {import('eslint').Linter.Config} */
 const config = {
   root: true,

configuration/eslint-config/package.json

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

configuration/prettier-config/CHANGELOG.md

@@ -1,11 +1,5 @@
 # @openstapps/prettier-config
 
-## 3.2.0
-
-### Patch Changes
-
-- dbb55850: Update Prettier to 3.1.1
-
 ## 3.0.0
 
 ### Major Changes
@@ -36,7 +30,7 @@
 
   ```js
   #!/usr/bin/env node
-  import "./lib/app.js";
+  import './lib/app.js';
   ```
 
 - 64caebaf: Migrate to ESM
@@ -75,14 +69,11 @@
 - 64caebaf: Migrated changelogs to changeset format
 
   ```js
-  import fs from "fs";
+  import fs from 'fs';
 
-  const path = "packages/logger/CHANGELOG.md";
+  const path = 'packages/logger/CHANGELOG.md';
 
-  fs.writeFileSync(
+  fs.writeFileSync(path, fs.readFileSync(path, 'utf8').replace(/^#+\s+\[/gm, '## ['));
-    path,
-    fs.readFileSync(path, "utf8").replace(/^#+\s+\[/gm, "## ["),
-  );
   ```
 
 - 98546a97: Migrate away from @openstapps/configuration
@@ -124,7 +115,7 @@
 
   ```js
   #!/usr/bin/env node
-  import "./lib/app.js";
+  import './lib/app.js';
   ```
 
 - 64caebaf: Migrate to ESM
@@ -163,14 +154,11 @@
 - 64caebaf: Migrated changelogs to changeset format
 
   ```js
-  import fs from "fs";
+  import fs from 'fs';
 
-  const path = "packages/logger/CHANGELOG.md";
+  const path = 'packages/logger/CHANGELOG.md';
 
-  fs.writeFileSync(
+  fs.writeFileSync(path, fs.readFileSync(path, 'utf8').replace(/^#+\s+\[/gm, '## ['));
-    path,
-    fs.readFileSync(path, "utf8").replace(/^#+\s+\[/gm, "## ["),
-  );
   ```
 
 - 98546a97: Migrate away from @openstapps/configuration

configuration/prettier-config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/prettier-config",
   "description": "StApps Prettier Config",
-  "version": "3.2.0",
+  "version": "3.0.0",
   "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/prettier-config.git",
@@ -19,9 +19,9 @@
     "test": "prettier --config index.js --check \"test/*.js\""
   },
   "devDependencies": {
-    "prettier": "3.1.1"
+    "prettier": "3.1.0"
   },
   "peerDependencies": {
-    "prettier": "3.1.1"
+    "prettier": "3.1.0"
   }
 }

configuration/projectmanagement/package.json

@@ -43,8 +43,8 @@
     "@openstapps/logger": "workspace:*",
     "@slack/web-api": "6.8.1",
     "commander": "10.0.0",
-    "date-fns": "3.6.0",
+    "date-fns": "2.30.0",
-    "glob": "10.3.10",
+    "glob": "10.2.7",
     "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.1.0",
+    "@types/glob": "8.0.1",
     "@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.2",
+    "ts-node": "10.9.1",
     "tsup": "6.7.0",
-    "typescript": "5.4.2"
+    "typescript": "5.1.6"
   },
   "tsup": {
     "entry": [

configuration/projectmanagement/tsconfig.json

@@ -1,4 +1,3 @@
 {
-  "extends": "@openstapps/tsconfig",
+  "extends": "@openstapps/tsconfig"
-  "exclude": ["lib", "app.js"]
 }

configuration/tsconfig/CHANGELOG.md

@@ -1,11 +1,5 @@
 # @openstapps/tsconfig
 
-## 3.3.0
-
-### Minor Changes
-
-- 688bc5f2: v3.3.0 changes
-
 ## 3.0.0
 
 ### Major Changes
@@ -36,7 +30,7 @@
 
   ```js
   #!/usr/bin/env node
-  import "./lib/app.js";
+  import './lib/app.js';
   ```
 
 - 64caebaf: Migrate to ESM
@@ -111,7 +105,7 @@
 
   ```js
   #!/usr/bin/env node
-  import "./lib/app.js";
+  import './lib/app.js';
   ```
 
 - 64caebaf: Migrate to ESM

configuration/tsconfig/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/tsconfig",
   "description": "The tsconfig for the openstapps project",
-  "version": "3.3.0",
+  "version": "3.0.0",
   "type": "commonjs",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/eslint-config.git",

configuration/tsconfig/tsconfig.json

@@ -14,26 +14,19 @@
     "noFallthroughCasesInSwitch": true,
     "isolatedModules": true,
     "allowJs": true,
-    "checkJs": true,
     "resolveJsonModule": true,
     "allowSyntheticDefaultImports": true,
     "noImplicitAny": true,
     "noImplicitReturns": true,
-    "noUnusedLocals": false,
+    "noUnusedLocals": true,
-    "noUnusedParameters": false,
+    "noUnusedParameters": true,
     "outDir": "../../../lib/",
-    "lib": [
+    "lib": ["ES2022", "DOM"],
-      "ES2022",
-      "DOM"
-    ],
     "strict": true,
     "target": "ES2022"
   },
   "ts-node": {
     "transpileOnly": true
   },
-  "exclude": [
+  "exclude": ["../../../app.js", "../../../lib/"]
-    "../../../app.js",
-    "../../../lib/"
-  ]
 }

examples/minimal-connector/CHANGELOG.md

@@ -1,23 +1,5 @@
 # @openstapps/minimal-connector
 
-## 3.3.0
-
-### Patch Changes
-
-- Updated dependencies [688bc5f2]
-  - @openstapps/api@3.3.0
-  - @openstapps/core@3.3.0
-  - @openstapps/logger@3.0.0
-
-## 3.2.0
-
-### Patch Changes
-
-- Updated dependencies [912ae422]
-  - @openstapps/core@3.2.0
-  - @openstapps/api@3.2.0
-  - @openstapps/logger@3.0.0
-
 ## 3.1.1
 
 ### Patch Changes

examples/minimal-connector/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/minimal-connector",
   "description": "This is a minimal connector which serves as an example",
-  "version": "3.3.0",
+  "version": "3.1.1",
   "private": true,
   "type": "module",
   "license": "GPL-3.0-only",
@@ -53,9 +53,9 @@
     "mocha": "10.2.0",
     "mocha-junit-reporter": "2.2.0",
     "nock": "13.3.1",
-    "ts-node": "10.9.2",
+    "ts-node": "10.9.1",
     "tsup": "6.7.0",
-    "typescript": "5.4.2"
+    "typescript": "5.1.6"
   },
   "tsup": {
     "entry": [

examples/minimal-connector/tsconfig.json

@@ -1,4 +1,3 @@
 {
-  "extends": "@openstapps/tsconfig",
+  "extends": "@openstapps/tsconfig"
-  "exclude": ["lib", "app.js"]
 }

examples/minimal-deployment/docker-compose.yml

@@ -1,62 +1,44 @@
 version: '3.7'
-
-x-development-variables: &development-variables
-  NODE_ENV: "development"
-  ALLOW_NO_TRANSPORT: "true"
-
 services:
   database:
-    image: registry.gitlab.com/openstapps/openstapps/database:3.0.0
+    image: registry.gitlab.com/openstapps/openstapps/database:2.0.0
-    # If you need persistence for debugging purposes uncomment the following lines
+    volumes:
-    #volumes:
+      - ./database:/usr/share/elasticsearch/data
-    #  - ./database:/usr/share/elasticsearch/data
     expose:
-      - 9200
+      - "9200"
-    ports:
-      - 127.0.0.1:9200:9200
-    environment:
-      - bootstrap.memory_lock=true
-      - "ES_JAVA_OPTS=-Xms2g -Xmx2g"
-      - discovery.type=single-node
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
     restart: unless-stopped
 
   backend:
-    image: registry.gitlab.com/openstapps/openstapps/backend:3.1.0
+    image: registry.gitlab.com/openstapps/openstapps/backend:3.0.0-next.0
     environment:
-      <<: *development-variables
       ES_ADDR: "http://database:9200"
       NODE_CONFIG_ENV: "elasticsearch"
-      NODE_APP_INSTANCE: "f-u"
+      ALLOW_NO_TRANSPORT: "true"
-      PROMETHEUS_MIDDLEWARE: "false"
     expose:
       - 3000
     ports:
-      - 127.0.0.1:3000:3000
+      - 3000:3000
+    links:
+      - "database"
     labels:
-      - stapps.version=4.1.0
+      - stapps.version=1.0.0
     restart: unless-stopped
     depends_on:
       - database
+
+  api:
+    image: registry.gitlab.com/openstapps/openstapps/api:3.0.0-next.0
     links:
-      - database
+      - "backend"
 
-  # api:
+  minimal-connector:
-  #   image: registry.gitlab.com/openstapps/openstapps/api:3.0.0
+    image: registry.gitlab.com/openstapps/minimal-connector:core-0.23
-  #   links:
+    container_name: minimal-connector-0.23
-  #     - backend
+    command: ["http://backend:3000", "minimal-connector", "f-u"]
 
-  # minimal-connector:
+  app:
-  #   image: registry.gitlab.com/openstapps/minimal-connector:core-0.23
+    image: registry.gitlab.com/openstapps/app/executable:core-0.23
-  #   container_name: minimal-connector-0.23
+    expose:
-  #   command: ["http://backend:3000", "minimal-connector", "f-u"]
+      - 8100
-
+    ports:
-  # app:
+      - 8100:8100
-  #   image: registry.gitlab.com/openstapps/app/executable:core-0.23
-  #   expose:
-  #     - 8100
-  #   ports:
-  #     - 8100:8100

examples/minimal-plugin/CHANGELOG.md

@@ -1,27 +1,5 @@
 # @openstapps/minimal-plugin
 
-## 3.3.0
-
-### Patch Changes
-
-- Updated dependencies [688bc5f2]
-  - @openstapps/api@3.3.0
-  - @openstapps/core@3.3.0
-  - @openstapps/api-plugin@3.3.0
-  - @openstapps/core-tools@3.3.0
-  - @openstapps/logger@3.0.0
-
-## 3.2.0
-
-### Patch Changes
-
-- Updated dependencies [912ae422]
-  - @openstapps/core@3.2.0
-  - @openstapps/api@3.2.0
-  - @openstapps/api-plugin@3.2.0
-  - @openstapps/core-tools@3.0.0
-  - @openstapps/logger@3.0.0
-
 ## 3.1.1
 
 ### Patch Changes

examples/minimal-plugin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/minimal-plugin",
   "description": "Minimal Plugin",
-  "version": "3.3.0",
+  "version": "3.1.1",
   "private": true,
   "type": "module",
   "license": "GPL-3.0-only",
@@ -35,7 +35,7 @@
     "@openstapps/logger": "workspace:*",
     "commander": "10.0.0",
     "express": "4.18.2",
-    "ts-node": "10.9.2"
+    "ts-node": "10.9.1"
   },
   "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.4.2"
+    "typescript": "5.1.6"
   },
   "tsup": {
     "entry": [

examples/minimal-plugin/tsconfig.json

@@ -1,4 +1,3 @@
 {
-  "extends": "@openstapps/tsconfig",
+  "extends": "@openstapps/tsconfig"
-  "exclude": ["lib", "app.js"]
 }

flake.lock

@@ -1,30 +1,12 @@
 {
   "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1709126324,
-        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709747860,
+        "lastModified": 1701626906,
-        "narHash": "sha256-RT4zuBy579m+l8VyIQFOR66WXfcs4g1jntZUHjh6eoI=",
+        "narHash": "sha256-ugr1QyzzwNk505ICE4VMQzonHQ9QS5W33xF2FXzFQ00=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "58ae79ea707579c40102ddf62d84b902a987c58b",
+        "rev": "0c6d8c783336a59f4c59d4a6daed6ab269c4b361",
         "type": "github"
       },
       "original": {
@@ -36,24 +18,8 @@
     },
     "root": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -1,71 +1,77 @@
 {
   description = "A Nix-flake-based development environment for OpenStApps";
-  inputs = {
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+  outputs = { self, nixpkgs }:
-    flake-utils.url = "github:numtide/flake-utils";
+    let
-  };
+      buildToolsVersion = "30.0.3";
-  outputs = {
+      overlays = [
-    self,
+        (final: prev: rec {
-    nixpkgs,
+          nodejs = prev.nodejs-18_x;
-    flake-utils,
+          pnpm = prev.nodePackages.pnpm;
-  }: let
+          chrome = prev.google-chrome;
-    aapt2buildToolsVersion = "33.0.2";
+          firefox = prev.firefox;
-  in
+          webkit = prev.epiphany; # Safari-ish browser
-    flake-utils.lib.eachDefaultSystem (system: let
+          android = prev.androidenv.composeAndroidPackages {
-      pkgs = import nixpkgs {
+            buildToolsVersions = [ "${buildToolsVersion}" ];
-        inherit system;
+            platformVersions = [ "33" ];
-        overlays = [
+          };
-          (final: prev: rec {
+          cypress = prev.cypress.overrideAttrs(cyPrev: rec {
-            fontMin = prev.python311.withPackages (ps: with ps; [brotli fonttools] ++ (with fonttools.optional-dependencies; [woff]));
+            version = "13.2.0";
-            android = prev.androidenv.composeAndroidPackages {
+            src = prev.fetchzip {
-              buildToolsVersions = ["30.0.3" aapt2buildToolsVersion];
+              url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
-              platformVersions = ["33"];
+              hash = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM=";
             };
-            cypress = prev.cypress.overrideAttrs (cyPrev: rec {
+          });
-              version = "13.2.0";
+        })
-              src = prev.fetchzip {
+      ];
-                url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
+      # TODO: aarch64-linux, x68_64-darwin, aarch64-darwin
-                hash = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM=";
+      supportedSystems = [ "x86_64-linux" ];
-              };
+      forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
-            });
+        pkgs = import nixpkgs {
-            nodejs = prev.nodejs_18;
+          inherit overlays system;
-          })
+          config = {
-        ];
+            allowUnfree = true;
-        config = {
+            android_sdk.accept_license = true;
-          allowUnfree = true;
+          };
-          android_sdk.accept_license = true;
         };
-      };
+      });
-      androidFhs = pkgs.buildFHSUserEnv {
+    in
-        name = "android-env";
+    {
-        targetPkgs = pkgs: with pkgs; [];
+      devShells = forEachSupportedSystem ({ pkgs }:
-        runScript = "bash";
+      let
-        profile = ''
+        python = (pkgs.python311.withPackages(ps: with ps; [ brotli fonttools ] ++ (with fonttools.optional-dependencies; [ ufo lxml unicode woff ])));
-          export ALLOW_NINJA_ENV=true
+      in
-          export USE_CCACHE=1
+      {
-          export LD_LIBRARY_PATH=/usr/lib:/usr/lib32
+        default = (pkgs.buildFHSUserEnv {
-        '';
+          name = "StApps Dev";
-      };
+          targetPkgs = pkgs: with pkgs; [
-    in {
+            nodejs
-      devShell = pkgs.mkShell rec {
+            pnpm
-        nativeBuildInputs = [androidFhs];
+            python
-        buildInputs = with pkgs; [
+            docker
-          nodejs
+            # tools
-          corepack
+            curl
-          # tools
+            jq
-          curl
+            # browsers
-          jq
+            firefox
-          fontMin
+            chrome
-          cypress
+            webkit
-          # android
+            cypress
-          jdk17
+            # android
-          android.androidsdk
+            jdk17
-        ];
+            android.androidsdk
-        ANDROID_JAVA_HOME = "${pkgs.jdk.home}";
+            musl
-        ANDROID_SDK_ROOT = "${pkgs.android.androidsdk}/libexec/android-sdk";
+          ];
-        GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${aapt2buildToolsVersion}/aapt2";
+          runScript = "bash";
-        CYPRESS_INSTALL_BINARY = "0";
+          profile = ''
-        CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
+            export CYPRESS_INSTALL_BINARY=0
-      };
+            export CYPRESS_RUN_BINARY=${pkgs.cypress}/bin/Cypress
-    });
+            export ANDROID_SDK_ROOT=${pkgs.android.androidsdk}/libexec/android-sdk
+            export ANDROID_JAVA_HOME=${pkgs.jdk.home}
+            export DOCKER_HOST=unix:///run/user/1000/docker.sock
+            { dockerd-rootless & } 2>/dev/null
+          '';
+        }).env;
+      });
+    };
 }

frontend/app/.browserslistrc

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

frontend/app/CHANGELOG.md

@@ -1,28 +1,5 @@
 # @openstapps/app
 
-## 3.3.0
-
-### Minor Changes
-
-- 688bc5f2: v3.3.0 changes
-
-### Patch Changes
-
-- Updated dependencies [688bc5f2]
-  - @openstapps/api@3.2.0
-  - @openstapps/core@3.2.0
-  - @openstapps/collection-utils@3.0.0
-
-## 3.2.0
-
-### Patch Changes
-
-- 689ac68b: pin alpine version to 3.18 and add healthchecks
-- Updated dependencies [912ae422]
-  - @openstapps/core@4.0.0
-  - @openstapps/api@4.0.0
-  - @openstapps/collection-utils@3.0.0
-
 ## 3.1.2
 
 ### Patch Changes

frontend/app/ICONS.md

@@ -50,11 +50,11 @@ the config file.
 Icon font minification is done automatically, but requires you to
 follow a few simple rules:
 
-1. Use the type-safe proxy for referencing icon names in
+1. Use the tagged template literal for referencing icon names in
    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/README.md

@@ -13,25 +13,25 @@ The StApps 1.x.x (legacy app, but current app in stores) is written using Ionic
 
 There are (`npm`) scripts defined to get the app running as quickly as possible. Those scripts (shortcuts for docker commands) are called using the syntax `npm run + <script-name>`. So we have the following commands available:
 
-```sh
+```
 npm run docker:pull
 ```
 
 which pulls the up-to-date image ([Dockerfile](Dockerfile)) which contains all the tools needed for building, serving and deploying the app.
 
-```sh
+```
 npm run docker:enter
 ```
 
 which enters the container on docker builder image, where we can run `npm install` (to install the required npm packages) and `npm build` (to build the app: convert into executable files), but also any other arbitrary commands with the tools available in the docker image.
 
-```sh
+```
 npm run docker:build
 ```
 
 which runs `npm install` (to install the required npm packages) and `npm build` (to build the app: convert into executable files) in the docker container which runs on the docker builder image.
 
-```sh
+```
 npm run docker:serve
 ```
 
@@ -39,7 +39,7 @@ which serves the app for running it in the browser. It basically runs `ionic ser
 
 ## How to build and start the app using the default backend?
 
-```sh
+```
 npm run build
 npm run start
 ```
@@ -86,98 +86,52 @@ addToIonicDB(
 
 You'll need to run _Chromium_ using
 
-```sh
+```shell
 pnpm chromium:no-cors
 ```
 
 ### Help, I can't log in!
 
 Login services will often block hosts not coming from the production
-server.
+server. You can circumvent this locally by using the `:virtual-host`
+scripts:
 
-#### Web
+```shell
-
-On the web you can circumvent this locally by using the `:virtual-host` scripts:
-
-```sh
 # Start the dev server on mobile.app.uni-frankfurt.de
 pnpm start:virtual-host
 # Run chromium with flags that redirect mobile.app.uni-frankfurt.de to localhost:8100
 pnpm chromium:virtual-host
 ```
 
-#### Android
-
-On Android you will need to change the `custom_url_scheme` values
-to `de.unifrankfurt.app` in the following files:
-
-- `android/app/src/main/res/values/strings.xml`
-- `src/environment/environment.ts`
-
-Then start the app normally as you would
-
-```sh
-pnpm run:android
-```
-
-**This alone will not make auth work**, only the login flow.
-
-If you need to test login, you have to disable live reload:
-
-```sh
-pnpm ionic capacitor run android
-```
-
-_**CAUTION:** a remote chrome debugging session can in some
-cases hijack the device's ADB connection. If the connection
-fails for no obvious reason, close chrome and uninstall the
-app, then try again._
-
-#### iOS
-
-On Android you will need to change the `custom_url_scheme` value in
-`src/environment/environment.ts` as well as the `CFBundleURLTypes`
-in `ios/App/App/Info.plist`.
-
-- make sure to remove any `Info.plist.orig` as capacitor might override
-  the modified `Info.plist` with that.
-- make sure you have a valid device in XCode (Simulator or real device).
-
-After that, run
-
-```sh
-pnpm run:ios
-```
-
 ### Running the app
 
 Install the npm packages needed for running the app (as for any other node project which uses npm):
 
-```sh
+```
 npm install
 ```
 
 Check the code for linter issues:
 
-```sh
+```
 npm run lint
 ```
 
 Automatically fix linter issues (those where autofix is possible):
 
-```sh
+```
 npm run lint:fix
 ```
 
 Build the app (transpile etc.):
 
-```sh
+```
 npm run build
 ```
 
 Open the app in the browser:
 
-```sh
+```
 ionic serve
 ```
 
@@ -185,7 +139,7 @@ ionic serve
 
 Run the app for testing on an android device (with live reload in the webview / device, when files are changed):
 
-```sh
+```
 npm run build # if needed
 npm run resources:android # generate needed resources (icons and splashscreens)
 npm run docker:run:android # runs "ionic capacitor run android --livereload --external" on a selected device
@@ -205,7 +159,7 @@ Besides that, it is possible to monitor processes (and so the processes related
 
 Build the (debug) app for testing on an android device (creates an APK file in the android's build outputs path):
 
-```sh
+```
 npm run docker:build:android
 ```
 
@@ -215,13 +169,13 @@ The mentioned `docker:*:android` npm commands are executed in a docker container
 
 Execute unit tests:
 
-```sh
+```
 npm test
 ```
 
 Execute e2e tests:
 
-```sh
+```
 npm run e2e
 ```
 

frontend/app/android/app/capacitor.build.gradle

@@ -9,7 +9,6 @@ android {
 
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
-    implementation project(':capacitor-community-screen-brightness')
     implementation project(':capacitor-app')
     implementation project(':capacitor-browser')
     implementation project(':capacitor-clipboard')
@@ -22,7 +21,6 @@ dependencies {
     implementation project(':capacitor-local-notifications')
     implementation project(':capacitor-network')
     implementation project(':capacitor-preferences')
-    implementation project(':capacitor-screen-orientation')
     implementation project(':capacitor-share')
     implementation project(':capacitor-splash-screen')
     implementation project(':transistorsoft-capacitor-background-fetch')

frontend/app/android/app/src/main/assets/capacitor.plugins.json

@@ -1,8 +1,4 @@
 [
-	{
-		"pkg": "@capacitor-community/screen-brightness",
-		"classpath": "com.elylucas.capscreenbrightness.ScreenBrightnessPlugin"
-	},
 	{
 		"pkg": "@capacitor/app",
 		"classpath": "com.capacitorjs.plugins.app.AppPlugin"
@@ -51,10 +47,6 @@
 		"pkg": "@capacitor/preferences",
 		"classpath": "com.capacitorjs.plugins.preferences.PreferencesPlugin"
 	},
-	{
-		"pkg": "@capacitor/screen-orientation",
-		"classpath": "com.capacitorjs.plugins.screenorientation.ScreenOrientationPlugin"
-	},
 	{
 		"pkg": "@capacitor/share",
 		"classpath": "com.capacitorjs.plugins.share.SharePlugin"

frontend/app/android/capacitor.settings.gradle

@@ -1,57 +1,51 @@
 // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 include ':capacitor-android'
-project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@5.7.3_@capacitor+core@5.7.3/node_modules/@capacitor/android/capacitor')
+project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/android/capacitor')
-
-include ':capacitor-community-screen-brightness'
-project(':capacitor-community-screen-brightness').projectDir = new File('../../../node_modules/.pnpm/@capacitor-community+screen-brightness@6.0.0_@capacitor+core@5.7.3/node_modules/@capacitor-community/screen-brightness/android')
 
 include ':capacitor-app'
-project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/app/android')
+project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/app/android')
 
 include ':capacitor-browser'
-project(':capacitor-browser').projectDir = new File('../../../node_modules/.pnpm/@capacitor+browser@5.2.0_@capacitor+core@5.7.3/node_modules/@capacitor/browser/android')
+project(':capacitor-browser').projectDir = new File('../../../node_modules/.pnpm/@capacitor+browser@5.1.0_@capacitor+core@5.5.0/node_modules/@capacitor/browser/android')
 
 include ':capacitor-clipboard'
-project(':capacitor-clipboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+clipboard@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/clipboard/android')
+project(':capacitor-clipboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+clipboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/clipboard/android')
 
 include ':capacitor-device'
-project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/device/android')
+project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/device/android')
 
 include ':capacitor-dialog'
-project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/@capacitor+dialog@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/dialog/android')
+project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/@capacitor+dialog@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/dialog/android')
 
 include ':capacitor-filesystem'
-project(':capacitor-filesystem').projectDir = new File('../../../node_modules/.pnpm/@capacitor+filesystem@5.2.1_@capacitor+core@5.7.3/node_modules/@capacitor/filesystem/android')
+project(':capacitor-filesystem').projectDir = new File('../../../node_modules/.pnpm/@capacitor+filesystem@5.1.4_@capacitor+core@5.5.0/node_modules/@capacitor/filesystem/android')
 
 include ':capacitor-geolocation'
-project(':capacitor-geolocation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+geolocation@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/geolocation/android')
+project(':capacitor-geolocation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+geolocation@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/geolocation/android')
 
 include ':capacitor-haptics'
-project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/haptics/android')
+project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/haptics/android')
 
 include ':capacitor-keyboard'
-project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+keyboard@5.0.8_@capacitor+core@5.7.3/node_modules/@capacitor/keyboard/android')
+project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+keyboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/keyboard/android')
 
 include ':capacitor-local-notifications'
-project(':capacitor-local-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+local-notifications@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/local-notifications/android')
+project(':capacitor-local-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+local-notifications@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/local-notifications/android')
 
 include ':capacitor-network'
-project(':capacitor-network').projectDir = new File('../../../node_modules/.pnpm/@capacitor+network@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/network/android')
+project(':capacitor-network').projectDir = new File('../../../node_modules/.pnpm/@capacitor+network@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/network/android')
 
 include ':capacitor-preferences'
-project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/preferences/android')
+project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/preferences/android')
-
-include ':capacitor-screen-orientation'
-project(':capacitor-screen-orientation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.0_@capacitor+core@5.7.3/node_modules/@capacitor/screen-orientation/android')
 
 include ':capacitor-share'
-project(':capacitor-share').projectDir = new File('../../../node_modules/.pnpm/@capacitor+share@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/share/android')
+project(':capacitor-share').projectDir = new File('../../../node_modules/.pnpm/@capacitor+share@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/share/android')
 
 include ':capacitor-splash-screen'
-project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/splash-screen/android')
+project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/splash-screen/android')
 
 include ':transistorsoft-capacitor-background-fetch'
-project(':transistorsoft-capacitor-background-fetch').projectDir = new File('../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.2.0_@capacitor+core@5.7.3/node_modules/@transistorsoft/capacitor-background-fetch/android')
+project(':transistorsoft-capacitor-background-fetch').projectDir = new File('../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.1.1_@capacitor+core@5.5.0/node_modules/@transistorsoft/capacitor-background-fetch/android')
 
 include ':capacitor-secure-storage-plugin'
-project(':capacitor-secure-storage-plugin').projectDir = new File('../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@5.7.3/node_modules/capacitor-secure-storage-plugin/android')
+project(':capacitor-secure-storage-plugin').projectDir = new File('../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@5.5.0/node_modules/capacitor-secure-storage-plugin/android')

frontend/app/angular.json

@@ -21,13 +21,10 @@
             "allowedCommonJsDependencies": [
               "moment",
               "opening_hours",
-              "localforage",
+              "leaflet",
-              "i18next",
+              "leaflet.markercluster",
-              "semver",
+              "localforge",
-              "suncalc",
+              "guid-typescript"
-              "guid-typescript",
-              "fast-deep-equal",
-              "maplibre-gl"
             ],
             "aot": true,
             "assets": [
@@ -35,13 +32,24 @@
                 "glob": "**/*",
                 "input": "src/assets",
                 "output": "assets"
+              },
+              {
+                "glob": "**/*",
+                "input": "./node_modules/leaflet/dist/images",
+                "output": "assets/"
               }
             ],
             "styles": [
+              {
+                "input": "src/theme/variables.scss",
+                "inject": true
+              },
               {
                 "input": "src/global.scss",
                 "inject": true
-              }
+              },
+              "./node_modules/leaflet/dist/leaflet.css",
+              "./node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css"
             ]
           },
           "configurations": {
@@ -89,20 +97,20 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "buildTarget": "app:build"
+            "browserTarget": "app:build"
           },
           "configurations": {
             "production": {
-              "buildTarget": "app:build:production"
+              "browserTarget": "app:build:production"
             },
             "development": {
-              "buildTarget": "app:build:development"
+              "browserTarget": "app:build:development"
             },
             "ci": {
-              "buildTarget": "app:build"
+              "browserTarget": "app:build"
             },
             "fake": {
-              "buildTarget": "app:build:fake"
+              "browserTarget": "app:build:fake"
             }
           },
           "defaultConfiguration": "development"
@@ -124,6 +132,11 @@
                 "glob": "**/*",
                 "input": "src/assets",
                 "output": "/assets"
+              },
+              {
+                "glob": "**/*",
+                "input": "./node_modules/leaflet/dist/images",
+                "output": "assets/"
               }
             ]
           }

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('include', '/search');
+      cy.url().should('eq', Cypress.config().baseUrl + '/search');
       cy.get('ion-searchbar').should('not.have.value');
       cy.get('ion-searchbar input.searchbar-input').should('have.focus');
 

frontend/app/icons.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
@@ -12,7 +13,6 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-
 /** @type {import('./scripts/icon-config').IconConfig} */
 const config = {
   inputPath: 'node_modules/material-symbols/material-symbols-rounded.woff2',
@@ -38,6 +38,10 @@ const config = {
       'work',
     ],
   },
+  codePoints: {
+    ios_share: 'e6b8',
+    fact_check: 'f0c5',
+  },
 };
 
 export default config;

frontend/app/ios/App/Podfile

@@ -1,4 +1,4 @@
-require_relative '../../../../node_modules/.pnpm/@capacitor+ios@5.7.3_@capacitor+core@5.7.3/node_modules/@capacitor/ios/scripts/pods_helpers'
+require_relative '../../../../node_modules/.pnpm/@capacitor+ios@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/ios/scripts/pods_helpers'
 
 platform :ios, '13.0'
 use_frameworks!
@@ -9,26 +9,24 @@ use_frameworks!
 install! 'cocoapods', :disable_input_output_paths => true
 
 def capacitor_pods
-  pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@5.7.3_@capacitor+core@5.7.3/node_modules/@capacitor/ios'
+  pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/ios'
-  pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@5.7.3_@capacitor+core@5.7.3/node_modules/@capacitor/ios'
+  pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/ios'
-  pod 'CapacitorCommunityScreenBrightness', :path => '../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@6.0.0_@capacitor+core@5.7.3/node_modules/@capacitor-community/screen-brightness'
+  pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@capacitor+app@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/app'
-  pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@capacitor+app@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/app'
+  pod 'CapacitorBrowser', :path => '../../../../node_modules/.pnpm/@capacitor+browser@5.1.0_@capacitor+core@5.5.0/node_modules/@capacitor/browser'
-  pod 'CapacitorBrowser', :path => '../../../../node_modules/.pnpm/@capacitor+browser@5.2.0_@capacitor+core@5.7.3/node_modules/@capacitor/browser'
+  pod 'CapacitorClipboard', :path => '../../../../node_modules/.pnpm/@capacitor+clipboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/clipboard'
-  pod 'CapacitorClipboard', :path => '../../../../node_modules/.pnpm/@capacitor+clipboard@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/clipboard'
+  pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@capacitor+device@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/device'
-  pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@capacitor+device@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/device'
+  pod 'CapacitorDialog', :path => '../../../../node_modules/.pnpm/@capacitor+dialog@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/dialog'
-  pod 'CapacitorDialog', :path => '../../../../node_modules/.pnpm/@capacitor+dialog@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/dialog'
+  pod 'CapacitorFilesystem', :path => '../../../../node_modules/.pnpm/@capacitor+filesystem@5.1.4_@capacitor+core@5.5.0/node_modules/@capacitor/filesystem'
-  pod 'CapacitorFilesystem', :path => '../../../../node_modules/.pnpm/@capacitor+filesystem@5.2.1_@capacitor+core@5.7.3/node_modules/@capacitor/filesystem'
+  pod 'CapacitorGeolocation', :path => '../../../../node_modules/.pnpm/@capacitor+geolocation@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/geolocation'
-  pod 'CapacitorGeolocation', :path => '../../../../node_modules/.pnpm/@capacitor+geolocation@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/geolocation'
+  pod 'CapacitorHaptics', :path => '../../../../node_modules/.pnpm/@capacitor+haptics@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/haptics'
-  pod 'CapacitorHaptics', :path => '../../../../node_modules/.pnpm/@capacitor+haptics@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/haptics'
+  pod 'CapacitorKeyboard', :path => '../../../../node_modules/.pnpm/@capacitor+keyboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/keyboard'
-  pod 'CapacitorKeyboard', :path => '../../../../node_modules/.pnpm/@capacitor+keyboard@5.0.8_@capacitor+core@5.7.3/node_modules/@capacitor/keyboard'
+  pod 'CapacitorLocalNotifications', :path => '../../../../node_modules/.pnpm/@capacitor+local-notifications@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/local-notifications'
-  pod 'CapacitorLocalNotifications', :path => '../../../../node_modules/.pnpm/@capacitor+local-notifications@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/local-notifications'
+  pod 'CapacitorNetwork', :path => '../../../../node_modules/.pnpm/@capacitor+network@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/network'
-  pod 'CapacitorNetwork', :path => '../../../../node_modules/.pnpm/@capacitor+network@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/network'
+  pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/preferences'
-  pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/preferences'
+  pod 'CapacitorShare', :path => '../../../../node_modules/.pnpm/@capacitor+share@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/share'
-  pod 'CapacitorScreenOrientation', :path => '../../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.0_@capacitor+core@5.7.3/node_modules/@capacitor/screen-orientation'
+  pod 'CapacitorSplashScreen', :path => '../../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/splash-screen'
-  pod 'CapacitorShare', :path => '../../../../node_modules/.pnpm/@capacitor+share@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/share'
+  pod 'TransistorsoftCapacitorBackgroundFetch', :path => '../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@1.0.2_@capacitor+core@5.5.0/node_modules/@transistorsoft/capacitor-background-fetch'
-  pod 'CapacitorSplashScreen', :path => '../../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/splash-screen'
+  pod 'CapacitorSecureStoragePlugin', :path => '../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@5.5.0/node_modules/capacitor-secure-storage-plugin'
-  pod 'TransistorsoftCapacitorBackgroundFetch', :path => '../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.2.0_@capacitor+core@5.7.3/node_modules/@transistorsoft/capacitor-background-fetch'
-  pod 'CapacitorSecureStoragePlugin', :path => '../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@5.7.3/node_modules/capacitor-secure-storage-plugin'
   pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
 end
 

frontend/app/ios/App/Podfile.lock

@@ -36,7 +36,7 @@ PODS:
   - CordovaPlugins (5.5.0):
     - CapacitorCordova
   - SwiftKeychainWrapper (4.0.1)
-  - TransistorsoftCapacitorBackgroundFetch (5.1.1):
+  - TransistorsoftCapacitorBackgroundFetch (1.0.2):
     - Capacitor
 
 DEPENDENCIES:
@@ -58,7 +58,7 @@ DEPENDENCIES:
   - "CapacitorShare (from `../../../../node_modules/.pnpm/@capacitor+share@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/share`)"
   - "CapacitorSplashScreen (from `../../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/splash-screen`)"
   - CordovaPlugins (from `../capacitor-cordova-ios-plugins`)
-  - "TransistorsoftCapacitorBackgroundFetch (from `../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.1.1_@capacitor+core@5.5.0/node_modules/@transistorsoft/capacitor-background-fetch`)"
+  - "TransistorsoftCapacitorBackgroundFetch (from `../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@1.0.2_@capacitor+core@5.5.0/node_modules/@transistorsoft/capacitor-background-fetch`)"
 
 SPEC REPOS:
   trunk:
@@ -102,7 +102,7 @@ EXTERNAL SOURCES:
   CordovaPlugins:
     :path: "../capacitor-cordova-ios-plugins"
   TransistorsoftCapacitorBackgroundFetch:
-    :path: "../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.1.1_@capacitor+core@5.5.0/node_modules/@transistorsoft/capacitor-background-fetch"
+    :path: "../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@1.0.2_@capacitor+core@5.5.0/node_modules/@transistorsoft/capacitor-background-fetch"
 
 SPEC CHECKSUMS:
   Capacitor: 57890b363df14d5d2d5d8461aa23e886cb34da2a
@@ -124,8 +124,8 @@ SPEC CHECKSUMS:
   CapacitorSplashScreen: 5fa2ab5e46cf5cc530cf16a51c80c7a986579ccd
   CordovaPlugins: de5669381702d76ed5b1d442177a6a5fc3252a9d
   SwiftKeychainWrapper: 807ba1d63c33a7d0613288512399cd1eda1e470c
-  TransistorsoftCapacitorBackgroundFetch: ce4b3e01b898cef516e68485d2160a078016ee97
+  TransistorsoftCapacitorBackgroundFetch: 74ca62dae7ec78639eaf3d0d1e24c595ada213dd
 
-PODFILE CHECKSUM: 229278f2c257e8ab555325c7115b2e187e8e628d
+PODFILE CHECKSUM: 073b899f90bacc5049101cb9c562a168757d554e
 
 COCOAPODS: 1.13.0

frontend/app/karma.conf.js

@@ -1,3 +1,4 @@
+// @ts-check
 /*
  * Copyright (C) 2022 StApps
  * This program is free software: you can redistribute it and/or modify it

frontend/app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/app",
   "description": "The generic app tailored to fulfill needs of German universities, written using Ionic Framework.",
-  "version": "3.3.0",
+  "version": "3.1.2",
   "private": true,
   "license": "GPL-3.0-only",
   "author": "Karl-Philipp Wulfert <krlwlfrt@gmail.com>",
@@ -35,7 +35,7 @@
     "e2e": "ng e2e",
     "format": "prettier . -c",
     "format:fix": "prettier --write .",
-    "licenses": "license-checker --json > src/assets/about/licenses.json && node ./scripts/accumulate-licenses.mjs && git add src/assets/about/licenses.json",
+    "licenses": "license-checker --json > src/assets/about/licenses.json && ts-node ./scripts/accumulate-licenses.ts && git add src/assets/about/licenses.json",
     "lint": "ng lint && stylelint \"**/*.scss\"",
     "lint:fix": "eslint --fix -c .eslintrc.json --ignore-path .eslintignore --ext .ts,.html src/ && stylelint --fix \"**/*.scss\"",
     "minify-icons": "node scripts/minify-icon-font.mjs",
@@ -52,138 +52,139 @@
     "test:integration": "sh integration-test.sh"
   },
   "dependencies": {
-    "@angular/animations": "17.3.0",
+    "@angular/animations": "16.1.4",
-    "@angular/cdk": "17.3.0",
+    "@angular/cdk": "16.1.4",
-    "@angular/common": "17.3.0",
+    "@angular/common": "16.1.4",
-    "@angular/core": "17.3.0",
+    "@angular/core": "16.1.4",
-    "@angular/forms": "17.3.0",
+    "@angular/forms": "16.1.4",
-    "@angular/platform-browser": "17.3.0",
+    "@angular/platform-browser": "16.1.4",
-    "@angular/router": "17.3.0",
+    "@angular/router": "16.1.4",
-    "@awesome-cordova-plugins/calendar": "6.6.0",
+    "@asymmetrik/ngx-leaflet": "16.0.1",
-    "@awesome-cordova-plugins/core": "6.6.0",
+    "@asymmetrik/ngx-leaflet-markercluster": "16.0.0",
-    "@capacitor-community/screen-brightness": "6.0.0",
+    "@awesome-cordova-plugins/calendar": "5.45.0",
-    "@capacitor/app": "5.0.7",
+    "@awesome-cordova-plugins/core": "5.45.0",
-    "@capacitor/browser": "5.2.0",
+    "@capacitor/app": "5.0.6",
-    "@capacitor/clipboard": "5.0.7",
+    "@capacitor/browser": "5.1.0",
-    "@capacitor/core": "5.7.3",
+    "@capacitor/clipboard": "5.0.6",
-    "@capacitor/device": "5.0.7",
+    "@capacitor/core": "5.5.0",
-    "@capacitor/dialog": "5.0.7",
+    "@capacitor/device": "5.0.6",
-    "@capacitor/filesystem": "5.2.1",
+    "@capacitor/dialog": "5.0.6",
-    "@capacitor/geolocation": "5.0.7",
+    "@capacitor/filesystem": "5.1.4",
-    "@capacitor/haptics": "5.0.7",
+    "@capacitor/geolocation": "5.0.6",
-    "@capacitor/keyboard": "5.0.8",
+    "@capacitor/haptics": "5.0.6",
-    "@capacitor/local-notifications": "5.0.7",
+    "@capacitor/keyboard": "5.0.6",
-    "@capacitor/network": "5.0.7",
+    "@capacitor/local-notifications": "5.0.6",
-    "@capacitor/preferences": "5.0.7",
+    "@capacitor/network": "5.0.6",
-    "@capacitor/screen-orientation": "6.0.0",
+    "@capacitor/preferences": "5.0.6",
-    "@capacitor/share": "5.0.7",
+    "@capacitor/share": "5.0.6",
-    "@capacitor/splash-screen": "5.0.7",
+    "@capacitor/splash-screen": "5.0.6",
     "@ionic-native/core": "5.36.0",
-    "@ionic/angular": "7.8.0",
+    "@ionic/angular": "7.1.3",
     "@ionic/storage-angular": "4.0.0",
-    "@maplibre/ngx-maplibre-gl": "17.4.1",
     "@ngx-translate/core": "15.0.0",
     "@ngx-translate/http-loader": "8.0.0",
     "@openid/appauth": "1.3.1",
     "@openstapps/api": "workspace:*",
     "@openstapps/collection-utils": "workspace:*",
     "@openstapps/core": "workspace:*",
-    "@transistorsoft/capacitor-background-fetch": "5.2.0",
+    "@transistorsoft/capacitor-background-fetch": "5.1.1",
-    "@types/dom-view-transitions": "1.0.4",
+    "@types/dom-view-transitions": "1.0.1",
     "capacitor-secure-storage-plugin": "0.9.0",
     "cordova-plugin-calendar": "5.1.6",
-    "date-fns": "3.6.0",
+    "date-fns": "2.30.0",
     "deepmerge": "4.3.1",
     "form-data": "4.0.0",
     "geojson": "0.5.0",
     "ionic-appauth": "0.9.0",
     "jsonpath-plus": "6.0.1",
-    "maplibre-gl": "4.0.2",
+    "leaflet": "1.9.3",
-    "material-symbols": "0.17.1",
+    "leaflet.markercluster": "1.5.3",
-    "moment": "2.30.1",
+    "material-symbols": "0.10.0",
-    "ngx-date-fns": "11.0.0",
+    "moment": "2.29.4",
+    "ngx-date-fns": "10.0.1",
     "ngx-logger": "5.0.12",
-    "ngx-markdown": "17.1.1",
+    "ngx-markdown": "16.0.0",
     "ngx-moment": "6.0.2",
     "opening_hours": "3.8.0",
-    "pmtiles": "3.0.3",
     "rxjs": "7.8.1",
-    "semver": "7.6.0",
+    "semver": "7.5.4",
     "swiper": "8.4.5",
-    "tslib": "2.6.2",
+    "tslib": "2.4.1",
-    "zone.js": "0.14.4"
+    "zone.js": "0.13.1"
   },
   "devDependencies": {
-    "@angular-devkit/architect": "0.1703.0",
+    "@angular-devkit/architect": "0.1601.4",
-    "@angular-devkit/build-angular": "17.3.0",
+    "@angular-devkit/build-angular": "16.1.4",
-    "@angular-devkit/core": "17.3.0",
+    "@angular-devkit/core": "16.1.4",
-    "@angular-devkit/schematics": "17.3.0",
+    "@angular-devkit/schematics": "16.1.4",
-    "@angular-eslint/builder": "17.3.0",
+    "@angular-eslint/builder": "16.1.0",
-    "@angular-eslint/eslint-plugin": "17.3.0",
+    "@angular-eslint/eslint-plugin": "16.1.0",
-    "@angular-eslint/eslint-plugin-template": "17.3.0",
+    "@angular-eslint/eslint-plugin-template": "16.1.0",
-    "@angular-eslint/schematics": "17.3.0",
+    "@angular-eslint/schematics": "16.1.0",
-    "@angular-eslint/template-parser": "17.3.0",
+    "@angular-eslint/template-parser": "16.1.0",
-    "@angular/cli": "17.3.0",
+    "@angular/cli": "16.1.4",
-    "@angular/compiler": "17.3.0",
+    "@angular/compiler": "16.1.4",
-    "@angular/compiler-cli": "17.3.0",
+    "@angular/compiler-cli": "16.1.4",
-    "@angular/language-server": "17.3.0",
+    "@angular/language-service": "16.1.4",
-    "@angular/language-service": "17.3.0",
+    "@angular/platform-browser-dynamic": "16.1.4",
-    "@angular/platform-browser-dynamic": "17.3.0",
+    "@capacitor/android": "5.5.0",
-    "@capacitor/android": "5.7.3",
+    "@capacitor/assets": "3.0.1",
-    "@capacitor/assets": "3.0.4",
+    "@capacitor/cli": "5.5.0",
-    "@capacitor/cli": "5.7.3",
+    "@capacitor/ios": "5.5.0",
-    "@capacitor/ios": "5.7.3",
+    "@compodoc/compodoc": "1.1.19",
-    "@compodoc/compodoc": "1.1.23",
+    "@cypress/schematic": "1.7.0",
-    "@cypress/schematic": "2.5.1",
+    "@ionic/angular-toolkit": "10.0.0",
-    "@ionic/angular-toolkit": "11.0.1",
+    "@ionic/cli": "7.1.1",
-    "@ionic/cli": "7.2.0",
     "@openstapps/prettier-config": "workspace:*",
     "@openstapps/tsconfig": "workspace:*",
-    "@types/fontkit": "2.0.7",
+    "@types/fontkit": "1.8.0",
     "@types/geojson": "1.0.6",
-    "@types/glob": "8.1.0",
+    "@types/glob": "8.0.1",
-    "@types/jasmine": "5.1.4",
+    "@types/jasmine": "4.3.1",
-    "@types/jasminewd2": "2.0.13",
+    "@types/jasminewd2": "2.0.10",
     "@types/jsonpath": "0.2.0",
-    "@types/karma": "6.3.8",
+    "@types/karma": "6.3.4",
-    "@types/karma-coverage": "2.0.3",
+    "@types/karma-coverage": "2.0.1",
-    "@types/karma-jasmine": "4.0.5",
+    "@types/karma-jasmine": "4.0.2",
+    "@types/leaflet": "1.9.0",
+    "@types/leaflet.markercluster": "1.5.1",
     "@types/node": "18.15.3",
-    "@types/semver": "7.5.8",
+    "@types/semver": "7.5.6",
-    "@typescript-eslint/eslint-plugin": "7.2.0",
+    "@typescript-eslint/eslint-plugin": "5.60.1",
-    "@typescript-eslint/parser": "7.2.0",
+    "@typescript-eslint/parser": "5.60.1",
     "cordova-res": "0.15.4",
-    "cypress": "13.7.0",
+    "cypress": "13.2.0",
-    "eslint": "8.57.0",
+    "eslint": "8.43.0",
-    "eslint-plugin-jsdoc": "48.2.1",
+    "eslint-plugin-jsdoc": "46.4.2",
-    "eslint-plugin-prettier": "5.1.3",
+    "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-unicorn": "51.0.1",
+    "eslint-plugin-unicorn": "47.0.0",
     "fast-deep-equal": "3.1.3",
     "fontkit": "2.0.2",
-    "glob": "10.3.10",
+    "glob": "10.2.7",
     "http-server": "14.1.1",
     "is-docker": "2.2.1",
-    "jasmine-core": "5.1.2",
+    "jasmine-core": "5.0.1",
     "jasmine-spec-reporter": "7.0.0",
     "jetifier": "2.0.0",
-    "junit-report-merger": "6.0.3",
+    "junit-report-merger": "6.0.2",
-    "karma": "6.4.3",
+    "karma": "6.4.2",
     "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": "16.3.1",
+    "stylelint": "15.10.1",
-    "stylelint-config-clean-order": "5.4.1",
+    "stylelint-config-clean-order": "5.0.1",
     "stylelint-config-prettier-scss": "1.0.0",
-    "stylelint-config-recommended-scss": "14.0.0",
+    "stylelint-config-recommended-scss": "12.0.0",
-    "stylelint-config-standard-scss": "13.0.0",
+    "stylelint-config-standard-scss": "10.0.0",
     "surge": "0.23.1",
-    "ts-node": "10.9.2",
+    "ts-node": "10.9.1",
-    "typescript": "5.4.2",
+    "typescript": "5.1.6",
-    "webpack-bundle-analyzer": "4.10.1"
+    "webpack-bundle-analyzer": "4.7.0"
   },
+  "prettier": "@openstapps/prettier-config",
   "cordova": {
     "plugins": {},
     "platforms": [

frontend/app/prettier.config.mjs

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

frontend/app/scripts/accumulate-licenses.mjs

@@ -1,3 +1,4 @@
+// @ts-check
 /*
  * Copyright (C) 2022 StApps
  * This program is free software: you can redistribute it and/or modify it
@@ -12,7 +13,7 @@
  * 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 {readFileSync, writeFileSync} from 'fs';
+import fs from 'fs';
 import {omit, pickBy} from '@openstapps/collection-utils';
 
 /**
@@ -21,25 +22,24 @@ import {omit, pickBy} from '@openstapps/collection-utils';
  * @param {string} additionalLicensesPath
  */
 function accumulateFile(path, additionalLicensesPath) {
-  const packageJson = JSON.parse(readFileSync('./package.json').toString());
+  const packageJson = JSON.parse(fs.readFileSync('./package.json').toString());
   const dependencies = packageJson.dependencies;
 
   console.log(`Accumulating licenses from ${path}`);
 
-  writeFileSync(
+  fs.writeFileSync(
     path,
     JSON.stringify(
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       Object.entries({
-        ...pickBy(JSON.parse(readFileSync(path).toString()), (_, key) => {
+        ...pickBy(JSON.parse(fs.readFileSync(path).toString()), (_, key) => {
           const parts = /** @type {string} */ (key).split('@');
 
           return dependencies[parts.slice(0, -1).join('@')] === parts[parts.length - 1];
         }),
-        ...JSON.parse(readFileSync(additionalLicensesPath).toString()),
+        ...JSON.parse(fs.readFileSync(additionalLicensesPath).toString()),
       })
         .map(([key, value]) => ({
-          licenseText: value.licenseFile && readFileSync(value.licenseFile, 'utf8'),
+          licenseText: value.licenseFile && fs.readFileSync(value.licenseFile, 'utf8'),
           name: key,
           ...omit(value, 'licenseFile', 'path'),
         }))

frontend/app/scripts/check-icon-correctness.mjs

@@ -1,3 +1,4 @@
+// @ts-check
 /*
  * Copyright (C) 2022 StApps
  * This program is free software: you can redistribute it and/or modify it
@@ -16,15 +17,13 @@ import {openSync} from 'fontkit';
 import config from '../icons.config.mjs';
 import {existsSync} from 'fs';
 import {getUsedIconsHtml, getUsedIconsTS} from './gather-used-icons.mjs';
-import {fetchCodePointMap} from './get-code-points.mjs';
 
 const commandName = '"npm run minify-icons"';
+const originalFont = openSync(config.inputPath);
 if (!existsSync(config.outputPath)) {
   console.error(`Minified font not found. Run ${commandName} first.`);
   process.exit(-1);
 }
-
-/** @type {import('fontkit').Font} */
 const modifiedFont = openSync(config.outputPath);
 
 let success = true;
@@ -52,14 +51,24 @@ async function checkAll() {
 /**
  * @param {Record<string, string[]>} icons
  */
-async function check(icons) {
+function check(icons) {
-  const codePoints = await fetchCodePointMap();
+  for (const [purpose, iconSet] of Object.entries(icons)) {
-
+    for (const icon of iconSet) {
-  for (const icon of Object.values(icons).flat()) {
+      if (!hasIcon(originalFont, icon)) {
-    const codePoint = codePoints.get(icon);
+        success = false;
-    if (!codePoint) throw new Error(`"${icon}" is not a valid icon`);
+        console.error(`${purpose}: ${icon} does not exist. Typo?`);
-    if (!modifiedFont.getGlyph(Number.parseInt(codePoint, 16))) {
+      } else if (!hasIcon(modifiedFont, icon)) {
-      throw new Error(`"${icon}" (code point ${codePoint}) is missing`);
+        success = false;
+        console.error(`${purpose}: ${icon} not found in minified font. Run ${commandName} to regenerate it.`);
+      }
     }
   }
 }
+
+/**
+ * @param {import('fontkit').Font} font
+ * @param {string} icon
+ */
+function hasIcon(font, icon) {
+  return font.layout(icon).glyphs.some(it => it.isLigature);
+}

frontend/app/scripts/gather-used-icons.mjs

@@ -1,3 +1,4 @@
+// @ts-check
 /*
  * Copyright (C) 2022 StApps
  * This program is free software: you can redistribute it and/or modify it
@@ -14,11 +15,7 @@
  */
 import {glob} from 'glob';
 import {readFileSync} from 'fs';
-import {
+import {matchPropertyContent, matchTagProperties} from '../src/app/util/ion-icon/icon-match.mjs';
-  matchPropertyAccess,
-  matchPropertyContent,
-  matchTagProperties,
-} from '../src/app/util/ion-icon/icon-match.mjs';
 
 /**
  * @returns {Promise<Record<string, string[]>>}
@@ -28,14 +25,16 @@ export async function getUsedIconsHtml(pattern = 'src/**/*.html') {
     (await glob(pattern))
       .map(file => [
         file,
-        readFileSync(file, 'utf8')
+        /** @type {string[]} */ (
-          .match(matchTagProperties('ion-icon'))
+          readFileSync(file, 'utf8')
-          ?.flatMap(match => {
+            .match(matchTagProperties('ion-icon'))
-            return match.match(matchPropertyContent(['name', 'md', 'ios']));
+            ?.flatMap(match => {
-          })
+              return match.match(matchPropertyContent(['name', 'md', 'ios']));
-          .filter(it => !!it) || [],
+            })
+            .filter(it => !!it)
+        ) || [],
       ])
-      .filter(([, values]) => values && values.length > 0),
+      .filter(([, values]) => values.length > 0),
   );
 }
 
@@ -43,10 +42,9 @@ export async function getUsedIconsHtml(pattern = 'src/**/*.html') {
  * @returns {Promise<Record<string, string[]>>}
  */
 export async function getUsedIconsTS(pattern = 'src/**/*.ts') {
-  const regex = matchPropertyAccess('SCIcon');
   return Object.fromEntries(
     (await glob(pattern))
-      .map(file => [file, readFileSync(file, 'utf8').match(regex) || []])
+      .map(file => [file, readFileSync(file, 'utf8').match(/(?<=Icon`)[\w-]+(?=`)/g) || []])
-      .filter(([, values]) => values && values.length > 0),
+      .filter(([, values]) => values.length > 0),
   );
 }

frontend/app/scripts/get-code-points.mjs

@@ -1,23 +0,0 @@
-const url =
-  'https://raw.githubusercontent.com/google/material-design-icons/master/' +
-  'variablefont/MaterialSymbolsRounded%5BFILL%2CGRAD%2Copsz%2Cwght%5D.codepoints';
-
-export async function fetchCodePointMap() {
-  const icons = await fetch(url)
-    .then(it => it.text())
-    .then(it => new Map(it.split('\n').map(it => /** @type {[string, string]} */ (it.split(' ')))));
-  if (icons.size < 100) throw new Error(`Code point map is very small, is the URL incorrect? ${url}`);
-  return icons;
-}
-
-/**
- * @param {string[]} icons
- */
-export async function getCodePoints(icons) {
-  const codePoints = await fetchCodePointMap();
-  return icons.map(icon => {
-    const code = codePoints.get(icon);
-    if (!code) throw new Error(`Code point for icon ${icon} not found`);
-    return code;
-  });
-}

frontend/app/scripts/get-ip.mjs

@@ -1,8 +0,0 @@
-import {networkInterfaces} from 'os';
-
-console.log(
-  Object.entries(networkInterfaces())
-    .map(([, info]) => info)
-    .flat()
-    .find(info => info && !info.internal && info.family === 'IPv4')?.address,
-);

frontend/app/scripts/icon-config.d.ts

@@ -19,4 +19,5 @@ export interface IconConfig {
   inputPath: string;
   outputPath: string;
   additionalIcons?: {[purpose: string]: string[]};
+  codePoints?: {[name: string]: string};
 }

frontend/app/scripts/minify-icon-font.mjs

@@ -1,3 +1,4 @@
+// @ts-check
 /*
  * Copyright (C) 2022 StApps
  * This program is free software: you can redistribute it and/or modify it
@@ -12,13 +13,11 @@
  * 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 {openSync} from 'fontkit';
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import {exec} from 'child_process';
 import config from '../icons.config.mjs';
 import {statSync} from 'fs';
 import {getUsedIconsHtml, getUsedIconsTS} from './gather-used-icons.mjs';
-import {getCodePoints} from './get-code-points.mjs';
 
 /**
  * @param {string[] | string} command
@@ -58,7 +57,36 @@ async function minifyIconFont() {
     }
   }
 
-  const glyphs = ['5f-7a', '30-39', ...(await getCodePoints([...icons]))].sort();
+  console.log('Icons used:', [...icons.values()].sort());
+  const font = openSync(config.inputPath);
+
+  /** @type {string[]} */
+  const glyphs = ['5f-7a', '30-39'];
+  for (const icon of icons) {
+    const iconGlyphs = font.layout(icon).glyphs;
+    if (iconGlyphs.length === 0) {
+      console.error(`${icon} not found in font. Typo?`);
+      process.exit(-1);
+    }
+
+    const codePoints = iconGlyphs
+      .flatMap(it => font.stringsForGlyph(it.id))
+      .flatMap(it => [...it])
+      .map(it => it.codePointAt(0).toString(16));
+
+    if (codePoints.length === 0) {
+      if (config.codePoints?.[icon]) {
+        glyphs.push(config.codePoints[icon]);
+      } else {
+        console.log();
+        console.error(`${icon} code point could not be determined. Add it to config.codePoints.`);
+        process.exit(-1);
+      }
+    }
+
+    glyphs.push(...codePoints);
+  }
+  glyphs.sort();
 
   console.log(
     await run([

frontend/app/scripts/tsconfig.json

@@ -1,7 +0,0 @@
-{
-  "extends": "@openstapps/tsconfig",
-  "compilerOptions": {
-    "module": "CommonJS",
-    "moduleResolution": "Node"
-  }
-}

frontend/app/src/app/_helpers/data/sample-configuration.ts

@@ -21,7 +21,7 @@ import {
   SCThingOriginType,
   SCThingType,
 } from '@openstapps/core';
-import {CORE_VERSION} from '@openstapps/core';
+import packageInfo from '@openstapps/core/package.json';
 import {Polygon} from 'geojson';
 
 // provides sample aggregations to be used in tests or backendless development
@@ -195,7 +195,7 @@ export const sampleIndexResponse: SCIndexResponse = {
   },
   auth: {},
   backend: {
-    SCVersion: CORE_VERSION,
+    SCVersion: packageInfo.version,
     externalRequestTimeout: 5000,
     hiddenTypes: [SCThingType.DateSeries, SCThingType.Diff, SCThingType.Floor],
     mappingIgnoredTags: [],

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

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

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

@@ -30,6 +30,7 @@ import {environment} from '../environments/environment';
 import {AppRoutingModule} from './app-routing.module';
 import {AppComponent} from './app.component';
 import {CatalogModule} from './modules/catalog/catalog.module';
+import {ConfigModule} from './modules/config/config.module';
 import {ConfigProvider} from './modules/config/config.provider';
 import {DashboardModule} from './modules/dashboard/dashboard.module';
 import {DataModule} from './modules/data/data.module';
@@ -69,8 +70,6 @@ import {setDefaultOptions} from 'date-fns';
 import {DateFnsConfigurationService} from 'ngx-date-fns';
 import {Capacitor} from '@capacitor/core';
 import {SplashScreen} from '@capacitor/splash-screen';
-import maplibregl from 'maplibre-gl';
-import {Protocol} from 'pmtiles';
 
 registerLocaleData(localeDe);
 
@@ -92,7 +91,6 @@ export function initializerFactory(
 ) {
   return async () => {
     try {
-      maplibregl.addProtocol('pmtiles', new Protocol().tile);
       initLogger(logger);
       await storageProvider.init();
       await configProvider.init();
@@ -153,6 +151,7 @@ export function createTranslateLoader(http: HttpClient) {
     BrowserAnimationsModule,
     CatalogModule,
     CommonModule,
+    ConfigModule,
     DashboardModule,
     DataModule,
     HebisModule,

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,24 +24,28 @@
 </ion-header>
 <ion-content parallax>
   <div class="licenses-content">
-    @for (license of licenses; track license) {
+    <ion-card
-      <ion-card [href]="license.url || license.repository" rel="external" target="_blank">
+      *ngFor="let license of licenses"
-        <ion-card-header>
+      [href]="license.url || license.repository"
-          <ion-card-title>
+      rel="external"
-            {{ license.name }}
+      target="_blank"
-            <ion-icon [size]="16" [weight]="300" class="supertext-icon" name="open_in_browser"></ion-icon>
+    >
-          </ion-card-title>
+      <ion-card-header>
-          @if (license.authors || license.publisher) {
+        <ion-card-title>
-            <ion-card-subtitle> {{ license.authors || license.publisher }} </ion-card-subtitle>
+          {{ license.name }}
-          }
+          <ion-icon [size]="16" [weight]="300" class="supertext-icon" name="open_in_browser"></ion-icon>
-        </ion-card-header>
+        </ion-card-title>
-        <ion-card-content>
+
-          <ion-chip (click)="$event.preventDefault(); viewLicense(license)">
+        <ion-card-subtitle *ngIf="license.authors || license.publisher">
-            <ion-icon name="copyright"></ion-icon>
+          {{ license.authors || license.publisher }}
-            <ion-label>{{ license.licenses }} License</ion-label>
+        </ion-card-subtitle>
-          </ion-chip>
+      </ion-card-header>
-        </ion-card-content>
+      <ion-card-content>
-      </ion-card>
+        <ion-chip (click)="$event.preventDefault(); viewLicense(license)">
-    }
+          <ion-icon name="copyright"></ion-icon>
+          <ion-label>{{ license.licenses }} License</ion-label>
+        </ion-chip>
+      </ion-card-content>
+    </ion-card>
   </div>
 </ion-content>

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

@@ -12,6 +12,24 @@
  * 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-content > div {
+  height: 100%;
+}
+
+cdk-virtual-scroll-viewport {
+  width: 100%;
+  height: 100%;
+}
+
+:host ::ng-deep {
+  .cdk-virtual-scroll-content-wrapper {
+    width: 100%;
+  }
+}
+
+.virtual-scroll-expander {
+  clear: both;
+}
 
 .supertext-icon {
   height: 14px;

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

@@ -1,56 +1,41 @@
 <!--
-~ 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/>.
--->
+  -->
 
-@if (content.type === 'markdown') {
+<markdown *ngIf="content.type === 'markdown'" [data]="'value' | translateSimple : content"></markdown>
-  <markdown [data]="'value' | translateSimple: content"></markdown>
+<div *ngIf="content.type ==='section'">
-}
+  <ion-card *ngIf="content.card; else noCard">
-@if (content.type === 'section') {
+    <ion-card-header>
-  <div>
+      <ion-card-title>{{ 'title' | translateSimple : content }}</ion-card-title>
-    @if (content.card) {
+    </ion-card-header>
-      <ion-card>
+    <ion-card-content>
-        <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>
-  </div>
+  </ion-card>
-}
+  <ng-template #noCard>
-@if (content.type === 'table') {
+    <h2>{{ 'title' | translateSimple : content }}</h2>
-  <ion-grid>
+    <about-page-content [content]="content.content"></about-page-content>
-    @for (row of content.rows; track row) {
+  </ng-template>
-      <ion-row>
+</div>
-        @for (col of row; track col) {
+<ion-grid *ngIf="content.type === 'table'">
-          <ion-col>
+  <ion-row *ngFor="let row of content.rows">
-            <about-page-content [content]="col"></about-page-content>
+    <ion-col *ngFor="let col of row">
-          </ion-col>
+      <about-page-content [content]="col"></about-page-content>
-        }
+    </ion-col>
-      </ion-row>
+  </ion-row>
-    }
+</ion-grid>
-  </ion-grid>
+<ion-item *ngIf="content.type === 'router link'" [routerLink]="content.link">
-}
+  <ion-icon *ngIf="content.icon" [name]="content.icon" slot="start"></ion-icon>
-@if (content.type === 'router link') {
+  <ion-label>{{ 'title' | translateSimple : content }}</ion-label>
-  <ion-item [routerLink]="content.link">
+</ion-item>
-    @if (content.icon) {
-      <ion-icon [name]="$any(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,37 +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-header>
   <ion-toolbar color="primary" mode="ios">
     <ion-buttons slot="start">
       <ion-back-button></ion-back-button>
     </ion-buttons>
-    @if (content) {
+    <ion-title *ngIf="content; else titleLoading">{{ 'title' | translateSimple : content }}</ion-title>
-      <ion-title>{{ 'title' | translateSimple: content }}</ion-title>
+    <ng-template #titleLoading>
-    } @else {
       <ion-title><ion-skeleton-text animated="true"></ion-skeleton-text></ion-title>
-    }
+    </ng-template>
   </ion-toolbar>
 </ion-header>
-@if (content) {
+<ion-content parallax *ngIf="content">
-  <ion-content parallax>
+  <ion-text>{{ 'about.VERSION_INFO' | translate: {name, version, stappsVersion} }}</ion-text>
-    <ion-text>{{ 'about.VERSION_INFO' | translate: {name, version, stappsVersion} }}</ion-text>
+  <div class="page-content">
-    <div class="page-content">
+    <about-page-content *ngFor="let element of content.content" [content]="element"></about-page-content>
-      @for (element of content.content; track element) {
+  </div>
-        <about-page-content [content]="element"></about-page-content>
+</ion-content>
-      }
-    </div>
-  </ion-content>
-}