Skip to content
Snippets Groups Projects
Commit 6be4fb91 authored by m431m's avatar m431m :speech_balloon:
Browse files

Resolves some issues:


* REDMINE_ISSUE-11808
* REDMINE_ISSUE-11965

Co-authored-by: default avatarFlorent <florent@Air-de-neogeo.neogeo.local>

Squashed commit of the following:

commit a254ac60
Merge: 3961a959 df594db6
Author: m431m <mmeliani@neogeo.fr>
Date:   Tue Oct 12 06:10:54 2021 +0000

    Merge branch 'redmine-issues/11808' into 'develop'

    REDMINE_ISSUE-11808 | Add Favicon PIGMA

    See merge request onegeo-suite/sites/onegeo-suite-site-login-vuejs!5

commit 3961a959
Merge: dcb6553f b7bb8684
Author: m431m <mmeliani@neogeo.fr>
Date:   Tue Oct 12 06:09:46 2021 +0000

    Merge branch 'redmine-issues/11965' into 'develop'

    REDMINE_ISSUE-11965 | Fix packages.json

    See merge request onegeo-suite/sites/onegeo-suite-site-login-vuejs!7

commit b7bb8684
Author: Florent <florent@Air-de-neogeo.neogeo.local>
Date:   Thu Oct 7 11:03:19 2021 +0200

    allow packages up to minor version

commit df594db6
Author: Florent <florent@Air-de-neogeo.neogeo.local>
Date:   Thu Oct 7 10:17:54 2021 +0200

    add favicon
parent dcb6553f
No related branches found
No related tags found
No related merge requests found
Pipeline #4213 passed
......@@ -41,6 +41,7 @@ build_development:
BASE_PATH=/\n
VUE_APP_NEXT_DEFAULT=/\n
VUE_APP_BASE_PATH=${BASE_PATH}\n
VUE_APP_FAVICON_URL=${VUE_APP_DOMAIN}/assets/favicon.png\n
VUE_APP_LOGIN_API_PATH=/fr/login/\n
VUE_APP_ORGANISATION_API_PATH=/fr/organisation/\n
VUE_APP_USERGROUP_API_PATH=/fr/usergroup/\n
......
......@@ -20,6 +20,9 @@ VUE_APP_NEXT_DEFAULT=/
VUE_APP_BASE_PATH=${BASE_PATH}
# Favicon
VUE_APP_FAVICON_URL=${VUE_APP_DOMAIN}/assets/favicon.png
# API
VUE_APP_LOGIN_API_PATH=/fr/login
VUE_APP_ORGANISATION_API_PATH=/fr/organisation/
......@@ -27,7 +30,7 @@ VUE_APP_USERGROUP_API_PATH=/fr/usergroup/
# AUTH
VUE_APP_LOGIN_API_USERNAME=admin
VUE_APP_LOGIN_API_PASSWORD=Neogeo2020
VUE_APP_LOGIN_API_PASSWORD=CHANGE_ME
```
### Compiles and hot-reloads for development
......
......@@ -11,18 +11,18 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"axios": "^0.21.1",
"axios": "~0.21.1",
"bootstrap-vue": "^2.21.2",
"core-js": "^3.6.5",
"corejs-typeahead": "^1.3.1",
"lodash": "^4.17.21",
"sweetalert2": "^11.0.18",
"vee-validate": "^3.4.9",
"vue": "^2.6.11",
"vue-multiselect": "^2.1.6",
"vue": "~2.6.11",
"vue-multiselect": "~2.1.6",
"vue-recaptcha": "^1.3.0",
"vue-router": "^3.2.0",
"vuex": "^3.4.0"
"vue-router": "~3.2.0",
"vuex": "~3.4.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "~4.5.0",
......
......@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<link rel="icon" href="<%= VUE_APP_FAVICON_URL %>">
<link rel="stylesheet" href="https://unpkg.com/vue-multiselect@2.1.0/dist/vue-multiselect.min.css">
<title><%= htmlWebpackPlugin.options.title %></title>
</head>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment