Merge pull request #132 from myclubapp/feat/angular18

Feat/angular18

.github/workflows/beta.yml

@@ -13,11 +13,9 @@ jobs:
       - name: Config Node Version because of npm login issues.
         uses: actions/setup-node@master
         with:
-          node-version: 18
+          node-version: 20
       - name: Install Dependencies
-        run: |
-          npm config set '//npm.fontawesome.com/:_authToken' "${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}"
-          npm ci
+        run: npm i --force
       - name: Build (BETA)
         run: npm run build:beta
       - name: Deploy to Firebase

.github/workflows/main.yml

@@ -13,11 +13,9 @@ jobs:
       - name: Config Node Version because of npm login issues.
         uses: actions/setup-node@master
         with:
-          node-version: 18
+          node-version: 20
       - name: Install Dependencies
-        run: |
-          npm config set '//npm.fontawesome.com/:_authToken' "${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}"
-          npm ci
+        run: npm i --force
       - name: Build (Default Unihockey)
         run: npm run build:prod
       - name: Deploy to Firebase
@@ -36,11 +34,9 @@ jobs:
       - name: Config Node Version because of npm login issues.
         uses: actions/setup-node@master
         with:
-          node-version: 18
+          node-version: 20
       - name: Install Dependencies
-        run: |
-          npm config set '//npm.fontawesome.com/:_authToken' "${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}"
-          npm ci
+        run: npm i --force
       - name: Build app-kadetten-unihockey
         run: npm run build:app-kadetten-unihockey
       - name: Deploy to Firebase
@@ -59,11 +55,9 @@ jobs:
       - name: Config Node Version because of npm login issues.
         uses: actions/setup-node@master
         with:
-          node-version: 18
+          node-version: 20
       - name: Install Dependencies
-        run: |
-          npm config set '//npm.fontawesome.com/:_authToken' "${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}"
-          npm ci
+        run: npm i --force
       - name: Build app-uhc-win-u
         run: npm run build:app-uhc-win-u
       - name: Deploy to Firebase
@@ -82,11 +76,9 @@ jobs:
       - name: Config Node Version because of npm login issues.
         uses: actions/setup-node@master
         with:
-          node-version: 18
+          node-version: 20
       - name: Install Dependencies
-        run: |
-          npm config set '//npm.fontawesome.com/:_authToken' "${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}"
-          npm ci
+        run: npm i --force
       - name: Build app-stv-spreitenbach
         run: npm run build:app-stv-spreitenbach
       - name: Deploy to Firebase
@@ -105,11 +97,9 @@ jobs:
       - name: Config Node Version because of npm login issues.
         uses: actions/setup-node@master
         with:
-          node-version: 18
+          node-version: 20
       - name: Install Dependencies
-        run: |
-          npm config set '//npm.fontawesome.com/:_authToken' "${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}"
-          npm ci
+        run: npm i --force
       - name: Build app-vbc-schaffhausen
         run: npm run build:app-vbc-schaffhausen
       - name: Deploy to Firebase
@@ -128,11 +118,9 @@ jobs:
       - name: Config Node Version because of npm login issues.
         uses: actions/setup-node@master
         with:
-          node-version: 18
+          node-version: 20
       - name: Install Dependencies
-        run: |
-          npm config set '//npm.fontawesome.com/:_authToken' "${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}"
-          npm ci
+        run: npm i --force
       - name: Build app-kadetten-handball
         run: npm run build:app-kadetten-handball
       - name: Deploy to Firebase

.husky/pre-commit

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npx pretty-quick --staged
+npx pretty-quick --staged

.prettierignore

@@ -1 +1,10 @@
-/.angular
+/.angular
+/.github
+/.husky
+/.vscode
+/android
+/docs
+/e2e
+/icons
+/ios
+/node_modules

android/app/build.gradle

@@ -1,14 +1,20 @@
 apply plugin: 'com.android.application'
 
 android {
+
+    packagingOptions {
+        resources {
+            excludes += ['META-INF/NOTICE', 'META-INF/LICENSE', 'META-INF/NOTICE', 'META-INF/LICENSE']
+        }
+    }
     namespace "app.myclub.defaultapp"
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdk rootProject.ext.compileSdkVersion
     defaultConfig {
         applicationId "app.myclub.defaultapp"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 4
-        versionName "1.4.10"
+        versionCode 106
+        versionName "1.8.12"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

android/app/capacitor.build.gradle

@@ -9,20 +9,22 @@ android {
 
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
+    implementation project(':capacitor-app')
     implementation project(':capacitor-browser')
     implementation project(':capacitor-camera')
+    implementation project(':capacitor-clipboard')
     implementation project(':capacitor-device')
     implementation project(':capacitor-dialog')
     implementation project(':capacitor-geolocation')
     implementation project(':capacitor-google-maps')
     implementation project(':capacitor-haptics')
     implementation project(':capacitor-keyboard')
     implementation project(':capacitor-network')
-    implementation project(':capacitor-preferences')
     implementation project(':capacitor-push-notifications')
     implementation project(':capacitor-share')
     implementation project(':capacitor-splash-screen')
     implementation project(':capacitor-status-bar')
+    implementation project(':myclub-widget-plugin')
 
 }
 apply from: "../../node_modules/cordova-plugin-ionic/src/android/cordovapluginionic.gradle"

android/app/src/main/AndroidManifest.xml

@@ -40,7 +40,6 @@
     </application>
 
     <!-- Permissions -->
-
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.LOCATION" />

android/app/src/main/assets/capacitor.config.json

@@ -16,5 +16,8 @@
 				"alert"
 			]
 		}
+	},
+	"ios": {
+		"scheme": "App"
 	}
 }