From 9e163b002b81c49db36d71456c16b70291349883 Mon Sep 17 00:00:00 2001
From: Fernando B <fredz0003@gmail.com>
Date: Sat, 4 Jan 2020 05:01:02 -0500
Subject: [PATCH 1/4] update-create-modal

---
 .../create-note-modal/CreateNoteModal.vue     | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/modals/create-note-modal/CreateNoteModal.vue b/src/renderer/components/modals/create-note-modal/CreateNoteModal.vue
index 96a5f1d..c2a52ea 100644
--- a/src/renderer/components/modals/create-note-modal/CreateNoteModal.vue
+++ b/src/renderer/components/modals/create-note-modal/CreateNoteModal.vue
@@ -111,7 +111,27 @@ export default {
   computed: {
     ...mapGetters(['gistsSelected', 'notes']),
     isDisabled() {
-      return this.files.some(file => !/\S/.test(file.content));
+      let isCreateButtonDisabled = false;
+
+      if(this.getNoteType() === "gist"){
+        if(this.files.some(file => !/\S/.test(file.content))   ||
+         this.files.some(file => !/\S/.test(file.name))      ||
+         this.files.some(file => !/\S/.test(this.note.description))){
+           isCreateButtonDisabled = true;
+         } else {
+           isCreateButtonDisabled = false;
+         }
+      } if(this.getNoteType() === "note"){
+          if(this.files.some(file => !/\S/.test(file.content))   ||
+          this.files.some(file => !/\S/.test(file.name))      ||
+          this.files.some(file => !/\S/.test(this.note.name)) ||
+          this.files.some(file => !/\S/.test(this.note.description))){
+            isCreateButtonDisabled = true;
+          } else {
+            isCreateButtonDisabled = false;
+          }
+      }
+      return isCreateButtonDisabled;
     },
     sortedLanguagesByUse() {
       this.languages.forEach((language) => { language.frequency = 0; });

From 95f5b5fadd56d553d442c59b52261ecea28cc897 Mon Sep 17 00:00:00 2001
From: Fernando B <fredz0003@gmail.com>
Date: Mon, 6 Jan 2020 10:21:01 -0500
Subject: [PATCH 2/4] update-modal

---
 .../create-note-modal/CreateNoteModal.html    |  9 +++++---
 .../create-note-modal/CreateNoteModal.vue     | 18 +++++++--------
 .../update-note-modal/UpdateNoteModal.html    |  6 +++--
 .../update-note-modal/UpdateNoteModal.vue     | 22 ++++++++++++++++++-
 4 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/src/renderer/components/modals/create-note-modal/CreateNoteModal.html b/src/renderer/components/modals/create-note-modal/CreateNoteModal.html
index 4a6d9d7..9555493 100644
--- a/src/renderer/components/modals/create-note-modal/CreateNoteModal.html
+++ b/src/renderer/components/modals/create-note-modal/CreateNoteModal.html
@@ -11,7 +11,8 @@ <h2 class="text-red" v-if="displayDupError">Oh sorry, you can't have duplicated
           type="text"
           ref="noteName"
           v-model="note.name"
-          placeholder="Your note name">
+          placeholder="Your note name"
+          required>
         </b-input>
       </b-field>
 
@@ -20,7 +21,8 @@ <h2 class="text-red" v-if="displayDupError">Oh sorry, you can't have duplicated
           type="text"
           ref="noteDescription"
           v-model="note.description"
-          placeholder="Your description">
+          placeholder="Your description"
+          required>
         </b-input>
       </b-field>
 
@@ -44,7 +46,8 @@ <h2 class="text-red" v-if="displayDupError">Oh sorry, you can't have duplicated
             style="width: 186px"
             type="text"
             v-model="file.name"
-            placeholder="Your file name">
+            placeholder="Your file name"
+            required>
           </b-input>
           <p class="control is-pulled-right" v-if="files.length > 1">
             <button class="button is-danger" @click="deleteFile(file)">
diff --git a/src/renderer/components/modals/create-note-modal/CreateNoteModal.vue b/src/renderer/components/modals/create-note-modal/CreateNoteModal.vue
index c2a52ea..765efc0 100644
--- a/src/renderer/components/modals/create-note-modal/CreateNoteModal.vue
+++ b/src/renderer/components/modals/create-note-modal/CreateNoteModal.vue
@@ -115,20 +115,20 @@ export default {
 
       if(this.getNoteType() === "gist"){
         if(this.files.some(file => !/\S/.test(file.content))   ||
-         this.files.some(file => !/\S/.test(file.name))      ||
-         this.files.some(file => !/\S/.test(this.note.description))){
-           isCreateButtonDisabled = true;
+           this.files.some(file => !/\S/.test(file.name))      ||
+           this.files.some(file => !/\S/.test(this.note.description))){
+               isCreateButtonDisabled = true;
          } else {
-           isCreateButtonDisabled = false;
+               isCreateButtonDisabled = false;
          }
       } if(this.getNoteType() === "note"){
           if(this.files.some(file => !/\S/.test(file.content))   ||
-          this.files.some(file => !/\S/.test(file.name))      ||
-          this.files.some(file => !/\S/.test(this.note.name)) ||
-          this.files.some(file => !/\S/.test(this.note.description))){
-            isCreateButtonDisabled = true;
+             this.files.some(file => !/\S/.test(file.name))      ||
+             this.files.some(file => !/\S/.test(this.note.name)) ||
+             this.files.some(file => !/\S/.test(this.note.description))){
+                 isCreateButtonDisabled = true;
           } else {
-            isCreateButtonDisabled = false;
+                 isCreateButtonDisabled = false;
           }
       }
       return isCreateButtonDisabled;
diff --git a/src/renderer/components/modals/update-note-modal/UpdateNoteModal.html b/src/renderer/components/modals/update-note-modal/UpdateNoteModal.html
index 07662e4..fabecbe 100644
--- a/src/renderer/components/modals/update-note-modal/UpdateNoteModal.html
+++ b/src/renderer/components/modals/update-note-modal/UpdateNoteModal.html
@@ -21,7 +21,8 @@ <h2 class="text-red" v-if="displayDupError">Oh sorry, you can't have duplicated
           type="text"
           ref="noteDescription"
           v-model="noteUpdated.description"
-          placeholder="Your description">
+          placeholder="Your description"
+          required>
         </b-input>
       </b-field>
 
@@ -38,7 +39,8 @@ <h2 class="text-red" v-if="displayDupError">Oh sorry, you can't have duplicated
             style="width: 186px"
             type="text"
             v-model="file.name"
-            placeholder="Your file name">
+            placeholder="Your file name"
+            required>
           </b-input>
           <p class="control is-pulled-right" v-if="files.length > 1">
             <button class="button is-danger" @click="deleteFile(file)">
diff --git a/src/renderer/components/modals/update-note-modal/UpdateNoteModal.vue b/src/renderer/components/modals/update-note-modal/UpdateNoteModal.vue
index 3c63d7b..2625d41 100644
--- a/src/renderer/components/modals/update-note-modal/UpdateNoteModal.vue
+++ b/src/renderer/components/modals/update-note-modal/UpdateNoteModal.vue
@@ -135,7 +135,27 @@ export default {
   computed: {
     ...mapGetters(['gistsSelected']),
     isDisabled() {
-      return this.files.some(file => !/\S/.test(file.content));
+      let isCreateButtonDisabled = false;
+
+      if(this.getNoteType() === "gist"){
+        if(this.files.some(file => !/\S/.test(file.content))   ||
+           this.files.some(file => !/\S/.test(file.name))      ||
+           this.files.some(file => !/\S/.test(this.noteUpdated.description))){
+               isCreateButtonDisabled = true;
+         } else {
+               isCreateButtonDisabled = false;
+         }
+      } if(this.getNoteType() === "note"){
+          if(this.files.some(file => !/\S/.test(file.content))   ||
+             this.files.some(file => !/\S/.test(file.name))      ||
+             this.files.some(file => !/\S/.test(this.noteUpdated.name)) ||
+             this.files.some(file => !/\S/.test(this.noteUpdated.description))){
+                 isCreateButtonDisabled = true;
+          } else {
+                 isCreateButtonDisabled = false;
+          }
+      }
+      return isCreateButtonDisabled;
     },
   },
 };

From 1b2b15cf963cba79d44ad045f25b9cbc4b2de6fe Mon Sep 17 00:00:00 2001
From: Fernando Balandran <ic3balandran@yahoo.com>
Date: Mon, 6 Jan 2020 12:55:32 -0600
Subject: [PATCH 3/4] fix-lint-issues

---
 package-lock.json | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 643a045..b54116e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14696,26 +14696,6 @@
         "prepend-http": "^1.0.1"
       }
     },
-    "vue-router": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.3.tgz",
-      "integrity": "sha512-8iSa4mGNXBjyuSZFCCO4fiKfvzqk+mhL0lnKuGcQtO1eoj8nq3CmbEG8FwK5QqoqwDgsjsf1GDuisDX4cdb/aQ=="
-    },
-    "vue-style-loader": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-3.1.2.tgz",
-      "integrity": "sha512-ICtVdK/p+qXWpdSs2alWtsXt9YnDoYjQe0w5616j9+/EhjoxZkbun34uWgsMFnC1MhrMMwaWiImz3K2jK1Yp2Q==",
-      "dev": true,
-      "requires": {
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.0.2"
-      }
-    },
-    "vue-select": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/vue-select/-/vue-select-3.2.0.tgz",
-      "integrity": "sha512-FfARbDuJWQNpYm6X9zPWCsYXmz33TNR2oqY8FktKRVksKfp1tZPqL9g+/7wgsaMaqUxcIxYEUVV7C3AD+H5cxA=="
-    },
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
@@ -15133,6 +15113,11 @@
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.3.tgz",
       "integrity": "sha512-8iSa4mGNXBjyuSZFCCO4fiKfvzqk+mhL0lnKuGcQtO1eoj8nq3CmbEG8FwK5QqoqwDgsjsf1GDuisDX4cdb/aQ=="
     },
