nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-29 11:15:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes part 2

Browse Source
This commit is contained in:
Čarodej
2022-03-01 10:15:50 +01:00
parent 64d1883f53
commit a303ffffdc
11 changed files with 37 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/components/Others/RenameItemPopup.vue
+4 -60
View File
@@ -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>
resources/js/components/Others/TreeMenu.vue
+1 -1
View File
@@ -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">
resources/js/components/Spotlight/Spotlight.vue
+2 -2
View File
@@ -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({
resources/js/views/FileView/Files.vue
+1 -2
View File
@@ -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') }}
resources/js/views/FileView/Public.vue
+3 -3
View File
@@ -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') }}
resources/js/views/FileView/SharedWithMe.vue
+1 -1
View File
@@ -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') }}
resources/js/views/FileView/TeamFolders.vue
+1 -1
View File
@@ -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') }}
resources/js/views/FileView/UploadRequestFiles.vue
+1 -1
View File
@@ -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') }}
src/Domain/Files/Models/File.php
+1 -1
View File
@@ -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
src/Domain/Teams/Controllers/TeamFoldersController.php
+14 -7
View File
@@ -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,
];
src/Domain/UploadRequest/Controllers/UploadFilesForUploadRequestController.php
+8 -6
View File
@@ -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