feat: backend index diffing

backend/backend/package.json

@@ -106,6 +106,9 @@
     "entry": [
       "src/cli.ts"
     ],
+    "loader": {
+      ".groovy": "text"
+    },
     "sourcemap": true,
     "clean": true,
     "target": "es2022",

backend/backend/src/storage/elasticsearch/diff-index.groovy

@@ -0,0 +1,65 @@
+void traverse(def a, def b, ArrayList path, HashMap result) {
+  if (a instanceof Map && b instanceof Map) {
+    for (key in a.keySet()) {
+      path.add(key);
+      traverse(a.get(key), b.get(key), path, result);
+      path.remove(path.size() - 1);
+    }
+  } else if (a instanceof List && b instanceof List) {
+    int la = a.size();
+    int lb = b.size();
+    int max = la > lb ? la : lb;
+    for (int i = 0; i < max; i++) {
+      path.add(i);
+      if (i < la && i < lb) {
+        traverse(a[i], b[i], path, result);
+      } else if (i >= la) {
+        result.added.add(path.toArray());
+      } else {
+        result.removed.add(path.toArray());
+      }
+      path.remove(path.size() - 1);
+    }
+  } else if (a == null && b != null) {
+    result.removed.add(path.toArray());
+  } else if (a != null && b == null) {
+    result.added.add(path.toArray());
+  } else if (!a.equals(b)) {
+    result.changed.add(path.toArray());
+  }
+}
+
+def to;
+def from;
+
+for (state in states) {
+  if (state.index.equals(params.newIndex)) {
+    to = state.doc;
+  } else {
+    from = state.doc;
+  }
+}
+
+HashMap result = [
+  'added': [],
+  'removed': [],
+  'changed': []
+];
+
+traverse(to, from, new ArrayList(), result);
+
+if (to == null && from != null) {
+  result.status = 'removed';
+} else if (to != null && from == null) {
+  result.status = 'added';
+} else if (
+  result.added.size() == 0 &&
+  result.removed.size() == 0 &&
+  result.changed.size() == 0
+) {
+  result.status = 'unchanged';
+} else {
+  result.status = 'changed';
+}
+
+return result;

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

