Commit 86fc4374 authored by Jérémy GAILLARD's avatar Jérémy GAILLARD
Browse files

Merge branch 'new-design-clean' into 'master'

New design clean

See merge request !21
parents 54596f03 67fd2d7b
......@@ -11267,6 +11267,11 @@
}
}
},
"vue-router": {
"version": "3.1.6",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.6.tgz",
"integrity": "sha512-GYhn2ynaZlysZMkFE5oCHRUTqE8BWs/a9YbKpNLi0i7xD6KG1EzDqpHQmv1F5gXjr8kL5iIVS8EOtRaVUEXTqA=="
},
"vue-style-loader": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
......
......@@ -10,7 +10,8 @@
"dependencies": {
"core-js": "^3.6.4",
"vue": "^2.6.11",
"vue-carousel": "^0.18.0"
"vue-carousel": "^0.18.0",
"vue-router": "^3.1.6"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^4.2.0",
......
<svg width="52" height="45" viewBox="0 0 52 45" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<rect width="52" height="45" fill="url(#pattern0)"/>
<defs>
<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
<use xlink:href="#image0" transform="translate(0 -0.0777778) scale(0.005 0.00577778)"/>
</pattern>
<image id="image0" width="200" height="200" xlink:href="data:image/png;base64,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"/>
</defs>
<svg width="44" height="36" viewBox="0 0 44 36" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M10.1741 36.0005C4.56406 36.0005 0 31.4364 0 25.8264C0 20.2164 4.56406 15.6523 10.1741 15.6523C15.7841 15.6523 20.3481 20.2164 20.3481 25.8264C20.3481 31.4364 15.7841 36.0005 10.1741 36.0005ZM10.1741 17.7393C5.71486 17.7393 2.08699 21.3672 2.08699 25.8264C2.08699 30.2856 5.71486 33.9135 10.1741 33.9135C14.6333 33.9135 18.2611 30.2856 18.2611 25.8264C18.2611 21.3672 14.6333 17.7393 10.1741 17.7393Z" fill="#333333"/>
<path d="M10.1742 29.4788C8.16034 29.4788 6.52197 27.8404 6.52197 25.8265C6.52197 23.8127 8.16034 22.1743 10.1742 22.1743C12.1881 22.1743 13.8264 23.8127 13.8264 25.8265C13.8264 27.8404 12.188 29.4788 10.1742 29.4788ZM10.1742 24.2613C9.31114 24.2613 8.60896 24.9635 8.60896 25.8265C8.60896 26.6896 9.31114 27.3918 10.1742 27.3918C11.0373 27.3918 11.7394 26.6896 11.7394 25.8265C11.7394 24.9635 11.0373 24.2613 10.1742 24.2613Z" fill="#333333"/>
<path d="M36.4347 36.0005C34.6381 36.0005 32.8954 35.357 31.5278 34.1884C30.175 33.0326 29.2685 31.4373 28.9751 29.6963L28.9385 29.4787H23.478V25.8265C23.478 18.4904 17.5096 12.5219 10.1735 12.5219C7.17567 12.5219 4.25189 13.5417 1.91012 15.3986L0.581055 13.7891C2.25699 12.4536 4.23763 11.4656 6.32566 10.9256L6.52123 10.875V2.08699H3.91249V0H24.2606V2.08699H22.0108L25.2978 13.0437H31.4781V6.26096C31.4781 4.33493 32.9769 2.75221 34.8695 2.61795V4.71746C34.1301 4.84207 33.5651 5.48677 33.5651 6.26096V13.0437H36.4347C39.1678 13.0437 41.3913 15.2672 41.3913 18.0003V22.7238L41.4781 22.8016C43.0807 24.238 44 26.2913 44 28.4352C44 32.6067 40.6061 36.0005 36.4347 36.0005ZM36.4347 22.9568C33.414 22.9568 30.9564 25.4144 30.9564 28.4352C30.9564 31.4559 33.414 33.9135 36.4347 33.9135C39.4554 33.9135 41.913 31.4559 41.913 28.4352C41.913 25.4144 39.4554 22.9568 36.4347 22.9568ZM25.3498 23.2612C25.4926 24.1064 25.565 24.9696 25.565 25.8265V27.3917H28.9385L28.9751 27.1741C29.212 25.7682 29.8434 24.4604 30.8011 23.3918L31.191 22.9568H25.2984L25.3498 23.2612ZM21.6349 15.5657C22.9856 17.0728 24.0117 18.799 24.6846 20.6962L24.7462 20.8699H36.4347C37.2981 20.8699 38.1465 21.0154 38.9562 21.3026L39.3043 21.426V18.0003C39.3043 16.418 38.017 15.1307 36.4347 15.1307H21.2451L21.6349 15.5657ZM10.1735 10.4349C13.2083 10.4349 16.1467 11.3219 18.6711 13.0001L18.7367 13.0437H23.119L19.832 2.08699H8.60821V10.5132L8.89091 10.4895C9.32109 10.4533 9.75258 10.4349 10.1735 10.4349Z" fill="#333333"/>
<path d="M36.4351 29.4786C35.8597 29.4786 35.3916 29.0105 35.3916 28.4351C35.3916 27.8597 35.8597 27.3916 36.4351 27.3916C37.0105 27.3916 37.4786 27.8597 37.4786 28.4351C37.4786 29.0105 37.0105 29.4786 36.4351 29.4786Z" fill="#333333"/>
</svg>
<template>
<div id="app">
<MainPage url="https://aide-covid-back.grandlyon.com/" project="_" table="initiatives" table_news="actualites"/>
<MainPage/>
</div>
</template>
<script>
import MainPage from './components/MainPage.vue'
import Store from './utils/store.js'
export default {
name: 'App',
components: {
MainPage
}
name: 'App',
components: {
MainPage
},
created: function() {
Store.url = "https://aide-covid-back.grandlyon.com/";
Store.project = "_";
Store.table = "initiatives";
Store.table_news = "actualites";
}
}
</script>
......@@ -55,7 +62,7 @@ h1 {
font-weight: 900;
font-size: 1.8vw;
color : black;
margin: 3% 0;
margin: 1% 0;
}
h2 {
......
......@@ -180,7 +180,7 @@
<button id="submitButton" @click="submit()" :disabled='!canSubmit'>Envoyer le formulaire</button>
</div>
<div>
<button id="returnButton" @click="page = $emit('changePage', 'list')">Retour</button>
<router-link tag='button' id="returnButton" :to="{ name: 'home' }" @click.native="pageChange()">Retour</router-link>
</div>
</div>
</div>
......@@ -191,6 +191,7 @@
import { postItem, postFile } from "../utils/requests"
import CGU from './CGU.vue'
import Charte from './Charte.vue'
import Store from '../utils/store.js'
const MAXSIZE = 2000000;
......@@ -202,14 +203,12 @@ export default {
},
props: {
mode: String,
metadata: Object,
data: Object,
url: String,
project: String,
table: String
data: Object
},
data: function() {
return {
store: Store,
// -----
titre: "",
descriptif: "",
media_associe: "",
......@@ -326,17 +325,17 @@ export default {
this.submit_error = null;
const data = this.myData;
if(this.image != null) {
postFile(this.url, this.project, this.image).then(ret => {
postFile(this.store.url, this.store.project, this.image).then(ret => {
data["image"] = ret["data"]["id"];
postItem(this.url, this.project, this.table, data).then(() => this.submit_status="Success", error => this.catchError(error))
postItem(this.store.url, this.store.project, this.store.table, data).then(() => this.submit_status="Success", error => this.catchError(error))
}, error => this.catchError(error));
}
else {
postItem(this.url, this.project, this.table, data).then(() => this.submit_status="Success", error => this.catchError(error));
postItem(this.store.url, this.store.project, this.store.table, data).then(() => this.submit_status="Success", error => this.catchError(error));
}
},
choices: function(field) {
return this.metadata["fields"][field]["options"]["choices"];
return this.store.metadata["fields"][field]["options"]["choices"];
},
setImage: function(e) {
this.image = null;
......@@ -474,6 +473,9 @@ export default {
this.localisation.push(event.target.value);
}
}
},
pageChange: function() {
window.scrollTo(0, 0);
}
}
};
......
<template>
<header>
<a href="https://www.toodego.com/connect/" target="_blank"><img class="logo_left" src="../static/toodego.svg" alt="Logo_Toodego" ></a>
<p> <b>Facilitez vous la ville</b> pendant le confinement ! </p>
<div class="text">
<p> <b>Facilitez vous la ville</b> </p>
<p> pendant le confinement ! </p>
</div>
<div class="right">
<a href="https://www.grandlyon.com/" target="_blank"><img class="logo_right" src="../static/logo_GL.svg" alt="Logo_GrandLyon" ></a>
<div class="nav-toolbar" @click='stats("ClickHome")'>
<router-link :to="{ name: 'home' }">Accueil</router-link>
</div>
<div class="nav-toolbar" @click='stats("ClickSearch")'>
<router-link id='list' :to="{ name: 'list', query: { cat: '1' } }">Rechercher</router-link>
</div>
<div class="nav-toolbar" @click='stats("Add_Initiative")'>
<router-link :to="{ name: 'form' }">Publier</router-link>
</div>
</div>
</header>
</template>
<script>
var _paq = window._paq || [];
export default {
data: function() {
return {
menu_filter: "Accueil"
}
},
methods: {
stats: function(actionName) {
_paq.push(["trackEvent", "HomePage", actionName]);
}
}
}
</script>
<style scoped>
header {
display: flex;
......@@ -15,38 +45,81 @@ header {
padding: 0.5% 10% 0.2% 10%;
}
p {
a {
float:left;
padding-left: 2%;
font-size: 1.1vw;
font-size: 0.9vw;
font-weight: bold;
margin: 0 3%;
color: black;
text-decoration: none;
outline: 0;
}
.logo_left{
logo_left{
max-width: 100%;
float: left;
}
.text p{
text-align: left;
margin: 0;
}
.right {
display: inline-block;
position: absolute;
display: flex;
right: 10%;
width: 30%;
position: absolute;
justify-content: flex-end;
}
.logo_right {
float: right;
max-width: 100%;
label {
background-color: var(--very-light-grey);
}
.nav-toolbar{
margin: 0 25%;
}
a:hover{
color: var(--medium-red);
}
.router-link-active#list {
color: var(--medium-red);
border-bottom: 2px solid var(--medium-red);
}
.router-link-exact-active {
color: var(--medium-red);
border-bottom: 2px solid var(--medium-red);
}
/* mobile */
@media (max-width: 600px) {
.logo_left{
header{
padding: 0.5% 0;
}
logo_left{
max-width: 60%;
}
p{
.text p{
display: none;
}
.nav-toolbar{
margin: 0 10%;
}
a {
font-size: 3vw;
}
img{
width: 50%;
}
}
</style>
\ No newline at end of file
</style>
<template>
<div>
<div class="home">
<p class="subtitle"> Rechercher des solutions pour </p>
<div class="categories">
<div class="categorie" v-for='(k, v) in choices("categorie")' :key="k">
<img :src="getImage(v)" :alt="k">
<div class="categorie_icon">
<img :src="getIcon(v)">
<p v-html='getLabel(v)'></p>
</div>
<router-link tag='button' :to="{ name: 'list', query: {cat: v} }" @click.native="pageChange(); stats(v)"> Voir les initiatives </router-link>
</div>
<div class="categorie add_initiative">
<p class="subsubtitle"> Vous avez lancé une initiative ? </p>
<p> Vous en connaissez une <br /> qui n'apparait pas sur le site ? <br /><br /> Aidez nous à répertorier <br />toutes les initiatives <br /> sur la Métropole ! </p>
<router-link tag='button' :to="{ name: 'form' }" @click.native="pageChange()"> <span class="plus"> + </span> <span> publier une initiative</span> </router-link>
</div>
</div>
</div>
<div class="other_sites">
<p class="subtitle"> Les autres sites pour retrouver les aides et informations <br />de la Métropole de Lyon en période de confinement </p>
<div class="other_sites_list">
<div class="other_site">
<img class="screenshot" src="../static/Site1.svg" alt="MET">
<br />
<img src="../static/MET.svg" alt="MET">
<p> Restez informés 7/7 jours. <br /> Rendez vous sur met.grandlyon.com </p>
<button><a href="https://met.grandlyon.com/" target="_blank"> voir le site </a></button>
</div>
<div class="other_site">
<img class="screenshot" src="../static/Site2.svg" alt="Entraide Grand Lyon">
<br />
<img src="../static/entraideGL.svg" alt="Entraide Grand Lyon">
<p> Vous souhaitez aider un voisin ou être aidé•e ? <br /> Rendez vous sur entraide.grandlyon.com </p>
<button><a href="https://entraide.grandlyon.com/" target="_blank"> voir le site </a></button>
</div>
<div class="other_site">
<img class="screenshot" src="../static/Site3.svg" alt="Tous unis tous solidaires">
<img class="tuts" src="../static/tuts.svg" alt="Tous unis tous solidaires">
<p class="tuts"> Aidez les associations ayant besoin de renforts. <br /> Rendez vous sur tousunistoussolidaires.fr </p>
<button><a href="https://www.tousunistoussolidaires.fr/" target="_blank"> voir le site </a></button>
</div>
</div>
</div>
</div>
</template>
<script>
import Store from '../utils/store.js'
var _paq = window._paq || [];
const IMAGE_PATH = {
"1": "/Categorie_illustration1.jpg",
"2": "/Categorie_illustration2.jpg",
"3": "/Categorie_illustration3.jpg",
"4": "/Categorie_illustration4.jpg",
"5": "/Categorie_illustration5.jpg"
};
const ICON_PATH = {
"1": "/Courses-MangerLocal_1.svg",
"2": "/Scolarité.svg",
"3": "/Emploi.svg",
"4": "/FormationCultureActivPhysique.svg",
"5": "/producers.svg"
};
const LABELS = {
"1": "Cartes des points de ventes, <br /> marchés solidaires, <br /> livraisons de paniers...",
"2": "Des ressources éducatives, <br /> des conseils, <br />des communautés...",
"3": "Groupes d'entraide, <br /> aides aux entreprises, <br /> solidarités...",
"4": "Contenus culturels, <br /> idées d'activités, <br /> conseils...",
"5": "Des ressources, <br /> des communautés, <br /> des solutions..."
};
export default {
name: 'Home',
data: function() {
return {
store: Store
}
},
methods: {
pageChange: function() {
window.scrollTo(0, 0);
},
choices: function(field) {
return this.store.metadata["fields"][field]["options"]["choices"];
},
getImage(id) {
return IMAGE_PATH[id];
},
getIcon(id) {
return ICON_PATH[id];
},
getLabel(id) {
return LABELS[id];
},
stats: function(actionName) {
_paq.push(["trackEvent", "Categories", actionName]);
}
}
}
</script>
<style scoped>
.home{
background-color: var(--almost-white);
padding: 0 10%;
}
.subtitle{
margin:0;
padding: 1%;
font-size: 1.6vw;
font-weight: bold;
}
.subsubtitle{
color: var(--medium-red);
font-weight: 900;
}
.categories{
display:grid;
grid-template-columns: repeat(3, 31%);
justify-content: center;
}
.categorie{
display: inline-block;
background: white;
border: 2px solid #EDEDED;
box-sizing: border-box;
margin: 5%;
padding-bottom: 5%;
}
.categorie img{
width: 100%;
}
button{
background-color: var(--medium-red);
border: none;
color: white;
border-radius: 30px;
font-weight: bold;
padding: 2% 5%;
}
.add_initiative{
padding-top: 10%;
border: 2px solid var(--medium-red);
}
.add_initiative p{
margin-bottom: 10%;
}
.categorie_icon{
display: flex;
justify-content: center;
text-align: left;
}
.categorie_icon img{
margin-right: 10%;
width: auto;
}
.add_initiative button{
align-items: center;
display: flex;
margin: auto;
}
.plus{
font-size: 1.5vw;
margin-right: 1vw;
}
.other_sites{
background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #DCDCDC 100%);
border-top: 2px solid var(--light-grey);
box-sizing: border-box;
padding: 2% 10%;
}
.other_sites_list{
display:grid;
grid-template-columns: repeat(3, 31%);
justify-content: center;
}
.other_site{
text-align: left;
align-items: left;
margin: 5%;
}
.other_site img{
margin-top: 2%;
}
.tuts{
margin-top: 0 !important;
}
a{
text-decoration: none;
color: white;
}
/* Mobile version */
@media (max-width: 600px) {
.subtitle{
font-size: 4vw;
}
.categories{
display: inline-block;
}
.categorie_icon img{
margin-left: 5%;
}
.add_initiative{
padding: 10% 5%;
}
.other_sites_list{
display: inline
}
.screenshot{
width: 100%;
}
.other_site button{
margin-bottom: 5%;
}
}
</style>
<template>
<div>
<Header></Header>
<News v-if="news !== null" :news="news"></News>
<div v-if='page === "list"'>
<div class="initiative">
<div class="initiative_title">
<h1>Retrouvez et proposez des initiatives </h1>
<h1>dans la Métropole de Lyon </h1>
<h1><span class="underline_title"> pour vous aider et pour aider </span></h1>
<h1>pendant le confinement</h1>
</div>
<div class="addoffer">
<button @click='page = "form"; stats("Add_Initiative")'>
<img src="../static/Union.svg" alt="+">
<p> proposer une initiative </p>
</button>
</div>
</div>
<Header/>
<News v-if="store.news !== null" :news="news"/>
<Title v-if='page === "list" || page === "home"'/>
<div v-if='subtitle' class="notice_header">
<h2> {{subtitle}} </h2>
</div>
<div v-if='metadata !== null && services !== null'>
<ServiceList v-if='page === "list"' :services='services' :metadata='metadata' :url='url' :project='project' :table='table'/>
<!-- Form-->
<div v-if='page === "form"'>
<div class="notice_header">
<div class="left_back" @click='page = "list";'>
<img src="../static/arrow_back.svg" alt="Flèche arrière">
<button >Revenir</button>
</div>
<h2> Proposer une initiative </h2>
</div>
<Form v-if='page === "form"' :mode='"new"' @changePage="pageChange('list')" :url='url' :project='project' :table='table' :metadata='metadata'/>
</div>
<div v-if='store.metadata !== null && store.services !== null'>
<transition name="fade">
<router-view class="view"></router-view>
</transition>
</div>
<div v-else>
<p>Chargement...</p>
</div>
<!-- Notice-->
<div v-if='page === "notice"'>
<div class="notice_header">
<div class="left_back" @click='page = "list"'>
<img src="../static/arrow_back.svg" alt="Flèche arrière">
<button>Revenir</button>
</div>