Merge branch 'bulk-operations' into sorting

resources/js/i18n/lang/cn.json

@@ -256,6 +256,7 @@
 	},
 	"alerts": {
 		"error_confirm": "哦，出了个问题！",
+		"leave_to_sign_in": "Do you really want to leave?",
 		"success_confirm": "太棒了！"
 	},
 	"context_menu": {
@@ -273,7 +274,7 @@
 		"rename": "重命名",
 		"restore": "恢复文件",
 		"share": "分享",
-		"share_cancel": "Share Cancel",
+		"share_cancel": "Cancel Sharing",
 		"share_edit": "编辑分享设定",
 		"upload": "上传",
 		"select": "Select"

resources/js/i18n/lang/en.json

@@ -258,6 +258,7 @@
 	},
 	"alerts": {
 		"error_confirm": "That’s horrible!",
+		"leave_to_sign_in": "Do you really want to leave?",
 		"success_confirm": "Awesome!"
 	},
 	"context_menu": {
@@ -275,7 +276,7 @@
 		"rename": "Rename",
 		"restore": "Restore",
 		"share": "Share",
-		"share_cancel": "Share Cancel",
+		"share_cancel": "Cancel Sharing",
 		"share_edit": "Edit Sharing",
 		"upload": "Upload",
 		"select": "Select"

resources/js/i18n/lang/sk.json

@@ -258,6 +258,7 @@
 	},
 	"alerts": {
 		"error_confirm": "To je hrozné!",
+		"leave_to_sign_in": "Naozaj chcete odísť?",
 		"success_confirm": "Skvelé!"
 	},
 	"context_menu": {

resources/js/views/FilePages/Files.vue

@@ -1,11 +1,11 @@
 <template>
-     <section id="viewport" v-if="user">
+    <section id="viewport" v-if="user">
 
         <ContentSidebar>
 
             <!--Empty storage warning-->
             <ContentGroup v-if="config.storageLimit && storage.used > 95">
-                <UpgradeSidebarBanner />
+                <UpgradeSidebarBanner/>
             </ContentGroup>
 
             <!--Locations-->
@@ -19,8 +19,7 @@
                             {{ $t('sidebar.home') }}
                         </div>
                     </a>
-                    <a class="menu-list-item link" :class="{'is-active': $isThisLocation(['latest'])}"
-                       @click="getLatest">
+                    <a class="menu-list-item link" :class="{'is-active': $isThisLocation(['latest'])}" @click="getLatest">
                         <div class="icon">
                             <upload-cloud-icon size="17"></upload-cloud-icon>
                         </div>
@@ -28,8 +27,7 @@
                             {{ $t('sidebar.latest') }}
                         </div>
                     </a>
-                    <a class="menu-list-item link trash" :class="{'is-active-trash': $isThisLocation(['trash', 'trash-root'])}"
-                       @click="getTrash">
+                    <a class="menu-list-item link trash" :class="{'is-active-trash': $isThisLocation(['trash', 'trash-root'])}" @click="getTrash">
                         <div class="icon">
                             <trash2-icon size="17"></trash2-icon>
                         </div>
@@ -45,29 +43,19 @@
                 <span class="empty-note navigator" v-if="tree.length == 0">
                     {{ $t('sidebar.folders_empty') }}
                 </span>
-                <TreeMenuNavigator class="folder-tree" :depth="0" :nodes="items" v-for="items in tree"
-                                   :key="items.unique_id"/>
+                <TreeMenuNavigator class="folder-tree" :depth="0" :nodes="items" v-for="items in tree" :key="items.unique_id"/>
             </ContentGroup>
 
             <!--Favourites-->
             <ContentGroup :title="$t('sidebar.favourites')" slug="favourites" :can-collapse="true">
 
-                <div class="menu-list-wrapper vertical favourites"
-                     :class="{ 'is-dragenter': area }"
-                     @dragover.prevent="dragEnter"
-                     @dragleave="dragLeave"
-                     @drop="dragFinish($event)"
-                >
+                <div class="menu-list-wrapper vertical favourites" :class="{ 'is-dragenter': area }" @dragover.prevent="dragEnter" @dragleave="dragLeave" @drop="dragFinish($event)">
                     <transition-group tag="div" class="menu-list" name="folder-item">
                         <span class="empty-note favourites" v-if="favourites.length == 0" :key="0">
                             {{ $t('sidebar.favourites_empty') }}
                         </span>
 
-                        <a @click.stop="openFolder(folder)"
-                           class="menu-list-item"
-                           :class="{'is-current': (folder && currentFolder) && (currentFolder.unique_id === folder.unique_id)}"
-                           v-for="folder in favourites"
-                           :key="folder.unique_id">
+                        <a @click.stop="openFolder(folder)" class="menu-list-item" :class="{'is-current': (folder && currentFolder) && (currentFolder.unique_id === folder.unique_id)}" v-for="folder in favourites" :key="folder.unique_id">
                             <div>
                                 <folder-icon size="17" class="folder-icon"></folder-icon>
                                 <span class="label">{{ folder.name }}</span>
@@ -85,190 +73,190 @@
 </template>
 
 <script>
-    import UpgradeSidebarBanner from '@/components/Others/UpgradeSidebarBanner'
-    import TreeMenuNavigator from '@/components/Others/TreeMenuNavigator'
-    import MultiSelected from '@/components/FilesView/MultiSelected'
-    import ContentFileView from '@/components/Others/ContentFileView'
-    import ContentSidebar from '@/components/Sidebar/ContentSidebar'
-    import ContentGroup from '@/components/Sidebar/ContentGroup'
-    import {mapGetters} from 'vuex'
-    import {events} from '@/bus'
-    import {
+import UpgradeSidebarBanner from '@/components/Others/UpgradeSidebarBanner'
+import TreeMenuNavigator from '@/components/Others/TreeMenuNavigator'
+import MultiSelected from '@/components/FilesView/MultiSelected'
+import ContentFileView from '@/components/Others/ContentFileView'
+import ContentSidebar from '@/components/Sidebar/ContentSidebar'
+import ContentGroup from '@/components/Sidebar/ContentGroup'
+import { mapGetters } from 'vuex'
+import { events } from '@/bus'
+import {
+    UploadCloudIcon,
+    FolderIcon,
+    Trash2Icon,
+    HomeIcon,
+    XIcon
+} from 'vue-feather-icons'
+
+export default {
+    name: 'FilesView',
+    components: {
+        UpgradeSidebarBanner,
+        TreeMenuNavigator,
+        ContentFileView,
+        MultiSelected,
+        ContentSidebar,
         UploadCloudIcon,
+        ContentGroup,
         FolderIcon,
         Trash2Icon,
         HomeIcon,
-        XIcon,
-    } from 'vue-feather-icons'
-
-    export default {
-        name: 'FilesView',
-        components: {
-            UpgradeSidebarBanner,
-            TreeMenuNavigator,
-            ContentFileView,
-            MultiSelected,
-            ContentSidebar,
-            UploadCloudIcon,
-            ContentGroup,
-            FolderIcon,
-            Trash2Icon,
-            HomeIcon,
-            XIcon,
+        XIcon
+    },
+    computed: {
+        ...mapGetters(['user', 'homeDirectory', 'currentFolder', 'config', 'fileInfoDetail']),
+        favourites() {
+            return this.user.relationships.favourites.data.attributes.folders
         },
-        computed: {
-            ...mapGetters(['user', 'homeDirectory', 'currentFolder', 'config', 'fileInfoDetail']),
-            favourites() {
-                return this.user.relationships.favourites.data.attributes.folders
-            },
-            tree() {
-                return this.user.relationships.tree.data.attributes.folders
-            },
-            storage() {
-                return this.$store.getters.user.relationships.storage.data.attributes
-            }
+        tree() {
+            return this.user.relationships.tree.data.attributes.folders
         },
-        data() {
-            return {
-                area: false,
-                draggedItem: undefined,
-            }
+        storage() {
+            return this.$store.getters.user.relationships.storage.data.attributes
+        }
+    },
+    data() {
+        return {
+            area: false,
+            draggedItem: undefined
+        }
+    },
+    methods: {
+        getTrash() {
+            this.$store.dispatch('getTrash')
         },
-        methods: {
-            getTrash() {
-                this.$store.dispatch('getTrash')
-            },
-            getLatest() {
-                this.$store.dispatch('getLatest')
-            },
-            goHome() {
-                this.$store.dispatch('getFolder', [{folder: this.homeDirectory, back: false, init: true}])
-            },
-            openFolder(folder) {
-                this.$store.dispatch('getFolder', [{folder: folder, back: false, init: false}])
-            },
-            dragEnter() {
-                if (this.draggedItem && this.draggedItem.type !== 'folder') return
+        getLatest() {
+            this.$store.dispatch('getLatest')
+        },
+        goHome() {
+            this.$store.dispatch('getFolder', [{ folder: this.homeDirectory, back: false, init: true }])
+        },
+        openFolder(folder) {
+            this.$store.dispatch('getFolder', [{ folder: folder, back: false, init: false }])
+        },
+        dragEnter() {
+            if (this.draggedItem && this.draggedItem.type !== 'folder') return
 
-                if(this.fileInfoDetail.length > 0 && this.fileInfoDetail.find(item => item.type !== 'folder'))  return
+            if (this.fileInfoDetail.length > 0 && this.fileInfoDetail.find(item => item.type !== 'folder')) return
 
-                this.area = true
-            },
-            dragLeave() {
-                this.area = false
-            },
-            dragFinish() {
-                this.area = false
+            this.area = true
+        },
+        dragLeave() {
+            this.area = false
+        },
+        dragFinish() {
+            this.area = false
 
-                events.$emit('drop')
+            events.$emit('drop')
 
-                // Check if dragged item is folder
-                if (this.draggedItem && this.draggedItem.type !== 'folder') return
+            // Check if dragged item is folder
+            if (this.draggedItem && this.draggedItem.type !== 'folder') return
 
-                // Check if folder exist in favourites
-                if (this.favourites.find(folder => folder.unique_id == this.draggedItem.unique_id)) return
+            // Check if folder exist in favourites
+            if (this.favourites.find(folder => folder.unique_id == this.draggedItem.unique_id)) return
 
-                // Prevent to move folders to self
-                if(this.fileInfoDetail.length > 0 && this.fileInfoDetail.find(item => item.type !== 'folder'))  return
-               
-                // Store favourites folder
-                
-                //Add to favourites non selected folder
-                if(!this.fileInfoDetail.includes(this.draggedItem)){
+            // Prevent to move folders to self
+            if (this.fileInfoDetail.length > 0 && this.fileInfoDetail.find(item => item.type !== 'folder')) return
+
+            // Store favourites folder
+
+            //Add to favourites non selected folder
+            if (!this.fileInfoDetail.includes(this.draggedItem)) {
                 this.$store.dispatch('addToFavourites', this.draggedItem)
-                }
-                
-                //Add to favourites selected folders
-                 if(this.fileInfoDetail.includes(this.draggedItem)) {
-                this.$store.dispatch('addToFavourites', null)            
-                }
-
-               
-            },
-            removeFavourite(folder) {
-                this.$store.dispatch('removeFromFavourites', folder)
             }
+
+            //Add to favourites selected folders
+            if (this.fileInfoDetail.includes(this.draggedItem)) {
+                this.$store.dispatch('addToFavourites', null)
+            }
+
+
         },
-        created() {
-            this.goHome()
+        removeFavourite(folder) {
+            this.$store.dispatch('removeFromFavourites', folder)
+        }
+    },
+    created() {
+        this.goHome()
 
-            // Listen for dragstart folder items
-            events.$on('dragstart', (item) => { this.draggedItem = item , this.dragInProgress = true})
+        // Listen for dragstart folder items
+        events.$on('dragstart', (item) => {
+            this.draggedItem = item , this.dragInProgress = true
+        })
 
-            events.$on('drop', () => {
-                this.dragInProgress = false
-            })
-        },
-        beforeRouteLeave(to, from, next) {
-            // Inquire user about his willing to step back to sign in page
-            if (to.name === 'SignIn') {
-                const answer = window.confirm('Do you really want to leave?')
-
-                if (answer) {
-                    next()
-                } else {
-                    next(false)
-                }
-            } else {
+        events.$on('drop', () => {
+            this.dragInProgress = false
+        })
+    },
+    beforeRouteLeave(to, from, next) {
+        // Inquire user about his willing to step back to sign in page
+        if (to.name === 'SignIn') {
+            if (window.confirm(this.$t('alerts.leave_to_sign_in'))) {
                 next()
+            } else {
+                next(false)
             }
-        },
+        } else {
+            next()
+        }
     }
+}
 </script>
 
 <style lang="scss" scoped>
 
+.empty-note {
+
+    &.navigator {
+        padding: 5px 25px 10px;
+    }
+
+    &.favourites {
+        padding: 5px 23px 10px;
+    }
+}
+
+.navigator {
+    width: 100%;
+    overflow-x: auto;
+}
+
+@media only screen and (max-width: 1024px) {
+
     .empty-note {
 
         &.navigator {
-            padding: 5px 25px 10px;
+            padding: 5px 20px 10px;
         }
 
         &.favourites {
-            padding: 5px 23px 10px;
+            padding: 5px 18px 10px;
         }
     }
+}
 
-    .navigator {
-        width: 100%;
-        overflow-x: auto;
-    }
+// Transition
+.folder-item-move {
+    transition: transform 300s ease;
+}
 
-    @media only screen and (max-width: 1024px) {
+.folder-item-enter-active {
+    transition: all 300ms ease;
+}
 
-        .empty-note {
+.folder-item-leave-active {
+    transition: all 300ms;
+}
 
-            &.navigator {
-                padding: 5px 20px 10px;
-            }
+.folder-item-enter, .folder-item-leave-to /* .list-leave-active below version 2.1.8 */
+{
+    opacity: 0;
+    transform: translateX(30px);
+}
 
-            &.favourites {
-                padding: 5px 18px 10px;
-            }
-        }
-    }
-
-    // Transition
-    .folder-item-move {
-        transition: transform 300s ease;
-    }
-
-    .folder-item-enter-active {
-        transition: all 300ms ease;
-    }
-
-    .folder-item-leave-active {
-        transition: all 300ms;
-    }
-
-    .folder-item-enter, .folder-item-leave-to /* .list-leave-active below version 2.1.8 */
-    {
-        opacity: 0;
-        transform: translateX(30px);
-    }
-
-    .folder-item-leave-active {
-        position: absolute;
-    }
+.folder-item-leave-active {
+    position: absolute;
+}
 
 </style>