Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • geocontrib/geocontrib-frontend
  • ext_matthieu/geocontrib-frontend
  • fnecas/geocontrib-frontend
  • MatthieuE/geocontrib-frontend
4 results
Show changes
Commits on Source (2)
Showing
with 20 additions and 22 deletions
......@@ -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":{
......
public/img/icons/android-chrome-192x192.png

9.2 KiB | W: 0px | H: 0px

public/img/icons/android-chrome-192x192.png

10.9 KiB | W: 0px | H: 0px

public/img/icons/android-chrome-192x192.png
public/img/icons/android-chrome-192x192.png
public/img/icons/android-chrome-192x192.png
public/img/icons/android-chrome-192x192.png
  • 2-up
  • Swipe
  • Onion skin
public/img/icons/android-chrome-512x512.png

29.1 KiB | W: 0px | H: 0px

public/img/icons/android-chrome-512x512.png

36.9 KiB | W: 0px | H: 0px

public/img/icons/android-chrome-512x512.png
public/img/icons/android-chrome-512x512.png
public/img/icons/android-chrome-512x512.png
public/img/icons/android-chrome-512x512.png
  • 2-up
  • Swipe
  • Onion skin
public/img/icons/android-chrome-maskable-192x192.png

6.25 KiB

public/img/icons/android-chrome-maskable-512x512.png

22.5 KiB

public/img/icons/apple-touch-icon-120x120.png

3.29 KiB

public/img/icons/apple-touch-icon-152x152.png

3.95 KiB

public/img/icons/apple-touch-icon-180x180.png

4.57 KiB

public/img/icons/apple-touch-icon-60x60.png

1.46 KiB

public/img/icons/apple-touch-icon-76x76.png

1.78 KiB

public/img/icons/apple-touch-icon.png

4.57 KiB | W: 0px | H: 0px

public/img/icons/apple-touch-icon.png

9.59 KiB | W: 0px | H: 0px

public/img/icons/apple-touch-icon.png
public/img/icons/apple-touch-icon.png
public/img/icons/apple-touch-icon.png
public/img/icons/apple-touch-icon.png
  • 2-up
  • Swipe
  • Onion skin
public/img/icons/favicon-16x16.png

799 B | W: 0px | H: 0px

public/img/icons/favicon-16x16.png

437 B | W: 0px | H: 0px

public/img/icons/favicon-16x16.png
public/img/icons/favicon-16x16.png
public/img/icons/favicon-16x16.png
public/img/icons/favicon-16x16.png
  • 2-up
  • Swipe
  • Onion skin
public/img/icons/favicon-32x32.png

1.24 KiB | W: 0px | H: 0px

public/img/icons/favicon-32x32.png

1.01 KiB | W: 0px | H: 0px

public/img/icons/favicon-32x32.png
public/img/icons/favicon-32x32.png
public/img/icons/favicon-32x32.png
public/img/icons/favicon-32x32.png
  • 2-up
  • Swipe
  • Onion skin
public/img/icons/favicon.ico

15 KiB

public/img/icons/msapplication-icon-144x144.png

1.14 KiB

public/img/icons/mstile-150x150.png

4.18 KiB

<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>
public/img/logo-neogeo-circle.png

40.5 KiB

......@@ -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
......
<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
......