From 732b3a7eca82a7e9bd0d31acc01c6970bcd6edbd Mon Sep 17 00:00:00 2001 From: chrismclarke Date: Fri, 4 Oct 2024 09:27:54 -0700 Subject: [PATCH 1/4] feat: add farmer footer nav icons --- .../footer/module-footer.component.html | 20 +++++++++++++++---- .../module-home/module-home.component.scss | 7 ++----- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/apps/picsa-tools/farmer-content/src/app/pages/module-home/components/footer/module-footer.component.html b/apps/picsa-tools/farmer-content/src/app/pages/module-home/components/footer/module-footer.component.html index 8d6283bd..19017bbb 100644 --- a/apps/picsa-tools/farmer-content/src/app/pages/module-home/components/footer/module-footer.component.html +++ b/apps/picsa-tools/farmer-content/src/app/pages/module-home/components/footer/module-footer.component.html @@ -3,14 +3,26 @@ {{ 'Home' | translate }}
- {{ selectedIndex() + 1 }} / {{ totalSections() }} -
diff --git a/apps/picsa-tools/farmer-content/src/app/pages/module-home/module-home.component.scss b/apps/picsa-tools/farmer-content/src/app/pages/module-home/module-home.component.scss index 4e75d36c..5a62b00a 100644 --- a/apps/picsa-tools/farmer-content/src/app/pages/module-home/module-home.component.scss +++ b/apps/picsa-tools/farmer-content/src/app/pages/module-home/module-home.component.scss @@ -1,11 +1,8 @@ :host { - --footer-height: 36px; + --footer-height: 48px; // Adjust farmer tabs to compensate for header and increased footer size @screen sm { - --footer-height: 48px; - } - @screen md { - --footer-height: 60px; + --footer-height: 64px; } } .content-container { From 9410f05ba6064328588b436aa044f50f15979b79 Mon Sep 17 00:00:00 2001 From: chrismclarke Date: Fri, 4 Oct 2024 09:28:08 -0700 Subject: [PATCH 2/4] chore: bump version --- apps/picsa-apps/extension-app-native/android/app/build.gradle | 4 ++-- libs/environments/src/version.ts | 2 +- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/picsa-apps/extension-app-native/android/app/build.gradle b/apps/picsa-apps/extension-app-native/android/app/build.gradle index b530fd41..4321bd0a 100644 --- a/apps/picsa-apps/extension-app-native/android/app/build.gradle +++ b/apps/picsa-apps/extension-app-native/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "io.picsa.extension" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 3046000 - versionName "3.46.0" + versionCode 3046001 + versionName "3.46.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/libs/environments/src/version.ts b/libs/environments/src/version.ts index c4797dfd..52232c3e 100644 --- a/libs/environments/src/version.ts +++ b/libs/environments/src/version.ts @@ -4,5 +4,5 @@ import packageJson from '../../../package.json'; export const APP_VERSION = { number: packageJson.version, - date: '2024-10-01', + date: '2024-10-04', }; diff --git a/package.json b/package.json index 280e5ad0..623d759a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "picsa-apps", - "version": "3.46.0", + "version": "3.46.1", "license": "See LICENSE", "scripts": { "ng": "nx", From 5626812978b46699a0e493b924d3ee01d28e96eb Mon Sep 17 00:00:00 2001 From: chrismclarke Date: Fri, 4 Oct 2024 09:28:25 -0700 Subject: [PATCH 3/4] fix: db sync service issues --- libs/shared/src/services/core/db_v2/db-sync.service.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/shared/src/services/core/db_v2/db-sync.service.ts b/libs/shared/src/services/core/db_v2/db-sync.service.ts index e5f02cb8..77b19ff2 100644 --- a/libs/shared/src/services/core/db_v2/db-sync.service.ts +++ b/libs/shared/src/services/core/db_v2/db-sync.service.ts @@ -32,9 +32,7 @@ export class PicsaDatabaseSyncService { /** Track local document deletions in separate collection to sync to server */ private syncDeleteCollection: RxCollection; - constructor(private supabaseService: SupabaseService) { - this.subscribeToNetworkChanges(); - } + constructor(private supabaseService: SupabaseService) {} /** * Register database for sync service to interact with @@ -44,6 +42,7 @@ export class PicsaDatabaseSyncService { this.db = db; const { sync_delete } = await this.db.addCollections({ sync_delete: SYNC_DELETE_COLLECTION }); this.syncDeleteCollection = sync_delete; + this.subscribeToNetworkChanges(); } /** Register a given collection to have records pushed to supabase db */ From ff729d8513a713d637ef60430f95b216e41cd2be Mon Sep 17 00:00:00 2001 From: chrismclarke Date: Fri, 4 Oct 2024 09:29:01 -0700 Subject: [PATCH 4/4] chore: code tidying --- libs/shared/src/services/core/db_v2/db-sync.service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/shared/src/services/core/db_v2/db-sync.service.ts b/libs/shared/src/services/core/db_v2/db-sync.service.ts index 77b19ff2..64593673 100644 --- a/libs/shared/src/services/core/db_v2/db-sync.service.ts +++ b/libs/shared/src/services/core/db_v2/db-sync.service.ts @@ -42,6 +42,7 @@ export class PicsaDatabaseSyncService { this.db = db; const { sync_delete } = await this.db.addCollections({ sync_delete: SYNC_DELETE_COLLECTION }); this.syncDeleteCollection = sync_delete; + // once db is registered subscribe to network changes to manage syncing this.subscribeToNetworkChanges(); }