From 524b815d371831586367a2d56cb52d24289ff1c8 Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 3 Jul 2023 14:26:11 +0200 Subject: [PATCH] better mode nav, from concernement & main menu --- README.md | 2 +- src/assets/main.scss | 68 +++++++++++++++++++++++------ src/components/MapConcernements.vue | 43 +++++++++++++++--- src/views/Concernement.vue | 57 ++++++++++++++++++++---- 4 files changed, 141 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 9e69860..b8bae1b 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ app (VueJs) -part of https://figureslibres.io/gogs/bachir/docker-enfrancais +part of https://figureslibres.io/gogs/bachir/docker-ouatterrir ..... diff --git a/src/assets/main.scss b/src/assets/main.scss index 0b867a1..7e1fdee 100644 --- a/src/assets/main.scss +++ b/src/assets/main.scss @@ -76,6 +76,11 @@ body{ @include btn(); display: block; line-height: 2.1; + &.disabled{ + pointer-events: none; + opacity: 0.4; + cursor: default; + } } } } @@ -108,22 +113,59 @@ body{ >header{ display: flex; - height: 8rem; + // height: 8rem; flex-direction: column; justify-content: flex-end; - label, h3{ - // height: 70px; - box-sizing: border-box; - // padding: 0 0 1em 0; - // flex-grow: auto; + div.pre-header{ + min-height: 10em; + display: flex; + flex-direction: column; + justify-content: flex-end; + label, h3{ + // height: 70px; + box-sizing: border-box; + // padding: 0 0 1em 0; + // flex-grow: auto; + } + h3{ + font-weight: 400; + font-size: 1.323em; + } + span.menacemaintient{ + display: block; + font-weight: 100; + font-size: 0.882em; + padding: 1em 0 1em 0; + } } - h2{ - font-weight: 400; - font-size: 1.512em; - } - h3{ - font-weight: 400; - font-size: 1.2em; + div.concernement-cartouche{ + h2{ + font-weight: 400; + font-size: 1.323em; + // &.faded{ + // font-weight: 100; + // } + } + nav.icons{ + ul{ + display: flex; + flex-direction: row; + li{ + margin: 0.4em 0.6em 0 0; + >svg{ + display: inline-block; + $d: 35px; + width:$d; height:$d; + border-radius: $d * 0.5; + background-color: #fff; + padding: 2px; + box-sizing: border-box; + color: #333; + // font-size: 2em; + } + } + } + } } } diff --git a/src/components/MapConcernements.vue b/src/components/MapConcernements.vue index 2ad62ff..62621d8 100644 --- a/src/components/MapConcernements.vue +++ b/src/components/MapConcernements.vue @@ -55,7 +55,7 @@ export default { ...mapState(ConcernementsStore,['map_mode']), ...mapState(ConcernementsStore,['concernements']), ...mapState(ConcernementsStore,['concernementsByID']), - // ...mapState(ConcernementsStore,['opened_concernement']), + ...mapState(ConcernementsStore,['opened_concernement']), ...mapState(CommonStore,['hover_elmt']), ...mapState(CommonStore,['paper_symbol_definitions']) }, @@ -919,22 +919,51 @@ export default { diff --git a/src/views/Concernement.vue b/src/views/Concernement.vue index e4a1399..e040eef 100644 --- a/src/views/Concernement.vue +++ b/src/views/Concernement.vue @@ -10,13 +10,17 @@ import gql from 'graphql-tag' import GQL from '@api/graphql-axios' import EntiteFields from '@api/gql/entite.fragment.gql' +import SvgIcon from '@jamescoyle/vue-icon'; +import { mdiHeadphones } from '@mdi/js'; + export default { props: ['id', 'eid'], data(){ return { entite: null, - opened_besoin_id: null + opened_besoin_id: null, + headphones_path: mdiHeadphones } }, computed: { @@ -32,7 +36,10 @@ export default { ...mapState(ConcernementsStore,['p_reception_et_traitement']), ...mapState(ConcernementsStore,['p_mise_en_oeuvre_decision']), ...mapState(ConcernementsStore,['p_reception_application_decision']), - ...mapState(CommonStore,['hover_elmt']) + ...mapState(CommonStore,['hover_elmt']), + display_concernement(){ + return this.ct_concernement && !this.entite && this.map_mode !== 'puissancedagir'&& this.map_mode !== 'doleancer'; + } }, created () { console.log(`Concernement view created, id: ${this.id}, eid: ${this.eid}, opened_concernement:${this.opened_concernement}`); @@ -70,6 +77,7 @@ export default { methods: { ...mapActions(ConcernementsStore,['openCloseConcernements']), ...mapActions(ConcernementsStore,['setOpenedEntityId']), + ...mapActions(ConcernementsStore,['setMapMode']), openEntity(){ this.setOpenedEntityId(parseInt(this.eid)) this.loadEntite() @@ -101,6 +109,7 @@ export default { } }, components: { + SvgIcon } } @@ -109,15 +118,47 @@ export default {