Commit 86eeaede authored by PECQUOT's avatar PECQUOT

renaming

parent 41489f2f
{
"name": "SUMARis Pod GraphQL Schema",
"name": "Quadrige3 Pod GraphQL Schema",
"schemaPath": "src/schema.graphql",
"extensions": {
"endpoints": {
......
......@@ -68,17 +68,17 @@ RUN unzip ${ANDROID_HOME}/temp/*.zip -d ${ANDROID_HOME}
# Install source code
#RUN git config --global user.email "user.name@domain.com" && \
# git config --global user.name "User Name" && \
RUN git clone https://github.com/E-IS/sumaris-app.git && \
cd sumaris-app && \
RUN git clone https://gitlab.ifremer.fr/quadrige/quadrige3-app.git && \
cd quadrige3-app && \
npm install
# Restore cordova platforms
RUN cd sumaris-app && \
RUN cd quadrige3-app && \
ionic state restore
# TODO: Test First Build so that it will be faster later
## ionic cordova build android --prod --no-interactive --release
WORKDIR sumaris-app
WORKDIR quadrige3-app
EXPOSE 8100 35729
CMD ["ionic", "serve"]
<?xml version='1.0' encoding='utf-8'?>
<widget android-versionCode="10503" id="net.sumaris.app" version="1.5.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>SUMARiS</name>
<description>Halieutic data capture</description>
<widget android-versionCode="10503" id="fr.ifremer.quadrige3.app" version="1.5.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>QUADRIGE3ADMIN</name>
<description>Quadrige3 Admin</description>
<author email="contact@e-is.pro" href="http://www.e-is.pro">Environmental Information Systems</author>
<content src="index.html" />
<access origin="*" />
......
# Building from source
Technologies: SUMARiS App is an Ionic 5 + Angular 9 App.
Technologies: Quadrige3 App is an Ionic 5 + Angular 9 App.
This article will explain how to install your environment, then build the application.
......@@ -31,12 +31,12 @@ sudo apt-get install chromium-browser docker.io
1. Install project's dependencies:
```bash
cd sumaris-app
cd quadrige3-app
npm install
```
OR, alternatively:
```bash
cd sumaris-app/scripts
cd quadrige3-app/scripts
./env-global.sh
```
......@@ -46,7 +46,7 @@ cd sumaris-app/scripts
3. Start the app
```bash
cd sumaris-app
cd quadrige3-app
npm start
```
By default, the app should be accessible at [http://localhost:4200](http://localhost:4200)
......@@ -54,7 +54,7 @@ cd sumaris-app/scripts
To change the default port, use this command instead:
```bash
cd sumaris-app
cd quadrige3-app
ng serve --port [port]
```
......@@ -77,13 +77,13 @@ The application should be accessible at [localhost:4200](http://localhost:4200)
1. Install the android build environment:
```bash
cd sumaris-app/scripts
cd quadrige3-app/scripts
./env-android.sh
```
2. Create a debug APK file:
```bash
cd sumaris-app/scripts
cd quadrige3-app/scripts
./build-android.sh
```
......@@ -95,7 +95,7 @@ The application should be accessible at [localhost:4200](http://localhost:4200)
2. Create a release APK file:
```bash
cd sumaris-app/scripts
cd quadrige3-app/scripts
./release-android.sh
```
......@@ -126,8 +126,8 @@ cp package*.json ./dist
cd dist
npm link
```
- Use it from Sumaris project:
- Use it from Quadrige3 project:
```bash
cd <sumaris_app_root>
cd <quadrige3_app_root>
npm link angular4-material-table
```
## Privacy policy
SUMARiS App use the user's device for:
Quadrige3Admin App use the user's device for:
- Upload pictures, such as user profile's avatar or picture of fish;
- Listening network status, to warn the user when he lost the network.
### Pictures
Privacy policy are :
- Pictures are stored locally, but can be upload to the [SUMARiS Pod](https://github.com/sumaris-net/sumaris-pod/) if user decide to export it;
- Profile's avatar are public data, stored by the [SUMARiS Pod](https://github.com/sumaris-net/sumaris-pod/);
- You can totally remove your profile's avatar, using the settings menu item.
### Network status
Privacy policy are :
......
......@@ -9,6 +9,6 @@ describe('workspace-project App', () => {
it('should display welcome message', () => {
page.navigateTo();
expect(page.getParagraphText()).toEqual('Welcome to the SUMARiS web site!');
expect(page.getParagraphText()).toEqual('Welcome to the Quadrige3Admin web site!');
});
});
......@@ -11,7 +11,7 @@ if [[ "_$1" != "_" ]]; then
fi
if [[ "_$INSTALL_DIR" == "_" ]]; then
DIRNAME=`pwd`
INSTALL_DIR="$DIRNAME/sumaris-app"
INSTALL_DIR="$DIRNAME/quadrige3-app"
fi
latest_version() {
......@@ -19,7 +19,7 @@ latest_version() {
}
api_release_url() {
echo "https://api.github.com/repos/sumaris-net/sumaris-app/releases/tags/$(latest_version)"
echo "https://gitlab.ifremer.fr/quadrige/quadrige3-app/-/releases/$(latest_version)"
}
download() {
......@@ -41,8 +41,8 @@ install_from_github() {
local RELEASE=`curl -XGET -i $(api_release_url)`
local ARCHIVE_URL=`echo "$RELEASE" | grep -P "\"browser_download_url\": \"[^\"]+" | grep -oP "https://[a-zA-Z0-9/.-]+-web.zip"`
local TMP_DIR=/tmp/sumaris-app-install
local ARCHIVE_FILE=${TMP_DIR}/sumaris-app-$(latest_version)-web.zip
local TMP_DIR=/tmp/quadrige3-app-install
local ARCHIVE_FILE=${TMP_DIR}/quadrige3-app-$(latest_version)-web.zip
if [[ -d "$INSTALL_DIR" ]]; then
if [[ -f "$ARCHIVE_FILE" ]]; then
echo "WARNING: Deleting existing archive [$ARCHIVE_FILE]"
......@@ -97,6 +97,6 @@ reset() {
download install_from_github do_install
}
[[ "_$SUMARIS_ENV" = "_testing" ]] || do_install $1
[[ "_$QUADRIGE3_ENV" = "_testing" ]] || do_install $1
} # this ensures the entire script is downloaded #
{
"name": "sumaris-app",
"name": "quadrige3-app",
"integrations": {
"cordova": {}
},
......
{
"name": "quadrige3-app",
"description": "Quadrige3Admin app",
"version": "1.5.3",
"author": "contact@e-is.pro",
"license": "AGPL-3.0",
"readmeFilename": "README.md",
"scripts": {
"postinstall": "ngcc",
"ng": "node --max-old-space-size=8192 ./node_modules/@angular/cli/bin/ng",
"start": "node --max-old-space-size=8192 ./node_modules/@angular/cli/bin/ng serve",
"serve.aot": "node --max-old-space-size=8192 ./node_modules/@angular/cli/bin/ng serve --aot",
"serve.android": "node --max-old-space-size=8192 ./node_modules/@angular/cli/bin/ng run app:ionic-cordova-serve --platform=android",
"prepare.android": "ionic cordova prepare --platform=android",
"build": "node --max-old-space-size=8192 ./node_modules/@angular/cli/bin/ng build",
"build.aot": "node --max-old-space-size=8192 ./node_modules/@angular/cli/bin/ng build --aot",
"build.prod": "node --max-old-space-size=8192 ./node_modules/@angular/cli/bin/ng build --prod --aot && npm run build.i18n",
"build.android": "ionic cordova build android",
"build.android.prod": "ionic cordova build android --prod --release",
"build.dev": "node --max-old-space-size=8192 ./node_modules/@angular/cli/bin/ng build --configuration=dev && lite-server --baseDir=\"www\"",
"build.i18n": "node scripts/build-i18n.js",
"test": "npm run ng test",
"lint": "npm run ng lint",
"e2e": "npm run ng e2e"
},
"dependencies": {
"@angular/animations": "^11.0.2",
"@angular/cdk": "^11.0.0",
"@angular/common": "^11.0.2",
"@angular/core": "^11.0.2",
"@angular/forms": "^11.0.2",
"@angular/material": "^11.0.0",
"@angular/material-moment-adapter": "^11.0.0",
"@angular/platform-browser": "^11.0.2",
"@angular/platform-browser-dynamic": "^11.0.2",
"@angular/router": "^11.0.2",
"@apollo/client": "^3.2.7",
"@apollo/link-error": "^2.0.0-beta.3",
"@apollo/link-retry": "^2.0.0-beta.3",
"@apollo/link-ws": "^2.0.0-beta.3",
"@asymmetrik/ngx-leaflet": "^7.0.1",
"@e-is/ngx-material-table": "0.10.2",
"@ionic-native/audio-management": "^5.29.0",
"@ionic-native/camera": "^5.29.0",
"@ionic-native/core": "^5.29.0",
"@ionic-native/downloader": "^5.29.0",
"@ionic-native/geolocation": "^5.29.0",
"@ionic-native/in-app-browser": "^5.29.0",
"@ionic-native/keyboard": "^5.29.0",
"@ionic-native/native-audio": "^5.29.0",
"@ionic-native/network": "^5.29.0",
"@ionic-native/splash-screen": "^5.29.0",
"@ionic-native/status-bar": "^5.29.0",
"@ionic-native/vibration": "^5.29.0",
"@ionic/angular": "^5.5.0",
"@ionic/core": "^5.5.0",
"@ionic/pwa-elements": "^3.0.1",
"@ionic/storage": "^2.3.1",
"@ngtools/webpack": "^11.0.2",
"@ngx-translate/core": "^13.0.0",
"@ngx-translate/http-loader": "^6.0.0",
"angular2-text-mask": "^9.0.0",
"apollo-angular": "^2.1.0",
"apollo-angular-link-http": "^1.11.0",
"apollo-cache-inmemory": "^1.6.6",
"apollo3-cache-persist": "^0.9.1",
"apollo-link-logger": "^2.0.0",
"apollo-link-queue": "^3.0.0",
"apollo-link-serialize": "^3.1.1",
"chart.js": "^2.9.4",
"clovelced-plugin-audiomanagement": "^1.0.2",
"cordova-android": "^8.1.0",
"cordova-plugin-advanced-http": "2.0.11",
"cordova-plugin-decimal-keyboard": "1.0.0",
"cordova-plugin-file": "^6.0.2",
"cordova-plugin-geolocation": "4.0.1",
"cordova-plugin-inappbrowser": "^3.1.0",
"cordova-plugin-nativeaudio": "^3.0.9",
"cordova-plugin-network-information": "^2.0.2",
"cordova-plugin-vibration": "^3.1.1",
"cordova-sqlite-storage": "^3.4.1",
"core-js": "^3.6.5",
"cors": "^2.8.5",
"ember-cli-roboto-fontface": "^2.0.5",
"geojson": "^0.5.0",
"graphql": "^15.4.0",
"graphql-tag": "^2.11.0",
"hammerjs": "^2.0.8",
"hammer-timejs": "^1.1.0",
"integrator-cordova-plugin-downloader": "^1.1.0",
"ionic-cache": "^5.2.0",
"ionicons": "^5.1.2",
"leaflet": "^1.6.0",
"localforage": "1.7.1",
"lodash.clonedeep": "^4.5.0",
"luxon": "^1.24.1",
"material-design-icons": "^3.0.1",
"moment": "^2.27.0",
"ng2-charts": "^2.4.2",
"ng2-charts-schematics": "^0.1.7",
"ngx-color-picker": "^10.1.0",
"ngx-markdown": "^10.1.1",
"ngx-material-timepicker": "5.5.3",
"ngx-quicklink": "^0.2.4",
"roboto-fontface": "^0.10.0",
"scrypt-async": "^2.0.1",
"seedrandom": "^3.0.5",
"subscriptions-transport-ws": "^0.9.16",
"sw-toolbox": "3.6.0",
"tslib": "^2.0.0",
"tweetnacl": "^1.0.3",
"tweetnacl-util": "^0.15.1",
"uuid": "^3.3.3",
"zone.js": "~0.11.3"
},
"peerDependencies": {
"tar": "^5.0.5",
"rxjs": "^6.6.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1100.2",
"@angular-devkit/build-webpack": "~0.1100.2",
"@angular/cli": "^11.0.2",
"@angular/compiler": "^11.0.2",
"@angular/compiler-cli": "^11.0.2",
"@angular/language-service": "^11.0.2",
"@ionic/angular-toolkit": "^3.0.0",
"@ionic/cli": "^6.12.2",
"@types/async": "^3.2.4",
"@types/graphql": "14.5.0",
"@types/jasmine": "^3.6.2",
"@types/jasminewd2": "^2.0.8",
"@types/leaflet": "^1.5.19",
"@types/node": "^12.19.6",
"@types/uuid": "^3.4.9",
"acorn": "^7.3.1",
"codelyzer": "^6.0.0",
"cordova": "^9.0.0",
"cordova-res": "^0.15.2",
"rxjs": "^6.6.3",
"cordova-plugin-camera": "^4.1.0",
"cordova-plugin-device": "^2.0.3",
"cordova-plugin-ionic-keyboard": "^2.2.0",
"cordova-plugin-ionic-webview": "^5.0.0",
"cordova-plugin-splashscreen": "^5.0.4",
"cordova-plugin-statusbar": "^2.4.3",
"cordova-plugin-whitelist": "^1.3.4",
"eslint": "^7.4.0",
"react": "^17.0.1",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.2",
"karma": "~5.2.1",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.3",
"karma-jasmine": "~4.0.1",
"karma-jasmine-html-reporter": "^1.5.4",
"protractor": "~7.0.0",
"sass": "^1.29.0",
"sass-loader": "^10.1.0",
"tar": "^5.0.5",
"ts-node": "^8.10.2",
"typescript": "~4.0.5",
"webpack": "^4.0.1"
},
"cordova": {
"plugins": {
"cordova-plugin-whitelist": {},
"cordova-plugin-statusbar": {},
"cordova-plugin-device": {},
"cordova-plugin-splashscreen": {},
"cordova-plugin-ionic-webview": {
"ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
},
"cordova-sqlite-storage": {},
"cordova-plugin-ionic-keyboard": {},
"cordova-plugin-decimal-keyboard": {},
"cordova-plugin-advanced-http": {},
"cordova-plugin-geolocation": {},
"cordova-plugin-camera": {
"ANDROID_SUPPORT_V4_VERSION": "27.+"
},
"cordova-plugin-network-information": {},
"cordova-plugin-nativeaudio": {},
"cordova-plugin-vibration": {},
"clovelced-plugin-audiomanagement": {},
"integrator-cordova-plugin-downloader": {}
},
"platforms": [
"android"
]
},
"repository": {
"type": "git",
"url": "https://gitlab.ifremer.fr/quadrige/quadrige3-app.git"
},
"homepage": "https://gitlab.ifremer.fr/quadrige/quadrige3-app",
"bugs": {
"url": "https://gitlab.ifremer.fr/quadrige/quadrige3-app/-/issues"
},
"engines": {
"node": ">= 10.20.0",
"npm": ">= 6.14.4"
}
}
{
"name": "sumaris-app",
"description": "SUMARiS app",
"name": "quadrige3-app",
"description": "Quadrige3Admin app",
"version": "1.5.3",
"author": "contact@e-is.pro",
"license": "AGPL-3.0",
......@@ -10,13 +10,9 @@
"ng": "node --max-old-space-size=8192 ./node_modules/@angular/cli/bin/ng",
"start": "node --max-old-space-size=8192 ./node_modules/@angular/cli/bin/ng serve",
"serve.aot": "node --max-old-space-size=8192 ./node_modules/@angular/cli/bin/ng serve --aot",
"serve.android": "node --max-old-space-size=8192 ./node_modules/@angular/cli/bin/ng run app:ionic-cordova-serve --platform=android",
"prepare.android": "ionic cordova prepare --platform=android",
"build": "node --max-old-space-size=8192 ./node_modules/@angular/cli/bin/ng build",
"build.aot": "node --max-old-space-size=8192 ./node_modules/@angular/cli/bin/ng build --aot",
"build.prod": "node --max-old-space-size=8192 ./node_modules/@angular/cli/bin/ng build --prod --aot && npm run build.i18n",
"build.android": "ionic cordova build android",
"build.android.prod": "ionic cordova build android --prod --release",
"build.dev": "node --max-old-space-size=8192 ./node_modules/@angular/cli/bin/ng build --configuration=dev && lite-server --baseDir=\"www\"",
"build.i18n": "node scripts/build-i18n.js",
"test": "npm run ng test",
......@@ -69,16 +65,6 @@
"apollo-link-serialize": "^3.1.1",
"chart.js": "^2.9.4",
"clovelced-plugin-audiomanagement": "^1.0.2",
"cordova-android": "^8.1.0",
"cordova-plugin-advanced-http": "2.0.11",
"cordova-plugin-decimal-keyboard": "1.0.0",
"cordova-plugin-file": "^6.0.2",
"cordova-plugin-geolocation": "4.0.1",
"cordova-plugin-inappbrowser": "^3.1.0",
"cordova-plugin-nativeaudio": "^3.0.9",
"cordova-plugin-network-information": "^2.0.2",
"cordova-plugin-vibration": "^3.1.1",
"cordova-sqlite-storage": "^3.4.1",
"core-js": "^3.6.5",
"cors": "^2.8.5",
"ember-cli-roboto-fontface": "^2.0.5",
......@@ -87,7 +73,6 @@
"graphql-tag": "^2.11.0",
"hammerjs": "^2.0.8",
"hammer-timejs": "^1.1.0",
"integrator-cordova-plugin-downloader": "^1.1.0",
"ionic-cache": "^5.2.0",
"ionicons": "^5.1.2",
"leaflet": "^1.6.0",
......@@ -135,16 +120,7 @@
"@types/uuid": "^3.4.9",
"acorn": "^7.3.1",
"codelyzer": "^6.0.0",
"cordova": "^9.0.0",
"cordova-res": "^0.15.2",
"rxjs": "^6.6.3",
"cordova-plugin-camera": "^4.1.0",
"cordova-plugin-device": "^2.0.3",
"cordova-plugin-ionic-keyboard": "^2.2.0",
"cordova-plugin-ionic-webview": "^5.0.0",
"cordova-plugin-splashscreen": "^5.0.4",
"cordova-plugin-statusbar": "^2.4.3",
"cordova-plugin-whitelist": "^1.3.4",
"eslint": "^7.4.0",
"react": "^17.0.1",
"jasmine-core": "~3.6.0",
......@@ -162,40 +138,13 @@
"typescript": "~4.0.5",
"webpack": "^4.0.1"
},
"cordova": {
"plugins": {
"cordova-plugin-whitelist": {},
"cordova-plugin-statusbar": {},
"cordova-plugin-device": {},
"cordova-plugin-splashscreen": {},
"cordova-plugin-ionic-webview": {
"ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
},
"cordova-sqlite-storage": {},
"cordova-plugin-ionic-keyboard": {},
"cordova-plugin-decimal-keyboard": {},
"cordova-plugin-advanced-http": {},
"cordova-plugin-geolocation": {},
"cordova-plugin-camera": {
"ANDROID_SUPPORT_V4_VERSION": "27.+"
},
"cordova-plugin-network-information": {},
"cordova-plugin-nativeaudio": {},
"cordova-plugin-vibration": {},
"clovelced-plugin-audiomanagement": {},
"integrator-cordova-plugin-downloader": {}
},
"platforms": [
"android"
]
},
"repository": {
"type": "git",
"url": "https://github.com/sumaris-net/sumaris-app.git"
"url": "https://gitlab.ifremer.fr/quadrige/quadrige3-app.git"
},
"homepage": "https://github.com/sumaris-net/sumaris-app",
"homepage": "https://gitlab.ifremer.fr/quadrige/quadrige3-app",
"bugs": {
"url": "https://github.com/sumaris-net/sumaris-app/issues"
"url": "https://gitlab.ifremer.fr/quadrige/quadrige3-app/-/issues"
},
"engines": {
"node": ">= 10.20.0",
......
#!/bin/sh
PWD=`pwd`
CMD="sudo docker run -ti --rm -p 8100:8100 -p 35729:35729 -v $PWD:/sumaris-app:rw sumaris-app:release"
CMD="sudo docker run -ti --rm -p 8100:8100 -p 35729:35729 -v $PWD:/quadrige3-app:rw quadrige3-app:release"
echo "Executing: CMD"
$CMD
\ No newline at end of file
$CMD
......@@ -27,7 +27,7 @@ ANDROID_OUTPUT_APK_DEBUG=${ANDROID_OUTPUT_APK}/debug
ANDROID_OUTPUT_APK_RELEASE=${ANDROID_OUTPUT_APK}/release
ANDROID_OUTPUT_APK_PREFIX=app
PROJECT_NAME=sumaris-app
PROJECT_NAME=quadrige3-app
......
......@@ -22,8 +22,8 @@ if [[ $? -ne 0 ]]; then
fi
# Signature
KEYSTORE_FILE=${PROJECT_DIR}/.local/android/Sumaris.keystore
KEY_ALIAS=Sumaris
KEYSTORE_FILE=${PROJECT_DIR}/.local/android/quadrige3.keystore
KEY_ALIAS=quadrige3
KEY_PWD=
APK_DIR=${PROJECT_DIR}/platforms/android/app/build/outputs/apk/release
APK_UNSIGNED_FILE=${APK_DIR}/app-release.apk
......@@ -49,7 +49,7 @@ if [[ $? -ne 0 ]]; then
echo "Signing APK file ${APK_UNSIGNED_FILE}..."
APK_SIGNED_FILE=${APK_DIR}/app-release-signed.apk
jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ${KEYSTORE_FILE} ${APK_UNSIGNED_FILE} Sumaris
jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ${KEYSTORE_FILE} ${APK_UNSIGNED_FILE} quadrige3
BUILD_TOOLS_DIR="${ANDROID_SDK_ROOT}/build-tools/28.*/"
cd ${BUILD_TOOLS_DIR}
......
......@@ -31,9 +31,9 @@ fi
echo "Current version: $current"
### Get repo URL
PROJECT_NAME=sumaris-app
PROJECT_NAME=quadrige3-app
REMOTE_URL=`git remote -v | grep -P "push" | grep -oP "(https:\/\/github.com\/|git@github.com:)[^ ]+"`
REPO="sumaris-net/sumaris-app"
REPO="quadrige3-net/quadrige3-app"
REPO_API_URL=https://api.github.com/repos/$REPO
REPO_PUBLIC_URL=https://github.com/$REPO
......
......@@ -7,8 +7,8 @@ if [[ "_" == "_${PROJECT_DIR}" ]]; then
fi;
# Default env (can be override in file <PROJECT>/.local/env.sh)
KEYSTORE_FILE=${PROJECT_DIR}/.local/android/Sumaris.keystore
KEY_ALIAS=Sumaris
KEYSTORE_FILE=${PROJECT_DIR}/.local/android/quadrige3.keystore
KEY_ALIAS=quadrige3
KEYSTORE_PWD=
APK_RELEASE_DIR=${PROJECT_DIR}/platforms/android/app/build/outputs/apk/release
APK_UNSIGNED_FILE=${APK_RELEASE_DIR}/app-release-unsigned.apk
......@@ -41,7 +41,7 @@ if [[ -f "${APK_SIGNED_FILE}" ]]; then
fi
echo "Executing jarsigner..."
jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ${KEYSTORE_FILE} ${APK_UNSIGNED_FILE} Sumaris
jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ${KEYSTORE_FILE} ${APK_UNSIGNED_FILE} quadrige3
if [[ $? -ne 0 ]]; then
exit 1
fi
......
......@@ -23,7 +23,7 @@ export class PersonValidatorService implements ValidatorService {
// Use account validator as base form group definition
// BUT add more flexibility (e.g. 'pubkey' become optional)
// This is need to be able to store person that are not using SUMARiS tools (e.g. onboard obsevers)
// This is need to be able to store person that are not using Quadrige3Admin tools (e.g. onboard obsevers)
const formConfig = this.accountValidatorService.getFormGroupConfig(data && Account.fromObject(data.asObject));
formConfig.pubkey = [data && data.pubkey || null, SharedValidators.pubkey];
formConfig.avatar = [''];
......
......@@ -79,7 +79,7 @@ export class AppComponent {
this._document.getElementById('appTitle').textContent = title;
// Set document favicon
const favicon = config.properties && config.properties["sumaris.favicon"];
const favicon = config.properties && config.properties["quadrige3.favicon"];
if (isNotNil(favicon)) {
this._document.getElementById('appFavicon').setAttribute('href', favicon);
}
......@@ -87,13 +87,13 @@ export class AppComponent {
if (config.properties) {
this.updateTheme({
colors: {
primary: config.properties["sumaris.color.primary"],
secondary: config.properties["sumaris.color.secondary"],
tertiary: config.properties["sumaris.color.tertiary"],
success: config.properties["sumaris.color.success"],
warning: config.properties["sumaris.color.warning"],
accent: config.properties["sumaris.color.accent"],
danger: config.properties["sumaris.color.danger"]
primary: config.properties["quadrige3.color.primary"],
secondary: config.properties["quadrige3.color.secondary"],