Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
canap
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository 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
SI-FSD
canap
Commits
f478e053
Commit
f478e053
authored
1 year ago
by
Leonardo Alain Surdez
Browse files
Options
Downloads
Plain Diff
Merge branch 'migration/gest' into 'master'
Migration gest See merge request
!7
parents
229c75f8
3ff1d3c0
No related branches found
No related tags found
1 merge request
!7
Migration gest
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Gestion/src/config/index.js
+2
-8
2 additions, 8 deletions
Gestion/src/config/index.js
Gestion/vue.config.js
+5
-15
5 additions, 15 deletions
Gestion/vue.config.js
with
7 additions
and
23 deletions
Gestion/src/config/index.js
+
2
−
8
View file @
f478e053
'
use strict
'
'
use strict
'
// https://stackoverflow.com/questions/44750008/vuejs-configuration-using-a-global-variable
module
.
exports
=
{
module
.
exports
=
{
'
API_LOCATION
'
:
process
.
env
.
NODE_ENV
===
'
production
'
'
API_LOCATION
'
:
"
/api
"
,
?
'
https://canap-gest.epfl.ch/api
'
'
LOGIN_REDIRECT
'
:
"
/api/auth/login
"
:
'
http://localhost:8181/api
'
,
'
LOGIN_REDIRECT
'
:
process
.
env
.
NODE_ENV
===
'
production
'
?
'
https://canap-gest.epfl.ch/api/auth/login
'
:
'
http://localhost:8181/api/auth/login
'
,
}
}
This diff is collapsed.
Click to expand it.
Gestion/vue.config.js
+
5
−
15
View file @
f478e053
module
.
exports
=
{
module
.
exports
=
{
devServer
:
{
devServer
:
{
host
:
'
localhost
'
,
port
:
8080
,
port
:
8080
,
https
:
false
https
:
false
,
//host: 'canap-gest-dev.local',
disableHostCheck
:
true
,
//port: 8080,
},
//https: true
publicPath
:
"
/gest
"
}
}
}
\ No newline at end of file
// module.exports = {
// devServer: {
// host: 'canap-gest-dev.local',
// port: 8080,
// https: true
// }
// }
\ 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