FileActionsMobile.vue refactoring

resources/js/views/FileView/Files.vue

@@ -43,16 +43,31 @@
 		<!--Show files & folders-->
 		<FileBrowser>
 			<template v-slot:file-actions-mobile>
-				<!-- todo: Implement mobile buttons-->
+				<MobileActionButton @click.native="$openSpotlight" icon="search">
+					{{ $t('actions.search') }}
+				</MobileActionButton>
+				<MobileActionButton @click.native="$showLocations" icon="filter">
+					{{ filterLocationTitle }}
+				</MobileActionButton>
+				<MobileActionButton @click.native="$createItems" icon="cloud-plus">
+					{{ $t('mobile.create') }}
+				</MobileActionButton>
+				<MobileActionButton @click.native="$enableMultiSelectMode" icon="check-square">
+					{{ $t('context_menu.select') }}
+				</MobileActionButton>
+				<MobileActionButton @click.native="$showViewOptions" icon="preview-sorting">
+					{{ $t('preview_sorting.preview_sorting_button') }}
+				</MobileActionButton>
 			</template>
 
 			<template v-slot:empty-file-page>
-				<h1 class="title">{{ $t('empty_page.title') }}</h1>
-                <p v-if="$checkPermission(['master', 'editor'])" class="description">{{ $t('empty_page.description') }}</p>
-                <ButtonUpload
-					v-if="$checkPermission(['master', 'editor'])"
-					button-style="theme"
-				>
+				<h1 class="title">
+					{{ $t('empty_page.title') }}
+				</h1>
+                <p v-if="$checkPermission(['master', 'editor'])" class="description">
+					{{ $t('empty_page.description') }}
+				</p>
+                <ButtonUpload v-if="$checkPermission(['master', 'editor'])" button-style="theme">
                     {{ $t('empty_page.call_to_action') }}
                 </ButtonUpload>
 			</template>
@@ -61,6 +76,8 @@
 </template>
 
 <script>
+    import MobileActionButtonUpload from '/resources/js/components/FilesView/MobileActionButtonUpload'
+	import MobileActionButton from '/resources/js/components/FilesView/MobileActionButton'
     import ButtonUpload from '/resources/js/components/FilesView/ButtonUpload'
 	import FileBrowser from '/resources/js/components/FilesView/FileBrowser'
 	import ContextMenu from '/resources/js/components/FilesView/ContextMenu'
