From a303ffffdcb000085ebe8fa571d9d3d97cc7ee27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Tue, 1 Mar 2022 10:15:50 +0100
Subject: [PATCH] fixes part 2

---
 .../js/components/Others/RenameItemPopup.vue  | 64 ++-----------------
 resources/js/components/Others/TreeMenu.vue   |  2 +-
 .../js/components/Spotlight/Spotlight.vue     |  4 +-
 resources/js/views/FileView/Files.vue         |  3 +-
 resources/js/views/FileView/Public.vue        |  6 +-
 resources/js/views/FileView/SharedWithMe.vue  |  2 +-
 resources/js/views/FileView/TeamFolders.vue   |  2 +-
 .../js/views/FileView/UploadRequestFiles.vue  |  2 +-
 src/Domain/Files/Models/File.php              |  2 +-
 .../Controllers/TeamFoldersController.php     | 21 ++++--
 .../UploadFilesForUploadRequestController.php | 14 ++--
 11 files changed, 37 insertions(+), 85 deletions(-)

diff --git a/resources/js/components/Others/RenameItemPopup.vue b/resources/js/components/Others/RenameItemPopup.vue
index f45cac7f..e0efe20f 100644
--- a/resources/js/components/Others/RenameItemPopup.vue
+++ b/resources/js/components/Others/RenameItemPopup.vue
@@ -23,11 +23,11 @@
                                 :class="{ 'border-red': errors[0] }"
                                 ref="input"
                                 type="text"
-                                class="focus-border-theme input-dark"
+                                class="!pr-10 focus-border-theme input-dark"
                                 :placeholder="$t('popup_rename.placeholder')"
                             />
-                            <div @click="pickedItem.data.attributes.name = ''" class="absolute right-4">
-                                <x-icon class="close-icon hover-text-theme" size="14" />
+                            <div @click="pickedItem.data.attributes.name = ''" class="absolute right-0 p-4 cursor-pointer">
+                                <x-icon class="hover-text-theme" size="14" />
                             </div>
                         </div>
                     </AppInputText>
@@ -172,60 +172,4 @@ export default {
         })
     },
 }
-</script>
-
-<style scoped lang="scss">
-@import '../../../sass/vuefilemanager/inapp-forms';
-@import '../../../sass/vuefilemanager/forms';
-
-.input {
-    position: relative;
-    display: flex;
-    justify-content: flex-end;
-    align-items: center;
-
-    .close-icon-wrapper {
-        width: 22px;
-        height: 22px;
-        position: absolute;
-        cursor: pointer;
-        right: 15px;
-        border-radius: 6px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-
-        &:hover {
-            .close-icon {
-                line {
-                    color: inherit;
-                }
-            }
-        }
-
-        .close-icon {
-            line {
-                color: rgba($text-muted, 0.3);
-            }
-        }
-    }
-}
-
-.dark {
-    .close-icon-wrapper {
-        &:hover {
-            .close-icon {
-                line {
-                    color: inherit !important;
-                }
-            }
-        }
-
-        .close-icon {
-            line {
-                color: rgba($dark_mode_text_primary, 0.3) !important;
-            }
-        }
-    }
-}
-</style>
+</script>
\ No newline at end of file
diff --git a/resources/js/components/Others/TreeMenu.vue b/resources/js/components/Others/TreeMenu.vue
index 7d0cf605..f83f9130 100644
--- a/resources/js/components/Others/TreeMenu.vue
+++ b/resources/js/components/Others/TreeMenu.vue
@@ -7,7 +7,7 @@
     >
         <div
             :style="indent"
-            class="relative relative flex cursor-pointer select-none items-center whitespace-nowrap py-2 px-1.5 transition-all duration-150"
+            class="relative relative flex cursor-pointer select-none items-center whitespace-nowrap lg:py-2 py-3.5 px-1.5 transition-all duration-150"
         >
             <!--Arrow icon-->
             <span @click.stop="showTree" class="-m-2 p-2">
diff --git a/resources/js/components/Spotlight/Spotlight.vue b/resources/js/components/Spotlight/Spotlight.vue
index fbcdc865..c5d45513 100644
--- a/resources/js/components/Spotlight/Spotlight.vue
+++ b/resources/js/components/Spotlight/Spotlight.vue
@@ -62,7 +62,7 @@
 
             <!--Show tips-->
             <div
