diff --git a/apps/cic-staff-client/Dockerfile b/apps/cic-staff-client/Dockerfile index a346b8a7..9721319c 100644 --- a/apps/cic-staff-client/Dockerfile +++ b/apps/cic-staff-client/Dockerfile @@ -13,8 +13,7 @@ RUN npm install COPY . . -ARG FRONTEND_ENV="production" - +ARG FRONTEND_ENV=prod # running build script RUN npm run build:${FRONTEND_ENV} diff --git a/apps/cic-staff-client/angular.json b/apps/cic-staff-client/angular.json index e86534f0..f96db61f 100644 --- a/apps/cic-staff-client/angular.json +++ b/apps/cic-staff-client/angular.json @@ -24,11 +24,7 @@ "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", "aot": true, - "assets": [ - "src/favicon.ico", - "src/assets", - "src/manifest.webmanifest" - ], + "assets": ["src/favicon.ico", "src/assets", "src/manifest.webmanifest"], "styles": [ "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "src/styles.scss", @@ -78,6 +74,14 @@ "with": "src/environments/environment.dev.ts" } ] + }, + "staging": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.staging.ts" + } + ] } } }, @@ -109,11 +113,7 @@ "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "codeCoverage": true, - "assets": [ - "src/favicon.ico", - "src/assets", - "src/manifest.webmanifest" - ], + "assets": ["src/favicon.ico", "src/assets", "src/manifest.webmanifest"], "styles": [ "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "src/styles.scss" @@ -130,9 +130,7 @@ "e2e/tsconfig.json", "tsconfig.worker.json" ], - "exclude": [ - "**/node_modules/**" - ] + "exclude": ["**/node_modules/**"] } }, "e2e": { diff --git a/apps/cic-staff-client/src/environments/environment.staging.ts b/apps/cic-staff-client/src/environments/environment.staging.ts index 2fe26b52..3e189cba 100644 --- a/apps/cic-staff-client/src/environments/environment.staging.ts +++ b/apps/cic-staff-client/src/environments/environment.staging.ts @@ -9,7 +9,7 @@ export const environment = { cicMetaUrl: 'https://meta.staging.grassrootseconomics.net', publicKeysUrl: 'https://dev.grassrootseconomics.net/.well-known/publickeys/', cicCacheUrl: 'https://cache.staging.grassrootseconomics.net', - web3Provider: 'https://bloxberg.staging.grassrootseconomics.net', + web3Provider: 'wss://bloxberg.staging.grassrootseconomics.net', cicUssdUrl: 'https://user.staging.grassrootseconomics.net', registryAddress: '0xea6225212005e86a4490018ded4bf37f3e772161', trustedDeclaratorAddress: '0xEb3907eCad74a0013c259D5874AE7f22DcBcC95C', diff --git a/apps/cic-staff-client/src/environments/environment.ts b/apps/cic-staff-client/src/environments/environment.ts index 962ae1dd..4d13e163 100644 --- a/apps/cic-staff-client/src/environments/environment.ts +++ b/apps/cic-staff-client/src/environments/environment.ts @@ -6,7 +6,7 @@ export const environment = { logLevel: NgxLoggerLevel.ERROR, serverLogLevel: NgxLoggerLevel.OFF, loggingUrl: 'http://localhost:8000', - cicMetaUrl: 'http://localhost:8080', + cicMetaUrl: 'https://meta-auth.dev.grassrootseconomics.net', publicKeysUrl: 'https://dev.grassrootseconomics.net/.well-known/publickeys/', cicCacheUrl: 'https://cache.dev.grassrootseconomics.net', web3Provider: 'wss://bloxberg-ws.dev.grassrootseconomics.net',