diff --git a/BetterIServ.Backend/Program.cs b/BetterIServ.Backend/Program.cs index 73771be..e70170e 100644 --- a/BetterIServ.Backend/Program.cs +++ b/BetterIServ.Backend/Program.cs @@ -5,7 +5,7 @@ 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") + policy.WithOrigins("https://school.leon-hoppe.de", "http://localhost:8100") .AllowAnyHeader() .AllowAnyMethod(); }); diff --git a/BetterIServ.Mobile/.dockerignore b/BetterIServ.Mobile/.dockerignore new file mode 100644 index 0000000..cf7accf --- /dev/null +++ b/BetterIServ.Mobile/.dockerignore @@ -0,0 +1,14 @@ +# Ignore the node_modules directory +node_modules + +# Ignore the dist directory +www + +# Ignore the .git directory +.git + +# Ignore the .gitignore file +.gitignore + +# Ignore the .dockerignore file +.dockerignore diff --git a/BetterIServ.Mobile/Dockerfile b/BetterIServ.Mobile/Dockerfile new file mode 100644 index 0000000..100b5ba --- /dev/null +++ b/BetterIServ.Mobile/Dockerfile @@ -0,0 +1,10 @@ +FROM node:18-slim as node +WORKDIR /app +COPY . . +RUN npm install +RUN npm install -g @ionic/cli +RUN ionic build --prod + +FROM nginx:1.17.1-alpine +COPY nginx.conf /etc/nginx/sites-available/default +COPY --from=node /app/www /usr/share/nginx/html diff --git a/BetterIServ.Mobile/android/.gitignore b/BetterIServ.Mobile/android/.gitignore deleted file mode 100644 index 48354a3..0000000 --- a/BetterIServ.Mobile/android/.gitignore +++ /dev/null @@ -1,101 +0,0 @@ -# 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 diff --git a/BetterIServ.Mobile/android/app/.gitignore b/BetterIServ.Mobile/android/app/.gitignore deleted file mode 100644 index 043df80..0000000 --- a/BetterIServ.Mobile/android/app/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/build/* -!/build/.npmkeep diff --git a/BetterIServ.Mobile/android/app/build.gradle b/BetterIServ.Mobile/android/app/build.gradle deleted file mode 100644 index dc860d1..0000000 --- a/BetterIServ.Mobile/android/app/build.gradle +++ /dev/null @@ -1,54 +0,0 @@ -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") -} diff --git a/BetterIServ.Mobile/android/app/capacitor.build.gradle b/BetterIServ.Mobile/android/app/capacitor.build.gradle deleted file mode 100644 index 06a5be4..0000000 --- a/BetterIServ.Mobile/android/app/capacitor.build.gradle +++ /dev/null @@ -1,22 +0,0 @@ -// 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() -} diff --git a/BetterIServ.Mobile/android/app/proguard-rules.pro b/BetterIServ.Mobile/android/app/proguard-rules.pro deleted file mode 100644 index f1b4245..0000000 --- a/BetterIServ.Mobile/android/app/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# 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 diff --git a/BetterIServ.Mobile/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java b/BetterIServ.Mobile/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java deleted file mode 100644 index f2c2217..0000000 --- a/BetterIServ.Mobile/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -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 Testing documentation - */ -@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()); - } -} diff --git a/BetterIServ.Mobile/android/app/src/main/AndroidManifest.xml b/BetterIServ.Mobile/android/app/src/main/AndroidManifest.xml deleted file mode 100644 index a9eabd4..0000000 --- a/BetterIServ.Mobile/android/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/BetterIServ.Mobile/android/app/src/main/java/de/leonhoppe/betteriserv/MainActivity.java b/BetterIServ.Mobile/android/app/src/main/java/de/leonhoppe/betteriserv/MainActivity.java deleted file mode 100644 index cea22ca..0000000 --- a/BetterIServ.Mobile/android/app/src/main/java/de/leonhoppe/betteriserv/MainActivity.java +++ /dev/null @@ -1,5 +0,0 @@ -package de.leonhoppe.betteriserv; - -import com.getcapacitor.BridgeActivity; - -public class MainActivity extends BridgeActivity {} diff --git a/BetterIServ.Mobile/android/app/src/main/res/drawable-land-hdpi/splash.png b/BetterIServ.Mobile/android/app/src/main/res/drawable-land-hdpi/splash.png deleted file mode 100644 index 49baaf4..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/drawable-land-hdpi/splash.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/drawable-land-mdpi/splash.png b/BetterIServ.Mobile/android/app/src/main/res/drawable-land-mdpi/splash.png deleted file mode 100644 index e11865c..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/drawable-land-mdpi/splash.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/drawable-land-xhdpi/splash.png b/BetterIServ.Mobile/android/app/src/main/res/drawable-land-xhdpi/splash.png deleted file mode 100644 index a0c943c..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/drawable-land-xhdpi/splash.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/drawable-land-xxhdpi/splash.png b/BetterIServ.Mobile/android/app/src/main/res/drawable-land-xxhdpi/splash.png deleted file mode 100644 index 4a27c98..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/drawable-land-xxhdpi/splash.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/drawable-land-xxxhdpi/splash.png b/BetterIServ.Mobile/android/app/src/main/res/drawable-land-xxxhdpi/splash.png deleted file mode 100644 index b326e46..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/drawable-land-xxxhdpi/splash.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/drawable-port-hdpi/splash.png b/BetterIServ.Mobile/android/app/src/main/res/drawable-port-hdpi/splash.png deleted file mode 100644 index 19bd2f1..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/drawable-port-hdpi/splash.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/drawable-port-mdpi/splash.png b/BetterIServ.Mobile/android/app/src/main/res/drawable-port-mdpi/splash.png deleted file mode 100644 index 64d0f06..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/drawable-port-mdpi/splash.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/drawable-port-xhdpi/splash.png b/BetterIServ.Mobile/android/app/src/main/res/drawable-port-xhdpi/splash.png deleted file mode 100644 index 9f3824d..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/drawable-port-xhdpi/splash.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/drawable-port-xxhdpi/splash.png b/BetterIServ.Mobile/android/app/src/main/res/drawable-port-xxhdpi/splash.png deleted file mode 100644 index b266fd0..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/drawable-port-xxhdpi/splash.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/drawable-port-xxxhdpi/splash.png b/BetterIServ.Mobile/android/app/src/main/res/drawable-port-xxxhdpi/splash.png deleted file mode 100644 index ce3011f..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/drawable-port-xxxhdpi/splash.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/BetterIServ.Mobile/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index c7bd21d..0000000 --- a/BetterIServ.Mobile/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - diff --git a/BetterIServ.Mobile/android/app/src/main/res/drawable/ic_launcher_background.xml b/BetterIServ.Mobile/android/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index d5fccc5..0000000 --- a/BetterIServ.Mobile/android/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/BetterIServ.Mobile/android/app/src/main/res/drawable/splash.png b/BetterIServ.Mobile/android/app/src/main/res/drawable/splash.png deleted file mode 100644 index e11865c..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/drawable/splash.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/layout/activity_main.xml b/BetterIServ.Mobile/android/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index b5ad138..0000000 --- a/BetterIServ.Mobile/android/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/BetterIServ.Mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/BetterIServ.Mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 80b730f..0000000 --- a/BetterIServ.Mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/BetterIServ.Mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/BetterIServ.Mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 036d09b..0000000 --- a/BetterIServ.Mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/BetterIServ.Mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/BetterIServ.Mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 1acf5a7..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/BetterIServ.Mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index 1acf5a7..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/BetterIServ.Mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 1acf5a7..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/BetterIServ.Mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index dccaee2..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/BetterIServ.Mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index dccaee2..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/BetterIServ.Mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index dccaee2..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/BetterIServ.Mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index a8117cf..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/BetterIServ.Mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index a8117cf..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/BetterIServ.Mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index a8117cf..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/BetterIServ.Mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index a11c17d..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/BetterIServ.Mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index a11c17d..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/BetterIServ.Mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index a11c17d..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/BetterIServ.Mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index ff92e5e..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/BetterIServ.Mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index ff92e5e..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/BetterIServ.Mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index ff92e5e..0000000 Binary files a/BetterIServ.Mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/BetterIServ.Mobile/android/app/src/main/res/values/ic_launcher_background.xml b/BetterIServ.Mobile/android/app/src/main/res/values/ic_launcher_background.xml deleted file mode 100644 index c5d5899..0000000 --- a/BetterIServ.Mobile/android/app/src/main/res/values/ic_launcher_background.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #FFFFFF - \ No newline at end of file diff --git a/BetterIServ.Mobile/android/app/src/main/res/values/strings.xml b/BetterIServ.Mobile/android/app/src/main/res/values/strings.xml deleted file mode 100644 index 8fb2156..0000000 --- a/BetterIServ.Mobile/android/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - BetterIServ - BetterIServ - de.leonhoppe.betteriserv - de.leonhoppe.betteriserv - diff --git a/BetterIServ.Mobile/android/app/src/main/res/values/styles.xml b/BetterIServ.Mobile/android/app/src/main/res/values/styles.xml deleted file mode 100644 index be874e5..0000000 --- a/BetterIServ.Mobile/android/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/BetterIServ.Mobile/android/app/src/main/res/xml/file_paths.xml b/BetterIServ.Mobile/android/app/src/main/res/xml/file_paths.xml deleted file mode 100644 index bd0c4d8..0000000 --- a/BetterIServ.Mobile/android/app/src/main/res/xml/file_paths.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/BetterIServ.Mobile/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java b/BetterIServ.Mobile/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java deleted file mode 100644 index 0297327..0000000 --- a/BetterIServ.Mobile/android/app/src/test/java/com/getcapacitor/myapp/ExampleUnitTest.java +++ /dev/null @@ -1,18 +0,0 @@ -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 Testing documentation - */ -public class ExampleUnitTest { - - @Test - public void addition_isCorrect() throws Exception { - assertEquals(4, 2 + 2); - } -} diff --git a/BetterIServ.Mobile/android/build.gradle b/BetterIServ.Mobile/android/build.gradle deleted file mode 100644 index fe3625e..0000000 --- a/BetterIServ.Mobile/android/build.gradle +++ /dev/null @@ -1,29 +0,0 @@ -// 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 -} diff --git a/BetterIServ.Mobile/android/capacitor.settings.gradle b/BetterIServ.Mobile/android/capacitor.settings.gradle deleted file mode 100644 index bd35873..0000000 --- a/BetterIServ.Mobile/android/capacitor.settings.gradle +++ /dev/null @@ -1,15 +0,0 @@ -// 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') diff --git a/BetterIServ.Mobile/android/gradle.properties b/BetterIServ.Mobile/android/gradle.properties deleted file mode 100644 index 0566c22..0000000 --- a/BetterIServ.Mobile/android/gradle.properties +++ /dev/null @@ -1,24 +0,0 @@ -# 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 diff --git a/BetterIServ.Mobile/android/gradle/wrapper/gradle-wrapper.jar b/BetterIServ.Mobile/android/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 41d9927..0000000 Binary files a/BetterIServ.Mobile/android/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/BetterIServ.Mobile/android/gradle/wrapper/gradle-wrapper.properties b/BetterIServ.Mobile/android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 92f06b5..0000000 --- a/BetterIServ.Mobile/android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/BetterIServ.Mobile/android/gradlew b/BetterIServ.Mobile/android/gradlew deleted file mode 100644 index 1b6c787..0000000 --- a/BetterIServ.Mobile/android/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/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" "$@" diff --git a/BetterIServ.Mobile/android/gradlew.bat b/BetterIServ.Mobile/android/gradlew.bat deleted file mode 100644 index 107acd3..0000000 --- a/BetterIServ.Mobile/android/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@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 diff --git a/BetterIServ.Mobile/android/settings.gradle b/BetterIServ.Mobile/android/settings.gradle deleted file mode 100644 index 3b4431d..0000000 --- a/BetterIServ.Mobile/android/settings.gradle +++ /dev/null @@ -1,5 +0,0 @@ -include ':app' -include ':capacitor-cordova-android-plugins' -project(':capacitor-cordova-android-plugins').projectDir = new File('./capacitor-cordova-android-plugins/') - -apply from: 'capacitor.settings.gradle' \ No newline at end of file diff --git a/BetterIServ.Mobile/android/variables.gradle b/BetterIServ.Mobile/android/variables.gradle deleted file mode 100644 index 777bd7e..0000000 --- a/BetterIServ.Mobile/android/variables.gradle +++ /dev/null @@ -1,16 +0,0 @@ -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' -} \ No newline at end of file diff --git a/BetterIServ.Mobile/angular.json b/BetterIServ.Mobile/angular.json index 78e95e9..827c049 100644 --- a/BetterIServ.Mobile/angular.json +++ b/BetterIServ.Mobile/angular.json @@ -34,11 +34,16 @@ "glob": "**/*.svg", "input": "node_modules/ionicons/dist/ionicons/svg", "output": "./svg" - } + }, + "src/manifest.webmanifest" ], "styles": ["src/theme/variables.scss", "src/global.scss"], "scripts": [], - "allowedCommonJsDependencies": ["file-saver"] + "allowedCommonJsDependencies": [ + "file-saver" + ], + "serviceWorker": true, + "ngswConfigPath": "ngsw-config.json" }, "configurations": { "production": { @@ -115,7 +120,8 @@ "glob": "**/*.svg", "input": "node_modules/ionicons/dist/ionicons/svg", "output": "./svg" - } + }, + "src/manifest.webmanifest" ], "styles": ["src/theme/variables.scss", "src/global.scss"], "scripts": [] diff --git a/BetterIServ.Mobile/nginx.conf b/BetterIServ.Mobile/nginx.conf new file mode 100644 index 0000000..588b64e --- /dev/null +++ b/BetterIServ.Mobile/nginx.conf @@ -0,0 +1,9 @@ +server { + listen 80 default_server; + server_name _; + root /usr/share/nginx/html; + index index.html; + location / { + try_files $uri $uri/ /index.html; + } +} diff --git a/BetterIServ.Mobile/ngsw-config.json b/BetterIServ.Mobile/ngsw-config.json new file mode 100644 index 0000000..f8bf210 --- /dev/null +++ b/BetterIServ.Mobile/ngsw-config.json @@ -0,0 +1,30 @@ +{ + "$schema": "./node_modules/@angular/service-worker/config/schema.json", + "index": "/index.html", + "assetGroups": [ + { + "name": "app", + "installMode": "prefetch", + "resources": { + "files": [ + "/favicon.ico", + "/index.html", + "/manifest.webmanifest", + "/*.css", + "/*.js" + ] + } + }, + { + "name": "assets", + "installMode": "lazy", + "updateMode": "prefetch", + "resources": { + "files": [ + "/assets/**", + "/*.(svg|cur|jpg|jpeg|png|apng|webp|avif|gif|otf|ttf|woff|woff2)" + ] + } + } + ] +} diff --git a/BetterIServ.Mobile/package-lock.json b/BetterIServ.Mobile/package-lock.json index dc80633..b0e60ff 100644 --- a/BetterIServ.Mobile/package-lock.json +++ b/BetterIServ.Mobile/package-lock.json @@ -14,6 +14,7 @@ "@angular/platform-browser": "^15.0.0", "@angular/platform-browser-dynamic": "^15.0.0", "@angular/router": "^15.0.0", + "@angular/service-worker": "^15.0.0", "@capacitor/android": "4.7.3", "@capacitor/app": "4.1.1", "@capacitor/core": "4.7.3", @@ -689,6 +690,24 @@ "rxjs": "^6.5.3 || ^7.4.0" } }, + "node_modules/@angular/service-worker": { + "version": "15.2.7", + "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-15.2.7.tgz", + "integrity": "sha512-lDUWIXpPFd4iICczzvfWJgWgMJ7Q/7ZBQF1IciXP4W5UpE+Vjgxx5mV4y0njzQLb2tn2VNDAOksJK26Y5ks43w==", + "dependencies": { + "tslib": "^2.3.0" + }, + "bin": { + "ngsw-config": "ngsw-config.js" + }, + "engines": { + "node": "^14.20.0 || ^16.13.0 || >=18.10.0" + }, + "peerDependencies": { + "@angular/common": "15.2.7", + "@angular/core": "15.2.7" + } + }, "node_modules/@assemblyscript/loader": { "version": "0.10.1", "resolved": "https://registry.npmjs.org/@assemblyscript/loader/-/loader-0.10.1.tgz", diff --git a/BetterIServ.Mobile/package.json b/BetterIServ.Mobile/package.json index 953fe08..816c0a2 100644 --- a/BetterIServ.Mobile/package.json +++ b/BetterIServ.Mobile/package.json @@ -20,6 +20,7 @@ "@angular/platform-browser": "^15.0.0", "@angular/platform-browser-dynamic": "^15.0.0", "@angular/router": "^15.0.0", + "@angular/service-worker": "^15.0.0", "@capacitor/android": "4.7.3", "@capacitor/app": "4.1.1", "@capacitor/core": "4.7.3", diff --git a/BetterIServ.Mobile/resources/android/icon/drawable-hdpi-icon.png b/BetterIServ.Mobile/resources/android/icon/drawable-hdpi-icon.png deleted file mode 100644 index 1acf5a7..0000000 Binary files a/BetterIServ.Mobile/resources/android/icon/drawable-hdpi-icon.png and /dev/null differ diff --git a/BetterIServ.Mobile/resources/android/icon/drawable-ldpi-icon.png b/BetterIServ.Mobile/resources/android/icon/drawable-ldpi-icon.png deleted file mode 100644 index 58aba61..0000000 Binary files a/BetterIServ.Mobile/resources/android/icon/drawable-ldpi-icon.png and /dev/null differ diff --git a/BetterIServ.Mobile/resources/android/icon/drawable-mdpi-icon.png b/BetterIServ.Mobile/resources/android/icon/drawable-mdpi-icon.png deleted file mode 100644 index dccaee2..0000000 Binary files a/BetterIServ.Mobile/resources/android/icon/drawable-mdpi-icon.png and /dev/null differ diff --git a/BetterIServ.Mobile/resources/android/icon/drawable-xhdpi-icon.png b/BetterIServ.Mobile/resources/android/icon/drawable-xhdpi-icon.png deleted file mode 100644 index a8117cf..0000000 Binary files a/BetterIServ.Mobile/resources/android/icon/drawable-xhdpi-icon.png and /dev/null differ diff --git a/BetterIServ.Mobile/resources/android/icon/drawable-xxhdpi-icon.png b/BetterIServ.Mobile/resources/android/icon/drawable-xxhdpi-icon.png deleted file mode 100644 index a11c17d..0000000 Binary files a/BetterIServ.Mobile/resources/android/icon/drawable-xxhdpi-icon.png and /dev/null differ diff --git a/BetterIServ.Mobile/resources/android/icon/drawable-xxxhdpi-icon.png b/BetterIServ.Mobile/resources/android/icon/drawable-xxxhdpi-icon.png deleted file mode 100644 index ff92e5e..0000000 Binary files a/BetterIServ.Mobile/resources/android/icon/drawable-xxxhdpi-icon.png and /dev/null differ diff --git a/BetterIServ.Mobile/resources/android/splash/drawable-land-hdpi-screen.png b/BetterIServ.Mobile/resources/android/splash/drawable-land-hdpi-screen.png deleted file mode 100644 index 49baaf4..0000000 Binary files a/BetterIServ.Mobile/resources/android/splash/drawable-land-hdpi-screen.png and /dev/null differ diff --git a/BetterIServ.Mobile/resources/android/splash/drawable-land-ldpi-screen.png b/BetterIServ.Mobile/resources/android/splash/drawable-land-ldpi-screen.png deleted file mode 100644 index 2b1a019..0000000 Binary files a/BetterIServ.Mobile/resources/android/splash/drawable-land-ldpi-screen.png and /dev/null differ diff --git a/BetterIServ.Mobile/resources/android/splash/drawable-land-mdpi-screen.png b/BetterIServ.Mobile/resources/android/splash/drawable-land-mdpi-screen.png deleted file mode 100644 index e11865c..0000000 Binary files a/BetterIServ.Mobile/resources/android/splash/drawable-land-mdpi-screen.png and /dev/null differ diff --git a/BetterIServ.Mobile/resources/android/splash/drawable-land-xhdpi-screen.png b/BetterIServ.Mobile/resources/android/splash/drawable-land-xhdpi-screen.png deleted file mode 100644 index a0c943c..0000000 Binary files a/BetterIServ.Mobile/resources/android/splash/drawable-land-xhdpi-screen.png and /dev/null differ diff --git a/BetterIServ.Mobile/resources/android/splash/drawable-land-xxhdpi-screen.png b/BetterIServ.Mobile/resources/android/splash/drawable-land-xxhdpi-screen.png deleted file mode 100644 index 4a27c98..0000000 Binary files a/BetterIServ.Mobile/resources/android/splash/drawable-land-xxhdpi-screen.png and /dev/null differ diff --git a/BetterIServ.Mobile/resources/android/splash/drawable-land-xxxhdpi-screen.png b/BetterIServ.Mobile/resources/android/splash/drawable-land-xxxhdpi-screen.png deleted file mode 100644 index b326e46..0000000 Binary files a/BetterIServ.Mobile/resources/android/splash/drawable-land-xxxhdpi-screen.png and /dev/null differ diff --git a/BetterIServ.Mobile/resources/android/splash/drawable-port-hdpi-screen.png b/BetterIServ.Mobile/resources/android/splash/drawable-port-hdpi-screen.png deleted file mode 100644 index 19bd2f1..0000000 Binary files a/BetterIServ.Mobile/resources/android/splash/drawable-port-hdpi-screen.png and /dev/null differ diff --git a/BetterIServ.Mobile/resources/android/splash/drawable-port-ldpi-screen.png b/BetterIServ.Mobile/resources/android/splash/drawable-port-ldpi-screen.png deleted file mode 100644 index ae3ae54..0000000 Binary files a/BetterIServ.Mobile/resources/android/splash/drawable-port-ldpi-screen.png and /dev/null differ diff --git a/BetterIServ.Mobile/resources/android/splash/drawable-port-mdpi-screen.png b/BetterIServ.Mobile/resources/android/splash/drawable-port-mdpi-screen.png deleted file mode 100644 index 64d0f06..0000000 Binary files a/BetterIServ.Mobile/resources/android/splash/drawable-port-mdpi-screen.png and /dev/null differ diff --git a/BetterIServ.Mobile/resources/android/splash/drawable-port-xhdpi-screen.png b/BetterIServ.Mobile/resources/android/splash/drawable-port-xhdpi-screen.png deleted file mode 100644 index 9f3824d..0000000 Binary files a/BetterIServ.Mobile/resources/android/splash/drawable-port-xhdpi-screen.png and /dev/null differ diff --git a/BetterIServ.Mobile/resources/android/splash/drawable-port-xxhdpi-screen.png b/BetterIServ.Mobile/resources/android/splash/drawable-port-xxhdpi-screen.png deleted file mode 100644 index b266fd0..0000000 Binary files a/BetterIServ.Mobile/resources/android/splash/drawable-port-xxhdpi-screen.png and /dev/null differ diff --git a/BetterIServ.Mobile/resources/android/splash/drawable-port-xxxhdpi-screen.png b/BetterIServ.Mobile/resources/android/splash/drawable-port-xxxhdpi-screen.png deleted file mode 100644 index ce3011f..0000000 Binary files a/BetterIServ.Mobile/resources/android/splash/drawable-port-xxxhdpi-screen.png and /dev/null differ diff --git a/BetterIServ.Mobile/resources/splash.png b/BetterIServ.Mobile/resources/splash.png deleted file mode 100644 index acb99f3..0000000 Binary files a/BetterIServ.Mobile/resources/splash.png and /dev/null differ diff --git a/BetterIServ.Mobile/src/app/pages/home/home.page.html b/BetterIServ.Mobile/src/app/pages/home/home.page.html index 0a5f35a..8fecdb3 100644 --- a/BetterIServ.Mobile/src/app/pages/home/home.page.html +++ b/BetterIServ.Mobile/src/app/pages/home/home.page.html @@ -17,7 +17,7 @@ Willkommen {{iserv.userdata?.username}} - + Du hast {{unreadMails?.length || 0}} ungelesene E-Mails
{{classData?.class.startsWith('Q') ? 'Jahrgang' : 'Klasse'}} {{classData?.class}}
{{dayName}} der {{today?.toLocaleDateString()}} @@ -30,7 +30,7 @@ Stundenplan - + Kein Unterricht @@ -64,7 +64,7 @@ - + Keine ungelesenen E-Mails diff --git a/BetterIServ.Mobile/src/assets/icon/favicon144x144.png b/BetterIServ.Mobile/src/assets/icon/favicon144x144.png new file mode 100644 index 0000000..cbaca6f Binary files /dev/null and b/BetterIServ.Mobile/src/assets/icon/favicon144x144.png differ diff --git a/BetterIServ.Mobile/resources/icon.png b/BetterIServ.Mobile/src/assets/icon/favicon512x512.png similarity index 100% rename from BetterIServ.Mobile/resources/icon.png rename to BetterIServ.Mobile/src/assets/icon/favicon512x512.png diff --git a/BetterIServ.Mobile/src/index.html b/BetterIServ.Mobile/src/index.html index 14e5313..322fe65 100644 --- a/BetterIServ.Mobile/src/index.html +++ b/BetterIServ.Mobile/src/index.html @@ -2,25 +2,29 @@ - - Ionic App + + BetterIServ - + - - - - + + + + + - + - - + + + + + diff --git a/BetterIServ.Mobile/src/main.ts b/BetterIServ.Mobile/src/main.ts index b87f4ea..ddcceb4 100644 --- a/BetterIServ.Mobile/src/main.ts +++ b/BetterIServ.Mobile/src/main.ts @@ -1,4 +1,4 @@ -import { enableProdMode, importProvidersFrom } from '@angular/core'; +import {enableProdMode, importProvidersFrom, isDevMode} from '@angular/core'; import { bootstrapApplication } from '@angular/platform-browser'; import { RouteReuseStrategy, provideRouter } from '@angular/router'; import { IonicModule, IonicRouteStrategy } from '@ionic/angular'; @@ -7,6 +7,7 @@ import { routes } from './app/app.routes'; import { AppComponent } from './app/app.component'; import { environment } from './environments/environment'; import {HttpClientModule} from "@angular/common/http"; +import {ServiceWorkerModule} from "@angular/service-worker"; if (environment.production) { enableProdMode(); @@ -14,9 +15,14 @@ if (environment.production) { bootstrapApplication(AppComponent, { providers: [ + importProvidersFrom(ServiceWorkerModule.register('ngsw-worker.js', { + enabled: !isDevMode(), + registrationStrategy: 'registerWhenStable:30000' + })), + { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, importProvidersFrom(IonicModule.forRoot({})), importProvidersFrom(HttpClientModule), provideRouter(routes), - ], + ] }); diff --git a/BetterIServ.Mobile/src/manifest.webmanifest b/BetterIServ.Mobile/src/manifest.webmanifest new file mode 100644 index 0000000..930c324 --- /dev/null +++ b/BetterIServ.Mobile/src/manifest.webmanifest @@ -0,0 +1,30 @@ +{ + "name": "BetterIServ", + "short_name": "BetterIServ", + "theme_color": "#3880ff", + "background_color": "#121212", + "display": "standalone", + "orientation": "portrait", + "scope": "./", + "start_url": "./", + "icons": [ + { + "src": "assets/icon/favicon.ico", + "sizes": "256x256", + "type": "image/ico", + "purpose": "any maskable" + }, + { + "src": "assets/icon/favicon512x512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "any maskable" + }, + { + "src": "assets/icon/favicon144x144.png", + "sizes": "144x144", + "type": "image/png", + "purpose": "any maskable" + } + ] +}