v0.0.1 (download not working)

BetterIServ.Backend/Controllers/IServController.cs

@@ -12,7 +12,7 @@ public class IServController : ControllerBase {
     
     [HttpPost("login")]
     public async Task<ActionResult<AuthKeys>> GetAuthKeysV2([FromBody] Credentials credentials) {
-        await using var browser = await Puppeteer.LaunchAsync(new LaunchOptions { Headless = true });
+        await using var browser = await Puppeteer.LaunchAsync(new LaunchOptions { Headless = true, Args = new []{"--no-sandbox"} });
         await using var page = await browser.NewPageAsync();
         await page.GoToAsync($"https://{credentials.Domain}/iserv/auth/login");
 
@@ -21,7 +21,7 @@ public class IServController : ControllerBase {
         await page.Keyboard.PressAsync("Tab");
         await page.Keyboard.TypeAsync(credentials.Password);
         await page.ClickAsync("body > div > main > div > div.panel-body > form > div.row > div:nth-child(1) > button");
-        await Task.Delay(500);
+        await Task.Delay(2000);
 
         var authKeys = new AuthKeys();
         var cookies = await page.GetCookiesAsync();

BetterIServ.Backend/Controllers/MailController.cs

@@ -68,7 +68,7 @@ public class MailController : ControllerBase {
             Subject = message.Subject.Replace("(Aspose.Email Evaluation)", ""),
             Time = message.Date,
             Read = true,
-            Message = message.Body.Replace("EVALUATION ONLY. CREATED WITH ASPOSE.EMAIL FOR .NET. COPYRIGHT 2002-2022 ASPOSE PTY LTD. \r\n http://www.aspose.com/corporate/purchase/end-user-license-agreement.aspx: View EULA Online\r\n", ""),
+            Message = message.Body.Split("View EULA")[1],
             Attachments = message.Attachments.Select(a => a.Name).ToArray()
         };
 

BetterIServ.Backend/Dockerfile

@@ -3,12 +3,29 @@ WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
+#####################
+#PUPPETEER RECIPE
+#####################
+# Install latest chrome dev package and fonts to support major charsets (Chinese, Japanese, Arabic, Hebrew, Thai and a few others)
+# Note: this installs the necessary libs to make the bundled version of Chromium that Puppeteer
+# installs, work.
+RUN apt-get update && apt-get -f install && apt-get -y install wget gnupg2 apt-utils
+RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
+    && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
+    && apt-get update \
+    && apt-get install -y google-chrome-unstable --no-install-recommends \
+    && rm -rf /var/lib/apt/lists/*
+#####################
+#END PUPPETEER RECIPE
+#####################
+ENV PUPPETEER_EXECUTABLE_PATH "/usr/bin/google-chrome-unstable"
+
 FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 WORKDIR /src
-COPY ["BetterIServ.Backend/BetterIServ.Backend.csproj", "BetterIServ.Backend/"]
+COPY ["BetterIServ.Backend.csproj", ""]
-RUN dotnet restore "BetterIServ.Backend/BetterIServ.Backend.csproj"
+RUN dotnet restore "BetterIServ.Backend.csproj"
 COPY . .
-WORKDIR "/src/BetterIServ.Backend"
+WORKDIR "/src"
 RUN dotnet build "BetterIServ.Backend.csproj" -c Release -o /app/build
 
 FROM build AS publish

BetterIServ.Backend/Entities/AuthKeys.cs

@@ -1,11 +1,11 @@
 namespace BetterIServ.Backend.Entities; 
 
 public struct AuthKeys {
-    public string Session { get; set; }
+    public string? Session { get; set; }
-    public string Sat { get; set; }
+    public string? Sat { get; set; }
-    public string AuthSid { get; set; }
+    public string? AuthSid { get; set; }
-    public string SatId { get; set; }
+    public string? SatId { get; set; }
-    public string AuthSession { get; set; }
+    public string? AuthSession { get; set; }
 
     public string ToCookieString() {
         return $"IServSession={Session}; IServSAT={Sat}; IServAuthSID={AuthSid}; IServSATId={SatId}; IServAuthSession={AuthSession}";

BetterIServ.Backend/Program.cs

@@ -1,10 +1,13 @@
-using PuppeteerSharp;
-
-await new BrowserFetcher().DownloadAsync(BrowserFetcher.DefaultChromiumRevision);
-
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
+builder.Services.AddCors(options => {
+    options.AddPolicy("BetterIserv", policy => {
+        policy.WithOrigins("http://localhost", "http://localhost:8100")
+            .AllowAnyHeader()
+            .AllowAnyMethod();
+    });
+});
 
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
@@ -19,12 +22,7 @@ if (app.Environment.IsDevelopment()) {
     app.UseSwaggerUI();
 }
 
-app.UseCors(options => {
+app.UseCors("BetterIserv");
-    options.WithOrigins("http://localhost:8100");
-    options.AllowCredentials();
-    options.AllowAnyHeader();
-    options.AllowAnyMethod();
-});
 
 app.UseAuthorization();
 

BetterIServ.Mobile/android/.gitignore

@@ -0,0 +1,101 @@
+# Using Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore
+
+# Built application files
+*.apk
+*.aar
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+#  Uncomment the following line in case you need and you don't have the release build type files in your app
+# release/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+# Android Studio 3 in .gitignore file.
+.idea/caches
+.idea/modules.xml
+# Comment next line if keeping position of elements in Navigation Editor is relevant for you
+.idea/navEditor.xml
+
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+.cxx/
+
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+
+# Version control
+vcs.xml
+
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+# lint/reports/
+
+# Android Profiling
+*.hprof
+
+# Cordova plugins for Capacitor
+capacitor-cordova-android-plugins
+
+# Copied web assets
+app/src/main/assets/public
+
+# Generated Config files
+app/src/main/assets/capacitor.config.json
+app/src/main/assets/capacitor.plugins.json
+app/src/main/res/xml/config.xml

BetterIServ.Mobile/android/app/.gitignore

@@ -0,0 +1,2 @@
+/build/*
+!/build/.npmkeep

BetterIServ.Mobile/android/app/build.gradle

@@ -0,0 +1,54 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    defaultConfig {
+        applicationId "de.leonhoppe.betteriserv"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        aaptOptions {
+             // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
+             // Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
+            ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
+        }
+    }
+    buildTypes {
+        release {
+            debuggable false
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+repositories {
+    flatDir{
+        dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
+    }
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
+    implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"
+    implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
+    implementation project(':capacitor-android')
+    testImplementation "junit:junit:$junitVersion"
+    androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
+    implementation project(':capacitor-cordova-android-plugins')
+}
+
+apply from: 'capacitor.build.gradle'
+
+try {
+    def servicesJSON = file('google-services.json')
+    if (servicesJSON.text) {
+        apply plugin: 'com.google.gms.google-services'
+    }
+} catch(Exception e) {
+    logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
+}

BetterIServ.Mobile/android/app/capacitor.build.gradle

@@ -0,0 +1,22 @@
+// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
+
+android {
+  compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+  }
+}
+
+apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
+dependencies {
+    implementation project(':capacitor-app')
+    implementation project(':capacitor-haptics')
+    implementation project(':capacitor-keyboard')
+    implementation project(':capacitor-status-bar')
+
+}
+
+
+if (hasProperty('postBuildExtras')) {
+  postBuildExtras()
+}

BetterIServ.Mobile/android/app/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

BetterIServ.Mobile/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package com.getcapacitor.myapp;
+
+import static org.junit.Assert.*;
+
+import android.content.Context;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+
+        assertEquals("com.getcapacitor.app", appContext.getPackageName());
+    }
+}

BetterIServ.Mobile/android/app/src/main/AndroidManifest.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="de.leonhoppe.betteriserv">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+
+        <activity
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
+            android:name="de.leonhoppe.betteriserv.MainActivity"
+            android:label="@string/title_activity_main"
+            android:theme="@style/AppTheme.NoActionBarLaunch"
+            android:launchMode="singleTask"
+            android:exported="true"
+            android:screenOrientation="userPortrait">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+        </activity>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths"></meta-data>
+        </provider>
+    </application>
+
+    <!-- Permissions -->
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-feature android:name="android.hardware.screen.portrait"/>
+</manifest>

BetterIServ.Mobile/android/app/src/main/java/de/leonhoppe/betteriserv/MainActivity.java

@@ -0,0 +1,5 @@
+package de.leonhoppe.betteriserv;
+
+import com.getcapacitor.BridgeActivity;
+
+public class MainActivity extends BridgeActivity {}

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

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

BetterIServ.Mobile/android/app/src/main/res/drawable/ic_launcher_background.xml

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

BetterIServ.Mobile/android/app/src/main/res/layout/activity_main.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <WebView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

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

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

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

BetterIServ.Mobile/android/app/src/main/res/values/ic_launcher_background.xml

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

BetterIServ.Mobile/android/app/src/main/res/values/strings.xml

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+    <string name="app_name">BetterIServ</string>
+    <string name="title_activity_main">BetterIServ</string>
+    <string name="package_name">de.leonhoppe.betteriserv</string>
+    <string name="custom_url_scheme">de.leonhoppe.betteriserv</string>
+</resources>

BetterIServ.Mobile/android/app/src/main/res/values/styles.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:background">@null</item>
+    </style>
+
+
+    <style name="AppTheme.NoActionBarLaunch" parent="Theme.SplashScreen">
+        <item name="android:background">@drawable/splash</item>
+    </style>
+</resources>

BetterIServ.Mobile/android/app/src/main/res/xml/file_paths.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path name="my_images" path="." />
+    <cache-path name="my_cache_images" path="." />
+</paths>

BetterIServ.Mobile/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java

@@ -0,0 +1,18 @@
+package com.getcapacitor.myapp;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}

BetterIServ.Mobile/android/build.gradle

@@ -0,0 +1,29 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.google.gms:google-services:4.3.13'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+apply from: "variables.gradle"
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

BetterIServ.Mobile/android/capacitor.settings.gradle

@@ -0,0 +1,15 @@
+// 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/@capacitor/android/capacitor')
+
+include ':capacitor-app'
+project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
+
+include ':capacitor-haptics'
+project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/haptics/android')
+
+include ':capacitor-keyboard'
+project(':capacitor-keyboard').projectDir = new File('../node_modules/@capacitor/keyboard/android')
+
+include ':capacitor-status-bar'
+project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacitor/status-bar/android')

BetterIServ.Mobile/android/gradle.properties

@@ -0,0 +1,24 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true

BetterIServ.Mobile/android/gradle/wrapper/gradle-wrapper.properties

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

BetterIServ.Mobile/android/gradlew

@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

BetterIServ.Mobile/android/gradlew.bat

@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

BetterIServ.Mobile/android/settings.gradle

@@ -0,0 +1,5 @@
+include ':app'
+include ':capacitor-cordova-android-plugins'
+project(':capacitor-cordova-android-plugins').projectDir = new File('./capacitor-cordova-android-plugins/')
+
+apply from: 'capacitor.settings.gradle'

BetterIServ.Mobile/android/variables.gradle

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

BetterIServ.Mobile/capacitor.config.ts

@@ -1,8 +1,8 @@
 import { CapacitorConfig } from '@capacitor/cli';
 
 const config: CapacitorConfig = {
-  appId: 'io.ionic.starter',
+  appId: 'de.leonhoppe.betteriserv',
-  appName: 'BetterIServ.Mobile',
+  appName: 'BetterIServ',
   webDir: 'www',
   bundledWebRuntime: false
 };

BetterIServ.Mobile/package-lock.json

@@ -15,6 +15,7 @@
         "@angular/platform-browser-dynamic": "^15.0.0",
         "@angular/router": "^15.0.0",
         "@awesome-cordova-plugins/file": "^6.3.0",
+        "@capacitor/android": "4.7.3",
         "@capacitor/app": "4.1.1",
         "@capacitor/core": "4.7.3",
         "@capacitor/haptics": "4.1.0",
@@ -2408,6 +2409,14 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@capacitor/android": {
+      "version": "4.7.3",
+      "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-4.7.3.tgz",
+      "integrity": "sha512-TmVg7vbAt6Iw0FWc51dLlW1gRMtSeIQ6qVLFJ1/sl2SYLXpgCHh8v/LfhqQ93NurgM+6SKFxOycGgg1FIBaLGw==",
+      "peerDependencies": {
+        "@capacitor/core": "^4.7.0"
+      }
+    },
     "node_modules/@capacitor/app": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/@capacitor/app/-/app-4.1.1.tgz",

BetterIServ.Mobile/package.json

@@ -21,6 +21,7 @@
     "@angular/platform-browser-dynamic": "^15.0.0",
     "@angular/router": "^15.0.0",
     "@awesome-cordova-plugins/file": "^6.3.0",
+    "@capacitor/android": "4.7.3",
     "@capacitor/app": "4.1.1",
     "@capacitor/core": "4.7.3",
     "@capacitor/haptics": "4.1.0",

BetterIServ.Mobile/src/app/api/iserv.service.ts

@@ -2,6 +2,8 @@ import { Injectable } from '@angular/core';
 import {HttpClient} from "@angular/common/http";
 import {Userdata, AuthKeys} from "../entities/userdata";
 import {firstValueFrom} from "rxjs";
+import {environment} from "../../environments/environment";
+import {Course} from "../entities/course";
 
 @Injectable({
   providedIn: 'root',
@@ -10,7 +12,7 @@ export class IServService {
 
   public userdata?: Userdata;
   public keys?: AuthKeys;
-  public backend: string = "http://localhost:5273";
+  public backend: string = environment.backend;
 
   public courseNames: {[id: string]: string} = {
     ["Bi"]: "Biologie",
@@ -32,6 +34,14 @@ export class IServService {
     ["Sf"]: "Seminarfach",
     ["DS"]: "Darstellendes Spiel",
   };
+  public colors: {name: string; val: string}[] = [
+    {name: "Blau", val: "primary"},
+    {name: "Hellblau", val: "secondary"},
+    {name: "Lila", val: "tertiary"},
+    {name: "Grün", val: "success"},
+    {name: "Gelb", val: "warning"},
+    {name: "Rot", val: "danger"}
+  ];
 
   constructor(private client: HttpClient) {
     const data = localStorage.getItem("userdata");
@@ -83,7 +93,13 @@ export class IServService {
     }
   }
 
-  public async getCoursesAndClass(groups?: string[]): Promise<{class: string, courses: string[]}> {
+  public async getCoursesAndClass(groups?: string[]): Promise<{class: string, courses: Course[]}> {
+    if (localStorage.getItem("courses") && localStorage.getItem("class")) {
+      const courses = JSON.parse(localStorage.getItem("courses")) as Course[];
+      const className = localStorage.getItem("class");
+      return {courses, class: className};
+    }
+
     if (groups == undefined) {
       groups = await this.getGroups();
     }
@@ -99,13 +115,37 @@ export class IServService {
         result.class = grades[0].replace("Jahrgang ", "").toUpperCase();
       }
     }
+    localStorage.setItem("class", result.class);
 
     for (let group of groups) {
       if (!group.includes(".") || !group.toLowerCase().startsWith("q")) continue;
       result.courses.push(group.split(".")[1]);
     }
 
-    return result;
+    if (result.class.startsWith("Q")) {
+      const courses: Course[] = [];
+      for (let course of result.courses) {
+        const short = course.substring(1, 3);
+        const name = this.courseNames[short];
+        if (name == undefined) continue;
+        courses.push({
+          id: course,
+          short: short.toUpperCase(),
+          name: name,
+          color: this.colors[Math.floor(Math.random() * this.colors.length)].val
+        });
+      }
+      courses.sort((a, b) => {
+        if (a.name < b.name) return -1;
+        if (a.name > b.name) return 1;
+        return 0;
+      });
+
+      localStorage.setItem("courses", JSON.stringify(courses));
+      return {class: result.class, courses};
+    }
+
+    return {class: result.class, courses: []};
   }
 
 }

BetterIServ.Mobile/src/app/app.component.ts

@@ -16,7 +16,6 @@ export class AppComponent {
     { title: 'Übersicht', url: '/home', icon: 'home' },
     { title: 'E-Mail', url: '/mails', icon: 'mail' },
     { title: 'Dateien', url: '/files', icon: 'folder' },
-    { title: 'Aufgaben', url: '/tasks', icon: 'clipboard' },
     { title: 'Stundenplan', url: '/schedule', icon: 'grid' },
     { title: 'Vertretungsplan', url: '/substitution', icon: 'list' },
   ];

BetterIServ.Mobile/src/app/app.routes.ts

@@ -23,12 +23,12 @@ export const routes: Routes = [
     loadComponent: () => import('./pages/mails/mails.page').then( m => m.MailsPage)
   },
   {
-    path: 'substitution',
+    path: 'mails/:id',
-    loadComponent: () => import('./pages/substitution/substitution.page').then( m => m.SubstitutionPage)
+    loadComponent: () => import('./pages/mails/mails.page').then( m => m.MailsPage)
   },
   {
-    path: 'tasks',
+    path: 'substitution',
-    loadComponent: () => import('./pages/tasks/tasks.page').then( m => m.TasksPage)
+    loadComponent: () => import('./pages/substitution/substitution.page').then( m => m.SubstitutionPage)
   },
   {
     path: 'schedule',

BetterIServ.Mobile/src/app/components/lesson/lesson.component.html

@@ -0,0 +1,13 @@
+<ion-card>
+  <ion-card-header>
+          <span
+            class="lesson-icon ion-text-center"
+            [style]="'--background: var(--ion-color-' + findCourse(lesson?.course)?.color + '); --foreground: var(--ion-color-' + findCourse(lesson?.course)?.color + '-contrast)'"
+          >
+            {{findCourse(lesson?.course)?.short || "PH"}}
+          </span>
+  </ion-card-header>
+  <ion-card-content class="ion-text-center">
+    <ion-label>{{lesson?.room || "&#10240; &#x2800;"}}</ion-label>
+  </ion-card-content>
+</ion-card>

BetterIServ.Mobile/src/app/components/lesson/lesson.component.scss

@@ -0,0 +1,8 @@
+ion-card {
+  margin: 10px 0 0;
+  width: 100%;
+
+  ion-card-header, ion-card-content {
+    padding: 7px;
+  }
+}

BetterIServ.Mobile/src/app/components/lesson/lesson.component.ts

@@ -0,0 +1,25 @@
+import {Component, Input} from '@angular/core';
+import {IonicModule} from "@ionic/angular";
+import {Course, Lesson} from "../../entities/course";
+
+@Component({
+  selector: 'lesson',
+  templateUrl: './lesson.component.html',
+  styleUrls: ['./lesson.component.scss'],
+  imports: [
+    IonicModule
+  ],
+  standalone: true
+})
+export class LessonComponent {
+
+  @Input('courses') courses: Course[];
+  @Input('lesson') lesson: Lesson;
+
+  public findCourse(id: string): Course {
+    for (let course of this.courses)
+      if (course.id == id) return course;
+    return undefined;
+  }
+
+}

BetterIServ.Mobile/src/app/components/mail/mail.component.html

@@ -0,0 +1,10 @@
+<ion-item class="mail pointer">
+  <div>
+    <div>
+      <ion-icon ios="mail-unread-outline" md="mail-unread-sharp" *ngIf="!message.read" />
+      <ion-label>{{message.sender.displayName}}</ion-label>
+      <ion-label class="date">{{message.time.toLocaleDateString()}}</ion-label>
+    </div>
+    <ion-label class="subject">{{message.subject}}</ion-label>
+  </div>
+</ion-item>

BetterIServ.Mobile/src/app/components/mail/mail.component.scss

@@ -0,0 +1,25 @@
+.mail > div {
+  display: flex;
+  flex-direction: column;
+  gap: 7px;
+  margin-block: 15px;
+  width: 100%;
+
+  .subject, .date {
+    font-size: 15px;
+  }
+
+  & > div {
+    display: flex;
+
+    ion-icon {
+      margin-right: 5px;
+      align-self: center;
+      color: var(--ion-color-primary);
+    }
+
+    .date {
+      margin-left: auto;
+    }
+  }
+}

BetterIServ.Mobile/src/app/components/mail/mail.component.ts

@@ -0,0 +1,20 @@
+import {Component, Input, OnInit} from '@angular/core';
+import {IonicModule} from "@ionic/angular";
+import {MailContent} from "../../entities/mail";
+import {NgIf} from "@angular/common";
+
+@Component({
+  selector: 'mail',
+  templateUrl: './mail.component.html',
+  styleUrls: ['./mail.component.scss'],
+  imports: [
+    IonicModule,
+    NgIf
+  ],
+  standalone: true
+})
+export class MailComponent {
+
+  @Input('mail') message: MailContent;
+
+}

BetterIServ.Mobile/src/app/components/substitution/substitution.component.html

@@ -0,0 +1,11 @@
+<ion-card
+  class="subs {{subs?.type.replace(' ', '').replace('.', '')}}"
+>
+  <ion-card-content>
+    <ion-label class="times">{{subs?.times.join(" - ")}}</ion-label>
+    <div>
+      <ion-label class="type">{{subs?.type}}</ion-label>
+      <ion-label class="desc" [innerHtml]="getDetails(subs)"></ion-label>
+    </div>
+  </ion-card-content>
+</ion-card>

BetterIServ.Mobile/src/app/components/substitution/substitution.component.scss

@@ -0,0 +1,44 @@
+.subs {
+  ion-card-content {
+    display: flex;
+    gap: 15px;
+    color: #FFF;
+
+    .times {
+      font-size: 25px;
+      line-height: 25px;
+      align-self: center;
+    }
+
+    div {
+      margin-left: auto;
+      display: flex;
+      flex-direction: column;
+      align-items: flex-end;
+
+      .type {
+        font-size: 18px;
+      }
+    }
+  }
+
+  &.Raumtausch {
+    --background: var(--ion-color-success-shade);
+  }
+
+  &.bittebeachten, &.stregulärem {
+    --background: var(--ion-color-tertiary-shade);
+  }
+
+  &.Vertretung {
+    --background: var(--ion-color-primary-shade);
+  }
+
+  &.Entfall, &.Stillarbeit {
+    --background: var(--ion-color-danger-shade);
+  }
+
+  &.Verlegung {
+    --background: var(--ion-color-warning-shade);
+  }
+}

BetterIServ.Mobile/src/app/components/substitution/substitution.component.ts

@@ -0,0 +1,52 @@
+import {Component, Input, OnInit} from '@angular/core';
+import {Substitution} from "../../entities/substitution";
+import {IonicModule} from "@ionic/angular";
+
+@Component({
+  selector: 'substitution',
+  templateUrl: './substitution.component.html',
+  styleUrls: ['./substitution.component.scss'],
+  imports: [
+    IonicModule
+  ],
+  standalone: true
+})
+export class SubstitutionComponent {
+
+  @Input('subs') subs: Substitution;
+
+  public getDetails(subs: Substitution): string {
+    if (subs.type == "bitte beachten") {
+      const desc = subs.description != " " ? ' - ' + subs.description : "";
+      let info = `${subs.lesson} (${subs.teacher}) in ${subs.room}`;
+
+      if (subs.lesson != subs.newLesson) {
+        info = `${subs.newLesson} (${subs.representative}) statt ${subs.lesson} (${subs.teacher}) in ${subs.room}`;
+      }
+
+      return info + desc;
+    }
+
+    switch (subs.type) {
+      case "Vertretung":
+      case "st. regulärem Unt.":
+        return `${subs.lesson} (${subs.representative} statt ${subs.teacher}) in ${subs.room}`;
+
+      case "Raumtausch":
+        return `${subs.lesson} (${subs.teacher}) in ${subs.room}`;
+
+      case "Entfall":
+        return `${subs.lesson} (${subs.teacher})`;
+
+      case "Stillarbeit":
+        return `${subs.lesson} (${subs.teacher}) in ${subs.room}`;
+
+      case "Verlegung":
+        return `${subs.newLesson} (${subs.representative}) statt ${subs.lesson} (${subs.teacher}) in ${subs.room}`;
+
+      default:
+        return subs.lesson + ' (' + subs.teacher + ') ' + subs.room;
+    }
+  }
+
+}

BetterIServ.Mobile/src/app/pages/home/home.page.html

@@ -13,4 +13,64 @@
       <ion-title size="large">Übersicht</ion-title>
     </ion-toolbar>
   </ion-header>
+
+  <ion-card>
+    <ion-card-header>
+      <ion-card-title>Willkommen {{iserv.userdata?.username}}</ion-card-title>
+      <ion-card-subtitle *ngIf="classData != undefined">
+        Du hast {{unreadMails?.length || 0}} ungelesene E-Mails<br>
+        <span>{{classData?.class.startsWith('Q') ? 'Jahrgang' : 'Klasse'}} {{classData?.class}}</span><br>
+        {{dayName}} der {{today?.toLocaleDateString()}}
+      </ion-card-subtitle>
+    </ion-card-header>
+  </ion-card>
+
+  <ion-card>
+    <ion-card-header>
+      <ion-card-title>Stundenplan</ion-card-title>
+    </ion-card-header>
+    <ion-card-content class="lesson-content">
+      <ion-card *ngIf="lessons == undefined && classData != undefined">
+        <ion-card-header>
+          <ion-card-subtitle>Kein Unterricht</ion-card-subtitle>
+        </ion-card-header>
+      </ion-card>
+
+      <div class="lesson-container">
+        <lesson *ngFor="let lesson of lessons" [lesson]="lesson" [courses]="classData.courses" />
+      </div>
+    </ion-card-content>
+  </ion-card>
+
+  <ion-card>
+    <ion-card-header>
+      <ion-card-title>Vertretungsplan</ion-card-title>
+    </ion-card-header>
+    <ion-card-content>
+      <ion-card *ngIf="subs?.length == 0 && subs != undefined">
+        <ion-card-header>
+          <ion-card-subtitle>Keine Vertretungen</ion-card-subtitle>
+        </ion-card-header>
+      </ion-card>
+
+      <substitution *ngFor="let sub of subs" [subs]="sub" />
+    </ion-card-content>
+  </ion-card>
+
+  <ion-card>
+    <ion-card-header>
+      <ion-card-title>Ungelesene E-Mails</ion-card-title>
+    </ion-card-header>
+    <ion-card-content>
+      <ion-list>
+        <ion-card *ngIf="unreadMails?.length == 0 && unreadMails != undefined">
+          <ion-card-header>
+            <ion-card-subtitle>Keine ungelesenen E-Mails</ion-card-subtitle>
+          </ion-card-header>
+        </ion-card>
+
+        <mail *ngFor="let mail of unreadMails" [mail]="mail" (click)="router.navigate(['mails/' + mail.id])" />
+      </ion-list>
+    </ion-card-content>
+  </ion-card>
 </ion-content>

BetterIServ.Mobile/src/app/pages/home/home.page.scss

@@ -1 +1,9 @@
+.lesson-container {
+  display: flex;
+  flex-grow: 1;
+  gap: 8px;
+}
 
+.lesson-content {
+  overflow-x: scroll;
+}

BetterIServ.Mobile/src/app/pages/home/home.page.ts

@@ -2,18 +2,56 @@ import {Component, OnInit} from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { IonicModule } from '@ionic/angular';
+import {IServService} from "../../api/iserv.service";
+import {MailService} from "../../api/mail.service";
+import {MailContent} from "../../entities/mail";
+import {UnitsService} from "../../api/units.service";
+import {Substitution} from "../../entities/substitution";
+import {SubstitutionComponent} from "../../components/substitution/substitution.component";
+import {MailComponent} from "../../components/mail/mail.component";
+import {Router} from "@angular/router";
+import {Course, Lesson, Timetable} from "../../entities/course";
+import {LessonComponent} from "../../components/lesson/lesson.component";
 
 @Component({
   selector: 'app-home',
   templateUrl: './home.page.html',
   styleUrls: ['./home.page.scss'],
   standalone: true,
-  imports: [IonicModule, CommonModule, FormsModule]
+  imports: [IonicModule, CommonModule, FormsModule, SubstitutionComponent, MailComponent, LessonComponent]
 })
 export class HomePage implements OnInit {
 
-  ngOnInit() {
+  public unreadMails: MailContent[];
+  public today: Date;
+  public dayName: string;
+  public subs: Substitution[];
+  public classData: {class: string, courses: Course[]};
+  public lessons: Lesson[];
 
+  public constructor(public iserv: IServService, public mails: MailService, public units: UnitsService, public router: Router) {}
+
+  async ngOnInit() {
+    this.today = new Date();
+    this.dayName = ["Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"][this.today.getDay()];
+    const scheduleDay = [undefined, "mon", "tue", "wed", "thu", "fri", undefined][this.today.getDay()];
+
+    const mailPromise = this.mails.getMails("INBOX", 0);
+    const classPromise = this.iserv.getCoursesAndClass();
+    const subsPromise = this.units.getSubstitutionPlan("today");
+    await Promise.all([mailPromise, classPromise, subsPromise]);
+
+    this.unreadMails = (await mailPromise).filter(mail => !mail.read);
+    this.classData = await classPromise;
+    this.subs = (await subsPromise).substitutions.filter(subs => subs.classes.includes(this.classData.class));
+
+    if (this.classData.class.startsWith("Q")) {
+      this.subs = this.subs.filter(subs => this.classData.courses.filter(course => course.id == subs.lesson).length > 0);
+    }
+
+    if (scheduleDay != undefined && localStorage.getItem("timetable")) {
+      this.lessons = (JSON.parse(localStorage.getItem("timetable")) as Timetable)[scheduleDay].filter(lesson => lesson != undefined);
+    }
   }
 
 }

BetterIServ.Mobile/src/app/pages/login/login.page.html

@@ -11,9 +11,11 @@
         <ion-card-title>IServ Anmeldedaten</ion-card-title>
       </ion-card-header>
       <ion-card-content>
-        <ion-input label="E-Mail" type="email" #email/>
+        <form (submit)="$event.preventDefault(); onLogin(email.value?.toString(), password.value?.toString())">
-        <ion-input label="Passwort" type="password" #password/>
+          <ion-input label="E-Mail" type="email" #email/>
-        <ion-button (click)="onLogin(email.value?.toString(), password.value?.toString())">Einloggen</ion-button>
+          <ion-input label="Passwort" type="password" #password/>
+          <ion-button type="submit">Einloggen</ion-button>
+        </form>
       </ion-card-content>
     </ion-card>
   </div>

BetterIServ.Mobile/src/app/pages/login/login.page.ts

@@ -23,7 +23,9 @@ export class LoginPage implements OnInit {
     if (email == undefined || password == undefined) return;
 
     if (await this.iservApi.login(email, password)) {
-      await this.router.navigate(['home']);
+      setTimeout(async () => {
+        await this.router.navigate(['home']);
+      }, 500);
     }else {
       const alert = await this.alerts.create({
         header: "Fehler",

BetterIServ.Mobile/src/app/pages/mails/mails.page.html

@@ -53,16 +53,7 @@
   </ion-item>
 
   <ion-list>
-    <ion-item *ngFor="let message of mails" class="mail pointer" (click)="selectMail(message, mailModal)">
+    <mail *ngFor="let message of mails" [mail]="message" (click)="selectMail(message, mailModal)" />
-      <div>
-        <div>
-          <ion-icon ios="mail-unread-outline" md="mail-unread-sharp" *ngIf="!message.read" />
-          <ion-label>{{message.sender.displayName}}</ion-label>
-          <ion-label class="date">{{message.time.toLocaleDateString()}}</ion-label>
-        </div>
-        <ion-label class="subject">{{message.subject}}</ion-label>
-      </div>
-    </ion-item>
   </ion-list>
   <ion-infinite-scroll (ionInfinite)="loadMore($event)">
     <ion-infinite-scroll-content></ion-infinite-scroll-content>
@@ -81,9 +72,9 @@
       </ion-header>
       <ion-content class="ion-padding current-mail">
         <div class="header">
-          <ion-label class="subject">{{currentMail?.subject}}</ion-label>
+          <ion-label class="subject">{{currentMail?.subject}}</ion-label><br>
           <ion-label class="time">{{currentMail?.time.toLocaleDateString()}}</ion-label>
-          <ion-list *ngIf="currentMail?.attachments?.length > 0">
+          <ion-list *ngIf="currentMail?.attachments?.length > 0" style="margin-top: 10px">
             <ion-item *ngFor="let attachment of currentMail?.attachments" class="pointer" (click)="downloadAttachment(attachment, currentMail?.id)">
               <ion-label>{{attachment}}</ion-label>
             </ion-item>

BetterIServ.Mobile/src/app/pages/mails/mails.page.scss

@@ -1,44 +1,3 @@
-.mail > div {
-  display: flex;
-  flex-direction: column;
-  gap: 7px;
-  margin-block: 15px;
-  width: 100%;
-
-  .subject, .date {
-    font-size: 15px;
-  }
-
-  & > div {
-    display: flex;
-
-    ion-icon {
-      margin-right: 5px;
-      color: var(--ion-color-primary);
-    }
-
-    .date {
-      margin-left: auto;
-    }
-  }
-}
-
-.current-mail {
-  .header {
-    display: flex;
-    flex-direction: column;
-    gap: 10px;
-
-    .subject {
-      font-weight: bold;
-    }
-
-    .time {
-      font-size: 15px;
-    }
-  }
-}
-
 .new-email {
   display: flex;
   flex-direction: column;