nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-05-19 19:55:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

editing with shared items in public

Browse Source
This commit is contained in:
carodej
2020-04-28 18:06:38 +02:00
parent eb6bd646c8
commit 2614efe601
77 changed files with 1171 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/App.vue
+7 -7
View File
@@ -31,13 +31,13 @@
</template>
<script>
import MobileMenu from '@/components/VueFileManagerComponents/FilesView/MobileMenu'
import ShareCreate from '@/components/VueFileManagerComponents/Others/ShareCreate'
import ShareEdit from '@/components/VueFileManagerComponents/Others/ShareEdit'
import MoveItem from '@/components/VueFileManagerComponents/Others/MoveItem'
import Vignette from '@/components/VueFileManagerComponents/Others/Vignette'
import Sidebar from '@/components/VueFileManagerComponents/Sidebar/Sidebar'
import Alert from '@/components/VueFileManagerComponents/FilesView/Alert'
import MobileMenu from '@/components/FilesView/MobileMenu'
import ShareCreate from '@/components/Others/ShareCreate'
import ShareEdit from '@/components/Others/ShareEdit'
import MoveItem from '@/components/Others/MoveItem'
import Vignette from '@/components/Others/Vignette'
import Sidebar from '@/components/Sidebar/Sidebar'
import Alert from '@/components/FilesView/Alert'
import {ResizeSensor} from 'css-element-queries'
import { includes } from 'lodash'
import {mapGetters} from 'vuex'
resources/js/components/VueFileManagerComponents/Auth/AuthButton.vue → resources/js/components/Auth/AuthButton.vue
View File
resources/js/components/VueFileManagerComponents/Auth/AuthContent.vue → resources/js/components/Auth/AuthContent.vue
View File
resources/js/components/VueFileManagerComponents/Auth/AuthContentWrapper.vue → resources/js/components/Auth/AuthContentWrapper.vue
View File
resources/js/components/VueFileManagerComponents/FilesView/Alert.vue → resources/js/components/FilesView/Alert.vue
+1 -1
View File
@@ -23,7 +23,7 @@
</template>
<script>
import ButtonBase from '@/components/VueFileManagerComponents/FilesView/ButtonBase'
import ButtonBase from '@/components/FilesView/ButtonBase'
import {events} from '@/bus'
export default {
resources/js/components/VueFileManagerComponents/FilesView/ButtonBase.vue → resources/js/components/FilesView/ButtonBase.vue
View File
resources/js/components/VueFileManagerComponents/FilesView/ButtonUpload.vue → resources/js/components/FilesView/ButtonUpload.vue
View File
resources/js/components/VueFileManagerComponents/FilesView/ContextMenu.vue → resources/js/components/FilesView/ContextMenu.vue
View File
resources/js/components/VueFileManagerComponents/FilesView/DesktopToolbar.vue → resources/js/components/FilesView/DesktopToolbar.vue
+7 -9
View File
@@ -46,7 +46,7 @@
<div class="toolbar-button-wrapper">
<ToolbarButton
:source="preview"
action=""
action="Change Preview"
@click.native="$store.dispatch('changePreviewType')"
/>
<ToolbarButton
@@ -62,10 +62,10 @@
</template>
<script>
import ToolbarButtonUpload from '@/components/VueFileManagerComponents/FilesView/ToolbarButtonUpload'
import UploadProgress from '@/components/VueFileManagerComponents/FilesView/UploadProgress'
import ToolbarButton from '@/components/VueFileManagerComponents/FilesView/ToolbarButton'
import SearchBar from '@/components/VueFileManagerComponents/FilesView/SearchBar'
import ToolbarButtonUpload from '@/components/FilesView/ToolbarButtonUpload'
import UploadProgress from '@/components/FilesView/UploadProgress'
import ToolbarButton from '@/components/FilesView/ToolbarButton'
import SearchBar from '@/components/FilesView/SearchBar'
import {mapGetters} from 'vuex'
import {events} from '@/bus'
@@ -97,9 +97,6 @@
preview() {
return this.FilePreviewType === 'list' ? 'th' : 'th-list'
},
isTrash() {
return this.currentFolder.location === 'trash' || this.currentFolder.location === 'trash-root'
}
},
data() {
return {
@@ -130,7 +127,8 @@
events.$emit('items:delete')
},
createFolder() {
if (! this.isTrash) this.$createFolder()
if (! this.$isThisLocation(['trash', 'trash-root']))
this.$createFolder()
}
},
created() {
resources/js/components/VueFileManagerComponents/FilesView/EmptyMessage.vue → resources/js/components/FilesView/EmptyMessage.vue
View File
resources/js/components/VueFileManagerComponents/FilesView/EmptyPage.vue → resources/js/components/FilesView/EmptyPage.vue
+2 -2
View File
@@ -35,8 +35,8 @@
</template>
<script>
import ButtonUpload from '@/components/VueFileManagerComponents/FilesView/ButtonUpload'
import Spinner from '@/components/VueFileManagerComponents/FilesView/Spinner'
import ButtonUpload from '@/components/FilesView/ButtonUpload'
import Spinner from '@/components/FilesView/Spinner'
import {mapGetters} from 'vuex'
export default {
resources/js/components/VueFileManagerComponents/FilesView/FileBrowser.vue → resources/js/components/FilesView/FileBrowser.vue
+8 -8
View File
@@ -83,14 +83,14 @@
</template>
<script>
import MobileToolbar from '@/components/VueFileManagerComponents/FilesView/MobileToolbar'
import MobileActions from '@/components/VueFileManagerComponents/FilesView/MobileActions'
import FileInfoPanel from '@/components/VueFileManagerComponents/FilesView/FileInfoPanel'
import FileItemList from '@/components/VueFileManagerComponents/FilesView/FileItemList'
import FileItemGrid from '@/components/VueFileManagerComponents/FilesView/FileItemGrid'
import EmptyMessage from '@/components/VueFileManagerComponents/FilesView/EmptyMessage'
import EmptyPage from '@/components/VueFileManagerComponents/FilesView/EmptyPage'
import SearchBar from '@/components/VueFileManagerComponents/FilesView/SearchBar'
import MobileToolbar from '@/components/FilesView/MobileToolbar'
import MobileActions from '@/components/FilesView/MobileActions'
import FileInfoPanel from '@/components/FilesView/FileInfoPanel'
import FileItemList from '@/components/FilesView/FileItemList'
import FileItemGrid from '@/components/FilesView/FileItemGrid'
import EmptyMessage from '@/components/FilesView/EmptyMessage'
import EmptyPage from '@/components/FilesView/EmptyPage'
import SearchBar from '@/components/FilesView/SearchBar'
import {mapGetters} from 'vuex'
import {events} from '@/bus'
resources/js/components/VueFileManagerComponents/FilesView/FileInfoPanel.vue → resources/js/components/FilesView/FileInfoPanel.vue
+2 -2
View File
@@ -65,8 +65,8 @@
</template>
<script>
import FilePreview from '@/components/VueFileManagerComponents/FilesView/FilePreview'
import CopyInput from '@/components/VueFileManagerComponents/Others/Forms/CopyInput'
import FilePreview from '@/components/FilesView/FilePreview'
import CopyInput from '@/components/Others/Forms/CopyInput'
import {mapGetters} from 'vuex'
import {events} from "@/bus"
resources/js/components/VueFileManagerComponents/FilesView/FileItemGrid.vue → resources/js/components/FilesView/FileItemGrid.vue
+17 -7
View File
@@ -7,7 +7,7 @@
>
<!--Grid preview-->
<div
:draggable="! isDeleted"
:draggable="canDrag"
@dragstart="$emit('dragstart')"
@drop="
$emit('drop')
@@ -49,11 +49,17 @@
</b>
<div class="item-info">
<!--Shared Icon-->
<div v-if="$checkPermission('master') && data.shared" class="item-shared">
<FontAwesomeIcon class="shared-icon" icon="user-friends"/>
</div>
<!--Participant owner Icon-->
<div v-if="$checkPermission('master') && data.user_scope !== 'master'" class="item-shared">
<FontAwesomeIcon class="shared-icon" icon="user-edit"/>
</div>
<!--Filesize-->
<span v-if="! isFolder" class="item-size">{{ data.filesize }}</span>
@@ -65,8 +71,8 @@
</div>
<span @click.stop="showItemActions" class="show-actions" v-if="$isMobile()">
<FontAwesomeIcon icon="ellipsis-h" class="icon-action"></FontAwesomeIcon>
</span>
<FontAwesomeIcon icon="ellipsis-h" class="icon-action"></FontAwesomeIcon>
</span>
</div>
</div>
</template>
@@ -77,7 +83,7 @@
import {events} from '@/bus'
export default {
name: 'FileItem',
name: 'FileItemGrid',
props: ['data'],
computed: {
...mapGetters(['FilePreviewType']),
@@ -91,7 +97,10 @@
return this.data.type === 'image'
},
canEditName() {
return ! this.$isMobile() && ! this.$isThisLocation(['trash', 'trash-root']) && ! this.$checkPermission('visitor')
return !this.$isMobile() && !this.$isThisLocation(['trash', 'trash-root']) && !this.$checkPermission('visitor')
},
canDrag() {
return !this.isDeleted && this.$checkPermission(['master', 'editor'])
},
timeStamp() {
return this.data.deleted_at ? this.$t('item_thumbnail.deleted_at', this.data.deleted_at) : this.data.created_at
@@ -136,7 +145,7 @@
if (this.$isMobile() && this.isFolder) {
// Go to folder
if ( this.$isThisLocation('public') ) {
if (this.$isThisLocation('public')) {
this.$store.dispatch('browseShared', [this.data, false])
} else {
this.$store.dispatch('getFolder', [this.data, false])
@@ -170,7 +179,7 @@
if (this.isFolder) {
// Go to folder
if ( this.$isThisLocation('public') ) {
if (this.$isThisLocation('public')) {
this.$store.dispatch('browseShared', [this.data, false])
} else {
this.$store.dispatch('getFolder', [this.data, false])
@@ -364,6 +373,7 @@
height: 110px;
border-radius: 5px;
margin: 0 auto;
pointer-events: none;
}
.folder-icon {
resources/js/components/VueFileManagerComponents/FilesView/FileItemList.vue → resources/js/components/FilesView/FileItemList.vue
+9 -8
View File
@@ -1,12 +1,13 @@
<template>
<div
@click.stop="clickedItem" @dblclick="goToItem"
class="file-wrapper"
@click.stop="clickedItem"
@dblclick="goToItem"
spellcheck="false"
>
<!--List preview-->
<div
:draggable="! isDeleted"
:draggable="canDrag"
@dragstart="$emit('dragstart')"
@drop="
$emit('drop')
@@ -84,7 +85,7 @@
import {events} from '@/bus'
export default {
name: 'FileItem',
name: 'FileItemList',
props: ['data'],
computed: {
...mapGetters(['FilePreviewType']),
@@ -100,6 +101,9 @@
canEditName() {
return ! this.$isMobile() && ! this.$isThisLocation(['trash', 'trash-root']) && ! this.$checkPermission('visitor')
},
canDrag() {
return ! this.isDeleted && this.$checkPermission(['master', 'editor'])
},
timeStamp() {
return this.data.deleted_at ? this.$t('item_thumbnail.deleted_at', {time: this.data.deleted_at}) : this.data.created_at
},
@@ -169,11 +173,7 @@
// Get target classname
let itemClass = e.target.className
if (
['name', 'icon', 'file-link', 'file-icon-text'].includes(
itemClass
)
)
if (['name', 'icon', 'file-link', 'file-icon-text'].includes(itemClass))
return
},
goToItem() {
@@ -380,6 +380,7 @@
border-radius: 5px;
width: 50px;
height: 50px;
pointer-events: none;
}
}
resources/js/components/VueFileManagerComponents/FilesView/FilePreview.vue → resources/js/components/FilesView/FilePreview.vue
View File
resources/js/components/VueFileManagerComponents/FilesView/MobileActionButton.vue → resources/js/components/FilesView/MobileActionButton.vue
View File
resources/js/components/VueFileManagerComponents/FilesView/MobileActionButtonUpload.vue → resources/js/components/FilesView/MobileActionButtonUpload.vue
View File
resources/js/components/VueFileManagerComponents/FilesView/MobileActions.vue → resources/js/components/FilesView/MobileActions.vue
+5 -5
View File
@@ -12,7 +12,7 @@
</div>
<!--ContextMenu for Base location with MASTER permission-->
<div v-if="$isThisLocation(['base', 'shared']) && $checkPermission(['master', 'editor'])" class="mobile-actions">
<div v-if="$isThisLocation(['base', 'shared', 'public']) && $checkPermission(['master', 'editor'])" class="mobile-actions">
<MobileActionButton @click.native="createFolder" icon="folder-plus">
{{ $t('context_menu.add_folder') }}
</MobileActionButton>
@@ -25,7 +25,7 @@
</div>
<!--ContextMenu for Base location with VISITOR permission-->
<div v-if="$isThisLocation(['base', 'shared']) && $checkPermission('visitor')" class="mobile-actions">
<div v-if="$isThisLocation(['base', 'shared', 'public']) && $checkPermission('visitor')" class="mobile-actions">
<MobileActionButton @click.native="switchPreview" :icon="previewIcon">
{{ previewText }}
</MobileActionButton>
@@ -37,9 +37,9 @@
</template>
<script>
import MobileActionButtonUpload from '@/components/VueFileManagerComponents/FilesView/MobileActionButtonUpload'
import MobileActionButton from '@/components/VueFileManagerComponents/FilesView/MobileActionButton'
import UploadProgress from '@/components/VueFileManagerComponents/FilesView/UploadProgress'
import MobileActionButtonUpload from '@/components/FilesView/MobileActionButtonUpload'
import MobileActionButton from '@/components/FilesView/MobileActionButton'
import UploadProgress from '@/components/FilesView/UploadProgress'
import {mapGetters} from 'vuex'
import {debounce} from 'lodash'
import {events} from '@/bus'
resources/js/components/VueFileManagerComponents/FilesView/MobileMenu.vue → resources/js/components/FilesView/MobileMenu.vue
+2 -2
View File
@@ -64,7 +64,7 @@
</ul>
<!--Mobile for Base location with EDITOR permission-->
<ul v-if="$isThisLocation(['base']) && $checkPermission('editor')" class="menu-options">
<ul v-if="$isThisLocation(['base', 'public']) && $checkPermission('editor')" class="menu-options">
<li class="menu-option" @click="renameItem" v-if="fileInfoDetail">
{{ $t('context_menu.rename') }}
</li>
@@ -77,7 +77,7 @@
</ul>
<!--Mobile for Base location with VISITOR permission-->
<ul v-if="$isThisLocation(['base']) && $checkPermission('visitor')" class="menu-options">
<ul v-if="$isThisLocation(['base', 'public']) && $checkPermission('visitor')" class="menu-options">
<li class="menu-option" @click="downloadItem" v-if="! isFolder">
{{ $t('context_menu.download') }}
</li>
resources/js/components/VueFileManagerComponents/FilesView/MobileToolbar.vue → resources/js/components/FilesView/MobileToolbar.vue
+5 -5
View File
@@ -14,8 +14,8 @@
<div class="directory-name">{{ directoryName }}</div>
<!--More Actions-->
<div class="more-actions-button" @click="showSidebarMenu">
<div class="tap-area">
<div class="more-actions-button">
<div class="tap-area" @click="showSidebarMenu" v-if="$checkPermission('master')">
<FontAwesomeIcon icon="bars" v-if="isSmallAppSize"></FontAwesomeIcon>
</div>
</div>
@@ -23,9 +23,9 @@
</template>
<script>
import ToolbarButtonUpload from '@/components/VueFileManagerComponents/FilesView/ToolbarButtonUpload'
import ToolbarButton from '@/components/VueFileManagerComponents/FilesView/ToolbarButton'
import SearchBar from '@/components/VueFileManagerComponents/FilesView/SearchBar'
import ToolbarButtonUpload from '@/components/FilesView/ToolbarButtonUpload'
import ToolbarButton from '@/components/FilesView/ToolbarButton'
import SearchBar from '@/components/FilesView/SearchBar'
import {mapGetters} from 'vuex'
import {events} from '@/bus'
resources/js/components/VueFileManagerComponents/FilesView/ProgressBar.vue → resources/js/components/FilesView/ProgressBar.vue
View File
resources/js/components/VueFileManagerComponents/FilesView/SearchBar.vue → resources/js/components/FilesView/SearchBar.vue
View File
resources/js/components/VueFileManagerComponents/FilesView/Spinner.vue → resources/js/components/FilesView/Spinner.vue
View File
resources/js/components/VueFileManagerComponents/FilesView/ToolbarButton.vue → resources/js/components/FilesView/ToolbarButton.vue
View File
resources/js/components/VueFileManagerComponents/FilesView/ToolbarButtonUpload.vue → resources/js/components/FilesView/ToolbarButtonUpload.vue
View File
resources/js/components/VueFileManagerComponents/FilesView/UploadProgress.vue → resources/js/components/FilesView/UploadProgress.vue
+1 -1
View File
@@ -10,7 +10,7 @@
</template>
<script>
import ProgressBar from '@/components/VueFileManagerComponents/FilesView/ProgressBar'
import ProgressBar from '@/components/FilesView/ProgressBar'
import {mapGetters} from 'vuex'
export default {
resources/js/components/VueFileManagerComponents/Others/ActionButton.vue → resources/js/components/Others/ActionButton.vue
View File
resources/js/components/VueFileManagerComponents/Others/Forms/CopyInput.vue → resources/js/components/Others/Forms/CopyInput.vue
View File
resources/js/components/VueFileManagerComponents/Others/Forms/SelectInput.vue → resources/js/components/Others/Forms/SelectInput.vue
View File
resources/js/components/VueFileManagerComponents/Others/Forms/SwitchInput.vue → resources/js/components/Others/Forms/SwitchInput.vue
View File
resources/js/components/VueFileManagerComponents/Others/MoveItem.vue → resources/js/components/Others/MoveItem.vue
+12 -12
View File
@@ -4,15 +4,15 @@
<PopupHeader :title="$t('popup_move_item.title')" />
<!--Content-->
<PopupContent type="height-limited" v-if="app && pickedItem">
<PopupContent type="height-limited" v-if="pickedItem">
<!--Show Spinner when loading folders-->
<Spinner v-if="isLoadingTree"/>
<!--Folder tree-->
<div v-if="! isLoadingTree">
<div v-if="! isLoadingTree && navigation">
<ThumbnailItem class="item-thumbnail" :item="pickedItem" info="location"/>
<TreeMenu :depth="1" :nodes="items" v-for="items in app.folders" :key="items.unique_id"/>
<TreeMenu :depth="1" :nodes="items" v-for="items in navigation" :key="items.unique_id"/>
</div>
</PopupContent>
@@ -35,14 +35,14 @@
</template>
<script>
import PopupWrapper from '@/components/VueFileManagerComponents/Others/Popup/PopupWrapper'
import PopupActions from '@/components/VueFileManagerComponents/Others/Popup/PopupActions'
import PopupContent from '@/components/VueFileManagerComponents/Others/Popup/PopupContent'
import PopupHeader from '@/components/VueFileManagerComponents/Others/Popup/PopupHeader'
import ThumbnailItem from '@/components/VueFileManagerComponents/Others/ThumbnailItem'
import ButtonBase from '@/components/VueFileManagerComponents/FilesView/ButtonBase'
import Spinner from '@/components/VueFileManagerComponents/FilesView/Spinner'
import TreeMenu from '@/components/VueFileManagerComponents/Others/TreeMenu'
import PopupWrapper from '@/components/Others/Popup/PopupWrapper'
import PopupActions from '@/components/Others/Popup/PopupActions'
import PopupContent from '@/components/Others/Popup/PopupContent'
import PopupHeader from '@/components/Others/Popup/PopupHeader'
import ThumbnailItem from '@/components/Others/ThumbnailItem'
import ButtonBase from '@/components/FilesView/ButtonBase'
import Spinner from '@/components/FilesView/Spinner'
import TreeMenu from '@/components/Others/TreeMenu'
import {mapGetters} from 'vuex'
import {events} from '@/bus'
@@ -59,7 +59,7 @@
Spinner,
},
computed: {
...mapGetters(['app']),
...mapGetters(['navigation']),
},
data() {
return {
resources/js/components/VueFileManagerComponents/Others/PageHeader.vue → resources/js/components/Others/PageHeader.vue
View File
resources/js/components/VueFileManagerComponents/Others/Popup/PopupActions.vue → resources/js/components/Others/Popup/PopupActions.vue
View File
resources/js/components/VueFileManagerComponents/Others/Popup/PopupContent.vue → resources/js/components/Others/Popup/PopupContent.vue
View File
resources/js/components/VueFileManagerComponents/Others/Popup/PopupHeader.vue → resources/js/components/Others/Popup/PopupHeader.vue
View File
resources/js/components/VueFileManagerComponents/Others/Popup/PopupWrapper.vue → resources/js/components/Others/Popup/PopupWrapper.vue
View File
resources/js/components/VueFileManagerComponents/Others/ShareCreate.vue → resources/js/components/Others/ShareCreate.vue
+9 -9
View File
@@ -65,16 +65,16 @@
</template>
<script>
import PopupWrapper from '@/components/VueFileManagerComponents/Others/Popup/PopupWrapper'
import PopupActions from '@/components/VueFileManagerComponents/Others/Popup/PopupActions'
import PopupContent from '@/components/VueFileManagerComponents/Others/Popup/PopupContent'
import PopupWrapper from '@/components/Others/Popup/PopupWrapper'
import PopupActions from '@/components/Others/Popup/PopupActions'
import PopupContent from '@/components/Others/Popup/PopupContent'
import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
import PopupHeader from '@/components/VueFileManagerComponents/Others/Popup/PopupHeader'
import SwitchInput from '@/components/VueFileManagerComponents/Others/Forms/SwitchInput'
import SelectInput from '@/components/VueFileManagerComponents/Others/Forms/SelectInput'
import ThumbnailItem from '@/components/VueFileManagerComponents/Others/ThumbnailItem'
import CopyInput from '@/components/VueFileManagerComponents/Others/Forms/CopyInput'
import ButtonBase from '@/components/VueFileManagerComponents/FilesView/ButtonBase'
import PopupHeader from '@/components/Others/Popup/PopupHeader'
import SwitchInput from '@/components/Others/Forms/SwitchInput'
import SelectInput from '@/components/Others/Forms/SelectInput'
import ThumbnailItem from '@/components/Others/ThumbnailItem'
import CopyInput from '@/components/Others/Forms/CopyInput'
import ButtonBase from '@/components/FilesView/ButtonBase'
import {required} from 'vee-validate/dist/rules'
import {mapGetters} from 'vuex'
import {events} from '@/bus'
resources/js/components/VueFileManagerComponents/Others/ShareEdit.vue → resources/js/components/Others/ShareEdit.vue
+10 -10
View File
@@ -67,17 +67,17 @@
</template>
<script>
import PopupWrapper from '@/components/VueFileManagerComponents/Others/Popup/PopupWrapper'
import PopupActions from '@/components/VueFileManagerComponents/Others/Popup/PopupActions'
import PopupContent from '@/components/VueFileManagerComponents/Others/Popup/PopupContent'
import PopupWrapper from '@/components/Others/Popup/PopupWrapper'
import PopupActions from '@/components/Others/Popup/PopupActions'
import PopupContent from '@/components/Others/Popup/PopupContent'
import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
import PopupHeader from '@/components/VueFileManagerComponents/Others/Popup/PopupHeader'
import SwitchInput from '@/components/VueFileManagerComponents/Others/Forms/SwitchInput'
import SelectInput from '@/components/VueFileManagerComponents/Others/Forms/SelectInput'
import ThumbnailItem from '@/components/VueFileManagerComponents/Others/ThumbnailItem'
import ActionButton from '@/components/VueFileManagerComponents/Others/ActionButton'
import CopyInput from '@/components/VueFileManagerComponents/Others/Forms/CopyInput'
import ButtonBase from '@/components/VueFileManagerComponents/FilesView/ButtonBase'
import PopupHeader from '@/components/Others/Popup/PopupHeader'
import SwitchInput from '@/components/Others/Forms/SwitchInput'
import SelectInput from '@/components/Others/Forms/SelectInput'
import ThumbnailItem from '@/components/Others/ThumbnailItem'
import ActionButton from '@/components/Others/ActionButton'
import CopyInput from '@/components/Others/Forms/CopyInput'
import ButtonBase from '@/components/FilesView/ButtonBase'
import {required} from 'vee-validate/dist/rules'
import {mapGetters} from 'vuex'
import {events} from '@/bus'
resources/js/components/VueFileManagerComponents/Others/TextLabel.vue → resources/js/components/Others/TextLabel.vue
View File
resources/js/components/VueFileManagerComponents/Others/ThemeLabel.vue → resources/js/components/Others/ThemeLabel.vue
View File
resources/js/components/VueFileManagerComponents/Others/ThumbnailItem.vue → resources/js/components/Others/ThumbnailItem.vue
View File
resources/js/components/VueFileManagerComponents/Others/TreeMenu.vue → resources/js/components/Others/TreeMenu.vue
+1 -1
View File
@@ -13,7 +13,7 @@
</template>
<script>
import TreeMenu from '@/components/VueFileManagerComponents/Others/TreeMenu'
import TreeMenu from '@/components/Others/TreeMenu'
import {events} from "@/bus"
export default {
resources/js/components/VueFileManagerComponents/Others/UserImageInput.vue → resources/js/components/Others/UserImageInput.vue
View File
resources/js/components/VueFileManagerComponents/Others/Vignette.vue → resources/js/components/Others/Vignette.vue
View File
resources/js/components/VueFileManagerComponents/Sidebar/FileListItemThumbnail.vue → resources/js/components/Sidebar/FileListItemThumbnail.vue
View File
resources/js/components/VueFileManagerComponents/Sidebar/Sidebar.vue → resources/js/components/Sidebar/Sidebar.vue
+5 -5
View File
@@ -73,11 +73,11 @@
</template>
<script>
import FileListItemThumbnail from '@/components/VueFileManagerComponents/Sidebar/FileListItemThumbnail'
import UserHeadline from '@/components/VueFileManagerComponents/Sidebar/UserHeadline'
import ButtonBase from '@/components/VueFileManagerComponents/FilesView/ButtonBase'
import StorageSize from '@/components/VueFileManagerComponents/Sidebar/StorageSize'
import TextLabel from '@/components/VueFileManagerComponents/Others/TextLabel'
import FileListItemThumbnail from '@/components/Sidebar/FileListItemThumbnail'
import UserHeadline from '@/components/Sidebar/UserHeadline'
import ButtonBase from '@/components/FilesView/ButtonBase'
import StorageSize from '@/components/Sidebar/StorageSize'
import TextLabel from '@/components/Others/TextLabel'
import {mapGetters} from 'vuex'
import {events} from '@/bus'
resources/js/components/VueFileManagerComponents/Sidebar/StorageSize.vue → resources/js/components/Sidebar/StorageSize.vue
+1 -1
View File
@@ -9,7 +9,7 @@
</template>
<script>
import ProgressBar from '@/components/VueFileManagerComponents/FilesView/ProgressBar'
import ProgressBar from '@/components/FilesView/ProgressBar'
import { mapGetters } from 'vuex'
export default {
resources/js/components/VueFileManagerComponents/Sidebar/UserHeadline.vue → resources/js/components/Sidebar/UserHeadline.vue
View File
resources/js/router.js
Vendored
-1
View File
@@ -5,7 +5,6 @@ import store from '@/store'
import Index from './views/Auth/SignIn'
import SignUp from './views/Auth/SignUp'
import SharedContent from './views/Shared/SharedContent'
import VerifyByPassword from './views/Shared/VerifyByPassword'
import ForgottenPassword from './views/Auth/ForgottenPassword'
import CreateNewPassword from './views/Auth/CreateNewPassword'
resources/js/store/modules/app.js
Vendored
+3 -3
View File
@@ -1,6 +1,6 @@
const defaultState = {
fileInfoPanelVisible: localStorage.getItem('file_info_visibility') == 'true' || false,
FilePreviewType: localStorage.getItem('FilePreviewType') || 'list',
FilePreviewType: localStorage.getItem('preview_type') || 'list',
appSize: undefined,
config: undefined,
}
@@ -20,8 +20,8 @@ const actions = {
} else {
if ( this.$isThisLocation('public') ) {
dispatch('browseShared', [this.currentFolder(), false, true])
if ( getters.currentFolder.location === 'public' ) {
dispatch('browseShared', [getters.currentFolder, false, true])
} else {
dispatch('getFolder', [getters.currentFolder, false, true])
}
resources/js/store/modules/fileBrowser.js
Vendored
+48 -9
View File
@@ -1,7 +1,7 @@
import axios from 'axios'
import {events} from '@/bus'
import router from '@/router'
import { includes } from 'lodash'
import {includes} from 'lodash'
import i18n from '@/i18n/index'
const defaultState = {
@@ -11,6 +11,7 @@ const defaultState = {
homeDirectory: undefined,
uploadingFileProgress: 0,
filesViewWidth: undefined,
navigation: undefined,
isSearching: false,
browseHistory: [],
isLoading: true,
@@ -22,7 +23,7 @@ const actions = {
events.$emit('show:content')
// Go to files view
if ( ! includes(['Files', 'SharedContent'], router.currentRoute.name) ) {
if (!includes(['Files', 'SharedContent'], router.currentRoute.name)) {
router.push({name: 'Files'})
}
@@ -42,7 +43,7 @@ const actions = {
location: folder.deleted_at || folder.location === 'trash' ? 'trash' : 'base'
}
let url = currentFolder.location === 'trash' ?'/folders/' + currentFolder.unique_id + '?trash=true' : '/folders/' + currentFolder.unique_id
let url = currentFolder.location === 'trash' ? '/folders/' + currentFolder.unique_id + '?trash=true' : '/folders/' + currentFolder.unique_id
axios
.get(context.getters.api + url)
@@ -76,9 +77,9 @@ const actions = {
router.push({name: 'Files'})
}
if (! back) context.commit('FLUSH_BROWSER_HISTORY')
context.commit('FLUSH_DATA')
context.commit('LOADING_STATE', true)
if (!back) context.commit('FLUSH_BROWSER_HISTORY')
context.commit('FLUSH_DATA')
context.commit('LOADING_STATE', true)
// Create shared object for history
let trash = {
@@ -113,9 +114,9 @@ const actions = {
router.push({name: 'Files'})
}
if (! back) context.commit('FLUSH_BROWSER_HISTORY')
context.commit('FLUSH_DATA')
context.commit('LOADING_STATE', true)
if (!back) context.commit('FLUSH_BROWSER_HISTORY')
context.commit('FLUSH_DATA')
context.commit('LOADING_STATE', true)
// Create trash object for history
let trash = {
@@ -177,9 +178,46 @@ const actions = {
})
})
},
getFolderTree: ({commit, getters}) => {
return new Promise((resolve, reject) => {
// Get route
let route = undefined
if (getters.sharedDetail && getters.sharedDetail.protected)
route = '/api/navigation/private'
else if (getters.sharedDetail && ! getters.sharedDetail.protected)
route = '/api/navigation/public/' + router.currentRoute.params.token
else
route = '/api/navigation'
axios
.get(route)
.then(response => {
resolve(response)
commit('UPDATE_FOLDER_TREE', response.data)
})
.catch((error) => {
reject(error)
// Show error message
events.$emit('alert:open', {
title: i18n.t('popup_error.title'),
message: i18n.t('popup_error.message'),
})
})
})
},
}
const mutations = {
UPDATE_FOLDER_TREE(state, tree) {
state.navigation = tree
},
LOADING_STATE(state, val) {
state.isLoading = val
},
@@ -274,6 +312,7 @@ const getters = {
currentFolder: state => state.currentFolder,
browseHistory: state => state.browseHistory,
isSearching: state => state.isSearching,
navigation: state => state.navigation,
isLoading: state => state.isLoading,
data: state => state.data,
}
resources/js/store/modules/fileFunctions.js
Vendored
+37 -9
View File
@@ -1,11 +1,19 @@
import axios from 'axios'
import {events} from '@/bus'
import i18n from '@/i18n/index'
import router from '@/router'
import {events} from '@/bus'
import axios from 'axios'
const actions = {
moveItem: ({commit, getters}, [item_from, to_item]) => {
// Get route
let route = getters.sharedDetail && ! getters.sharedDetail.protected
? '/api/move/' + item_from.unique_id + '/public/' + router.currentRoute.params.token
: '/api/move/' + item_from.unique_id
axios
.patch(getters.api + '/move-item/' + item_from.unique_id, {
.patch(route, {
from_type: item_from.type,
to_unique_id: to_item.unique_id
})
@@ -16,11 +24,15 @@ const actions = {
.catch(() => isSomethingWrong())
},
createFolder: ({commit, getters}, folderName) => {
const parent_id = getters.currentFolder ? getters.currentFolder.unique_id : 0
// Get route
let route = getters.sharedDetail && ! getters.sharedDetail.protected
? '/api/create-folder/public/' + router.currentRoute.params.token
: '/api/create-folder'
axios
.post(getters.api + '/create-folder', {
parent_id: parent_id,
.post(route, {
parent_id: getters.currentFolder.unique_id,
name: folderName
})
.then(response => {
@@ -34,8 +46,13 @@ const actions = {
if (getters.permission === 'master' && data.type === 'folder')
commit('UPDATE_NAME_IN_FAVOURITES', data)
// Get route
let route = getters.sharedDetail && ! getters.sharedDetail.protected
? '/api/rename-item/' + data.unique_id + '/public/' + router.currentRoute.params.token
: '/api/rename-item/' + data.unique_id
axios
.patch(getters.api + '/rename-item/' + data.unique_id, {
.patch(route, {
name: data.name,
type: data.type,
})
@@ -46,8 +63,14 @@ const actions = {
},
uploadFiles: ({commit, getters}, files) => {
return new Promise((resolve, reject) => {
// Get route
let route = getters.sharedDetail && ! getters.sharedDetail.protected
? '/api/upload/public/' + router.currentRoute.params.token
: '/api/upload'
axios
.post(getters.api + '/upload-file', files, {
.post(route, files, {
headers: {
'Content-Type': 'multipart/form-data'
},
@@ -114,8 +137,13 @@ const actions = {
// Remove file preview
commit('CLEAR_FILEINFO_DETAIL')
// Get route
let route = getters.sharedDetail && ! getters.sharedDetail.protected
? '/api/remove-item/' + data.unique_id + '/public/' + router.currentRoute.params.token
: '/api/remove-item/' + data.unique_id
axios
.delete(getters.api + '/remove-item/' + data.unique_id, {
.delete(route, {
data: {
type: data.type,
force_delete: data.deleted_at ? true : false
resources/js/store/modules/userAuth.js
Vendored
-25
View File
@@ -68,37 +68,12 @@ const actions = {
})
})
},
getFolderTree: (context) => {
return new Promise((resolve, reject) => {
axios
.get(context.getters.api + '/folder-tree')
.then(response => {
resolve(response)
context.commit('UPDATE_FOLDER_TREE', response.data)
})
.catch((error) => {
reject(error)
// Show error message
events.$emit('alert:open', {
title: i18n.t('popup_error.title'),
message: i18n.t('popup_error.message'),
})
})
})
},
}
const mutations = {
RETRIEVE_APP_DATA(state, app) {
state.app = app
},
UPDATE_FOLDER_TREE(state, tree) {
state.app.folders = tree
},
SET_PERMISSION(state, role) {
state.permission = role
},
resources/js/views/Auth/CreateNewPassword.vue
+3 -3
View File
@@ -66,10 +66,10 @@
</template>
<script>
import AuthContentWrapper from '@/components/VueFileManagerComponents/Auth/AuthContentWrapper'
import AuthContentWrapper from '@/components/Auth/AuthContentWrapper'
import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
import AuthContent from '@/components/VueFileManagerComponents/Auth/AuthContent'
import AuthButton from '@/components/VueFileManagerComponents/Auth/AuthButton'
import AuthContent from '@/components/Auth/AuthContent'
import AuthButton from '@/components/Auth/AuthButton'
import {required} from 'vee-validate/dist/rules'
import {mapGetters} from 'vuex'
import axios from 'axios'
resources/js/views/Auth/ForgottenPassword.vue
+3 -3
View File
@@ -42,10 +42,10 @@
</template>
<script>
import AuthContentWrapper from '@/components/VueFileManagerComponents/Auth/AuthContentWrapper'
import AuthContentWrapper from '@/components/Auth/AuthContentWrapper'
import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
import AuthContent from '@/components/VueFileManagerComponents/Auth/AuthContent'
import AuthButton from '@/components/VueFileManagerComponents/Auth/AuthButton'
import AuthContent from '@/components/Auth/AuthContent'
import AuthButton from '@/components/Auth/AuthButton'
import {required} from 'vee-validate/dist/rules'
import {mapGetters} from 'vuex'
import axios from 'axios'
resources/js/views/Auth/SignIn.vue
+3 -3
View File
@@ -60,10 +60,10 @@
</template>
<script>
import AuthContentWrapper from '@/components/VueFileManagerComponents/Auth/AuthContentWrapper'
import AuthContentWrapper from '@/components/Auth/AuthContentWrapper'
import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
import AuthContent from '@/components/VueFileManagerComponents/Auth/AuthContent'
import AuthButton from '@/components/VueFileManagerComponents/Auth/AuthButton'
import AuthContent from '@/components/Auth/AuthContent'
import AuthButton from '@/components/Auth/AuthButton'
import {required} from 'vee-validate/dist/rules'
import {mapGetters} from 'vuex'
import axios from 'axios'
resources/js/views/Auth/SignUp.vue
+3 -3
View File
@@ -66,10 +66,10 @@
</template>
<script>
import AuthContentWrapper from '@/components/VueFileManagerComponents/Auth/AuthContentWrapper'
import AuthContentWrapper from '@/components/Auth/AuthContentWrapper'
import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
import AuthContent from '@/components/VueFileManagerComponents/Auth/AuthContent'
import AuthButton from '@/components/VueFileManagerComponents/Auth/AuthButton'
import AuthContent from '@/components/Auth/AuthContent'
import AuthButton from '@/components/Auth/AuthButton'
import {required} from 'vee-validate/dist/rules'
import {mapGetters} from 'vuex'
import axios from 'axios'
resources/js/views/Files.vue
+3 -3
View File
@@ -7,9 +7,9 @@
</template>
<script>
import DesktopToolbar from '@/components/VueFileManagerComponents/FilesView/DesktopToolbar'
import FileBrowser from '@/components/VueFileManagerComponents/FilesView/FileBrowser'
import ContextMenu from '@/components/VueFileManagerComponents/FilesView/ContextMenu'
import DesktopToolbar from '@/components/FilesView/DesktopToolbar'
import FileBrowser from '@/components/FilesView/FileBrowser'
import ContextMenu from '@/components/FilesView/ContextMenu'
import {ResizeSensor} from 'css-element-queries'
import {mapGetters} from 'vuex'
import {events} from '@/bus'
resources/js/views/Profile.vue
+4 -4
View File
@@ -74,10 +74,10 @@
<script>
import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
import UserImageInput from '@/components/VueFileManagerComponents/Others/UserImageInput'
import ButtonBase from '@/components/VueFileManagerComponents/FilesView/ButtonBase'
import PageHeader from '@/components/VueFileManagerComponents/Others/PageHeader'
import ThemeLabel from '@/components/VueFileManagerComponents/Others/ThemeLabel'
import UserImageInput from '@/components/Others/UserImageInput'
import ButtonBase from '@/components/FilesView/ButtonBase'
import PageHeader from '@/components/Others/PageHeader'
import ThemeLabel from '@/components/Others/ThemeLabel'
import {required} from 'vee-validate/dist/rules'
import {mapGetters} from 'vuex'
import {debounce} from 'lodash'
resources/js/views/Shared/SharedContent.vue
+16 -11
View File
@@ -44,6 +44,9 @@
</div>
<div v-if="sharedDetail.type === 'folder'" @contextmenu.prevent.capture="contextMenu($event, undefined)" @click="fileViewClick">
<!--Move item setup-->
<MoveItem />
<!--Mobile Menu-->
<MobileMenu/>
@@ -61,18 +64,19 @@
</template>
<script>
import DesktopToolbar from '@/components/VueFileManagerComponents/FilesView/DesktopToolbar'
import DesktopToolbar from '@/components/FilesView/DesktopToolbar'
import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
import FileItemGrid from '@/components/VueFileManagerComponents/FilesView/FileItemGrid'
import FileBrowser from '@/components/VueFileManagerComponents/FilesView/FileBrowser'
import ContextMenu from '@/components/VueFileManagerComponents/FilesView/ContextMenu'
import ButtonBase from '@/components/VueFileManagerComponents/FilesView/ButtonBase'
import MobileMenu from '@/components/VueFileManagerComponents/FilesView/MobileMenu'
import AuthContent from '@/components/VueFileManagerComponents/Auth/AuthContent'
import AuthButton from '@/components/VueFileManagerComponents/Auth/AuthButton'
import Spinner from '@/components/VueFileManagerComponents/FilesView/Spinner'
import Vignette from '@/components/VueFileManagerComponents/Others/Vignette'
import Alert from '@/components/VueFileManagerComponents/FilesView/Alert'
import FileItemGrid from '@/components/FilesView/FileItemGrid'
import FileBrowser from '@/components/FilesView/FileBrowser'
import ContextMenu from '@/components/FilesView/ContextMenu'
import ButtonBase from '@/components/FilesView/ButtonBase'
import MobileMenu from '@/components/FilesView/MobileMenu'
import AuthContent from '@/components/Auth/AuthContent'
import AuthButton from '@/components/Auth/AuthButton'
import Spinner from '@/components/FilesView/Spinner'
import MoveItem from '@/components/Others/MoveItem'
import Vignette from '@/components/Others/Vignette'
import Alert from '@/components/FilesView/Alert'
import {required} from 'vee-validate/dist/rules'
import {ResizeSensor} from 'css-element-queries'
import {mapGetters} from 'vuex'
@@ -92,6 +96,7 @@
AuthButton,
MobileMenu,
ButtonBase,
MoveItem,
required,
Vignette,
Spinner,
resources/js/views/Shared/VerifyByPassword.vue
-88
View File
@@ -1,88 +0,0 @@
<template>
<AuthContentWrapper ref="auth">
<!--Verify share link by password-->
<AuthContent name="password" :visible="true">
</AuthContent>
</AuthContentWrapper>
</template>
<script>
import AuthContentWrapper from '@/components/VueFileManagerComponents/Auth/AuthContentWrapper'
import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
import AuthContent from '@/components/VueFileManagerComponents/Auth/AuthContent'
import AuthButton from '@/components/VueFileManagerComponents/Auth/AuthButton'
import {required} from 'vee-validate/dist/rules'
import {mapGetters} from 'vuex'
import axios from 'axios'
export default {
name: 'SharedContent',
components: {
AuthContentWrapper,
ValidationProvider,
ValidationObserver,
AuthContent,
AuthButton,
required,
},
computed: {
...mapGetters(['config']),
},
data() {
return {
checkedAccount: undefined,
password: 'tvojpenis',
isLoading: false,
}
},
methods: {
async sharedProtected() {
// Validate fields
const isValid = await this.$refs.sharedProtected.validate();
if (!isValid) return;
// Start loading
this.isLoading = true
// Send request to get verify account
axios
.post('/api/shared/authenticate/' + this.$route.params.token, {
password: this.password
})
.then(response => {
// End loading
this.isLoading = false
// Commit shared item options
this.$store.commit('SET_PERMISSION', response.data.permission)
// Redirect to file browser page
this.$router.push({name: 'SharedContent', params: {token: this.$route.params.token}})
})
.catch(error => {
if (error.response.status == 401) {
this.$refs.sharedProtected.setErrors({
'Password': [error.response.data.message]
});
}
// End loading
this.isLoading = false
})
},
},
}
</script>
<style scoped lang="scss">
@import "@assets/app.scss";
@import '@assets/vue-file-manager/_forms';
@import '@assets/vue-file-manager/_auth';
</style>