- removed participant upload

This commit is contained in:
Peter Papp
2021-08-09 09:38:08 +02:00
parent 9a80c044fc
commit 60337934cb
15 changed files with 35 additions and 123 deletions
+1 -3
View File
@@ -586,16 +586,14 @@ return [
'shared_form.recipients_label' => 'Recipients',
'shared_form.share_by_email' => 'Share by Email',
'shared_form.share_by_link' => 'Share by Link',
'sidebar.sharing' => 'Sharing',
'sidebar.favourites' => 'Favourites',
'sidebar.favourites_empty' => 'Drag here your favourite folder.',
'sidebar.folders_empty' => 'Create some new folder.',
'sidebar.home' => 'Files',
'sidebar.latest' => 'Recent Uploads',
'sidebar.locations_title' => 'Base',
'sidebar.my_shared' => 'My Shared Items',
'sidebar.my_shared' => 'Shared Items',
'sidebar.navigator_title' => 'Navigator',
'sidebar.participant_uploads' => 'Participant Uploads',
'sidebar.tools_title' => 'Tools',
'storage.audios' => 'Audios',
'storage.documents' => 'Documents',
+13 -5
View File
@@ -35,12 +35,12 @@
"/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=1141f8e183483da82e8a",
"/chunks/email-verified.js": "/chunks/email-verified.js?id=b80cafb3a468e55c45eb",
"/chunks/environment-setup.js": "/chunks/environment-setup.js?id=9290f1443c67945fb50d",
"/chunks/files.js": "/chunks/files.js?id=54c6dddb471986e202f3",
"/chunks/files.js": "/chunks/files.js?id=22139cc83b94c1f431d6",
"/chunks/files~chunks/platform~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared/file-browser.js?id=9309e2d3ab4df7612d1a",
"/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.js?id=6e1976cd4babd4161cd5",
"/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file.js?id=0de0b81edf0bb5d4617d",
"/chunks/files~chunks/settings-subscription~chunks/shared/file-browser~chunks/user-subscription.js": "/chunks/files~chunks/settings-subscription~chunks/shared/file-browser~chunks/user-subscription.js?id=c5ec9502bcfad35c502e",
"/chunks/files~chunks/shared/file-browser.js": "/chunks/files~chunks/shared/file-browser.js?id=f4c9cfedf32f9943c32a",
"/chunks/files~chunks/shared/file-browser.js": "/chunks/files~chunks/shared/file-browser.js?id=33b64a1fa6047209a477",
"/chunks/files~chunks/shared/file-browser~chunks/shared/single-file.js": "/chunks/files~chunks/shared/file-browser~chunks/shared/single-file.js?id=ad09e3f973e4db0411f1",
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=8871529af0da8193d3a3",
"/chunks/homepage.js": "/chunks/homepage.js?id=d29b9f09d08d673dff75",
@@ -55,8 +55,8 @@
"/chunks/plan-settings.js": "/chunks/plan-settings.js?id=146515010333316075d6",
"/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=320263fdc9aef3a3be60",
"/chunks/plans.js": "/chunks/plans.js?id=0533e61243eeb87b3e8e",
"/chunks/platform.js": "/chunks/platform.js?id=721cb528aaff1d69d58f",
"/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=f7ea7a882f169ecc2c31",
"/chunks/platform.js": "/chunks/platform.js?id=6c0449589e2c4f765887",
"/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=d20718311d00f1999d48",
"/chunks/profile.js": "/chunks/profile.js?id=7186e04a6f0f5b6bf470",
"/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=ddb7be518c092ed392ca",
"/chunks/purchase-code.js": "/chunks/purchase-code.js?id=85217c42d79948008ed1",
@@ -318,5 +318,13 @@
"/chunks/files~chunks/shared/file-browser.f1f6c11acfa94bf93cb8.hot-update.js": "/chunks/files~chunks/shared/file-browser.f1f6c11acfa94bf93cb8.hot-update.js",
"/chunks/files~chunks/shared/file-browser.4af45de3004a8a9deaaa.hot-update.js": "/chunks/files~chunks/shared/file-browser.4af45de3004a8a9deaaa.hot-update.js",
"/chunks/files~chunks/shared/file-browser.bb482343209992384ecc.hot-update.js": "/chunks/files~chunks/shared/file-browser.bb482343209992384ecc.hot-update.js",
"/chunks/files~chunks/shared/file-browser.3e0d9f1ec2260d437123.hot-update.js": "/chunks/files~chunks/shared/file-browser.3e0d9f1ec2260d437123.hot-update.js"
"/chunks/files~chunks/shared/file-browser.3e0d9f1ec2260d437123.hot-update.js": "/chunks/files~chunks/shared/file-browser.3e0d9f1ec2260d437123.hot-update.js",
"/chunks/files.0de7de8407c9227062e8.hot-update.js": "/chunks/files.0de7de8407c9227062e8.hot-update.js",
"/chunks/files.2ea6b328906095d8dbb0.hot-update.js": "/chunks/files.2ea6b328906095d8dbb0.hot-update.js",
"/chunks/platform.d6982c05146928ee6a19.hot-update.js": "/chunks/platform.d6982c05146928ee6a19.hot-update.js",
"/chunks/files.3ba8e7d5505b2ff7cbb8.hot-update.js": "/chunks/files.3ba8e7d5505b2ff7cbb8.hot-update.js",
"/chunks/files.38b958539fd7d86cab09.hot-update.js": "/chunks/files.38b958539fd7d86cab09.hot-update.js",
"/js/main.4b2c754cdde7d2d5e041.hot-update.js": "/js/main.4b2c754cdde7d2d5e041.hot-update.js",
"/chunks/files~chunks/shared/file-browser.4b2c754cdde7d2d5e041.hot-update.js": "/chunks/files~chunks/shared/file-browser.4b2c754cdde7d2d5e041.hot-update.js",
"/chunks/platform~chunks/shared.4b2c754cdde7d2d5e041.hot-update.js": "/chunks/platform~chunks/shared.4b2c754cdde7d2d5e041.hot-update.js"
}
@@ -67,15 +67,15 @@
</div>
<!-- Base location with MASTER permission-->
<div v-if="$isThisLocation(['base', 'participant_uploads', 'latest']) && $checkPermission('master')" id="menu-list" class="menu-options">
<div v-if="$isThisLocation(['base', 'latest']) && $checkPermission('master')" id="menu-list" class="menu-options">
<!-- No Files options -->
<OptionGroup v-if="!$isThisLocation(['participant_uploads', 'latest']) && isMultiSelectContextMenu && !item">
<OptionGroup v-if="!$isThisLocation(['latest']) && isMultiSelectContextMenu && !item">
<Option @click.native="createFolder" :title="$t('context_menu.create_folder')" icon="create-folder" />
</OptionGroup>
<!-- Single options -->
<OptionGroup v-if="!$isThisLocation(['participant_uploads', 'latest']) && item && isMultiSelectContextMenu && isFolder">
<OptionGroup v-if="!$isThisLocation(['latest']) && item && isMultiSelectContextMenu && isFolder">
<Option @click.native="addToFavourites" :title="isInFavourites ? $t('context_menu.remove_from_favourites') : $t('context_menu.add_to_favourites')" icon="favourites" />
</OptionGroup>
@@ -92,7 +92,7 @@
</OptionGroup>
<!-- Multi options -->
<OptionGroup v-if="!$isThisLocation(['participant_uploads', 'latest']) && !isMultiSelectContextMenu && item && !hasFile">
<OptionGroup v-if="!$isThisLocation(['latest']) && !isMultiSelectContextMenu && item && !hasFile">
<Option @click.native="addToFavourites" :title="isInFavourites ? $t('context_menu.remove_from_favourites') : $t('context_menu.add_to_favourites')" icon="favourites" />
</OptionGroup>
@@ -131,7 +131,6 @@
},
canDeleteInView() {
let locations = [
'participant_uploads',
'trash-root',
'latest',
'shared',
@@ -146,7 +145,6 @@
},
canMoveInView() {
let locations = [
'participant_uploads',
'latest',
'shared',
'public',
@@ -156,7 +154,6 @@
},
canShareInView() {
let locations = [
'participant_uploads',
'latest',
'shared',
'public',
@@ -12,11 +12,6 @@
<h1 class="title">{{ $t('empty_page.title') }}</h1>
</div>
<!--Trash empty message-->
<div class="text-content" v-if="$isThisLocation(['participant_uploads']) && ! isLoading">
<h1 class="title">{{ $t('messages.nothing_from_participants') }}</h1>
</div>
<!--Base file browser empty message-->
<div class="text-content" v-if="$isThisLocation(['base', 'public', 'latest']) && !isLoading">
<h1 class="title">{{ $t('empty_page.title') }}</h1>
@@ -79,7 +79,7 @@
</div>
<!--Shared location--->
<div v-if="$isThisLocation(['shared', 'participant_uploads']) && ! isSelectMode" class="mobile-actions">
<div v-if="$isThisLocation(['shared']) && ! isSelectMode" class="mobile-actions">
<MobileActionButton @click.native="showLocations" icon="filter">
{{ filterLocationTitle }}
</MobileActionButton>
@@ -141,7 +141,6 @@
'latest': 'Latest',
'trash': 'Trash',
'trash-root': 'Trash',
'participant_uploads': 'Participants',
}[this.$store.getters.currentFolder.location]
}
},
@@ -4,11 +4,11 @@
<OptionGroup>
<Option @click.native="goToFiles" :title="$t('menu.files')" icon="hard-drive" :is-active="$isThisLocation('base')" is-hover-disabled="true" />
<Option @click.native="goToLatest" :title="$t('menu.latest')" icon="upload-cloud" :is-active="$isThisLocation('latest')" is-hover-disabled="true" />
<Option @click.native="goToShared" :title="$t('sidebar.my_shared')" icon="share" :is-active="$isThisLocation('shared')" is-hover-disabled="true" />
<Option @click.native="goToTrash" :title="$t('menu.trash')" icon="trash" :is-active="$isThisLocation(['trash', 'trash-root'])" is-hover-disabled="true" />
</OptionGroup>
<OptionGroup>
<Option @click.native="goToShared" :title="$t('sidebar.my_shared')" icon="share" :is-active="$isThisLocation('shared')" is-hover-disabled="true" />
<Option @click.native="goToParticipantUploads" :title="$t('sidebar.participant_uploads')" icon="users" :is-active="$isThisLocation('participant_uploads')" is-hover-disabled="true" />
<!--todo: add teams-->
</OptionGroup>
</MenuMobileGroup>
</MenuMobile>
@@ -53,10 +53,6 @@ export default {
goToShared() {
this.$store.dispatch('getShared', [{back: false, init: false}])
this.flushBrowseHistory()
},
goToParticipantUploads() {
this.$store.dispatch('getParticipantUploads')
this.flushBrowseHistory()
}
}
}
@@ -32,7 +32,7 @@
</MenuMobileGroup>
<!--Base location for user-->
<MenuMobileGroup v-if="$isThisLocation(['base', 'participant_uploads', 'latest']) && $checkPermission('master')">
<MenuMobileGroup v-if="$isThisLocation(['base', 'latest']) && $checkPermission('master')">
<OptionGroup v-if="clipboard[0] && isFolder">
<Option @click.native="addToFavourites" :title="favouritesTitle" icon="star" />
</OptionGroup>
@@ -112,7 +112,7 @@
},
canShareItem() {
return this.$isThisLocation([
'base', 'participant_uploads', 'latest', 'shared'
'base', 'latest', 'shared'
])
},
},
-1
View File
@@ -375,7 +375,6 @@ const Helpers = {
'base': ['getFolder', [{folder: folder, back: true, init: false, sorting: true}]],
'public': ['browseShared', [{folder: folder, back: true, init: false, sorting: true}]],
'trash': ['getFolder', [{folder: folder, back: true, init: false, sorting: true}]],
'participant_uploads': ['getParticipantUploads'],
'trash-root': ['getTrash'],
'latest': ['getLatest'],
'shared': ['getShared']
-19
View File
@@ -108,25 +108,6 @@ const actions = {
})
.catch(() => Vue.prototype.$isSomethingWrong())
},
getParticipantUploads: ({commit, getters}) => {
commit('LOADING_STATE', {loading: true, data: []})
commit('STORE_PREVIOUS_FOLDER', getters.currentFolder)
commit('STORE_CURRENT_FOLDER', {
name: i18n.t('sidebar.participant_uploads'),
id: undefined,
location: 'participant_uploads',
})
axios
.get(getters.api + '/browse/participants' + getters.sorting.URI)
.then(response => {
commit('LOADING_STATE', {loading: false, data: response.data})
events.$emit('scrollTop')
})
.catch(() => Vue.prototype.$isSomethingWrong())
},
getTrash: ({commit, getters}) => {
commit('LOADING_STATE', {loading: true, data: []})
commit('FLUSH_FOLDER_HISTORY')
+12 -29
View File
@@ -13,7 +13,7 @@
<div class="menu-list-wrapper vertical">
<a class="menu-list-item link" :class="{'is-active': $isThisLocation(['base'])}" @click="goHome">
<div class="icon text-theme">
<home-icon size="17"></home-icon>
<home-icon size="17" />
</div>
<div class="label text-theme">
{{ $t('sidebar.home') }}
@@ -21,15 +21,23 @@
</a>
<a class="menu-list-item link" :class="{'is-active': $isThisLocation(['latest'])}" @click="getLatest">
<div class="icon text-theme">
<upload-cloud-icon size="17"></upload-cloud-icon>
<upload-cloud-icon size="17" />
</div>
<div class="label text-theme">
{{ $t('sidebar.latest') }}
</div>
</a>
<a class="menu-list-item link" :class="{'is-active': $isThisLocation(['shared'])}" @click="getShared">
<div class="icon text-theme">
<link-icon size="17" />
</div>
<div class="label text-theme">
{{ $t('sidebar.my_shared') }}
</div>
</a>
<a class="menu-list-item link" :class="{'is-active': $isThisLocation(['trash', 'trash-root'])}" @click="getTrash">
<div class="icon text-theme">
<trash2-icon size="17"></trash2-icon>
<trash2-icon size="17" />
</div>
<div class="label text-theme">
{{ $t('locations.trash') }}
@@ -38,31 +46,9 @@
</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">
<span class="empty-note navigator" v-if="tree.length === 0">
{{ $t('sidebar.folders_empty') }}
</span>
<TreeMenuNavigator class="folder-tree" :depth="0" :nodes="folder" v-for="folder in tree" :key="folder.id"/>
@@ -151,9 +137,6 @@ export default {
getShared() {
this.$store.dispatch('getShared', [{back: false, init: false}])
},
getParticipantUploads() {
this.$store.dispatch('getParticipantUploads')
},
getTrash() {
this.$store.dispatch('getTrash')
},
-2
View File
@@ -24,7 +24,6 @@ use Domain\Homepage\Controllers\SendContactMessageController;
use Domain\Browsing\Controllers\BrowseFolderContentController;
use Domain\Folders\Controllers\NavigationFolderTreeController;
use Domain\Browsing\Controllers\SearchFilesAndFoldersController;
use Domain\Browsing\Controllers\BrowseParticipantsUploadsController;
// Pages
Route::apiResource('/page', PagesController::class);
@@ -47,7 +46,6 @@ Route::group(['prefix' => 'password'], function () {
Route::group(['middleware' => ['auth:sanctum']], function () {
// Browse
Route::group(['prefix' => 'browse'], function () {
Route::get('/participants', BrowseParticipantsUploadsController::class);
Route::get('/folders/{id}', BrowseFolderContentController::class);
Route::get('/navigation', NavigationFolderTreeController::class);
Route::get('/search', SearchFilesAndFoldersController::class);
@@ -1,18 +0,0 @@
<?php
namespace Domain\Browsing\Controllers;
use Domain\Files\Models\File;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Auth;
class BrowseParticipantsUploadsController
{
public function __invoke(): Collection
{
return File::with(['parent'])
->where('user_id', Auth::id())
->whereAuthor('visitor')
->sortable()
->get();
}
}
-24
View File
@@ -297,30 +297,6 @@ class BrowseTest extends TestCase
]);
}
/**
* @test
*/
public function it_get_participant_uploads()
{
$user = User::factory(User::class)
->create();
$file = File::factory(File::class)
->create([
'author' => 'visitor',
'type' => 'file',
'user_id' => $user->id,
]);
$this
->actingAs($user)
->getJson('/api/browse/participants')
->assertStatus(200)
->assertJsonFragment([
'id' => $file->id,
]);
}
/**
* @test
*/