Merge branch 'master' of ssh://git.shikiryu.com:2200/Shikiryu/journal-intime into e2e

resources/js/app.js

@@ -29,8 +29,8 @@ window.Vue = require('vue');
 
 import Vue from 'vue';
 import Autocomplete from './components/Autocomplete.vue';
-import { Endcrypt } from 'endcrypt';
-import { Vue2Storage } from 'vue2-storage'
+import {Endcrypt} from 'endcrypt';
+import {Vue2Storage} from 'vue2-storage';
 
 const e = new Endcrypt();
 
@@ -49,6 +49,14 @@ Vue.component(
     'messageform', {
         name: 'MessageForm',
         props: {
+            'imageLabel': {
+                type: String,
+                default: "Choisir une image"
+            },
+            'uploadClass': {
+                type: String,
+                default: "fe fe-upload"
+            },
             'mustencrypt': {
                 type: Boolean,
                 default: true
@@ -64,11 +72,24 @@ Vue.component(
                 if (this.mustencrypt) {
                     // https://www.npmjs.com/package/endcrypt
                     let plain = document.querySelector("[name=message]").value;
-                    let encryptedMessage = JSON.stringify(e.encryptWithKey(plain, this.$storage.get('passphrase')));
-                    document.querySelector("[name=message]").value = encryptedMessage;
+                    document.querySelector("[name=message]").value = JSON.stringify(e.encryptWithKey(plain, this.$storage.get('passphrase')));
                 }
                 document.getElementById('messageForm').submit();
                 return false;
+            },
+            fileNameChanged: function(inputName, inputFiles) {
+                let file = inputFiles[0];
+                let imageName = file["name"];
+                if (imageName !== "") {
+                    imageName = imageName.split('\\').pop();
+                }
+                if (imageName !== "") {
+                    this.uploadClass = "fe fe-check";
+                    this.imageLabel = imageName;
+                } else {
+                    this.uploadClass = "fe fe-upload";
+                    this.imageLabel = "Choisir une image";
+                }
             }
         },
         beforeMount: function() {
@@ -86,7 +107,6 @@ Vue.component(
                     cardBody.innerHTML = e.decryptWithKey(cardBodyDecrypted, $this.$storage.get('passphrase'));
                 } catch (e) {
                     console.log('can\'t decode '+ cardBody.innerHTML);
-                    console.log(e);
                 }
                 card.addEventListener('click', function(evt) {
                     let $card = this.parentElement.parentElement.parentElement;
@@ -103,6 +123,8 @@ Vue.component(
     }
 );
 
-new Vue({
-    el: '#store'
-});
+if (document.getElementById("store")) {
+    new Vue({
+        el: '#store'
+    });
+}

resources/js/components/Autocomplete.vue

@@ -51,6 +51,13 @@
                         }
                     }
                 });
+            let collapse = document.getElementById("collapse");
+            let already = collapse && document.getElementById("collapse").classList.contains("collapse");
+            if (already) {
+                let post = document.querySelector(".already").innerText;
+                document.querySelector("textarea").innerHTML = post;
+                this.inputValue = post;
+            }
         },
         computed: {
             listToSearch() {