+    "vue-select": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/vue-select/-/vue-select-3.2.0.tgz",
+      "integrity": "sha512-FfARbDuJWQNpYm6X9zPWCsYXmz33TNR2oqY8FktKRVksKfp1tZPqL9g+/7wgsaMaqUxcIxYEUVV7C3AD+H5cxA=="
+    },
     "vue-style-loader": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-3.1.2.tgz",
@@ -16272,4 +16257,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}

From a704d6afe20a043820135a5cfe07e5fff532a0be Mon Sep 17 00:00:00 2001
From: Laurent Thiebault <thiebault.laurent@gmail.com>
Date: Wed, 8 Jan 2020 10:52:59 +0100
Subject: [PATCH 4/4] refactor: whiteout issue

---
 .../create-note-modal/CreateNoteModal.html    |  2 +-
 .../create-note-modal/CreateNoteModal.vue     | 31 +++++++------------
 .../update-note-modal/UpdateNoteModal.html    |  2 +-
 .../update-note-modal/UpdateNoteModal.vue     | 31 +++++++------------
 4 files changed, 24 insertions(+), 42 deletions(-)

diff --git a/src/renderer/components/modals/create-note-modal/CreateNoteModal.html b/src/renderer/components/modals/create-note-modal/CreateNoteModal.html
index 9555493..d4d77ef 100644
--- a/src/renderer/components/modals/create-note-modal/CreateNoteModal.html
+++ b/src/renderer/components/modals/create-note-modal/CreateNoteModal.html
@@ -58,7 +58,7 @@ <h2 class="text-red" v-if="displayDupError">Oh sorry, you can't have duplicated
 
         <b-field horizontal label="Language">
           <v-select style="width: 186px" label="name" :options="sortedLanguagesByUse" placeholder="Select a language"
