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
e82983e8
Commit
e82983e8
authored
3 years ago
by
Sébastien DA ROCHA
Browse files
Options
Downloads
Plain Diff
Merge branch 'redmine-issues/11982' into 'develop'
REDMINE_ISSUE-11982
See merge request
!91
parents
ec13bea9
87cdc7af
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
public/config/config.json
+1
-1
1 addition, 1 deletion
public/config/config.json
src/main.js
+20
-19
20 additions, 19 deletions
src/main.js
src/router/index.js
+1
-1
1 addition, 1 deletion
src/router/index.js
vue.config.js
+11
-10
11 additions, 10 deletions
vue.config.js
with
33 additions
and
31 deletions
public/config/config.json
+
1
−
1
View file @
e82983e8
{
"BASE_URL"
:
"/"
,
"BASE_URL"
:
"/
geocontrib/
"
,
"DOMAIN"
:
"http://localhost:8010/"
,
"NODE_ENV"
:
"development"
,
"VUE_APP_LOCALE"
:
"fr-FR"
,
...
...
This diff is collapsed.
Click to expand it.
src/main.js
+
20
−
19
View file @
e82983e8
...
...
@@ -14,25 +14,26 @@ Vue.config.productionTip = false
axios
.
get
(
"
/config/config.json
"
)
.
then
((
response
)
=>
{
if
(
response
&&
response
.
status
===
200
)
{
store
.
commit
(
"
SET_CONFIG
"
,
response
.
data
);
window
.
proxy_url
=
response
.
data
.
VUE_APP_DJANGO_API_BASE
+
"
proxy/
"
axios
.
all
([
store
.
dispatch
(
"
USER_INFO
"
),
store
.
dispatch
(
"
GET_ALL_PROJECTS
"
),
store
.
dispatch
(
"
GET_STATIC_PAGES
"
),
store
.
dispatch
(
"
GET_USER_LEVEL_PROJECTS
"
),
store
.
dispatch
(
"
map/GET_AVAILABLE_LAYERS
"
),
store
.
dispatch
(
"
GET_USER_LEVEL_PERMISSIONS
"
),
]).
then
(
axios
.
spread
(
function
()
{
new
Vue
({
router
,
store
,
render
:
h
=>
h
(
App
)
}).
$mount
(
'
#app
'
)
}))
}
})
.
catch
((
error
)
=>
{
throw
error
;
store
.
commit
(
"
SET_CONFIG
"
,
response
.
data
);
window
.
proxy_url
=
response
.
data
.
VUE_APP_DJANGO_API_BASE
+
"
proxy/
"
axios
.
all
([
store
.
dispatch
(
"
USER_INFO
"
),
store
.
dispatch
(
"
GET_ALL_PROJECTS
"
),
store
.
dispatch
(
"
GET_STATIC_PAGES
"
),
store
.
dispatch
(
"
GET_USER_LEVEL_PROJECTS
"
),
store
.
dispatch
(
"
map/GET_AVAILABLE_LAYERS
"
),
store
.
dispatch
(
"
GET_USER_LEVEL_PERMISSIONS
"
),
]).
then
(
axios
.
spread
(
function
()
{
new
Vue
({
router
,
store
,
render
:
h
=>
h
(
App
)
}).
$mount
(
'
#app
'
)
}))
}
})
.
catch
((
error
)
=>
{
throw
error
;
});
...
...
This diff is collapsed.
Click to expand it.
src/router/index.js
+
1
−
1
View file @
e82983e8
...
...
@@ -120,7 +120,7 @@ const routes = [
const
router
=
new
VueRouter
({
mode
:
'
history
'
,
base
:
process
.
env
.
BASE_URL
,
base
:
'
/geocontrib/
'
,
routes
,
routerHistory
:
[],
scrollBehavior
(
to
,
from
,
savedPosition
)
{
//* record each route change to turn back to origin after redirect
...
...
This diff is collapsed.
Click to expand it.
vue.config.js
+
11
−
10
View file @
e82983e8
...
...
@@ -3,14 +3,15 @@ const fs = require('fs')
const
packageJson
=
fs
.
readFileSync
(
'
./package.json
'
)
const
version
=
JSON
.
parse
(
packageJson
).
version
||
0
module
.
exports
=
{
configureWebpack
:
{
plugins
:
[
new
webpack
.
DefinePlugin
({
'
process.env
'
:
{
PACKAGE_VERSION
:
'
"
'
+
version
+
'
"
'
}
})
]
},
// the rest of your original module.exports code goes here
publicPath
:
'
/geocontrib/
'
,
configureWebpack
:
{
plugins
:
[
new
webpack
.
DefinePlugin
({
'
process.env
'
:
{
PACKAGE_VERSION
:
'
"
'
+
version
+
'
"
'
}
})
]
},
// the rest of your original module.exports code goes here
}
\ No newline at end of file
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