editing with shared items in public

resources/js/components/FilesView/Alert.vue

@@ -23,7 +23,7 @@
 </template>
 
 <script>
-    import ButtonBase from '@/components/VueFileManagerComponents/FilesView/ButtonBase'
+    import ButtonBase from '@/components/FilesView/ButtonBase'
     import {events} from '@/bus'
 
     export default {

resources/js/components/FilesView/DesktopToolbar.vue

@@ -46,7 +46,7 @@
                 <div class="toolbar-button-wrapper">
                     <ToolbarButton
                             :source="preview"
-                            action=""
+                            action="Change Preview"
                             @click.native="$store.dispatch('changePreviewType')"
                     />
                     <ToolbarButton
@@ -62,10 +62,10 @@
 </template>
 
 <script>
-    import ToolbarButtonUpload from '@/components/VueFileManagerComponents/FilesView/ToolbarButtonUpload'
-    import UploadProgress from '@/components/VueFileManagerComponents/FilesView/UploadProgress'
-    import ToolbarButton from '@/components/VueFileManagerComponents/FilesView/ToolbarButton'
-    import SearchBar from '@/components/VueFileManagerComponents/FilesView/SearchBar'
+    import ToolbarButtonUpload from '@/components/FilesView/ToolbarButtonUpload'
+    import UploadProgress from '@/components/FilesView/UploadProgress'
+    import ToolbarButton from '@/components/FilesView/ToolbarButton'
+    import SearchBar from '@/components/FilesView/SearchBar'
     import {mapGetters} from 'vuex'
     import {events} from '@/bus'
 
@@ -97,9 +97,6 @@
             preview() {
                 return this.FilePreviewType === 'list' ? 'th' : 'th-list'
             },
-            isTrash() {
-                return this.currentFolder.location === 'trash' || this.currentFolder.location === 'trash-root'
-            }
         },
         data() {
             return {
@@ -130,7 +127,8 @@
                 events.$emit('items:delete')
             },
             createFolder() {
-                if (! this.isTrash) this.$createFolder()
+                if (! this.$isThisLocation(['trash', 'trash-root']))
+                    this.$createFolder()
             }
         },
         created() {

resources/js/components/FilesView/EmptyPage.vue

@@ -35,8 +35,8 @@
 </template>
 
 <script>
-    import ButtonUpload from '@/components/VueFileManagerComponents/FilesView/ButtonUpload'
-    import Spinner from '@/components/VueFileManagerComponents/FilesView/Spinner'
+    import ButtonUpload from '@/components/FilesView/ButtonUpload'
+    import Spinner from '@/components/FilesView/Spinner'
     import {mapGetters} from 'vuex'
 
     export default {

resources/js/components/FilesView/FileBrowser.vue

@@ -83,14 +83,14 @@
 </template>
 
 <script>
-    import MobileToolbar from '@/components/VueFileManagerComponents/FilesView/MobileToolbar'
-    import MobileActions from '@/components/VueFileManagerComponents/FilesView/MobileActions'
-    import FileInfoPanel from '@/components/VueFileManagerComponents/FilesView/FileInfoPanel'
-    import FileItemList from '@/components/VueFileManagerComponents/FilesView/FileItemList'
-    import FileItemGrid from '@/components/VueFileManagerComponents/FilesView/FileItemGrid'
-    import EmptyMessage from '@/components/VueFileManagerComponents/FilesView/EmptyMessage'
-    import EmptyPage from '@/components/VueFileManagerComponents/FilesView/EmptyPage'
-    import SearchBar from '@/components/VueFileManagerComponents/FilesView/SearchBar'
+    import MobileToolbar from '@/components/FilesView/MobileToolbar'
+    import MobileActions from '@/components/FilesView/MobileActions'
+    import FileInfoPanel from '@/components/FilesView/FileInfoPanel'
+    import FileItemList from '@/components/FilesView/FileItemList'
+    import FileItemGrid from '@/components/FilesView/FileItemGrid'
+    import EmptyMessage from '@/components/FilesView/EmptyMessage'
+    import EmptyPage from '@/components/FilesView/EmptyPage'
+    import SearchBar from '@/components/FilesView/SearchBar'
     import {mapGetters} from 'vuex'
     import {events} from '@/bus'
 

resources/js/components/FilesView/FileInfoPanel.vue

@@ -65,8 +65,8 @@
 </template>
 
 <script>
-    import FilePreview from '@/components/VueFileManagerComponents/FilesView/FilePreview'
-    import CopyInput from '@/components/VueFileManagerComponents/Others/Forms/CopyInput'
+    import FilePreview from '@/components/FilesView/FilePreview'
+    import CopyInput from '@/components/Others/Forms/CopyInput'
     import {mapGetters} from 'vuex'
     import {events} from "@/bus"
 

resources/js/components/FilesView/FileItemGrid.vue

@@ -7,7 +7,7 @@
     >
         <!--Grid preview-->
         <div
-                :draggable="! isDeleted"
+                :draggable="canDrag"
                 @dragstart="$emit('dragstart')"
                 @drop="
 				$emit('drop')
@@ -49,11 +49,17 @@
                 </b>
 
                 <div class="item-info">
+
                     <!--Shared Icon-->
                     <div v-if="$checkPermission('master') && data.shared" class="item-shared">
                         <FontAwesomeIcon class="shared-icon" icon="user-friends"/>
                     </div>
 
+                    <!--Participant owner Icon-->
+                    <div v-if="$checkPermission('master') && data.user_scope !== 'master'" class="item-shared">
+                        <FontAwesomeIcon class="shared-icon" icon="user-edit"/>
+                    </div>
+
                     <!--Filesize-->
                     <span v-if="! isFolder" class="item-size">{{ data.filesize }}</span>
 
@@ -65,8 +71,8 @@
             </div>
 
             <span @click.stop="showItemActions" class="show-actions" v-if="$isMobile()">
-					<FontAwesomeIcon icon="ellipsis-h" class="icon-action"></FontAwesomeIcon>
-				</span>
+                <FontAwesomeIcon icon="ellipsis-h" class="icon-action"></FontAwesomeIcon>
+            </span>
         </div>
     </div>
 </template>
@@ -77,7 +83,7 @@
     import {events} from '@/bus'
 
     export default {
-        name: 'FileItem',
+        name: 'FileItemGrid',
         props: ['data'],
         computed: {
             ...mapGetters(['FilePreviewType']),
@@ -91,7 +97,10 @@
                 return this.data.type === 'image'
             },
             canEditName() {
-                return ! this.$isMobile() && ! this.$isThisLocation(['trash', 'trash-root']) && ! this.$checkPermission('visitor')
+                return !this.$isMobile() && !this.$isThisLocation(['trash', 'trash-root']) && !this.$checkPermission('visitor')
+            },
+            canDrag() {
+                return !this.isDeleted && this.$checkPermission(['master', 'editor'])
             },
             timeStamp() {
                 return this.data.deleted_at ? this.$t('item_thumbnail.deleted_at', this.data.deleted_at) : this.data.created_at
@@ -136,7 +145,7 @@
                 if (this.$isMobile() && this.isFolder) {
 
                     // Go to folder
-                    if ( this.$isThisLocation('public') ) {
+                    if (this.$isThisLocation('public')) {
                         this.$store.dispatch('browseShared', [this.data, false])
                     } else {
                         this.$store.dispatch('getFolder', [this.data, false])
@@ -170,7 +179,7 @@
 
                 if (this.isFolder) {
                     // Go to folder
-                    if ( this.$isThisLocation('public') ) {
+                    if (this.$isThisLocation('public')) {
                         this.$store.dispatch('browseShared', [this.data, false])
                     } else {
                         this.$store.dispatch('getFolder', [this.data, false])
@@ -364,6 +373,7 @@
                 height: 110px;
                 border-radius: 5px;
                 margin: 0 auto;
+                pointer-events: none;
             }
 
             .folder-icon {

resources/js/components/FilesView/FileItemList.vue

@@ -1,12 +1,13 @@
 <template>
     <div
-            @click.stop="clickedItem" @dblclick="goToItem"
             class="file-wrapper"
+            @click.stop="clickedItem"
+            @dblclick="goToItem"
             spellcheck="false"
     >
         <!--List preview-->
         <div
-                :draggable="! isDeleted"
+                :draggable="canDrag"
                 @dragstart="$emit('dragstart')"
                 @drop="
 				$emit('drop')
@@ -84,7 +85,7 @@
     import {events} from '@/bus'
 
     export default {
-        name: 'FileItem',
+        name: 'FileItemList',
         props: ['data'],
         computed: {
             ...mapGetters(['FilePreviewType']),
@@ -100,6 +101,9 @@
             canEditName() {
                 return ! this.$isMobile() && ! this.$isThisLocation(['trash', 'trash-root']) && ! this.$checkPermission('visitor')
             },
+            canDrag() {
+                return ! this.isDeleted && this.$checkPermission(['master', 'editor'])
+            },
             timeStamp() {
                 return this.data.deleted_at ? this.$t('item_thumbnail.deleted_at', {time: this.data.deleted_at}) : this.data.created_at
             },
@@ -169,11 +173,7 @@
                 // Get target classname
                 let itemClass = e.target.className
 
-                if (
-                    ['name', 'icon', 'file-link', 'file-icon-text'].includes(
-                        itemClass
-                    )
-                )
+                if (['name', 'icon', 'file-link', 'file-icon-text'].includes(itemClass))
                     return
             },
             goToItem() {
@@ -380,6 +380,7 @@
                 border-radius: 5px;
                 width: 50px;
                 height: 50px;
+                pointer-events: none;
             }
         }
 

resources/js/components/FilesView/MobileActions.vue

@@ -12,7 +12,7 @@
         </div>
 
         <!--ContextMenu for Base location with MASTER permission-->
-        <div v-if="$isThisLocation(['base', 'shared']) && $checkPermission(['master', 'editor'])" class="mobile-actions">
+        <div v-if="$isThisLocation(['base', 'shared', 'public']) && $checkPermission(['master', 'editor'])" class="mobile-actions">
             <MobileActionButton @click.native="createFolder" icon="folder-plus">
                 {{ $t('context_menu.add_folder') }}
             </MobileActionButton>
@@ -25,7 +25,7 @@
         </div>
 
         <!--ContextMenu for Base location with VISITOR permission-->
-        <div v-if="$isThisLocation(['base', 'shared']) && $checkPermission('visitor')" class="mobile-actions">
+        <div v-if="$isThisLocation(['base', 'shared', 'public']) && $checkPermission('visitor')" class="mobile-actions">
             <MobileActionButton @click.native="switchPreview" :icon="previewIcon">
                 {{ previewText }}
             </MobileActionButton>
@@ -37,9 +37,9 @@
 </template>
 
 <script>
-    import MobileActionButtonUpload from '@/components/VueFileManagerComponents/FilesView/MobileActionButtonUpload'
-    import MobileActionButton from '@/components/VueFileManagerComponents/FilesView/MobileActionButton'
-    import UploadProgress from '@/components/VueFileManagerComponents/FilesView/UploadProgress'
+    import MobileActionButtonUpload from '@/components/FilesView/MobileActionButtonUpload'
+    import MobileActionButton from '@/components/FilesView/MobileActionButton'
+    import UploadProgress from '@/components/FilesView/UploadProgress'
     import {mapGetters} from 'vuex'
     import {debounce} from 'lodash'
     import {events} from '@/bus'

resources/js/components/FilesView/MobileMenu.vue

@@ -64,7 +64,7 @@
                     </ul>
 
                     <!--Mobile for Base location with EDITOR permission-->
-                    <ul v-if="$isThisLocation(['base']) && $checkPermission('editor')" class="menu-options">
+                    <ul v-if="$isThisLocation(['base', 'public']) && $checkPermission('editor')" class="menu-options">
                         <li class="menu-option" @click="renameItem" v-if="fileInfoDetail">
                             {{ $t('context_menu.rename') }}
                         </li>
@@ -77,7 +77,7 @@
                     </ul>
 
                     <!--Mobile for Base location with VISITOR permission-->
-                    <ul v-if="$isThisLocation(['base']) && $checkPermission('visitor')" class="menu-options">
+                    <ul v-if="$isThisLocation(['base', 'public']) && $checkPermission('visitor')" class="menu-options">
                         <li class="menu-option" @click="downloadItem" v-if="! isFolder">
                             {{ $t('context_menu.download') }}
                         </li>

resources/js/components/FilesView/MobileToolbar.vue

@@ -14,8 +14,8 @@
         <div class="directory-name">{{ directoryName }}</div>
 
         <!--More Actions-->
-        <div class="more-actions-button" @click="showSidebarMenu">
-            <div class="tap-area">
+        <div class="more-actions-button">
+            <div class="tap-area" @click="showSidebarMenu" v-if="$checkPermission('master')">
                 <FontAwesomeIcon icon="bars" v-if="isSmallAppSize"></FontAwesomeIcon>
             </div>
         </div>
@@ -23,9 +23,9 @@
 </template>
 
 <script>
-    import ToolbarButtonUpload from '@/components/VueFileManagerComponents/FilesView/ToolbarButtonUpload'
-    import ToolbarButton from '@/components/VueFileManagerComponents/FilesView/ToolbarButton'
-    import SearchBar from '@/components/VueFileManagerComponents/FilesView/SearchBar'
+    import ToolbarButtonUpload from '@/components/FilesView/ToolbarButtonUpload'
+    import ToolbarButton from '@/components/FilesView/ToolbarButton'
+    import SearchBar from '@/components/FilesView/SearchBar'
     import {mapGetters} from 'vuex'
     import {events} from '@/bus'
 

resources/js/components/FilesView/UploadProgress.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script>
-    import ProgressBar from '@/components/VueFileManagerComponents/FilesView/ProgressBar'
+    import ProgressBar from '@/components/FilesView/ProgressBar'
     import {mapGetters} from 'vuex'
 
     export default {

resources/js/components/Others/MoveItem.vue

@@ -4,15 +4,15 @@
         <PopupHeader :title="$t('popup_move_item.title')" />
 
         <!--Content-->
-        <PopupContent type="height-limited" v-if="app && pickedItem">
+        <PopupContent type="height-limited" v-if="pickedItem">
 
             <!--Show Spinner when loading folders-->
             <Spinner v-if="isLoadingTree"/>
 
             <!--Folder tree-->
-            <div v-if="! isLoadingTree">
+            <div v-if="! isLoadingTree && navigation">
                 <ThumbnailItem class="item-thumbnail" :item="pickedItem" info="location"/>
-                <TreeMenu :depth="1" :nodes="items" v-for="items in app.folders" :key="items.unique_id"/>
+                <TreeMenu :depth="1" :nodes="items" v-for="items in navigation" :key="items.unique_id"/>
             </div>
         </PopupContent>
 
@@ -35,14 +35,14 @@
 </template>
 
 <script>
-    import PopupWrapper from '@/components/VueFileManagerComponents/Others/Popup/PopupWrapper'
-    import PopupActions from '@/components/VueFileManagerComponents/Others/Popup/PopupActions'
-    import PopupContent from '@/components/VueFileManagerComponents/Others/Popup/PopupContent'
-    import PopupHeader from '@/components/VueFileManagerComponents/Others/Popup/PopupHeader'
-    import ThumbnailItem from '@/components/VueFileManagerComponents/Others/ThumbnailItem'
-    import ButtonBase from '@/components/VueFileManagerComponents/FilesView/ButtonBase'
-    import Spinner from '@/components/VueFileManagerComponents/FilesView/Spinner'
-    import TreeMenu from '@/components/VueFileManagerComponents/Others/TreeMenu'
+    import PopupWrapper from '@/components/Others/Popup/PopupWrapper'
+    import PopupActions from '@/components/Others/Popup/PopupActions'
+    import PopupContent from '@/components/Others/Popup/PopupContent'
+    import PopupHeader from '@/components/Others/Popup/PopupHeader'
+    import ThumbnailItem from '@/components/Others/ThumbnailItem'
+    import ButtonBase from '@/components/FilesView/ButtonBase'
+    import Spinner from '@/components/FilesView/Spinner'
+    import TreeMenu from '@/components/Others/TreeMenu'
     import {mapGetters} from 'vuex'
     import {events} from '@/bus'
 
@@ -59,7 +59,7 @@
             Spinner,
         },
         computed: {
-            ...mapGetters(['app']),
+            ...mapGetters(['navigation']),
         },
         data() {
             return {

resources/js/components/Others/ShareCreate.vue

@@ -65,16 +65,16 @@
 </template>
 
 <script>
-    import PopupWrapper from '@/components/VueFileManagerComponents/Others/Popup/PopupWrapper'
-    import PopupActions from '@/components/VueFileManagerComponents/Others/Popup/PopupActions'
-    import PopupContent from '@/components/VueFileManagerComponents/Others/Popup/PopupContent'
+    import PopupWrapper from '@/components/Others/Popup/PopupWrapper'
+    import PopupActions from '@/components/Others/Popup/PopupActions'
+    import PopupContent from '@/components/Others/Popup/PopupContent'
     import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
-    import PopupHeader from '@/components/VueFileManagerComponents/Others/Popup/PopupHeader'
-    import SwitchInput from '@/components/VueFileManagerComponents/Others/Forms/SwitchInput'
-    import SelectInput from '@/components/VueFileManagerComponents/Others/Forms/SelectInput'
-    import ThumbnailItem from '@/components/VueFileManagerComponents/Others/ThumbnailItem'
-    import CopyInput from '@/components/VueFileManagerComponents/Others/Forms/CopyInput'
-    import ButtonBase from '@/components/VueFileManagerComponents/FilesView/ButtonBase'
+    import PopupHeader from '@/components/Others/Popup/PopupHeader'
+    import SwitchInput from '@/components/Others/Forms/SwitchInput'
+    import SelectInput from '@/components/Others/Forms/SelectInput'
+    import ThumbnailItem from '@/components/Others/ThumbnailItem'
+    import CopyInput from '@/components/Others/Forms/CopyInput'
+    import ButtonBase from '@/components/FilesView/ButtonBase'
     import {required} from 'vee-validate/dist/rules'
     import {mapGetters} from 'vuex'
     import {events} from '@/bus'

resources/js/components/Others/ShareEdit.vue

@@ -67,17 +67,17 @@
 </template>
 
 <script>
-    import PopupWrapper from '@/components/VueFileManagerComponents/Others/Popup/PopupWrapper'
-    import PopupActions from '@/components/VueFileManagerComponents/Others/Popup/PopupActions'
-    import PopupContent from '@/components/VueFileManagerComponents/Others/Popup/PopupContent'
+    import PopupWrapper from '@/components/Others/Popup/PopupWrapper'
+    import PopupActions from '@/components/Others/Popup/PopupActions'
+    import PopupContent from '@/components/Others/Popup/PopupContent'
     import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
-    import PopupHeader from '@/components/VueFileManagerComponents/Others/Popup/PopupHeader'
-    import SwitchInput from '@/components/VueFileManagerComponents/Others/Forms/SwitchInput'
-    import SelectInput from '@/components/VueFileManagerComponents/Others/Forms/SelectInput'
-    import ThumbnailItem from '@/components/VueFileManagerComponents/Others/ThumbnailItem'
-    import ActionButton from '@/components/VueFileManagerComponents/Others/ActionButton'
-    import CopyInput from '@/components/VueFileManagerComponents/Others/Forms/CopyInput'
-    import ButtonBase from '@/components/VueFileManagerComponents/FilesView/ButtonBase'
+    import PopupHeader from '@/components/Others/Popup/PopupHeader'
+    import SwitchInput from '@/components/Others/Forms/SwitchInput'
+    import SelectInput from '@/components/Others/Forms/SelectInput'
+    import ThumbnailItem from '@/components/Others/ThumbnailItem'
+    import ActionButton from '@/components/Others/ActionButton'
+    import CopyInput from '@/components/Others/Forms/CopyInput'
+    import ButtonBase from '@/components/FilesView/ButtonBase'
     import {required} from 'vee-validate/dist/rules'
     import {mapGetters} from 'vuex'
     import {events} from '@/bus'

resources/js/components/Others/TreeMenu.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script>
-    import TreeMenu from '@/components/VueFileManagerComponents/Others/TreeMenu'
+    import TreeMenu from '@/components/Others/TreeMenu'
     import {events} from "@/bus"
 
     export default {

resources/js/components/Sidebar/Sidebar.vue

@@ -73,11 +73,11 @@
 </template>
 
 <script>
-    import FileListItemThumbnail from '@/components/VueFileManagerComponents/Sidebar/FileListItemThumbnail'
-    import UserHeadline from '@/components/VueFileManagerComponents/Sidebar/UserHeadline'
-    import ButtonBase from '@/components/VueFileManagerComponents/FilesView/ButtonBase'
-    import StorageSize from '@/components/VueFileManagerComponents/Sidebar/StorageSize'
-    import TextLabel from '@/components/VueFileManagerComponents/Others/TextLabel'
+    import FileListItemThumbnail from '@/components/Sidebar/FileListItemThumbnail'
+    import UserHeadline from '@/components/Sidebar/UserHeadline'
+    import ButtonBase from '@/components/FilesView/ButtonBase'
+    import StorageSize from '@/components/Sidebar/StorageSize'
+    import TextLabel from '@/components/Others/TextLabel'
     import {mapGetters} from 'vuex'
     import {events} from '@/bus'
 

resources/js/components/Sidebar/StorageSize.vue

@@ -9,7 +9,7 @@
 </template>
 
 <script>
-    import ProgressBar from '@/components/VueFileManagerComponents/FilesView/ProgressBar'
+    import ProgressBar from '@/components/FilesView/ProgressBar'
     import { mapGetters } from 'vuex'
 
     export default {