Sauvegarde du 04/06

9a2ce580 · Jérémie Passerat · 9ce98f17 · 9a2ce580 · 9a2ce580 · 9a2ce580
Commit 9a2ce580 authored Jun 04, 2021 by Jérémie Passerat
8 changed files
--- a/package-lock.json
+++ b/package-lock.json
@@ -10376,6 +10376,11 @@
      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
      "dev": true
    },
+    "tiny-cookie": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tiny-cookie/-/tiny-cookie-1.0.1.tgz",
+      "integrity": "sha1-dTeGB5xkKjw9CyrMrWAPjeEZrCo="
+    },
    "tmp": {
      "version": "0.0.33",
      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -10870,6 +10875,14 @@
      "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz",
      "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="
    },
+    "vue-cookie": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/vue-cookie/-/vue-cookie-1.1.4.tgz",
+      "integrity": "sha1-uLRtESvan5Oi9HAXwu1SgtIGT9o=",
+      "requires": {
+        "tiny-cookie": "^1.0"
+      }
+    },
    "vue-cookies": {
      "version": "1.7.4",
      "resolved": "https://registry.npmjs.org/vue-cookies/-/vue-cookies-1.7.4.tgz",

--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
    "jquery": "^3.6.0",
    "jquery-ui-bundle": "^1.12.1-migrate",
    "vue": "^2.6.11",
+    "vue-cookie": "^1.1.4",
    "vue-cookies": "^1.7.4",
    "vue-js-modal": "^2.0.0-rc.6",
    "vue-js-popover": "^1.2.1"

--- a/src/Contenu.vue
+++ b/src/Contenu.vue
 <template>
  <div id="app">
-    <Volet_Base @choix_variante="choixVariante" @publication="publication"/>
+    <Volet_Base @choix_variante="choixVariante" v-bind:auteur="auteur" @publication="publication"/>
  </div>
 </template>

@@ -22,7 +22,8 @@ export default {
      this.$emit("publication", {document: event.document})

    }
-  }
+  },
+  props: ['auteur']
 }
 </script>


--- a/src/Index.vue
+++ b/src/Index.vue
@@ -3,7 +3,7 @@
    <Login v-show="etat === 'unlogged'" @user_logged="setLogged"></Login>

    <Menu v-show="etat !== 'unlogged'" v-bind:auteur="auteur" v-bind:etat="etat" v-bind:isNotif="isNotif"  v-bind:variante="variante" @menu_choisi="changerPage"></Menu>
-    <Contenu v-show="etat === 'Contenu'"  @choix_variante="choixVariante" @publication="publication"></Contenu>
+    <Contenu v-show="etat === 'Contenu'"  v-bind:auteur="auteur"  @choix_variante="choixVariante" @publication="publication"></Contenu>
    <Maj v-show="etat === 'Mises à jour'"  v-bind:contenuEnPublication="contenuEnPublication" ></Maj>
    <Profil v-show="etat === 'Profil'"  ></Profil>
    <Tags v-show="etat === 'Tags'"  ></Tags>

--- a/src/Login.vue
+++ b/src/Login.vue
 <template>
  <div id="loginForm">

-      <p>Trois comptes temporaires : Auteur 1, Auteur 2, Auteur 3</p>
+      <p>Deux comptes temporaires : Charles, Jacques</p>
      <label for="identifiant">Identifiant</label>
      <br>
      <input type="text" id="identifiant" placeholder="identifiant"  v-model="login"  >

--- a/src/Menu.vue
+++ b/src/Menu.vue
@@ -3,7 +3,7 @@

    <Choix_Mode_Variante class="menuVariante" v-show="variante"></Choix_Mode_Variante>
    <div class="notif" v-on:click="choixIconeNotification" v-show="isNotif" v-bind:style="[!variante ? {'margin-left': '90%'} : {'margin-left': '31.78%'}]"></div>
-    <div class="circle" v-on:click="isAffiche = !isAffiche" v-bind:style="[!isNotif ? {'margin-left': '94.75%'} : {'margin-left': '3%'}]">
+    <div class="circle" id="menuAuteur" v-on:click="isAffiche = !isAffiche" v-bind:style="[!isNotif ? {'margin-left': '94.75%'} : {'margin-left': '3%'}]">
      {{auteur}}
    </div>
    <div class="menu" v-show="isAffiche">
@@ -23,7 +23,7 @@ export default {
  name: "Menu",
  data: function () {
    return {
-      isAffiche: false
+      isAffiche: false,
    }
  },
  props: ['etat', 'variante', 'isNotif', 'auteur'],

--- a/src/components/Volet_Base.vue
+++ b/src/components/Volet_Base.vue
@@ -85,7 +85,7 @@
    <Consulter_Contenu @actionContenu="actionContenu" @retour_arriere="retourArriere" v-bind:contenuClique = "contenuClique" v-bind:contenuCliqueProvenance = "contenuCliqueProvenance" v-show="modeConsultation"/>

    <div v-show="panierChoisi && !modeConsultation" class="circle" v-on:click="ajouterContenu" v-bind:style="{'margin-left': '95%'}">
-
+    <p> Kai Nishikori {{auteur}}</p>
    </div>

  </div>
@@ -97,6 +97,7 @@ import 'jquery-ui-bundle'
 import Volet_Menu from "@/components/Volet_Menu";
 import Volet_Contenu from "@/components/Volet_Contenu";
 import Consulter_Contenu from "@/components/Consulter_Contenu";
+import Service from '../../src/service/Service'

 export default {
  name: "Volet_Base",
@@ -105,6 +106,7 @@ export default {
    Volet_Contenu,
    Consulter_Contenu
  },
+  props: ['auteur'],
  data: function () {
    return {
      isActif: true,
@@ -120,18 +122,22 @@ export default {
      persoChecked: true,
      tiersChecked: true,
      enCoursChecked: true,
+      oui: 0,
      imgEtoile: "https://previews.123rf.com/images/ylivdesign/ylivdesign1612/ylivdesign161208906/67933171-ic%C3%B4ne-%C3%A9toile-%C3%A0-cinq-branches-jaunes-illustration-de-dessin-anim%C3%A9-d-ic%C3%B4ne-de-vecteur-%C3%A9toile-jaune-%C3%A0-cinq-branches-.jpg",
      imgPoubelle: "data:image/png;base64,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"
    }
  },
+  beforeUpdate() {
+    this.contenus = Service.getPanierAuteur(this.auteur).then(function (response) {
+      console.log(response.data)
+    })
+
+  },
  mounted() {
    this.modeConsultation = false
    $('#ensemble').draggable()

  },
-  updated() {
-    alert('susumesusumemayi')
-  },
  methods: {
    desactiverVolet: function () {
      this.isActif = !this.isActif

--- a/src/service/Service.js
+++ b/src/service/Service.js
@@ -12,5 +12,9 @@ export default {
             reponse =  response.data
        })*/
        return  axios.get(urlBase + "checkUser?login=" + login + "&password=" + motDePasse)
+    },
+
+    getPanierAuteur(auteur){
+        return axios.get(urlBase + "getContenuPanier/" + auteur + "?perso=True&tiers=True&enCours=true")
    }
 }
\ No newline at end of file