From ee67b8050d82c421252af39f60e2324d18b6ad8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Tue, 22 Feb 2022 11:36:28 +0100
Subject: [PATCH] mobile file request

---
 .../FilesView/DesktopUploadRequestToolbar.vue |  7 ++--
 .../js/components/FilesView/EmptyFilePage.vue |  2 +-
 .../FilesView/FileActionsMobile.vue           |  2 +-
 .../FilesView/MobileUploadRequestToolbar.vue  | 42 +++++++++++++++++++
 .../js/views/FileView/UploadRequestFiles.vue  | 28 ++++++++++---
 resources/js/views/UploadRequest.vue          |  8 ++--
 .../MoveFileToExternalStorageAction.php       |  2 +-
 7 files changed, 75 insertions(+), 16 deletions(-)
 create mode 100644 resources/js/components/FilesView/MobileUploadRequestToolbar.vue

diff --git a/resources/js/components/FilesView/DesktopUploadRequestToolbar.vue b/resources/js/components/FilesView/DesktopUploadRequestToolbar.vue
index 395617b6..5590ab77 100644
--- a/resources/js/components/FilesView/DesktopUploadRequestToolbar.vue
+++ b/resources/js/components/FilesView/DesktopUploadRequestToolbar.vue
@@ -6,8 +6,8 @@
             <div class="flex items-center">
 
 				<!--I am Done-->
-                <div class="bg-theme-200 mr-6 flex cursor-pointer items-center rounded-lg py-1 pr-1 pl-4">
-                    <b @click="uploadingDone" class="text-theme mr-3 text-xs">
+                <div @click="uploadingDone" class="bg-theme-200 mr-6 flex cursor-pointer items-center rounded-lg py-1 pr-1 pl-4">
+                    <b class="text-theme mr-3 text-xs">
                         {{ $t('Tell Jane you are done!') }}
                     </b>
 					<MemberAvatar