-             v-model="file.language" :reduce="selectedLanguage => selectedLanguage.name">
+             v-model="file.language" :reduce="selectedLanguage => selectedLanguage.name" :clearable="false">
              <template v-slot:option="option">
                {{ option.name | capitalize }}
              </template>
diff --git a/src/renderer/components/modals/create-note-modal/CreateNoteModal.vue b/src/renderer/components/modals/create-note-modal/CreateNoteModal.vue
index 765efc0..d3911a2 100644
--- a/src/renderer/components/modals/create-note-modal/CreateNoteModal.vue
+++ b/src/renderer/components/modals/create-note-modal/CreateNoteModal.vue
@@ -111,27 +111,18 @@ export default {
   computed: {
     ...mapGetters(['gistsSelected', 'notes']),
     isDisabled() {
-      let isCreateButtonDisabled = false;
+      const isGistDisabled = () => (
+        !/\S/.test(this.note.description) ||
+        this.files.some(file => !/\S/.test(file.name)) ||
+        this.files.some(file => !/\S/.test(file.language)) ||
+        this.files.some(file => !/\S/.test(file.content))
+      );
 
-      if(this.getNoteType() === "gist"){
-        if(this.files.some(file => !/\S/.test(file.content))   ||
-           this.files.some(file => !/\S/.test(file.name))      ||
-           this.files.some(file => !/\S/.test(this.note.description))){
-               isCreateButtonDisabled = true;
-         } else {
-               isCreateButtonDisabled = false;
-         }
-      } if(this.getNoteType() === "note"){
-          if(this.files.some(file => !/\S/.test(file.content))   ||
-             this.files.some(file => !/\S/.test(file.name))      ||
-             this.files.some(file => !/\S/.test(this.note.name)) ||
-             this.files.some(file => !/\S/.test(this.note.description))){
-                 isCreateButtonDisabled = true;
-          } else {
-                 isCreateButtonDisabled = false;
-          }
-      }
-      return isCreateButtonDisabled;
+      const isNoteDisabled = () => (
+        isGistDisabled() || !/\S/.test(this.note.name)
+      );
+
+      return this.gistsSelected ? isGistDisabled() : isNoteDisabled();
     },
     sortedLanguagesByUse() {
       this.languages.forEach((language) => { language.frequency = 0; });
diff --git a/src/renderer/components/modals/update-note-modal/UpdateNoteModal.html b/src/renderer/components/modals/update-note-modal/UpdateNoteModal.html
index fabecbe..6172f43 100644
--- a/src/renderer/components/modals/update-note-modal/UpdateNoteModal.html
+++ b/src/renderer/components/modals/update-note-modal/UpdateNoteModal.html
@@ -50,7 +50,7 @@ <h2 class="text-red" v-if="displayDupError">Oh sorry, you can't have duplicated
         </b-field>
 
         <b-field horizontal label="Language">
-          <b-select placeholder="Select a language" v-model="file.language">
+          <b-select placeholder="Select a language" v-model="file.language" :clearable="false">
             <option
               v-for="language in languages"
               :value="language.name">
diff --git a/src/renderer/components/modals/update-note-modal/UpdateNoteModal.vue b/src/renderer/components/modals/update-note-modal/UpdateNoteModal.vue
index 2625d41..b9e4008 100644
--- a/src/renderer/components/modals/update-note-modal/UpdateNoteModal.vue
+++ b/src/renderer/components/modals/update-note-modal/UpdateNoteModal.vue
@@ -135,27 +135,18 @@ export default {
   computed: {
     ...mapGetters(['gistsSelected']),
     isDisabled() {
-      let isCreateButtonDisabled = false;
+      const isGistDisabled = () => (
+        !/\S/.test(this.noteUpdated.description) ||
+        this.files.some(file => !/\S/.test(file.name)) ||
+        this.files.some(file => !/\S/.test(file.language)) ||
+        this.files.some(file => !/\S/.test(file.content))
+      );
 
-      if(this.getNoteType() === "gist"){
-        if(this.files.some(file => !/\S/.test(file.content))   ||
-           this.files.some(file => !/\S/.test(file.name))      ||
-           this.files.some(file => !/\S/.test(this.noteUpdated.description))){
-               isCreateButtonDisabled = true;
-         } else {
-               isCreateButtonDisabled = false;
-         }
-      } if(this.getNoteType() === "note"){
-          if(this.files.some(file => !/\S/.test(file.content))   ||
-             this.files.some(file => !/\S/.test(file.name))      ||
-             this.files.some(file => !/\S/.test(this.noteUpdated.name)) ||
-             this.files.some(file => !/\S/.test(this.noteUpdated.description))){
-                 isCreateButtonDisabled = true;
-          } else {
-                 isCreateButtonDisabled = false;
-          }
-      }
-      return isCreateButtonDisabled;
+      const isNoteDisabled = () => (
+        isGistDisabled() || !/\S/.test(this.noteUpdated.name)
+      );
+
+      return this.gistsSelected ? isGistDisabled() : isNoteDisabled();
     },
   },
 };