feat: improve search experience

.changeset/green-hotels-itch.md

@@ -1,8 +0,0 @@
----
-"@openstapps/projectmanagement": patch
-"@openstapps/core-tools": patch
-"@openstapps/easy-ast": patch
-"@openstapps/app": patch
----
-
-Updated node-glob dependency

.gitignore

@@ -98,8 +98,7 @@ typings/
 
 # ignore ide files
 .idea
-.vscode?*
+.vscode
-!.vscode/launch.json
 
 # ignore lib
 lib

.gitlab-ci.yml

@@ -21,7 +21,13 @@ include:
   - local: /.gitlab/publishing.gitlab-ci.yml
 
 variables:
-  TURBO_CACHE_BYPASS: "--force --no-cache"
+  TURBO_CACHE_BYPASS:
+    value: ''
+    options:
+      - '--force'
+      - '--no-cache'
+      - ''
+    description: Bypass turbo cache
 
 default:
   image: registry.gitlab.com/openstapps/openstapps/node-builder
@@ -30,7 +36,10 @@ default:
   interruptible: true
   before_script:
     - corepack enable
-    - corepack prepare pnpm@latest-10 --activate
+    - corepack prepare pnpm@latest-8 --activate
+    - echo TURBO_API=$TURBO_API >> .env.local
+    - echo TURBO_TOKEN=$TURBO_TOKEN >> .env.local
+    - echo TURBO_TEAM=$TURBO_TEAM >> .env.local
     - pnpm config set store-dir .pnpm-store
   cache: &pnpm_cache
     key:
@@ -54,13 +63,13 @@ build:
     # - pnpm i --prefer-offline
     # - pnpm build:full:skip || pnpm i -r --prefer-offline
     - pnpm install
-    # TODO: whats the benefit for CI? something doesn't work with git here...
+    # TODO: whats the benifit for CI? something doesn't work with git here...
     # "🦋  error Error: Failed to find where HEAD diverged from master. Does master exist?"
     # - pnpm changeset:status
     - pnpm build:full $TURBO_CACHE_BYPASS
-    - .gitlab/ci/enableGitlabReviewToolbar.sh frontend/app/www/browser/index.html "$CI_PROJECT_ID" "$CI_OPEN_MERGE_REQUESTS"
+    - .gitlab/ci/enableGitlabReviewToolbar.sh frontend/app/www/index.html "$CI_PROJECT_ID" "$CI_OPEN_MERGE_REQUESTS"
-    - cp frontend/app/www/browser/index.html frontend/app/www/browser/200.html
+    - cp frontend/app/www/index.html frontend/app/www/200.html
-    - pnpm dlx surge -p frontend/app/www/browser -d https://$CI_PROJECT_NAME-$DEPLOY_ID.surge.sh/
+    - pnpm dlx surge -p frontend/app/www -d https://$CI_PROJECT_NAME-$DEPLOY_ID.surge.sh/
   cache:
     <<: *pnpm_cache
     policy: pull-push
@@ -96,7 +105,13 @@ unit:
   stage: test
   needs: ['build']
   script:
+    # - pnpm config set recursive-install false
+    # - pnpm i --prefer-offline
+    # - pnpm test:skip || pnpm i -r --prefer-offline
     - pnpm install
+    - cd node_modules/.pnpm/re2*/node_modules/re2
+    - npm run install
+    - cd $CI_PROJECT_DIR
     - pnpm test $TURBO_CACHE_BYPASS
   coverage: '/Statements[^:]*\:[^:]*\s+([\d\.]+)%/'
   artifacts:

.gitlab/publishing.gitlab-ci.yml

@@ -27,7 +27,7 @@ publish image:
       - tags
   needs: ['deploy']
   image:
-    name: gcr.io/kaniko-project/executor:v1.24.0-debug
+    name: gcr.io/kaniko-project/executor:v1.12.1-debug
     entrypoint: [""]
   script:
     - >

.syncpackrc.cjs

@@ -27,7 +27,6 @@ const config = {
     'bin',
     'files',
     'engines',
-    'packageManager',
     'scripts',
     'dependencies',
     'devDependencies',

.tool-versions

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

.vscode/launch.json

@@ -1,23 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Launch Chrome",
-            "request": "launch",
-            "type": "chrome",
-            "url": "http://localhost:8100",
-            "webRoot": "${workspaceFolder}/frontend/app/www"
-        },
-        {
-            "type":"node",
-            "request": "launch",
-            "name": "Run mocha for nodejs workspace",
-            "runtimeExecutable": "${fileDirname}/../node_modules/.bin/c8",
-            "cwd": "${fileDirname}/../",
-            "runtimeArgs": ["--config", "${workspaceFolder}/.c8rc.json", "${fileDirname}/../node_modules/.bin/mocha", "--exit", "--reporter", "spec"]
-        },
-    ]
-}

backend/backend/.gitlab-ci.yml

@@ -9,8 +9,8 @@ integration:
     - name: registry.gitlab.com/openstapps/openstapps/database:latest
       alias: elasticsearch
   script:
-    - pnpm install
+    - pnpm --filter=@openstapps/backend install
-    - pnpm test:integration:backend --force --no-cache
+    - pnpm test:integration:backend
   artifacts:
     when: on_failure
     paths:

backend/backend/CHANGELOG.md

@@ -1,44 +1,5 @@
 # @openstapps/backend
 
-## 4.0.3
-
-### Patch Changes
-
-- 3a274a3a: Upgrade to Capacitor 7 and Anuglar 18
-  - @openstapps/core@4.0.2
-  - @openstapps/core-tools@4.0.2
-  - @openstapps/logger@4.0.2
-
-## 4.0.2
-
-### Patch Changes
-
-- 6b06de40: Updated nodemailer dependency
-- Updated dependencies [6b06de40]
-  - @openstapps/logger@4.0.2
-  - @openstapps/core@4.0.2
-  - @openstapps/core-tools@4.0.2
-
-## 4.0.1
-
-### Patch Changes
-
-- b40ba7ad: Updated Elasticsearch dependency
-  - @openstapps/core@4.0.0
-
-## 4.0.0
-
-### Major Changes
-
-- c8e29020: Update to Node 22
-
-### Patch Changes
-
-- Updated dependencies [c8e29020]
-  - @openstapps/core@4.0.0
-  - @openstapps/core-tools@4.0.0
-  - @openstapps/logger@4.0.0
-
 ## 3.3.2
 
 ### Patch Changes

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

@@ -8,8 +8,7 @@ const config = {
     database: {
       name: 'elasticsearch',
       query: {
-        minMatch: '60%',
+        fields: ["name"]
-        queryType: 'query_string',
       },
     },
   },

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

@@ -112,7 +112,7 @@ const menus = [
     icon: 'school',
     items: [
       {
-        icon: 'star',
+        icon: 'grade',
         route: '/favorites',
         title: 'favorites',
         translations: {

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

@@ -5,8 +5,8 @@ const userGroupSetting = {
   categories: ['profile'],
   defaultValue: 'students',
   description:
-    'The user group the app is going to use primarily.' +
+    'The user group the app is going to be used.' +
-    ' This settings for example is getting used for the predefined price category of mensa meals.',
+    'This settings for example is getting used for the predefined price category of mensa meals.',
   inputType: SCSettingInputType.SingleChoice,
   name: 'group',
   order: 1,
@@ -25,7 +25,7 @@ const userGroupSetting = {
     },
     en: {
       description:
-        'The user group the app is going to use primarily.' +
+        'The user group the app is going to be used.' +
         ' This settings for example is getting used for the predefined price category of mensa meals.',
       name: 'Group',
       values: ['students', 'employees', 'guests'],

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

@@ -39,7 +39,7 @@ const boostings = {
       type: SCThingType.AcademicEvent,
     },
     {
-      factor: 1.6,
+      factor: 2,
       type: SCThingType.Building,
     },
     {
@@ -85,7 +85,7 @@ const boostings = {
   ],
   place: [
     {
-      factor: 2,
+      factor: 3,
       type: SCThingType.Building,
     },
     {

backend/backend/config/default/elasticsearchrc.js

@@ -17,12 +17,21 @@ const config = {
       name: 'elasticsearch',
       version: '8.4.2',
       query: {
-        minMatch: '75%',
+        type: 'best_fields',
-        queryType: 'dis_max',
+        fields: [
-        matchBoosting: 1.3,
+          'identifiers^20',
-        fuzziness: 'AUTO',
+          'name^10',
-        cutoffFrequency: 0,
+          'translations.*.name^10',
-        tieBreaker: 0,
+          'alternateNames^10',
+          'translations.*.alternateNames^10',
+          'description^2',
+          'translations.*.description^2',
+          'categories^5',
+        ],
+      },
+      searchAsYouTypeQuery: {
+        type: 'phrase_prefix',
+        fields: ['name.completion', 'name.completion._2gram', 'name.completion._3gram'],
       },
     },
   },

backend/backend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/backend",
   "description": "A reference implementation for a StApps backend",
-  "version": "4.0.3",
+  "version": "3.3.2",
   "private": true,
   "type": "module",
   "license": "AGPL-3.0-only",
@@ -43,33 +43,33 @@
     "test:unit": "cross-env NODE_CONFIG_ENV=elasticsearch ALLOW_NO_TRANSPORT=true STAPPS_LOG_LEVEL=0 mocha --exit"
   },
   "dependencies": {
-    "@elastic/elasticsearch": "8.14.1",
+    "@elastic/elasticsearch": "8.4.0",
     "@openstapps/core": "workspace:*",
     "@openstapps/core-tools": "workspace:*",
     "@openstapps/logger": "workspace:*",
-    "@types/body-parser": "1.19.6",
+    "@types/body-parser": "1.19.2",
     "@types/cors": "2.8.13",
     "@types/express": "4.17.17",
     "@types/geojson": "1.0.6",
-    "@types/node": "22.15.31",
+    "@types/node": "18.15.3",
     "@types/node-cron": "3.0.7",
     "@types/nodemailer": "6.4.7",
     "@types/promise-queue": "2.2.0",
     "@types/uuid": "8.3.4",
-    "body-parser": "1.20.3",
+    "body-parser": "1.20.2",
     "cors": "2.8.5",
     "cosmiconfig": "8.1.3",
     "deepmerge": "4.3.1",
-    "express": "4.21.2",
+    "express": "4.18.2",
     "express-prom-bundle": "6.6.0",
     "express-promise-router": "4.1.1",
     "got": "12.6.0",
     "moment": "2.30.1",
-    "morgan": "1.10.1",
+    "morgan": "1.10.0",
     "nock": "13.3.1",
     "node-cache": "5.1.2",
     "node-cron": "3.0.2",
-    "nodemailer": "6.9.9",
+    "nodemailer": "6.9.1",
     "prom-client": "14.1.1",
     "promise-queue": "2.2.5",
     "uuid": "8.3.2"
@@ -80,26 +80,26 @@
     "@openstapps/prettier-config": "workspace:*",
     "@openstapps/tsconfig": "workspace:*",
     "@testdeck/mocha": "0.3.3",
-    "@types/chai": "4.3.20",
+    "@types/chai": "4.3.5",
-    "@types/chai-as-promised": "7.1.8",
+    "@types/chai-as-promised": "7.1.5",
-    "@types/mocha": "10.0.10",
+    "@types/mocha": "10.0.1",
-    "@types/morgan": "1.9.10",
+    "@types/morgan": "1.9.4",
     "@types/sinon": "10.0.14",
     "@types/sinon-express-mock": "1.3.9",
     "@types/supertest": "2.0.12",
-    "c8": "10.1.3",
+    "c8": "7.14.0",
-    "chai": "4.5.0",
+    "chai": "4.3.7",
-    "chai-as-promised": "7.1.2",
+    "chai-as-promised": "7.1.1",
     "cross-env": "7.0.3",
     "get-port": "5.1.1",
-    "mocha": "10.8.2",
+    "mocha": "10.2.0",
     "mocha-junit-reporter": "2.2.0",
     "mocked-env": "1.3.5",
     "sinon": "15.0.4",
     "sinon-express-mock": "2.2.1",
     "supertest": "6.3.3",
     "ts-node": "10.9.2",
-    "tsup": "8.5.0",
+    "tsup": "6.7.0",
     "typescript": "5.4.2"
   },
   "tsup": {

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

@@ -20,6 +20,8 @@ import {
   IndicesGetAliasResponse,
   SearchHit,
   SearchResponse,
+  SearchTermSuggest,
+  SearchTermSuggestOption,
 } from '@elastic/elasticsearch/lib/api/types.js';
 import {SCConfigFile, SCSearchQuery, SCSearchResponse, SCThings, SCUuid} from '@openstapps/core';
 import {Logger} from '@openstapps/logger';
@@ -47,6 +49,9 @@ import {
 import {noUndefined} from './util/no-undefined.js';
 import {retryCatch, RetryOptions} from './util/retry.js';
 import {Feature, Point, Polygon} from 'geojson';
+import {parseSuggestions} from './util/parse-suggestions.js';
+import {buildScoringFunctions} from './query/boost/scoring-functions.js';
+import {buildFilter} from './query/filter.js';
 
 /**
  * A database interface for elasticsearch
@@ -355,6 +360,39 @@ export class Elasticsearch implements Database {
     throw new Error('You tried to PUT an non-existing object. PUT is only supported on existing objects.');
   }
 
+  public async searchAsYouType(parameters: SCSearchQuery): Promise<SCSearchResponse> {
+    const result = await this.client.search({
+      _source: 'name',
+      query: {
+        function_score: {
+          functions: buildScoringFunctions(this.config.internal.boostings, parameters.context),
+          query: {
+            bool: {
+              must: {
+                multi_match: {
+                  query: parameters.query,
+                  type: 'bool_prefix',
+                  fields: ['name.completion', 'name.completion._2gram', 'name.completion._3gram'],
+                },
+              },
+              should: [],
+              filter: parameters.filter === undefined ? undefined : buildFilter(parameters.filter),
+            },
+          },
+          score_mode: 'max',
+          boost_mode: 'multiply',
+        },
+      },
+      index: ACTIVE_INDICES_ALIAS,
+      allow_no_indices: true,
+      size: 5,
+    });
+
+    const suggestions = result.hits.hits.map(it => (it._source as any).name);
+    console.log(suggestions);
+    console.log(result.took);
+  }
+
   /**
    * Search all indexed data
    * @param parameters search query
@@ -364,18 +402,23 @@ export class Elasticsearch implements Database {
       throw new TypeError('Database is undefined. You have to configure the query build');
     }
 
-    const esConfig: ElasticsearchConfig = {
+    const esConfig = this.config.internal.database as object as ElasticsearchConfig;
-      name: this.config.internal.database.name as 'elasticsearch',
-      version: this.config.internal.database.version as string,
-      query: this.config.internal.database.query as
-        | ElasticsearchQueryDisMaxConfig
-        | ElasticsearchQueryQueryStringConfig
-        | undefined,
-    };
 
     const response: SearchResponse<SCThings> = await this.client.search({
       aggs: aggregations,
       query: buildQuery(parameters, this.config, esConfig),
+      suggest:
+        parameters.query === undefined
+          ? undefined
+          : {
+              text: parameters.query,
+              terms: {
+                term: {
+                  field: 'name',
+                  suggest_mode: 'missing',
+                },
+              },
+            },
       from: parameters.from,
       index: ACTIVE_INDICES_ALIAS,
       allow_no_indices: true,
@@ -395,6 +438,7 @@ export class Elasticsearch implements Database {
         response.aggregations === undefined
           ? []
           : parseAggregations(response.aggregations as Record<AggregateName, AggregationsMultiTermsBucket>),
+      suggestions: response.suggest === undefined ? undefined : parseSuggestions(response.suggest),
       pagination: {
         count: response.hits.hits.length,
         offset: typeof parameters.from === 'number' ? parameters.from : 0,

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

@@ -30,84 +30,21 @@ export const buildQuery = function buildQuery(
   defaultConfig: SCConfigFile,
   elasticsearchConfig: ElasticsearchConfig,
 ): QueryDslQueryContainer {
-  // if config provides a minMatch parameter, we use query_string instead of a match query
+  return {
-  let query;
-  if (elasticsearchConfig.query === undefined) {
-    query = {
-      query_string: {
-        analyzer: 'search_german',
-        default_field: 'name',
-        minimum_should_match: '90%',
-        query: typeof parameters.query === 'string' ? parameters.query : '*',
-      },
-    };
-  } else if (elasticsearchConfig.query.queryType === 'query_string') {
-    query = {
-      query_string: {
-        analyzer: 'search_german',
-        default_field: 'name',
-        minimum_should_match: elasticsearchConfig.query.minMatch,
-        query: typeof parameters.query === 'string' ? parameters.query : '*',
-      },
-    };
-  } else if (elasticsearchConfig.query.queryType === 'dis_max') {
-    if (typeof parameters.query === 'string' && parameters.query !== '*') {
-      query = {
-        dis_max: {
-          boost: 1.2,
-          queries: [
-            {
-              match: {
-                name: {
-                  boost: elasticsearchConfig.query.matchBoosting,
-                  fuzziness: elasticsearchConfig.query.fuzziness,
-                  query: parameters.query,
-                },
-              },
-            },
-            {
-              query_string: {
-                default_field: 'name',
-                minimum_should_match: elasticsearchConfig.query.minMatch,
-                query: parameters.query,
-              },
-            },
-          ],
-          tie_breaker: elasticsearchConfig.query.tieBreaker,
-        },
-      };
-    }
-  } else {
-    throw new Error(
-      'Unsupported query type. Check your config file and reconfigure your elasticsearch query',
-    );
-  }
-
-  const functionScoreQuery: QueryDslQueryContainer = {
     function_score: {
       functions: buildScoringFunctions(defaultConfig.internal.boostings, parameters.context),
       query: {
         bool: {
-          minimum_should_match: 0, // if we have no should, nothing can match
+          must:
-          must: [],
+            parameters.query === undefined || parameters.query === '' || parameters.query === '*'
+              ? {match_all: {}}
+              : {multi_match: {...elasticsearchConfig.query, query: parameters.query}},
           should: [],
+          filter: parameters.filter === undefined ? undefined : buildFilter(parameters.filter),
         },
       },
-      score_mode: 'multiply',
+      score_mode: 'max',
+      boost_mode: 'multiply',
     },
   };
-
-  const mustMatch = functionScoreQuery.function_score?.query?.bool?.must;
-
-  if (Array.isArray(mustMatch)) {
-    if (query !== undefined) {
-      mustMatch.push(query);
-    }
-
-    if (parameters.filter !== undefined) {
-      mustMatch.push(buildFilter(parameters.filter));
-    }
-  }
-
-  return functionScoreQuery;
 };

backend/backend/src/storage/elasticsearch/types/elasticsearch-config.ts

@@ -13,68 +13,7 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-/**
+import {QueryDslMultiMatchQuery} from '@elastic/elasticsearch/lib/api/types.js';
- * A configuration for using the Dis Max Query
- *
- * See https://www.elastic.co/guide/en/elasticsearch/reference/5.5/query-dsl-dis-max-query.html for further
- * explanation of what the parameters mean
- */
-export interface ElasticsearchQueryDisMaxConfig {
-  /**
-   * Relative (to a total number of documents) or absolute number to exclude meaningless matches that frequently appear
-   */
-  cutoffFrequency: number;
-
-  /**
-   * The maximum allowed Levenshtein Edit Distance (or number of edits)
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/common-options.html#fuzziness
-   */
-  fuzziness: number | string;
-
-  /**
-   * Increase the importance (relevance score) of a field
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/mapping-boost.html
-   */
-  matchBoosting: number;
-
-  /**
-   * Minimal number (or percentage) of words that should match in a query
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/query-dsl-minimum-should-match.html
-   */
-  minMatch: string;
-
-  /**
-   * Type of the query - in this case 'dis_max' which is a union of its subqueries
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/query-dsl-dis-max-query.html
-   */
-  queryType: 'dis_max';
-
-  /**
-   * Changes behavior of default calculation of the score when multiple results match
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/query-dsl-multi-match-query.html#tie-breaker
-   */
-  tieBreaker: number;
-}
-
-/**
- * A configuration for using Query String Query
- *
- * See https://www.elastic.co/guide/en/elasticsearch/reference/5.5/query-dsl-query-string-query.html for further
- * explanation of what the parameters mean
- */
-export interface ElasticsearchQueryQueryStringConfig {
-  /**
-   * Minimal number (or percentage) of words that should match in a query
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/query-dsl-minimum-should-match.html
-   */
-  minMatch: string;
-
-  /**
-   * Type of the query - in this case 'query_string' which uses a query parser in order to parse content
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/query-dsl-query-string-query.html
-   */
-  queryType: 'query_string';
-}
 
 /**
  * An config file for the elasticsearch database interface
@@ -105,7 +44,12 @@ export interface ElasticsearchConfig {
   /**
    * Configuration for using queries
    */
-  query?: ElasticsearchQueryDisMaxConfig | ElasticsearchQueryQueryStringConfig;
+  query: Omit<QueryDslMultiMatchQuery, 'query'>;
+
+  /**
+   *
+   */
+  searchAsYouTypeQuery: Omit<QueryDslMultiMatchQuery, 'query'>;
 
   /**
    * Version of the used elasticsearch

backend/backend/src/storage/elasticsearch/util/parse-suggestions.ts

@@ -0,0 +1,28 @@
+import {
+  SearchSuggest,
+  SearchTermSuggest,
+  SearchTermSuggestOption,
+  SuggestionName,
+} from '@elastic/elasticsearch/lib/api/types.js';
+import {SCSearchSuggestions} from '@openstapps/core';
+
+/**
+ * Parse ES Suggestions to SC Search Suggestions
+ */
+export function parseSuggestions(suggest: Record<SuggestionName, SearchSuggest[]>): SCSearchSuggestions {
+  const termsSuggestions =
+    suggest.terms === undefined
+      ? []
+      : (suggest.terms as SearchTermSuggest[])
+          ?.map(
+            ({text, options}) =>
+              [
+                text,
+                (options as SearchTermSuggestOption[] | undefined)?.map(({text}) => text) ?? [],
+              ] as const,
+          )
+          .filter(([, suggestions]) => suggestions.length > 0) ?? [];
+  return {
+    terms: termsSuggestions.length === 0 ? undefined : Object.fromEntries(termsSuggestions),
+  };
+}

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

@@ -25,7 +25,7 @@ import {expect} from 'chai';
 import {bulk, DEFAULT_TEST_TIMEOUT} from '../common.js';
 import {testApp} from '../tests-setup.js';
 import {v4} from 'uuid';
-import bookFile from '@openstapps/core/test/resources/indexable/Book.2.json' with {type: 'json'};
+import bookFile from '@openstapps/core/test/resources/indexable/Book.2.json' assert {type: 'json'};
 
 const book = bookFile.instance as SCBook;
 

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

@@ -30,7 +30,7 @@ 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' with {type: 'json'};
+import registerRequest from '@openstapps/core/test/resources/PluginRegisterRequest.1.json' assert {type: 'json'};
 
 // for using promises in expectations (to.eventually.be...)
 use(chaiAsPromised);

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

@@ -18,7 +18,7 @@ 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' with {type: 'json'};
+import bookFile from '@openstapps/core/test/resources/indexable/Book.1.json' assert {type: 'json'};
 
 use(chaiAsPromised);
 

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

@@ -49,8 +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' with {type: 'json'};
+import messageFile from '@openstapps/core/test/resources/indexable/Message.1.json' assert {type: 'json'};
-import bookFile from '@openstapps/core/test/resources/indexable/Book.1.json' with {type: 'json'};
+import bookFile from '@openstapps/core/test/resources/indexable/Book.1.json' assert {type: 'json'};
 
 const message = messageFile.instance as SCMessage;
 const book = bookFile.instance as SCBook;

backend/database/CHANGELOG.md

@@ -1,17 +1,5 @@
 # @openstapps/database
 
-## 4.0.1
-
-### Patch Changes
-
-- b40ba7ad: Updated Elasticsearch dependency
-
-## 4.0.0
-
-### Major Changes
-
-- c8e29020: Update to Node 22
-
 ## 3.2.0
 
 ### Patch Changes

backend/database/Dockerfile

@@ -1,4 +1,4 @@
-FROM elasticsearch:8.14.3
+FROM elasticsearch:8.4.2
 
 EXPOSE 9200
 EXPOSE 9300

backend/database/package.json

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

backend/proxy/CHANGELOG.md

@@ -1,23 +1,5 @@
 # @openstapps/proxy
 
-## 4.0.2
-
-### Patch Changes
-
-- Updated dependencies [6b06de40]
-  - @openstapps/logger@4.0.2
-
-## 4.0.0
-
-### Major Changes
-
-- c8e29020: Update to Node 22
-
-### Patch Changes
-
-- Updated dependencies [c8e29020]
-  - @openstapps/logger@4.0.0
-
 ## 3.0.0
 
 ### Major Changes

backend/proxy/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/proxy",
   "description": "NGINX proxy that is dynamically configured by a Node.js script",
-  "version": "4.0.2",
+  "version": "3.0.0",
   "private": true,
   "type": "module",
   "license": "AGPL-3.0-only",
@@ -44,7 +44,7 @@
     "@openstapps/logger": "workspace:*",
     "@types/config": "3.3.0",
     "@types/dockerode": "3.3.17",
-    "@types/node": "22.15.31",
+    "@types/node": "18.15.3",
     "@types/sha1": "1.1.3",
     "config": "3.3.9",
     "dockerode": "3.3.5",
@@ -58,25 +58,25 @@
     "@openstapps/eslint-config": "workspace:*",
     "@openstapps/prettier-config": "workspace:*",
     "@openstapps/tsconfig": "workspace:*",
-    "@types/chai": "4.3.20",
+    "@types/chai": "4.3.5",
     "@types/config": "3.3.0",
     "@types/dockerode": "3.3.17",
-    "@types/mocha": "10.0.10",
+    "@types/mocha": "10.0.1",
     "@types/mustache": "4.2.2",
-    "@types/node": "22.15.31",
+    "@types/node": "18.15.3",
     "@types/proxyquire": "1.3.28",
     "@types/semver": "7.5.8",
     "@types/sha1": "1.1.3",
     "@types/sinon": "10.0.14",
     "@types/sinon-chai": "3.2.9",
-    "c8": "10.1.3",
+    "c8": "7.14.0",
-    "chai": "4.5.0",
+    "chai": "4.3.7",
-    "mocha": "10.8.2",
+    "mocha": "10.2.0",
     "mocha-junit-reporter": "2.2.0",
     "sinon": "15.0.4",
     "sinon-chai": "3.7.0",
     "ts-node": "10.9.2",
-    "tsup": "8.5.0"
+    "tsup": "6.7.0"
   },
   "tsup": {
     "entry": [

configuration/backend-config/CHANGELOG.md

@@ -1,17 +1,5 @@
 # @openstapps/backend-config
 
-## 4.0.3
-
-### Patch Changes
-
-- 3a274a3a: Upgrade to Capacitor 7 and Anuglar 18
-
-## 4.0.0
-
-### Major Changes
-
-- c8e29020: Update to Node 22
-
 ## 3.0.0
 
 ### Major Changes
@@ -42,7 +30,7 @@
 
   ```js
   #!/usr/bin/env node
-  import "./lib/app.js";
+  import './lib/app.js';
   ```
 
 - 64caebaf: Migrate to ESM
@@ -117,7 +105,7 @@
 
   ```js
   #!/usr/bin/env node
-  import "./lib/app.js";
+  import './lib/app.js';
   ```
 
 - 64caebaf: Migrate to ESM

configuration/backend-config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/backend-config",
   "description": "Backend Configuration for OpenStApps",
-  "version": "4.0.3",
+  "version": "3.0.0",
   "private": true,
   "type": "module",
   "license": "GPL-3.0-only",

configuration/backend-config/test/menu.de.xml

@@ -10,7 +10,7 @@
   <group title="canteen" title.de="Mensa" icon="local_cafe" route="/canteen"/>
   <group title="campus map" title.de="Campus Karte" icon="map" route="/map"/>
   <group title="my app" title.de="Meine App" icon="school" route="/profile">
-    <item title="favorites" title.de="Favoriten" icon="star" route="/favorites"/>
+    <item title="favorites" title.de="Favoriten" icon="grade" route="/favorites"/>
     <item title="schedule" title.de="Stundenplan" icon="calendar_today" route="/schedule"/>
     <item title="library account" title.de="Bibliothekskonto" icon="badge" route="/library-account" authProvider="paia"/>
     <item title="settings" title.de="Einstellungen" icon="settings" route="/settings"/>

configuration/backend-config/test/menu.xml

@@ -10,7 +10,7 @@
   <group title="canteen" title.de="Mensa" icon="local_cafe" route="/canteen"/>
   <group title="campus map" title.de="Campus Karte" icon="map" route="/map"/>
   <group title="my app" title.de="Meine App" icon="school" route="/profile">
-    <item title="favorites" title.de="Favoriten" icon="star" route="/favorites"/>
+    <item title="favorites" title.de="Favoriten" icon="grade" route="/favorites"/>
     <item title="schedule" title.de="Stundenplan" icon="calendar_today" route="/schedule"/>
     <item title="library account" title.de="Bibliothekskonto" icon="badge" route="/library-account" authProvider="paia"/>
     <item title="settings" title.de="Einstellungen" icon="settings" route="/settings"/>

configuration/eslint-config/CHANGELOG.md

@@ -1,17 +1,5 @@
 # @openstapps/eslint-config
 
-## 4.0.3
-
-### Patch Changes
-
-- 3a274a3a: Upgrade to Capacitor 7 and Anuglar 18
-
-## 4.0.0
-
-### Major Changes
-
-- c8e29020: Update to Node 22
-
 ## 3.0.0
 
 ### Major Changes
@@ -42,7 +30,7 @@
 
   ```js
   #!/usr/bin/env node
-  import "./lib/app.js";
+  import './lib/app.js';
   ```
 
 - 64caebaf: Migrate to ESM
@@ -87,14 +75,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
@@ -137,7 +122,7 @@
 
   ```js
   #!/usr/bin/env node
-  import "./lib/app.js";
+  import './lib/app.js';
   ```
 
 - 64caebaf: Migrate to ESM
@@ -182,14 +167,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/eslint-config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/eslint-config",
   "description": "A collection of configuration base files for StApps projects. Just an (unused) experiment for now.",
-  "version": "4.0.3",
+  "version": "3.0.0",
   "type": "commonjs",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/eslint-config.git",
@@ -17,13 +17,13 @@
   ],
   "devDependencies": {
     "@openstapps/tsconfig": "workspace:*",
-    "@types/node": "22.15.31",
+    "@types/node": "18.15.3",
     "eslint": "8.57.0",
     "typescript": "5.4.2"
   },
   "peerDependencies": {
-    "@typescript-eslint/eslint-plugin": "7.11.0",
+    "@typescript-eslint/eslint-plugin": "7.2.0",
-    "@typescript-eslint/parser": "7.11.0",
+    "@typescript-eslint/parser": "7.2.0",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-jsdoc": "48.2.1",

configuration/prettier-config/CHANGELOG.md

@@ -1,11 +1,5 @@
 # @openstapps/prettier-config
 
-## 4.0.0
-
-### Major Changes
-
-- c8e29020: Update to Node 22
-
 ## 3.2.0
 
 ### Patch Changes

configuration/prettier-config/index.js

@@ -12,4 +12,4 @@ const config = {
   endOfLine: 'lf'
 }
 
-module.exports = config;
+export default config;

configuration/prettier-config/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@openstapps/prettier-config",
   "description": "StApps Prettier Config",
-  "version": "4.0.0",
+  "version": "3.2.0",
-  "type": "commonjs",
+  "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/prettier-config.git",
   "author": "Thea Schöbl <dev@theaninova.de>",

configuration/projectmanagement/CHANGELOG.md

@@ -1,32 +1,5 @@
 # @openstapps/projectmanagement
 
-## 4.0.2
-
-### Patch Changes
-
-- Updated dependencies [6b06de40]
-  - @openstapps/logger@4.0.2
-  - @openstapps/gitlab-api@4.0.2
-
-## 4.0.1
-
-### Patch Changes
-
-- b40ba7ad: Updated Elasticsearch dependency
-
-## 4.0.0
-
-### Major Changes
-
-- c8e29020: Update to Node 22
-
-### Patch Changes
-
-- Updated dependencies [c8e29020]
-  - @openstapps/collection-utils@4.0.0
-  - @openstapps/gitlab-api@4.0.0
-  - @openstapps/logger@4.0.0
-
 ## 3.0.0
 
 ### Major Changes

configuration/projectmanagement/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/projectmanagement",
   "description": "Main documentation and scripts for maintenance.",
-  "version": "4.0.2",
+  "version": "3.0.0",
   "private": true,
   "type": "module",
   "license": "GPL-3.0-only",
@@ -41,29 +41,30 @@
     "@openstapps/collection-utils": "workspace:*",
     "@openstapps/gitlab-api": "workspace:*",
     "@openstapps/logger": "workspace:*",
+    "@slack/web-api": "6.8.1",
     "commander": "10.0.0",
     "date-fns": "3.6.0",
-    "glob": "10.5.0",
+    "glob": "10.3.10",
     "mustache": "4.2.0"
   },
   "devDependencies": {
     "@openstapps/eslint-config": "workspace:*",
     "@openstapps/prettier-config": "workspace:*",
     "@openstapps/tsconfig": "workspace:*",
-    "@types/chai": "4.3.20",
+    "@types/chai": "4.3.5",
-    "@types/chai-as-promised": "7.1.8",
+    "@types/chai-as-promised": "7.1.5",
     "@types/glob": "8.1.0",
-    "@types/mocha": "10.0.10",
+    "@types/mocha": "10.0.1",
     "@types/mustache": "4.2.2",
-    "@types/node": "22.15.31",
+    "@types/node": "18.15.3",
     "@types/tmp": "0.2.3",
-    "c8": "10.1.3",
+    "c8": "7.14.0",
-    "chai": "4.5.0",
+    "chai": "4.3.7",
-    "chai-as-promised": "7.1.2",
+    "chai-as-promised": "7.1.1",
-    "mocha": "10.8.2",
+    "mocha": "10.2.0",
     "mocha-junit-reporter": "2.2.0",
     "ts-node": "10.9.2",
-    "tsup": "8.5.0",
+    "tsup": "6.7.0",
     "typescript": "5.4.2"
   },
   "tsup": {

configuration/projectmanagement/src/tasks/remind.ts

@@ -22,6 +22,7 @@ import {
   User,
 } from '@openstapps/gitlab-api';
 import {Logger} from '@openstapps/logger';
+import {WebClient} from '@slack/web-api';
 import {CONCURRENCY, GROUPS, MAX_DEPTH_FOR_REMINDER, NOTE_PREFIX, SLACK_CHANNEL} from '../configuration.js';
 import {mapAsyncLimit} from '@openstapps/collection-utils';
 
@@ -52,7 +53,8 @@ export async function remind(api: Api): Promise<void> {
   Logger.info(`Found ${mergeRequests.length} open merge requests.`);
 
   // instantiate slack client
-  const client = undefined;
+  const client =
+    process.env.SLACK_API_TOKEN === undefined ? undefined : new WebClient(process.env.SLACK_API_TOKEN);
 
   // get members of the main group
   const members = await api.getMembers(MembershipScope.GROUPS, GROUPS[0]);

configuration/tsconfig/CHANGELOG.md

@@ -1,11 +1,5 @@
 # @openstapps/tsconfig
 
-## 4.0.0
-
-### Major Changes
-
-- c8e29020: Update to Node 22
-
 ## 3.3.0
 
 ### Minor Changes

configuration/tsconfig/package.json

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

coverage.mjs

@@ -9,7 +9,7 @@ const args = files.map(it => `${it.split('/', 2)[1]}='${it}'`);
 
 console.log(
   'Collecting coverage...',
-  await promisify(exec)(`merge-cobertura -o ./coverage.xml ${args.join(' ')}`),
+  await promisify(exec)(`cobertura-merge -o ./coverage.xml ${args.join(' ')}`),
 );
 
 const reportFiles = await glob('./*/*/coverage/report-junit.xml');

examples/minimal-connector/CHANGELOG.md

@@ -1,35 +1,5 @@
 # @openstapps/minimal-connector
 
-## 4.0.2
-
-### Patch Changes
-
-- Updated dependencies [6b06de40]
-  - @openstapps/logger@4.0.2
-  - @openstapps/core@4.0.2
-  - @openstapps/api@4.0.2
-
-## 4.0.1
-
-### Patch Changes
-
-- Updated dependencies [b40ba7ad]
-  - @openstapps/api@4.0.1
-  - @openstapps/core@4.0.0
-
-## 4.0.0
-
-### Major Changes
-
-- c8e29020: Update to Node 22
-
-### Patch Changes
-
-- Updated dependencies [c8e29020]
-  - @openstapps/api@4.0.0
-  - @openstapps/core@4.0.0
-  - @openstapps/logger@4.0.0
-
 ## 3.3.2
 
 ### 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": "4.0.2",
+  "version": "3.3.2",
   "private": true,
   "type": "module",
   "license": "GPL-3.0-only",
@@ -42,19 +42,19 @@
     "@openstapps/eslint-config": "workspace:*",
     "@openstapps/prettier-config": "workspace:*",
     "@openstapps/tsconfig": "workspace:*",
-    "@types/chai": "4.3.20",
+    "@types/chai": "4.3.5",
-    "@types/chai-as-promised": "7.1.8",
+    "@types/chai-as-promised": "7.1.5",
-    "@types/mocha": "10.0.10",
+    "@types/mocha": "10.0.1",
-    "@types/node": "22.15.31",
+    "@types/node": "18.15.3",
-    "c8": "10.1.3",
+    "c8": "7.14.0",
-    "chai": "4.5.0",
+    "chai": "4.3.7",
-    "chai-as-promised": "7.1.2",
+    "chai-as-promised": "7.1.1",
     "conventional-changelog-cli": "2.2.2",
-    "mocha": "10.8.2",
+    "mocha": "10.2.0",
     "mocha-junit-reporter": "2.2.0",
     "nock": "13.3.1",
     "ts-node": "10.9.2",
-    "tsup": "8.5.0",
+    "tsup": "6.7.0",
     "typescript": "5.4.2"
   },
   "tsup": {

examples/minimal-deployment/CHANGELOG.md

@@ -1,17 +1,5 @@
 # @openstapps/minimal-deployment
 
-## 4.0.1
-
-### Patch Changes
-
-- b40ba7ad: Updated Elasticsearch dependency
-
-## 4.0.0
-
-### Major Changes
-
-- c8e29020: Update to Node 22
-
 ## 3.0.0
 
 ### Patch Changes

examples/minimal-deployment/docker-compose.yml

@@ -1,21 +1,23 @@
+version: '3.7'
+
 x-development-variables: &development-variables
   NODE_ENV: "development"
   ALLOW_NO_TRANSPORT: "true"
 
 services:
   database:
-    image: registry.gitlab.com/openstapps/openstapps/database:4.0.1
+    image: registry.gitlab.com/openstapps/openstapps/database:3.0.0
     # If you need persistence for debugging purposes uncomment the following lines
-    # volumes:
+    #volumes:
     #  - ./database:/usr/share/elasticsearch/data
     expose:
       - 9200
     ports:
       - 127.0.0.1:9200:9200
     environment:
-    #  - bootstrap.memory_lock=true
+      - bootstrap.memory_lock=true
-    #  - discovery.type=single-node
+      - "ES_JAVA_OPTS=-Xms2g -Xmx2g"
-      - "ES_JAVA_OPTS=-Xms4g -Xmx4g"
+      - discovery.type=single-node
     ulimits:
       memlock:
         soft: -1
@@ -23,7 +25,7 @@ services:
     restart: unless-stopped
 
   backend:
-    image: registry.gitlab.com/openstapps/openstapps/backend:4.0.1
+    image: registry.gitlab.com/openstapps/openstapps/backend:3.1.0
     environment:
       <<: *development-variables
       ES_ADDR: "http://database:9200"
@@ -35,11 +37,10 @@ services:
     ports:
       - 127.0.0.1:3000:3000
     labels:
-      - stapps.version=4.0.0
+      - stapps.version=4.1.0
     restart: unless-stopped
     depends_on:
-      database:
+      - database
-        condition: service_healthy
     links:
       - database
 

examples/minimal-deployment/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openstapps/minimal-deployment",
-  "version": "4.0.1",
+  "version": "3.0.0",
   "private": true,
   "files": [
     "database",

examples/minimal-plugin/CHANGELOG.md

@@ -1,41 +1,5 @@
 # @openstapps/minimal-plugin
 
-## 4.0.2
-
-### Patch Changes
-
-- Updated dependencies [6b06de40]
-  - @openstapps/logger@4.0.2
-  - @openstapps/api-plugin@4.0.2
-  - @openstapps/core@4.0.2
-  - @openstapps/core-tools@4.0.2
-  - @openstapps/api@4.0.2
-
-## 4.0.1
-
-### Patch Changes
-
-- b40ba7ad: Updated Elasticsearch dependency
-- Updated dependencies [b40ba7ad]
-  - @openstapps/api-plugin@4.0.1
-  - @openstapps/api@4.0.1
-  - @openstapps/core@4.0.0
-
-## 4.0.0
-
-### Major Changes
-
-- c8e29020: Update to Node 22
-
-### Patch Changes
-
-- Updated dependencies [c8e29020]
-  - @openstapps/api@4.0.0
-  - @openstapps/api-plugin@4.0.0
-  - @openstapps/core@4.0.0
-  - @openstapps/core-tools@4.0.0
-  - @openstapps/logger@4.0.0
-
 ## 3.3.2
 
 ### Patch Changes

examples/minimal-plugin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/minimal-plugin",
   "description": "Minimal Plugin",
-  "version": "4.0.2",
+  "version": "3.3.2",
   "private": true,
   "type": "module",
   "license": "GPL-3.0-only",
@@ -34,7 +34,7 @@
     "@openstapps/core-tools": "workspace:*",
     "@openstapps/logger": "workspace:*",
     "commander": "10.0.0",
-    "express": "4.21.2",
+    "express": "4.18.2",
     "ts-node": "10.9.2"
   },
   "devDependencies": {
@@ -42,8 +42,8 @@
     "@openstapps/prettier-config": "workspace:*",
     "@openstapps/tsconfig": "workspace:*",
     "@types/express": "4.17.17",
-    "@types/node": "22.15.31",
+    "@types/node": "18.15.3",
-    "tsup": "8.5.0",
+    "tsup": "6.7.0",
     "typescript": "5.4.2"
   },
   "tsup": {

flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
+        "lastModified": 1709126324,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717112898,
+        "lastModified": 1709747860,
-        "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=",
+        "narHash": "sha256-RT4zuBy579m+l8VyIQFOR66WXfcs4g1jntZUHjh6eoI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0",
+        "rev": "58ae79ea707579c40102ddf62d84b902a987c58b",
         "type": "github"
       },
       "original": {

flake.nix

@@ -11,7 +11,7 @@
       flake-utils,
     }:
     let
-      aapt2buildToolsVersion = "34.0.0";
+      aapt2buildToolsVersion = "33.0.2";
     in
     flake-utils.lib.eachDefaultSystem (
       system:
@@ -19,7 +19,7 @@
         pkgs = import nixpkgs {
           inherit system;
           overlays = [
-            (final: prev: {
+            (final: prev: rec {
               fontMin = prev.python311.withPackages (
                 ps:
                 with ps;
@@ -30,20 +30,21 @@
                 ++ (with fonttools.optional-dependencies; [ woff ])
               );
               android = prev.androidenv.composeAndroidPackages {
-                buildToolsVersions = prev.lib.lists.unique [
+                buildToolsVersions = [
                   "34.0.0"
                   aapt2buildToolsVersion
                 ];
                 platformVersions = [ "34" ];
               };
               cypress = prev.cypress.overrideAttrs (cyPrev: rec {
-                version = "13.10.0";
+                version = "13.2.0";
                 src = prev.fetchzip {
                   url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
-                  hash = "sha256-wKNXo2lWndsQaouOiul0rsOWah+RRQ6fljzdeC8/KW4=";
+                  hash = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM=";
                 };
               });
-              nodejs = prev.nodejs_22;
+              nodejs = prev.nodejs_18;
+              corepack = prev.corepack_18;
             })
           ];
           config = {
@@ -53,6 +54,7 @@
         };
         androidFhs = pkgs.buildFHSUserEnv {
           name = "android-env";
+          targetPkgs = pkgs: with pkgs; [ ];
           runScript = "bash";
           profile = ''
             export ALLOW_NINJA_ENV=true
@@ -66,7 +68,7 @@
           nativeBuildInputs = [ androidFhs ];
           buildInputs = with pkgs; [
             nodejs
-            nodePackages.pnpm
+            corepack
             # tools
             curl
             jq
@@ -81,8 +83,6 @@
           GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${aapt2buildToolsVersion}/aapt2";
           CYPRESS_INSTALL_BINARY = "0";
           CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
-          # https://github.com/nodejs/node/issues/48444#issuecomment-1591882694
-          UV_USE_IO_URING = "0";
         };
       }
     );

frontend/app/.gitlab-ci.yml

@@ -1,10 +1,13 @@
 e2e:
-  image: registry.gitlab.com/openstapps/openstapps/app-cypress
+  image: registry.gitlab.com/openstapps/openstapps/app-cypress:node-18
   stage: test
   script:
-    - pnpm install
+    - pnpm --filter=@openstapps/app install
     - pnpm --filter=@openstapps/app exec cypress install
-    - pnpm test:integration:app --force --no-cache
+    - cd node_modules/.pnpm/re2*/node_modules/re2
+    - npm run install
+    - cd $CI_PROJECT_DIR
+    - pnpm test:integration:app
   artifacts:
     when: on_failure
     paths:

frontend/app/CHANGELOG.md

@@ -1,55 +1,5 @@
 # @openstapps/app
 
-## 4.0.3
-
-### Patch Changes
-
-- 3a274a3a: Upgrade to Capacitor 7 and Anuglar 18
-  - @openstapps/api@4.0.2
-  - @openstapps/collection-utils@4.0.0
-  - @openstapps/core@4.0.2
-
-## 4.0.2
-
-### Patch Changes
-
-- @openstapps/core@4.0.2
-- @openstapps/api@4.0.2
-
-## 4.0.1
-
-### Patch Changes
-
-- b40ba7ad: Updated Elasticsearch dependency
-- Updated dependencies [b40ba7ad]
-  - @openstapps/api@4.0.1
-  - @openstapps/core@4.0.0
-
-## 4.0.0
-
-### Major Changes
-
-- c8e29020: Update to Node 22
-
-### Patch Changes
-
-- b8ac30b9: Migrated IonIcons replacer to a custom component
-- b8ac30b9: Migrated to Ionic standalone components
-
-  Angular ESBuild will not work with `IonicModule` apps
-
-- b8ac30b9: Migrated to Angular ESBuild
-- Updated dependencies [c8e29020]
-  - @openstapps/api@4.0.0
-  - @openstapps/collection-utils@4.0.0
-  - @openstapps/core@4.0.0
-
-## 3.3.5
-
-### Patch Changes
-
-- 4c9d330c: fix user logout when token expires
-
 ## 3.3.4
 
 ### Minor Changes

frontend/app/Dockerfile

@@ -4,10 +4,10 @@
 FROM node:18-alpine3.18
 
 WORKDIR /app
-COPY www/browser /app/www/browser
+COPY www/ /app/www
 COPY package.json /app
 
 EXPOSE 8100
 
 RUN npm install -g http-server
-CMD http-server www/browser --p 8100
+CMD http-server www --p 8100

frontend/app/android/app/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    namespace = "de.anyschool.app"
+    namespace "de.anyschool.app"
-    compileSdk = rootProject.ext.compileSdkVersion
+    compileSdk rootProject.ext.compileSdkVersion
     defaultConfig {
         applicationId "de.anyschool.app"
         minSdkVersion rootProject.ext.minSdkVersion
@@ -13,7 +13,7 @@ android {
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
              // Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
-            ignoreAssetsPattern = '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
+            ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
         }
     }
     buildTypes {

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

@@ -2,14 +2,13 @@
 
 android {
   compileOptions {
-      sourceCompatibility JavaVersion.VERSION_21
+      sourceCompatibility JavaVersion.VERSION_17
-      targetCompatibility JavaVersion.VERSION_21
+      targetCompatibility JavaVersion.VERSION_17
   }
 }
 
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
-    implementation project(':capacitor-community-in-app-review')
     implementation project(':capacitor-community-screen-brightness')
     implementation project(':capacitor-app')
     implementation project(':capacitor-browser')

frontend/app/android/app/src/main/AndroidManifest.xml

@@ -9,7 +9,7 @@
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true">
         <activity
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation|density"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout"
             android:exported="true"
             android:label="@string/title_activity_main"
             android:launchMode="singleTask"

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

@@ -1,8 +1,4 @@
 [
-	{
-		"pkg": "@capacitor-community/in-app-review",
-		"classpath": "com.getcapacitor.community.inappreview.InAppReviewPlugin"
-	},
 	{
 		"pkg": "@capacitor-community/screen-brightness",
 		"classpath": "com.elylucas.capscreenbrightness.ScreenBrightnessPlugin"

frontend/app/android/app/src/main/res/values-night/styles.xml

@@ -7,6 +7,5 @@
         <item name="android:statusBarColor">@color/colorPrimary</item>
         <item name="android:windowBackground">@color/colorPrimary</item>
         <item name="android:navigationBarColor">@color/colorBackground</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
     </style>
 </resources>

frontend/app/android/app/src/main/res/values/styles.xml

@@ -7,7 +7,6 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
     </style>
 
     <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
@@ -18,7 +17,6 @@
         <item name="android:windowBackground">@color/colorPrimary</item>
         <item name="android:navigationBarColor">@color/colorBackground</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
     </style>
 
 

frontend/app/android/build.gradle

@@ -7,8 +7,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.13.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
-        classpath 'com.google.gms:google-services:4.4.4'
+        classpath 'com.google.gms:google-services:4.4.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

frontend/app/android/capacitor.settings.gradle

@@ -1,60 +1,57 @@
 // 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@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/android/capacitor')
+project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/android/capacitor')
-
-include ':capacitor-community-in-app-review'
-project(':capacitor-community-in-app-review').projectDir = new File('../../../node_modules/.pnpm/@capacitor-community+in-app-review@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor-community/in-app-review/android')
 
 include ':capacitor-community-screen-brightness'
-project(':capacitor-community-screen-brightness').projectDir = new File('../../../node_modules/.pnpm/@capacitor-community+screen-brightness@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor-community/screen-brightness/android')
+project(':capacitor-community-screen-brightness').projectDir = new File('../../../node_modules/.pnpm/@capacitor-community+screen-brightness@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor-community/screen-brightness/android')
 
 include ':capacitor-app'
-project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/app/android')
+project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/app/android')
 
 include ':capacitor-browser'
-project(':capacitor-browser').projectDir = new File('../../../node_modules/.pnpm/@capacitor+browser@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/browser/android')
+project(':capacitor-browser').projectDir = new File('../../../node_modules/.pnpm/@capacitor+browser@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/browser/android')
 
 include ':capacitor-clipboard'
-project(':capacitor-clipboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+clipboard@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/clipboard/android')
+project(':capacitor-clipboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/clipboard/android')
 
 include ':capacitor-device'
-project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/device/android')
+project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/device/android')
 
 include ':capacitor-dialog'
-project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/@capacitor+dialog@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/dialog/android')
+project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/dialog/android')
 
 include ':capacitor-filesystem'
-project(':capacitor-filesystem').projectDir = new File('../../../node_modules/.pnpm/@capacitor+filesystem@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/filesystem/android')
+project(':capacitor-filesystem').projectDir = new File('../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/filesystem/android')
 
 include ':capacitor-geolocation'
-project(':capacitor-geolocation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+geolocation@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/geolocation/android')
+project(':capacitor-geolocation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/geolocation/android')
 
 include ':capacitor-haptics'
-project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/haptics/android')
+project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/haptics/android')
 
 include ':capacitor-keyboard'
-project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+keyboard@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/keyboard/android')
+project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/keyboard/android')
 
 include ':capacitor-local-notifications'
-project(':capacitor-local-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+local-notifications@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/local-notifications/android')
+project(':capacitor-local-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/local-notifications/android')
 
 include ':capacitor-network'
-project(':capacitor-network').projectDir = new File('../../../node_modules/.pnpm/@capacitor+network@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/network/android')
+project(':capacitor-network').projectDir = new File('../../../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/network/android')
 
 include ':capacitor-preferences'
-project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/preferences/android')
+project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/preferences/android')
 
 include ':capacitor-screen-orientation'
-project(':capacitor-screen-orientation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+screen-orientation@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/screen-orientation/android')
+project(':capacitor-screen-orientation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/screen-orientation/android')
 
 include ':capacitor-share'
-project(':capacitor-share').projectDir = new File('../../../node_modules/.pnpm/@capacitor+share@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/share/android')
+project(':capacitor-share').projectDir = new File('../../../node_modules/.pnpm/@capacitor+share@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/share/android')
 
 include ':capacitor-splash-screen'
-project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/splash-screen/android')
+project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.1_@capacitor+core@6.1.1/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@7.1.0_@capacitor+core@8.0.0/node_modules/@transistorsoft/capacitor-background-fetch/android')
+project(':transistorsoft-capacitor-background-fetch').projectDir = new File('../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.2.0_@capacitor+core@6.1.1/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.12.0_@capacitor+core@8.0.0/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@6.1.1/node_modules/capacitor-secure-storage-plugin/android')

frontend/app/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
 networkTimeout=10000
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

frontend/app/android/gradlew

@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -85,8 +83,10 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -133,13 +133,10 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -147,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -155,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -200,20 +197,16 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-
+# Collect all arguments for the java command;
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+#     shell script including quotes and variable substitutions, so put them in
-
+#     double quotes to make sure that they get re-expanded; and
-# Collect all arguments for the java command:
+#   * put everything else in single quotes, so that it's not re-expanded.
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.

frontend/app/android/gradlew.bat

@@ -13,8 +13,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -45,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo. 1>&2
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation. 1>&2
+echo location of your Java installation.
 
 goto fail
 
@@ -59,22 +57,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo. 1>&2
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation. 1>&2
+echo location of your Java installation.
 
 goto fail
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

frontend/app/android/variables.gradle

@@ -1,16 +1,16 @@
 ext {
-    minSdkVersion = 24
+    minSdkVersion = 22
-    compileSdkVersion = 36
+    compileSdkVersion = 34
-    targetSdkVersion = 36
+    targetSdkVersion = 34
-    androidxActivityVersion = '1.11.0'
+    androidxActivityVersion = '1.8.0'
-    androidxAppCompatVersion = '1.7.1'
+    androidxAppCompatVersion = '1.6.1'
-    androidxCoordinatorLayoutVersion = '1.3.0'
+    androidxCoordinatorLayoutVersion = '1.2.0'
-    androidxCoreVersion = '1.17.0'
+    androidxCoreVersion = '1.12.0'
-    androidxFragmentVersion = '1.8.9'
+    androidxFragmentVersion = '1.6.2'
-    coreSplashScreenVersion = '1.2.0'
+    coreSplashScreenVersion = '1.0.1'
-    androidxWebkitVersion = '1.14.0'
+    androidxWebkitVersion = '1.9.0'
     junitVersion = '4.13.2'
-    androidxJunitVersion = '1.3.0'
+    androidxJunitVersion = '1.1.5'
-    androidxEspressoCoreVersion = '3.7.0'
+    androidxEspressoCoreVersion = '3.5.1'
-    cordovaAndroidVersion = '14.0.1'
+    cordovaAndroidVersion = '10.1.1'
 }

frontend/app/angular.json

@@ -11,12 +11,12 @@
       "schematics": {},
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:application",
+          "builder": "@angular-devkit/build-angular:browser",
           "options": {
             "outputPath": "www",
             "index": "src/index.html",
-            "browser": "src/main.ts",
+            "main": "src/main.ts",
-            "polyfills": ["zone.js", "src/ion-icons.js"],
+            "polyfills": "zone.js",
             "tsConfig": "tsconfig.app.json",
             "allowedCommonJsDependencies": [
               "moment",
@@ -72,7 +72,9 @@
               ]
             },
             "development": {
+              "buildOptimizer": false,
               "optimization": false,
+              "vendorChunk": true,
               "extractLicenses": false,
               "sourceMap": true,
               "namedChunks": true

frontend/app/capacitor.config.ts

@@ -3,7 +3,7 @@ import {CapacitorConfig} from '@capacitor/cli';
 const config: CapacitorConfig = {
   appId: 'de.anyschool.app',
   appName: 'StApps',
-  webDir: 'www/browser',
+  webDir: 'www',
   cordova: {
     preferences: {
       'AndroidXEnabled': 'true',

frontend/app/cypress.config.ts

@@ -22,7 +22,6 @@ export default defineConfig({
       mochaFile: 'coverage/integration-report-junit-[hash].xml',
     },
     baseUrl: 'http://localhost:4200',
-    injectDocumentDomain: true,
     supportFile: 'cypress/support/index.ts',
     videosFolder: 'cypress/videos',
     screenshotsFolder: 'cypress/screenshots',

frontend/app/cypress/fixtures/config/default-config.json

@@ -299,7 +299,7 @@
         "icon": "school",
         "items": [
           {
-            "icon": "star",
+            "icon": "grade",
             "route": "/favorites",
             "title": "favorites",
             "translations": {

frontend/app/cypress/integration/context-menu.spec.ts

@@ -14,8 +14,6 @@
  */
 
 describe('context menu', function () {
-  const contextMenuSelector = 'stapps-context-menu-modal';
-
   beforeEach(function () {
     cy.interceptSearch({
       extends: {query: 'a'},
@@ -31,25 +29,25 @@ describe('context menu', function () {
     cy.patchSearchPage();
     cy.get('ion-searchbar').type('a');
     cy.wait('@search');
-    cy.get('ion-toolbar > ion-menu-button').click();
+    cy.get('ion-searchbar > ion-menu-button').click();
   });
 
   it('should sort', function () {
-    cy.get(contextMenuSelector).within(() => {
+    cy.get('stapps-context').within(() => {
       cy.contains('ion-item', 'Name').click();
       cy.wait('@search');
     });
   });
 
   it('should filter', function () {
-    cy.get(contextMenuSelector).within(() => {
+    cy.get('stapps-context').within(() => {
       cy.contains('ion-item', '(17) Akademische Veranstaltung').click();
       cy.wait('@search');
     });
   });
 
   it('should have a working delete button', function () {
-    cy.get(contextMenuSelector).within(() => {
+    cy.get('stapps-context').within(() => {
       cy.contains('ion-item', '(17) Akademische Veranstaltung').click();
 
       cy.get('.checkbox-checked').should('have.length', 1);
@@ -62,7 +60,7 @@ describe('context menu', function () {
   it('should truncate long category items', function () {
     cy.contains('ion-list', 'Akademische Veranstaltung / Kategorien').within(() => {
       cy.contains('ion-item', '(1) Tutorium').should('not.exist');
-      cy.get('ion-button').click();
+      cy.get('div > ion-button').click();
       cy.contains('ion-item', '(1) Tutorium').should('exist');
     });
   });

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

@@ -33,9 +33,9 @@ describe('dashboard', async function () {
   describe('schedule section', function () {
     it('should lead to the week overview', function () {
       cy.get('.schedule')
-        .contains('a', /Wochen.*ansicht/)
+        .contains('a', /Wochen.*übersicht/)
         .click();
-      cy.url().should('include', '/schedule/weekly-view');
+      cy.url().should('include', '/schedule/week-overview');
     });
 
     it('should lead to the calendar', function () {

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

@@ -100,7 +100,7 @@ describe('schedule', function () {
     cy.get('ion-searchbar').click().type('a');
     cy.wait('@search');
     cy.wait('@chips');
-    cy.wait(1000);
+    cy.wait(200);
     cy.contains('ion-item', 'UNIcert (Test)')
       .contains('stapps-add-event-action-chip', 'Termine Auswählen')
       .click();

frontend/app/cypress/support/commands/backend.ts

@@ -16,8 +16,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import equal from 'fast-deep-equal';
 import {extendsDeepEqual} from '@openstapps/collection-utils';
-import {CORE_VERSION, SCIndexResponse, SCSearchRequest, SCSearchResponse} from '@openstapps/core';
+import {SCSearchRequest, SCSearchResponse} from '@openstapps/core';
-import * as defaultConfig from '../../fixtures/config/default-config.json';
 
 type InterceptArguments = {
   fixture?: string | SCSearchResponse | ((request: SCSearchRequest) => SCSearchResponse);
@@ -35,12 +34,7 @@ type InterceptArguments = {
  *
  */
 export function interceptConfig(config?: string) {
-  let localConfig: SCIndexResponse = defaultConfig as unknown as SCIndexResponse;
+  cy.intercept({url: '/', method: 'POST'}, {fixture: config || 'config/default-config.json'}).as('config');
-  localConfig.backend.SCVersion = CORE_VERSION;
-  cy.intercept(
-    {url: '/', method: 'POST'},
-    config ? {fixture: config} : {body: JSON.stringify(localConfig)},
-  ).as('config');
 }
 
 /**

frontend/app/icons.config.mjs

@@ -20,7 +20,7 @@ const config = {
   htmlGlob: 'src/**/*.html',
   scriptGlob: 'src/**/*.ts',
   additionalIcons: {
-    about: ['copyright', 'campaign', 'policy', 'description', 'text_snippet', 'expand_more', 'expand_all'],
+    about: ['copyright', 'campaign', 'policy', 'description', 'text_snippet'],
     navigation: [
       'home',
       'newspaper',
@@ -30,7 +30,7 @@ const config = {
       'local_library',
       'inventory_2',
       'map',
-      'star',
+      'grade',
       'account_circle',
       'settings',
       'info',

frontend/app/integration-test.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
-rm coverage/integration-report-junit-*.xml || true
+rm coverage/integration-report-junit-*.xml
 
 ng e2e --watch=false --headless=true --browser="$BROWSER"
 exit_code=$?
 
-jrm coverage/integration-report-junit.xml coverage/integration-report-junit-*.xml || true
+jrm coverage/integration-report-junit.xml coverage/integration-report-junit-*.xml
-rm coverage/integration-report-junit-*.xml || true
+rm coverage/integration-report-junit-*.xml
 
 exit $exit_code

frontend/app/ios/App/App.xcodeproj/project.pbxproj

@@ -109,7 +109,6 @@
 				504EC3011FED79650016851F /* Frameworks */,
 				504EC3021FED79650016851F /* Resources */,
 				F40DBF7576173B02228B7A71 /* [CP] Embed Pods Frameworks */,
-				2D217985258DD775FC9B6A72 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -171,21 +170,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		2D217985258DD775FC9B6A72 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		947055B15D65E7FC3ADB1FEB /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -304,7 +288,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -355,7 +339,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -373,7 +357,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = YSGS9WV338;
 				INFOPLIST_FILE = App/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = de.openstapps.app;
@@ -395,7 +379,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = YSGS9WV338;
 				INFOPLIST_FILE = App/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = de.openstapps.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";

frontend/app/ios/App/Podfile

@@ -1,6 +1,6 @@
-require_relative '../../../../node_modules/.pnpm/@capacitor+ios@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/ios/scripts/pods_helpers'
+require_relative '../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios/scripts/pods_helpers'
 
-platform :ios, '15.0'
+platform :ios, '13.0'
 use_frameworks!
 
 # workaround to avoid Xcode caching of Pods that requires
@@ -9,27 +9,26 @@ use_frameworks!
 install! 'cocoapods', :disable_input_output_paths => true
 
 def capacitor_pods
-  pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/ios'
+  pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios'
-  pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/ios'
+  pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios'
-  pod 'CapacitorCommunityInAppReview', :path => '../../../../node_modules/.pnpm/@capacitor-community+in-app-review@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor-community/in-app-review'
+  pod 'CapacitorCommunityScreenBrightness', :path => '../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor-community/screen-brightness'
-  pod 'CapacitorCommunityScreenBrightness', :path => '../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor-community/screen-brightness'
+  pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/app'
-  pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@capacitor+app@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/app'
+  pod 'CapacitorBrowser', :path => '../../../../node_modules/.pnpm/@capacitor+browser@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/browser'
-  pod 'CapacitorBrowser', :path => '../../../../node_modules/.pnpm/@capacitor+browser@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/browser'
+  pod 'CapacitorClipboard', :path => '../../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/clipboard'
-  pod 'CapacitorClipboard', :path => '../../../../node_modules/.pnpm/@capacitor+clipboard@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/clipboard'
+  pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/device'
-  pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@capacitor+device@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/device'
+  pod 'CapacitorDialog', :path => '../../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/dialog'
-  pod 'CapacitorDialog', :path => '../../../../node_modules/.pnpm/@capacitor+dialog@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/dialog'
+  pod 'CapacitorFilesystem', :path => '../../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/filesystem'
-  pod 'CapacitorFilesystem', :path => '../../../../node_modules/.pnpm/@capacitor+filesystem@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/filesystem'
+  pod 'CapacitorGeolocation', :path => '../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/geolocation'
-  pod 'CapacitorGeolocation', :path => '../../../../node_modules/.pnpm/@capacitor+geolocation@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/geolocation'
+  pod 'CapacitorHaptics', :path => '../../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/haptics'
-  pod 'CapacitorHaptics', :path => '../../../../node_modules/.pnpm/@capacitor+haptics@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/haptics'
+  pod 'CapacitorKeyboard', :path => '../../../../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/keyboard'
-  pod 'CapacitorKeyboard', :path => '../../../../node_modules/.pnpm/@capacitor+keyboard@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/keyboard'
+  pod 'CapacitorLocalNotifications', :path => '../../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/local-notifications'
-  pod 'CapacitorLocalNotifications', :path => '../../../../node_modules/.pnpm/@capacitor+local-notifications@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/local-notifications'
+  pod 'CapacitorNetwork', :path => '../../../../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/network'
-  pod 'CapacitorNetwork', :path => '../../../../node_modules/.pnpm/@capacitor+network@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/network'
+  pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/preferences'
-  pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/preferences'
+  pod 'CapacitorScreenOrientation', :path => '../../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/screen-orientation'
-  pod 'CapacitorScreenOrientation', :path => '../../../../node_modules/.pnpm/@capacitor+screen-orientation@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/screen-orientation'
+  pod 'CapacitorShare', :path => '../../../../node_modules/.pnpm/@capacitor+share@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/share'
-  pod 'CapacitorShare', :path => '../../../../node_modules/.pnpm/@capacitor+share@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/share'
+  pod 'CapacitorSplashScreen', :path => '../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/splash-screen'
-  pod 'CapacitorSplashScreen', :path => '../../../../node_modules/.pnpm/@capacitor+splash-screen@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/splash-screen'
+  pod 'TransistorsoftCapacitorBackgroundFetch', :path => '../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.2.0_@capacitor+core@6.1.1/node_modules/@transistorsoft/capacitor-background-fetch'
-  pod 'TransistorsoftCapacitorBackgroundFetch', :path => '../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@7.1.0_@capacitor+core@8.0.0/node_modules/@transistorsoft/capacitor-background-fetch'
+  pod 'CapacitorSecureStoragePlugin', :path => '../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@6.1.1/node_modules/capacitor-secure-storage-plugin'
-  pod 'CapacitorSecureStoragePlugin', :path => '../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.12.0_@capacitor+core@8.0.0/node_modules/capacitor-secure-storage-plugin'
   pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
 end
 

frontend/app/ios/App/Podfile.lock

@@ -1,157 +1,143 @@
 PODS:
-  - Capacitor (8.0.0):
+  - Capacitor (6.1.1):
     - CapacitorCordova
-  - CapacitorApp (8.0.0):
+  - CapacitorApp (6.0.0):
     - Capacitor
-  - CapacitorBrowser (8.0.0):
+  - CapacitorBrowser (6.0.1):
     - Capacitor
-  - CapacitorClipboard (8.0.0):
+  - CapacitorClipboard (6.0.0):
     - Capacitor
-  - CapacitorCommunityInAppReview (8.0.0):
+  - CapacitorCommunityScreenBrightness (6.0.0):
     - Capacitor
-  - CapacitorCommunityScreenBrightness (8.0.0):
+  - CapacitorCordova (6.1.1)
+  - CapacitorDevice (6.0.0):
     - Capacitor
-  - CapacitorCordova (8.0.0)
+  - CapacitorDialog (6.0.0):
-  - CapacitorDevice (8.0.0):
     - Capacitor
-  - CapacitorDialog (8.0.0):
+  - CapacitorFilesystem (6.0.0):
     - Capacitor
-  - CapacitorFilesystem (8.0.0):
+  - CapacitorGeolocation (6.0.0):
     - Capacitor
-    - IONFilesystemLib (~> 1.0.1)
+  - CapacitorHaptics (6.0.0):
-  - CapacitorGeolocation (8.0.0):
     - Capacitor
-    - IONGeolocationLib (= 2.0.0)
+  - CapacitorKeyboard (6.0.1):
-  - CapacitorHaptics (8.0.0):
     - Capacitor
-  - CapacitorKeyboard (8.0.0):
+  - CapacitorLocalNotifications (6.0.0):
     - Capacitor
-  - CapacitorLocalNotifications (8.0.0):
+  - CapacitorNetwork (6.0.1):
     - Capacitor
-  - CapacitorNetwork (8.0.0):
+  - CapacitorPreferences (6.0.1):
     - Capacitor
-  - CapacitorPreferences (8.0.0):
+  - CapacitorScreenOrientation (6.0.1):
     - Capacitor
-  - CapacitorScreenOrientation (8.0.0):
+  - CapacitorSecureStoragePlugin (0.9.0):
-    - Capacitor
-  - CapacitorSecureStoragePlugin (0.12.0):
     - Capacitor
     - SwiftKeychainWrapper
-  - CapacitorShare (8.0.0):
+  - CapacitorShare (6.0.1):
     - Capacitor
-  - CapacitorSplashScreen (8.0.0):
+  - CapacitorSplashScreen (6.0.1):
     - Capacitor
-  - CordovaPlugins (8.0.0):
+  - CordovaPlugins (6.1.1):
     - CapacitorCordova
-  - IONFilesystemLib (1.0.1)
-  - IONGeolocationLib (2.0.0)
   - SwiftKeychainWrapper (4.0.1)
-  - TransistorsoftCapacitorBackgroundFetch (7.1.0):
+  - TransistorsoftCapacitorBackgroundFetch (5.2.0):
     - Capacitor
 
 DEPENDENCIES:
-  - "Capacitor (from `../../../../node_modules/.pnpm/@capacitor+ios@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/ios`)"
+  - "Capacitor (from `../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios`)"
-  - "CapacitorApp (from `../../../../node_modules/.pnpm/@capacitor+app@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/app`)"
+  - "CapacitorApp (from `../../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/app`)"
-  - "CapacitorBrowser (from `../../../../node_modules/.pnpm/@capacitor+browser@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/browser`)"
+  - "CapacitorBrowser (from `../../../../node_modules/.pnpm/@capacitor+browser@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/browser`)"
-  - "CapacitorClipboard (from `../../../../node_modules/.pnpm/@capacitor+clipboard@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/clipboard`)"
+  - "CapacitorClipboard (from `../../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/clipboard`)"
-  - "CapacitorCommunityInAppReview (from `../../../../node_modules/.pnpm/@capacitor-community+in-app-review@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor-community/in-app-review`)"
+  - "CapacitorCommunityScreenBrightness (from `../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor-community/screen-brightness`)"
-  - "CapacitorCommunityScreenBrightness (from `../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor-community/screen-brightness`)"
+  - "CapacitorCordova (from `../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios`)"
-  - "CapacitorCordova (from `../../../../node_modules/.pnpm/@capacitor+ios@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/ios`)"
+  - "CapacitorDevice (from `../../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/device`)"
-  - "CapacitorDevice (from `../../../../node_modules/.pnpm/@capacitor+device@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/device`)"
+  - "CapacitorDialog (from `../../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/dialog`)"
-  - "CapacitorDialog (from `../../../../node_modules/.pnpm/@capacitor+dialog@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/dialog`)"
+  - "CapacitorFilesystem (from `../../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/filesystem`)"
-  - "CapacitorFilesystem (from `../../../../node_modules/.pnpm/@capacitor+filesystem@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/filesystem`)"
+  - "CapacitorGeolocation (from `../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/geolocation`)"
-  - "CapacitorGeolocation (from `../../../../node_modules/.pnpm/@capacitor+geolocation@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/geolocation`)"
+  - "CapacitorHaptics (from `../../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/haptics`)"
-  - "CapacitorHaptics (from `../../../../node_modules/.pnpm/@capacitor+haptics@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/haptics`)"
+  - "CapacitorKeyboard (from `../../../../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/keyboard`)"
-  - "CapacitorKeyboard (from `../../../../node_modules/.pnpm/@capacitor+keyboard@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/keyboard`)"
+  - "CapacitorLocalNotifications (from `../../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/local-notifications`)"
-  - "CapacitorLocalNotifications (from `../../../../node_modules/.pnpm/@capacitor+local-notifications@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/local-notifications`)"
+  - "CapacitorNetwork (from `../../../../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/network`)"
-  - "CapacitorNetwork (from `../../../../node_modules/.pnpm/@capacitor+network@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/network`)"
+  - "CapacitorPreferences (from `../../../../node_modules/.pnpm/@capacitor+preferences@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/preferences`)"
-  - "CapacitorPreferences (from `../../../../node_modules/.pnpm/@capacitor+preferences@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/preferences`)"
+  - "CapacitorScreenOrientation (from `../../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/screen-orientation`)"
-  - "CapacitorScreenOrientation (from `../../../../node_modules/.pnpm/@capacitor+screen-orientation@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/screen-orientation`)"
+  - "CapacitorSecureStoragePlugin (from `../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@6.1.1/node_modules/capacitor-secure-storage-plugin`)"
-  - "CapacitorSecureStoragePlugin (from `../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.12.0_@capacitor+core@8.0.0/node_modules/capacitor-secure-storage-plugin`)"
+  - "CapacitorShare (from `../../../../node_modules/.pnpm/@capacitor+share@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/share`)"
-  - "CapacitorShare (from `../../../../node_modules/.pnpm/@capacitor+share@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/share`)"
+  - "CapacitorSplashScreen (from `../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/splash-screen`)"
-  - "CapacitorSplashScreen (from `../../../../node_modules/.pnpm/@capacitor+splash-screen@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/splash-screen`)"
   - CordovaPlugins (from `../capacitor-cordova-ios-plugins`)
-  - "TransistorsoftCapacitorBackgroundFetch (from `../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@7.1.0_@capacitor+core@8.0.0/node_modules/@transistorsoft/capacitor-background-fetch`)"
+  - "TransistorsoftCapacitorBackgroundFetch (from `../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.2.0_@capacitor+core@6.1.1/node_modules/@transistorsoft/capacitor-background-fetch`)"
 
 SPEC REPOS:
   trunk:
-    - IONFilesystemLib
-    - IONGeolocationLib
     - SwiftKeychainWrapper
 
 EXTERNAL SOURCES:
   Capacitor:
-    :path: "../../../../node_modules/.pnpm/@capacitor+ios@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/ios"
+    :path: "../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios"
   CapacitorApp:
-    :path: "../../../../node_modules/.pnpm/@capacitor+app@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/app"
+    :path: "../../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/app"
   CapacitorBrowser:
-    :path: "../../../../node_modules/.pnpm/@capacitor+browser@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/browser"
+    :path: "../../../../node_modules/.pnpm/@capacitor+browser@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/browser"
   CapacitorClipboard:
-    :path: "../../../../node_modules/.pnpm/@capacitor+clipboard@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/clipboard"
+    :path: "../../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/clipboard"
-  CapacitorCommunityInAppReview:
-    :path: "../../../../node_modules/.pnpm/@capacitor-community+in-app-review@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor-community/in-app-review"
   CapacitorCommunityScreenBrightness:
-    :path: "../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor-community/screen-brightness"
+    :path: "../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor-community/screen-brightness"
   CapacitorCordova:
-    :path: "../../../../node_modules/.pnpm/@capacitor+ios@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/ios"
+    :path: "../../../../node_modules/.pnpm/@capacitor+ios@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/ios"
   CapacitorDevice:
-    :path: "../../../../node_modules/.pnpm/@capacitor+device@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/device"
+    :path: "../../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/device"
   CapacitorDialog:
-    :path: "../../../../node_modules/.pnpm/@capacitor+dialog@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/dialog"
+    :path: "../../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/dialog"
   CapacitorFilesystem:
-    :path: "../../../../node_modules/.pnpm/@capacitor+filesystem@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/filesystem"
+    :path: "../../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/filesystem"
   CapacitorGeolocation:
-    :path: "../../../../node_modules/.pnpm/@capacitor+geolocation@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/geolocation"
+    :path: "../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/geolocation"
   CapacitorHaptics:
-    :path: "../../../../node_modules/.pnpm/@capacitor+haptics@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/haptics"
+    :path: "../../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/haptics"
   CapacitorKeyboard:
-    :path: "../../../../node_modules/.pnpm/@capacitor+keyboard@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/keyboard"
+    :path: "../../../../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/keyboard"
   CapacitorLocalNotifications:
-    :path: "../../../../node_modules/.pnpm/@capacitor+local-notifications@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/local-notifications"
+    :path: "../../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/local-notifications"
   CapacitorNetwork:
-    :path: "../../../../node_modules/.pnpm/@capacitor+network@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/network"
+    :path: "../../../../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/network"
   CapacitorPreferences:
-    :path: "../../../../node_modules/.pnpm/@capacitor+preferences@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/preferences"
+    :path: "../../../../node_modules/.pnpm/@capacitor+preferences@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/preferences"
   CapacitorScreenOrientation:
-    :path: "../../../../node_modules/.pnpm/@capacitor+screen-orientation@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/screen-orientation"
+    :path: "../../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/screen-orientation"
   CapacitorSecureStoragePlugin:
-    :path: "../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.12.0_@capacitor+core@8.0.0/node_modules/capacitor-secure-storage-plugin"
+    :path: "../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@6.1.1/node_modules/capacitor-secure-storage-plugin"
   CapacitorShare:
-    :path: "../../../../node_modules/.pnpm/@capacitor+share@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/share"
+    :path: "../../../../node_modules/.pnpm/@capacitor+share@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/share"
   CapacitorSplashScreen:
-    :path: "../../../../node_modules/.pnpm/@capacitor+splash-screen@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/splash-screen"
+    :path: "../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/splash-screen"
   CordovaPlugins:
     :path: "../capacitor-cordova-ios-plugins"
   TransistorsoftCapacitorBackgroundFetch:
-    :path: "../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@7.1.0_@capacitor+core@8.0.0/node_modules/@transistorsoft/capacitor-background-fetch"
+    :path: "../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.2.0_@capacitor+core@6.1.1/node_modules/@transistorsoft/capacitor-background-fetch"
 
 SPEC CHECKSUMS:
-  Capacitor: 341ff7cf652ec695d1a8ebf604db448ac7b6d635
+  Capacitor: 8941aba4364ba9d1b22188569001f2ce45cc2b00
-  CapacitorApp: 3963a84197280757b84f126afd1520a85ae3b092
+  CapacitorApp: 9d53aec7101f7b030a950c5bdc4df8612576b279
-  CapacitorBrowser: b7d7f05f840fe042e46f6528bb8db853e3058fb2
+  CapacitorBrowser: 473c7fd70ddbe541608ff09ec1be14da0078279e
-  CapacitorClipboard: 61832a3722adc61afed6e0191c8a0e11ba11674d
+  CapacitorClipboard: 80282f684154124b9019ebf401235b70b0cf4994
-  CapacitorCommunityInAppReview: 4492bdd34aad4d27ed87949376022cc93b294ea1
+  CapacitorCommunityScreenBrightness: 250184917bd0738a681c026a9513e18ddb0cb49b
-  CapacitorCommunityScreenBrightness: e4075e1181f7e88259edb8b1e3b9a209e1144d45
+  CapacitorCordova: 8f2cc8d8d3619c566e9418fe8772064a94266106
-  CapacitorCordova: 5dc3912d25ef770a3fe0f431bb65c9fbfa2e92f9
+  CapacitorDevice: f8fd88f9edd1261c55a109f32015b09bbbfdc4a0
-  CapacitorDevice: 9a16fb36a19ff391bf75afbe3cf16f883b3b3aa0
+  CapacitorDialog: 64aa82840ee5e9c066f9e1a49c1e186afd3f24d2
-  CapacitorDialog: 3721e40dd075f590328166c29b4e982dbeedeb56
+  CapacitorFilesystem: 60e59ba274c234a979e7a3be2552feaadcee4263
-  CapacitorFilesystem: 2cb7c29536024668f333266a2177f8c10bbd9c98
+  CapacitorGeolocation: 1f12bbe372b65116e851bd8e3a94cf0ef9bacebb
-  CapacitorGeolocation: 8a405e707de9aff6ac9eca7f408966a370f7ca33
+  CapacitorHaptics: 9ebc9363f0e9b8eb4295088a0b474530acf1859b
-  CapacitorHaptics: 2079d9fa04c5a71e18663b4722323c304c58245c
+  CapacitorKeyboard: 5f32a712adf41e07a61caafb82cf29fb6d8ba123
-  CapacitorKeyboard: d7868c079a4d5277a3deca27a10a488fcbbb8b69
+  CapacitorLocalNotifications: 4ab68f0be5f697a579558fadd307d823a9ec1c26
-  CapacitorLocalNotifications: 177cfbf8228d9bd82a147e094cb7984d7afb9e29
+  CapacitorNetwork: 5c94acfdddc22043f2ffaff224ce9b4aa5a179f0
-  CapacitorNetwork: 156f8096cbbce5337eb1769fcc0d6adc4b85d3f3
+  CapacitorPreferences: 72909b165bc7807103778ddbb86d5d8ce06abf71
-  CapacitorPreferences: 443fabe9670226200e595658a87ef0b1566716d4
+  CapacitorScreenOrientation: 3d4965dcbda5d901b6a48350a5d270ad7d404e05
-  CapacitorScreenOrientation: d962f79e5bcbba4e01e9dc0cd872abf465fb943f
+  CapacitorSecureStoragePlugin: e91d7df060f2495a1acff9583641a6953e3aacba
-  CapacitorSecureStoragePlugin: 50de0808ad398aa401e00f9e58adf88c77cb3c25
+  CapacitorShare: 02222f2457ff003e642370a9c1ecd101baaa27c8
-  CapacitorShare: 12f1d192170cbcf9f108fd675ac8e343761a4638
+  CapacitorSplashScreen: 61645214e8f955ff2b80f16a6a3648960fe4c89f
-  CapacitorSplashScreen: 422880d7117605c30699eb4b21644b62db42e86c
+  CordovaPlugins: 1078156cfc354dd440b38ce4062e69fd9b07033c
-  CordovaPlugins: f37f9ada1d1f5687772ab7338ada420056bd5d72
-  IONFilesystemLib: 89258b8e3e85465da93127d25d7ce37f977e8a6f
-  IONGeolocationLib: a5e40b54edc2ee9902036eda5aaa41ddf07bb68d
   SwiftKeychainWrapper: 807ba1d63c33a7d0613288512399cd1eda1e470c
-  TransistorsoftCapacitorBackgroundFetch: 28e561636145a899f05025d31f627019c16791f5
+  TransistorsoftCapacitorBackgroundFetch: f130c5dcb6048401e74cc531e691e1d513045366
 
-PODFILE CHECKSUM: 04efbf7f9f98cfcdac2ab7f4cb7f6925fd81e87e
+PODFILE CHECKSUM: d0561b89b66368df409c77587e3e02b48e737203
 
-COCOAPODS: 1.16.2
+COCOAPODS: 1.15.2

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": "4.0.3",
+  "version": "3.3.4",
   "private": true,
   "license": "GPL-3.0-only",
   "author": "Karl-Philipp Wulfert <krlwlfrt@gmail.com>",
@@ -14,9 +14,12 @@
     "Thea Schöbl <dev@theaninova.de>"
   ],
   "scripts": {
-    "build": "pnpm check-icons && ng build --configuration=production --stats-json",
+    "analyze": "webpack-bundle-analyzer www/stats.json",
+    "build": "pnpm check-icons && ng build --configuration=production --stats-json && webpack-bundle-analyzer www/stats.json --mode static --report www/bundle-info.html --no-open",
+    "build:analyze": "npm run build:stats && npm run analyze",
     "build:android": "ionic capacitor build android --no-open && cd android && ./gradlew clean assemble && cd ..",
     "build:prod": "ng build --configuration=production",
+    "build:stats": "ng build --configuration=production --stats-json",
     "changelog": "conventional-changelog -p angular -i src/assets/about/CHANGELOG.md -s -r 0",
     "check-icons": "node scripts/check-icon-correctness.mjs",
     "chromium:no-cors": "chromium --disable-web-security --user-data-dir=\".browser-data/chromium\"",
@@ -36,7 +39,8 @@
     "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",
-    "preview": "http-server www/browser --p 8101 -o",
+    "postinstall": "jetify && echo \"skipping jetify in production mode\"",
+    "preview": "http-server www --p 8101 -o",
     "push": "git push && git push origin \"v$npm_package_version\"",
     "resources:ios": "capacitor-assets generate --ios --iconBackgroundColor $(grep -oE \"^@include ion-color\\(primary, #[a-fA-F0-9]{3,6}\" src/theme/colors.scss | grep -oE \"#[a-fA-F0-9]{3,6}\") --splashBackgroundColor $(grep -oE \"^@include ion-color\\(primary, #[a-fA-F0-9]{3,6}\" src/theme/colors.scss | grep -oE \"#[a-fA-F0-9]{3,6}\")",
     "run:android": "ionic capacitor run android --livereload --external",
@@ -48,94 +52,91 @@
     "test:integration": "sh integration-test.sh"
   },
   "dependencies": {
-    "@angular/animations": "18.2.13",
+    "@angular/animations": "17.3.0",
-    "@angular/cdk": "18.2.13",
+    "@angular/cdk": "17.3.0",
-    "@angular/common": "18.2.13",
+    "@angular/common": "17.3.0",
-    "@angular/core": "18.2.13",
+    "@angular/core": "17.3.0",
-    "@angular/forms": "18.2.13",
+    "@angular/forms": "17.3.0",
-    "@angular/platform-browser": "18.2.13",
+    "@angular/platform-browser": "17.3.0",
-    "@angular/router": "18.2.13",
+    "@angular/router": "17.3.0",
-    "@awesome-cordova-plugins/calendar": "8.1.0",
+    "@awesome-cordova-plugins/calendar": "6.6.0",
-    "@awesome-cordova-plugins/core": "8.1.0",
+    "@awesome-cordova-plugins/core": "6.6.0",
-    "@capacitor-community/in-app-review": "8.0.0",
+    "@capacitor-community/screen-brightness": "6.0.0",
-    "@capacitor-community/screen-brightness": "8.0.0",
+    "@capacitor/app": "6.0.0",
-    "@capacitor/app": "8.0.0",
+    "@capacitor/browser": "6.0.1",
-    "@capacitor/browser": "8.0.0",
+    "@capacitor/clipboard": "6.0.0",
-    "@capacitor/clipboard": "8.0.0",
+    "@capacitor/core": "6.1.1",
-    "@capacitor/core": "8.0.0",
+    "@capacitor/device": "6.0.0",
-    "@capacitor/device": "8.0.0",
+    "@capacitor/dialog": "6.0.0",
-    "@capacitor/dialog": "8.0.0",
+    "@capacitor/filesystem": "6.0.0",
-    "@capacitor/filesystem": "8.0.0",
+    "@capacitor/geolocation": "6.0.0",
-    "@capacitor/geolocation": "8.0.0",
+    "@capacitor/haptics": "6.0.0",
-    "@capacitor/haptics": "8.0.0",
+    "@capacitor/keyboard": "6.0.1",
-    "@capacitor/keyboard": "8.0.0",
+    "@capacitor/local-notifications": "6.0.0",
-    "@capacitor/local-notifications": "8.0.0",
+    "@capacitor/network": "6.0.1",
-    "@capacitor/network": "8.0.0",
+    "@capacitor/preferences": "6.0.1",
-    "@capacitor/preferences": "8.0.0",
+    "@capacitor/screen-orientation": "6.0.1",
-    "@capacitor/screen-orientation": "8.0.0",
+    "@capacitor/share": "6.0.1",
-    "@capacitor/share": "8.0.0",
+    "@capacitor/splash-screen": "6.0.1",
-    "@capacitor/splash-screen": "8.0.0",
+    "@ionic-native/core": "5.36.0",
-    "@ionic/angular": "8.7.16",
+    "@ionic/angular": "7.8.0",
-    "@ionic/angular-server": "8.7.16",
     "@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.2",
+    "@openid/appauth": "1.3.1",
     "@openstapps/api": "workspace:*",
     "@openstapps/collection-utils": "workspace:*",
     "@openstapps/core": "workspace:*",
-    "@transistorsoft/capacitor-background-fetch": "7.1.0",
+    "@transistorsoft/capacitor-background-fetch": "5.2.0",
     "@types/dom-view-transitions": "1.0.4",
-    "capacitor-secure-storage-plugin": "0.12.0",
+    "capacitor-secure-storage-plugin": "0.9.0",
     "cordova-plugin-calendar": "5.1.6",
     "date-fns": "3.6.0",
     "deepmerge": "4.3.1",
-    "form-data": "4.0.4",
+    "form-data": "4.0.0",
     "geojson": "0.5.0",
-    "ionic-appauth": "2.1.0",
+    "ionic-appauth": "0.9.0",
-    "ionicons": "8.0.13",
+    "jsonpath-plus": "10.0.6",
-    "jsonpath-plus": "10.3.0",
     "maplibre-gl": "4.0.2",
     "material-symbols": "0.17.1",
     "moment": "2.30.1",
     "ngx-date-fns": "11.0.0",
     "ngx-logger": "5.0.12",
-    "ngx-markdown": "17.2.1",
+    "ngx-markdown": "17.1.1",
     "ngx-moment": "6.0.2",
     "opening_hours": "3.8.0",
     "pmtiles": "3.0.3",
-    "prettier": "3.1.1",
     "rxjs": "7.8.1",
     "semver": "7.6.0",
     "swiper": "8.4.5",
     "tslib": "2.6.2",
-    "zone.js": "0.14.10"
+    "zone.js": "0.14.4"
   },
   "devDependencies": {
-    "@angular-devkit/architect": "0.1802.20",
+    "@angular-devkit/architect": "0.1703.0",
-    "@angular-devkit/build-angular": "18.2.20",
+    "@angular-devkit/build-angular": "17.3.0",
-    "@angular-devkit/core": "18.2.20",
+    "@angular-devkit/core": "17.3.0",
-    "@angular-devkit/schematics": "18.2.20",
+    "@angular-devkit/schematics": "17.3.0",
-    "@angular-eslint/builder": "18.4.3",
+    "@angular-eslint/builder": "17.3.0",
-    "@angular-eslint/eslint-plugin": "18.4.3",
+    "@angular-eslint/eslint-plugin": "17.3.0",
-    "@angular-eslint/eslint-plugin-template": "18.4.3",
+    "@angular-eslint/eslint-plugin-template": "17.3.0",
-    "@angular-eslint/schematics": "18.4.1",
+    "@angular-eslint/schematics": "17.3.0",
-    "@angular-eslint/template-parser": "18.4.3",
+    "@angular-eslint/template-parser": "17.3.0",
-    "@angular/cli": "18.2.20",
+    "@angular/cli": "17.3.0",
-    "@angular/compiler": "18.2.13",
+    "@angular/compiler": "17.3.0",
-    "@angular/compiler-cli": "18.2.13",
+    "@angular/compiler-cli": "17.3.0",
-    "@angular/language-server": "18.2.0",
+    "@angular/language-server": "17.3.0",
-    "@angular/language-service": "18.2.13",
+    "@angular/language-service": "17.3.0",
-    "@angular/platform-browser-dynamic": "18.2.13",
+    "@angular/platform-browser-dynamic": "17.3.0",
-    "@capacitor/android": "8.0.0",
+    "@capacitor/android": "6.1.1",
-    "@capacitor/assets": "3.0.5",
+    "@capacitor/assets": "3.0.4",
-    "@capacitor/cli": "8.0.0",
+    "@capacitor/cli": "6.1.1",
-    "@capacitor/ios": "8.0.0",
+    "@capacitor/ios": "6.1.1",
     "@compodoc/compodoc": "1.1.23",
-    "@cypress/schematic": "4.1.1",
+    "@cypress/schematic": "2.5.1",
-    "@ionic/angular-toolkit": "12.3.0",
+    "@ionic/angular-toolkit": "11.0.1",
-    "@ionic/cli": "7.2.1",
+    "@ionic/cli": "7.2.0",
     "@openstapps/prettier-config": "workspace:*",
     "@openstapps/tsconfig": "workspace:*",
     "@types/fontkit": "2.0.7",
@@ -147,23 +148,24 @@
     "@types/karma": "6.3.8",
     "@types/karma-coverage": "2.0.3",
     "@types/karma-jasmine": "4.0.5",
-    "@types/node": "22.15.31",
+    "@types/node": "18.15.3",
     "@types/semver": "7.5.8",
-    "@typescript-eslint/eslint-plugin": "7.11.0",
+    "@typescript-eslint/eslint-plugin": "7.2.0",
-    "@typescript-eslint/parser": "7.11.0",
+    "@typescript-eslint/parser": "7.2.0",
     "cordova-res": "0.15.4",
-    "cypress": "15.0.0",
+    "cypress": "13.7.0",
     "eslint": "8.57.0",
     "eslint-plugin-jsdoc": "48.2.1",
     "eslint-plugin-prettier": "5.1.3",
     "eslint-plugin-unicorn": "51.0.1",
     "fast-deep-equal": "3.1.3",
     "fontkit": "2.0.2",
-    "glob": "10.5.0",
+    "glob": "10.3.10",
     "http-server": "14.1.1",
     "is-docker": "2.2.1",
     "jasmine-core": "5.1.2",
     "jasmine-spec-reporter": "7.0.0",
+    "jetifier": "2.0.0",
     "junit-report-merger": "6.0.3",
     "karma": "6.4.3",
     "karma-chrome-launcher": "3.2.0",
@@ -179,7 +181,8 @@
     "stylelint-config-standard-scss": "13.0.0",
     "surge": "0.23.1",
     "ts-node": "10.9.2",
-    "typescript": "5.4.2"
+    "typescript": "5.4.2",
+    "webpack-bundle-analyzer": "4.10.1"
   },
   "cordova": {
     "plugins": {},

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

@@ -13,7 +13,7 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {AnimationBuilder, AnimationController} from '@ionic/angular/standalone';
+import {AnimationBuilder, AnimationController} from '@ionic/angular';
 import {AnimationOptions} from '@ionic/angular/common/providers/nav-controller';
 import {iosDuration, iosEasing, mdDuration, mdEasing} from './easings';
 

frontend/app/src/app/app.component.spec.ts

@@ -17,11 +17,11 @@
 import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
 
-import {ModalController, Platform} from '@ionic/angular/standalone';
+import {ModalController, Platform} from '@ionic/angular';
 
 import {TranslateService} from '@ngx-translate/core';
 import {ThingTranslateService} from './translation/thing-translate.service';
-import {provideHttpClientTesting} from '@angular/common/http/testing';
+import {HttpClientTestingModule} from '@angular/common/http/testing';
 import {AppComponent} from './app.component';
 import {AuthModule} from './modules/auth/auth.module';
 import {ConfigProvider} from './modules/config/config.provider';
@@ -32,8 +32,6 @@ import {ScheduleSyncService} from './modules/background/schedule/schedule-sync.s
 import {sampleAuthConfiguration} from './_helpers/data/sample-configuration';
 import {StorageProvider} from './modules/storage/storage.provider';
 import {SimpleBrowser} from './util/browser.factory';
-import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
-import {InAppReviewProvider} from './modules/settings/in-app-review/in-app-review.provider';
 
 describe('AppComponent', () => {
   let platformReadySpy: any;
@@ -41,7 +39,6 @@ describe('AppComponent', () => {
   let translateServiceSpy: jasmine.SpyObj<TranslateService>;
   let thingTranslateServiceSpy: jasmine.SpyObj<ThingTranslateService>;
   let settingsProvider: jasmine.SpyObj<SettingsProvider>;
-  let inAppReviewProvider: jasmine.SpyObj<InAppReviewProvider>;
   let configProvider: jasmine.SpyObj<ConfigProvider>;
   let ngxLogger: jasmine.SpyObj<NGXLogger>;
   let scheduleSyncServiceSpy: jasmine.SpyObj<ScheduleSyncService>;
@@ -78,24 +75,21 @@ describe('AppComponent', () => {
     modalController = jasmine.createSpyObj('ModalController', ['create', 'dismiss', 'getTop']);
 
     TestBed.configureTestingModule({
+      imports: [RouterTestingModule.withRoutes([]), HttpClientTestingModule, AuthModule],
       declarations: [AppComponent],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA],
-      imports: [RouterTestingModule.withRoutes([]), AuthModule],
       providers: [
         {provide: Platform, useValue: platformSpy},
         {provide: TranslateService, useValue: translateServiceSpy},
         {provide: ThingTranslateService, useValue: thingTranslateServiceSpy},
         {provide: ScheduleSyncService, useValue: scheduleSyncServiceSpy},
         {provide: SettingsProvider, useValue: settingsProvider},
-        {provide: InAppReviewProvider, useValue: inAppReviewProvider},
         {provide: ConfigProvider, useValue: configProvider},
         {provide: NGXLogger, useValue: ngxLogger},
         {provide: StorageProvider, useValue: storageProvider},
         {provide: SimpleBrowser, useValue: simpleBrowser},
         {provide: ModalController, useValue: modalController},
-        provideHttpClient(withInterceptorsFromDi()),
-        provideHttpClientTesting(),
       ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   });
 

frontend/app/src/app/app.component.ts

@@ -15,9 +15,8 @@
 import {AfterContentInit, Component, NgZone} from '@angular/core';
 import {Router} from '@angular/router';
 import {App, URLOpenListenerEvent} from '@capacitor/app';
-import {Platform, ToastController} from '@ionic/angular/standalone';
+import {Platform, ToastController} from '@ionic/angular';
 import {SettingsProvider} from './modules/settings/settings.provider';
-import {InAppReviewProvider} from './modules/settings/in-app-review/in-app-review.provider';
 import {AuthHelperService} from './modules/auth/auth-helper.service';
 import {environment} from '../environments/environment';
 import {Capacitor} from '@capacitor/core';
@@ -56,7 +55,6 @@ export class AppComponent implements AfterContentInit {
   constructor(
     private readonly platform: Platform,
     private readonly settingsProvider: SettingsProvider,
-    private readonly inAppReviewProvider: InAppReviewProvider,
     private readonly router: Router,
     private readonly zone: NgZone,
     private readonly authHelper: AuthHelperService,
@@ -88,8 +86,6 @@ export class AppComponent implements AfterContentInit {
   async hideSplash() {
     if (Capacitor.isNativePlatform()) {
       void SplashScreen.hide();
-      await this.inAppReviewProvider.increaseSessionCount();
-      void this.inAppReviewProvider.startInAppReviewIfFeasible();
     }
   }
 

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

@@ -13,12 +13,12 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 import {CommonModule, LocationStrategy, PathLocationStrategy, registerLocaleData} from '@angular/common';
-import {HTTP_INTERCEPTORS, HttpClient, provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
+import {HTTP_INTERCEPTORS, HttpClient, HttpClientModule} from '@angular/common/http';
 import localeDe from '@angular/common/locales/de';
 import {APP_INITIALIZER, NgModule} from '@angular/core';
 import {BrowserModule} from '@angular/platform-browser';
 import {RouteReuseStrategy} from '@angular/router';
-import {IonicRouteStrategy, Platform, provideIonicAngular, IonApp} from '@ionic/angular/standalone';
+import {IonicModule, IonicRouteStrategy, Platform} from '@ionic/angular';
 import {TranslateLoader, TranslateModule, TranslateService} from '@ngx-translate/core';
 import {TranslateHttpLoader} from '@ngx-translate/http-loader';
 import moment from 'moment';
@@ -61,6 +61,7 @@ import {RoutingStackService} from './util/routing-stack.service';
 import {SCLanguageCode, SCSettingValue} from '@openstapps/core';
 import {DefaultAuthService} from './modules/auth/default-auth.service';
 import {PAIAAuthService} from './modules/auth/paia/paia-auth.service';
+import {IonIconModule} from './util/ion-icon/ion-icon.module';
 import {NavigationModule} from './modules/menu/navigation/navigation.module';
 import {browserFactory, SimpleBrowser} from './util/browser.factory';
 import {getDateFnsLocale} from './translation/dfns-locale';
@@ -155,9 +156,12 @@ export function createTranslateLoader(http: HttpClient) {
     DashboardModule,
     DataModule,
     HebisModule,
+    IonicModule.forRoot(),
+    IonIconModule,
     JobModule,
     FavoritesModule,
     LibraryModule,
+    HttpClientModule,
     ProfilePageModule,
     FeedbackModule,
     MapModule,
@@ -181,7 +185,6 @@ export function createTranslateLoader(http: HttpClient) {
     LoggerModule.forRoot({
       level: environment.production ? NgxLoggerLevel.FATAL : NgxLoggerLevel.TRACE,
     }),
-    IonApp,
   ],
   providers: [
     {
@@ -218,8 +221,6 @@ export function createTranslateLoader(http: HttpClient) {
       useClass: ServiceHandlerInterceptor,
       multi: true,
     },
-    provideIonicAngular(),
-    provideHttpClient(withInterceptorsFromDi()),
   ],
 })
 export class AppModule {

frontend/app/src/app/modules/about/about-licenses.component.ts

@@ -13,7 +13,7 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 import {Component, OnInit} from '@angular/core';
-import {ModalController} from '@ionic/angular/standalone';
+import {ModalController} from '@ionic/angular';
 import {AboutLicenseModalComponent} from './about-license-modal.component';
 import licensesFile from 'src/assets/about/licenses.json';
 

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

@@ -16,6 +16,7 @@ import {RouterModule, Routes} from '@angular/router';
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {FormsModule} from '@angular/forms';
+import {IonicModule} from '@ionic/angular';
 import {TranslateModule} from '@ngx-translate/core';
 import {ThingTranslateModule} from '../../translation/thing-translate.module';
 import {AboutPageComponent} from './about-page/about-page.component';
@@ -27,31 +28,8 @@ import {ScrollingModule} from '@angular/cdk/scrolling';
 import {AboutLicenseModalComponent} from './about-license-modal.component';
 import {AboutChangelogComponent} from './about-changelog.component';
 import {UtilModule} from '../../util/util.module';
+import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
 import {AboutReleaseNotesComponent} from './about-release-notes.component';
-import {
-  IonBackButton,
-  IonButton,
-  IonButtons,
-  IonCard,
-  IonCardContent,
-  IonCardHeader,
-  IonCardSubtitle,
-  IonCardTitle,
-  IonChip,
-  IonCol,
-  IonContent,
-  IonGrid,
-  IonHeader,
-  IonLabel,
-  IonList,
-  IonRouterLink,
-  IonRow,
-  IonSkeletonText,
-  IonText,
-  IonTitle,
-  IonToolbar,
-} from '@ionic/angular/standalone';
-import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
 
 const settingsRoutes: Routes = [
   {path: 'about', component: AboutPageComponent},
@@ -77,8 +55,9 @@ const settingsRoutes: Routes = [
   ],
   imports: [
     CommonModule,
-    IonIconDirective,
+    IonIconModule,
     FormsModule,
+    IonicModule.forRoot(),
     TranslateModule.forChild(),
     ThingTranslateModule.forChild(),
     RouterModule.forChild(settingsRoutes),
@@ -86,27 +65,6 @@ const settingsRoutes: Routes = [
     DataModule,
     ScrollingModule,
     UtilModule,
-    IonRouterLink,
-    IonBackButton,
-    IonButton,
-    IonButtons,
-    IonText,
-    IonSkeletonText,
-    IonTitle,
-    IonToolbar,
-    IonHeader,
-    IonLabel,
-    IonGrid,
-    IonRow,
-    IonCol,
-    IonCard,
-    IonCardHeader,
-    IonCardTitle,
-    IonCardContent,
-    IonCardSubtitle,
-    IonChip,
-    IonList,
-    IonContent,
   ],
 })
 export class AboutModule {}

frontend/app/src/app/modules/about/app-version.service.ts

@@ -1,12 +1,12 @@
 import {Injectable} from '@angular/core';
 import {StorageProvider} from '../storage/storage.provider';
 import {ConfigProvider} from '../config/config.provider';
-import {ModalController} from '@ionic/angular/standalone';
+import {ModalController} from '@ionic/angular';
-import {Capacitor} from '@capacitor/core';
 import {ReleaseNotesComponent} from './release-notes.component';
 import {SCAppVersionInfo} from '@openstapps/core';
 import {App} from '@capacitor/app';
 import {coerce} from 'semver';
+import {Capacitor} from '@capacitor/core';
 
 export const RELEASE_NOTES_SHOWN_KEY = 'release_notes_shown';
 

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

@@ -2,14 +2,7 @@ import {ChangeDetectionStrategy, Component, Input} from '@angular/core';
 import {SCAppVersionInfo} from '@openstapps/core';
 import {MarkdownModule} from 'ngx-markdown';
 import {ThingTranslateModule} from '../../translation/thing-translate.module';
-import {
+import {IonicModule, ModalController} from '@ionic/angular';
-  IonButton,
-  IonButtons,
-  IonHeader,
-  IonTitle,
-  IonToolbar,
-  ModalController,
-} from '@ionic/angular/standalone';
 import {TranslateModule} from '@ngx-translate/core';
 import {UtilModule} from '../../util/util.module';
 
@@ -19,17 +12,7 @@ import {UtilModule} from '../../util/util.module';
   styleUrls: ['release-notes.scss', 'release-notes-markdown.scss'],
   standalone: true,
   changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [
+  imports: [UtilModule, MarkdownModule, ThingTranslateModule, IonicModule, TranslateModule],
-    UtilModule,
-    MarkdownModule,
-    ThingTranslateModule,
-    TranslateModule,
-    IonButton,
-    IonButtons,
-    IonToolbar,
-    IonHeader,
-    IonTitle,
-  ],
 })
 export class ReleaseNotesComponent {
   @Input() versionInfos: SCAppVersionInfo[];

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

@@ -19,6 +19,7 @@ import {AssessmentBaseInfoComponent} from './types/assessment/assessment-base-in
 import {AssessmentDetailComponent} from './types/assessment/assessment-detail.component';
 import {CommonModule} from '@angular/common';
 import {FormsModule} from '@angular/forms';
+import {IonicModule} from '@ionic/angular';
 import {TranslateModule} from '@ngx-translate/core';
 import {DataModule} from '../data/data.module';
 import {ThingTranslateModule} from '../../translation/thing-translate.module';
@@ -34,25 +35,8 @@ import {AssessmentsProvider} from './assessments.provider';
 import {AssessmentsSimpleDataListComponent} from './list/assessments-simple-data-list.component';
 import {ProtectedRoutes} from '../auth/protected.routes';
 import {AssessmentsTreeListComponent} from './list/assessments-tree-list.component';
+import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
 import {UtilModule} from '../../util/util.module';
-import {
-  IonBackButton,
-  IonButton,
-  IonButtons,
-  IonCard,
-  IonCardContent,
-  IonContent,
-  IonHeader,
-  IonItem,
-  IonLabel,
-  IonList,
-  IonNote,
-  IonSegment,
-  IonSegmentButton,
-  IonTitle,
-  IonToolbar,
-} from '@ionic/angular/standalone';
-import {IonIconDirective} from 'src/app/util/ion-icon/ion-icon.directive';
 
 const routes: ProtectedRoutes = [
   {
@@ -85,28 +69,14 @@ const routes: ProtectedRoutes = [
   imports: [
     CommonModule,
     FormsModule,
-    IonIconDirective,
+    IonIconModule,
+    IonicModule,
     RouterModule.forChild(routes),
     TranslateModule,
     DataModule,
     ThingTranslateModule,
     MomentModule,
     UtilModule,
-    IonBackButton,
-    IonList,
-    IonItem,
-    IonNote,
-    IonCardContent,
-    IonCard,
-    IonLabel,
-    IonSegment,
-    IonSegmentButton,
-    IonButtons,
-    IonTitle,
-    IonContent,
-    IonHeader,
-    IonToolbar,
-    IonButton,
   ],
   providers: [AssessmentsProvider],
   exports: [],

frontend/app/src/app/modules/assessments/detail/assessments-detail.component.ts

@@ -17,7 +17,7 @@ import {Component, DestroyRef, inject, Input, OnInit, ViewChild} from '@angular/
 import {ActivatedRoute} from '@angular/router';
 import {AssessmentsProvider} from '../assessments.provider';
 import {DataDetailComponent, ExternalDataLoadEvent} from '../../data/detail/data-detail.component';
-import {NavController} from '@ionic/angular/standalone';
+import {NavController} from '@ionic/angular';
 import {DataRoutingService} from '../../data/data-routing.service';
 import {SCAssessment} from '@openstapps/core';
 import {takeUntilDestroyed} from '@angular/core/rxjs-interop';

frontend/app/src/app/modules/auth/auth-callback/page/auth-callback-page.component.ts

@@ -13,7 +13,7 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 import {Component} from '@angular/core';
-import {NavController} from '@ionic/angular/standalone';
+import {NavController} from '@ionic/angular';
 import {Router} from '@angular/router';
 import {AuthActions, IAuthAction} from 'ionic-appauth';
 import {AuthHelperService} from '../../auth-helper.service';

frontend/app/src/app/modules/auth/auth-helper.service.spec.ts

@@ -22,7 +22,7 @@ import {Requestor, StorageBackend} from '@openid/appauth';
 import {TranslateService} from '@ngx-translate/core';
 import {PAIAAuthService} from './paia/paia-auth.service';
 import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
-import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
+import {HttpClientModule} from '@angular/common/http';
 import {SimpleBrowser} from '../../util/browser.factory';
 import {LoggerTestingModule} from 'ngx-logger/testing';
 
@@ -54,7 +54,7 @@ describe('AuthHelperService', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [LoggerTestingModule],
+      imports: [HttpClientModule, LoggerTestingModule],
       providers: [
         StAppsWebHttpClient,
         {
@@ -88,7 +88,6 @@ describe('AuthHelperService', () => {
           provide: SimpleBrowser,
           useValue: simpleBrowserMock,
         },
-        provideHttpClient(withInterceptorsFromDi()),
       ],
     });
     authHelperService = TestBed.inject(AuthHelperService);

frontend/app/src/app/modules/auth/auth-helper.service.ts

@@ -29,7 +29,7 @@ import {StorageProvider} from '../storage/storage.provider';
 import {DefaultAuthService} from './default-auth.service';
 import {PAIAAuthService} from './paia/paia-auth.service';
 import {SimpleBrowser} from '../../util/browser.factory';
-import {AlertController} from '@ionic/angular/standalone';
+import {AlertController} from '@ionic/angular';
 
 const AUTH_ORIGIN_PATH = 'stapps.auth.origin_path';
 

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

@@ -1,6 +1,6 @@
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {Platform} from '@ionic/angular/standalone';
+import {Platform} from '@ionic/angular';
 import {Requestor, StorageBackend} from '@openid/appauth';
 import {storageFactory} from './factories';
 import {Browser} from 'ionic-appauth';

frontend/app/src/app/modules/auth/auth.service.ts

@@ -86,8 +86,6 @@ export abstract class AuthService implements IAuthService {
 
   private _authenticatedSubject = new BehaviorSubject<boolean>(false);
 
-  private _loggedInSubject = new BehaviorSubject<boolean>(false);
-
   private _initComplete = new BehaviorSubject<boolean>(false);
 
   protected tokenHandler: TokenRequestHandler;
@@ -135,13 +133,6 @@ export abstract class AuthService implements IAuthService {
     return this._authenticatedSubject.asObservable();
   }
 
-  /**
-   * Similar to isAuthenticated$, but will also return true if the token is expired
-   */
-  get isLoggedIn$(): Observable<boolean> {
-    return this._loggedInSubject.asObservable();
-  }
-
   get initComplete$(): Observable<boolean> {
     return this._initComplete.asObservable();
   }
@@ -192,20 +183,19 @@ export abstract class AuthService implements IAuthService {
   protected notifyActionListers(action: IAuthAction) {
     /* eslint-disable unicorn/no-useless-undefined */
     switch (action.action) {
+      case AuthActions.RefreshFailed:
       case AuthActions.SignInFailed:
       case AuthActions.SignOutSuccess:
       case AuthActions.SignOutFailed: {
         this._tokenSubject.next(undefined);
         this._userSubject.next(undefined);
         this._authenticatedSubject.next(false);
-        this._loggedInSubject.next(false);
         break;
       }
       case AuthActions.LoadTokenFromStorageFailed: {
         this._tokenSubject.next(undefined);
         this._userSubject.next(undefined);
         this._authenticatedSubject.next(false);
-        this._loggedInSubject.next(false);
         this._initComplete.next(true);
         break;
       }
@@ -213,13 +203,11 @@ export abstract class AuthService implements IAuthService {
       case AuthActions.RefreshSuccess: {
         this._tokenSubject.next(action.tokenResponse);
         this._authenticatedSubject.next(true);
-        this._loggedInSubject.next(true);
         break;
       }
       case AuthActions.LoadTokenFromStorageSuccess: {
         this._tokenSubject.next(action.tokenResponse);
         this._authenticatedSubject.next((action.tokenResponse as TokenResponse).isValid(0));
-        this._loggedInSubject.next(true);
         this._initComplete.next(true);
         break;
       }
@@ -454,6 +442,7 @@ export abstract class AuthService implements IAuthService {
 
   public async refreshToken() {
     await this.requestTokenRefresh().catch(error => {
+      this.storage.removeItem(TOKEN_RESPONSE_KEY);
       this.notifyActionListers(AuthActionBuilder.RefreshFailed(error));
     });
   }

frontend/app/src/app/modules/auth/default-auth.service.spec.ts

@@ -20,7 +20,7 @@ import {Browser} from 'ionic-appauth';
 import {nowInSeconds, Requestor, StorageBackend} from '@openid/appauth';
 import {TranslateService} from '@ngx-translate/core';
 import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
-import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
+import {HttpClientModule} from '@angular/common/http';
 import {IonicStorage} from 'ionic-appauth/lib';
 import {RouterModule} from '@angular/router';
 import {LoggerTestingModule} from 'ngx-logger/testing';
@@ -35,7 +35,7 @@ describe('AuthService', () => {
     storageBackendSpy = jasmine.createSpyObj('StorageBackend', ['getItem']);
 
     TestBed.configureTestingModule({
-      imports: [LoggerTestingModule, RouterModule.forRoot([])],
+      imports: [HttpClientModule, LoggerTestingModule, RouterModule.forRoot([])],
       providers: [
         StAppsWebHttpClient,
         {
@@ -54,7 +54,6 @@ describe('AuthService', () => {
           useValue: storageBackendSpy,
         },
         Requestor,
-        provideHttpClient(withInterceptorsFromDi()),
       ],
     });
     defaultAuthService = TestBed.inject(DefaultAuthService);

frontend/app/src/app/modules/auth/factories/http.factory.ts

@@ -14,7 +14,7 @@
  */
 
 import {HttpClient} from '@angular/common/http';
-import {Platform} from '@ionic/angular/standalone';
+import {Platform} from '@ionic/angular';
 import {CapacitorRequestor} from '../capacitor-requestor';
 import {NgHttpService} from '../ng-http.service';
 

frontend/app/src/app/modules/auth/factories/storage.factory.ts

@@ -13,7 +13,7 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {Platform} from '@ionic/angular/standalone';
+import {Platform} from '@ionic/angular';
 import {IonicStorage} from 'ionic-appauth/lib';
 import {SafeCapacitorSecureStorage} from '../../storage/capacitor-secure-storage';