diff --git a/nginx.conf b/nginx.conf index b1a4d31d8d61c35ab78d0b999c673d28a23b5a2d..3ea3849f16c06b3f6da02bfaff5147374320b925 100644 --- a/nginx.conf +++ b/nginx.conf @@ -27,6 +27,18 @@ server { proxy_pass http://geocontrib_site; } + location /geocontrib/cas { + proxy_pass_header Set-Cookie; + proxy_set_header X-NginX-Proxy true; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + proxy_read_timeout 300s; + proxy_redirect off; + + proxy_pass http://geocontrib_site; + } + location /geocontrib/admin { proxy_pass_header Set-Cookie; proxy_set_header X-NginX-Proxy true; diff --git a/src/assets/js/map-util.js b/src/assets/js/map-util.js index 1450f3c042e17a420ba85f923b5601cc91102c9f..2552bfeb211dc6b03245b4ddd4feb70ab05d6ecb 100644 --- a/src/assets/js/map-util.js +++ b/src/assets/js/map-util.js @@ -319,9 +319,15 @@ const mapUtil = { customFieldOption = properties[customField[0]]; } - let defaultStyle; - let hiddenStyle; + const hiddenStyle = ({ + radius: 0, + fillOpacity: 0.5, + weight: 0, + fill: false, + color: featureType.color, + }); + let defaultStyle; if ( featureType.colors_style.value.icons[customFieldOption] && featureType.colors_style.value.icons[customFieldOption] !== 'circle' @@ -342,10 +348,6 @@ const mapUtil = { icon: customMapIcon }; - hiddenStyle = ({ - icon: customMapIcon - }); - } else { defaultStyle = { @@ -355,15 +357,7 @@ const mapUtil = { fill: true, color: color, }; - - hiddenStyle = ({ - radius: 0, - fillOpacity: 0.5, - weight: 0, - fill: false, - color: featureType.color, - }); - + } // Filtre sur le feature type diff --git a/src/service-worker.js b/src/service-worker.js index 2b50cf5562db86e66812a56a741b734c3d5a1a26..bf980d0aee13e32a41b314e2990fee555ff50211 100644 --- a/src/service-worker.js +++ b/src/service-worker.js @@ -11,12 +11,12 @@ if (workbox) { //workbox.core.skipWaiting(); - // Make sure to return a specific response for all navigation requests. - // Since we have a SPA here, this should be index.html always. - // https://stackoverflow.com/questions/49963982/vue-router-history-mode-with-pwa-in-offline-mode - workbox.routing.registerNavigationRoute('/geocontrib/index.html', { - blacklist: [/\/api/,/\/admin/,/\/media/], - }); + // Make sure to return a specific response for all navigation requests. + // Since we have a SPA here, this should be index.html always. + // https://stackoverflow.com/questions/49963982/vue-router-history-mode-with-pwa-in-offline-mode + workbox.routing.registerNavigationRoute('/geocontrib/index.html', { + blacklist: [/\/api/,/\/admin/,/\/media/,/\/cas/], + }) workbox.routing.registerRoute( new RegExp('.*/config/config.json'),