diff --git a/public/config/config.json b/public/config/config.json
index 859464c3401983ee073000a70601cb67c0223024..65038a32551262edcccf998e4c66e7707f44de04 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -5,7 +5,7 @@
"VUE_APP_LOCALE":"fr-FR",
"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_LOGO_PATH":"/geocontrib/img/logo-neogeo-circle.png",
"VUE_APP_DJANGO_BASE":"http://localhost:8010",
"VUE_APP_DJANGO_API_BASE":"http://localhost:8010/api/",
"DEFAULT_BASE_MAP":{
diff --git a/public/img/icons/android-chrome-192x192.png b/public/img/icons/android-chrome-192x192.png
index b02aa64d97167ad649e496908b35f14c603d9249..6cdb47eaf1fe19d451367d181cc4f817e65a655e 100644
Binary files a/public/img/icons/android-chrome-192x192.png and b/public/img/icons/android-chrome-192x192.png differ
diff --git a/public/img/icons/android-chrome-512x512.png b/public/img/icons/android-chrome-512x512.png
index 06088b011eccebb820b6e8de0cd244aa443208ba..226124806a29ad052689654f7e8fb70af5c72f9b 100644
Binary files a/public/img/icons/android-chrome-512x512.png and b/public/img/icons/android-chrome-512x512.png differ
diff --git a/public/img/icons/android-chrome-maskable-192x192.png b/public/img/icons/android-chrome-maskable-192x192.png
deleted file mode 100644
index 791e9c8c2c69ddb7be30cef2517dd6050b079cf0..0000000000000000000000000000000000000000
Binary files a/public/img/icons/android-chrome-maskable-192x192.png and /dev/null differ
diff --git a/public/img/icons/android-chrome-maskable-512x512.png b/public/img/icons/android-chrome-maskable-512x512.png
deleted file mode 100644
index 5f2098ed27e2f2878de62894b6c3bc31d07c585f..0000000000000000000000000000000000000000
Binary files a/public/img/icons/android-chrome-maskable-512x512.png and /dev/null differ
diff --git a/public/img/icons/apple-touch-icon-120x120.png b/public/img/icons/apple-touch-icon-120x120.png
deleted file mode 100644
index 1427cf62752646ad7217df0a61aa01fdef7475d1..0000000000000000000000000000000000000000
Binary files a/public/img/icons/apple-touch-icon-120x120.png and /dev/null differ
diff --git a/public/img/icons/apple-touch-icon-152x152.png b/public/img/icons/apple-touch-icon-152x152.png
deleted file mode 100644
index f24d454a2ecb8851bb893192b64ee09386d30e24..0000000000000000000000000000000000000000
Binary files a/public/img/icons/apple-touch-icon-152x152.png and /dev/null differ
diff --git a/public/img/icons/apple-touch-icon-180x180.png b/public/img/icons/apple-touch-icon-180x180.png
deleted file mode 100644
index 404e192a95ccccbede087203c42b1f25f6bc6e67..0000000000000000000000000000000000000000
Binary files a/public/img/icons/apple-touch-icon-180x180.png and /dev/null differ
diff --git a/public/img/icons/apple-touch-icon-60x60.png b/public/img/icons/apple-touch-icon-60x60.png
deleted file mode 100644
index cf10a5602e653bb126332934e2b7f34081c19a01..0000000000000000000000000000000000000000
Binary files a/public/img/icons/apple-touch-icon-60x60.png and /dev/null differ
diff --git a/public/img/icons/apple-touch-icon-76x76.png b/public/img/icons/apple-touch-icon-76x76.png
deleted file mode 100644
index c500769e3df9d6a6f1977ace8be4e63a8095e36a..0000000000000000000000000000000000000000
Binary files a/public/img/icons/apple-touch-icon-76x76.png and /dev/null differ
diff --git a/public/img/icons/apple-touch-icon.png b/public/img/icons/apple-touch-icon.png
index 03c0c5d5ec302ed7b0ee2c401df9427fb9d3c117..5ffc54a4f8b1f2a0b716fb4f5dc0cb045aa28b12 100644
Binary files a/public/img/icons/apple-touch-icon.png and b/public/img/icons/apple-touch-icon.png differ
diff --git a/public/img/icons/favicon-16x16.png b/public/img/icons/favicon-16x16.png
index 42af00963d81b8e39a30435c60ac482d1f8756e0..dfaab576ca4b539b968467eecdec33567bb0bafc 100644
Binary files a/public/img/icons/favicon-16x16.png and b/public/img/icons/favicon-16x16.png differ
diff --git a/public/img/icons/favicon-32x32.png b/public/img/icons/favicon-32x32.png
index 46ca04dee251a4fa85a2891a145fbe20cc619d96..c7dca04bdb68a81e35dd3d383097cc07a7f08604 100644
Binary files a/public/img/icons/favicon-32x32.png and b/public/img/icons/favicon-32x32.png differ
diff --git a/public/img/icons/favicon.ico b/public/img/icons/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..05ea7edf1b8b946f3407db8b22353d908f31fd2d
Binary files /dev/null and b/public/img/icons/favicon.ico differ
diff --git a/public/img/icons/msapplication-icon-144x144.png b/public/img/icons/msapplication-icon-144x144.png
deleted file mode 100644
index 7808237a18d4009501f950044f8388d13c5e1044..0000000000000000000000000000000000000000
Binary files a/public/img/icons/msapplication-icon-144x144.png and /dev/null differ
diff --git a/public/img/icons/mstile-150x150.png b/public/img/icons/mstile-150x150.png
deleted file mode 100644
index 3b37a43ae2fdef53050291d95da2e49f78cf398e..0000000000000000000000000000000000000000
Binary files a/public/img/icons/mstile-150x150.png and /dev/null differ
diff --git a/public/img/icons/safari-pinned-tab.svg b/public/img/icons/safari-pinned-tab.svg
deleted file mode 100644
index e44c0d5b0ff35e7facaed6353e0be801d4f3b10d..0000000000000000000000000000000000000000
--- a/public/img/icons/safari-pinned-tab.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.00251 14.9297L0 1.07422H6.14651L8.00251 4.27503L9.84583 1.07422H16L8.00251 14.9297Z" fill="black"/>
-</svg>
diff --git a/public/img/logo-neogeo-circle.png b/public/img/logo-neogeo-circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..427c1c63b8051722f05406349a48a073ac7ba927
Binary files /dev/null and b/public/img/logo-neogeo-circle.png differ
diff --git a/src/App.vue b/src/App.vue
index 940e4ea9c7ee80e27d188c66d6a644d4be5a1ef1..954fe28fa431592cd8f246ee7d8b0e35c8a0c703 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,10 +4,7 @@
<div class="menu container">
<div class="ui inverted icon menu">
<router-link to="/" class="header item">
- <img
- class="ui mini right spaced image"
- src="@/assets/img/logo-neogeo-circle.png"
- />
+ <img class="ui mini right spaced image" :src="logo" />
<span class="desktop">
{{ APPLICATION_NAME }}
</span>
@@ -202,16 +199,19 @@ export default {
"loader",
]),
...mapGetters(["project"]),
- APPLICATION_NAME: function () {
+ APPLICATION_NAME() {
return this.configuration.VUE_APP_APPLICATION_NAME;
},
PACKAGE_VERSION: () => process.env.PACKAGE_VERSION || "0",
- userFullname: function () {
+ logo() {
+ return this.configuration.VUE_APP_LOGO_PATH;
+ },
+ userFullname() {
if (this.user.first_name || this.user.last_name)
return this.user.first_name + " " + this.user.last_name;
return null;
},
- isAdmin: function () {
+ isAdmin() {
return this.USER_LEVEL_PROJECTS &&
this.USER_LEVEL_PROJECTS[this.project.slug] === "Administrateur projet"
? true
diff --git a/src/views/Index.vue b/src/views/Index.vue
index e199657757733fb9d0874e0c72e2a47fd9f04d8b..b751999169c005a0a90fc93e2df3ffc4156c7912 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -1,9 +1,6 @@
<template>
<div class="fourteen wide column">
- <img
- class="ui centered small image"
- src="@/assets/img/logo-neogeo-circle.png"
- />
+ <img class="ui centered small image" :src="logo" />
<!-- :src="LOGO_PATH" -->
<h2 class="ui center aligned icon header">
<div class="content">
@@ -15,14 +12,14 @@
<h4 id="les_projets" class="ui horizontal divider header">PROJETS</h4>
<div class="flex">
<router-link
- v-if="user && user.can_create_project && isOffline()!=true"
+ v-if="user && user.can_create_project && isOffline() != true"
:to="{ name: 'project_create', params: { action: 'create' } }"
class="ui green basic button"
>
<i class="plus icon"></i> Créer un nouveau projet
</router-link>
<router-link
- v-if="user && user.can_create_project && isOffline()!=true"
+ v-if="user && user.can_create_project && isOffline() != true"
:to="{
name: 'project_type_list',
}"
@@ -110,22 +107,26 @@ import { mapState } from "vuex";
export default {
name: "Index",
+
computed: {
...mapState(["projects", "user", "USER_LEVEL_PROJECTS"]),
- APPLICATION_NAME: function () {
+ APPLICATION_NAME() {
return this.$store.state.configuration.VUE_APP_APPLICATION_NAME;
},
- APPLICATION_ABSTRACT: function () {
+ APPLICATION_ABSTRACT() {
return this.$store.state.configuration.VUE_APP_APPLICATION_ABSTRACT;
},
- DJANGO_BASE_URL: function () {
+ DJANGO_BASE_URL() {
return this.$store.state.configuration.VUE_APP_DJANGO_BASE;
},
+ logo() {
+ return this.$store.state.configuration.VUE_APP_LOGO_PATH;
+ },
},
methods: {
- isOffline(){
- return navigator.onLine==false;
+ isOffline() {
+ return navigator.onLine == false;
},
refreshId() {
//* change path of thumbnail to update image