@@ -72,6 +89,8 @@
 	export default {
 		name: 'Files',
 		components: {
+			MobileActionButtonUpload,
+			MobileActionButton,
 			ButtonUpload,
 			OptionGroup,
 			FileBrowser,
@@ -95,6 +114,15 @@
 			favourites() {
 				return this.user.data.relationships.favourites.data.attributes.folders
 			},
+			filterLocationTitle() {
+				return {
+					'RecentUploads': this.$t('Recent'),
+					'MySharedItems': this.$t('Shared'),
+					'Trash': this.$t('Trash'),
+					'Public': this.$t('Files'),
+					'Files': this.$t('Files'),
+				}[this.$route.name]
+			}
 		},
 		data() {
 			return {

resources/js/views/FileView/MySharedItems.vue

@@ -35,7 +35,18 @@
 		<!--Show files & folders-->
 		<FileBrowser>
 			<template v-slot:file-actions-mobile>
-				<!-- todo: Implement mobile buttons-->
+				<MobileActionButton @click.native="$openSpotlight" icon="search">
+					{{ $t('actions.search')}}
+				</MobileActionButton>
+				<MobileActionButton @click.native="$showLocations" icon="filter">
+					{{ filterLocationTitle }}
+				</MobileActionButton>
+				<MobileActionButton @click.native="$enableMultiSelectMode" icon="check-square">
+					{{ $t('context_menu.select') }}
+				</MobileActionButton>
+				<MobileActionButton @click.native="$showViewOptions" icon="preview-sorting">
+					{{ $t('preview_sorting.preview_sorting_button') }}
+				</MobileActionButton>
 			</template>
 
 			<template v-slot:empty-file-page>
@@ -46,6 +57,8 @@
 </template>
 
 <script>
+    import MobileActionButtonUpload from '/resources/js/components/FilesView/MobileActionButtonUpload'
+	import MobileActionButton from '/resources/js/components/FilesView/MobileActionButton'
 	import FileBrowser from '/resources/js/components/FilesView/FileBrowser'
 	import ContextMenu from '/resources/js/components/FilesView/ContextMenu'
 	import OptionGroup from '/resources/js/components/FilesView/OptionGroup'
@@ -56,6 +69,8 @@
 	export default {
 		name: 'MySharedItems',
 		components: {
+			MobileActionButtonUpload,
+			MobileActionButton,
 			OptionGroup,
 			FileBrowser,
 			ContextMenu,
@@ -70,7 +85,7 @@
 				return this.item && this.item.type === 'folder'
 			},
 			isInFavourites() {
-				return this.favourites.find((el) => el.id === this.item.id)
+				return this.favourites.find(el => el.id === this.item.id)
 			},
 			hasFile() {
 				return this.clipboard.find(item => item.type !== 'folder')
@@ -78,6 +93,15 @@
 			favourites() {
 				return this.user.data.relationships.favourites.data.attributes.folders
 			},
+			filterLocationTitle() {
+				return {
+					'RecentUploads': this.$t('Recent'),
+					'MySharedItems': this.$t('Shared'),
+					'Trash': this.$t('Trash'),
+					'Public': this.$t('Files'),
+					'Files': this.$t('Files'),
+				}[this.$route.name]
+			},
 		},
 		data() {
 			return {

resources/js/views/FileView/NavigationPanel.vue

@@ -1,7 +1,7 @@
 <template>
-	<div v-if="user">
+	<ContentSidebar>
 		<!--Empty storage warning-->
-		<ContentGroup v-if="config.storageLimit && storage.used > 95">
+		<ContentGroup v-if="user && config.storageLimit && storage.used > 95">
 			<UpgradeSidebarBanner/>
 		</ContentGroup>
 
@@ -66,7 +66,7 @@
 		</ContentGroup>
 
 		<!--Navigator-->
-		<ContentGroup :title="$t('sidebar.navigator_title')" slug="navigator" :can-collapse="true" class="navigator">
+		<ContentGroup v-if="user" :title="$t('sidebar.navigator_title')" slug="navigator" :can-collapse="true" class="navigator">
 			<span v-if="tree.length === 0" class="empty-note navigator">
 				{{ $t('sidebar.folders_empty') }}
 			</span>
@@ -74,7 +74,7 @@
 		</ContentGroup>
 
 		<!--Favourites-->
-		<ContentGroup :title="$t('sidebar.favourites')" slug="favourites" :can-collapse="true">
+		<ContentGroup v-if="user" :title="$t('sidebar.favourites')" slug="favourites" :can-collapse="true">
 
 			<div @dragover.prevent="dragEnter" @dragleave="dragLeave" @drop="dragFinish($event)" :class="{ 'is-dragenter': area }" class="menu-list-wrapper vertical favourites">
 				<transition-group tag="div" class="menu-list" name="folder-item">
@@ -92,13 +92,14 @@
 				</transition-group>
 			</div>
 		</ContentGroup>
-	</div>
+	</ContentSidebar>
 </template>
 
 <script>
 	import {FolderIcon, HomeIcon, LinkIcon, Trash2Icon, UploadCloudIcon, UserCheckIcon, UsersIcon, XIcon} from "vue-feather-icons";
 	import UpgradeSidebarBanner from '/resources/js/components/Others/UpgradeSidebarBanner'
 	import TreeMenuNavigator from '/resources/js/components/Others/TreeMenuNavigator'
+	import ContentSidebar from '/resources/js/components/Sidebar/ContentSidebar'
 	import ContentGroup from '/resources/js/components/Sidebar/ContentGroup'
 	import {events} from "../../bus";
 	import {mapGetters} from "vuex";
@@ -108,6 +109,7 @@ export default {
 	components: {
 		UpgradeSidebarBanner,
 		TreeMenuNavigator,
+		ContentSidebar,
 		ContentGroup,
 		UploadCloudIcon,
 		UserCheckIcon,

resources/js/views/FileView/Public.vue

@@ -0,0 +1,178 @@
+<template>
+	<div>
+		<ContextMenu>
+			<template v-slot:empty-select>
+				<OptionGroup>
+					<Option @click.native="$createFolder" :title="$t('context_menu.create_folder')" icon="create-folder" />
+				</OptionGroup>
+			</template>
+
+			<template v-slot:single-select v-if="item">
+				<OptionGroup v-if="isFolder">
+					<Option @click.native="addToFavourites" :title="isInFavourites ? $t('context_menu.remove_from_favourites') : $t('context_menu.add_to_favourites')" icon="favourites" />
+				</OptionGroup>
+				<OptionGroup>
+					<Option @click.native="$renameFileOrFolder(item)" :title="$t('context_menu.rename')" icon="rename" />
+					<Option @click.native="$moveFileOrFolder(item)" :title="$t('context_menu.move')" icon="move-item" />
+					<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
+				</OptionGroup>
+				<OptionGroup>
+					<Option @click.native="$shareFileOrFolder(item)" :title="item.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
+					<Option @click.native="$updateTeamFolder(item)" v-if="isFolder" :title="$t('Convert as Team Folder')" icon="users" />
+				</OptionGroup>
+				<OptionGroup>
+					<Option @click.native="$openInDetailPanel(item)" :title="$t('context_menu.detail')" icon="detail" />
+					<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
+				</OptionGroup>
+			</template>
+
+			<template v-slot:multiple-select v-if="item">
+				<OptionGroup v-if="!hasFile">
+					<Option @click.native="addToFavourites" :title="isInFavourites ? $t('context_menu.remove_from_favourites') : $t('context_menu.add_to_favourites')" icon="favourites" />
+				</OptionGroup>
+				<OptionGroup>
+					<Option @click.native="$moveFileOrFolder(item)" :title="$t('context_menu.move')" icon="move-item" />
+					<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
+				</OptionGroup>
+				<OptionGroup>
+					<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
+				</OptionGroup>
+			</template>
+		</ContextMenu>
+
+		<!--Show files & folders-->
+		<FileBrowser>
+			<template v-if="$checkPermission('editor')" v-slot:file-actions-mobile>
+				<MobileActionButton @click.native="$openSpotlight" icon="search">
+					{{ $t('actions.search') }}
+				</MobileActionButton>
+				<MobileActionButton @click.native="$showLocations" icon="filter">
+					{{ filterLocationTitle }}
+				</MobileActionButton>
+				<MobileActionButton @click.native="$createItems" icon="cloud-plus">
+					{{ $t('mobile.create') }}
+				</MobileActionButton>
+				<MobileActionButton @click.native="$enableMultiSelectMode" icon="check-square">
+					{{ $t('context_menu.select') }}
+				</MobileActionButton>
+				<MobileActionButton @click.native="$showViewOptions" icon="preview-sorting">
+					{{ $t('preview_sorting.preview_sorting_button') }}
+				</MobileActionButton>
+			</template>
+
+			<template v-if="$checkPermission('visitor')" v-slot:file-actions-mobile>
+				<MobileActionButton @click.native="$openSpotlight" icon="search">
+					{{ $t('actions.search')}}
+				</MobileActionButton>
+				 <MobileActionButton @click.native="$enableMultiSelectMode" icon="check-square">
+				   {{ $t('context_menu.select') }}
+				</MobileActionButton>
+				 <MobileActionButton @click.native="$showViewOptions" icon="preview-sorting">
+					{{ $t('preview_sorting.preview_sorting_button') }}
+				</MobileActionButton>
+			</template>
+
+			<template v-slot:empty-file-page>
+				<h1 class="title">
+					{{ $t('empty_page.title') }}
+				</h1>
+                <p v-if="$checkPermission('editor')" class="description">
+					{{ $t('empty_page.description') }}
+				</p>
+                <ButtonUpload v-if="$checkPermission('editor')" button-style="theme">
+                    {{ $t('empty_page.call_to_action') }}
+                </ButtonUpload>
+			</template>
+		</FileBrowser>
+	</div>
+</template>
+
+<script>
+    import MobileActionButtonUpload from '/resources/js/components/FilesView/MobileActionButtonUpload'
+	import MobileActionButton from '/resources/js/components/FilesView/MobileActionButton'
+    import ButtonUpload from '/resources/js/components/FilesView/ButtonUpload'
+	import FileBrowser from '/resources/js/components/FilesView/FileBrowser'
+	import ContextMenu from '/resources/js/components/FilesView/ContextMenu'
+	import OptionGroup from '/resources/js/components/FilesView/OptionGroup'
+	import Option from '/resources/js/components/FilesView/Option'
+	import { mapGetters } from 'vuex'
+	import {events} from "../../bus";
+
+	export default {
+		name: 'Files',
+		components: {
+			MobileActionButtonUpload,
+			MobileActionButton,
+			ButtonUpload,
+			OptionGroup,
+			FileBrowser,
+			ContextMenu,
+			Option,
+		},
+		computed: {
+			...mapGetters([
+				'clipboard',
+				'user',
+			]),
+			isFolder() {
+				return this.item && this.item.type === 'folder'
+			},
+			isInFavourites() {
+				return this.favourites.find((el) => el.id === this.item.id)
+			},
+			hasFile() {
+				return this.clipboard.find(item => item.type !== 'folder')
+			},
+			favourites() {
+				return this.user.data.relationships.favourites.data.attributes.folders
+			},
+			filterLocationTitle() {
+				return {
+					'RecentUploads': this.$t('Recent'),
+					'MySharedItems': this.$t('Shared'),
+					'Trash': this.$t('Trash'),
+					'Public': this.$t('Files'),
+					'Files': this.$t('Files'),
+				}[this.$route.name]
+			}
+		},
+		data() {
+			return {
+				item: undefined,
+			}
+		},
+		methods: {
+			addToFavourites() {
+				// Check if folder is in favourites and then add/remove from favourites
+				if (
+					this.favourites &&
+					!this.favourites.find(el => el.id === this.item.id)
+				) {
+					// Add to favourite folder that is not selected
+					if (!this.clipboard.includes(this.item)) {
+						this.$store.dispatch('addToFavourites', this.item)
+					}
+
+					// Add to favourites all selected folders
+					if (this.clipboard.includes(this.item)) {
+						this.$store.dispatch('addToFavourites', null)
+					}
+				} else {
+					this.$store.dispatch('removeFromFavourites', this.item)
+				}
+			},
+			downloadItem() {
+				if (this.clipboard.length > 1 || (this.clipboard.length === 1 && this.clipboard[0].type === 'folder'))
+					this.$store.dispatch('downloadZip')
+				else {
+					this.$downloadFile(this.item.file_url, this.item.name + '.' + this.item.mimetype)
+				}
+			},
+		},
+		created() {
+			this.$store.dispatch('getFolder', this.$route.params.id)
+
+			events.$on('contextMenu:show', (event, item) => this.item = item)
+		}
+	}
+</script>

resources/js/views/FileView/RecentUploads.vue

@@ -30,13 +30,29 @@
 		<!--Show files & folders-->
 		<FileBrowser>
 			<template v-slot:file-actions-mobile>
-				<!-- todo: Implement mobile buttons-->
+				<MobileActionButton @click.native="$openSpotlight" icon="search">
+					{{ $t('actions.search')}}
+				</MobileActionButton>
+				<MobileActionButton @click.native="$showLocations" icon="filter">
+					{{ filterLocationTitle }}
+				</MobileActionButton>
+				<MobileActionButtonUpload>
+					{{ $t('context_menu.upload') }}
+				</MobileActionButtonUpload>
+				<MobileActionButton @click.native="$enableMultiSelectMode" icon="check-square">
+					{{ $t('context_menu.select') }}
+				</MobileActionButton>
+				<MobileActionButton @click.native="$showViewOptions" icon="preview-sorting">
+					{{ $t('preview_sorting.preview_sorting_button') }}
+				</MobileActionButton>
 			</template>
 		</FileBrowser>
 	</div>
 </template>
 
 <script>
+    import MobileActionButtonUpload from '/resources/js/components/FilesView/MobileActionButtonUpload'
+	import MobileActionButton from '/resources/js/components/FilesView/MobileActionButton'
 	import FileBrowser from '/resources/js/components/FilesView/FileBrowser'
 	import ContextMenu from '/resources/js/components/FilesView/ContextMenu'
 	import OptionGroup from '/resources/js/components/FilesView/OptionGroup'
@@ -47,6 +63,8 @@
 	export default {
 		name: 'RecentUploads',
 		components: {
+			MobileActionButtonUpload,
+			MobileActionButton,
 			OptionGroup,
 			FileBrowser,
 			ContextMenu,
@@ -56,7 +74,16 @@
 			...mapGetters([
 				'clipboard',
 				'user',
-			])
+			]),
+			filterLocationTitle() {
+				return {
+					'RecentUploads': this.$t('Recent'),
+					'MySharedItems': this.$t('Shared'),
+					'Trash': this.$t('Trash'),
+					'Public': this.$t('Files'),
+					'Files': this.$t('Files'),
+				}[this.$route.name]
+			},
 		},
 		data() {
 			return {

resources/js/views/FileView/Trash.vue

@@ -34,7 +34,21 @@
 		<!--Show files & folders-->
 		<FileBrowser>
 			<template v-slot:file-actions-mobile>
-				<!-- todo: Implement mobile buttons-->
+				<MobileActionButton @click.native="$openSpotlight" icon="search">
+					{{ $t('actions.search')}}
+				</MobileActionButton>
+				<MobileActionButton @click.native="$showLocations" icon="filter">
+					{{ filterLocationTitle }}
+				</MobileActionButton>
+				<MobileActionButton @click.native="$emptyTrash" icon="trash">
+					{{ $t('context_menu.empty_trash') }}
+				</MobileActionButton>
+				 <MobileActionButton @click.native="$enableMultiSelectMode" icon="check-square">
+					{{ $t('context_menu.select') }}
+				</MobileActionButton>
+				 <MobileActionButton @click.native="$showViewOptions" icon="preview-sorting">
+					{{ $t('preview_sorting.preview_sorting_button') }}
+				</MobileActionButton>
 			</template>
 
 			<template v-slot:empty-file-page>
@@ -45,6 +59,8 @@
 </template>
 
 <script>
+    import MobileActionButtonUpload from '/resources/js/components/FilesView/MobileActionButtonUpload'
+	import MobileActionButton from '/resources/js/components/FilesView/MobileActionButton'
 	import FileBrowser from '/resources/js/components/FilesView/FileBrowser'
 	import ContextMenu from '/resources/js/components/FilesView/ContextMenu'
 	import OptionGroup from '/resources/js/components/FilesView/OptionGroup'
@@ -55,6 +71,8 @@
 	export default {
 		name: 'Trash',
 		components: {
+			MobileActionButtonUpload,
+			MobileActionButton,
 			OptionGroup,
 			FileBrowser,
 			ContextMenu,
@@ -64,6 +82,15 @@
 			...mapGetters([
 				'clipboard',
 			]),
+			filterLocationTitle() {
+				return {
+					'RecentUploads': this.$t('Recent'),
+					'MySharedItems': this.$t('Shared'),
+					'Trash': this.$t('Trash'),
+					'Public': this.$t('Files'),
+					'Files': this.$t('Files'),
+				}[this.$route.name]
+			},
 		},
 		data() {
 			return {

resources/js/views/Platform.vue

@@ -36,9 +36,7 @@
         <DragUI />
 
 		<!--Sidebar-->
-		<ContentSidebar>
-			<NavigationPanel />
-		</ContentSidebar>
+		<NavigationPanel />
 
 		<div @contextmenu.prevent.capture="contextMenu($event, undefined)" id="files-view">
 			<DesktopToolbar/>
@@ -62,7 +60,6 @@
 	import CreateTeamFolderPopup from "../components/Teams/CreateTeamFolderPopup"
     import ConfirmPopup from '/resources/js/components/Others/Popup/ConfirmPopup'
     import RenameItemPopup from '/resources/js/components/Others/RenameItemPopup'
-	import ContentSidebar from '/resources/js/components/Sidebar/ContentSidebar'
     import ShareEditPopup from '/resources/js/components/Others/ShareEditPopup'
     import MoveItemPopup from '/resources/js/components/Others/MoveItemPopup'
     import FilePreview from '/resources/js/components/FilePreview/FilePreview'
@@ -70,7 +67,6 @@
     import DragUI from '/resources/js/components/FilesView/DragUI'
 	import NavigationPanel from "./FileView/NavigationPanel"
     import {events} from '/resources/js/bus'
-    import {mapGetters} from 'vuex'
 
     export default {
         name: 'Platform',
@@ -90,7 +86,6 @@
             ShareEditPopup,
 			DesktopToolbar,
             FileMenuMobile,
-			ContentSidebar,
             MoveItemPopup,
             ConfirmPopup,
             FilePreview,