Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Géocontrib Frontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
externe Matthieu
Géocontrib Frontend
Commits
5c749971
Commit
5c749971
authored
3 years ago
by
Timothee P
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' into redmine-issues/12721
parents
287cb0cf
f5882f47
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
nginx.conf
+12
-0
12 additions, 0 deletions
nginx.conf
src/assets/js/map-util.js
+9
-15
9 additions, 15 deletions
src/assets/js/map-util.js
src/service-worker.js
+6
-6
6 additions, 6 deletions
src/service-worker.js
with
27 additions
and
21 deletions
nginx.conf
+
12
−
0
View file @
5c749971
...
@@ -27,6 +27,18 @@ server {
...
@@ -27,6 +27,18 @@ server {
proxy_pass
http://geocontrib_site
;
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
{
location
/geocontrib/admin
{
proxy_pass_header
Set-Cookie
;
proxy_pass_header
Set-Cookie
;
proxy_set_header
X-NginX-Proxy
true
;
proxy_set_header
X-NginX-Proxy
true
;
...
...
This diff is collapsed.
Click to expand it.
src/assets/js/map-util.js
+
9
−
15
View file @
5c749971
...
@@ -319,9 +319,15 @@ const mapUtil = {
...
@@ -319,9 +319,15 @@ const mapUtil = {
customFieldOption
=
properties
[
customField
[
0
]];
customFieldOption
=
properties
[
customField
[
0
]];
}
}
let
defaultStyle
;
const
hiddenStyle
=
({
let
hiddenStyle
;
radius
:
0
,
fillOpacity
:
0.5
,
weight
:
0
,
fill
:
false
,
color
:
featureType
.
color
,
});
let
defaultStyle
;
if
(
if
(
featureType
.
colors_style
.
value
.
icons
[
customFieldOption
]
&&
featureType
.
colors_style
.
value
.
icons
[
customFieldOption
]
&&
featureType
.
colors_style
.
value
.
icons
[
customFieldOption
]
!==
'
circle
'
featureType
.
colors_style
.
value
.
icons
[
customFieldOption
]
!==
'
circle
'
...
@@ -342,10 +348,6 @@ const mapUtil = {
...
@@ -342,10 +348,6 @@ const mapUtil = {
icon
:
customMapIcon
icon
:
customMapIcon
};
};
hiddenStyle
=
({
icon
:
customMapIcon
});
}
else
{
}
else
{
defaultStyle
=
{
defaultStyle
=
{
...
@@ -355,15 +357,7 @@ const mapUtil = {
...
@@ -355,15 +357,7 @@ const mapUtil = {
fill
:
true
,
fill
:
true
,
color
:
color
,
color
:
color
,
};
};
hiddenStyle
=
({
radius
:
0
,
fillOpacity
:
0.5
,
weight
:
0
,
fill
:
false
,
color
:
featureType
.
color
,
});
}
}
// Filtre sur le feature type
// Filtre sur le feature type
...
...
This diff is collapsed.
Click to expand it.
src/service-worker.js
+
6
−
6
View file @
5c749971
...
@@ -11,12 +11,12 @@ if (workbox) {
...
@@ -11,12 +11,12 @@ if (workbox) {
//workbox.core.skipWaiting();
//workbox.core.skipWaiting();
// Make sure to return a specific response for all navigation requests.
// Make sure to return a specific response for all navigation requests.
// Since we have a SPA here, this should be index.html always.
// 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
// https://stackoverflow.com/questions/49963982/vue-router-history-mode-with-pwa-in-offline-mode
workbox
.
routing
.
registerNavigationRoute
(
'
/geocontrib/index.html
'
,
{
workbox
.
routing
.
registerNavigationRoute
(
'
/geocontrib/index.html
'
,
{
blacklist
:
[
/
\/
api/
,
/
\/
admin/
,
/
\/
media/
],
blacklist
:
[
/
\/
api/
,
/
\/
admin/
,
/
\/
media/
,
/
\/
cas/
],
})
;
})
workbox
.
routing
.
registerRoute
(
workbox
.
routing
.
registerRoute
(
new
RegExp
(
'
.*/config/config.json
'
),
new
RegExp
(
'
.*/config/config.json
'
),
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment