implements a option to delete notes faster (move them into trash bin)

rainu · Dec 11, 2019 · 85bdcbb · 85bdcbb
1 parent f59bd0e
commit 85bdcbb
Show file tree

Hide file tree

Showing 15 changed files with 448 additions and 20 deletions.
diff --git a/components/note/card/Camera.vue b/components/note/card/Camera.vue
@@ -24,9 +24,12 @@
           <v-btn icon class="error" @click="onDelete()">
             <v-icon>delete</v-icon>
           </v-btn>
-          <v-btn icon class="primary" @click="onEdit()">
+          <v-btn icon class="primary" @click="onEdit()" v-if="editable">
             <v-icon>edit</v-icon>
           </v-btn>
+          <v-btn icon class="primary" @click="onRestore()" v-if="restorable">
+            <v-icon>restore_from_trash</v-icon>
+          </v-btn>
           <div class="flex-grow-1"></div>
           <v-btn icon @click="onCopy()">
             <v-icon>file_copy</v-icon>
@@ -86,6 +89,16 @@
         type: Boolean,
         required: false,
         default: false
+      },
+      editable: {
+        type: Boolean,
+        required: false,
+        default: true
+      },
+      restorable: {
+        type: Boolean,
+        required: false,
+        default: false
       }
     },
     data(){
@@ -109,6 +122,9 @@
       onEdit(){
         this.$emit('onEdit')
       },
+      onRestore(){
+        this.$emit('onRestore')
+      },
       onDelete(){
         this.$emit('onDelete')
       },

diff --git a/components/note/card/Credentials.vue b/components/note/card/Credentials.vue
@@ -68,9 +68,12 @@
       <v-btn icon class="error" @click="onDelete()">
         <v-icon>delete</v-icon>
       </v-btn>
-      <v-btn icon class="primary" @click="onEdit()">
+      <v-btn icon class="primary" @click="onEdit()" v-if="editable">
         <v-icon>edit</v-icon>
       </v-btn>
+      <v-btn icon class="primary" @click="onRestore()" v-if="restorable">
+        <v-icon>restore_from_trash</v-icon>
+      </v-btn>
 
       <div class="flex-grow-1"></div>
 
@@ -101,6 +104,16 @@
         type: Boolean,
         required: false,
         default: false
+      },
+      editable: {
+        type: Boolean,
+        required: false,
+        default: true
+      },
+      restorable: {
+        type: Boolean,
+        required: false,
+        default: false
       }
     },
     data(){
@@ -121,6 +134,9 @@
       onEdit(){
         this.$emit('onEdit')
       },
+      onRestore(){
+        this.$emit('onRestore')
+      },
       onDelete(){
         this.$emit('onDelete')
       },

diff --git a/components/note/card/Picture.vue b/components/note/card/Picture.vue
@@ -44,9 +44,12 @@
       <v-btn icon class="error" @click="onDelete()">
         <v-icon>delete</v-icon>
       </v-btn>
-      <v-btn icon class="primary" @click="onEdit()">
+      <v-btn icon class="primary" @click="onEdit()" v-if="editable">
         <v-icon>edit</v-icon>
       </v-btn>
+      <v-btn icon class="primary" @click="onRestore()" v-if="restorable">
+        <v-icon>restore_from_trash</v-icon>
+      </v-btn>
 
       <div class="flex-grow-1"></div>
 
@@ -77,7 +80,17 @@
         type: Boolean,
         required: false,
         default: false
-      }
+      },
+      editable: {
+        type: Boolean,
+        required: false,
+        default: true
+      },
+      restorable: {
+        type: Boolean,
+        required: false,
+        default: false
+      },
     },
     data(){
       return {
@@ -97,6 +110,9 @@
       onEdit(){
         this.$emit('onEdit')
       },
+      onRestore(){
+        this.$emit('onRestore')
+      },
       onDelete(){
         this.$emit('onDelete')
       },

diff --git a/components/note/card/Reminder.vue b/components/note/card/Reminder.vue
@@ -68,9 +68,12 @@
       <v-btn icon class="error" @click="onDelete()">
         <v-icon>delete</v-icon>
       </v-btn>
-      <v-btn icon class="primary" @click="onEdit()">
+      <v-btn icon class="primary" @click="onEdit()" v-if="editable">
         <v-icon>edit</v-icon>
       </v-btn>
+      <v-btn icon class="primary" @click="onRestore()" v-if="restorable">
+        <v-icon>restore_from_trash</v-icon>
+      </v-btn>
 
       <div class="flex-grow-1"></div>
 
@@ -106,7 +109,17 @@
         type: Boolean,
         required: false,
         default: false
-      }
+      },
+      editable: {
+        type: Boolean,
+        required: false,
+        default: true
+      },
+      restorable: {
+        type: Boolean,
+        required: false,
+        default: false
+      },
     },
     data(){
       return {
@@ -136,6 +149,9 @@
       onEdit(){
         this.$emit('onEdit')
       },
+      onRestore(){
+        this.$emit('onRestore')
+      },
       onDelete(){
         this.$emit('onDelete')
       },

diff --git a/components/note/card/Template.vue b/components/note/card/Template.vue
@@ -49,9 +49,12 @@
       <v-btn icon class="error" @click="onDelete()">
         <v-icon>delete</v-icon>
       </v-btn>
-      <v-btn icon class="primary" @click="onEdit()">
+      <v-btn icon class="primary" @click="onEdit()" v-if="editable">
         <v-icon>edit</v-icon>
       </v-btn>
+      <v-btn icon class="primary" @click="onRestore()" v-if="restorable">
+        <v-icon>restore_from_trash</v-icon>
+      </v-btn>
 
       <div class="flex-grow-1"></div>
 
@@ -90,7 +93,17 @@
         type: Boolean,
         required: false,
         default: false
-      }
+      },
+      editable: {
+        type: Boolean,
+        required: false,
+        default: true
+      },
+      restorable: {
+        type: Boolean,
+        required: false,
+        default: false
+      },
     },
     data(){
       return {
@@ -111,6 +124,9 @@
       onEdit(){
         this.$emit('onEdit')
       },
+      onRestore(){
+        this.$emit('onRestore')
+      },
       onDelete(){
         this.$emit('onDelete')
       },

diff --git a/components/note/card/Text.vue b/components/note/card/Text.vue
@@ -48,9 +48,12 @@
       <v-btn icon class="error" @click="onDelete()">
         <v-icon>delete</v-icon>
       </v-btn>
-      <v-btn icon class="primary" @click="onEdit()">
+      <v-btn icon class="primary" @click="onEdit()" v-if="editable">
         <v-icon>edit</v-icon>
       </v-btn>
+      <v-btn icon class="primary" @click="onRestore()" v-if="restorable">
+        <v-icon>restore_from_trash</v-icon>
+      </v-btn>
 
       <div class="flex-grow-1"></div>
 
@@ -85,6 +88,16 @@
         type: Boolean,
         required: false,
         default: false
+      },
+      editable: {
+        type: Boolean,
+        required: false,
+        default: true
+      },
+      restorable: {
+        type: Boolean,
+        required: false,
+        default: false
       }
     },
     data(){
@@ -105,6 +118,9 @@
       onEdit(){
         this.$emit('onEdit')
       },
+      onRestore(){
+        this.$emit('onRestore')
+      },
       onDelete(){
         this.$emit('onDelete')
       },

diff --git a/components/settings/Note.vue b/components/settings/Note.vue
@@ -16,6 +16,11 @@
           ></v-select>
         </v-col>
       </v-row>
+      <v-row>
+        <v-col cols="12" sm="6">
+          <v-switch v-model="notes.deleteFast" :label="$t('settings.notes.delete.fast')" color="primary"></v-switch>
+        </v-col>
+      </v-row>
     </v-card-text>
   </v-card>
 </template>
@@ -30,6 +35,7 @@
         notes: {
           size: 'small',
           fixedSize: false,
+          deleteFast: true
         },
         noteSizes: [
           {label: 'settings.notes.size.small', value: 'small'},
@@ -46,13 +52,15 @@
     methods: {
       ...mapMutations({
         setNoteSize: 'settings/setNoteSize',
+        setNoteDeleteHard: 'settings/setNoteDeleteHard',
       }),
       getNoteSizeItemLabel(item){
         return this.$t(item.label)
       },
       updateNoteSettings(settings){
         this.notes.fixedSize = settings.fixed
         this.notes.size = settings.size
+        this.notes.deleteFast = !settings.deleteHard
       },
     },
     watch: {
@@ -67,8 +75,9 @@
         handler(notes) {
           this.setNoteSize({
             fixed: notes.fixedSize,
-            size: notes.size
+            size: notes.size,
           })
+          this.setNoteDeleteHard(!notes.deleteFast)
         }
       },
     },

diff --git a/layouts/default.vue b/layouts/default.vue
@@ -32,6 +32,16 @@
 
         <v-divider />
 
+        <v-list-item router to="/trash/">
+          <v-list-item-action>
+            <v-icon v-if="hasDeletedNotes">delete</v-icon>
+            <v-icon v-else>delete_outline</v-icon>
+          </v-list-item-action>
+          <v-list-item-content>
+            <v-list-item-title v-text="$t('navigation.trash')" />
+          </v-list-item-content>
+        </v-list-item>
+
         <v-list-item router to="/backup/">
           <v-list-item-action>
             <v-icon>import_export</v-icon>
@@ -80,7 +90,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex';
+import { mapState, mapGetters } from 'vuex';
 import { generateBoardQuery, readBoardQuery } from '../common/boardQuery'
 import Info from "../components/Info";
 import OverdueNotifications from "../components/note/OverdueNotifications";
@@ -102,6 +112,9 @@ export default {
       boards: state => state.board.boards,
       boardOrder: state => state.board.boardOrder,
     }),
+    ...mapGetters({
+      hasDeletedNotes: 'note/hasDeletedNotes',
+    }),
   },
   methods: {
     applyBoards(){

diff --git a/locales/de.json b/locales/de.json
@@ -60,6 +60,7 @@
   },
   "navigation": {
     "home": "Alle",
+    "trash": "Papierkorb",
     "settings": "Einstellungen",
     "backup": "Sicherung",
     "help": "Hilfe"
@@ -177,7 +178,15 @@
     "saved": {
       "successful": "Inhalt wurde gespeichert."
     },
+    "restored": {
+      "successful": "Die Notiz wurde wiederhergestellt."
+    },
     "delete": {
+      "all": {
+        "action": "Papierkorb leeren",
+        "confirmation": "Sind Sie sicher, dass Sie all diese Notizen löschen wollen?"
+      },
+      "trash": "Die Notiz wurde in den Papierkorb verschoben.",
       "confirmation": "Sind Sie sicher, dass Sie diese Notiz löschen wollen?"
     }
   },
@@ -444,6 +453,9 @@
         "small": "Klein",
         "medium": "Mittel",
         "large": "Groß"
+      },
+      "delete": {
+        "fast": "Schnelles Löschen"
       }
     },
     "theme": {