@@ -47,6 +47,7 @@ import {
 import {noUndefined} from './util/no-undefined.js';
 import {retryCatch, RetryOptions} from './util/retry.js';
 import {Feature, Point, Polygon} from 'geojson';
+import indexDiffScript from './diff-index.groovy';
 
 /**
  * A database interface for elasticsearch
@@ -239,6 +240,42 @@ export class Elasticsearch implements Database {
       .then(it => Object.entries(it).map(([name]) => name))
       .catch(() => [] as string[]);
 
+    if (activeIndices.length <= 1) {
+      const result = await this.client.transform.previewTransform({
+        source: {
+          index: [...activeIndices, index],
+          query: {match_all: {}},
+        },
+        dest: {index: 'compare'},
+        pivot: {
+          group_by: {
+            uid: {terms: {field: 'uid.raw'}},
+          },
+          aggregations: {
+            compare: {
+              scripted_metric: {
+                map_script: `
+                  state.index = doc['_index'];
+                  state.doc = params['_source'];`,
+                combine_script: `
+                  state.index = state.index[0];
+                  return state;
+                `,
+                reduce_script: {
+                  source: indexDiffScript,
+                  params: {
+                    newIndex: index,
+                  },
+                },
+              },
+            },
+          },
+        },
+      });
+
+      console.log(JSON.stringify(result.preview, null, 2))
+    }
+
     await this.client.indices.updateAliases({
       actions: [
         {

backend/backend/src/storage/elasticsearch/query/sort/price-sort.groovy

@@ -0,0 +1,26 @@
+// initialize the sort value with the maximum
+double price = Double.MAX_VALUE;
+
+// if we have any offers
+if (params._source.containsKey(params.field)) {
+  // iterate through all offers
+  for (offer in params._source[params.field]) {
+    // if this offer contains a role specific price
+    if (offer.containsKey('prices') && offer.prices.containsKey(params.universityRole)) {
+      // if the role specific price is smaller than the cheapest we found
+      if (offer.prices[params.universityRole] < price) {
+        // set the role specific price as cheapest for now
+        price = offer.prices[params.universityRole];
+      }
+    } else { // we have no role specific price for our role in this offer
+      // if the default price of this offer is lower than the cheapest we found
+      if (offer.price < price) {
+        // set this price as the cheapest
+        price = offer.price;
+      }
+    }
+  }
+}
+
+// return cheapest price for our role
+return price;

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

@@ -13,7 +13,8 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 import {SortOptions} from '@elastic/elasticsearch/lib/api/types.js';
-import {SCPriceSort, SCSportCoursePriceGroup, SCThingsField} from '@openstapps/core';
+import {SCPriceSort} from '@openstapps/core';
+import priceSortScript from './price-sort.groovy';
 
 /**
  * Converts a price sort to elasticsearch syntax
@@ -23,47 +24,11 @@ export function buildPriceSort(sort: SCPriceSort): SortOptions {
   return {
     _script: {
       order: sort.order,
-      script: buildPriceSortScript(sort.arguments.universityRole, sort.arguments.field),
+      script: {
+        source: priceSortScript,
+        params: sort.arguments,
+      },
       type: 'number' as const,
     },
   };
 }
-
-/**
- * Provides a script for sorting search results by prices
- * @param universityRole User group which consumes university services
- * @param field Field in which wanted offers with prices are located
- */
-export function buildPriceSortScript(
-  universityRole: keyof SCSportCoursePriceGroup,
-  field: SCThingsField,
-): string {
-  return `
-  // initialize the sort value with the maximum
-  double price = Double.MAX_VALUE;
-
-  // if we have any offers
-  if (params._source.containsKey('${field}')) {
-    // iterate through all offers
-    for (offer in params._source.${field}) {
-      // if this offer contains a role specific price
-      if (offer.containsKey('prices') && offer.prices.containsKey('${universityRole}')) {
-        // if the role specific price is smaller than the cheapest we found
-        if (offer.prices.${universityRole} < price) {
-          // set the role specific price as cheapest for now
-          price = offer.prices.${universityRole};
-        }
-      } else { // we have no role specific price for our role in this offer
-        // if the default price of this offer is lower than the cheapest we found
-        if (offer.price < price) {
-          // set this price as the cheapest
-          price = offer.price;
-        }
-      }
-    }
-  }
-
-  // return cheapest price for our role
-  return price;
-  `;
-}

backend/backend/src/types.d.ts

@@ -0,0 +1,6 @@
+declare module '*.groovy' {
+  const content: string;
+  export default content;
+}
+
+export {};

frontend/app/package.json

@@ -82,7 +82,6 @@
     "@ionic/angular": "7.8.0",
     "@ionic/storage-angular": "4.0.0",
     "@maplibre/ngx-maplibre-gl": "17.4.1",
-    "@material/material-color-utilities": "0.3.0",
     "@ngx-translate/core": "15.0.0",
     "@ngx-translate/http-loader": "8.0.0",
     "@openid/appauth": "1.3.1",

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

@@ -71,7 +71,6 @@ import {Capacitor} from '@capacitor/core';
 import {SplashScreen} from '@capacitor/splash-screen';
 import maplibregl from 'maplibre-gl';
 import {Protocol} from 'pmtiles';
-import {ThemeProvider} from './util/theme.provider';
 
 registerLocaleData(localeDe);
 
@@ -90,7 +89,6 @@ export function initializerFactory(
   defaultAuthService: DefaultAuthService,
   paiaAuthService: PAIAAuthService,
   dateFnsConfigurationService: DateFnsConfigurationService,
-  _themeProvider: ThemeProvider,
 ) {
   return async () => {
     try {
@@ -215,7 +213,6 @@ export function createTranslateLoader(http: HttpClient) {
         DefaultAuthService,
         PAIAAuthService,
         DateFnsConfigurationService,
-        ThemeProvider,
       ],
       useFactory: initializerFactory,
     },

frontend/app/src/app/util/media-query.pipe.ts

@@ -1,7 +1,6 @@
 import {PipeTransform} from '@angular/core';
 import {Pipe} from '@angular/core';
-import {Observable} from 'rxjs';
+import {Observable, fromEvent, map, startWith} from 'rxjs';
-import {fromMediaQuery} from './rxjs/from-media-query';
 
 @Pipe({
   name: 'mediaQuery',
@@ -10,6 +9,10 @@ import {fromMediaQuery} from './rxjs/from-media-query';
 })
 export class MediaQueryPipe implements PipeTransform {
   transform(query: string): Observable<boolean> {
-    return fromMediaQuery(query);
+    const match = window.matchMedia(query);
+    return fromEvent<MediaQueryListEvent>(match, 'change').pipe(
+      map(event => event.matches),
+      startWith(match.matches),
+    );
   }
 }

frontend/app/src/app/util/rxjs/from-media-query.ts

@@ -1,38 +0,0 @@
-import {Observable, combineLatest, defer, distinctUntilChanged, fromEvent, map, startWith} from 'rxjs';
-
-/**
- * Lazily creates an Observable that emits whether the given media query matches.
- * @example
- * fromMediaQuery('(prefers-color-scheme: dark)').subscribe(matches => console.log(matches))
- */
-export function fromMediaQuery(query: string): Observable<boolean> {
-  return defer(() => {
-    const match = window.matchMedia(query);
-    return fromEvent<MediaQueryListEvent>(match, 'change').pipe(
-      map(event => event.matches),
-      startWith(match.matches),
-    );
-  });
-}
-
-/**
- * Like `fromMediaQuery`, but combines multiple matches.
- * Since the list of values may not be exhaustive, the result can be `undefined`
- * @example
- * fromMediaQueryValues('prefers-color-scheme', ['dark', 'light']).subscribe(value => console.log(value))
- */
-export function fromMediaQueryValues<T extends string>(
-  property: string,
-  values: T[],
-): Observable<T | undefined> {
-  return defer(() =>
-    combineLatest(
-      values.map(value =>
-        fromMediaQuery(`(${property}: ${value})`).pipe(map(matches => [value, matches] as const)),
-      ),
-    ).pipe(
-      map(matches => matches.find(([, matches]) => matches)?.[0]),
-      distinctUntilChanged(),
-    ),
-  );
-}

frontend/app/src/app/util/theme-ionic-utils.ts

@@ -1,288 +0,0 @@
-import {Hct, argbFromHex, hexFromArgb} from '@material/material-color-utilities';
-import {
-  IonTheme,
-  IonThemeColorDarkLight,
-  IonThemeOptions,
-  ThemeCustomColor,
-  ThemeCustomColorOptions,
-} from './theme-types';
-import {dynamicScheme, makeCustomColor} from './theme-utils';
-
-/**
- * Turn a custom material color to a color that can be used in Ionic
- */
-export function ionColorFromCustomColor(color: ThemeCustomColor): IonThemeColorDarkLight {
-  return {
-    palette: color.palette,
-    light: {
-      color: color.light.color,
-      colorContrast: color.light.onColor,
-      colorShade: color.fixed.dim,
-      colorTint: color.fixed.color,
-    },
-    dark: {
-      color: color.dark.color,
-      colorContrast: color.dark.onColor,
-      colorShade: color.fixed.dim,
-      colorTint: color.fixed.color,
-    },
-  };
-}
-
-/**
- * Create an Ionic theme
- */
-export function makeIonicTheme(options: IonThemeOptions): IonTheme {
-  const light = dynamicScheme(
-    options.variant,
-    Hct.fromInt(options.sourceColor),
-    false,
-    options.contrastLevel,
-  );
-  const dark = dynamicScheme(options.variant, Hct.fromInt(options.sourceColor), true, options.contrastLevel);
-  const customColorOptions: Omit<ThemeCustomColorOptions, 'color'> = {
-    blend: true,
-    sourceColor: options.sourceColor,
-    variant: options.variant,
-    contrastLevel: options.contrastLevel,
-  };
-
-  return {
-    success: ionColorFromCustomColor(makeCustomColor({color: argbFromHex('#00ff00'), ...customColorOptions})),
-    warning: ionColorFromCustomColor(makeCustomColor({color: argbFromHex('#ffdd00'), ...customColorOptions})),
-    danger: ionColorFromCustomColor(makeCustomColor({color: argbFromHex('#ff4444'), ...customColorOptions})),
-    primary: {
-      palette: light.primaryPalette,
-      light: {
-        color: light.primary,
-        colorContrast: light.onPrimary,
-        colorShade: light.primaryFixedDim,
-        colorTint: light.primaryFixed,
-      },
-      dark: {
-        color: dark.primary,
-        colorContrast: dark.onPrimary,
-        colorShade: dark.primaryFixedDim,
-        colorTint: dark.primaryFixed,
-      },
-    },
-    secondary: {
-      palette: light.secondaryPalette,
-      light: {
-        color: light.secondary,
-        colorContrast: light.onSecondary,
-        colorShade: light.secondaryFixedDim,
-        colorTint: light.secondaryFixed,
-      },
-      dark: {
-        color: dark.secondary,
-        colorContrast: dark.onSecondary,
-        colorShade: dark.secondaryFixedDim,
-        colorTint: dark.secondaryFixed,
-      },
-    },
-    tertiary: {
-      palette: light.tertiaryPalette,
-      light: {
-        color: light.tertiary,
-        colorContrast: light.onTertiary,
-        colorShade: light.tertiaryFixedDim,
-        colorTint: light.tertiaryFixed,
-      },
-      dark: {
-        color: dark.tertiary,
-        colorContrast: dark.onTertiary,
-        colorShade: dark.tertiaryFixedDim,
-        colorTint: dark.tertiaryFixed,
-      },
-    },
-    light: {
-      palette: light.neutralPalette,
-      light: {
-        color: light.neutralPalette.tone(90),
-        colorContrast: light.onSurface,
-        colorShade: light.neutralPalette.tone(85),
-        colorTint: light.neutralPalette.tone(95),
-      },
-      dark: {
-        color: dark.surfaceContainerLowest,
-        colorContrast: dark.onSurface,
-        // TODO: find a better color for these
-        colorShade: dark.surfaceBright,
-        colorTint: dark.surfaceBright,
-      },
-    },
-    medium: {
-      palette: light.neutralVariantPalette,
-      light: {
-        color: light.neutralPalette.tone(50),
-        colorContrast: light.onSurfaceVariant,
-        colorShade: light.neutralPalette.tone(45),
-        colorTint: light.neutralPalette.tone(55),
-      },
-      dark: {
-        color: dark.surfaceVariant,
-        colorContrast: dark.onSurfaceVariant,
-        // TODO: find a better color for these
-        colorShade: dark.surfaceContainerLow,
-        colorTint: dark.surfaceContainerHigh,
-      },
-    },
-    dark: {
-      palette: light.neutralPalette,
-      light: {
-        color: light.surfaceContainerHigh,
-        colorContrast: light.onSurface,
-        colorShade: light.surfaceContainerHighest,
-        colorTint: light.surfaceContainer,
-      },
-      dark: {
-        color: dark.surfaceContainerHighest,
-        colorContrast: dark.onSurface,
-        // TODO: find a better color for these
-        colorShade: dark.surfaceDim,
-        colorTint: dark.surfaceDim,
-      },
-    },
-    background: {
-      palette: light.neutralPalette,
-      light: {
-        backgroundColor: light.background,
-        textColor: light.onBackground,
-        boxShadowColor: light.shadow,
-        placeholderColor: light.onSurfaceVariant,
-      },
-      dark: {
-        backgroundColor: dark.background,
-        textColor: dark.onBackground,
-        boxShadowColor: dark.shadow,
-        placeholderColor: dark.onSurfaceVariant,
-      },
-    },
-    item: {
-      palette: light.neutralPalette,
-      light: {
-        itemBackground: light.surface,
-        itemColor: light.onSurface,
-        cardBackground: light.surfaceContainer,
-        itemBorderColor: light.outline,
-        borderColor: light.outline,
-      },
-      dark: {
-        itemBackground: dark.surface,
-        itemColor: dark.onSurface,
-        cardBackground: dark.surfaceContainer,
-        itemBorderColor: dark.outline,
-        borderColor: dark.outline,
-      },
-    },
-  };
-}
-
-/**
- * Simple color
- */
-function color(element: HTMLElement, name: string, argb: number) {
-  element.style.setProperty(name, hexFromArgb(argb));
-}
-
-/**
- * Color, in RGB
- */
-function colorRgb(element: HTMLElement, name: string, argb: number) {
-  element.style.setProperty(name, `${(argb >> 16) & 0xff}, ${(argb >> 8) & 0xff}, ${argb & 0xff}`);
-}
-
-/**
- * Apply the Ionic color to an element
- */
-export function applyIonicAccentColor(
-  element: HTMLElement,
-  name: string,
-  colors: IonThemeColorDarkLight,
-  dark: boolean,
-) {
-  const operations = [
-    ['', dark ? colors.dark : colors.light],
-    ['-dark', colors.dark],
-    ['-light', colors.light],
-  ] as const;
-
-  for (const [suffix, colors] of operations) {
-    color(element, `--ion-color-${name}${suffix}`, colors.color);
-    color(element, `--ion-color-${name}-contrast${suffix}`, colors.colorContrast);
-    color(element, `--ion-color-${name}-shade${suffix}`, colors.colorShade);
-    color(element, `--ion-color-${name}-tint${suffix}`, colors.colorTint);
-
-    colorRgb(element, `--ion-color-${name}-rgb${suffix}`, colors.color);
-    colorRgb(element, `--ion-color-${name}-contrast-rgb${suffix}`, colors.colorContrast);
-    colorRgb(element, `--ion-color-${name}-shade-rgb${suffix}`, colors.colorShade);
-    colorRgb(element, `--ion-color-${name}-tint-rgb${suffix}`, colors.colorTint);
-  }
-}
-
-/**
- * Apply the theme
- */
-export function applyIonicTheme(element: HTMLElement, theme: IonTheme, dark: boolean) {
-  applyIonicAccentColor(element, 'primary', theme.primary, dark);
-  applyIonicAccentColor(element, 'secondary', theme.secondary, dark);
-  applyIonicAccentColor(element, 'tertiary', theme.tertiary, dark);
-  applyIonicAccentColor(element, 'success', theme.success, dark);
-  applyIonicAccentColor(element, 'warning', theme.warning, dark);
-  applyIonicAccentColor(element, 'danger', theme.danger, dark);
-  applyIonicAccentColor(element, 'dark', theme.dark, dark);
-  applyIonicAccentColor(element, 'medium', theme.medium, dark);
-  applyIonicAccentColor(element, 'light', theme.light, dark);
-
-  const backgroundOps = [
-    ['', dark ? theme.background.dark : theme.background.light],
-    ['-dark', theme.background.dark],
-    ['-light', theme.background.light],
-  ] as const;
-
-  for (const [suffix, background] of backgroundOps) {
-    color(element, `--ion-background-color${suffix}`, background.backgroundColor);
-    color(element, `--ion-text-color${suffix}`, background.textColor);
-    color(element, `--ion-box-shadow-color${suffix}`, background.boxShadowColor);
-    color(element, `--ion-placeholder-color${suffix}`, background.placeholderColor);
-
-    colorRgb(element, `--ion-background-color-rgb${suffix}`, background.backgroundColor);
-    colorRgb(element, `--ion-text-color-rgb${suffix}`, background.textColor);
-    colorRgb(element, `--ion-box-shadow-color-rgb${suffix}`, background.boxShadowColor);
-    colorRgb(element, `--ion-placeholder-color-rgb${suffix}`, background.placeholderColor);
-  }
-
-  const stepOps = [
-    ['', dark ? true : false],
-    ['-dark', true],
-    ['-light', false],
-  ] as const;
-
-  for (const [suffix, reverse] of stepOps) {
-    for (let i = 5; i < 100; i += 5) {
-      const ionicTone = 10 * (reverse ? 100 - i : i);
-      color(element, `--ion-color-step-${ionicTone}${suffix}`, theme.background.palette.tone(i));
-    }
-  }
-
-  const itemOps = [
-    ['', dark ? theme.item.dark : theme.item.light],
-    ['-dark', theme.item.dark],
-    ['-light', theme.item.light],
-  ] as const;
-
-  for (const [suffix, item] of itemOps) {
-    color(element, `--ion-item-background${suffix}`, item.itemBackground);
-    color(element, `--ion-card-background${suffix}`, item.cardBackground);
-    color(element, `--ion-item-border-color${suffix}`, item.itemBorderColor);
-    color(element, `--ion-border-color${suffix}`, item.borderColor);
-    color(element, `--ion-item-color${suffix}`, item.itemColor);
-
-    colorRgb(element, `--ion-item-background-rgb${suffix}`, item.itemBackground);
-    colorRgb(element, `--ion-card-background-rgb${suffix}`, item.cardBackground);
-    colorRgb(element, `--ion-item-border-color-rgb${suffix}`, item.itemBorderColor);
-    colorRgb(element, `--ion-border-color-rgb${suffix}`, item.borderColor);
-    colorRgb(element, `--ion-item-color-rgb${suffix}`, item.itemColor);
-  }
-}

frontend/app/src/app/util/theme-types.ts

@@ -1,109 +0,0 @@
-import {TonalPalette} from '@material/material-color-utilities';
-
-export const THEME_VARIANTS = [
-  'content',
-  'neutral',
-  'rainbow',
-  'vibrant',
-  'fidelity',
-  'expressive',
-  'monochrome',
-  'tonal-spot',
-  'fruit-salad',
-] as const;
-export type ThemeVariant = (typeof THEME_VARIANTS)[number];
-
-export interface ThemeCustomColorOptions {
-  color: number;
-  blend: boolean;
-  sourceColor: number;
-  variant: ThemeVariant;
-  contrastLevel: number;
-}
-
-export interface ThemeColorNormal {
-  color: number;
-  onColor: number;
-  container: number;
-  onContainer: number;
-}
-
-/**
- * Palette that can be used in both light and dark mode.
- * Caution: check contrast level before using
- * @see https://m3.material.io/styles/color/roles#26b6a882-064d-4668-b096-c51142477850
- */
-export interface ThemeColorFixed {
-  color: number;
-  onColor: number;
-  /**
-   * Lower emphasis against fixed color
-   */
-  onVariant: number;
-  dim: number;
-}
-
-export interface ThemeCustomColor {
-  color: number;
-  source: number;
-  palette: TonalPalette;
-  light: ThemeColorNormal;
-  dark: ThemeColorNormal;
-  fixed: ThemeColorFixed;
-}
-
-export interface IonThemeOptions {
-  sourceColor: number;
-  contrastLevel: number;
-  variant: ThemeVariant;
-}
-
-export interface IonThemeColor {
-  color: number;
-  colorContrast: number;
-  colorShade: number;
-  colorTint: number;
-}
-
-export interface IonThemeColorDarkLight {
-  palette: TonalPalette;
-  dark: IonThemeColor;
-  light: IonThemeColor;
-}
-
-export interface IonThemeBackground {
-  backgroundColor: number;
-  textColor: number;
-  boxShadowColor: number;
-  placeholderColor: number;
-}
-
-export interface IonThemeItem {
-  itemBackground: number;
-  cardBackground: number;
-  itemBorderColor: number;
-  borderColor: number;
-  itemColor: number;
-}
-
-export interface IonTheme {
-  primary: IonThemeColorDarkLight;
-  secondary: IonThemeColorDarkLight;
-  tertiary: IonThemeColorDarkLight;
-  success: IonThemeColorDarkLight;
-  warning: IonThemeColorDarkLight;
-  danger: IonThemeColorDarkLight;
-  dark: IonThemeColorDarkLight;
-  medium: IonThemeColorDarkLight;
-  light: IonThemeColorDarkLight;
-  background: {
-    palette: TonalPalette;
-    light: IonThemeBackground;
-    dark: IonThemeBackground;
-  };
-  item: {
-    palette: TonalPalette;
-    light: IonThemeItem;
-    dark: IonThemeItem;
-  };
-}

frontend/app/src/app/util/theme-utils.ts

@@ -1,93 +0,0 @@
-import {
-  Blend,
-  Hct,
-  SchemeContent,
-  SchemeExpressive,
-  SchemeFidelity,
-  SchemeFruitSalad,
-  SchemeMonochrome,
-  SchemeNeutral,
-  SchemeRainbow,
-  SchemeTonalSpot,
-  SchemeVibrant,
-} from '@material/material-color-utilities';
-import {ThemeCustomColor, ThemeCustomColorOptions, ThemeVariant} from './theme-types';
-
-export const DEFAULT_CONTRAST = 0;
-export const GLOBAL_CONTRAST = {
-  'more': 4,
-  'less': 0,
-  'no-preference': 0,
-};
-
-/**
- * Creates a DynamicScheme based on the variant.
- */
-export function dynamicScheme(
-  variant: ThemeVariant,
-  sourceColorHct: Hct,
-  isDark: boolean,
-  contrastLevel: number,
-) {
-  switch (variant) {
-    case 'content': {
-      return new SchemeContent(sourceColorHct, isDark, contrastLevel);
-    }
-    case 'neutral': {
-      return new SchemeNeutral(sourceColorHct, isDark, contrastLevel);
-    }
-    case 'rainbow': {
-      return new SchemeRainbow(sourceColorHct, isDark, contrastLevel);
-    }
-    case 'vibrant': {
-      return new SchemeVibrant(sourceColorHct, isDark, contrastLevel);
-    }
-    case 'fidelity': {
-      return new SchemeFidelity(sourceColorHct, isDark, contrastLevel);
-    }
-    case 'expressive': {
-      return new SchemeExpressive(sourceColorHct, isDark, contrastLevel);
-    }
-    case 'monochrome': {
-      return new SchemeMonochrome(sourceColorHct, isDark, contrastLevel);
-    }
-    case 'tonal-spot': {
-      return new SchemeTonalSpot(sourceColorHct, isDark, contrastLevel);
-    }
-    case 'fruit-salad': {
-      return new SchemeFruitSalad(sourceColorHct, isDark, contrastLevel);
-    }
-  }
-}
-
-/**
- * Create a custom color that works with the theme
- */
-export function makeCustomColor(options: ThemeCustomColorOptions): ThemeCustomColor {
-  const color = options.blend ? Blend.harmonize(options.color, options.sourceColor) : options.color;
-  const light = dynamicScheme(options.variant, Hct.fromInt(color), false, options.contrastLevel);
-  const dark = dynamicScheme(options.variant, Hct.fromInt(color), true, options.contrastLevel);
-  return {
-    color,
-    source: options.color,
-    palette: light.primaryPalette,
-    light: {
-      color: light.primary,
-      onColor: light.onPrimary,
-      container: light.primaryContainer,
-      onContainer: light.onPrimaryContainer,
-    },
-    dark: {
-      color: dark.primary,
-      onColor: dark.onPrimary,
-      container: dark.primaryContainer,
-      onContainer: dark.onPrimaryContainer,
-    },
-    fixed: {
-      color: light.primaryFixed,
-      onColor: light.onPrimaryFixed,
-      dim: light.primaryFixedDim,
-      onVariant: light.onPrimaryFixedVariant,
-    },
-  };
-}

frontend/app/src/app/util/theme.provider.ts

@@ -1,61 +0,0 @@
-import {Injectable} from '@angular/core';
-import {fromMediaQuery, fromMediaQueryValues} from './rxjs/from-media-query';
-import {BehaviorSubject, Observable, combineLatest, distinctUntilChanged, map} from 'rxjs';
-import {argbFromHex} from '@material/material-color-utilities';
-import {applyIonicTheme, makeIonicTheme} from './theme-ionic-utils';
-import {DEFAULT_CONTRAST, GLOBAL_CONTRAST} from './theme-utils';
-import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
-import {ThemeVariant} from './theme-types';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ThemeProvider {
-  prefersDark = fromMediaQuery('(prefers-color-scheme: dark)');
-
-  constrastPreference = fromMediaQueryValues('prefers-contrast', ['more', 'less', 'no-preference']);
-
-  // TODO: fetch the color from somewhere
-  settingThemeColor = new BehaviorSubject<string>('#3880FF');
-
-  settingThemeVariant = new BehaviorSubject<ThemeVariant>('content');
-
-  settingThemeContrast = new BehaviorSubject<number | undefined>(undefined);
-
-  settingThemeMode = new BehaviorSubject<'light' | 'dark' | undefined>(undefined);
-
-  themeSourceColor = this.settingThemeColor.pipe(map(argbFromHex));
-
-  themeVariant = this.settingThemeVariant.asObservable();
-
-  themeContrastLevel: Observable<number> = combineLatest([
-    this.constrastPreference,
-    this.settingThemeContrast,
-  ]).pipe(
-    map(([prefersContrast, customContrast]) =>
-      customContrast === undefined
-        ? prefersContrast === undefined
-          ? DEFAULT_CONTRAST
-          : GLOBAL_CONTRAST[prefersContrast]
-        : customContrast,
-    ),
-    distinctUntilChanged(),
-  );
-
-  themeIsDark = combineLatest([this.prefersDark, this.settingThemeMode]).pipe(
-    map(([prefersDark, customMode]) => (customMode === undefined ? prefersDark : customMode === 'dark')),
-    distinctUntilChanged(),
-  );
-
-  ionicTheme = combineLatest([this.themeContrastLevel, this.themeVariant, this.themeSourceColor]).pipe(
-    map(([contrastLevel, variant, sourceColor]) => makeIonicTheme({variant, sourceColor, contrastLevel})),
-  );
-
-  constructor() {
-    combineLatest([this.ionicTheme, this.themeIsDark])
-      .pipe(takeUntilDestroyed())
-      .subscribe(([theme, isDark]) => {
-        applyIonicTheme(document.documentElement, theme, isDark);
-      });
-  }
-}

frontend/app/src/theme/colors.scss

@@ -13,7 +13,7 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 @import './util/color-system';
-/*
+
 @include ion-color(primary, #3880ff);
 @include ion-color(secondary, #32db64);
 @include ion-color(tertiary, #f4a942);
@@ -26,7 +26,6 @@
 
 @include ion-background-color(#f5f5f5, #000);
 @include ion-item-color(#fff, #0e0e0e);
-*/
 
 :root {
   --calender-lecture-card: var(--ion-color-primary-tint);

pnpm-lock.yaml

@@ -791,9 +791,6 @@ importers:
       '@maplibre/ngx-maplibre-gl':
         specifier: 17.4.1
         version: 17.4.1(@angular/common@17.3.0)(@angular/core@17.3.0)(maplibre-gl@4.0.2)(rxjs@7.8.1)
-      '@material/material-color-utilities':
-        specifier: 0.3.0
-        version: 0.3.0
       '@ngx-translate/core':
         specifier: 15.0.0
         version: 15.0.0(@angular/common@17.3.0)(@angular/core@17.3.0)(rxjs@7.8.1)
@@ -5525,7 +5522,7 @@ packages:
       object-assign: 4.1.1
       open: 8.4.0
       proxy-middleware: 0.15.0
-      send: 0.19.0
+      send: 0.18.0
       serve-index: 1.9.1
     transitivePeerDependencies:
       - supports-color
@@ -7070,10 +7067,6 @@ packages:
       tslib: 2.6.2
     dev: false
 
-  /@material/material-color-utilities@0.3.0:
-    resolution: {integrity: sha512-ztmtTd6xwnuh2/xu+Vb01btgV8SQWYCaK56CkRK8gEkWe5TuDyBcYJ0wgkMRn+2VcE9KUmhvkz+N9GHrqw/C0g==}
-    dev: false
-
   /@ngtools/webpack@17.3.0(@angular/compiler-cli@17.3.0)(typescript@5.4.2)(webpack@5.90.3):
     resolution: {integrity: sha512-wNTCDPPEtjP4mxYerLVLCMwOCTEOD2HqZMVXD8pJbarrGPMuoyglUZuqNSIS5KVqR+fFez6JEUnMvC3QSqf58w==}
     engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
@@ -18935,27 +18928,6 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /send@0.19.0:
-    resolution: {integrity: sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==}
-    engines: {node: '>= 0.8.0'}
-    dependencies:
-      debug: 2.6.9
-      depd: 2.0.0
-      destroy: 1.2.0
-      encodeurl: 1.0.2
-      escape-html: 1.0.3
-      etag: 1.8.1
-      fresh: 0.5.2
-      http-errors: 2.0.0
-      mime: 1.6.0
-      ms: 2.1.3
-      on-finished: 2.4.1
-      range-parser: 1.2.1
-      statuses: 2.0.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /serialize-javascript@6.0.0:
     resolution: {integrity: sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==}
     dependencies: