docs: update changelogs for release

ci: publish release

.changeset/good-eggs-add.md

@@ -1,5 +0,0 @@
----
-"@openstapps/prettier-config": patch
----
-
-Update Prettier to 3.1.1

.changeset/old-bottles-hide.md

@@ -1,5 +0,0 @@
----
-"@openstapps/backend": patch
----
-
-Backend unit tests break every year

.changeset/spotty-ducks-cheer.md

@@ -1,9 +0,0 @@
----
-'@openstapps/app': minor
----
-
-Require full reload for setting & language changes
-
-Setting changes are relatively rare, so it makes little sense
-going through the effort of ensuring everything is reactive to
-language changes as well as creating all the pipe bindings etc.

.envrc

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

.gitignore

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

.gitlab-ci.yml

@@ -133,7 +133,7 @@ audit:
   allow_failure: true
   needs: []
   script:
-    - pnpm audit --prod --audit-level critical
+    - pnpm audit --prod
   rules:
     - if: $CI_COMMIT_BRANCH == 'main'
       allow_failure: false

.gitlab/publishing.gitlab-ci.yml

@@ -1,11 +1,6 @@
 .limit_publish_pipelines:
   rules:
-      - if: '$CI_COMMIT_BRANCH == "develop" && $CI_COMMIT_MESSAGE =~ /ci: publish prerelease/ && $CI_PIPELINE_SOURCE != "schedule"'
+      - if: '($CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "develop") && $CI_COMMIT_MESSAGE =~ /ci: publish release/ && $CI_PIPELINE_SOURCE != "schedule"'
-        variables:
-          PUBLISH_TAG: next
-      - if: '$CI_COMMIT_BRANCH == "main" && $CI_COMMIT_MESSAGE =~ /ci: publish release/ && $CI_PIPELINE_SOURCE != "schedule"'
-        variables:
-          PUBLISH_TAG: latest
 
 deploy:
   stage: publish
@@ -29,6 +24,8 @@ publish image:
   image:
     name: gcr.io/kaniko-project/executor:v1.12.1-debug
     entrypoint: [""]
+  variables:
+    PUBLISH_TAG: next
   script:
     - >
        /kaniko/executor
@@ -53,6 +50,9 @@ publish image:
       - IMAGE_NAME: app
         DEPLOY_DIR: frontend/app
   rules:
+    - if: $CI_COMMIT_BRANCH == 'main'
+      variables:
+        PUBLISH_TAG: latest
     - !reference [.limit_publish_pipelines, rules]
 
 publish packages:
@@ -61,12 +61,16 @@ publish packages:
   variables:
     GIT_STRATEGY: clone
     GIT_DEPTH: 0
+    PUBLISH_TAG: next
   script:
     - pnpm install
     - pnpm build
     - pnpm config set '//registry.npmjs.org/:_authToken' "${NPM_AUTH_TOKEN}"
     - pnpm publish -r --publish-branch ${CI_COMMIT_BRANCH} --tag ${PUBLISH_TAG} --no-git-checks # TODO: Git checks...
   rules:
+    - if: $CI_COMMIT_BRANCH == 'main'
+      variables:
+        PUBLISH_TAG: latest
     - !reference [.limit_publish_pipelines, rules]
 
 publish docs:
@@ -80,4 +84,5 @@ publish docs:
     paths:
       - public
   rules:
+    - if: $CI_COMMIT_BRANCH == 'main'
     - !reference [.limit_publish_pipelines, rules]

.prettierignore

@@ -1 +0,0 @@
-pnpm-lock.yaml

.tool-versions

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

CONTRIBUTING.md

@@ -37,13 +37,13 @@ Adding new types requires changes at multiple locations for it to work correctly
 - Add your SCThing and SCThingWithoutReferences to `src/things/your-thing-name.ts` and make them extend `SCThingWithoutReferences` and `SCThing` respectively
 - Add your SCThingMeta to `src/things/your-thing-name.ts` and make it extend `SCThingMeta`
 - Add your SCThingMeta to `SCClasses` in `src/meta.ts`
-- Add your SCThing to `SCIndexableThings ` in `src/meta.ts`
+- Add your SCThing to `SCThingsWithoutDiff` in `src/meta.ts`
 - Add your SCThingWithoutReferences to `SCAssociatedThingWithoutReferences` in `src/meta.ts`
 - Add your SCThing to `SCAssociatedThing` in `src/meta.ts`
 - Add your SCThing to the `SCThingType` enum in `src/things/abstract/thing.ts`
 - Add an example file for your SCThing in `test/resources/YourThingName.json`
 - Add the following lines for your SCThing in `test/type.spec.ts`:
