Merge pull request alexusmai#18 from lkloon123/develop

Enhanced UX

Author: alexusmai

src/components/blocks/Navbar.vue

@@ -36,27 +36,30 @@
                             disabled
                             v-if="uploading"
                             v-bind:title="lang.btn.upload">
-                        <i class="fas fa-download"></i>
+                        <i class="fas fa-upload"></i>
                     </button>
                     <button type="button" class="btn btn-secondary"
                             v-else
                             v-on:click="showModal('Upload')"
                             v-bind:title="lang.btn.upload">
-                        <i class="fas fa-download"></i>
+                        <i class="fas fa-upload"></i>
                     </button>
                     <button type="button" class="btn btn-secondary"
+                            v-bind:disabled="!isAnyItemSelected"
                             v-on:click="showModal('Delete')"
                             v-bind:title="lang.btn.delete">
                         <i class="fas fa-trash-alt"></i>
                     </button>
                 </div>
                 <div class="btn-group" role="group">
                     <button type="button" class="btn btn-secondary"
+                            v-bind:disabled="!isAnyItemSelected"
                             v-bind:title="lang.btn.copy"
                             v-on:click="toClipboard('copy')">
                         <i class="fas fa-copy"></i>
                     </button>
                     <button type="button" class="btn btn-secondary"
+                            v-bind:disabled="!isAnyItemSelected"
                             v-bind:title="lang.btn.cut"
                             v-on:click="toClipboard('cut')">
                         <i class="fas fa-cut"></i>
@@ -106,6 +109,7 @@
 
 <script>
 import translate from './../../mixins/translate';
+import EventBus from './../../eventBus';
 
 export default {
   mixins: [translate],
@@ -135,6 +139,15 @@ export default {
           this.$store.state.fm[this.activeManager].history.length - 1;
     },
 
+    /**
+     * Is any files or directories selected?
+     * @returns {boolean}
+     */
+    isAnyItemSelected() {
+      return this.$store.state.fm[this.activeManager].selected.files.length > 0 ||
+          this.$store.state.fm[this.activeManager].selected.directories.length > 0;
+    },
+
     /**
      * Manager view type - grid or table
      * @returns {default.computed.viewType|(function())|string}
@@ -195,6 +208,13 @@ export default {
      */
     toClipboard(type) {
       this.$store.dispatch('fm/toClipboard', type);
+
+      // show notification
+      if(type === 'cut') {
+          EventBus.$emit('addNotification', {status: 'success', message: 'Cut to clipboard!'});
+      } else if(type === 'copy') {
+          EventBus.$emit('addNotification', {status: 'success', message: 'Copied to clipboard!'});
+      }
     },
 
     /**

src/components/manager/GridView.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="fm-grid">
         <div class="d-flex align-content-start flex-wrap">
-            <div class="fm-grid-item text-center" v-on:click="levelUp">
+            <div class="fm-grid-item text-center" v-on:click="levelUp" v-if="!isRootPath">
                 <div class="fm-item-icon">
                     <i class="fas fa-level-up-alt fa-5x pb-2"></i>
                 </div>

src/components/manager/TableView.vue

@@ -42,7 +42,7 @@
                 </tr>
             </thead>
             <tbody>
-                <tr>
+                <tr v-if="!isRootPath">
                     <td colspan="4" class="fm-content-item" v-on:click="levelUp">
                         <i class="fas fa-level-up-alt"></i>
                     </td>

src/components/manager/mixins/manager.js

@@ -49,6 +49,13 @@ export default {
     acl() {
       return this.$store.state.fm.settings.acl;
     },
+
+    /**
+    * Check if current path is at root level
+    */
+    isRootPath() {
+      return this.$store.state.fm[this.manager].selectedDirectory === null;
+    }
   },
   methods: {
     /**