docs: update changelogs for release

ci: publish release

backend/backend/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @openstapps/backend
 
+## 3.3.2
+
+### Patch Changes
+
+- @openstapps/core@3.3.2
+- @openstapps/core-tools@3.3.2
+
+## 3.3.1
+
+### Patch Changes
+
+- 67ab1fd6: fix for geo.point mapping
+
 ## 3.3.0
 
 ### Minor Changes

backend/backend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/backend",
   "description": "A reference implementation for a StApps backend",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "private": true,
   "type": "module",
   "license": "AGPL-3.0-only",

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

@@ -25,7 +25,7 @@ export function buildDistanceFilter(
 ): QueryDslSpecificQueryContainer<'geo_distance'> {
   const geoObject: QueryDslGeoDistanceQuery = {
     distance: `${filter.arguments.distance}m`,
-    [`${filter.arguments.field}.point.coordinates`]: {
+    [`${filter.arguments.field}.point`]: {
       lat: filter.arguments.position[1],
       lon: filter.arguments.position[0],
     },

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

@@ -25,7 +25,7 @@ export function buildDistanceSort(sort: SCDistanceSort): SortOptions {
       mode: 'avg',
       order: sort.order,
       unit: 'm',
-      [`${sort.arguments.field}.point.coordinates`]: {
+      [`${sort.arguments.field}.point`]: {
         lat: sort.arguments.position[1],
         lon: sort.arguments.position[0],
       },

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

@@ -466,7 +466,7 @@ describe('Query', function () {
       const expectedFilter: QueryDslSpecificQueryContainer<'geo_distance'> = {
         geo_distance: {
           'distance': '1000m',
-          'geo.point.coordinates': {
+          'geo.point': {
             lat: 8.123,
             lon: 50.123,
           },
@@ -636,7 +636,7 @@ describe('Query', function () {
           'mode': 'avg',
           'order': 'desc',
           'unit': 'm',
-          'geo.point.coordinates': {
+          'geo.point': {
             lat: 50.123,
             lon: 8.123,
           },

examples/minimal-connector/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @openstapps/minimal-connector
 
+## 3.3.2
+
+### Patch Changes
+
+- @openstapps/core@3.3.2
+- @openstapps/api@3.3.2
+
 ## 3.3.0
 
 ### Patch Changes

examples/minimal-connector/package.json

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

examples/minimal-plugin/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @openstapps/minimal-plugin
 
+## 3.3.2
+
+### Patch Changes
+
+- @openstapps/core@3.3.2
+- @openstapps/core-tools@3.3.2
+- @openstapps/api-plugin@3.3.2
+- @openstapps/api@3.3.2
+
 ## 3.3.0
 
 ### Patch Changes

examples/minimal-plugin/package.json

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

flake.nix

@@ -4,68 +4,86 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
   };
-  outputs = {
-    self,
-    nixpkgs,
-    flake-utils,
-  }: let
-    aapt2buildToolsVersion = "33.0.2";
-  in
-    flake-utils.lib.eachDefaultSystem (system: let
-      pkgs = import nixpkgs {
-        inherit system;
-        overlays = [
-          (final: prev: rec {
-            fontMin = prev.python311.withPackages (ps: with ps; [brotli fonttools] ++ (with fonttools.optional-dependencies; [woff]));
-            android = prev.androidenv.composeAndroidPackages {
-              buildToolsVersions = ["30.0.3" aapt2buildToolsVersion];
-              platformVersions = ["33"];
-            };
-            cypress = prev.cypress.overrideAttrs (cyPrev: rec {
-              version = "13.2.0";
-              src = prev.fetchzip {
-                url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
-                hash = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM=";
+  outputs =
+    {
+      self,
+      nixpkgs,
+      flake-utils,
+    }:
+    let
+      aapt2buildToolsVersion = "33.0.2";
+    in
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [
+            (final: prev: rec {
+              fontMin = prev.python311.withPackages (
+                ps:
+                with ps;
+                [
+                  brotli
+                  fonttools
+                ]
+                ++ (with fonttools.optional-dependencies; [ woff ])
+              );
+              android = prev.androidenv.composeAndroidPackages {
+                buildToolsVersions = [
+                  "34.0.0"
+                  aapt2buildToolsVersion
+                ];
+                platformVersions = [ "34" ];
               };
-            });
-            nodejs = prev.nodejs_18;
-          })
-        ];
-        config = {
-          allowUnfree = true;
-          android_sdk.accept_license = true;
+              cypress = prev.cypress.overrideAttrs (cyPrev: rec {
+                version = "13.2.0";
+                src = prev.fetchzip {
+                  url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
+                  hash = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM=";
+                };
+              });
+              nodejs = prev.nodejs_18;
+              corepack = prev.corepack_18;
+            })
+          ];
+          config = {
+            allowUnfree = true;
+            android_sdk.accept_license = true;
+          };
         };
-      };
-      androidFhs = pkgs.buildFHSUserEnv {
-        name = "android-env";
-        targetPkgs = pkgs: with pkgs; [];
-        runScript = "bash";
-        profile = ''
-          export ALLOW_NINJA_ENV=true
-          export USE_CCACHE=1
-          export LD_LIBRARY_PATH=/usr/lib:/usr/lib32
-        '';
-      };
-    in {
-      devShell = pkgs.mkShell rec {
-        nativeBuildInputs = [androidFhs];
-        buildInputs = with pkgs; [
-          nodejs
-          corepack
-          # tools
-          curl
-          jq
-          fontMin
-          cypress
-          # android
-          jdk17
-          android.androidsdk
-        ];
-        ANDROID_JAVA_HOME = "${pkgs.jdk.home}";
-        ANDROID_SDK_ROOT = "${pkgs.android.androidsdk}/libexec/android-sdk";
-        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";
-      };
-    });
+        androidFhs = pkgs.buildFHSUserEnv {
+          name = "android-env";
+          targetPkgs = pkgs: with pkgs; [ ];
+          runScript = "bash";
+          profile = ''
+            export ALLOW_NINJA_ENV=true
+            export USE_CCACHE=1
+            export LD_LIBRARY_PATH=/usr/lib:/usr/lib32
+          '';
+        };
+      in
+      {
+        devShell = pkgs.mkShell rec {
+          nativeBuildInputs = [ androidFhs ];
+          buildInputs = with pkgs; [
+            nodejs
+            corepack
+            # tools
+            curl
+            jq
+            fontMin
+            cypress
+            # android
+            jdk17
+            android.androidsdk
+          ];
+          ANDROID_JAVA_HOME = "${pkgs.jdk.home}";
+          ANDROID_SDK_ROOT = "${pkgs.android.androidsdk}/libexec/android-sdk";
+          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";
+        };
+      }
+    );
 }

frontend/app/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @openstapps/app
 
+## 3.3.3
+
+### Patch Changes
+
+- 496b50d8: Bug fixes and Android target sdk version is now 34
+
+## 3.3.2
+
+### Patch Changes
+
+- 7afc24f1: fixed config version comparison
+  - @openstapps/core@3.3.2
+  - @openstapps/api@3.3.2
+
 ## 3.3.0
 
 ### Minor Changes

frontend/app/android/app/build.gradle

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

frontend/app/android/build.gradle

@@ -7,8 +7,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.0'
-        classpath 'com.google.gms:google-services:4.3.15'
+        classpath 'com.android.tools.build:gradle:8.2.1'
+        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,57 +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.7.3_@capacitor+core@5.7.3/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-screen-brightness'
-project(':capacitor-community-screen-brightness').projectDir = new File('../../../node_modules/.pnpm/@capacitor-community+screen-brightness@6.0.0_@capacitor+core@5.7.3/node_modules/@capacitor-community/screen-brightness/android')
+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@5.0.7_@capacitor+core@5.7.3/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@5.2.0_@capacitor+core@5.7.3/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@5.0.7_@capacitor+core@5.7.3/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@5.0.7_@capacitor+core@5.7.3/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@5.0.7_@capacitor+core@5.7.3/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@5.2.1_@capacitor+core@5.7.3/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@5.0.7_@capacitor+core@5.7.3/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@5.0.7_@capacitor+core@5.7.3/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@5.0.8_@capacitor+core@5.7.3/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@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/local-notifications/android')
+project(':capacitor-local-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+local-notifications@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@5.0.7_@capacitor+core@5.7.3/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@5.0.7_@capacitor+core@5.7.3/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@6.0.0_@capacitor+core@5.7.3/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@5.0.7_@capacitor+core@5.7.3/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@5.0.7_@capacitor+core@5.7.3/node_modules/@capacitor/splash-screen/android')
+project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@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@5.2.0_@capacitor+core@5.7.3/node_modules/@transistorsoft/capacitor-background-fetch/android')
+project(':transistorsoft-capacitor-background-fetch').projectDir = new File('../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.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.9.0_@capacitor+core@5.7.3/node_modules/capacitor-secure-storage-plugin/android')
+project(':capacitor-secure-storage-plugin').projectDir = new File('../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@6.1.1/node_modules/capacitor-secure-storage-plugin/android')

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

@@ -1,6 +1,6 @@
 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-8.2.1-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

frontend/app/android/variables.gradle

@@ -1,14 +1,14 @@
 ext {
     minSdkVersion = 22
-    compileSdkVersion = 33
-    targetSdkVersion = 33
-    androidxActivityVersion = '1.7.0'
+    compileSdkVersion = 34
+    targetSdkVersion = 34
+    androidxActivityVersion = '1.8.0'
     androidxAppCompatVersion = '1.6.1'
     androidxCoordinatorLayoutVersion = '1.2.0'
-    androidxCoreVersion = '1.10.0'
-    androidxFragmentVersion = '1.5.6'
-    coreSplashScreenVersion = '1.0.0'
-    androidxWebkitVersion = '1.6.1'
+    androidxCoreVersion = '1.12.0'
+    androidxFragmentVersion = '1.6.2'
+    coreSplashScreenVersion = '1.0.1'
+    androidxWebkitVersion = '1.9.0'
     junitVersion = '4.13.2'
     androidxJunitVersion = '1.1.5'
     androidxEspressoCoreVersion = '3.5.1'

frontend/app/ios/App/Podfile

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

frontend/app/ios/App/Podfile.lock

@@ -1,64 +1,70 @@
 PODS:
-  - Capacitor (5.5.0):
+  - Capacitor (6.1.1):
     - CapacitorCordova
-  - CapacitorApp (5.0.6):
+  - CapacitorApp (6.0.0):
     - Capacitor
-  - CapacitorBrowser (5.1.0):
+  - CapacitorBrowser (6.0.1):
     - Capacitor
-  - CapacitorClipboard (5.0.6):
+  - CapacitorClipboard (6.0.0):
     - Capacitor
-  - CapacitorCordova (5.5.0)
-  - CapacitorDevice (5.0.6):
+  - CapacitorCommunityScreenBrightness (6.0.0):
     - Capacitor
-  - CapacitorDialog (5.0.6):
+  - CapacitorCordova (6.1.1)
+  - CapacitorDevice (6.0.0):
     - Capacitor
-  - CapacitorFilesystem (5.1.4):
+  - CapacitorDialog (6.0.0):
     - Capacitor
-  - CapacitorGeolocation (5.0.6):
+  - CapacitorFilesystem (6.0.0):
     - Capacitor
-  - CapacitorHaptics (5.0.6):
+  - CapacitorGeolocation (6.0.0):
     - Capacitor
-  - CapacitorKeyboard (5.0.6):
+  - CapacitorHaptics (6.0.0):
     - Capacitor
-  - CapacitorLocalNotifications (5.0.6):
+  - CapacitorKeyboard (6.0.1):
     - Capacitor
-  - CapacitorNetwork (5.0.6):
+  - CapacitorLocalNotifications (6.0.0):
     - Capacitor
-  - CapacitorPreferences (5.0.6):
+  - CapacitorNetwork (6.0.1):
+    - Capacitor
+  - CapacitorPreferences (6.0.1):
+    - Capacitor
+  - CapacitorScreenOrientation (6.0.1):
     - Capacitor
   - CapacitorSecureStoragePlugin (0.9.0):
     - Capacitor
     - SwiftKeychainWrapper
-  - CapacitorShare (5.0.6):
+  - CapacitorShare (6.0.1):
     - Capacitor
-  - CapacitorSplashScreen (5.0.6):
+  - CapacitorSplashScreen (6.0.1):
     - Capacitor
-  - CordovaPlugins (5.5.0):
+  - CordovaPlugins (6.1.1):
     - CapacitorCordova
   - SwiftKeychainWrapper (4.0.1)
-  - TransistorsoftCapacitorBackgroundFetch (5.1.1):
+  - TransistorsoftCapacitorBackgroundFetch (5.2.0):
     - Capacitor
 
 DEPENDENCIES:
-  - "Capacitor (from `../../../../node_modules/.pnpm/@capacitor+ios@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/ios`)"
-  - "CapacitorApp (from `../../../../node_modules/.pnpm/@capacitor+app@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/app`)"
-  - "CapacitorBrowser (from `../../../../node_modules/.pnpm/@capacitor+browser@5.1.0_@capacitor+core@5.5.0/node_modules/@capacitor/browser`)"
-  - "CapacitorClipboard (from `../../../../node_modules/.pnpm/@capacitor+clipboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/clipboard`)"
-  - "CapacitorCordova (from `../../../../node_modules/.pnpm/@capacitor+ios@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/ios`)"
-  - "CapacitorDevice (from `../../../../node_modules/.pnpm/@capacitor+device@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/device`)"
-  - "CapacitorDialog (from `../../../../node_modules/.pnpm/@capacitor+dialog@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/dialog`)"
-  - "CapacitorFilesystem (from `../../../../node_modules/.pnpm/@capacitor+filesystem@5.1.4_@capacitor+core@5.5.0/node_modules/@capacitor/filesystem`)"
-  - "CapacitorGeolocation (from `../../../../node_modules/.pnpm/@capacitor+geolocation@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/geolocation`)"
-  - "CapacitorHaptics (from `../../../../node_modules/.pnpm/@capacitor+haptics@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/haptics`)"
-  - "CapacitorKeyboard (from `../../../../node_modules/.pnpm/@capacitor+keyboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/keyboard`)"
-  - "CapacitorLocalNotifications (from `../../../../node_modules/.pnpm/@capacitor+local-notifications@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/local-notifications`)"
-  - "CapacitorNetwork (from `../../../../node_modules/.pnpm/@capacitor+network@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/network`)"
-  - "CapacitorPreferences (from `../../../../node_modules/.pnpm/@capacitor+preferences@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/preferences`)"
-  - "CapacitorSecureStoragePlugin (from `../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@5.5.0/node_modules/capacitor-secure-storage-plugin`)"
-  - "CapacitorShare (from `../../../../node_modules/.pnpm/@capacitor+share@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/share`)"
-  - "CapacitorSplashScreen (from `../../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/splash-screen`)"
+  - "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@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/app`)"
+  - "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@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/clipboard`)"
+  - "CapacitorCommunityScreenBrightness (from `../../../../node_modules/.pnpm/@capacitor-community+screen-brightness@6.0.0_@capacitor+core@6.1.1/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`)"
+  - "CapacitorDevice (from `../../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/device`)"
+  - "CapacitorDialog (from `../../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/dialog`)"
+  - "CapacitorFilesystem (from `../../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/filesystem`)"
+  - "CapacitorGeolocation (from `../../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/geolocation`)"
+  - "CapacitorHaptics (from `../../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/haptics`)"
+  - "CapacitorKeyboard (from `../../../../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.1.1/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`)"
+  - "CapacitorNetwork (from `../../../../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/network`)"
+  - "CapacitorPreferences (from `../../../../node_modules/.pnpm/@capacitor+preferences@6.0.1_@capacitor+core@6.1.1/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`)"
+  - "CapacitorSecureStoragePlugin (from `../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@6.1.1/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`)"
+  - "CapacitorSplashScreen (from `../../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/splash-screen`)"
   - CordovaPlugins (from `../capacitor-cordova-ios-plugins`)
-  - "TransistorsoftCapacitorBackgroundFetch (from `../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.1.1_@capacitor+core@5.5.0/node_modules/@transistorsoft/capacitor-background-fetch`)"
+  - "TransistorsoftCapacitorBackgroundFetch (from `../../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.2.0_@capacitor+core@6.1.1/node_modules/@transistorsoft/capacitor-background-fetch`)"
 
 SPEC REPOS:
   trunk:
@@ -66,66 +72,72 @@ SPEC REPOS:
 
 EXTERNAL SOURCES:
   Capacitor:
-    :path: "../../../../node_modules/.pnpm/@capacitor+ios@5.5.0_@capacitor+core@5.5.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@5.0.6_@capacitor+core@5.5.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@5.1.0_@capacitor+core@5.5.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@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/clipboard"
+    :path: "../../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/clipboard"
+  CapacitorCommunityScreenBrightness:
+    :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@5.5.0_@capacitor+core@5.5.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@5.0.6_@capacitor+core@5.5.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@5.0.6_@capacitor+core@5.5.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@5.1.4_@capacitor+core@5.5.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@5.0.6_@capacitor+core@5.5.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@5.0.6_@capacitor+core@5.5.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@5.0.6_@capacitor+core@5.5.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@5.0.6_@capacitor+core@5.5.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@5.0.6_@capacitor+core@5.5.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@5.0.6_@capacitor+core@5.5.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@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/screen-orientation"
   CapacitorSecureStoragePlugin:
-    :path: "../../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@5.5.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@5.0.6_@capacitor+core@5.5.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@5.0.6_@capacitor+core@5.5.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@5.1.1_@capacitor+core@5.5.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: 57890b363df14d5d2d5d8461aa23e886cb34da2a
-  CapacitorApp: 024e1b1bea5f883d79f6330d309bc441c88ad04a
-  CapacitorBrowser: 7a0fb6a1011abfaaf2dfedfd8248f942a8eda3d6
-  CapacitorClipboard: 77edf49827ea21da2a9c05c690a4a6a4d07199c4
-  CapacitorCordova: 3d3908a3d208a11a75f9df3b18c4405c4de76e1d
-  CapacitorDevice: 2c968f98a1ec4d22357418c1521e7ddc46c675e6
-  CapacitorDialog: 0f3c15dfe9414b83bc64aef4078f1b92bcfead26
-  CapacitorFilesystem: af704badfbc69f6f8623d9ed313e5490e3723dcb
-  CapacitorGeolocation: 7be5f77abc205c0efe319fff8587a7183e7b0240
-  CapacitorHaptics: 1fffc1217c7e64a472d7845be50fb0c2f7d4204c
-  CapacitorKeyboard: b978154b024a5f65e044908e37d15b7de58b9d12
-  CapacitorLocalNotifications: c2d8b14794064fd4814b1d6c4ddbac8029afa295
-  CapacitorNetwork: d80b3e79bef6ec37640ee2806c19771f07ff2d0c
-  CapacitorPreferences: f03954bcb0ff09c792909e46bff88e3183c16b10
+  Capacitor: 8941aba4364ba9d1b22188569001f2ce45cc2b00
+  CapacitorApp: 9d53aec7101f7b030a950c5bdc4df8612576b279
+  CapacitorBrowser: 473c7fd70ddbe541608ff09ec1be14da0078279e
+  CapacitorClipboard: 80282f684154124b9019ebf401235b70b0cf4994
+  CapacitorCommunityScreenBrightness: 250184917bd0738a681c026a9513e18ddb0cb49b
+  CapacitorCordova: 8f2cc8d8d3619c566e9418fe8772064a94266106
+  CapacitorDevice: f8fd88f9edd1261c55a109f32015b09bbbfdc4a0
+  CapacitorDialog: 64aa82840ee5e9c066f9e1a49c1e186afd3f24d2
+  CapacitorFilesystem: 60e59ba274c234a979e7a3be2552feaadcee4263
+  CapacitorGeolocation: 1f12bbe372b65116e851bd8e3a94cf0ef9bacebb
+  CapacitorHaptics: 9ebc9363f0e9b8eb4295088a0b474530acf1859b
+  CapacitorKeyboard: 5f32a712adf41e07a61caafb82cf29fb6d8ba123
+  CapacitorLocalNotifications: 4ab68f0be5f697a579558fadd307d823a9ec1c26
+  CapacitorNetwork: 5c94acfdddc22043f2ffaff224ce9b4aa5a179f0
+  CapacitorPreferences: 72909b165bc7807103778ddbb86d5d8ce06abf71
+  CapacitorScreenOrientation: 3d4965dcbda5d901b6a48350a5d270ad7d404e05
   CapacitorSecureStoragePlugin: e91d7df060f2495a1acff9583641a6953e3aacba
-  CapacitorShare: cd41743331cb71d217c029de54b681cbd91e0fcc
-  CapacitorSplashScreen: 5fa2ab5e46cf5cc530cf16a51c80c7a986579ccd
-  CordovaPlugins: de5669381702d76ed5b1d442177a6a5fc3252a9d
+  CapacitorShare: 02222f2457ff003e642370a9c1ecd101baaa27c8
+  CapacitorSplashScreen: 61645214e8f955ff2b80f16a6a3648960fe4c89f
+  CordovaPlugins: 1078156cfc354dd440b38ce4062e69fd9b07033c
   SwiftKeychainWrapper: 807ba1d63c33a7d0613288512399cd1eda1e470c
-  TransistorsoftCapacitorBackgroundFetch: ce4b3e01b898cef516e68485d2160a078016ee97
+  TransistorsoftCapacitorBackgroundFetch: f130c5dcb6048401e74cc531e691e1d513045366
 
-PODFILE CHECKSUM: 229278f2c257e8ab555325c7115b2e187e8e628d
+PODFILE CHECKSUM: d0561b89b66368df409c77587e3e02b48e737203
 
-COCOAPODS: 1.13.0
+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": "3.3.0",
+  "version": "3.3.3",
   "private": true,
   "license": "GPL-3.0-only",
   "author": "Karl-Philipp Wulfert <krlwlfrt@gmail.com>",
@@ -62,22 +62,22 @@
     "@awesome-cordova-plugins/calendar": "6.6.0",
     "@awesome-cordova-plugins/core": "6.6.0",
     "@capacitor-community/screen-brightness": "6.0.0",
-    "@capacitor/app": "5.0.7",
-    "@capacitor/browser": "5.2.0",
-    "@capacitor/clipboard": "5.0.7",
-    "@capacitor/core": "5.7.3",
-    "@capacitor/device": "5.0.7",
-    "@capacitor/dialog": "5.0.7",
-    "@capacitor/filesystem": "5.2.1",
-    "@capacitor/geolocation": "5.0.7",
-    "@capacitor/haptics": "5.0.7",
-    "@capacitor/keyboard": "5.0.8",
-    "@capacitor/local-notifications": "5.0.7",
-    "@capacitor/network": "5.0.7",
-    "@capacitor/preferences": "5.0.7",
-    "@capacitor/screen-orientation": "6.0.0",
-    "@capacitor/share": "5.0.7",
-    "@capacitor/splash-screen": "5.0.7",
+    "@capacitor/app": "6.0.0",
+    "@capacitor/browser": "6.0.1",
+    "@capacitor/clipboard": "6.0.0",
+    "@capacitor/core": "6.1.1",
+    "@capacitor/device": "6.0.0",
+    "@capacitor/dialog": "6.0.0",
+    "@capacitor/filesystem": "6.0.0",
+    "@capacitor/geolocation": "6.0.0",
+    "@capacitor/haptics": "6.0.0",
+    "@capacitor/keyboard": "6.0.1",
+    "@capacitor/local-notifications": "6.0.0",
+    "@capacitor/network": "6.0.1",
+    "@capacitor/preferences": "6.0.1",
+    "@capacitor/screen-orientation": "6.0.1",
+    "@capacitor/share": "6.0.1",
+    "@capacitor/splash-screen": "6.0.1",
     "@ionic-native/core": "5.36.0",
     "@ionic/angular": "7.8.0",
     "@ionic/storage-angular": "4.0.0",
@@ -97,7 +97,7 @@
     "form-data": "4.0.0",
     "geojson": "0.5.0",
     "ionic-appauth": "0.9.0",
-    "jsonpath-plus": "6.0.1",
+    "jsonpath-plus": "10.0.6",
     "maplibre-gl": "4.0.2",
     "material-symbols": "0.17.1",
     "moment": "2.30.1",
@@ -129,10 +129,10 @@
     "@angular/language-server": "17.3.0",
     "@angular/language-service": "17.3.0",
     "@angular/platform-browser-dynamic": "17.3.0",
-    "@capacitor/android": "5.7.3",
+    "@capacitor/android": "6.1.1",
     "@capacitor/assets": "3.0.4",
-    "@capacitor/cli": "5.7.3",
-    "@capacitor/ios": "5.7.3",
+    "@capacitor/cli": "6.1.1",
+    "@capacitor/ios": "6.1.1",
     "@compodoc/compodoc": "1.1.23",
     "@cypress/schematic": "2.5.1",
     "@ionic/angular-toolkit": "11.0.1",

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

@@ -81,7 +81,6 @@ export class AuthHelperService {
       user[key as keyof SCUserConfiguration] = JSONPath({
         path: this.userConfigurationMap[key as keyof SCUserConfiguration] as string,
         json: userInfo,
-        preventEval: true,
       })[0];
     }
     if (user.givenName && user.givenName.length > 0 && user.familyName && user.familyName.length > 0) {

frontend/app/src/app/modules/config/config.provider.spec.ts

@@ -67,7 +67,8 @@ describe('ConfigProvider', () => {
 
   it('should fetch app configuration', async () => {
     spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(sampleIndexResponse));
-    const result = await configProvider.fetch();
+    await configProvider.fetch();
+    const result = configProvider.config;
     expect(result).toEqual(sampleIndexResponse);
   });
 
@@ -110,7 +111,7 @@ describe('ConfigProvider', () => {
     expect(storageProviderSpy.has).toHaveBeenCalled();
     expect(storageProviderSpy.get).toHaveBeenCalledTimes(0);
     expect(configProvider.client.handshake).toHaveBeenCalled();
-    expect(await configProvider.getValue('name')).toEqual(sampleIndexResponse.app.name);
+    expect(configProvider.getValue('name')).toEqual(sampleIndexResponse.app.name);
   });
 
   it('should throw error on failed initialisation', async () => {
@@ -132,6 +133,8 @@ describe('ConfigProvider', () => {
     wrongConfig.backend.SCVersion = '0.1.0';
     storageProviderSpy.get.and.returnValue(Promise.resolve(wrongConfig));
     spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(sampleIndexResponse));
+    // sets StApps core version which has a different major version
+    configProvider.scVersion = '1.0.0';
     await configProvider.init();
 
     expect(ngxLogger.warn).toHaveBeenCalledWith(
@@ -139,6 +142,19 @@ describe('ConfigProvider', () => {
     );
   });
 
+  it('should load from storage if offline and same major version stored', async () => {
+    internetConnectionServiceMock = {offline$: new BehaviorSubject<boolean>(true)};
+    storageProviderSpy.has.and.returnValue(Promise.resolve(true));
+    const configInStorage = structuredClone(sampleIndexResponse);
+    configInStorage.backend.SCVersion = '1.0.0';
+    storageProviderSpy.get.and.returnValue(Promise.resolve(configInStorage));
+    // sets StApps core version which has the same major version
+    configProvider.scVersion = '1.1.1';
+    await configProvider.init();
+
+    expect(configProvider.getAnyValue('app')).toEqual(configInStorage.app);
+  });
+
   it('should throw error on saved app configuration not available', async () => {
     storageProviderSpy.has.and.returnValue(Promise.resolve(false));
     // eslint-disable-next-line unicorn/error-message
@@ -177,4 +193,31 @@ describe('ConfigProvider', () => {
 
     expect(configProvider.getValue('name')).toEqual(sampleIndexResponse.app.name);
   });
+
+  it('should fetch new config from remote on init', async () => {
+    storageProviderSpy.has.and.returnValue(Promise.resolve(true));
+    storageProviderSpy.get.and.returnValue(Promise.resolve(sampleIndexResponse));
+    spyOn(configProvider, 'fetch');
+    await configProvider.init();
+
+    expect(configProvider.fetch).toHaveBeenCalled();
+  });
+
+  it('should update the local config with the one from remote', async () => {
+    storageProviderSpy.has.and.returnValue(Promise.resolve(true));
+    storageProviderSpy.get.and.returnValue(Promise.resolve(sampleIndexResponse));
+    const newConfig = structuredClone(sampleIndexResponse);
+    newConfig.app.name = 'New app name';
+    spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(newConfig));
+    await configProvider.init();
+
+    // Validate that the initial configuration is loaded
+    expect(configProvider.getValue('name')).toEqual(sampleIndexResponse.app.name);
+
+    // Fetch the new configuration from the remote
+    await configProvider.fetch();
+
+    // Validate that the new configuration is now set
+    expect(configProvider.getValue('name')).toEqual(newConfig.app.name);
+  });
 });

frontend/app/src/app/modules/config/config.provider.ts

@@ -83,17 +83,20 @@ export class ConfigProvider {
   /**
    * Fetches configuration from backend
    */
-  async fetch(): Promise<SCIndexResponse> {
+  async fetch(): Promise<void> {
     try {
       const isOffline = await firstValueFrom(this.internetConnectionService.offline$);
       if (isOffline) {
         throw new Error('Device is offline.');
       } else {
-        return await this.client.handshake(this.scVersion);
+        const fetchedConfig: SCIndexResponse = await this.client.handshake(this.scVersion);
+        await this.set(fetchedConfig);
+        this.logger.log(`Configuration updated from remote`);
       }
     } catch (error) {
       const error_ = error instanceof Error ? new ConfigFetchError(error.message) : new ConfigFetchError();
-      throw error_;
+      this.logger.warn(`Failed to fetch remote configuration:`, error_);
+      throw error_; // Rethrow the error to handle it in init()
     }
   }
 
@@ -121,40 +124,33 @@ export class ConfigProvider {
 
   /**
    * Initialises the ConfigProvider
-   * @throws ConfigInitError if no configuration could be loaded.
-   * @throws WrongConfigVersionInStorage if fetch failed and saved config has wrong SCVersion
+   * @throws ConfigInitError if no configuration could be loaded both locally and remote.
    */
   async init(): Promise<void> {
-    let loadError;
-    let fetchError;
-    // load saved configuration
     try {
+      // Attempt to load the configuration from local storage
       this.config = await this.loadLocal();
       this.firstSession = false;
       this.logger.log(`initialised configuration from storage`);
-      if (this.config.backend.SCVersion !== this.scVersion) {
-        loadError = new WrongConfigVersionInStorage(this.scVersion, this.config.backend.SCVersion);
+
+      // Check if the stored configuration has the correct version
+      if (this.config.backend.SCVersion.split('.')[0] !== this.scVersion.split('.')[0]) {
+        throw new WrongConfigVersionInStorage(this.scVersion, this.config.backend.SCVersion);
       }
-    } catch (error) {
-      loadError = error;
-    }
-    // fetch remote configuration from backend
-    try {
-      const fetchedConfig: SCIndexResponse = await this.fetch();
-      await this.set(fetchedConfig);
-      this.logger.log(`initialised configuration from remote`);
-    } catch (error) {
-      fetchError = error;
-    }
-    // check for occurred errors and throw them
-    if (loadError !== undefined && fetchError !== undefined) {
-      throw new ConfigInitError();
-    }
-    if (loadError !== undefined) {
+
+      // Fetch the remote configuration in a non-blocking manner
+      void this.fetch();
+    } catch (loadError) {
       this.logger.warn(loadError);
-    }
-    if (fetchError !== undefined) {
-      this.logger.warn(fetchError);
+
+      try {
+        // If local loading fails, immediately try to fetch the configuration from remote
+        await this.fetch();
+      } catch (fetchError) {
+        this.logger.warn(`Failed to fetch remote configuration:`, fetchError);
+        // If both local loading and remote fetching fail, throw ConfigInitError
+        throw new ConfigInitError();
+      }
     }
   }
 

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

@@ -33,9 +33,9 @@ ion-item {
   margin: var(--spacing-sm);
 
   ion-thumbnail {
-    --ion-margin: var(--spacing-xs);
+    --size: 36px;
 
-    margin-block: auto;
+    margin: 0;
     margin-inline: var(--spacing-md);
     padding: 0;
   }

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

@@ -80,13 +80,12 @@
         </ion-item>
         <ion-item>
           <ion-checkbox
-            class="ion-text-wrap"
             color="primary"
             label-placement="end"
             justify="start"
             [(ngModel)]="termsAgree"
             name="termsAgree"
-            >{{ 'feedback.form.termsAgree.0' | translate }}</ion-checkbox
+            ><span class="ion-text-wrap">{{ 'feedback.form.termsAgree.0' | translate }}</span></ion-checkbox
           >
         </ion-item>
         <ion-item lines="none">
@@ -104,7 +103,9 @@
             justify="start"
             [(ngModel)]="protocolDataAgree"
             name="protocolDataAgree"
-            >{{ 'feedback.form.protocolDataAgree' | translate }}</ion-checkbox
+            ><span class="ion-text-wrap">{{
+              'feedback.form.protocolDataAgree' | translate
+            }}</span></ion-checkbox
           >
         </ion-item>
         <ion-card>

frontend/app/src/app/modules/library/account/elements/paia-item/paiaitem.component.ts

@@ -14,7 +14,7 @@
  */
 
 import {Component, EventEmitter, Input, Output} from '@angular/core';
-import {DocumentAction, PAIADocument, PAIADocumentStatus} from '../../../types';
+import {DocumentAction, PAIADocument, PAIADocumentStatus, PAIADocumentVisualStatus} from '../../../types';
 import {LibraryAccountService} from '../../library-account.service';
 
 @Component({
@@ -27,12 +27,15 @@ export class PAIAItemComponent {
 
   renewable: boolean;
 
+  visualStatus?: PAIADocumentVisualStatus;
+
   constructor(private readonly libraryAccountService: LibraryAccountService) {}
 
   @Input()
   set item(value: PAIADocument) {
     this._item = value;
     void this.setRenewable();
+    this.visualStatus = this.getVisualStatus(Number(this.item.status));
   }
 
   get item(): PAIADocument {
@@ -56,4 +59,18 @@ export class PAIAItemComponent {
     const isActive = await this.libraryAccountService.isActivePatron();
     this.renewable = isActive && Number(this.item.status) === PAIADocumentStatus.Held;
   }
+
+  private getVisualStatus(status: PAIADocumentStatus): PAIADocumentVisualStatus | undefined {
+    switch (status) {
+      case PAIADocumentStatus.Ordered: {
+        return {color: 'warning', status: status, statusText: 'ordered'};
+      }
+      case PAIADocumentStatus.Provided: {
+        return {color: 'success', status: status, statusText: 'ready'};
+      }
+      default: {
+        return undefined;
+      }
+    }
+  }
 }

frontend/app/src/app/modules/library/account/elements/paia-item/paiaitem.html

@@ -14,10 +14,16 @@
 -->
 
 <ion-item>
-  <!-- TODO: text not selectable in Chrome, bugfix needed https://github.com/ionic-team/ionic-framework/issues/24956 -->
   <ion-label class="ion-text-wrap">
     @if (item.about) {
-      <h2 class="name">{{ item.about }}</h2>
+      <h2 class="name">
+        @if (visualStatus) {
+          <ion-badge [color]="visualStatus.color" slot="start">
+            {{ 'library.account.pages' + '.' + listName + '.' + visualStatus.statusText | translate }}
+          </ion-badge>
+        }
+        {{ item.about }}
+      </h2>
     }
     @for (property of propertiesToShow; track property) {
       @if (item[property]) {

frontend/app/src/app/modules/library/account/elements/paia-item/paiaitem.scss

@@ -12,3 +12,6 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
+ion-badge {
+  vertical-align: bottom;
+}

frontend/app/src/app/modules/library/account/holds/holds-page.html

@@ -35,23 +35,13 @@
       @switch (activeSegment) {
         @case ('orders') {
           @for (hold of paiaDocuments; track hold) {
-            @if (toNumber(hold.status) === paiaDocumentStatus.Provided) {
-              <stapps-paia-item
-                [item]="hold"
-                [propertiesToShow]="['label', 'storage']"
-                (documentAction)="onDocumentAction($event)"
-                listName="holds"
-              >
-              </stapps-paia-item>
-            } @else {
-              <stapps-paia-item
-                [item]="hold"
-                [propertiesToShow]="['label']"
-                (documentAction)="onDocumentAction($event)"
-                listName="holds"
-              >
-              </stapps-paia-item>
-            }
+            <stapps-paia-item
+              [item]="hold"
+              [propertiesToShow]="['label', 'storage']"
+              (documentAction)="onDocumentAction($event)"
+              listName="holds"
+            >
+            </stapps-paia-item>
           }
         }
         @case ('reservations') {

frontend/app/src/app/modules/library/account/profile/profile-page.component.ts

@@ -25,8 +25,6 @@ import {PAIAPatron} from '../../types';
 export class ProfilePageComponent {
   patron?: PAIAPatron;
 
-  propertiesToShow: (keyof PAIAPatron)[] = ['id', 'name', 'email', 'address', 'expires'];
-
   constructor(private readonly libraryAccountService: LibraryAccountService) {}
 
   async ionViewWillEnter(): Promise<void> {

frontend/app/src/app/modules/library/account/profile/profile-page.html

@@ -26,27 +26,45 @@
     <ion-card>
       <ion-card-content>
         <ion-grid>
-          @for (property of propertiesToShow; track property) {
-            @if (patron[property]) {
-              <ion-row>
-                <ion-col>
-                  {{ 'library.account.pages.profile.labels' + '.' + property | translate }}:
-                </ion-col>
-                <ion-col>
-                  @if (!['expires'].includes(property)) {
-                    {{ patron[property] }}
-                  } @else {
-                    @if (isUnlimitedExpiry(patron['expires'])) {
-                      {{ 'library.account.pages.profile.values.unlimited' | translate }}
-                    } @else {
-                      {{ 'library.account.pages.profile.values.expires' | translate }}:&nbsp;{{
-                        patron['expires'] | amDateFormat: 'll'
-                      }}
-                    }
-                  }
-                </ion-col>
-              </ion-row>
-            }
+          <ion-row>
+            <ion-col> {{ 'library.account.pages.profile.labels.id' | translate }}: </ion-col>
+            <ion-col>
+              {{ patron.id }}
+            </ion-col>
+          </ion-row>
+          <ion-row>
+            <ion-col> {{ 'library.account.pages.profile.labels.name' | translate }}: </ion-col>
+            <ion-col> {{ patron.name_details?.title ?? '' }} {{ patron.name }} </ion-col>
+          </ion-row>
+          @if (patron.email) {
+            <ion-row>
+              <ion-col> {{ 'library.account.pages.profile.labels.email' | translate }}: </ion-col>
+              <ion-col>
+                {{ patron.email }}
+              </ion-col>
+            </ion-row>
+          }
+          @if (patron.address) {
+            <ion-row>
+              <ion-col> {{ 'library.account.pages.profile.labels.address' | translate }}: </ion-col>
+              <ion-col>
+                {{ patron.address }}
+              </ion-col>
+            </ion-row>
+          }
+          @if (patron.expires) {
+            <ion-row>
+              <ion-col> {{ 'library.account.pages.profile.labels.expires' | translate }}: </ion-col>
+              <ion-col>
+                @if (isUnlimitedExpiry(patron.expires)) {
+                  {{ 'library.account.pages.profile.values.unlimited' | translate }}
+                } @else {
+                  {{ 'library.account.pages.profile.values.expires' | translate }}:&nbsp;{{
+                    patron.expires | amDateFormat: 'll'
+                  }}
+                }
+              </ion-col>
+            </ion-row>
           }
         </ion-grid>
       </ion-card-content>

frontend/app/src/app/modules/library/types.ts

@@ -22,6 +22,13 @@ export interface PAIAPatron {
   status?: PAIAPatronStatus;
   type?: string;
   note?: string;
+  // HeBIS specific property (not in PAIA documentation)
+  name_details?: {
+    firstname?: string;
+    lastname?: string;
+    gender?: string;
+    title?: string;
+  };
 }
 
 export enum PAIAPatronStatus {
@@ -88,3 +95,9 @@ export interface DocumentAction {
   action: 'cancel' | 'renew';
   doc: PAIADocument;
 }
+
+export interface PAIADocumentVisualStatus {
+  color: 'warning' | 'success';
+  status: PAIADocumentStatus;
+  statusText: 'ordered' | 'ready';
+}

frontend/app/src/app/modules/profile/id-card.component.ts

@@ -2,7 +2,7 @@ import {ChangeDetectionStrategy, Component, ElementRef, Input} from '@angular/co
 import {SCIdCard} from '@openstapps/core';
 import {ThingTranslateModule} from '../../translation/thing-translate.module';
 import {AsyncPipe, TitleCasePipe} from '@angular/common';
-import {InRangeNowPipe, ToDateRangePipe} from '../../util/in-range.pipe';
+import {IntervalIsNowPipe, ToDateIntervalPipe} from '../../util/in-range.pipe';
 import {TranslateModule} from '@ngx-translate/core';
 import {AnimationController, ModalController} from '@ionic/angular';
 import {ScreenBrightness} from '@capacitor-community/screen-brightness';
@@ -16,7 +16,14 @@ import {iosDuration, iosEasing, mdDuration, mdEasing} from 'src/app/animation/ea
   styleUrls: ['id-card.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [ThingTranslateModule, InRangeNowPipe, ToDateRangePipe, AsyncPipe, TranslateModule, TitleCasePipe],
+  imports: [
+    ThingTranslateModule,
+    IntervalIsNowPipe,
+    ToDateIntervalPipe,
+    AsyncPipe,
+    TranslateModule,
+    TitleCasePipe,
+  ],
 })
 export class IdCardComponent {
   @Input({required: true}) item: SCIdCard;

frontend/app/src/app/modules/profile/id-card.html

@@ -4,6 +4,6 @@
   draggable="false"
   (click)="presentFullscreen()"
 />
-@if (item.validity && (item.validity | toDateRange | isInRangeNow | async) === false) {
+@if (item.validity && (item.validity | rangeToDateInterval | dfnsIntervalIsNow | async) === false) {
   <div class="expired">{{ 'profile.userInfo.expired' | translate | titlecase }}</div>
 }

frontend/app/src/app/modules/profile/id-cards.provider.ts

@@ -41,7 +41,7 @@ export class IdCardsProvider {
                 mergeMap(user => this.fetchFallbackIdCards(user)),
                 startWith([]),
               )
-          : of([]).pipe(tap(() => this.encryptedStorageProvider.delete('id-cards'))),
+          : of([]).pipe(tap({next: () => this.encryptedStorageProvider.delete('id-cards')})),
       ),
     );
   }
@@ -54,7 +54,7 @@ export class IdCardsProvider {
         },
         responseType: 'json',
       })
-      .pipe(tap(idCards => this.encryptedStorageProvider.set('id-cards', idCards)));
+      .pipe(tap({next: idCards => this.encryptedStorageProvider.set('id-cards', idCards)}));
   }
 
   private fetchFallbackIdCards(user: SCUserConfiguration): Observable<SCIdCard[]> {

frontend/app/src/app/util/in-range.pipe.ts

@@ -1,7 +1,7 @@
 import {Pipe, PipeTransform} from '@angular/core';
 import {SCRange, isInRange, SCISO8601DateRange} from '@openstapps/core';
-import {merge, Observable, timer} from 'rxjs';
-import {distinctUntilChanged, map, startWith} from 'rxjs/operators';
+import {NormalizedInterval, differenceInMilliseconds, interval, isEqual} from 'date-fns';
+import {EMPTY, Observable, SchedulerLike, asyncScheduler, concat, defer, map, of, timer} from 'rxjs';
 
 @Pipe({
   name: 'isInRange',
@@ -14,28 +14,49 @@ export class InRangePipe implements PipeTransform {
   }
 }
 
+export const MIN_DATE = new Date(0);
+export const MAX_DATE = new Date(1e15);
+
 @Pipe({
-  name: 'toDateRange',
+  name: 'rangeToDateInterval',
   pure: true,
   standalone: true,
 })
-export class ToDateRangePipe implements PipeTransform {
-  transform(value: SCISO8601DateRange): SCRange<Date> {
-    return Object.fromEntries(Object.entries(value).map(([key, value]) => [key, new Date(value)]));
+export class ToDateIntervalPipe implements PipeTransform {
+  transform(value: SCISO8601DateRange): NormalizedInterval {
+    return interval(new Date(value.gte ?? value.gt ?? MIN_DATE), new Date(value.lte ?? value.lt ?? MAX_DATE));
   }
 }
 
+/**
+ * Returns an Observable that will change its value when the current date is within the given interval.
+ */
+export function isWithinIntervalObservable(
+  value: NormalizedInterval,
+  scheduler: SchedulerLike = asyncScheduler,
+): Observable<boolean> {
+  return defer(() => {
+    const now = scheduler.now();
+    const activate = differenceInMilliseconds(value.start, now);
+    const deactivate = differenceInMilliseconds(value.end, now);
+
+    return concat(
+      of(activate <= 0 && deactivate > 0),
+      activate <= 0 ? EMPTY : timer(value.start, scheduler).pipe(map(() => true)),
+      isEqual(value.end, MAX_DATE) || deactivate <= 0
+        ? EMPTY
+        : timer(value.end, scheduler).pipe(map(() => false)),
+    );
+  });
+}
+
 @Pipe({
-  name: 'isInRangeNow',
+  name: 'dfnsIntervalIsNow',
   pure: true,
   standalone: true,
 })
-export class InRangeNowPipe implements PipeTransform {
-  transform(value: SCRange<Date>): Observable<boolean> {
-    return merge(timer(value.lte || value.lt || 0), timer(value.gte || value.gt || 0)).pipe(
-      startWith(0),
-      map(() => isInRange(new Date(), value)),
-      distinctUntilChanged(),
-    );
+export class IntervalIsNowPipe implements PipeTransform {
+  transform(value: NormalizedInterval): Observable<boolean> {
+    return isWithinIntervalObservable(value);
   }
 }

frontend/app/src/app/util/in-range.spec.ts

@@ -0,0 +1,42 @@
+import {TestScheduler} from 'rxjs/testing';
+import {MAX_DATE, MIN_DATE, isWithinIntervalObservable} from './in-range.pipe';
+import {interval} from 'date-fns';
+
+/**
+ * Test macro
+ */
+function test(range: [number | undefined, number | undefined], subscribe: string, expected: string) {
+  const testScheduler = new TestScheduler((actual, expected) => {
+    expect(actual).withContext(actual.map(JSON.stringify).join('\n')).toEqual(expected);
+  });
+
+  it(`should emit "${expected}" when "${subscribe}" for range ${range[0] ?? ''}..${range[1] ?? ''}`, () => {
+    testScheduler.run(({expectObservable}) => {
+      expectObservable(
+        isWithinIntervalObservable(
+          interval(new Date(range[0] ?? MIN_DATE), new Date(range[1] ?? MAX_DATE)),
+          testScheduler,
+        ),
+        subscribe,
+      ).toBe(expected, {t: true, f: false});
+    });
+  });
+}
+
+describe('isWithinIntervalObservable', () => {
+  test([500, undefined], '1s ^', '1s (t|)');
+  test([1000, undefined], '500ms ^', '500ms f 499ms (t|)');
+
+  test([undefined, 500], '1s ^', '1s (f|)');
+  test([undefined, 1000], '500ms ^', '500ms t 499ms (f|)');
+
+  test([1000, 2000], '500ms ^', '500ms f 499ms t 999ms (f|)');
+
+  test([500, 1000], '1500ms ^', '1500ms (f|)');
+  test([500, 1000], '1s ^', '1000ms (f|)');
+  test([500, 1000], '999ms ^', '999ms t (f|)');
+  test([500, 1000], '500ms ^', '500ms t 499ms (f|)');
+  test([500, 1000], '499ms ^', '499ms f t 499ms (f|)');
+
+  test([500, 1000], '^ 750ms !', 'f 499ms t');
+});

frontend/app/src/assets/i18n/de.json

@@ -336,13 +336,15 @@
             "title": "Titel",
             "about": "Mehr Informationen",
             "label": "Signatur",
-            "starttime": "Übermittelt am",
+            "starttime": "Vorgemerkt am",
             "endtime": "Abzuholen bis",
             "storage": "Abholtheke",
             "queue": "Position in der Warteschlange"
           },
           "holds": "Bestellungen",
-          "reservations": "Vormerkungen"
+          "reservations": "Vormerkungen",
+          "ordered": "Bestellt",
+          "ready": "Abholbereit"
         },
         "checked_out": {
           "title": "Deine Ausleihen",

frontend/app/src/assets/i18n/en.json

@@ -336,13 +336,15 @@
             "title": "Title",
             "about": "More information",
             "label": "Shelfmark",
-            "starttime": "Submitted at",
+            "starttime": "Reserved on",
             "endtime": "Available for pickup until",
-            "storage": "Pick-up counter",
+            "storage": "Pickup counter",
             "queue": "Position in the queue"
           },
           "holds": "orders",
-          "reservations": "reservations"
+          "reservations": "reservations",
+          "ordered": "Ordered",
+          "ready": "Ready for pickup"
         },
         "checked_out": {
           "title": "checked out items",

frontend/app/src/environments/environment.ts

@@ -21,7 +21,7 @@ export const environment = {
   backend_url: 'https://mobile.server.uni-frankfurt.de',
   app_host: 'mobile.app.uni-frankfurt.de',
   custom_url_scheme: 'de.anyschool.app',
-  backend_version: '3.3.0',
+  backend_version: '999.0.0',
   production: false,
 };
 

frontend/app/src/theme/util/_color-system.scss

@@ -18,15 +18,15 @@
 @import './dark';
 
 @function to-rgb($color) {
-  @return red($color) + ',' + green($color) + ',' + blue($color);
+  @return color.red($color) + ',' + color.green($color) + ',' + color.blue($color);
 }
 
 @function to-shade($color) {
-  @return darken($color, $shade-amount);
+  @return color.adjust($color, $lightness: -$shade-amount);
 }
 
 @function to-tint($color) {
-  @return lighten($color, $tint-amount);
+  @return color.adjust($color, $lightness: $tint-amount);
 }
 
 @function to-contrast($color) {
@@ -35,7 +35,11 @@
 }
 
 @function fade($color, $amount) {
-  @return if(lightness($color) > $fade-threshold, darken($color, $amount), lighten($color, $amount));
+  @return if(
+    color.lightness($color) > $fade-threshold,
+    color.adjust($color, $lightness: -$amount),
+    color.adjust($color, $lightness: $amount)
+  );
 }
 
 @function map-range($value, $input-min, $input-max, $output-min, $output-max) {
@@ -44,9 +48,9 @@
 
 @function interpolate-colors($from, $to, $progress, $progress-min: 0, $progress-max: 100) {
   @return rgb(
-    map-range($progress, $progress-min, $progress-max, red($from), red($to)),
-    map-range($progress, $progress-min, $progress-max, green($from), green($to)),
-    map-range($progress, $progress-min, $progress-max, blue($from), blue($to))
+    map-range($progress, $progress-min, $progress-max, color.red($from), color.red($to)),
+    map-range($progress, $progress-min, $progress-max, color.green($from), color.green($to)),
+    map-range($progress, $progress-min, $progress-max, color.blue($from), color.blue($to))
   );
 }
 

images/app-builder/Dockerfile

@@ -6,9 +6,9 @@ LABEL version="2.0.0" \
   maintainer="Jovan Krunić <krunic@uni-frankfurt.de>"
 
 ### Configure versions to install
-ENV	ANDROID_APIS="android-33" \
-  ANDROID_BUILD_TOOLS_VERSION="30.0.2" \
-  NPM_VERSION="^9.0.0" \
+ENV	ANDROID_APIS="android-34" \
+  ANDROID_BUILD_TOOLS_VERSION="34.0.0" \
+  NPM_VERSION="^10.0.0" \
   IONIC_VERSION="^6.0.0" \
   CORDOVA_RES_VERSION="latest" \
   ### Configure download URLs

images/app-builder/scripts/node_setup.sh

@@ -1,372 +1,108 @@
 #!/bin/bash
 
-# Discussion, issues and change requests at:
-#   https://github.com/nodesource/distributions
-#
-# Script to install the NodeSource Node.js 18.x repo onto a
-# Debian or Ubuntu system.
-#
-# Run as root or insert `sudo -E` before `bash`:
-#
-# curl -sL https://deb.nodesource.com/setup_18.x | bash -
-#   or
-# wget -qO- https://deb.nodesource.com/setup_18.x | bash -
-#
-# CONTRIBUTIONS TO THIS SCRIPT
-#
-# This script is built from a template in
-# https://github.com/nodesource/distributions/tree/master/deb/src
-# please don't submit pull requests against the built scripts.
-#
+# Logger Function
+log() {
+  local message="$1"
+  local type="$2"
+  local timestamp=$(date '+%Y-%m-%d %H:%M:%S')
+  local color
+  local endcolor="\033[0m"
 
+  case "$type" in
+    "info") color="\033[38;5;79m" ;;
+    "success") color="\033[1;32m" ;;
+    "error") color="\033[1;31m" ;;
+    *) color="\033[1;34m" ;;
+  esac
 
-export DEBIAN_FRONTEND=noninteractive
-SCRSUFFIX="_18.x"
-NODENAME="Node.js 18.x"
-NODEREPO="node_18.x"
-NODEPKG="nodejs"
-
-print_status() {
-    echo
-    echo "## $1"
-    echo
+  echo -e "${color}${timestamp} - ${message}${endcolor}"
 }
 
-if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
-    if test -n "$ncolors" && test $ncolors -ge 8; then
-        termcols=$(tput cols)
-        bold="$(tput bold)"
-        underline="$(tput smul)"
-        standout="$(tput smso)"
-        normal="$(tput sgr0)"
-        black="$(tput setaf 0)"
-        red="$(tput setaf 1)"
-        green="$(tput setaf 2)"
-        yellow="$(tput setaf 3)"
-        blue="$(tput setaf 4)"
-        magenta="$(tput setaf 5)"
-        cyan="$(tput setaf 6)"
-        white="$(tput setaf 7)"
-    fi
-fi
-
-print_bold() {
-    title="$1"
-    text="$2"
-
-    echo
-    echo "${red}================================================================================${normal}"
-    echo "${red}================================================================================${normal}"
-    echo
-    echo -e "  ${bold}${yellow}${title}${normal}"
-    echo
-    echo -en "  ${text}"
-    echo
-    echo "${red}================================================================================${normal}"
-    echo "${red}================================================================================${normal}"
+# Error handler function
+handle_error() {
+  local exit_code=$1
+  local error_message="$2"
+  log "Error: $error_message (Exit Code: $exit_code)" "error"
+  exit $exit_code
 }
 
-bail() {
-    echo 'Error executing command, exiting'
-    exit 1
+# Function to check for command availability
+command_exists() {
+  command -v "$1" &> /dev/null
 }
 
-exec_cmd_nobail() {
-    echo "+ $1"
-    bash -c "$1"
-}
-
-exec_cmd() {
-    exec_cmd_nobail "$1" || bail
-}
-
-node_deprecation_warning() {
-    if [[ "X${NODENAME}" == "Xio.js 1.x" ||
-          "X${NODENAME}" == "Xio.js 2.x" ||
-          "X${NODENAME}" == "Xio.js 3.x" ||
-          "X${NODENAME}" == "XNode.js 0.10" ||
-          "X${NODENAME}" == "XNode.js 0.12" ||
-          "X${NODENAME}" == "XNode.js 4.x LTS Argon" ||
-          "X${NODENAME}" == "XNode.js 5.x" ||
-          "X${NODENAME}" == "XNode.js 6.x LTS Boron" ||
-          "X${NODENAME}" == "XNode.js 7.x" ||
-          "X${NODENAME}" == "XNode.js 8.x LTS Carbon" ||
-          "X${NODENAME}" == "XNode.js 9.x" ||
-          "X${NODENAME}" == "XNode.js 10.x" ||
-          "X${NODENAME}" == "XNode.js 11.x" || 
-          "X${NODENAME}" == "XNode.js 12.x" ||
-          "X${NODENAME}" == "XNode.js 13.x" ||
-          "X${NODENAME}" == "XNode.js 14.x" ||
-          "X${NODENAME}" == "XNode.js 15.x" ||
-          "X${NODENAME}" == "XNode.js 17.x" ]]; then
-
-        print_bold \
-"                            DEPRECATION WARNING                            " "\
-${bold}${NODENAME} is no longer actively supported!${normal}
-
-  ${bold}You will not receive security or critical stability updates${normal} for this version.
-
-  You should migrate to a supported version of Node.js as soon as possible.
-  Use the installation script that corresponds to the version of Node.js you
-  wish to install. e.g.
-
-   * ${green}https://deb.nodesource.com/setup_16.x — Node.js 16 \"Gallium\"${normal}
-   * ${green}https://deb.nodesource.com/setup_18.x — Node.js 18 LTS \"Hydrogen\"${normal} (recommended)
-   * ${green}https://deb.nodesource.com/setup_19.x — Node.js 19 \"Nineteen\"${normal}
-   * ${green}https://deb.nodesource.com/setup_20.x — Node.js 20 \"Iron\"${normal} (current)
-
-  Please see ${bold}https://github.com/nodejs/Release${normal} for details about which
-  version may be appropriate for you.
-
-  The ${bold}NodeSource${normal} Node.js distributions repository contains
-  information both about supported versions of Node.js and supported Linux
-  distributions. To learn more about usage, see the repository:
-    ${bold}https://github.com/nodesource/distributions${normal}
-"
-        echo
-        echo "Continuing in 20 seconds ..."
-        echo
-        sleep 20
+check_os() {
+    if ! [ -f "/etc/debian_version" ]; then
+        echo "Error: This script is only supported on Debian-based systems."
+        exit 1
     fi
 }
 
-script_deprecation_warning() {
-    if [ "X${SCRSUFFIX}" == "X" ]; then
-        print_bold \
-"                         SCRIPT DEPRECATION WARNING                         " "\
-This script, located at ${bold}https://deb.nodesource.com/setup${normal}, used to
-  install Node.js 0.10, is deprecated and will eventually be made inactive.
+# Function to Install the script pre-requisites
+install_pre_reqs() {
+    log "Installing pre-requisites" "info"
 
-  You should use the script that corresponds to the version of Node.js you
-  wish to install. e.g.
+    # Run 'apt-get update'
+    if ! apt-get update -y; then
+        handle_error "$?" "Failed to run 'apt-get update'"
+    fi
 
-   * ${green}https://deb.nodesource.com/setup_16.x — Node.js 16 \"Gallium\"${normal}
-   * ${green}https://deb.nodesource.com/setup_18.x — Node.js 18 LTS \"Hydrogen\"${normal} (recommended)
-   * ${green}https://deb.nodesource.com/setup_19.x — Node.js 19 \"Nineteen\"${normal}
-   * ${green}https://deb.nodesource.com/setup_20.x — Node.js 20 \"Iron\"${normal} (current)
+    # Run 'apt-get install'
+    if ! apt-get install -y apt-transport-https ca-certificates curl gnupg; then
+        handle_error "$?" "Failed to install packages"
+    fi
 
-  Please see ${bold}https://github.com/nodejs/Release${normal} for details about which
-  version may be appropriate for you.
+    if ! mkdir -p /usr/share/keyrings; then
+      handle_error "$?" "Makes sure the path /usr/share/keyrings exist or run ' mkdir -p /usr/share/keyrings' with sudo"
+    fi
 
-  The ${bold}NodeSource${normal} Node.js Linux distributions GitHub repository contains
-  information about which versions of Node.js and which Linux distributions
-  are supported and how to use the install scripts.
-    ${bold}https://github.com/nodesource/distributions${normal}
-"
+    rm -f /usr/share/keyrings/nodesource.gpg || true
+    rm -f /etc/apt/sources.list.d/nodesource.list || true
 
-        echo
-        echo "Continuing in 20 seconds (press Ctrl-C to abort) ..."
-        echo
-        sleep 20
+    # Run 'curl' and 'gpg'
+    if ! curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg; then
+      handle_error "$?" "Failed to download and import the NodeSource signing key"
     fi
 }
 
-setup() {
+# Function to configure the Repo
+configure_repo() {
+    local node_version=$1
 
-script_deprecation_warning
-node_deprecation_warning
+    arch=$(dpkg --print-architecture)
+    if [ "$arch" != "amd64" ] && [ "$arch" != "arm64" ] && [ "$arch" != "armhf" ]; then
+      handle_error "1" "Unsupported architecture: $arch. Only amd64, arm64, and armhf are supported."
+    fi
 
-print_status "Installing the NodeSource ${NODENAME} repo..."
+    echo "deb [arch=$arch signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$node_version nodistro main" | tee /etc/apt/sources.list.d/nodesource.list > /dev/null
 
-if $(uname -m | grep -Eq ^armv6); then
-    print_status "You appear to be running on ARMv6 hardware. Unfortunately this is not currently supported by the NodeSource Linux distributions. Please use the 'linux-armv6l' binary tarballs available directly from nodejs.org for Node.js 4 and later."
-    exit 1
-fi
+    # N|solid Config
+    echo "Package: nsolid" | tee /etc/apt/preferences.d/nsolid > /dev/null
+    echo "Pin: origin deb.nodesource.com" | tee -a /etc/apt/preferences.d/nsolid > /dev/null
+    echo "Pin-Priority: 600" | tee -a /etc/apt/preferences.d/nsolid > /dev/null
 
-PRE_INSTALL_PKGS=""
+    # Nodejs Config
+    echo "Package: nodejs" | tee /etc/apt/preferences.d/nodejs > /dev/null
+    echo "Pin: origin deb.nodesource.com" | tee -a /etc/apt/preferences.d/nodejs > /dev/null
+    echo "Pin-Priority: 600" | tee -a /etc/apt/preferences.d/nodejs > /dev/null
 
-# Check that HTTPS transport is available to APT
-# (Check snaked from: https://get.docker.io/ubuntu/)
-
-if [ ! -e /usr/lib/apt/methods/https ]; then
-    PRE_INSTALL_PKGS="${PRE_INSTALL_PKGS} apt-transport-https"
-fi
-
-if [ ! -x /usr/bin/lsb_release ]; then
-    PRE_INSTALL_PKGS="${PRE_INSTALL_PKGS} lsb-release"
-fi
-
-if [ ! -x /usr/bin/curl ] && [ ! -x /usr/bin/wget ]; then
-    PRE_INSTALL_PKGS="${PRE_INSTALL_PKGS} curl"
-fi
-
-# Used by apt-key to add new keys
-
-if [ ! -x /usr/bin/gpg ]; then
-    PRE_INSTALL_PKGS="${PRE_INSTALL_PKGS} gnupg"
-fi
-
-# Populating Cache
-print_status "Populating apt-get cache..."
-exec_cmd 'apt-get update'
-
-if [ "X${PRE_INSTALL_PKGS}" != "X" ]; then
-    print_status "Installing packages required for setup:${PRE_INSTALL_PKGS}..."
-    # This next command needs to be redirected to /dev/null or the script will bork
-    # in some environments
-    exec_cmd "apt-get install -y${PRE_INSTALL_PKGS} > /dev/null 2>&1"
-fi
-
-IS_PRERELEASE=$(lsb_release -d | grep 'Ubuntu .*development' >& /dev/null; echo $?)
-if [[ $IS_PRERELEASE -eq 0 ]]; then
-    print_status "Your distribution, identified as \"$(lsb_release -d -s)\", is a pre-release version of Ubuntu. NodeSource does not maintain official support for Ubuntu versions until they are formally released. You can try using the manual installation instructions available at https://github.com/nodesource/distributions and use the latest supported Ubuntu version name as the distribution identifier, although this is not guaranteed to work."
-    exit 1
-fi
-
-DISTRO=$(lsb_release -c -s)
-
-check_alt() {
-    if [ "X${DISTRO}" == "X${2}" ]; then
-        echo
-        echo "## You seem to be using ${1} version ${DISTRO}."
-        echo "## This maps to ${3} \"${4}\"... Adjusting for you..."
-        DISTRO="${4}"
+    # Run 'apt-get update'
+    if ! apt-get update -y; then
+        handle_error "$?" "Failed to run 'apt-get update'"
+    else
+        log "Repository configured successfully."
+        log "To install Node.js, run: apt-get install nodejs -y" "info"
+        log "You can use N|solid Runtime as a node.js alternative" "info"
+        log "To install N|solid Runtime, run: apt-get install nsolid -y \n" "success"
     fi
 }
 
-check_alt "Astra Linux"    "orel"            "Debian"        "stretch"
-check_alt "BOSS"           "anokha"          "Debian"        "wheezy"
-check_alt "BOSS"           "anoop"           "Debian"        "jessie"
-check_alt "BOSS"           "drishti"         "Debian"        "stretch"
-check_alt "BOSS"           "unnati"          "Debian"        "buster"
-check_alt "BOSS"           "urja"            "Debian"        "bullseye"
-check_alt "bunsenlabs"     "bunsen-hydrogen" "Debian"        "jessie"
-check_alt "bunsenlabs"     "helium"          "Debian"        "stretch"
-check_alt "bunsenlabs"     "lithium"         "Debian"        "buster"
-check_alt "Devuan"         "jessie"          "Debian"        "jessie"
-check_alt "Devuan"         "ascii"           "Debian"        "stretch"
-check_alt "Devuan"         "beowulf"         "Debian"        "buster"
-check_alt "Devuan"         "chimaera"        "Debian"        "bullseye"
-check_alt "Devuan"         "ceres"           "Debian"        "sid"
-check_alt "Devuan"         "daedalus"        "Debian"        "bookworm"
-check_alt "Deepin"         "panda"           "Debian"        "sid"
-check_alt "Deepin"         "unstable"        "Debian"        "sid"
-check_alt "Deepin"         "stable"          "Debian"        "buster"
-check_alt "Deepin"         "apricot"         "Debian"        "buster"
-check_alt "Deepin"         "beige"           "Debian"        "bookworm"
-check_alt "elementaryOS"   "luna"            "Ubuntu"        "precise"
-check_alt "elementaryOS"   "freya"           "Ubuntu"        "trusty"
-check_alt "elementaryOS"   "loki"            "Ubuntu"        "xenial"
-check_alt "elementaryOS"   "juno"            "Ubuntu"        "bionic"
-check_alt "elementaryOS"   "hera"            "Ubuntu"        "bionic"
-check_alt "elementaryOS"   "odin"            "Ubuntu"        "focal"
-check_alt "elementaryOS"   "jolnir"          "Ubuntu"        "focal"
-check_alt "elementaryOS"   "horus"           "Ubuntu"        "jammy"
-check_alt "Kali"           "sana"            "Debian"        "jessie"
-check_alt "Kali"           "kali-rolling"    "Debian"        "bullseye"
-check_alt "Linux Mint"     "maya"            "Ubuntu"        "precise"
-check_alt "Linux Mint"     "qiana"           "Ubuntu"        "trusty"
-check_alt "Linux Mint"     "rafaela"         "Ubuntu"        "trusty"
-check_alt "Linux Mint"     "rebecca"         "Ubuntu"        "trusty"
-check_alt "Linux Mint"     "rosa"            "Ubuntu"        "trusty"
-check_alt "Linux Mint"     "sarah"           "Ubuntu"        "xenial"
-check_alt "Linux Mint"     "serena"          "Ubuntu"        "xenial"
-check_alt "Linux Mint"     "sonya"           "Ubuntu"        "xenial"
-check_alt "Linux Mint"     "sylvia"          "Ubuntu"        "xenial"
-check_alt "Linux Mint"     "tara"            "Ubuntu"        "bionic"
-check_alt "Linux Mint"     "tessa"           "Ubuntu"        "bionic"
-check_alt "Linux Mint"     "tina"            "Ubuntu"        "bionic"
-check_alt "Linux Mint"     "tricia"          "Ubuntu"        "bionic"
-check_alt "Linux Mint"     "ulyana"          "Ubuntu"        "focal"
-check_alt "Linux Mint"     "ulyssa"          "Ubuntu"        "focal"
-check_alt "Linux Mint"     "uma"             "Ubuntu"        "focal"
-check_alt "Linux Mint"     "una"             "Ubuntu"        "focal"
-check_alt "Linux Mint"     "vanessa"         "Ubuntu"        "jammy"
-check_alt "Linux Mint"     "vera"            "Ubuntu"        "jammy"
-check_alt "Liquid Lemur"   "lemur-3"         "Debian"        "stretch"
-check_alt "LMDE"           "betsy"           "Debian"        "jessie"
-check_alt "LMDE"           "cindy"           "Debian"        "stretch"
-check_alt "LMDE"           "debbie"          "Debian"        "buster"
-check_alt "LMDE"           "elsie"           "Debian"        "bullseye"
-check_alt "MX Linux 17"    "Horizon"         "Debian"        "stretch"
-check_alt "MX Linux 18"    "Continuum"       "Debian"        "stretch"
-check_alt "MX Linux 19"    "patito feo"      "Debian"        "buster"
-check_alt "MX Linux 21"    "wildflower"      "Debian"        "bullseye"
-check_alt "Pardus"         "onyedi"          "Debian"        "stretch"
-check_alt "Parrot"         "ara"             "Debian"        "bullseye"
-check_alt "PureOS"         "green"           "Debian"        "sid"
-check_alt "PureOS"         "amber"           "Debian"        "buster"
-check_alt "PureOS"         "byzantium"       "Debian"        "bullseye"
-check_alt "SolydXK"        "solydxk-9"       "Debian"        "stretch"
-check_alt "Sparky Linux"   "Tyche"           "Debian"        "stretch"
-check_alt "Sparky Linux"   "Nibiru"          "Debian"        "buster"
-check_alt "Sparky Linux"   "Po-Tolo"         "Debian"        "bullseye"
-check_alt "Tanglu"         "chromodoris"     "Debian"        "jessie"
-check_alt "Trisquel"       "toutatis"        "Ubuntu"        "precise"
-check_alt "Trisquel"       "belenos"         "Ubuntu"        "trusty"
-check_alt "Trisquel"       "flidas"          "Ubuntu"        "xenial"
-check_alt "Trisquel"       "etiona"          "Ubuntu"        "bionic"
-check_alt "Ubilinux"       "dolcetto"        "Debian"        "stretch"
-check_alt "Uruk GNU/Linux" "lugalbanda"      "Ubuntu"        "xenial"
+# Define Node.js version
+NODE_VERSION="18.x"
 
-if [ "X${DISTRO}" == "Xdebian" ]; then
-  print_status "Unknown Debian-based distribution, checking /etc/debian_version..."
-  NEWDISTRO=$([ -e /etc/debian_version ] && cut -d/ -f1 < /etc/debian_version)
-  if [ "X${NEWDISTRO}" == "X" ]; then
-    print_status "Could not determine distribution from /etc/debian_version..."
-  else
-    DISTRO=$NEWDISTRO
-    print_status "Found \"${DISTRO}\" in /etc/debian_version..."
-  fi
-fi
+# Check OS
+check_os
 
-print_status "Confirming \"${DISTRO}\" is supported..."
-
-if [ -x /usr/bin/curl ]; then
-    exec_cmd_nobail "curl -sLf -o /dev/null 'https://deb.nodesource.com/${NODEREPO}/dists/${DISTRO}/Release'"
-    RC=$?
-else
-    exec_cmd_nobail "wget -qO /dev/null -o /dev/null 'https://deb.nodesource.com/${NODEREPO}/dists/${DISTRO}/Release'"
-    RC=$?
-fi
-
-if [[ $RC != 0 ]]; then
-    print_status "Your distribution, identified as \"${DISTRO}\", is not currently supported, please contact NodeSource at https://github.com/nodesource/distributions/issues if you think this is incorrect or would like your distribution to be considered for support"
-    exit 1
-fi
-
-if [ -f "/etc/apt/sources.list.d/chris-lea-node_js-$DISTRO.list" ]; then
-    print_status 'Removing Launchpad PPA Repository for NodeJS...'
-
-    exec_cmd_nobail 'add-apt-repository -y -r ppa:chris-lea/node.js'
-    exec_cmd "rm -f /etc/apt/sources.list.d/chris-lea-node_js-${DISTRO}.list"
-fi
-
-print_status 'Adding the NodeSource signing key to your keyring...'
-keyring='/usr/share/keyrings'
-node_key_url="https://deb.nodesource.com/gpgkey/nodesource.gpg.key"
-local_node_key="$keyring/nodesource.gpg"
-
-if [ -x /usr/bin/curl ]; then
-    exec_cmd "curl -s $node_key_url | gpg --dearmor | tee $local_node_key >/dev/null"
-else
-    exec_cmd "wget -q -O - $node_key_url | gpg --dearmor | tee $local_node_key >/dev/null"
-fi
-
-print_status "Creating apt sources list file for the NodeSource ${NODENAME} repo..."
-
-exec_cmd "echo 'deb [signed-by=$local_node_key] https://deb.nodesource.com/${NODEREPO} ${DISTRO} main' > /etc/apt/sources.list.d/nodesource.list"
-exec_cmd "echo 'deb-src [signed-by=$local_node_key] https://deb.nodesource.com/${NODEREPO} ${DISTRO} main' >> /etc/apt/sources.list.d/nodesource.list"
-
-print_status 'Running `apt-get update` for you...'
-
-exec_cmd 'apt-get update'
-
-yarn_site='https://dl.yarnpkg.com/debian'
-yarn_key_url="$yarn_site/pubkey.gpg"
-local_yarn_key="$keyring/yarnkey.gpg"
-
-print_status """Run \`${bold}sudo apt-get install -y ${NODEPKG}${normal}\` to install ${NODENAME} and npm
-## You may also need development tools to build native addons:
-     sudo apt-get install gcc g++ make
-## To install the Yarn package manager, run:
-     curl -sL $yarn_key_url | gpg --dearmor | sudo tee $local_yarn_key >/dev/null
-     echo \"deb [signed-by=$local_yarn_key] $yarn_site stable main\" | sudo tee /etc/apt/sources.list.d/yarn.list
-     sudo apt-get update && sudo apt-get install yarn
-"""
-
-}
-
-## Defer setup until we have the complete script
-setup
+# Main execution
+install_pre_reqs || handle_error $? "Failed installing pre-requisites"
+configure_repo "$NODE_VERSION" || handle_error $? "Failed configuring repository"

package.json

@@ -2,8 +2,8 @@
   "name": "@openstapps/openstapps",
   "private": true,
   "engines": {
-    "node": ">=18.16",
-    "pnpm": ">=8"
+    "node": "^18.19.1",
+    "pnpm": "^8.15.4"
   },
   "scripts": {
     "build": "dotenv -c -- turbo run build",
@@ -13,11 +13,12 @@
     "deploy": "dotenv -c -- turbo run deploy --concurrency=1",
     "dev": "dotenv -c -- turbo run dev",
     "docs": "dotenv -c -- turbo run docs && typedoc && mkdir docs/api && cp packages/core/lib/api-doc.html docs/api/index.html && cp packages/core/lib/openapi.json docs/api/openapi.json && cp -r packages/core/lib/schema docs/api/schema",
+    "docs:serve": "http-server docs -p 8080 -o",
     "format": "dotenv -c -- turbo run format",
     "format:fix": "dotenv -c -- turbo run format:fix",
     "lint": "dotenv -c -- turbo run lint",
     "lint:fix": "dotenv -c -- turbo run lint:fix",
-    "publish-packages": "pnpm changeset version && pnpm syncpack:fix && pnpm install && git add . && git commit -m \"docs: update changelogs for release\n\nci: publish release\" && git push && pnpm changeset tag && git push --follow-tags",
+    "publish-packages": "pnpm changeset version && pnpm syncpack:fix && pnpm install && pnpm format:fix && git add . && git commit -m \"docs: update changelogs for release\" -m \"ci: publish release\" && git push && pnpm changeset tag && git push --follow-tags",
     "syncpack": "syncpack list-mismatches && syncpack lint-semver-ranges --types dev,peer,prod",
     "syncpack:fix": "syncpack format && syncpack fix-mismatches",
     "test": "trap 'node coverage.mjs' EXIT && dotenv -c -- turbo run test",
@@ -34,6 +35,7 @@
     "deepmerge": "4.3.1",
     "dotenv-cli": "7.2.1",
     "glob": "10.3.10",
+    "http-server": "14.1.1",
     "junit-report-merger": "6.0.3",
     "prettier": "3.1.1",
     "syncpack": "12.3.0",

packages/api-cli/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @openstapps/api-cli
 
+## 3.3.2
+
+### Patch Changes
+
+- @openstapps/core@3.3.2
+- @openstapps/core-tools@3.3.2
+- @openstapps/api@3.3.2
+
 ## 3.3.0
 
 ### Minor Changes

packages/api-cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/api-cli",
   "description": "CLI client for @openstapps/api",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/api.git",

packages/api-plugin/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @openstapps/api-plugin
 
+## 3.3.2
+
+### Patch Changes
+
+- @openstapps/core@3.3.2
+- @openstapps/core-tools@3.3.2
+- @openstapps/api@3.3.2
+
 ## 3.3.0
 
 ### Patch Changes

packages/api-plugin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/api-plugin",
   "description": "Node.js library to interact with the StApps backend service",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/api.git",

packages/api/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @openstapps/api
 
+## 3.3.2
+
+### Patch Changes
+
+- @openstapps/core@3.3.2
+
 ## 3.3.0
 
 ### Minor Changes

packages/api/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/api",
   "description": "Node.js library to interact with the StApps backend service",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/api.git",

packages/core-tools/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @openstapps/core-tools
 
+## 3.3.2
+
+### Patch Changes
+
+- Updated dependencies [802a7a3f]
+  - @openstapps/easy-ast@3.3.2
+
 ## 3.3.0
 
 ### Patch Changes

packages/core-tools/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/core-tools",
   "description": "Tools to convert and validate StAppsCore",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/core-tools.git",

packages/core/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @openstapps/core
 
+## 3.3.2
+
+### Patch Changes
+
+- @openstapps/core-tools@3.3.2
+
 ## 3.3.0
 
 ### Minor Changes

packages/core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/core",
   "description": "StAppsCore - Generalized model of data",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/core.git",

packages/easy-ast/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @openstapps/easy-ast
 
+## 3.3.2
+
+### Patch Changes
+
+- 802a7a3f: Fixed docs generation
+
 ## 3.3.0
 
 ### Minor Changes

packages/easy-ast/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/easy-ast",
   "description": "Tool to easily handle TypeScript AST",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/core-tools.git",

packages/easy-ast/test/project/alias-like.ast-test.ts

@@ -17,10 +17,8 @@ import {EasyAstSpecType} from '../easy-ast-spec-type.js';
 import {LightweightDefinitionKind} from '../../src/index.js';
 import {TypeFlags} from 'typescript';
 
-// @ts-expect-error unused type
 type TestTypeAlias = number | string;
 
-// @ts-expect-error unused type
 enum TestEnum {
   Foo,
   Bar,

packages/easy-ast/test/project/array-like.ast-test.ts

@@ -18,13 +18,9 @@ import {LightweightDefinitionKind} from '../../src/index.js';
 
 interface Random {}
 
-// @ts-expect-error unused type
 type TestArrayGeneric = Array<string>;
-// @ts-expect-error unused type
 type TestArrayLiteral = number[];
-// @ts-expect-error unused type
 type TestArrayReferenceGeneric = Array<Random>;
-// @ts-expect-error unused type
 type TestArrayReferenceLiteral = Random[];
 
 export const testConfig: EasyAstSpecType = {

packages/easy-ast/test/project/class-like.ast-test.ts

@@ -16,12 +16,10 @@
 import {EasyAstSpecType} from '../easy-ast-spec-type.js';
 import {LightweightDefinitionKind} from '../../src/index.js';
 
-// @ts-expect-error unused type
 interface TestInterface {
   foo: number;
 }
 
-// @ts-expect-error unused type
 class TestClass {
   bar: string = 'test';
 }

packages/easy-ast/test/project/comment.ast-test.ts

@@ -22,10 +22,8 @@ import {LightweightDefinitionKind} from '../../src/index.js';
  * Class description
  *
  * More description
- *
  * @classTag classParameter1 classParameter2
  */
-// @ts-expect-error unused type
 interface TestInterface {
   /**
    * Property comment
@@ -33,7 +31,6 @@ interface TestInterface {
    * Property description
    *
    * More description
-   *
    * @propertyTag propertyParameter1 propertyParameter2
    */
   foo: string;
@@ -45,10 +42,8 @@ interface TestInterface {
  * Class description
  *
  * More description
- *
  * @classTag classParameter1 classParameter2
  */
-// @ts-expect-error unused type
 class TestClass {
   /**
    * Property comment
@@ -56,7 +51,6 @@ class TestClass {
    * Property description
    *
    * More description
-   *
    * @propertyTag propertyParameter1 propertyParameter2
    */
   foo = 1;
@@ -68,10 +62,8 @@ class TestClass {
  * Enum description
  *
  * More description
- *
  * @enumTag enumParameter1
  */
-// @ts-expect-error unused type
 enum TestAlias {}
 
 export const testConfig: EasyAstSpecType = {

packages/easy-ast/test/project/default-generics.ast-test.ts

@@ -20,7 +20,6 @@ interface Test1<T = number> {
   foo: T;
 }
 
-// @ts-expect-error unused type
 interface Test2 {
   bar: Test1;
 }

packages/easy-ast/test/project/enum-specified-value.ast-test.ts

@@ -17,13 +17,11 @@ import {EasyAstSpecType} from '../easy-ast-spec-type.js';
 import {LightweightDefinitionKind} from '../../src/index.js';
 import {TypeFlags} from 'typescript';
 
-// @ts-expect-error unused type
 enum TestAuto {
   Foo,
   Bar,
 }
 
-// @ts-expect-error unused type
 enum TestSpecified {
   YES = 'yes',
   NO = 'no',

packages/easy-ast/test/project/generics.ast-test.ts

@@ -18,7 +18,6 @@ import {LightweightDefinitionKind} from '../../src/index.js';
 
 interface $Random {}
 
-// @ts-expect-error unused type
 interface Generics {
   baz: Foo<number, $Random>;
 }

packages/easy-ast/test/project/index-signature.ast-test.ts

@@ -18,12 +18,10 @@ import {LightweightDefinitionKind} from '../../src/index.js';
 
 interface $Random {}
 
-// @ts-expect-error unused
 interface IndexSignatureObject {
   [key: string]: $Random;
 }
 
-// @ts-expect-error unused
 interface IndexSignaturePrimitive {
   [key: string]: number;
 }

packages/easy-ast/test/project/ineritance.ast-test.ts

@@ -26,7 +26,6 @@ interface $BaseInterface2 {
 
 class $BaseClass {}
 
-// @ts-expect-error unused
 class InheritingClass extends $BaseClass implements $BaseInterface<number>, $BaseInterface2 {
   bar: string = '';
 

packages/easy-ast/test/project/nested.ast-test.ts

@@ -16,7 +16,6 @@
 import {EasyAstSpecType} from '../easy-ast-spec-type.js';
 import {LightweightDefinitionKind} from '../../src/index.js';
 
-// @ts-expect-error unused
 interface NestedObject {
   nested: {
     deeplyNested: {

packages/easy-ast/test/project/primitive-types.ast-test.ts

@@ -17,7 +17,6 @@ import {EasyAstSpecType} from '../easy-ast-spec-type.js';
 import {LightweightDefinitionKind} from '../../src/index.js';
 import {TypeFlags} from 'typescript';
 
-// @ts-expect-error unused
 interface Test {
   number_type: number;
   string_type: string;

packages/easy-ast/test/project/stack-overflow.ast-test.ts

@@ -16,7 +16,6 @@
 import {EasyAstSpecType} from '../easy-ast-spec-type.js';
 import {LightweightDefinitionKind} from '../../src/index.js';
 
-// @ts-expect-error unused
 interface Foo<T extends Bar<string>> {
   bar: T;
 }

packages/es-mapping-generator/src/config/premap.ts

@@ -27,15 +27,7 @@ export const premaps: Record<string, MappingProperty> = {
     type: 'geo_shape',
   },
   'Point': {
-    properties: {
-      type: {
-        type: 'keyword',
-      },
-      coordinates: {
-        type: 'geo_point',
-      },
-    },
-    dynamic: 'strict',
+    type: 'geo_point',
   },
   'Polygon': {
     type: 'geo_shape',