Merge pull request #164 from supportingami/updates/2024-09-1

Updates/2024 09 1

Author: chrismclarke

.gitignore

@@ -29,3 +29,11 @@ maths-club-app/src/environments/firebaseConfig.json
 maths-club-app/firebase-debug.log
 maths-club-app/ios/App/App/GoogleService-Info.plist
 maths-club-app/src/static/sitemap.xml
+
+# yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

TODO.md

@@ -0,0 +1,65 @@
+**Update**
+
+- [x] ng core 11->18
+- [x] mat 11->16
+- [x] mat 16->18
+- [x] sentry
+- [x] ngx-markdown
+- [ ] capacitor
+- [ ] yarn
+- [ ] misc deps
+- [ ] nx
+
+**Content**
+
+- [x] control flow migration
+- [ ] signals
+- [x] mat components
+- [ ] Weekly problem
+
+**Actions**
+
+- [ ] ....
+
+**Functions**
+
+- [ ] ...
+
+**Docs**
+
+- [ ] pre-requisites
+
+**Test**
+
+- [ ] animations
+- [ ] scroll restoration
+- [x] markdown (katex)
+- [ ] web build
+- [ ] android build (+cap native functions)
+- [ ] ios build (+cap native functions)
+- [ ] ios content inset (notch)
+
+**IOS**
+
+- [ ] Splash screen
+- [ ] Native functionality (share, deep links)
+
+**IOS**
+
+- [ ] Configure plist for status bar: https://capacitorjs.com/docs/apis/status-bar#ios-note
+- [ ] Enable push notification https://capacitorjs.com/docs/apis/push-notifications#ios
+- [ ] Check all other plugin notes
+- [ ] Splash screen
+
+**Refactor**
+
+- [ ] all components standalone
+- [ ] typography
+- [x] provide sentry error handler (see legacy app module)
+- [ ] lazy-load component routes
+- [ ] problems standalone repo (?)
+- [ ] material module imports to components (if standalone in mat 18)
+- [ ] async pipe -> signals
+- [ ] Dynamic links (deprecated?)
+- [ ] Lint rules (enforce control-flow, ordered imports)
+- [ ] Run prettier (write) `yarn prettier --write "**/*.{ts}"`

maths-club-app/.gitignore

@@ -32,6 +32,7 @@ speed-measure-plugin*.json
 .history/*
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage
@@ -44,3 +45,12 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
+
+
+# yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

maths-club-app/.yarnrc

@@ -1,5 +1,26 @@
 # SAMI Maths Club App
 
+## Pre-requisites
+
+- Install [Node JS](https://nodejs.org/en/download/package-manager)
+- Enable yarn package manager
+
+```sh
+corepack enable
+```
+
+- Install dependencies
+
+```sh
+yarn install
+```
+
+## Run on Web
+
+```sh
+yarn start
+```
+
 ## Running on android
 
 First you must add the android platform for the build

maths-club-app/README.md

@@ -1,11 +1,8 @@
-# NPM renames .gitignore to .npmignore
-# In order to prevent that, we remove the initial "."
-# And the CLI then renames it
-
-# Using Android gitignore template: https://github.com/github/gitignore/blob/master/Android.gitignore
+# Using Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore
 
 # Built application files
 *.apk
+*.aar
 *.ap_
 *.aab
 
@@ -19,7 +16,8 @@
 bin/
 gen/
 out/
-release/
+#  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/
@@ -61,6 +59,10 @@ captures/
 
 # 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
@@ -84,8 +86,16 @@ 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

maths-club-app/android/.gitignore

@@ -1,16 +1,20 @@
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'com.google.gms.google-services'  // Google Services plugin
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    namespace "io.c2dev.samimathsclub"
+    compileSdk rootProject.ext.compileSdkVersion
     defaultConfig {
         applicationId "io.c2dev.samimathsclub"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 2007002
-        versionName "2.7.2"
+        versionCode 3000000
+        versionName "3.0.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 {
@@ -24,47 +28,18 @@ repositories {
     flatDir{
         dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
     }
-  mavenCentral()
 }
 
 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"
+    androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation project(':capacitor-cordova-android-plugins')
-    implementation 'com.google.firebase:firebase-messaging:20.2.4'
-//  androidTestImplementation 'androidx.test:rules:1.3.0-alpha03'
-//  implementation "androidx.core:core-ktx:+"
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
-  //  Testing (overrides many of the above)
-  //  TODO - should be moved to separate build for test package
-  androidTestImplementation 'tools.fastlane:screengrab:2.0.0'
-  // Core library
-  androidTestImplementation 'androidx.test:core:1.3.0'
-  // AndroidJUnitRunner and JUnit Rules
-  androidTestImplementation 'androidx.test:runner:1.3.0'
-  androidTestImplementation 'androidx.test:rules:1.3.0'
-  // Assertions
-  androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-  androidTestImplementation 'androidx.test.ext:truth:1.3.0'
-  androidTestImplementation 'com.google.truth:truth:0.42'
-  // Espresso dependencies
-  androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-  androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.2.0'
-  androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
-  androidTestImplementation 'androidx.test.espresso:espresso-accessibility:3.2.0'
-  androidTestImplementation 'androidx.test.espresso:espresso-web:3.2.0'
-  androidTestImplementation 'androidx.test.espresso.idling:idling-concurrent:3.2.0'
-  // The following Espresso dependency can be either "implementation"
-  // or "androidTestImplementation", depending on whether you want the
-  // dependency to appear on your APK's compile classpath or the test APK
-  // classpath.
-  androidTestImplementation 'androidx.test.espresso:espresso-idling-resource:3.2.0'
-
 }
 
 apply from: 'capacitor.build.gradle'
@@ -75,5 +50,5 @@ try {
         apply plugin: 'com.google.gms.google-services'
     }
 } catch(Exception e) {
-    logger.warn("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
+    logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
 }

maths-club-app/android/app/build.gradle

@@ -1,27 +1,26 @@
 package com.getcapacitor.myapp;
 
-import android.content.Context;
+import static org.junit.Assert.*;
 
-import androidx.test.platform.app.InstrumentationRegistry;
+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;
 
-import static org.junit.Assert.*;
-
 /**
  * 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());
-  }
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+
+        assertEquals("com.getcapacitor.app", appContext.getPackageName());
+    }
 }