-                v-if="isEmptyQuery && !activeFilter && !$isThisRoute($route, ['Public'])"
+                v-if="isEmptyQuery && !activeFilter && !$isThisRoute($route, ['Public']) && isAdmin"
                 class="relative z-50 px-4 pb-4"
             >
                 <CategoryName>
@@ -590,7 +590,7 @@ export default {
             }
 
             // Return commands for logged admin
-            if (this.user.data.attributes.role === 'admin') {
+            if (this.isAdmin) {
                 // Available only for fixed subscription
                 if (this.config.subscriptionType === 'fixed') {
                     adminLocations.push({
diff --git a/resources/js/views/FileView/Files.vue b/resources/js/views/FileView/Files.vue
index c7b4471d..01e53cfe 100644
--- a/resources/js/views/FileView/Files.vue
+++ b/resources/js/views/FileView/Files.vue
@@ -182,10 +182,9 @@
             </MobileActionButton>
             <MobileActionButton
                 @click.native="$showMobileMenu('create-list')"
-                v-if="$checkPermission(['master', 'editor'])"
                 icon="cloud-plus"
             >
-                {{ $t('mobile.create') }}
+                {{ $t('Upload / Create') }}
             </MobileActionButton>
             <MobileActionButton @click.native="$enableMultiSelectMode" icon="check-square">
                 {{ $t('context_menu.select') }}
diff --git a/resources/js/views/FileView/Public.vue b/resources/js/views/FileView/Public.vue
index 37b9903f..65a3dc42 100644
--- a/resources/js/views/FileView/Public.vue
+++ b/resources/js/views/FileView/Public.vue
@@ -37,11 +37,11 @@
         </MobileContextMenu>
 
         <MobileCreateMenu>
-            <OptionGroup>
+            <OptionGroup :title="$t('Upload')">
                 <OptionUpload :title="$t('actions.upload')" type="file" :is-hover-disabled="true" />
                 <OptionUpload :title="$t('actions.upload_folder')" type="folder" :is-hover-disabled="true" />
             </OptionGroup>
-            <OptionGroup>
+            <OptionGroup :title="$t('Create')">
                 <Option
                     @click.stop.native="createFolder"
                     :title="$t('actions.create_folder')"
@@ -136,7 +136,7 @@
                     {{ $t('Spotlight') }}
                 </MobileActionButton>
                 <MobileActionButton @click.native="$showMobileMenu('create-list')" icon="cloud-plus">
-                    {{ $t('mobile.create') }}
+                    {{ $t('Upload / Create') }}
                 </MobileActionButton>
                 <MobileActionButton @click.native="$enableMultiSelectMode" icon="check-square">
                     {{ $t('context_menu.select') }}
diff --git a/resources/js/views/FileView/SharedWithMe.vue b/resources/js/views/FileView/SharedWithMe.vue
index ad5f2706..7fca9535 100644
--- a/resources/js/views/FileView/SharedWithMe.vue
+++ b/resources/js/views/FileView/SharedWithMe.vue
@@ -115,7 +115,7 @@
                 {{ $getCurrentSectionName() }}
             </MobileActionButton>
             <MobileActionButton v-if="canEdit" @click.native="$showMobileMenu('create-list')" icon="cloud-plus">
-                {{ $t('mobile.create') }}
+                {{ $t('Upload / Create') }}
             </MobileActionButton>
             <MobileActionButton @click.native="$enableMultiSelectMode" icon="check-square">
                 {{ $t('context_menu.select') }}
diff --git a/resources/js/views/FileView/TeamFolders.vue b/resources/js/views/FileView/TeamFolders.vue
index 8518779d..0f401dfb 100644
--- a/resources/js/views/FileView/TeamFolders.vue
+++ b/resources/js/views/FileView/TeamFolders.vue
@@ -184,7 +184,7 @@
                 v-if="$checkPermission(['master', 'editor'])"
                 icon="cloud-plus"
             >
-                {{ $t('mobile.create') }}
+                {{ $t('Upload / Create') }}
             </MobileActionButton>
             <MobileActionButton @click.native="$enableMultiSelectMode" icon="check-square">
                 {{ $t('context_menu.select') }}
diff --git a/resources/js/views/FileView/UploadRequestFiles.vue b/resources/js/views/FileView/UploadRequestFiles.vue
index e9ad2c8d..b4b8ad68 100644
--- a/resources/js/views/FileView/UploadRequestFiles.vue
+++ b/resources/js/views/FileView/UploadRequestFiles.vue
@@ -98,7 +98,7 @@
 				v-if="$checkPermission(['master', 'editor'])"
 				icon="cloud-plus"
 			>
-                {{ $t('mobile.create') }}
+                {{ $t('Upload / Create') }}
             </MobileActionButton>
             <MobileActionButton @click.native="$enableMultiSelectMode" icon="check-square">
                 {{ $t('context_menu.select') }}
diff --git a/src/Domain/Files/Models/File.php b/src/Domain/Files/Models/File.php
index 7ec82454..501b0507 100644
--- a/src/Domain/Files/Models/File.php
+++ b/src/Domain/Files/Models/File.php
@@ -160,7 +160,7 @@ class File extends Model
 
         // Set shared public url
         if ($this->sharedAccess) {
-            return "$route/$this->sharedAccess";
+            return "$route/shared/$this->sharedAccess";
         }
 
         // Set upload request public url
diff --git a/src/Domain/Teams/Controllers/TeamFoldersController.php b/src/Domain/Teams/Controllers/TeamFoldersController.php
index 168dd648..532e72a9 100644
--- a/src/Domain/Teams/Controllers/TeamFoldersController.php
+++ b/src/Domain/Teams/Controllers/TeamFoldersController.php
@@ -33,22 +33,29 @@ class TeamFoldersController extends Controller
     {
         $id = Str::isUuid($id) ? $id : null;
 
-        $folders = Folder::where('parent_id', $id)
-            ->where('team_folder', true)
-            ->where('user_id', Auth::id())
-            ->sortable()
-            ->get();
-
         if ($id) {
+            $folders = Folder::where('parent_id', $id)
+                ->where('team_folder', true)
+                ->sortable()
+                ->get();
+
             $files = File::where('parent_id', $id)
                 ->sortable()
                 ->get();
         }
 
+        if (!$id) {
+            $folders = Folder::where('parent_id', null)
+                ->where('team_folder', true)
+                ->where('user_id', Auth::id())
+                ->sortable()
+                ->get();
+        }
+
         // Collect folders and files to single array
         return [
             'folders'    => new FolderCollection($folders),
-            'files'      => isset($files) ? new FilesCollection($files) : new FilesCollection([]),
+            'files'      => isset($files) ? new FilesCollection($files) : [],
             'root'       => $id ? new FolderResource(Folder::findOrFail($id)) : null,
             'teamFolder' => $id ? new FolderResource(Folder::findOrFail($id)->getLatestParent()) : null,
         ];
diff --git a/src/Domain/UploadRequest/Controllers/UploadFilesForUploadRequestController.php b/src/Domain/UploadRequest/Controllers/UploadFilesForUploadRequestController.php
index 21b133be..c83b86d8 100644
--- a/src/Domain/UploadRequest/Controllers/UploadFilesForUploadRequestController.php
+++ b/src/Domain/UploadRequest/Controllers/UploadFilesForUploadRequestController.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Domain\UploadRequest\Controllers;
 
 use DB;
@@ -13,8 +14,7 @@ class UploadFilesForUploadRequestController
 {
     public function __construct(
         private UploadFileAction $uploadFile,
-    ) {
-    }
+    ) {}
 
     /**
      * @throws FileNotFoundException
@@ -64,10 +64,12 @@ class UploadFilesForUploadRequestController
 
         // Create folder
         DB::table('folders')->insert([
-            'id'        => $uploadRequest->id,
-            'parent_id' => $uploadRequest->folder_id ?? null,
-            'user_id'   => $uploadRequest->user_id,
-            'name'      => $uploadRequest->name ?? "Upload Request from $timestampName",
+            'id'         => $uploadRequest->id,
+            'parent_id'  => $uploadRequest->folder_id ?? null,
+            'user_id'    => $uploadRequest->user_id,
+            'name'       => $uploadRequest->name ?? "Upload Request from $timestampName",
+            'created_at' => now(),
+            'updated_at' => now(),
         ]);
 
         // Update upload request status