Add colors from api

GeotrekCE · Jul 23, 2020 · 0dca2cb · 0dca2cb
1 parent 4cef2ff
commit 0dca2cb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/docs/settings-custom-json-all-options.md b/docs/settings-custom-json-all-options.md
@@ -224,6 +224,7 @@ WARNING_SUBMIT_URL | "reports/report" | Warning submit URL
 STYLES_CONFIG_FILE | "styles.json" | Custom styles variables
 APPROVED_BIG | "images/approved-big.png" | Default big image for approved label (for detail page)
 APPROVED_SMALL | "images/approved-small.png" | Default small image for approved label (for results page)
+PARAMETERS_FILE | "parameters.json" | Parameters rando
 
 ## Filters
 

diff --git a/src/app/categories/styles/_liste.scss b/src/app/categories/styles/_liste.scss
@@ -209,7 +209,6 @@
                 line-height: 38px;
             }
             border-radius: 50%;
-            background-color: $default-category-color;
             position: relative;
 
             img, svg {
@@ -262,7 +261,6 @@
         margin: 0;
         padding: 0;
         width: 40px;
-        background-color: $default-category-color;
         @media (max-width: 540px) {
             width: 30px;
         }

diff --git a/src/app/config/factories.js b/src/app/config/factories.js
@@ -26,8 +26,8 @@ function settingsFactory(globalSettings) {
         infrastructuresUrl = globalSettings.API_URL + '/' + globalSettings.API_DIR + '/$lang/' + globalSettings.INFRASTRUCTURES_FILE,
         signagesUrl = globalSettings.API_URL + '/' + globalSettings.API_DIR + '/$lang/' + globalSettings.SIGNAGES_FILE,
         trekSensitiveUrl = globalSettings.API_URL + '/' + globalSettings.API_DIR + '/$lang/treks/',
-        diveSensitiveUrl = globalSettings.API_URL + '/' + globalSettings.API_DIR + '/$lang/dives/';
-
+        diveSensitiveUrl = globalSettings.API_URL + '/' + globalSettings.API_DIR + '/$lang/dives/',
+        parametersURL = globalSettings.API_URL + '/' + globalSettings.API_DIR + '/' + 'parameters.json';
 
     //PUBLIC METHODS
     //
@@ -63,6 +63,7 @@ function settingsFactory(globalSettings) {
         signagesUrl: signagesUrl,
         trekSensitiveUrl: trekSensitiveUrl,
         diveSensitiveUrl: diveSensitiveUrl,
+        parametersURL: parametersURL,
 
         //METHODS
         setLang: setLang,

diff --git a/src/app/config/services.js b/src/app/config/services.js
@@ -1,11 +1,10 @@
 'use strict';
 
-function stylesConfigService($http, $filter, settingsFactory, translationService) {
+function stylesConfigService($http, $filter, settingsFactory, translationService, globalSettings) {
 
     // Variable to test if Json file is available - for development
     // Set to false if API dosn't send this file.
-    this.isConfigAvailable = false;
-
+    this.isConfigAvailable = globalSettings.USE_CATEGORIES_COLORS_API;
     var defaultConfig = {
         "colors": {
             "main": "#f39400",
@@ -28,11 +27,11 @@ function stylesConfigService($http, $filter, settingsFactory, translationService
 
     this.getCustomConfig = function getCustomConfig() {
         var currentLang = translationService.getCurrentLang(),
-            url = settingsFactory.stylesConfigUrl.replace(/\$lang/, currentLang);
+            url = settingsFactory.parametersURL;
 
         return $http({url: url})
             .then(function (response) {
-                return response.data;
+                return angular.fromJson(response.data);
             }, function() {
                 return defaultConfig;
             });

diff --git a/src/app/config/settings.default.json b/src/app/config/settings.default.json
@@ -172,5 +172,6 @@
         { "id": 40, "label": "40m"},
         { "id": 999, "label": ">40m"}
     ],
-    "ASIDE_PANEL_FOLDED_BY_DEFAULT": false
+    "ASIDE_PANEL_FOLDED_BY_DEFAULT": false,
+    "USE_CATEGORIES_COLORS_API": false
 }