From 41297da0e4729d36c3c034deeb81750d8147db84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Poussard?= <tpoussard@neogeo.fr>
Date: Wed, 15 Sep 2021 10:10:42 +0200
Subject: [PATCH] fix change with configuration vs .env
---
src/App.vue | 6 ++++--
src/assets/config/config.js | 2 +-
src/views/Index.vue | 11 ++++++++---
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index c007b625..e43cc4f8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,8 +6,9 @@
<router-link to="/" class="header item">
<img
class="ui mini right spaced image"
- :src="LOGO_PATH"
+ src="@/assets/img/logo-neogeo-circle.png"
/>
+ <!-- :src="LOGO_PATH" -->
{{ APPLICATION_NAME }}
</router-link>
@@ -155,7 +156,7 @@ export default {
computed: {
...mapState(["projects", "user", "SSO_SETTED", "USER_LEVEL_PROJECTS"]),
...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,
PACKAGE_VERSION: () => process.env.PACKAGE_VERSION || "0",
userFullname: function () {
@@ -173,6 +174,7 @@ export default {
},
},
created() {
+ console.log(configuration)
window.addEventListener("mousedown", this.clickOutsideMenu);
},
diff --git a/src/assets/config/config.js b/src/assets/config/config.js
index 9bf83459..0dbe4059 100644
--- a/src/assets/config/config.js
+++ b/src/assets/config/config.js
@@ -6,7 +6,7 @@ var configuration = {
VUE_APP_APPLICATION_NAME:"GéoContrib",
VUE_APP_APPLICATION_ABSTRACT:"Application de saisie d'informations géographiques contributive",
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/",
DEFAULT_BASE_MAP:{
'SERVICE': 'https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png',
diff --git a/src/views/Index.vue b/src/views/Index.vue
index 7facb78f..8071b88a 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -1,6 +1,10 @@
<template>
<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">
<div class="content">
{{ APPLICATION_NAME }}
@@ -109,14 +113,15 @@ export default {
name: "Index",
computed: {
...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_ABSTRACT: () => configuration.VUE_APP_APPLICATION_ABSTRACT,
DJANGO_BASE_URL: () => configuration.VUE_APP_DJANGO_BASE,
},
methods: {
- refreshId() { //* change path of thumbnail to update image
+ refreshId() {
+ //* change path of thumbnail to update image
return "?ver=" + Math.random();
},
},
--
GitLab