diff --git a/_install/dependencies.json b/_install/dependencies.json index ebe42b35a7b15ea00b6db5b5651d4cac7aa1d164..fc5db917bb86b7ca0a02ba33e7fc95b9a17525de 100644 --- a/_install/dependencies.json +++ b/_install/dependencies.json @@ -5,7 +5,7 @@ "APP_ENV": "prod", "HTTPSERVER_CONF_FILE": "vm_app_vmap.conf", "HTTPSERVER_PATH": "/etc/apache2", - "HOSTNAME" : "", + "HOSTNAME": "", "INSTALL_PATH": "/var/www/vmap", "INSTALL_TYPE": "full", "PLATFORM": "Linux", @@ -14,8 +14,8 @@ "POSTGRES_PASSWORD": "dbpasswd", "POSTGRES_PORT": 5432, "POSTGRES_USER": "dbuser", - "SQL_DATA" : { - "SRID" : 2154 + "SQL_DATA": { + "SRID": 2154 }, "application": { "default_description": "# Bienvenue dans vMap ! \n\nPlus d'information sur [http:\/\/www.veremes.com](http:\/\/www.veremes.com)", @@ -57,4 +57,4 @@ "url": "git@gitlab.veremes.net:Development/vitis-2020/sources/module-cadastre-2020.git" }] } -} +} \ No newline at end of file diff --git a/conf/app.struct.ts b/conf/app.struct.ts index 2ccb65155b4c2744c17f33064d3f298f318021f4..764d3dddaae391809c809cb3ca36feb96c6a4ae9 100755 --- a/conf/app.struct.ts +++ b/conf/app.struct.ts @@ -55,16 +55,16 @@ export const appStruct: AppConfig = { 'label': 'TITLE_SEPARATOR_MAP', 'privilege': 'vmap_user' }, - vmapAdminCartoObject, + vmapAdminCartoObject, { 'type': 'separator', 'label': 'TITLE_MODE_VMAP_ADMIN', 'privilege': 'vmap_admin' }, - vmapAdminDatasourceObject, - vmapMapsLayersMode, - vmapSymbolsFontsMode, - vmapFluxMode, + vmapAdminDatasourceObject, + vmapMapsLayersMode, + vmapSymbolsFontsMode, + vmapFluxMode, { 'type': 'separator', 'label': 'Administration des impressions', @@ -77,8 +77,8 @@ export const appStruct: AppConfig = { 'label': 'TITLE_MODE_VMAP_ADMINISTRATION', 'privilege': 'vitis_admin' }, - vitisUsersMode, - vitisConfigSharedDirObject, + vitisUsersMode, + vitisConfigSharedDirObject, { 'name': 'vitis_config', 'label': 'TITLE_MODE_CONFIGURATION', @@ -141,4 +141,4 @@ export const appStruct: AppConfig = { 'contact': 'www.veremes.com', 'licence': '© Veremes' } -}; \ No newline at end of file +}; diff --git a/conf/modules-components.ts b/conf/modules-components.ts index 5e927908ed2e8e562cc5480b1e93f6a0ebbf97cf..8e35c7e3f6ed42ddc798f145b1eccdfd81fd6911 100644 --- a/conf/modules-components.ts +++ b/conf/modules-components.ts @@ -13,24 +13,20 @@ * * * Exemple : import des composants GTF - * + * * import { * oModules as oGTFModules, * oModulesComponents as oGTFModulesComponents, - * oWkListComponents as oGTFWkListComponents * } from './gtf/gtf.exports'; - * + * * export const oModules = { ...oGTFModules }; * export const oModulesComponents = { ...oGTFModulesComponents }; - * export const oWkListComponents = { ...oGTFWkListComponents }; */ import { oVmapModules, oVmapModulesComponents, - oVmapWkListComponents } from './vmap/vmap.exports'; export const oModules = { ...oVmapModules }; export const oModulesComponents = { ...oVmapModulesComponents }; -export const oWkListComponents = { ...oVmapWkListComponents }; \ No newline at end of file diff --git a/conf/style.scss b/conf/style.scss index aaf756be58c237e942ea7e8c1ca982a444b37c49..481f06c1b20610300c4290b63e0f464df37bf254 100644 --- a/conf/style.scss +++ b/conf/style.scss @@ -13,16 +13,16 @@ @import 'src/modules/vmap/styles/vmap.scss'; // Icones Font Awesome -$icomoon-font-path: "src/assets/icons/font-awesome/fonts"; +$icomoon-font-path: "~src/assets/icons/font-awesome/fonts"; $icomoon-font-family: "font-awesome"; @import 'src/assets/icons/font-awesome/style.scss'; // Icones Vitis -$icomoon-font-path: "src/assets/icons/vitis/fonts"; +$icomoon-font-path: "~src/assets/icons/vitis/fonts"; $icomoon-font-family: "vitis"; @import 'src/assets/icons/vitis/style.scss'; // Icones Vmap -$icomoon-font-path: "src/modules/vmap/icons/vmap/fonts"; +$icomoon-font-path: "~src/modules/vmap/icons/vmap/fonts"; $icomoon-font-family: "vmap"; @import 'src/modules/vmap/icons/vmap/style.scss'; \ No newline at end of file