nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-18 16:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge remote with local

Browse Source
This commit is contained in:
Milos Holba
2021-02-06 16:29:55 +01:00
parent 847bcec22f e984ae6beb
commit 44158c74e3
23 changed files with 945 additions and 977 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/mix-manifest.json
View File

@@ -27,9 +27,9 @@
"/chunks/database.js": "/chunks/database.js?id=1fc78cfeb3befbd92423",
"/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=f7ff36abf37571173944",
"/chunks/environment-setup.js": "/chunks/environment-setup.js?id=a2eed5073e52410cab54",
"/chunks/files.js": "/chunks/files.js?id=6a283c2c9f8a02500bc6",
"/chunks/files.js": "/chunks/files.js?id=b738eb9054e663cc32b7",
"/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js?id=b646ec02fb9d6a497e74",
"/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=21632550b02db8bfd464",
"/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=48524061ae633d993344",
"/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=47ade53389e84dd64310",
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=d5e39543eeb619cb5513",
"/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=be9304e6ba2c61b6cab3",
@@ -57,7 +57,7 @@
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=b671f4f3198119b48449",
"/chunks/shared-files.js": "/chunks/shared-files.js?id=b13068f12911fbf79f74",
"/chunks/shared-page.js": "/chunks/shared-page.js?id=09252cb95089d52ee56a",
"/chunks/sign-in.js": "/chunks/sign-in.js?id=0212907c9bf1cdbd99ed",
"/chunks/sign-in.js": "/chunks/sign-in.js?id=7b6565f5df2060b45bc0",
"/chunks/sign-up.js": "/chunks/sign-up.js?id=39de7293c26fb3cef1a3",
"/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=57235ac99a66b55fbf7c",
"/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=51a2856dd0631053b42e",
@@ -117,5 +117,9 @@
"/js/main.94786b794f722913db2f.hot-update.js": "/js/main.94786b794f722913db2f.hot-update.js",
"/js/main.5b97e99de82c004b7040.hot-update.js": "/js/main.5b97e99de82c004b7040.hot-update.js",
"/js/main.0994c3cbbe38c708be78.hot-update.js": "/js/main.0994c3cbbe38c708be78.hot-update.js",
"/js/main.1743a74cb9afb57f23a8.hot-update.js": "/js/main.1743a74cb9afb57f23a8.hot-update.js"
"/js/main.1743a74cb9afb57f23a8.hot-update.js": "/js/main.1743a74cb9afb57f23a8.hot-update.js",
"/js/main.4d61823678463591028f.hot-update.js": "/js/main.4d61823678463591028f.hot-update.js",
"/chunks/files.4d61823678463591028f.hot-update.js": "/chunks/files.4d61823678463591028f.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.4d61823678463591028f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.4d61823678463591028f.hot-update.js",
"/chunks/sign-in.4d61823678463591028f.hot-update.js": "/chunks/sign-in.4d61823678463591028f.hot-update.js"
}

1
resources/js/App.vue
View File

@@ -59,7 +59,6 @@
<CookieDisclaimer/>
<!--Background vignette-->
<Vignette/>
</div>
</template>

8
resources/js/components/FilesView/DesktopToolbar.vue
View File

@@ -25,22 +25,22 @@
<SearchBar/>
</div>
<!--Files controlls-->
<!--Creating controls-->
<div class="toolbar-button-wrapper" v-if="$checkPermission(['master', 'editor'])">
<ToolbarButtonUpload :class="{ 'is-inactive': canUploadInView || !hasCapacity }" :action="$t('actions.upload')"/>
<ToolbarButton :class="{ 'is-inactive': canCreateFolderInView }" @click.native="createFolder" source="folder-plus" :action="$t('actions.create_folder')"/>
</div>
<div class="toolbar-button-wrapper" v-if="$checkPermission(['master', 'editor'])">
<!--File Controls-->
<div class="toolbar-button-wrapper" v-if="$checkPermission(['master', 'editor']) && ! $isMobile()">
<ToolbarButton source="move" :class="{ 'is-inactive': canMoveInView }" :action="$t('actions.move')" @click.native="moveItem"/>
<ToolbarButton v-if="!$isThisLocation(['public'])" source="share" :class="{ 'is-inactive': canShareInView }" :action="$t('actions.share')" @click.native="shareItem"/>
<ToolbarButton source="trash" :class="{ 'is-inactive': canDeleteInView }" :action="$t('actions.delete')" @click.native="deleteItem"/>
</div>
<!--View options-->
<!--View Controls-->
<div class="toolbar-button-wrapper">
<ToolbarButton source="preview-sorting" class="preview-sorting" :action="$t('actions.sorting_view')" :class="{ active: sortingAndPreview }" @click.stop.native="sortingAndPreview = !sortingAndPreview"/>
<ToolbarButton :action="$t('actions.info_panel')" :class="{ active: fileInfoVisible }" @click.native="$store.dispatch('fileInfoToggle')" source="info"/>
</div>
</div>

