Skip to content

Commit

Permalink
Merge pull request #310 from e-picsa/feat/dashboard-workshop-prep
Browse files Browse the repository at this point in the history
fix(dashboard): uppy styles, disable anonymous login, update translations
  • Loading branch information
chrismclarke authored Jul 31, 2024
2 parents 0dc1c09 + 30b3c17 commit 24060f5
Show file tree
Hide file tree
Showing 13 changed files with 36 additions and 6 deletions.
6 changes: 5 additions & 1 deletion apps/picsa-apps/dashboard/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@
"output": "assets/climate-icons"
}
],
"styles": ["apps/picsa-apps/dashboard/src/styles.scss", "node_modules/leaflet/dist/leaflet.css"],
"styles": [
"apps/picsa-apps/dashboard/src/styles.scss",
"node_modules/leaflet/dist/leaflet.css",
"@uppy/core/dist/style.min.css"
],
"stylePreprocessorOptions": {
"includePaths": ["libs/theme/src"]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { MatDialog } from '@angular/material/dialog';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { RouterModule } from '@angular/router';
import { ENVIRONMENT } from '@picsa/environments/src';
import { SupabaseAuthService } from '@picsa/shared/services/core/supabase/services/supabase-auth.service';

import { SupabaseSignInDialogComponent } from '../sign-in-dialog/sign-in-dialog.component';
Expand All @@ -21,7 +22,10 @@ export class ProfileMenuComponent implements AfterViewInit {

async ngAfterViewInit() {
await this.supabaseAuthService.ready();
await this.supabaseAuthService.signInDefaultUser();
// HACK - use anonymous user when running in dev
if (!ENVIRONMENT.production) {
await this.supabaseAuthService.signInDefaultUser();
}
}
public signOut() {
console.log('signing out');
Expand Down
4 changes: 2 additions & 2 deletions apps/picsa-apps/extension-app-native/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId "io.picsa.extension"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 3042000
versionName "3.42.0"
versionCode 3043000
versionName "3.43.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
Expand Down
2 changes: 1 addition & 1 deletion libs/environments/src/version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ import packageJson from '../../../package.json';

export const APP_VERSION = {
number: packageJson.version,
date: '2024-07-08',
date: '2024-07-31',
};
2 changes: 2 additions & 0 deletions libs/i18n/assets/debug.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"Add Female Member": "•Add Female Member•",
"Add Male Member": "•Add Male Member•",
"Add Option": "•Add Option•",
"Add Photo": "•Add Photo•",
"afforestation": "•afforestation•",
"After the season": "•After the season•",
"All Submitted": "•All Submitted•",
Expand Down Expand Up @@ -228,6 +229,7 @@
"New Profile": "•New Profile•",
"Next": "•Next•",
"No outputs produce for consumption": "•No outputs produce for consumption•",
"No photos added": "•No photos added•",
"No results found": "•No results found•",
"No saved calendars": "•No saved calendars•",
"Nov": "•Nov•",
Expand Down
2 changes: 2 additions & 0 deletions libs/i18n/assets/global_en.json
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@
"Next": "Next",
"Save": "Save",
"Above": "Above",
"Add Photo": "Add Photo",
"Are the changes a good idea?": "Are the changes a good idea?",
"Are you sure you want to delete?": "Are you sure you want to delete?",
"Below": "Below",
Expand All @@ -185,6 +186,7 @@
"I'm an extension worker": "I'm an extension worker",
"Name": "Name",
"New Profile": "New Profile",
"No photos added": "No photos added",
"Options": "Options",
"Probability and Risk": "Probability and Risk",
"Ram": "Ram",
Expand Down
2 changes: 2 additions & 0 deletions libs/i18n/assets/ke_sw.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"Add Female Member": "•Add Female Member•",
"Add Male Member": "•Add Male Member•",
"Add Option": "•Add Option•",
"Add Photo": "•Add Photo•",
"afforestation": "•afforestation•",
"After the season": "•After the season•",
"All Submitted": "•All Submitted•",
Expand Down Expand Up @@ -228,6 +229,7 @@
"New Profile": "•New Profile•",
"Next": "•Next•",
"No outputs produce for consumption": "•No outputs produce for consumption•",
"No photos added": "•No photos added•",
"No results found": "•No results found•",
"No saved calendars": "•No saved calendars•",
"Nov": "•Nov•",
Expand Down
2 changes: 2 additions & 0 deletions libs/i18n/assets/mw_ny.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"Add Female Member": "Onjezerani membala wa mkazi",
"Add Male Member": "Onjezerani membala wa mamuna",
"Add Option": "•Add Option•",
"Add Photo": "•Add Photo•",
"afforestation": "kudzala mitengo",
"After the season": "Pakutha pa nyengo",
"All Submitted": "•All Submitted•",
Expand Down Expand Up @@ -228,6 +229,7 @@
"New Profile": "Mbiri yatsopano",
"Next": "pitani tsamba lina",
"No outputs produce for consumption": "Palibe zokolora zomwe zagwiritsidwa (zadyedwa) ntchito pakhomo",
"No photos added": "•No photos added•",
"No results found": "•No results found•",
"No saved calendars": "•No saved calendars•",
"Nov": "•Nov•",
Expand Down
2 changes: 2 additions & 0 deletions libs/i18n/assets/tj_tg.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"Add Female Member": "•Add Female Member•",
"Add Male Member": "•Add Male Member•",
"Add Option": "•Add Option•",
"Add Photo": "•Add Photo•",
"afforestation": "орадодӣ",
"After the season": "•After the season•",
"All Submitted": "•All Submitted•",
Expand Down Expand Up @@ -228,6 +229,7 @@
"New Profile": "•New Profile•",
"Next": "Баъдӣ",
"No outputs produce for consumption": "•No outputs produce for consumption•",
"No photos added": "•No photos added•",
"No results found": "•No results found•",
"No saved calendars": "•No saved calendars•",
"Nov": "Ноябр",
Expand Down
2 changes: 2 additions & 0 deletions libs/i18n/assets/zm_ny.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"Add Female Member": "Ikamponi membala wam'kazi",
"Add Male Member": "Ikamponi membala wam'muna",
"Add Option": "•Add Option•",
"Add Photo": "•Add Photo•",
"afforestation": "kubyala mitengo",
"After the season": "Pambuyo pakutha kwa Nyengo",
"All Submitted": "•All Submitted•",
Expand Down Expand Up @@ -228,6 +229,7 @@
"New Profile": "Profaelo yatsopano",
"Next": "ina",
"No outputs produce for consumption": "Palibe zokolola zakudya pakhomo",
"No photos added": "•No photos added•",
"No results found": "•No results found•",
"No saved calendars": "•No saved calendars•",
"Nov": "•Nov•",
Expand Down
2 changes: 2 additions & 0 deletions libs/i18n/templates/_template.csv
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ tool,context,text
"common","buttons","Next"
"common","buttons","Save"
"common",,"Above"
"common",,"Add Photo"
"common",,"Are the changes a good idea?"
"common",,"Are you sure you want to delete?"
"common",,"Below"
Expand All @@ -185,6 +186,7 @@ tool,context,text
"common",,"I'm an extension worker"
"common",,"Name"
"common",,"New Profile"
"common",,"No photos added"
"common",,"Options"
"common",,"Probability and Risk"
"common",,"Ram"
Expand Down
8 changes: 8 additions & 0 deletions libs/i18n/templates/_template.json
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,10 @@
"text": "Above",
"tool": "common"
},
{
"text": "Add Photo",
"tool": "common"
},
{
"text": "Are the changes a good idea?",
"tool": "common"
Expand Down Expand Up @@ -844,6 +848,10 @@
"text": "New Profile",
"tool": "common"
},
{
"text": "No photos added",
"tool": "common"
},
{
"text": "Options",
"tool": "common"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "picsa-apps",
"version": "3.42.0",
"version": "3.43.0",
"license": "See LICENSE",
"scripts": {
"ng": "nx",
Expand Down

0 comments on commit 24060f5

Please sign in to comment.