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

Merge remote-tracking branch 'origin/master' into oasis

Browse Source 
# Conflicts:
#	.php_cs.cache
#	public/mix-manifest.json
#	resources/js/components/FilesView/FilePreviewMedia.vue
#	resources/js/components/Sidebar/SidebarNavigation.vue
#	resources/js/helpers.js
This commit is contained in:
Peter Papp
2021-05-06 16:06:17 +02:00
parent 69deafeda0 f252a0ba23
commit f5f0663d07
17 changed files with 482 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue
+3 -3
View File
@@ -74,7 +74,7 @@
<label>{{ $t('admin_settings.others.google_analytics') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Google Analytics Code"
v-slot="{ errors }">
<input @input="$updateText('/admin/settings', 'google_analytics', app.googleAnalytics)" v-model="app.googleAnalytics"
<input @input="$updateText('/admin/settings', 'google_analytics', app.googleAnalytics, true)" v-model="app.googleAnalytics"
:placeholder="$t('admin_settings.others.google_analytics_plac')"
type="text" :class="{'is-error': errors[0]}" class="focus-border-theme"/>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
@@ -84,7 +84,7 @@
<div class="block-wrapper">
<label>{{ $t('admin_settings.others.mimetypes_blacklist') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Mimetypes Blacklist" v-slot="{ errors }">
<textarea rows="2" @input="$updateText('/admin/settings', 'mimetypes_blacklist', app.mimetypesBlacklist)" v-model="app.mimetypesBlacklist" :placeholder="$t('admin_settings.others.mimetypes_blacklist_plac')" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme"/>
<textarea rows="2" @input="$updateText('/admin/settings', 'mimetypes_blacklist', app.mimetypesBlacklist, true)" v-model="app.mimetypesBlacklist" :placeholder="$t('admin_settings.others.mimetypes_blacklist_plac')" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme"/>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
<small class="input-help" v-html="$t('admin_settings.others.mimetypes_blacklist_help')"></small>
@@ -93,7 +93,7 @@
<div class="block-wrapper">
<label>{{ $t('admin_settings.others.upload_limit') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Upload Limit" v-slot="{ errors }">
<input @input="$updateText('/admin/settings', 'upload_limit', app.uploadLimit)" v-model="app.uploadLimit" :placeholder="$t('admin_settings.others.upload_limit_plac')" type="number" min="0" step="1" :class="{'is-error': errors[0]}" class="focus-border-theme"/>
<input @input="$updateText('/admin/settings', 'upload_limit', app.uploadLimit, true)" v-model="app.uploadLimit" :placeholder="$t('admin_settings.others.upload_limit_plac')" type="number" min="0" step="1" :class="{'is-error': errors[0]}" class="focus-border-theme"/>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
<small class="input-help" v-html="$t('admin_settings.others.upload_limit_help')"></small>
resources/js/views/FilePages/Files.vue
+34 -2
View File
@@ -38,6 +38,28 @@
</div>
</ContentGroup>
<!--Sharing-->
<ContentGroup :title="$t('sidebar.sharing')" slug="sharing" :can-collapse="true">
<div class="menu-list-wrapper vertical">
<li class="menu-list-item link" :class="{'is-active': $isThisLocation(['shared'])}" @click="getShared">
<div class="icon text-theme">
<link-icon size="17"></link-icon>
</div>
<div class="label text-theme">
{{ $t('sidebar.my_shared') }}
</div>
</li>
<li class="menu-list-item link" :class="{'is-active': $isThisLocation(['participant_uploads'])}" @click="getParticipantUploads">
<div class="icon text-theme">
<users-icon size="17"></users-icon>
</div>
<div class="label text-theme">
{{ $t('sidebar.participant_uploads') }}
</div>
</li>
</div>
</ContentGroup>
<!--Navigator-->
<ContentGroup :title="$t('sidebar.navigator_title')" slug="navigator" :can-collapse="true" class="navigator">
<span class="empty-note navigator" v-if="tree.length == 0">
@@ -85,7 +107,9 @@ import {
FolderIcon,
Trash2Icon,
HomeIcon,
XIcon
XIcon,
LinkIcon,
UsersIcon,
} from 'vue-feather-icons'
export default {
@@ -101,7 +125,9 @@ export default {
FolderIcon,
Trash2Icon,
HomeIcon,
XIcon
XIcon,
LinkIcon,
UsersIcon,
},
computed: {
...mapGetters(['user', 'homeDirectory', 'currentFolder', 'config', 'clipboard']),
@@ -122,6 +148,12 @@ export default {
}
},
methods: {
getShared() {
this.$store.dispatch('getShared', [{back: false, init: false}])
},
getParticipantUploads() {
this.$store.dispatch('getParticipantUploads')
},
getTrash() {
this.$store.dispatch('getTrash')
},
resources/js/views/FilePages/SharedFiles.vue
-67
View File
@@ -1,67 +0,0 @@
<template>
<section id="viewport">
<ContentSidebar>
<!--Navigator-->
<ContentGroup :title="$t('sidebar.locations_title')">
<div class="menu-list-wrapper vertical">
<li class="menu-list-item link" :class="{'is-active': $isThisLocation(['shared'])}" @click="getShared">
<div class="icon text-theme">
<link-icon size="17"></link-icon>
</div>
<div class="label text-theme">
{{ $t('sidebar.my_shared') }}
</div>
</li>
<li class="menu-list-item link" :class="{'is-active': $isThisLocation(['participant_uploads'])}" @click="getParticipantUploads">
<div class="icon text-theme">
<users-icon size="17"></users-icon>
</div>
<div class="label text-theme">
{{ $t('sidebar.participant_uploads') }}
</div>
</li>
</div>
</ContentGroup>
</ContentSidebar>
<ContentFileView />
</section>
</template>
<script>
import ContentFileView from '@/components/Others/ContentFileView'
import ContentSidebar from '@/components/Sidebar/ContentSidebar'
import ContentGroup from '@/components/Sidebar/ContentGroup'
import {
LinkIcon,
UsersIcon,
} from 'vue-feather-icons'
export default {
name: 'FilesView',
components: {
ContentFileView,
ContentSidebar,
ContentGroup,
LinkIcon,
UsersIcon,
},
methods: {
getShared() {
this.$store.dispatch('getShared', [{back: false, init: false}])
},
getParticipantUploads() {
this.$store.dispatch('getParticipantUploads')
},
},
mounted() {
this.getShared()
}
}
</script>
<style lang="scss" scoped>
</style>