49
resources/js/components/FilesView/DragUI.vue
View File

@@ -1,5 +1,5 @@
<template>
<MultiSelected :title="title" :subtitle="subtitle" id="multi-select-ui" v-show="dragged" />
<MultiSelected :title="title" :subtitle="subtitle" id="multi-select-ui" v-show="isVisible"/>
</template>
<script>
@@ -8,29 +8,34 @@ import {mapGetters} from 'vuex'
import { events } from '@/bus'
export default {
name:"DragUI",
name: 'DragUI',
components: { MultiSelected },
computed: {
...mapGetters(['fileInfoDetail']),
title() {
let filesLength = this.fileInfoDetail.length,
hasDraggedItem = this.fileInfoDetail.includes(this.draggedItem)
// Title for multiple selected items
if(this.fileInfoDetail.length > 1 && this.fileInfoDetail.includes(this.draggedItem)) {
if (filesLength > 1 && hasDraggedItem) {
return this.$t('file_detail.selected_multiple')
}
// Title for single item
if((this.fileInfoDetail.length < 2 || !this.fileInfoDetail.includes(this.draggedItem)) && this.draggedItem ) {
if ((filesLength < 2 || !hasDraggedItem) && this.draggedItem) {
return this.draggedItem.name
}
},
subtitle() {
let filesLength = this.fileInfoDetail.length,
hasDraggedItem = this.fileInfoDetail.includes(this.draggedItem)
// Subtitle for multiple selected items
if(this.fileInfoDetail.length > 1 && this.fileInfoDetail.includes(this.draggedItem) ) {
return this.fileInfoDetail.length + ' ' + this.$tc('file_detail.items', this.fileInfoDetail.length)
if (filesLength > 1 && hasDraggedItem) {
return filesLength + ' ' + this.$tc('file_detail.items', filesLength)
}
if((this.fileInfoDetail.length < 2 || !this.fileInfoDetail.includes(this.draggedItem)) && this.draggedItem) {
if ((filesLength < 2 || !hasDraggedItem) && this.draggedItem) {
// Subtitle for single folder
if (this.draggedItem.type === 'folder') {
@@ -42,30 +47,30 @@ import {events} from '@/bus'
return '.' + this.draggedItem.mimetype
}
}
},
}
},
data() {
return {
dragged: false,
isVisible: false,
draggedItem: undefined
}
},
mounted () {
// Hnadle Drag & Drop Ghost show
events.$on('dragstart', (data) => {
setTimeout(() => {
this.dragged = true
}, 50);
created() {
// Handle Drag & Drop Ghost show
events.$on('dragstart', data => {
this.draggedItem = data
setTimeout(() => {
this.isVisible = true
}, 100)
})
events.$on('drop', () => {
this.dragged = false
this.isVisible = false
})
}
}
</script>
@@ -83,14 +88,17 @@ import {events} from '@/bus'
border-radius: 8px;
box-shadow: 0 7px 25px 1px rgba(0, 0, 0, 0.12);
background: white;
/deep/ .text {
.title {
color: $text;
}
.count {
color: $text-muted;
}
}
/deep/ .icon-wrapper {
.icon {
stroke: $theme;
@@ -101,14 +109,17 @@ import {events} from '@/bus'
@media (prefers-color-scheme: dark) {
#multi-select-ui {
background: $dark_mode_foreground;
/deep/ .text {
.title {
color: $dark_mode_text_primary;
}
.count {
color: $dark_mode_text_secondary;
}
}
/deep/ .icon-wrapper {
.icon {
stroke: $theme;

6
resources/js/components/FilesView/FileItemGrid.vue
View File

@@ -347,7 +347,7 @@ export default {
}
.select-box-active {
background-color: $text;
background-color: $theme;
.icon {
stroke: white;
@@ -601,10 +601,10 @@ export default {
}
.select-box-active {
background-color: #f4f5f6;
background-color: lighten($theme, 5%);
.icon {
stroke: $text;
stroke: white;
}
}

20
resources/js/components/FilesView/FileItemList.vue
View File

@@ -1,9 +1,14 @@
<template>
<div class="file-wrapper" @click.stop="clickedItem" @dblclick="goToItem" spellcheck="false">
<!--List preview-->
<div :draggable="canDrag" @dragstart="$emit('dragstart')" @drop="
drop()
area = false" @dragleave="dragLeave" @dragover.prevent="dragEnter" class="file-item" :class="{'is-clicked' : isClicked , 'no-clicked' : !isClicked && this.$isMobile(), 'is-dragenter': area }">
<div
:draggable="canDrag"
@dragstart="$emit('dragstart')"
@drop="drop()"
@dragleave="dragLeave"
@dragover.prevent="dragEnter"
class="file-item" :class="{'is-clicked' : isClicked , 'no-clicked' : !isClicked && this.$isMobile(), 'is-dragenter': area }"
>
<!-- MultiSelecting for the mobile version -->
<transition name="slide-from-left">
<div class="check-select" v-if="mobileMultiSelect">
@@ -161,6 +166,7 @@ export default {
},
methods: {
drop() {
this.area = false
events.$emit('drop')
},
showItemActions() {
@@ -358,10 +364,10 @@ export default {
}
.select-box-active {
background-color: #f4f5f6;
background-color: $theme;
.icon {
stroke: $text;
stroke: white;
}
}
}
@@ -563,10 +569,10 @@ export default {
}
.select-box-active {
background-color: lighten($dark_mode_foreground, 10%);
background-color: $theme;
.icon {
stroke: $theme;
stroke: white;
}
}
}

2
resources/js/components/FilesView/FilePreviewNavigationPanel.vue
View File

@@ -6,7 +6,7 @@
<p class="title">{{ fileInfoDetail[0].name }}</p>
<span class="file-count"> ({{ showingImageIndex + ' ' + $t('pronouns.of') + ' ' + filteredFiles.length }}) </span>
</div>
<span id="fast-preview-menu" class="fast-menu-icon" @click.stop="menuOpen" v-if="$checkPermission(['master', 'editor'])">
<span id="fast-preview-menu" class="fast-menu-icon" @click.stop="menuOpen" v-if="$checkPermission(['master', 'editor', 'visitor'])">
<more-horizontal-icon class="more-icon" size="14"> </more-horizontal-icon>
</span>
</div>

2
resources/js/components/FilesView/MediaFullPreview.vue
View File

@@ -5,7 +5,7 @@
<audio class="file audio" :class="{ 'file-shadow': !isMobileDevice }" v-if="fileInfoDetail[0].type == 'audio'" :src="currentFile.file_url" controlsList="nodownload" controls></audio>
<img v-if="fileInfoDetail[0].type === 'image' && currentFile.thumbnail" class="file" :class="{ 'file-shadow': !isMobileDevice }" id="image" :src="currentFile.file_url" />
<div class="video-wrapper" v-if="fileInfoDetail[0].type === 'video' && currentFile.file_url">
<video :src="currentFile.file_url" class="video" :class="{ 'file-shadow': !isMobileDevice }" controlsList="nodownload" disablePictureInPicture playsinline controls />
<video :src="currentFile.file_url" class="video" :class="{ 'file-shadow': !isMobileDevice }" controlsList="nodownload" disablePictureInPicture playsinline controls autoplay />
</div>
</div>
</div>

224
resources/js/components/FilesView/MobileMenu.vue
View File

@@ -1,53 +1,30 @@
<template>
<div class="options-wrapper">
<transition name="context-menu">
<div
v-if="isVisible"
ref="contextmenu"
class="options"
@click="closeAndResetContextMenu"
>
<div v-if="isVisible" ref="contextmenu" class="options" @click="closeAndResetContextMenu">
<div class="menu-wrapper">
<!--Item Thumbnail-->
<ThumbnailItem
class="item-thumbnail"
:item="fileInfoDetail[0]"
info="metadata"
/>
<ThumbnailItem class="item-thumbnail" :item="fileInfoDetail[0]" info="metadata"/>
<!--Mobile for trash location-->
<div
v-if="
$isThisLocation(['trash', 'trash-root']) &&
$checkPermission('master')
"
class="menu-options"
>
<div v-if="$isThisLocation(['trash', 'trash-root']) && $checkPermission('master')" class="menu-options">
<ul class="menu-option-group">
<li
class="menu-option"
@click="$store.dispatch('restoreItem', fileInfoDetail[0])"
v-if="fileInfoDetail[0]"
>
<li class="menu-option" @click="$store.dispatch('restoreItem', fileInfoDetail[0])" v-if="fileInfoDetail[0]">
<div class="icon">
<life-buoy-icon size="17"></life-buoy-icon>
</div>
<div class="text-label">
{{ $t("context_menu.restore") }}
{{ $t('context_menu.restore') }}
</div>
</li>
<li
class="menu-option delete"
@click="deleteItem"
v-if="fileInfoDetail[0]"
>
<li class="menu-option delete" @click="deleteItem" v-if="fileInfoDetail[0]">
<div class="icon">
<trash-2-icon size="17"></trash-2-icon>
</div>
<div class="text-label">
{{ $t("context_menu.delete") }}
{{ $t('context_menu.delete') }}
</div>
</li>
</ul>
@@ -58,31 +35,24 @@
<download-cloud-icon size="17"></download-cloud-icon>
</div>
<div class="text-label">
{{ $t("context_menu.download") }}
{{ $t('context_menu.download') }}
</div>
</li>
</ul>
</div>
<!--Mobile for Base location-->
<div
v-if="$isThisLocation(['shared']) && $checkPermission('master')"
class="menu-options"
>
<div v-if="$isThisLocation(['shared']) && $checkPermission('master')" class="menu-options">
<ul class="menu-option-group">
<li
class="menu-option"
@click="addToFavourites"
v-if="fileInfoDetail[0] && isFolder"
>
<li class="menu-option" @click="addToFavourites" v-if="fileInfoDetail[0] && isFolder">
<div class="icon">
<star-icon size="17"></star-icon>
</div>
<div class="text-label">
{{
isInFavourites
? $t("context_menu.remove_from_favourites")
: $t("context_menu.add_to_favourites")
? $t('context_menu.remove_from_favourites')
: $t('context_menu.add_to_favourites')
}}
</div>
</li>
@@ -94,7 +64,7 @@
<edit-2-icon size="17"></edit-2-icon>
</div>
<div class="text-label">
{{ $t("context_menu.rename") }}
{{ $t('context_menu.rename') }}
</div>
</li>
<li class="menu-option" @click="shareItem" v-if="fileInfoDetail[0]">
@@ -104,21 +74,17 @@
<div class="text-label">
{{
fileInfoDetail[0].shared
? $t("context_menu.share_edit")
: $t("context_menu.share")
? $t('context_menu.share_edit')
: $t('context_menu.share')
}}
</div>
</li>
<li
class="menu-option delete"
@click="deleteItem"
v-if="fileInfoDetail[0]"
>
<li class="menu-option delete" @click="deleteItem" v-if="fileInfoDetail[0]">
<div class="icon">
<trash-2-icon size="17"></trash-2-icon>
</div>
<div class="text-label">
{{ $t("context_menu.delete") }}
{{ $t('context_menu.delete') }}
</div>
</li>
</ul>
@@ -129,20 +95,14 @@
<download-cloud-icon size="17"></download-cloud-icon>
</div>
<div class="text-label">
{{ $t("context_menu.download") }}
{{ $t('context_menu.download') }}
</div>
</li>
</ul>
</div>
<!--Mobile for Base location-->
<div
v-if="
$isThisLocation(['base', 'participant_uploads', 'latest']) &&
$checkPermission('master')
"
class="menu-options"
>
<div v-if="$isThisLocation(['base', 'participant_uploads', 'latest']) && $checkPermission('master')" class="menu-options">
<ul class="menu-option-group" v-if="fileInfoDetail[0] && isFolder">
<li class="menu-option" @click="addToFavourites">
<div class="icon">
@@ -151,8 +111,8 @@
<div class="text-label">
{{
isInFavourites
? $t("context_menu.remove_from_favourites")
: $t("context_menu.add_to_favourites")
? $t('context_menu.remove_from_favourites')
: $t('context_menu.add_to_favourites')
}}
</div>
</li>
@@ -164,7 +124,7 @@
<edit-2-icon size="17"></edit-2-icon>
</div>
<div class="text-label">
{{ $t("context_menu.rename") }}
{{ $t('context_menu.rename') }}
</div>
</li>
<li class="menu-option" @click="moveItem" v-if="fileInfoDetail[0]">
@@ -172,7 +132,7 @@
<corner-down-right-icon size="17"></corner-down-right-icon>
</div>
<div class="text-label">
{{ $t("context_menu.move") }}
{{ $t('context_menu.move') }}
</div>
</li>
<li class="menu-option" @click="shareItem" v-if="fileInfoDetail[0]">
@@ -182,21 +142,17 @@
<div class="text-label">
{{
fileInfoDetail[0].shared
? $t("context_menu.share_edit")
: $t("context_menu.share")
? $t('context_menu.share_edit')
: $t('context_menu.share')
}}
</div>
</li>
<li
class="menu-option delete"
@click="deleteItem"
v-if="fileInfoDetail[0]"
>
<li class="menu-option delete" @click="deleteItem" v-if="fileInfoDetail[0]">
<div class="icon">
<trash-2-icon size="17"></trash-2-icon>
</div>
<div class="text-label">
{{ $t("context_menu.delete") }}
{{ $t('context_menu.delete') }}
</div>
</li>
</ul>
@@ -207,26 +163,21 @@
<download-cloud-icon size="17"></download-cloud-icon>
</div>
<div class="text-label">
{{ $t("context_menu.download") }}
{{ $t('context_menu.download') }}
</div>
</li>
</ul>
</div>
<!--Mobile for Base location with EDITOR permission-->
<div
v-if="
$isThisLocation(['base', 'public']) && $checkPermission('editor')
"
class="menu-options"
>
<div v-if="$isThisLocation(['base', 'public']) && $checkPermission('editor')" class="menu-options">
<ul class="menu-option-group">
<li class="menu-option" @click="renameItem" v-if="fileInfoDetail[0]">
<div class="icon">
<edit-2-icon size="17"></edit-2-icon>
</div>
<div class="text-label">
{{ $t("context_menu.rename") }}
{{ $t('context_menu.rename') }}
</div>
</li>
<li class="menu-option" @click="moveItem" v-if="fileInfoDetail[0]">
@@ -234,7 +185,7 @@
<corner-down-right-icon size="17"></corner-down-right-icon>
</div>
<div class="text-label">
{{ $t("context_menu.move") }}
{{ $t('context_menu.move') }}
</div>
</li>
<li class="menu-option" @click="deleteItem">
@@ -242,7 +193,7 @@
<trash-2-icon size="17"></trash-2-icon>
</div>
<div class="text-label">
{{ $t("context_menu.delete") }}
{{ $t('context_menu.delete') }}
</div>
</li>
</ul>
@@ -253,26 +204,21 @@
<download-cloud-icon size="17"></download-cloud-icon>
</div>
<div class="text-label">
{{ $t("context_menu.download") }}
{{ $t('context_menu.download') }}
</div>
</li>
</ul>
</div>
<!--Mobile for Base location with VISITOR permission-->
<div
v-if="
$isThisLocation(['base', 'public']) && $checkPermission('visitor')
"
class="menu-options"
>
<div v-if="$isThisLocation(['base', 'public']) && $checkPermission('visitor')" class="menu-options">
<ul class="menu-option-group">
<li class="menu-option" @click="downloadItem" v-if="!isFolder">
<div class="icon">
<download-cloud-icon size="17"></download-cloud-icon>
</div>
<div class="text-label">
{{ $t("context_menu.download") }}
{{ $t('context_menu.download') }}
</div>
</li>
</ul>
@@ -281,17 +227,13 @@
</div>
</transition>
<transition name="fade">
<div
v-show="isVisible"
class="vignette"
@click="closeAndResetContextMenu"
></div>
<div v-show="isVisible" class="vignette" @click="closeAndResetContextMenu"></div>
</transition>
</div>
</template>
<script>
import ThumbnailItem from "@/components/Others/ThumbnailItem";
import ThumbnailItem from '@/components/Others/ThumbnailItem'
import {
CornerDownRightIcon,
@@ -303,13 +245,13 @@ import {
TrashIcon,
StarIcon,
LinkIcon,
EyeIcon,
} from "vue-feather-icons";
import { events } from "@/bus";
import { mapGetters } from "vuex";
EyeIcon
} from 'vue-feather-icons'
import { events } from '@/bus'
import { mapGetters } from 'vuex'
export default {
name: "MobileMenu",
name: 'MobileMenu',
components: {
CornerDownRightIcon,
DownloadCloudIcon,
@@ -321,38 +263,38 @@ export default {
TrashIcon,
LinkIcon,
StarIcon,
EyeIcon,
EyeIcon
},
computed: {
...mapGetters(["fileInfoDetail", "user"]),
...mapGetters(['fileInfoDetail', 'user']),
favourites() {
return this.user.relationships.favourites.data.attributes.folders;
return this.user.relationships.favourites.data.attributes.folders
},
isInFavourites() {
return this.favourites.find(
(el) => el.unique_id == this.fileInfoDetail[0].unique_id
);
)
},
isFile() {
return (
this.fileInfoDetail[0] &&
this.fileInfoDetail[0].type !== "folder" &&
this.fileInfoDetail[0].type !== 'folder' &&
this.fileInfoDetail[0] &&
this.fileInfoDetail[0].type !== "image"
);
this.fileInfoDetail[0].type !== 'image'
)
},
isImage() {
return this.fileInfoDetail[0] && this.fileInfoDetail[0].type === "image";
return this.fileInfoDetail[0] && this.fileInfoDetail[0].type === 'image'
},
isFolder() {
return this.fileInfoDetail[0] && this.fileInfoDetail[0].type === "folder";
},
return this.fileInfoDetail[0] && this.fileInfoDetail[0].type === 'folder'
}
},
data() {
return {
isVisible: false,
showFromMediaPreview: false,
};
showFromMediaPreview: false
}
},
methods: {
moveItem() {
@@ -361,16 +303,16 @@ export default {
shareItem() {
if (this.fileInfoDetail[0].shared) {
// Open share item popup
events.$emit("popup:open", {
name: "share-edit",
item: this.fileInfoDetail[0],
});
events.$emit('popup:open', {
name: 'share-edit',
item: this.fileInfoDetail[0]
})
} else {
// Open share item popup
events.$emit("popup:open", {
name: "share-create",
item: this.fileInfoDetail[0],
});
events.$emit('popup:open', {
name: 'share-create',
item: this.fileInfoDetail[0]
})
}
},
addToFavourites() {
@@ -380,48 +322,47 @@ export default {
(el) => el.unique_id == this.fileInfoDetail[0].unique_id
)
) {
this.$store.dispatch("addToFavourites", this.fileInfoDetail[0]);
this.$store.dispatch('addToFavourites', this.fileInfoDetail[0])
} else {
this.$store.dispatch("removeFromFavourites", this.fileInfoDetail[0]);
this.$store.dispatch('removeFromFavourites', this.fileInfoDetail[0])
}
},
downloadItem() {
this.$downloadFile(
this.fileInfoDetail[0].file_url,
this.fileInfoDetail[0].name + "." + this.fileInfoDetail[0].mimetype
);
this.fileInfoDetail[0].name + '.' + this.fileInfoDetail[0].mimetype
)
},
deleteItem() {
this.$store.dispatch("deleteItem");
this.$store.dispatch('deleteItem')
},
renameItem() {
events.$emit('popup:open', { name: 'rename-item', item: this.fileInfoDetail[0] })
},
closeAndResetContextMenu() {
//If emit to show menu coming from MediaFullPreview dont reset data
this.isVisible = false;
this.showFromMediaPreview = false;
this.isVisible = false
this.showFromMediaPreview = false
events.$emit('hide:mobile-navigation')
},
}
},
created() {
// Show context menu
events.$on("mobileMenu:show", (showFromMedia) => {
events.$on('mobileMenu:show', showFromMedia => {
// If emit come from MediaFullPreview
if (showFromMedia) {
this.isVisible = true;
this.showFromMediaPreview = true;
this.isVisible = true
this.showFromMediaPreview = true
} else {
this.isVisible = !this.isVisible;
this.isVisible = !this.isVisible
}
});
})
// Hide mobile menu
events.$on("mobileMenu:hide", () => {
this.isVisible = false;
});
},
};
events.$on('mobileMenu:hide', () => {
this.isVisible = false
})
}
}
</script>
<style scoped lang="scss">
@@ -432,6 +373,7 @@ export default {
display: flex;
margin-left: 15px;
margin-right: 15px;
.close-icon {
margin-left: auto !important;
}
@@ -524,10 +466,10 @@ export default {
}
.options {
background: $dark_mode_background;
background: $dark_mode_foreground;
.menu-options {
background: $dark_mode_background;
background: $dark_mode_foreground;
.menu-option-group {
border-color: $dark_mode_border_color;

2
resources/js/components/FilesView/MobileSortingAndPreview.vue
View File

@@ -42,7 +42,7 @@ import { events } from '@/bus'
@media (prefers-color-scheme: dark) {
.options {
background: $dark_mode_background;
background: $dark_mode_foreground;
}
}

8
resources/js/components/FilesView/ProcessingPopup.vue
View File

@@ -1,13 +1,13 @@
<template>
<transition name="popup">
<div class="popup" v-if="isZippingFiles">
<div class="popup" v-if="processingPopup">
<div class="popup-wrapper">
<div class="popup-content">
<div class="spinner-wrapper">
<Spinner/>
</div>
<h1 class="title">{{ $t('popup_zipping.title') }}</h1>
<p class="message">{{ $t('popup_zipping.message') }}</p>
<h1 class="title">{{ processingPopup.title }}</h1>
<p class="message">{{ processingPopup.message }}</p>
</div>
</div>
</div>
@@ -25,7 +25,7 @@ export default {
},
computed: {
...mapGetters([
'isZippingFiles'
'processingPopup'
])
}
}

4
resources/js/components/Others/CookieDisclaimer.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="cookie-wrapper" v-if="isVisibleDisclaimer && config.isSaaS">
<span class="close-icon">
<x-icon @click="closeDisclaimer" size="12"></x-icon>
<span @click="closeDisclaimer" class="close-icon">
<x-icon size="12"></x-icon>
</span>
<i18n path="cookie_disclaimer.description" tag="p">
<router-link :to="{name: 'DynamicPage', params: {slug: 'cookie-policy'}}">{{ $t('cookie_disclaimer.button') }}</router-link>

6
resources/js/components/Others/SetFolderIcon.vue
View File

@@ -139,6 +139,7 @@
this.groupInView = group.name
}
})
}, 200),
scrollToGroup( name ) {
@@ -154,6 +155,7 @@
}, 800),
openMenu() {
this.selectOpen = ! this.selectOpen
this.searchInput = ''
@@ -161,6 +163,7 @@
this.groupInView = 'Smileys & Emotion'
},
setIcon( value ) {
if(value.emoji){
this.selectedEmoji = value.emoji
this.selectedColor = undefined
@@ -176,19 +179,20 @@
this.selectOpen = false
},
resetEmoji(){
this.selectedEmoji = undefined
events.$emit('setFolderIcon', undefined)
}
},
mounted () {
this.selectOpen = false
events.$on('unClick', () => {
this.selectOpen = false
})
}
}
</script>

8
resources/js/components/Others/TabWrapper.vue
View File

@@ -61,10 +61,11 @@
margin-bottom: 20px;
cursor: pointer;
align-items: center;
background: $light_background;
background: white;
color: $text;
border-radius: 8px;
overflow: hidden;
border: 1px solid #E8E9EB;
.tab-title {
@include font-size(14);
@@ -78,10 +79,10 @@
padding: 8px;
&.active {
background: $text;
background: $light_background;
.tab-title {
color: $light_background;
color: $text;
}
}
}
@@ -101,6 +102,7 @@
@media (prefers-color-scheme: dark) {
.tab-wrapper {
background: $dark_mode_foreground;
border-color: transparent;
.tab.active {
background: rgba($theme, 0.1);

4
resources/js/components/Others/Vignette.vue
View File

@@ -12,10 +12,10 @@
name: 'Vignette',
computed: {
...mapGetters([
'isZippingFiles'
'processingPopup'
]),
isVisible() {
return this.isZippingFiles || this.isVisibleVignette
return this.processingPopup || this.isVisibleVignette
},
},
data() {

2
resources/js/i18n/lang/cn.json
View File

@@ -284,7 +284,7 @@
"upload": "上传",
"select": "Select",
"no_options": "No Options Available",
"zip_folder": "Zip Folder"
"zip_folder": "Zip and Download"
},
"mobile_selecting": {
"select_all": "Select All",

8
resources/js/i18n/lang/en.json
View File

@@ -286,7 +286,7 @@
"upload": "Upload",
"select": "Select",
"no_options": "No Options Available",
"zip_folder": "Zip Folder"
"zip_folder": "Zip and Download"
},
"mobile_selecting": {
"select_all": "Select All",
@@ -308,9 +308,9 @@
"paginate_info": "Showing 1 - {visible} from {total} records"
},
"empty_page": {
"call_to_action": "Upload File",
"description": "Upload some files here easily via upload button",
"title": "There is Nothing"
"call_to_action": "Upload Files",
"description": "Upload some files here easily via upload button.",
"title": "Upload Your First File"
},
"errors": {
"capacity_digit": "The storage capacity must be lower than 10 digit number."

3
resources/js/main.js vendored
View File

@@ -90,8 +90,9 @@ Vue.use(Helpers);
Vue.config.productionTip = false;
// Handle position of Drag & Drop Ghost
document.addEventListener('drag', (event) => {
document.addEventListener('drag', event => {
let multiSelect = document.getElementById('multi-select-ui')
multiSelect.style.top = event.clientY + 20 + 'px'
multiSelect.style.left = event.clientX + 'px'

2
resources/js/store/modules/app.js vendored
View File

@@ -1,7 +1,7 @@
import i18n from '@/i18n/index'
const defaultState = {
fileInfoPanelVisible: localStorage.getItem('file_info_visibility') == 'true' || false,
fileInfoPanelVisible: localStorage.getItem('file_info_visibility') == 'true' || true,
FilePreviewType: localStorage.getItem('preview_type') || 'list',
config: undefined,
index: undefined,

15
resources/js/store/modules/fileFunctions.js vendored
View File

@@ -6,13 +6,16 @@ import axios from 'axios'
import Vue from 'vue'
const defaultState = {
isZippingFiles: false,
processingPopup: undefined,
}
const actions = {
downloadFolder: ({commit, getters}, folder) => {
commit('ZIPPING_FILE_STATUS', true)
commit('PROCESSING_POPUP', {
title: i18n.t('popup_zipping.title'),
message: i18n.t('popup_zipping.message'),
})
// Get route
let route = getters.sharedDetail && !getters.sharedDetail.protected
@@ -27,7 +30,7 @@ const actions = {
Vue.prototype.$isSomethingWrong()
})
.finally(() => {
commit('ZIPPING_FILE_STATUS', false)
commit('PROCESSING_POPUP', undefined)
})
},
@@ -379,13 +382,13 @@ const actions = {
}
const mutations = {
ZIPPING_FILE_STATUS(state, status) {
state.isZippingFiles = status
PROCESSING_POPUP(state, status) {
state.processingPopup = status
}
}
const getters = {
isZippingFiles: state => state.isZippingFiles
processingPopup: state => state.processingPopup
}
export default {

11
resources/js/store/modules/userAuth.js vendored
View File

@@ -39,11 +39,18 @@ const actions = {
})
},
logOut: ({getters, commit}) => {
let popup = setTimeout(() => {
commit('PROCESSING_POPUP', {
title: 'Logging Out',
message: 'Wait a second...',
})
}, 300)
axios
.get(getters.api + '/logout')
.then(() => {
// Commit Remove Access Token from vuex storage
clearTimeout(popup)
commit('DESTROY_DATA')
router.push({name: 'SignIn'})

1
resources/js/views/Auth/SignIn.vue
View File

@@ -208,6 +208,7 @@
},
created() {
this.$scrollTop()
this.$store.commit('PROCESSING_POPUP', undefined)
}
}
</script>

12
resources/js/views/FilePages/Files.vue
View File

@@ -188,18 +188,6 @@ export default {
events.$on('drop', () => {
this.dragInProgress = false
})
},
beforeRouteLeave(to, from, next) {
// Inquire user about his willing to step back to sign in page
if (to.name === 'SignIn') {
if (window.confirm(this.$t('alerts.leave_to_sign_in'))) {
next()
} else {
next(false)
}
} else {
next()
}
}
}
</script>