Skip to content
Snippets Groups Projects
Commit 41297da0 authored by Timothee P's avatar Timothee P :sunflower:
Browse files

fix change with configuration vs .env

parent 954410f3
No related branches found
No related tags found
No related merge requests found
...@@ -6,8 +6,9 @@ ...@@ -6,8 +6,9 @@
<router-link to="/" class="header item"> <router-link to="/" class="header item">
<img <img
class="ui mini right spaced image" class="ui mini right spaced image"
:src="LOGO_PATH" src="@/assets/img/logo-neogeo-circle.png"
/> />
<!-- :src="LOGO_PATH" -->
{{ APPLICATION_NAME }} {{ APPLICATION_NAME }}
</router-link> </router-link>
...@@ -155,7 +156,7 @@ export default { ...@@ -155,7 +156,7 @@ export default {
computed: { computed: {
...mapState(["projects", "user", "SSO_SETTED", "USER_LEVEL_PROJECTS"]), ...mapState(["projects", "user", "SSO_SETTED", "USER_LEVEL_PROJECTS"]),
...mapGetters(["project"]), ...mapGetters(["project"]),
LOGO_PATH: () => require(configuration.VUE_APP_LOGO_PATH), //LOGO_PATH: () => require(`${configuration.VUE_APP_LOGO_PATH}`),
APPLICATION_NAME: () => configuration.VUE_APP_APPLICATION_NAME, APPLICATION_NAME: () => configuration.VUE_APP_APPLICATION_NAME,
PACKAGE_VERSION: () => process.env.PACKAGE_VERSION || "0", PACKAGE_VERSION: () => process.env.PACKAGE_VERSION || "0",
userFullname: function () { userFullname: function () {
...@@ -173,6 +174,7 @@ export default { ...@@ -173,6 +174,7 @@ export default {
}, },
}, },
created() { created() {
console.log(configuration)
window.addEventListener("mousedown", this.clickOutsideMenu); window.addEventListener("mousedown", this.clickOutsideMenu);
}, },
......
...@@ -6,7 +6,7 @@ var configuration = { ...@@ -6,7 +6,7 @@ var configuration = {
VUE_APP_APPLICATION_NAME:"GéoContrib", VUE_APP_APPLICATION_NAME:"GéoContrib",
VUE_APP_APPLICATION_ABSTRACT:"Application de saisie d'informations géographiques contributive", VUE_APP_APPLICATION_ABSTRACT:"Application de saisie d'informations géographiques contributive",
VUE_APP_LOGO_PATH:"@/assets/img/logo-neogeo-circle.png", VUE_APP_LOGO_PATH:"@/assets/img/logo-neogeo-circle.png",
VUE_APP_DJANGO_BASE:"http://localhost:8010/", VUE_APP_DJANGO_BASE:"http://localhost:8010",
VUE_APP_DJANGO_API_BASE:"http://localhost:8010/api/", VUE_APP_DJANGO_API_BASE:"http://localhost:8010/api/",
DEFAULT_BASE_MAP:{ DEFAULT_BASE_MAP:{
'SERVICE': 'https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png', 'SERVICE': 'https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png',
......
<template> <template>
<div class="fourteen wide column"> <div class="fourteen wide column">
<img class="ui centered small image" :src="LOGO_PATH" /> <img
class="ui centered small image"
src="@/assets/img/logo-neogeo-circle.png"
/>
<!-- :src="LOGO_PATH" -->
<h2 class="ui center aligned icon header"> <h2 class="ui center aligned icon header">
<div class="content"> <div class="content">
{{ APPLICATION_NAME }} {{ APPLICATION_NAME }}
...@@ -109,14 +113,15 @@ export default { ...@@ -109,14 +113,15 @@ export default {
name: "Index", name: "Index",
computed: { computed: {
...mapState(["projects", "user", "USER_LEVEL_PROJECTS"]), ...mapState(["projects", "user", "USER_LEVEL_PROJECTS"]),
LOGO_PATH: () => require(configuration.VUE_APP_LOGO_PATH), //LOGO_PATH: () => require(configuration.VUE_APP_LOGO_PATH),
APPLICATION_NAME: () => configuration.VUE_APP_APPLICATION_NAME, APPLICATION_NAME: () => configuration.VUE_APP_APPLICATION_NAME,
APPLICATION_ABSTRACT: () => configuration.VUE_APP_APPLICATION_ABSTRACT, APPLICATION_ABSTRACT: () => configuration.VUE_APP_APPLICATION_ABSTRACT,
DJANGO_BASE_URL: () => configuration.VUE_APP_DJANGO_BASE, DJANGO_BASE_URL: () => configuration.VUE_APP_DJANGO_BASE,
}, },
methods: { methods: {
refreshId() { //* change path of thumbnail to update image refreshId() {
//* change path of thumbnail to update image
return "?ver=" + Math.random(); return "?ver=" + Math.random();
}, },
}, },
......
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