-- Make sure your SCThing (but not SCThingWithoutReferences!) includes the `@indexable` and `@validatable` JSDoc annotations, otherwise neither JSON Schemas nor Elasticsearch mappings will be generated
+
 ```typescript
 /**
  * Types of properties of SCYourThingName

README.md

@@ -1,4 +1,4 @@
-# <img src="logo-bg.svg" height="24"> Open StApps Monorepo
+# Open StApps Monorepo
 
 Refer to the [contribution guide](./CONTRIBUTING.md)
 

backend/backend/CHANGELOG.md

@@ -1,37 +1,5 @@
 # @openstapps/backend
 
-## 3.1.2
-
-### Patch Changes
-
-- Fix backend rejecting plugins
-- Fix backend sliently falling back to default configs
-
-## 3.1.1
-
-### Patch Changes
-
-- Fix version history offered by backend
-- Updated dependencies
-  - @openstapps/core@3.1.1
-
-## 3.1.0
-
-### Minor Changes
-
-- 06b8ca10: Add job portal feature
-
-### Patch Changes
-
-- Updated dependencies [06b8ca10]
-  - @openstapps/core@3.1.0
-
-## 3.0.1
-
-### Patch Changes
-
-- Fix missing dependency
-
 ## 3.0.0
 
 ### Major Changes

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

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

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

@@ -22,7 +22,6 @@ const app = {
   name: 'Goethe-Uni',
   privacyPolicyUrl: 'https://mobile.server.uni-frankfurt.de/_static/privacy.md',
   settings: [userGroupSetting, languageSetting],
-  versionHistory: [],
 };
 
 export default app;

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

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

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

@@ -1,3 +1,4 @@
+// @ts-check
 /** @type {import('@openstapps/core').SCAppConfigurationMenuCategory[]} */
 const menus = [
   {
@@ -55,19 +56,6 @@ const menus = [
           },
         },
       },
-      {
-        icon: 'work',
-        route: '/jobs',
-        title: 'job postings',
-        translations: {
-          de: {
-            title: 'Jobangebote',
-          },
-          en: {
-            title: 'job postings',
-          },
-        },
-      },
     ],
     title: 'overview',
     route: '/overview',

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

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

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

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

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

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

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

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

backend/backend/config/default/backendrc.js

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

backend/backend/config/default/elasticsearchrc.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 /**
  * This is the default configuration for elasticsearch (a database)
  *
@@ -9,13 +11,13 @@
  *
  * To get more information about the meaning of specific fields, please use your IDE to read the TSDoc documentation.
  *
- * @type {import('../../src/storage/elasticsearch/types/elasticsearch-config.js').ElasticsearchConfigFile}
+ * @type {import('../../src/storage/elasticsearch/types/elasticsearch-config.js')}
  */
 const config = {
   internal: {
     database: {
       name: 'elasticsearch',
-      version: '8.4.2',
+      version: '5.6',
       query: {
         minMatch: '75%',
         queryType: 'dis_max',

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

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

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

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

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

@@ -1,37 +0,0 @@
-import {readFile, readdir} from 'fs/promises';
-import url from 'url';
-import path from 'path';
-
-/**
- * @example version(1, import.meta.url)
- * @param options {Omit<import('@openstapps/core').SCAppVersionInfo, 'releaseNotes' | 'translations'>}
- * @param base {string}
- * @returns {Promise<import('@openstapps/core').SCAppVersionInfo>}
- */
-export async function version(options, base) {
-  const de = await readFile(new URL(`${options.version}.de.md`, base), 'utf8');
-  const en = await readFile(new URL(`${options.version}.en.md`, base), 'utf8');
-
-  return {
-    ...options,
-    releaseNotes: de,
-    translations: {
-      en: {
-        releaseNotes: en,
-      },
-    },
-  };
-}
-
-/**
- * @param base {string} Base path of the file as `import.meta.url`
- * @returns {Promise<import('@openstapps/core').SCAppVersionInfo[]>}
- */
-export async function versions(base) {
-  const directory = await readdir(path.dirname(url.fileURLToPath(base)));
-  const versions = [
-    ...new Set(directory.filter(it => it.endsWith('.md')).map(it => it.replace(/\.\w+\.md$/, ''))),
-  ].sort((a, b) => -a.localeCompare(b, undefined, {numeric: true}));
-
-  return Promise.all(versions.map(versionName => version({version: versionName}, base)));
-}

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
+// @ts-check
 import aboutPages from './about-pages/index.js';
 import defaultApp from '../default/app/index.js';
 import {backend as defaultBackend, internal as defaultInternal} from '../default/backend/index.js';
-import versionHistory from './version-history/index.js';
 
 /**
  * This is the default configuration for the Goethe university of Frankfurt
@@ -76,7 +76,6 @@ const config = {
         } */
       },
     },
-    versionHistory,
     aboutPages,
   },
   backend: defaultBackend,

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

@@ -1,52 +0,0 @@
-# Goethe-Uni App 2.4
-
-Wir freuen uns euch mehr in der Goethe-Uni App
-bieten zu können.
-
-## Navigation zu Gebäuden und Orten
-
-Als eines der Ergebnisse des Ideenwettbewerbs wurde jetzt
-ein Navigationsfeature in die App integriert.
-
-Orte auf der Karte, Mensen, sowie sogar Termine (wenn hinterlegt)
-bieten jetzt direkt die Option eine Verbindung zu finden, gestützt
-durch die Karten App auf deinem Gerät.
-
-## Integration der Jobbörse
-
-Jobs findest du ab sofort auch in der Goethe-Uni App.
-
-Auch das ist ein Ergebnis des Ideenwettbewerbs,
-und wir freuen uns es euch hier präsentieren zu können!
-
-## Der Umweltscore
-
-Der Umweltscore für Gerichte wird nun auch in der App angezeigt.
-
-> Nachhaltigkeit, Umweltschutz, Gesundheit und Klimawandel sind
-> zentrale Begriffe im gesellschaftlichen Miteinander.
-> Unsere Ernährung spielt hierbei eine wichtige Rolle.
-> Das Studierendenwerk Frankfurt am Main zeichnet seine Speisenpläne
-> ab sofort mit einem Umweltscore aus.
-> Anhand dieser Bewertung können Sie direkt ersehen,
-> welchen Einfluss Ihre Essenauswahl auf das Klima hat.
-
-## Weitere Verbesserungen
-
-### Performance
-
-Die Performance der App beim Navigieren wurde stark verbessert und ist datensparender.
-
-### Kalender
-
-Die Kalenderabschnitte haben jetzt neue Namen bekommen:
-
-- Der _Kalender_ zeigt Termine für spezifische Tage
-- Die _Wochenübersicht_ ist ein Stundenplan mit allen Termine, die sich wiederholen (z. B. Vorlesungen)
-- Die _Einzeltermine_ zeigen alle Termine, die sich nicht wiederholen
-  (z. B. Klausuren)
-
-### Meine App
-
-Der "Meine Kurse" Abschnitt wurde überarbeitet, und zeigt jetzt Termine
-für die nächsten Tage und mit mehr Details an.

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

@@ -1,49 +0,0 @@
-# Goethe-Uni App 2.4
-
-The Goethe-Uni App got even better!
-
-## Navigation to buildings and places
-
-As part of the "Ideenwettbewerb," the idea competition,
-we have now integrated a navigation feature into the app.
-
-Orte auf der Karte, Mensen, sowie sogar Termine (wenn hinterlegt)
-bieten jetzt direkt die Option eine Verbindung zu finden, gestützt
-durch die Karten App auf deinem Gerät.
-
-## Integration of the job market
-
-Jobs are now also available in the Goethe-Uni App.
-
-This feature is also a result of the idea competition,
-and we're happy to be able to present it to you here!
-
-## The environment score
-
-The environment score for dishes is now displayed inside the app.
-
-> Sustainability, environment protection, health, and climate change are
-> central topics in how we live today in our society.
-> Our eating habits play an important role in it.
-> The "Studierendenwerk Frankfurt am Main" is marking up its menus
-> from now on with the so-called "Umweltscore," the environment score.
-> Based on this rating, you can see the impact your meal choice would have on our climate.
-
-## Further improvements
-
-### Performance
-
-The performance while navigating around the app has been heavily improved and requires less data to work.
-
-### Calendar
-
-The calendar sections have new names:
-
-- The _calendar_ shows appointments on specific days
-- The _week overview_ is a schedule with all events that repeat (e.g. lectures)
-- The _single events_ show all appointments that don't repeat (e.g. exams)
-
-### My App
-
-The "my courses" section has been revamped,
-and now shows events for the next days and with more detail.

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

@@ -1,6 +0,0 @@
-import {versions} from '../../default/tools/version.js';
-
-/** @type {import('@openstapps/core').SCAppVersionInfo[]} */
-const versionHistory = await versions(import.meta.url);
-
-export default versionHistory;

backend/backend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/backend",
   "description": "A reference implementation for a StApps backend",
-  "version": "3.1.2",
+  "version": "3.0.0",
   "private": true,
   "type": "module",
   "license": "AGPL-3.0-only",
@@ -59,7 +59,6 @@
     "body-parser": "1.20.2",
     "cors": "2.8.5",
     "cosmiconfig": "8.1.3",
-    "deepmerge": "4.3.1",
     "express": "4.18.2",
     "express-prom-bundle": "6.6.0",
     "express-promise-router": "4.1.1",

backend/backend/src/config.ts

@@ -2,7 +2,6 @@ import {cosmiconfig, PublicExplorer} from 'cosmiconfig';
 import {SCConfigFile} from '@openstapps/core';
 import path from 'path';
 import deepmerge from 'deepmerge';
-import {Logger} from '@openstapps/logger';
 
 const fallbackNamespace = 'default';
 const configPath = 'config';
@@ -24,25 +23,31 @@ function configLoader(moduleName: string): PublicExplorer {
  * Find and load a config file
  */
 async function findConfig<T>(moduleName: string, namespace = fallbackNamespace): Promise<T> {
-  const config = await configLoader(moduleName).search(path.posix.join('.', configPath, namespace));
+  return configLoader(moduleName)
-
+    .search(path.posix.join('.', configPath, namespace))
-  if (config) {
+    .then(it => it!.config as T)
-    Logger.info(`Using ${namespace} config for ${moduleName}`);
+    .catch(() =>
-    return config.config;
+      configLoader(moduleName)
-  } else {
+        .search(path.posix.join('.', configPath, fallbackNamespace))
-    Logger.info(`Using ${fallbackNamespace} config for ${moduleName}`);
+        .then(it => it!.config),
-    return configLoader(moduleName)
+    );
-      .search(path.posix.join('.', configPath, fallbackNamespace))
-      .then(it => it!.config);
-  }
 }
 
-const namespace = process.env.NODE_APP_INSTANCE;
+/**
-const database = process.env.NODE_CONFIG_ENV;
+ * Loads a config file
+ */
+async function loadConfig<T>(moduleName: string): Promise<T> {
+  const namespace = process.env.NODE_APP_INSTANCE;
+  const database = process.env.NODE_CONFIG_ENV;
 
-export const prometheusConfig = await findConfig<unknown>('prometheus', namespace);
+  const config = await findConfig<T>(moduleName, namespace);
+  if (database) {
+    const databaseConfig = await findConfig<T>(database, namespace);
+    return deepmerge(config, databaseConfig);
+  }
 
-const backendConfigWithoutDatabase = await findConfig<SCConfigFile>('backend', namespace);
+  return config;
-export const backendConfig = database
+}
-  ? deepmerge(backendConfigWithoutDatabase, await findConfig<never>(database, namespace))
+
-  : backendConfigWithoutDatabase;
+export const backendConfig = await loadConfig<SCConfigFile>('backend');
+export const prometheusConfig = await loadConfig<unknown>('prometheus');

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

@@ -84,10 +84,7 @@ export class Elasticsearch implements Database {
    * @param config an assembled config file
    * @param mailQueue a mail queue for monitoring
    */
-  constructor(
+  constructor(private readonly config: SCConfigFile, mailQueue?: MailQueue) {
-    private readonly config: SCConfigFile,
-    mailQueue?: MailQueue,
-  ) {
     if (config.internal.database === undefined || typeof config.internal.database.version !== 'string') {
       throw new TypeError('Database version is undefined. Check your config file');
     }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -39,6 +39,7 @@ import {Elasticsearch} from '../../../src/storage/elasticsearch/elasticsearch.js
 import {bulk, DEFAULT_TEST_TIMEOUT, getTransport, getIndex} from '../../common.js';
 import fs from 'fs';
 import {backendConfig} from '../../../src/config.js';
+import {readFile} from 'fs/promises';
 import {
   ACTIVE_INDICES_ALIAS,
   getIndexUID,
@@ -49,11 +50,6 @@ import {
 } from '../../../src/storage/elasticsearch/util/index.js';
 import cron from 'node-cron';
 import {query} from './query.js';
-import messageFile from '@openstapps/core/test/resources/indexable/Message.1.json' assert {type: 'json'};
-import 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;
 
 use(chaiAsPromised);
 
@@ -64,6 +60,13 @@ function searchResponse<T>(...hits: SearchHit<T>[]): SearchResponse<T> {
   return {hits: {hits}, took: 0, timed_out: false, _shards: {total: 1, failed: 0, successful: 1}};
 }
 
+const message = JSON.parse(
+  await readFile('node_modules/@openstapps/core/test/resources/indexable/Message.1.json', 'utf8'),
+);
+const book = JSON.parse(
+  await readFile('node_modules/@openstapps/core/test/resources/indexable/Book.1.json', 'utf8'),
+);
+
 describe('Elasticsearch', function () {
   // increase timeout for the suite
   this.timeout(DEFAULT_TEST_TIMEOUT);
@@ -71,15 +74,8 @@ describe('Elasticsearch', function () {
 
   before(function () {
     // eslint-disable-next-line no-console
+    console.log('before');
     sandbox.stub(fs, 'readFileSync').returns('{}');
-    sandbox.stub(backendConfig.internal.boostings.default[0], 'fields').value({
-      'academicTerms.acronym': {
-        'SS 2023': 1.05,
-        'WS 2023/24': 1.1,
-        'SoSe 2023': 1.05,
-        'WiSe 2023/24': 1.1,
-      },
-    });
   });
   after(function () {
     sandbox.restore();
@@ -449,7 +445,7 @@ describe('Elasticsearch', function () {
           _id: '',
           _index: '',
           _score: 0,
-          _source: message,
+          _source: message as SCMessage,
         };
         sandbox.stub(es.client, 'search').resolves(searchResponse(foundObject));
 
@@ -479,7 +475,7 @@ describe('Elasticsearch', function () {
         const object: SearchHit<SCMessage> = {
           _id: '',
           _index: oldIndex,
-          _source: message,
+          _source: message as SCMessage,
         };
         sandbox.stub(es.client, 'search').resolves(searchResponse<SCMessage>(object));
         sandbox.stub(es, 'prepareBulkWrite').resolves(index);
@@ -493,7 +489,7 @@ describe('Elasticsearch', function () {
         sandbox.stub(es.client, 'create').resolves({result: 'not_found'} as CreateResponse);
 
         await es.init();
-        return expect(es.post(message, bulk)).to.rejectedWith('creation');
+        return expect(es.post(message as SCMessage, bulk)).to.rejectedWith('creation');
       });
 
       it('should create a new object', async function () {
@@ -506,7 +502,7 @@ describe('Elasticsearch', function () {
         });
 
         await es.init();
-        await es.post(message, bulk);
+        await es.post(message as SCMessage, bulk);
 
         expect(createStub.called).to.be.true;
         expect(caughtParameter.document).to.be.eql({
@@ -531,7 +527,7 @@ describe('Elasticsearch', function () {
           _id: '',
           _index: getIndex(),
           _score: 0,
-          _source: message,
+          _source: message as SCMessage,
         };
         sandbox.stub(es.client, 'search').resolves(searchResponse());
 
@@ -545,7 +541,7 @@ describe('Elasticsearch', function () {
           _id: '',
           _index: getIndex(),
           _score: 0,
-          _source: message,
+          _source: message as SCMessage,
         };
         sandbox.stub(es.client, 'search').resolves(searchResponse(object));
         // @ts-expect-error unused
@@ -568,13 +564,13 @@ describe('Elasticsearch', function () {
         _id: '123',
         _index: getIndex(),
         _score: 0,
-        _source: message,
+        _source: message as SCMessage,
       };
       const objectBook: SearchHit<SCBook> = {
         _id: '321',
         _index: getIndex(),
         _score: 0,
-        _source: book,
+        _source: book as SCBook,
       };
       const fakeEsAggregations = {
         '@all': {

backend/backend/tsconfig.json

@@ -3,8 +3,6 @@
   "compilerOptions": {
     "resolveJsonModule": true,
     "useUnknownInCatchVariables": false,
-    "allowJs": true,
+    "allowJs": true
-    "checkJs": true
+  }
-  },
-  "exclude": ["app.js", "lib/"]
 }

backend/proxy/package.json

@@ -50,7 +50,7 @@
     "dockerode": "3.3.5",
     "is-cidr": "4.0.2",
     "mustache": "4.2.0",
-    "semver": "7.5.4",
+    "semver": "7.3.8",
     "typescript": "5.1.6"
   },
   "devDependencies": {
@@ -65,7 +65,7 @@
     "@types/mustache": "4.2.2",
     "@types/node": "18.15.3",
     "@types/proxyquire": "1.3.28",
-    "@types/semver": "7.5.6",
+    "@types/semver": "7.3.13",
     "@types/sha1": "1.1.3",
     "@types/sinon": "10.0.14",
     "@types/sinon-chai": "3.2.9",

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

@@ -5,7 +5,6 @@
     <item title="search" title.de="Suche" icon="search" route="/search"/>
     <item title="library catalog" title.de="Bibliothekskatalog" icon="local_library" route="/hebis-search"/>
     <item title="course catalog" title.de="Vorlesungsverzeichnis" icon="inventory_2" route="/catalog"/>
-    <item title="job postings" title.de="Jobangebote" icon="work" route="/jobs"/>
   </group>
   <group title="canteen" title.de="Mensa" icon="local_cafe" route="/canteen"/>
   <group title="campus map" title.de="Campus Karte" icon="map" route="/map"/>

configuration/backend-config/test/menu.xml

@@ -5,7 +5,6 @@
     <item title="search" title.de="Suche" icon="search" route="/search"/>
     <item title="library catalog" title.de="Bibliothekskatalog" icon="local_library" route="/hebis-search"/>
     <item title="course catalog" title.de="Vorlesungsverzeichnis" icon="inventory_2" route="/catalog"/>
-    <item title="job postings" title.de="Jobangebote" icon="work" route="/jobs"/>
   </group>
   <group title="canteen" title.de="Mensa" icon="local_cafe" route="/canteen"/>
   <group title="campus map" title.de="Campus Karte" icon="map" route="/map"/>

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

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

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

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

configuration/eslint-config/index.js

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

configuration/prettier-config/index.js

@@ -1,15 +0,0 @@
-/** @type {import('prettier').Config} */
-const config = {
-  tabWidth: 2,
-  printWidth: 110,
-  useTabs: false,
-  semi: true,
-  singleQuote: true,
-  quoteProps: 'consistent',
-  trailingComma: 'all',
-  bracketSpacing: false,
-  arrowParens: 'avoid',
-  endOfLine: 'lf'
-}
-
-export default config;

configuration/prettier-config/index.json

@@ -0,0 +1,13 @@
+{
+  "$schema": "http://json.schemastore.org/prettierrc",
+  "tabWidth": 2,
+  "printWidth": 110,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": true,
+  "quoteProps": "consistent",
+  "trailingComma": "all",
+  "bracketSpacing": false,
+  "arrowParens": "avoid",
+  "endOfLine": "lf"
+}

configuration/prettier-config/package.json

@@ -9,19 +9,16 @@
   "contributors": [
     "Rainer Killinger <mail-openstapps@killinger.co>"
   ],
-  "main": "index.js",
+  "main": "index.json",
   "files": [
-    "index.js",
+    "index.json",
     "CHANGELOG.md",
     "README.md"
   ],
   "scripts": {
-    "test": "prettier --config index.js --check \"test/*.js\""
+    "test": "npx prettier --config index.json --check \"test/*.js\""
-  },
-  "devDependencies": {
-    "prettier": "3.1.1"
   },
   "peerDependencies": {
-    "prettier": "3.1.1"
+    "prettier": "2.8.6"
   }
 }

configuration/tsconfig/tsconfig.json

@@ -14,7 +14,6 @@
     "noFallthroughCasesInSwitch": true,
     "isolatedModules": true,
     "allowJs": true,
-    "checkJs": true,
     "resolveJsonModule": true,
     "allowSyntheticDefaultImports": true,
     "noImplicitAny": true,

examples/minimal-connector/CHANGELOG.md

@@ -1,21 +1,5 @@
 # @openstapps/minimal-connector
 
-## 3.1.1
-
-### Patch Changes
-
-- Updated dependencies
-  - @openstapps/api@3.1.1
-  - @openstapps/core@3.1.1
-
-## 3.1.0
-
-### Patch Changes
-
-- Updated dependencies [06b8ca10]
-  - @openstapps/core@3.1.0
-  - @openstapps/api@3.1.0
-
 ## 3.0.0
 
 ### Major Changes

examples/minimal-connector/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/minimal-connector",
   "description": "This is a minimal connector which serves as an example",
-  "version": "3.1.1",
+  "version": "3.0.0",
   "private": true,
   "type": "module",
   "license": "GPL-3.0-only",

examples/minimal-connector/src/minimal-connector.ts

@@ -51,7 +51,7 @@ export class MinimalConnector extends Connector<SCMessage> {
   protected async fetchItems(): Promise<SCMessage[]> {
     return [
       {
-        audiences: ['students', 'employees', 'guests'],
+        audiences: ['students', 'employees'],
         categories: [],
         description: 'Some description 1',
         messageBody: 'Some message 1',
@@ -61,7 +61,7 @@ export class MinimalConnector extends Connector<SCMessage> {
         uid: createUUID({id: 'message_1'}, this.licensePlate),
       },
       {
-        audiences: ['students', 'employees', 'guests'],
+        audiences: ['students', 'employees'],
         categories: [],
         description: 'Some description 2',
         messageBody: 'Some message 2',
@@ -71,7 +71,7 @@ export class MinimalConnector extends Connector<SCMessage> {
         uid: '', // see Connetor.getItems()
       },
       {
-        audiences: ['students', 'employees', 'guests'],
+        audiences: ['students', 'employees'],
         categories: [],
         description: 'Some description 3',
         messageBody: 'Some message 3',

examples/minimal-deployment/docker-compose.yml

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

examples/minimal-plugin/CHANGELOG.md

@@ -1,23 +1,5 @@
 # @openstapps/minimal-plugin
 
-## 3.1.1
-
-### Patch Changes
-
-- Updated dependencies
-  - @openstapps/api@3.1.1
-  - @openstapps/api-plugin@3.1.1
-  - @openstapps/core@3.1.1
-
-## 3.1.0
-
-### Patch Changes
-
-- Updated dependencies [06b8ca10]
-  - @openstapps/core@3.1.0
-  - @openstapps/api@3.1.0
-  - @openstapps/api-plugin@3.1.0
-
 ## 3.0.0
 
 ### Major Changes

examples/minimal-plugin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/minimal-plugin",
   "description": "Minimal Plugin",
-  "version": "3.1.1",
+  "version": "3.0.0",
   "private": true,
   "type": "module",
   "license": "GPL-3.0-only",

flake.lock

@@ -1,30 +1,12 @@
 {
   "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701626906,
+        "lastModified": 1689752456,
-        "narHash": "sha256-ugr1QyzzwNk505ICE4VMQzonHQ9QS5W33xF2FXzFQ00=",
+        "narHash": "sha256-VOChdECcEI8ixz8QY+YC4JaNEFwQd1V8bA0G4B28Ki0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0c6d8c783336a59f4c59d4a6daed6ab269c4b361",
+        "rev": "7f256d7da238cb627ef189d56ed590739f42f13b",
         "type": "github"
       },
       "original": {
@@ -36,24 +18,8 @@
     },
     "root": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

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

frontend/app/.eslintrc.json

@@ -46,7 +46,6 @@
         "unicorn/no-nested-ternary": "off",
         "unicorn/better-regex": "off",
         "unicorn/no-non-null-assertion": "off",
-        "unicorn/consistent-function-scoping": ["error", {"checkArrowFunctions": false}],
         "jsdoc/no-types": "error",
         "jsdoc/require-param": "off",
         "jsdoc/require-param-description": "error",

frontend/app/.gitignore

@@ -37,7 +37,6 @@ resources/*/icon/
 resources/*/splash/
 android/app/src/main/res/**/*.png
 ios/App/App/Assets.xcassets/**/*.png
-AndroidManifest.xml.orig
 
 .DS_Store
 Thumbs.db

frontend/app/.prettierrc.js

@@ -12,11 +12,9 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-import prettierConfig from '@openstapps/prettier-config';
 
-/** @type {import('prettier').Config} */
+module.exports = {
-const config = {
+  ...require('@openstapps/prettier-config'),
-  ...prettierConfig,
   overrides: [
     {
       files: 'src/**/*.html',
@@ -27,5 +25,3 @@ const config = {
   ],
   ignorePath: ['.prettierignore', '../../.gitignore'],
 };
-
-export default config;

frontend/app/CHANGELOG.md

@@ -1,42 +1,5 @@
 # @openstapps/app
 
-## 3.1.2
-
-### Patch Changes
-
-- Fix for Android users not being able to log in
-
-## 3.1.1
-
-### Patch Changes
-
-- Fix version history offered by backend
-- Updated dependencies
-  - @openstapps/api@3.1.1
-  - @openstapps/core@3.1.1
-
-## 3.1.1
-
-### Patch Changes
-
-- last minute deployment changes
-
-## 3.1.0
-
-### Minor Changes
-
-- 06b8ca10: Add job portal feature
-- 066e3744: Update to Capacitor 5.x
-
-### Patch Changes
-
-- 066e3744: Update logo flow to use capacitor-assets (single asset)
-- 066e3744: Replace NavigationBar/StatusBar plugins with native color setting
-- 066e3744: Hide splash screen only when app is ready
-- Updated dependencies [06b8ca10]
-  - @openstapps/core@3.1.0
-  - @openstapps/api@3.1.0
-
 ## 3.0.0
 
 ### Major Changes

frontend/app/README.md

@@ -52,7 +52,7 @@ All the npm scripts are defined in `package.json` [file](package.json). It is re
 
 ## Most useful commands
 
-### Editing the Ionic Database from the browser
+## Editing the Ionic Database from the browser
 
 Add the following function using the browser console
 
@@ -90,19 +90,6 @@ You'll need to run _Chromium_ using
 pnpm chromium:no-cors
 ```
 