@@ -121,9 +121,8 @@ export default {
     },
     methods: {
         uploadingDone() {
-            // TODO: add name to the message
 			events.$emit('confirm:open', {
-				title: this.$t('Are you sure you uploaded all files you want for {name}?', {name: this.uploadRequest.relationships.user.data.attributes.name}),
+				title: this.$t('Are you sure you uploaded all files you want for {name}?', {name: this.uploadRequest.data.relationships.user.data.attributes.name}),
 				message: this.$t("You won't be able to upload any files here once again."),
 				action: {
 					id: this.$router.currentRoute.params.token,
diff --git a/resources/js/components/FilesView/EmptyFilePage.vue b/resources/js/components/FilesView/EmptyFilePage.vue
index fe434b7c..d2326fe8 100644
--- a/resources/js/components/FilesView/EmptyFilePage.vue
+++ b/resources/js/components/FilesView/EmptyFilePage.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="flex h-screen items-center justify-center" v-if="isLoading || isEmpty">
+    <div class="flex h-screen items-center justify-center md:px-0 px-4" v-if="isLoading || isEmpty">
         <!--Show message for user-->
         <div v-if="!isLoading" class="text-content text-center">
             <slot></slot>
diff --git a/resources/js/components/FilesView/FileActionsMobile.vue b/resources/js/components/FilesView/FileActionsMobile.vue
index 074b74e4..16d1dd2e 100644
--- a/resources/js/components/FilesView/FileActionsMobile.vue
+++ b/resources/js/components/FilesView/FileActionsMobile.vue
@@ -1,6 +1,6 @@
 <template>
     <div
-        class="sticky top-14 z-[19] block overflow-x-auto whitespace-nowrap bg-white px-4 pb-3 dark:bg-dark-background lg:hidden"
+        class="sticky top-14 z-[19] flex items-center overflow-x-auto whitespace-nowrap bg-white px-4 pb-3 dark:bg-dark-background lg:hidden"
     >
         <!--Show Buttons-->
         <slot v-if="!isMultiSelectMode" />
diff --git a/resources/js/components/FilesView/MobileUploadRequestToolbar.vue b/resources/js/components/FilesView/MobileUploadRequestToolbar.vue
new file mode 100644
index 00000000..d9734557
--- /dev/null
+++ b/resources/js/components/FilesView/MobileUploadRequestToolbar.vue
@@ -0,0 +1,42 @@
+<template>
+    <div
+        class="sticky top-0 z-[19] block flex w-full items-center justify-between bg-white py-5 px-4 text-center dark:bg-dark-background lg:hidden"
+    >
+        <NavigationBar />
+
+<!--        <div class="relative flex items-center">
+            &lt;!&ndash;More Actions&ndash;&gt;
+            <div class="relative">
+                <div
+                    @click="showMobileNavigation"
+                    class="absolute right-0 -mr-2 -translate-y-2/4 transform p-4"
+                >
+                    <menu-icon size="17" />
+                </div>
+            </div>
+        </div>-->
+    </div>
+</template>
+
+<script>
+import TeamMembersPreview from '../Teams/Components/TeamMembersPreview'
+import TeamMembersButton from '../Teams/Components/TeamMembersButton'
+import { MenuIcon } from 'vue-feather-icons'
+import NavigationBar from './NavigationBar'
+
+export default {
+    name: 'MobileUploadRequestToolBar',
+    components: {
+        NavigationBar,
+        TeamMembersPreview,
+        TeamMembersButton,
+        MenuIcon,
+    },
+    methods: {
+        showMobileNavigation() {
+            this.$showMobileMenu('user-navigation')
+            this.$store.commit('DISABLE_MULTISELECT_MODE')
+        },
+    },
+}
+</script>
diff --git a/resources/js/views/FileView/UploadRequestFiles.vue b/resources/js/views/FileView/UploadRequestFiles.vue
index e1db90fa..585597ea 100644
--- a/resources/js/views/FileView/UploadRequestFiles.vue
+++ b/resources/js/views/FileView/UploadRequestFiles.vue
@@ -82,9 +82,17 @@
         </ContextMenu>
 
         <FileActionsMobile v-if="entries.length">
-            <MobileActionButton @click.native="$openSpotlight()" icon="search">
-                {{ $t('Spotlight') }}
-            </MobileActionButton>
+			<!--I am Done-->
+			<button @click="uploadingDone" class="flex shrink-0 items-center mr-2 rounded-xl bg-theme-200 py-1 px-1 pr-3">
+				<MemberAvatar
+					:member="uploadRequest.data.relationships.user"
+					:size="26"
+				/>
+				<b class="text-theme ml-2 text-sm">
+					{{ $t('Tell Jane you are done!') }}
+				</b>
+			</button>
+
             <MobileActionButton
 				@click.native="$showMobileMenu('create-list')"
 				v-if="$checkPermission(['master', 'editor'])"
@@ -174,8 +182,8 @@ export default {
 		emptyPageTitle() {
 			// Todo: add name into translation
 			return {
-				active: this.$t('Jane Request You for File Upload'),
-				filled: this.$t('Upload Request was Fulfilled Successfully'),
+				active: this.$t('{name} Request You for File Upload', {name: this.uploadRequest.data.relationships.user.data.attributes.name}),
+				filled: this.$t('Upload Request for {name} was Fulfilled Successfully', {name: this.uploadRequest.data.relationships.user.data.attributes.name}),
 				expired: this.$t('Upload Request Expired'),
 			}[this.uploadRequest.data.attributes.status]
 		},
@@ -193,6 +201,16 @@ export default {
 		}
 	},
 	methods: {
+		uploadingDone() {
+			events.$emit('confirm:open', {
+				title: this.$t('Are you sure you uploaded all files you want for {name}?', {name: this.uploadRequest.data.relationships.user.data.attributes.name}),
+				message: this.$t("You won't be able to upload any files here once again."),
+				action: {
+					id: this.$router.currentRoute.params.token,
+					operation: 'close-upload-request',
+				},
+			})
+		},
 		createFolder() {
 			events.$emit('popup:open', {name: 'create-folder'})
 		},
diff --git a/resources/js/views/UploadRequest.vue b/resources/js/views/UploadRequest.vue
index d21243fd..909142f9 100644
--- a/resources/js/views/UploadRequest.vue
+++ b/resources/js/views/UploadRequest.vue
@@ -23,7 +23,7 @@
             class="transition-transform duration-200 lg:grid lg:flex-grow lg:content-start lg:px-3.5"
         >
             <DesktopUploadRequestToolbar v-if="entries.length" />
-            <!--<MobileToolbar />-->
+            <MobileUploadRequestToolBar v-if="entries.length" />
 
             <!--Google Adsense banner-->
             <div v-if="config.allowedAdsense" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
@@ -40,13 +40,13 @@
 
 <script>
 import DesktopUploadRequestToolbar from '../components/FilesView/DesktopUploadRequestToolbar'
+import MobileUploadRequestToolBar from "../components/FilesView/MobileUploadRequestToolbar"
 import FileSortingMobile from '../components/FilesView/FileSortingMobile'
 import FileFilterMobile from '../components/FilesView/FileFilterMobile'
 import CreateFolderPopup from '../components/Others/CreateFolderPopup'
 import DesktopToolbar from '../components/FilesView/DesktopToolbar'
 import ConfirmPopup from "../components/Others/Popup/ConfirmPopup"
 import RenameItemPopup from '../components/Others/RenameItemPopup'
-import MobileToolbar from '../components/FilesView/MobileToolbar'
 import FilePreview from '../components/FilePreview/FilePreview'
 import MoveItemPopup from '../components/Others/MoveItemPopup'
 import InfoSidebar from '../components/FilesView/InfoSidebar'
@@ -58,15 +58,15 @@ import { events } from '../bus'
 export default {
     name: 'UploadRequest',
     components: {
-		ConfirmPopup,
         DesktopUploadRequestToolbar,
+		MobileUploadRequestToolBar,
         CreateFolderPopup,
         FileSortingMobile,
         FileFilterMobile,
         RenameItemPopup,
         DesktopToolbar,
         MoveItemPopup,
-        MobileToolbar,
+		ConfirmPopup,
         InfoSidebar,
         FilePreview,
         Spotlight,
diff --git a/src/Domain/Files/Actions/MoveFileToExternalStorageAction.php b/src/Domain/Files/Actions/MoveFileToExternalStorageAction.php
index 2b9e1ff3..f42ee101 100644
--- a/src/Domain/Files/Actions/MoveFileToExternalStorageAction.php
+++ b/src/Domain/Files/Actions/MoveFileToExternalStorageAction.php
@@ -21,7 +21,7 @@ class MoveFileToExternalStorageAction
         // Get file size
         $filesize = $disk_local->size("files/$user_id/$file");
 
-        // If file is bigger than 5.2MB then run multipart upload
+        // If file is bigger than 5.2 MB then run multipart upload
         if ($filesize > 5242880) {
             // Get driver
             $driver = Storage::getDriver();