public share navigation

resources/js/views/FileView/Public/Public.vue

@@ -147,6 +147,7 @@
 		},
 		computed: {
 			...mapGetters([
+				'sharedDetail',
 				'clipboard',
 				'user',
 			]),
@@ -205,8 +206,8 @@
 				}
 			},
 		},
-		created() {
-			this.$store.dispatch('getFolder', this.$route.params.id)
+		mounted() {
+			this.$store.dispatch('getSharedFolder', this.$route.params.id)
 
 			events.$on('context-menu:show', (event, item) => this.item = item)
 			events.$on('mobile-context-menu:show', item => this.item = item)

resources/js/views/Shared.vue

@@ -26,19 +26,23 @@
         <DragUI />
         <Alert />
 
-        <router-view :class="{'is-scaled-down': isScaledDown}" />
+		<div @contextmenu.prevent.capture="contextMenu($event, undefined)" id="file-view">
+			<DesktopToolbar/>
+			<router-view :key="$route.fullPath" />
+		</div>
     </div>
 </template>
 
 <script>
     import MultiSelectToolbar from '/resources/js/components/FilesView/MultiSelectToolbar'
+    import MobileContextMenu from '/resources/js/components/FilesView/MobileContextMenu'
     import FileSortingMobile from '/resources/js/components/FilesView/FileSortingMobile'
     import CreateFolderPopup from '/resources/js/components/Others/CreateFolderPopup'
     import ProcessingPopup from '/resources/js/components/FilesView/ProcessingPopup'
-    import MobileContextMenu from '/resources/js/components/FilesView/MobileContextMenu'
     import RenameItemPopup from '/resources/js/components/Others/RenameItemPopup'
-    import MoveItemPopup from '/resources/js/components/Others/MoveItemPopup'
     import FilePreview from '/resources/js/components/FilePreview/FilePreview'
+    import MoveItemPopup from '/resources/js/components/Others/MoveItemPopup'
+	import DesktopToolbar from "../components/FilesView/DesktopToolbar"
     import Spinner from '/resources/js/components/FilesView/Spinner'
     import Vignette from '/resources/js/components/Others/Vignette'
     import DragUI from '/resources/js/components/FilesView/DragUI'
@@ -52,9 +56,10 @@
             MultiSelectToolbar,
             CreateFolderPopup,
             FileSortingMobile,
+            MobileContextMenu,
             ProcessingPopup,
             RenameItemPopup,
-            MobileContextMenu,
+			DesktopToolbar,
             MoveItemPopup,
             FilePreview,
             Vignette,
@@ -73,6 +78,16 @@
                 isScaledDown: false
             }
         },
+		methods: {
+			spotlightListener(e) {
+				if (e.key === 'k' && e.metaKey) {
+					events.$emit('spotlight:show');
+				}
+			},
+			contextMenu(event, item) {
+				events.$emit('context-menu:show', event, item)
+			},
+		},
         mounted() {
             events.$on('mobile-menu:show', () => this.isScaledDown = true)
             events.$on('fileItem:deselect', () => this.isScaledDown = false)
@@ -81,18 +96,22 @@
                 .then(response => {
                     this.isLoading = false
 
+					let type = response.data.data.attributes.type
+					let routeName = this.$router.currentRoute.name
+					let isProtected = response.data.data.attributes.is_protected
+
                     // Show public file browser
-                    if (response.data.data.attributes.type === 'folder' && !response.data.data.attributes.is_protected && this.$router.currentRoute.name !== 'SharedFileBrowser') {
-                        this.$router.push({name: 'SharedFileBrowser'})
+                    if (type === 'folder' && !isProtected && routeName !== 'Public') {
+                        this.$router.replace({name: 'Public', params: {token: this.$route.params.token, id: response.data.data.attributes.item_id}})
                     }
 
                     // Show public single file
-                    if (response.data.data.attributes.type !== 'folder' && !response.data.data.attributes.is_protected && this.$router.currentRoute.name !== 'SharedSingleFile') {
+                    if (type !== 'folder' && !isProtected && routeName !== 'SharedSingleFile') {
                         this.$router.push({name: 'SharedSingleFile'})
                     }
 
                     // Show authentication page
-                    if (response.data.data.attributes.is_protected && this.$router.currentRoute.name !== 'SharedAuthentication') {
+                    if (isProtected && routeName !== 'SharedAuthentication') {
                         this.$router.push({name: 'SharedAuthentication'})
                     }
                 })
@@ -103,6 +122,20 @@
 <style lang="scss">
     @import '/resources/sass/vuefilemanager/_mixins';
 
+	#file-view {
+		font-family: 'Nunito', sans-serif;
+		font-size: 16px;
+		width: 100%;
+		height: 100%;
+		position: relative;
+		min-width: 320px;
+		overflow-x: hidden;
+		padding-left: 15px;
+		padding-right: 15px;
+		overflow-y: hidden;
+		@include transition(120ms);
+	}
+
     @media only screen and (max-width: 690px) {
 
         .is-scaled-down {