-### Help, I can't log in!
-
-Login services will often block hosts not coming from the production
-server. You can circumvent this locally by using the `:virtual-host`
-scripts:
-
-```shell
-# Start the dev server on mobile.app.uni-frankfurt.de
-pnpm start:virtual-host
-# Run chromium with flags that redirect mobile.app.uni-frankfurt.de to localhost:8100
-pnpm chromium:virtual-host
-```
-
 ### Running the app
 
 Install the npm packages needed for running the app (as for any other node project which uses npm):

frontend/app/android/app/build.gradle

@@ -1,7 +1,6 @@
 apply plugin: 'com.android.application'
 
 android {
-    namespace "de.anyschool.app"
     compileSdkVersion rootProject.ext.compileSdkVersion
     defaultConfig {
         applicationId "de.anyschool.app"

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

@@ -2,8 +2,8 @@
 
 android {
   compileOptions {
-      sourceCompatibility JavaVersion.VERSION_17
+      sourceCompatibility JavaVersion.VERSION_11
-      targetCompatibility JavaVersion.VERSION_17
+      targetCompatibility JavaVersion.VERSION_11
   }
 }
 
@@ -23,6 +23,8 @@ dependencies {
     implementation project(':capacitor-preferences')
     implementation project(':capacitor-share')
     implementation project(':capacitor-splash-screen')
+    implementation project(':capacitor-status-bar')
+    implementation project(':hugotomazi-capacitor-navigation-bar')
     implementation project(':transistorsoft-capacitor-background-fetch')
     implementation project(':capacitor-secure-storage-plugin')
 

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

@@ -1,5 +1,7 @@
-<?xml version='1.0' encoding='utf-8' ?>
+<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="de.anyschool.app">
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -8,14 +10,16 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true">
+
         <activity
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
-            android:exported="true"
-            android:label="@string/title_activity_main"
-            android:launchMode="singleTask"
             android:name="de.anyschool.app.MainActivity"
+            android:label="@string/title_activity_main"
             android:theme="@style/AppTheme.NoActionBarLaunch"
+            android:launchMode="singleTask"
+            android:exported="true"
             android:windowSoftInputMode="adjustPan">
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -33,14 +37,20 @@
                 <data android:host="@string/app_host" android:scheme="https" />
             </intent-filter>
         </activity>
+
         <provider
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
             android:exported="false"
-            android:grantUriPermissions="true"
+            android:grantUriPermissions="true">
-            android:name="androidx.core.content.FileProvider">
+            <meta-data
-            <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths"></meta-data>
         </provider>
     </application>
+
+    <!-- Permissions -->
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

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

@@ -55,6 +55,14 @@
 		"pkg": "@capacitor/splash-screen",
 		"classpath": "com.capacitorjs.plugins.splashscreen.SplashScreenPlugin"
 	},
+	{
+		"pkg": "@capacitor/status-bar",
+		"classpath": "com.capacitorjs.plugins.statusbar.StatusBarPlugin"
+	},
+	{
+		"pkg": "@hugotomazi/capacitor-navigation-bar",
+		"classpath": "br.com.tombus.capacitor.plugin.navigationbar.NavigationBarPlugin"
+	},
 	{
 		"pkg": "@transistorsoft/capacitor-background-fetch",
 		"classpath": "com.transistorsoft.bgfetch.capacitor.BackgroundFetchPlugin"

frontend/app/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+</vector>

frontend/app/android/app/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillColor="#26A69A"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+</vector>

frontend/app/android/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -1,27 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <group android:scaleX="0.649"
-      android:scaleY="0.649"
-      android:translateX="176.63525"
-      android:translateY="179.712">
-    <path
-        android:pathData="M272.4,232.1L483.6,232.1A38,38 0,0 1,521.6 270.2L521.6,481.4A38,38 0,0 1,483.6 519.4L272.4,519.4A38,38 0,0 1,234.4 481.4L234.4,270.2A38,38 0,0 1,272.4 232.1z"
-        android:strokeWidth="0.839386"
-        android:fillColor="#00b5cc"/>
-    <path
-        android:pathData="M584.2,402.8L662,402.8A19.4,19.4 0,0 1,681.4 422.2L681.4,499.9A19.4,19.4 0,0 1,662 519.4L584.2,519.4A19.4,19.4 0,0 1,564.8 499.9L564.8,422.2A19.4,19.4 0,0 1,584.2 402.8z"
-        android:strokeWidth="0.842212"
-        android:fillColor="#3be40b"/>
-    <path
-        android:pathData="M591.8,562.6L769.3,562.6A27,27 0,0 1,796.3 589.6L796.3,767A27,27 0,0 1,769.3 794.1L591.8,794.1A27,27 0,0 1,564.8 767L564.8,589.6A27,27 0,0 1,591.8 562.6z"
-        android:strokeWidth="0.832623"
-        android:fillColor="#c90e20"/>
-    <path
-        android:pathData="M371.2,562.6L496.3,562.6A25.3,25.3 0,0 1,521.6 587.9L521.6,713A25.3,25.3 0,0 1,496.3 738.3L371.2,738.3A25.3,25.3 0,0 1,345.9 713L345.9,587.9A25.3,25.3 0,0 1,371.2 562.6z"
-        android:strokeWidth="0.846446"
-        android:fillColor="#e4a20b"/>
-  </group>
-</vector>

frontend/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
-</adaptive-icon>

frontend/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
-</adaptive-icon>

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <color name="colorBackground">#000</color>
-</resources>

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

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:background">@null</item>
-        <item name="android:statusBarColor">@color/colorPrimary</item>
-        <item name="android:windowBackground">@color/colorPrimary</item>
-        <item name="android:navigationBarColor">@color/colorBackground</item>
-    </style>
-</resources>

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <color name="colorPrimary">#3880ff</color>
-  <color name="colorPrimaryDark">#3880ff</color>
-  <color name="colorBackground">#f5f5f5</color>
-</resources>

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

@@ -13,14 +13,12 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:background">@null</item>
-        <item name="android:statusBarColor">@color/colorPrimary</item>
+        <item name="android:windowBackground">#FFFFFF</item>
-        <item name="android:windowBackground">@color/colorPrimary</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
-        <item name="android:navigationBarColor">@color/colorBackground</item>
-        <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
     </style>
 
 
     <style name="AppTheme.NoActionBarLaunch" parent="Theme.SplashScreen">
-        <item name="android:windowBackground">@color/colorPrimary</item>
+        <item name="android:background">@drawable/splash</item>
     </style>
 </resources>

frontend/app/android/build.gradle

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

frontend/app/android/capacitor.settings.gradle

@@ -1,51 +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@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/android/capacitor')
+project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@4.6.1_@capacitor+core@4.6.1/node_modules/@capacitor/android/capacitor')
 
 include ':capacitor-app'
-project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/app/android')
+project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@4.1.1_@capacitor+core@4.6.1/node_modules/@capacitor/app/android')
 
 include ':capacitor-browser'
-project(':capacitor-browser').projectDir = new File('../../../node_modules/.pnpm/@capacitor+browser@5.1.0_@capacitor+core@5.5.0/node_modules/@capacitor/browser/android')
+project(':capacitor-browser').projectDir = new File('../../../node_modules/.pnpm/@capacitor+browser@4.1.0_@capacitor+core@4.6.1/node_modules/@capacitor/browser/android')
 
 include ':capacitor-clipboard'
-project(':capacitor-clipboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+clipboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/clipboard/android')
+project(':capacitor-clipboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+clipboard@4.1.0_@capacitor+core@4.6.1/node_modules/@capacitor/clipboard/android')
 
 include ':capacitor-device'
-project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/device/android')
+project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@4.1.0_@capacitor+core@4.6.1/node_modules/@capacitor/device/android')
 
 include ':capacitor-dialog'
-project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/@capacitor+dialog@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/dialog/android')
+project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/@capacitor+dialog@4.1.0_@capacitor+core@4.6.1/node_modules/@capacitor/dialog/android')
 
 include ':capacitor-filesystem'
-project(':capacitor-filesystem').projectDir = new File('../../../node_modules/.pnpm/@capacitor+filesystem@5.1.4_@capacitor+core@5.5.0/node_modules/@capacitor/filesystem/android')
+project(':capacitor-filesystem').projectDir = new File('../../../node_modules/.pnpm/@capacitor+filesystem@4.1.4_@capacitor+core@4.6.1/node_modules/@capacitor/filesystem/android')
 
 include ':capacitor-geolocation'
-project(':capacitor-geolocation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+geolocation@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/geolocation/android')
+project(':capacitor-geolocation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+geolocation@4.1.0_@capacitor+core@4.6.1/node_modules/@capacitor/geolocation/android')
 
 include ':capacitor-haptics'
-project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/haptics/android')
+project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@4.1.0_@capacitor+core@4.6.1/node_modules/@capacitor/haptics/android')
 
 include ':capacitor-keyboard'
-project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+keyboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/keyboard/android')
+project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+keyboard@4.1.0_@capacitor+core@4.6.1/node_modules/@capacitor/keyboard/android')
 
 include ':capacitor-local-notifications'
-project(':capacitor-local-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+local-notifications@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/local-notifications/android')
+project(':capacitor-local-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+local-notifications@4.1.4_@capacitor+core@4.6.1/node_modules/@capacitor/local-notifications/android')
 
 include ':capacitor-network'
-project(':capacitor-network').projectDir = new File('../../../node_modules/.pnpm/@capacitor+network@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/network/android')
+project(':capacitor-network').projectDir = new File('../../../node_modules/.pnpm/@capacitor+network@4.1.0_@capacitor+core@4.6.1/node_modules/@capacitor/network/android')
 
 include ':capacitor-preferences'
-project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/preferences/android')
+project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@4.0.2_@capacitor+core@4.6.1/node_modules/@capacitor/preferences/android')
 
 include ':capacitor-share'
-project(':capacitor-share').projectDir = new File('../../../node_modules/.pnpm/@capacitor+share@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/share/android')
+project(':capacitor-share').projectDir = new File('../../../node_modules/.pnpm/@capacitor+share@4.1.0_@capacitor+core@4.6.1/node_modules/@capacitor/share/android')
 
 include ':capacitor-splash-screen'
-project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/splash-screen/android')
+project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@4.1.2_@capacitor+core@4.6.1/node_modules/@capacitor/splash-screen/android')
+
+include ':capacitor-status-bar'
+project(':capacitor-status-bar').projectDir = new File('../../../node_modules/.pnpm/@capacitor+status-bar@4.1.1_@capacitor+core@4.6.1/node_modules/@capacitor/status-bar/android')
+
+include ':hugotomazi-capacitor-navigation-bar'
+project(':hugotomazi-capacitor-navigation-bar').projectDir = new File('../../../node_modules/.pnpm/@hugotomazi+capacitor-navigation-bar@2.0.0_@capacitor+core@4.6.1/node_modules/@hugotomazi/capacitor-navigation-bar/android')
 
 include ':transistorsoft-capacitor-background-fetch'
-project(':transistorsoft-capacitor-background-fetch').projectDir = new File('../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.1.1_@capacitor+core@5.5.0/node_modules/@transistorsoft/capacitor-background-fetch/android')
+project(':transistorsoft-capacitor-background-fetch').projectDir = new File('../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@1.0.2_@capacitor+core@4.6.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.9.0_@capacitor+core@5.5.0/node_modules/capacitor-secure-storage-plugin/android')
+project(':capacitor-secure-storage-plugin').projectDir = new File('../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.8.1_@capacitor+core@4.6.1/node_modules/capacitor-secure-storage-plugin/android')

frontend/app/android/gradle.properties

@@ -20,4 +20,5 @@ org.gradle.jvmargs=-Xmx1536m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true

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

@@ -1,6 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
-networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

frontend/app/android/gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/master/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/.
@@ -80,11 +80,11 @@ do
     esac
 done
 
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
 # 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"'
 
@@ -143,16 +143,12 @@ fi
 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=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -209,12 +205,6 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

frontend/app/android/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,8 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
+if "%DIRNAME%" == "" set DIRNAME=.
-@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
+exit /b 1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

frontend/app/android/variables.gradle

@@ -1,16 +1,16 @@
 ext {
     minSdkVersion = 22
-    compileSdkVersion = 33
+    compileSdkVersion = 32
-    targetSdkVersion = 33
+    targetSdkVersion = 32
-    androidxActivityVersion = '1.7.0'
+    androidxActivityVersion = '1.4.0'
-    androidxAppCompatVersion = '1.6.1'
+    androidxAppCompatVersion = '1.4.2'
     androidxCoordinatorLayoutVersion = '1.2.0'
-    androidxCoreVersion = '1.10.0'
+    androidxCoreVersion = '1.8.0'
-    androidxFragmentVersion = '1.5.6'
+    androidxFragmentVersion = '1.4.1'
-    coreSplashScreenVersion = '1.0.0'
+    coreSplashScreenVersion = '1.0.0-rc01'
-    androidxWebkitVersion = '1.6.1'
+    androidxWebkitVersion = '1.4.0'
     junitVersion = '4.13.2'
-    androidxJunitVersion = '1.1.5'
+    androidxJunitVersion = '1.1.3'
-    androidxEspressoCoreVersion = '3.5.1'
+    androidxEspressoCoreVersion = '3.4.0'
     cordovaAndroidVersion = '10.1.1'
 }

frontend/app/capacitor.config.ts

@@ -4,6 +4,7 @@ const config: CapacitorConfig = {
   appId: 'de.anyschool.app',
   appName: 'StApps',
   webDir: 'www',
+  bundledWebRuntime: false,
   cordova: {
     preferences: {
       'AndroidXEnabled': 'true',
@@ -13,9 +14,18 @@ const config: CapacitorConfig = {
   },
   plugins: {
     SplashScreen: {
+      launchShowDuration: 6000,
       launchAutoHide: false,
-      backgroundColor: '#3880ff',
+      backgroundColor: '#ffffff',
+      androidSplashResourceName: 'splash',
+      androidScaleType: 'FIT_CENTER',
       showSpinner: false,
+      androidSpinnerStyle: 'large',
+      iosSpinnerStyle: 'small',
+      spinnerColor: '#999999',
+      splashFullScreen: false,
+      splashImmersive: false,
+      useDialog: false,
     },
     LocalNotifications: {
       // TODO