solved issues bulk review part.1

This commit is contained in:
Milos Holba
2020-12-13 16:33:28 +01:00
parent 874b4bb768
commit 89ea50b893
24 changed files with 359 additions and 172 deletions
@@ -95,9 +95,9 @@ class BrowseController extends Controller
public function latest() {
// Get User
// TODO: SFORMATOVAT!
$user = User::with(['latest_uploads' => function($query) {
$query->sortable(); }])
$query->sortable();
}])
->where('id', Auth::id())
->first();
@@ -134,7 +134,6 @@ class BrowseController extends Controller
$user_id = Auth::id();
// Get folder trash items
// TODO: do funkcii nizsie potrebujeme tiez sortable, totizto foldre v kosi vies tiez prechadzat, takisto spojazdnit na frontende. Lokacie mame 'trash-root' a 'trash'
if ($request->query('trash')) {
// Get folders and files
@@ -142,12 +141,14 @@ class BrowseController extends Controller
->with('parent')
->where('user_id', $user_id)
->where('parent_id', $unique_id)
->sortable()
->get();
$files = FileManagerFile::onlyTrashed()
->with('parent')
->where('user_id', $user_id)
->where('folder_id', $unique_id)
->sortable()
->get();
// Collect folders and files to single array
@@ -158,13 +159,13 @@ class BrowseController extends Controller
$folders = FileManagerFolder::with(['parent', 'shared:token,id,item_id,permission,protected,expire_in'])
->where('user_id', $user_id)
->where('parent_id', $unique_id)
->sortable(['name', 'DESC'])
->sortable()
->get();
$files = FileManagerFile::with(['parent', 'shared:token,id,item_id,permission,protected,expire_in'])
->where('user_id', $user_id)
->where('folder_id', $unique_id)
->sortable(['name', 'DESC'])
->sortable()
->get();
// Collect folders and files to single array
@@ -107,7 +107,15 @@ class AccountController extends Controller
*/
public function update_user_settings(Request $request)
{
// TODO: validation
// Validate request
$validator = Validator::make($request->all(), [
'name' => 'string',
'value' => 'string',
]);
// Return error
if ($validator->fails()) abort(400, 'Bad input');
// Get user
$user = Auth::user();
+2 -3
View File
@@ -195,15 +195,14 @@ class User extends Authenticatable
*/
public function getFolderTreeAttribute()
{
// Get sorting setup
$sort = strtolower(request()->input('sort'));
$direction = strtolower(request()->input('direction'));
// TODO: pozor pozor tu by sme mali pouzit sortable(), tak ako si pouzil v BrowseController
return FileManagerFolder::with(['folders.shared', 'shared:token,id,item_id,permission,protected,expire_in'])
->where('parent_id', 0)
->where('user_id', $this->id)
->orderBy($sort , $direction)
->sortable($sort , $direction)
->get();
}
+198 -63
View File
@@ -1,65 +1,200 @@
{
"/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=ece1ced9bca9d528bbe1",
"/js/main.js": "/js/main.js?id=3dd10beca4336e12197c",
"/css/app.css": "/css/app.css?id=8f6d5dcb7110a726e142",
"/chunks/admin.js": "/chunks/admin.js?id=5c1ef019716afc67775b",
"/chunks/admin-account.js": "/chunks/admin-account.js?id=16cd99641f6c1cb6788a",
"/chunks/app-appearance.js": "/chunks/app-appearance.js?id=3043f5ab051b9cac9ab7",
"/chunks/app-billings.js": "/chunks/app-billings.js?id=b4d28bec8835085f885f",
"/chunks/app-email.js": "/chunks/app-email.js?id=24fc0cc212e9b893bb09",
"/chunks/app-index.js": "/chunks/app-index.js?id=c1c8101bd90f630ac6bf",
"/chunks/app-others.js": "/chunks/app-others.js?id=c73372ee9f62d01c74d1",
"/chunks/app-payments.js": "/chunks/app-payments.js?id=83608af3a7e34ac062d4",
"/chunks/app-settings.js": "/chunks/app-settings.js?id=466c6bfc5ab7b883e443",
"/chunks/app-setup.js": "/chunks/app-setup.js?id=652f0ab8a6423dd24906",
"/chunks/billings-detail.js": "/chunks/billings-detail.js?id=b955f8dcd6890a1b45ca",
"/chunks/contact-us.js": "/chunks/contact-us.js?id=a5150dcf81c8e1ab23a4",
"/chunks/create-new-password.js": "/chunks/create-new-password.js?id=58c543c4f92b5ca9a284",
"/chunks/dashboard.js": "/chunks/dashboard.js?id=3ee4bf9387ba610231ee",
"/chunks/database.js": "/chunks/database.js?id=dbb3c73c995c7ee55015",
"/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=08a0c2de8f93e0222600",
"/chunks/environment-setup.js": "/chunks/environment-setup.js?id=3b6455db55e44d265c86",
"/chunks/files.js": "/chunks/files.js?id=3e7ab3ab0bc78accc9df",
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=7ff98232e7b4cc5d2c2a",
"/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=f8a13783dc40aad197b5",
"/chunks/invoices.js": "/chunks/invoices.js?id=58751161ec5163b7d3bf",
"/chunks/landing-page.js": "/chunks/landing-page.js?id=00d49e4ffb54dc5abb5b",
"/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=53d4f9c58bdac1e568c7",
"/chunks/page-edit.js": "/chunks/page-edit.js?id=e3dbad6c75184042d2e6",
"/chunks/pages.js": "/chunks/pages.js?id=6d0ea14f54f59fc3d97b",
"/chunks/plan.js": "/chunks/plan.js?id=7ea9ddff467ab749441a",
"/chunks/plan-create.js": "/chunks/plan-create.js?id=b40c3e16a94a55fc9397",
"/chunks/plan-delete.js": "/chunks/plan-delete.js?id=61c8edfbdad6904435ed",
"/chunks/plan-settings.js": "/chunks/plan-settings.js?id=2be8a0aaf9e6968e158e",
"/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=60b05b4391ec24649eaf",
"/chunks/plans.js": "/chunks/plans.js?id=5acc8acff759155caa58",
"/chunks/profile.js": "/chunks/profile.js?id=91714cf4f6ca568515d6",
"/chunks/purchase-code.js": "/chunks/purchase-code.js?id=82446c77da50e52cf1bd",
"/chunks/settings.js": "/chunks/settings.js?id=0cfc9ad9196a31d29811",
"/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=72bc6c0599e6d6095ddd",
"/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=daad8173619d5d047c0d",
"/chunks/settings-password.js": "/chunks/settings-password.js?id=9424e701a221958e50e8",
"/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=4fe3314e78fb90505518",
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=6af5afc7c03b54e80984",
"/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=1be617484ada2cd04bd7",
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=47090233afc7b0cdf855",
"/chunks/shared-files.js": "/chunks/shared-files.js?id=9581a454bbb3b0de5ff1",
"/chunks/shared-page.js": "/chunks/shared-page.js?id=0bd5bb1769f850581967",
"/chunks/sign-in.js": "/chunks/sign-in.js?id=ec080714b24154cf1081",
"/chunks/sign-up.js": "/chunks/sign-up.js?id=0d8b571bcf5a54f073fd",
"/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=099fd6800da190981a1c",
"/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=a1582c9b65d4b9df716e",
"/chunks/subscription-service.js": "/chunks/subscription-service.js?id=67403d4466f7e7c5701d",
"/chunks/upgrade.js": "/chunks/upgrade.js?id=a414b418fb4f7c37287f",
"/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=985dd231a8395f6a01d2",
"/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=a66c2011e6e99d0880de",
"/chunks/user.js": "/chunks/user.js?id=614b75d3e823cde8ab9f",
"/chunks/user-create.js": "/chunks/user-create.js?id=2bd3bf90450c1ae1a9e1",
"/chunks/user-delete.js": "/chunks/user-delete.js?id=08acb6b552540d60131f",
"/chunks/user-detail.js": "/chunks/user-detail.js?id=cf402ad5f8e4a19bfa6c",
"/chunks/user-invoices.js": "/chunks/user-invoices.js?id=968a95bf02cb6a5cf064",
"/chunks/user-password.js": "/chunks/user-password.js?id=59afc7db6a7c0b40781e",
"/chunks/user-storage.js": "/chunks/user-storage.js?id=cb0b4bfb94595993795f",
"/chunks/user-subscription.js": "/chunks/user-subscription.js?id=893d245c41391543de25",
"/chunks/users.js": "/chunks/users.js?id=29d2749764463102bd77"
"/js/main.js": "/js/main.js",
"/css/app.css": "/css/app.css",
"/chunks/admin.js": "/chunks/admin.js?id=ed4125d0b85c16ac0a46",
"/chunks/admin-account.js": "/chunks/admin-account.js?id=ac9df71ad80bac225d62",
"/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js?id=9ab2c60930e2adf92716",
"/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~3b77a26e.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~3b77a26e.js?id=eeb40a78f38c60a32042",
"/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js?id=54a833ec02385944db39",
"/chunks/app-appearance.js": "/chunks/app-appearance.js?id=2fcf9b6a8bcdcf0bf877",
"/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js?id=165778ddf33905044afb",
"/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js?id=c88362556572886cf8bd",
"/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js?id=75a610ff95b22e4e015c",
"/chunks/app-billings.js": "/chunks/app-billings.js?id=b8e6ca52592de6c0d2a8",
"/chunks/app-email.js": "/chunks/app-email.js?id=5e231b4d6cf0a4d1acb9",
"/chunks/app-index.js": "/chunks/app-index.js?id=b8c778343ab04e9c2f79",
"/chunks/app-others.js": "/chunks/app-others.js?id=39709ad63bc65e256571",
"/chunks/app-payments.js": "/chunks/app-payments.js?id=ab77360a958f97f95c6c",
"/chunks/app-settings.js": "/chunks/app-settings.js?id=cff243a66e4b037e5e84",
"/chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~8a0e1d25.js": "/chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~8a0e1d25.js?id=fe9f96c80a32a0beefe8",
"/chunks/app-setup.js": "/chunks/app-setup.js?id=bf12cf48a877bfb28bab",
"/chunks/billings-detail.js": "/chunks/billings-detail.js?id=4d83edccf043c2698895",
"/chunks/contact-us.js": "/chunks/contact-us.js?id=be7eb0498b786a4859db",
"/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js": "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js?id=8b11e9c64262b9275963",
"/chunks/create-new-password.js": "/chunks/create-new-password.js?id=abb47a424c09ace77d79",
"/chunks/dashboard.js": "/chunks/dashboard.js?id=59053d9345e827465d1c",
"/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.js?id=2938ebab2c036e9de9d4",
"/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js?id=ffd2f414666d7cc80b9d",
"/chunks/database.js": "/chunks/database.js?id=0b21e6ff3bac5c963d9a",
"/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=464c8e70974d492ce7f6",
"/chunks/environment-setup.js": "/chunks/environment-setup.js?id=826fbaa6cc4acab69f5d",
"/chunks/files.js": "/chunks/files.js?id=76b46f43df974e899836",
"/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=8ccd35de575e8a91d02f",
"/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=87e6fd4cfbe8cb2cad37",
"/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=ed167949ea9398f0fbeb",
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=aba8c662fbc234892216",
"/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=7dfffa0f25308ba70b7a",
"/chunks/invoices.js": "/chunks/invoices.js?id=262f284d4edc13719b00",
"/chunks/landing-page.js": "/chunks/landing-page.js?id=920418aa2cd205d96d0a",
"/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=a28320bdc00aeb85409e",
"/chunks/page-edit.js": "/chunks/page-edit.js?id=0607b8e16d6678e0b463",
"/chunks/pages.js": "/chunks/pages.js?id=53cfb0cdbc2ecbc2111f",
"/chunks/plan.js": "/chunks/plan.js?id=ed865758447ff7e3f2b5",
"/chunks/plan-create.js": "/chunks/plan-create.js?id=f4199916eddc63fb1720",
"/chunks/plan-delete.js": "/chunks/plan-delete.js?id=2a50cca120ca589f5626",
"/chunks/plan-settings.js": "/chunks/plan-settings.js?id=4a691e84a65d9a779d60",
"/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=8c85b14979d3fb6c54a3",
"/chunks/plans.js": "/chunks/plans.js?id=db810284f32ea3aa36ad",
"/chunks/profile.js": "/chunks/profile.js?id=df174ba95616670c8edb",
"/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=42dbd1e9d17515be4a7b",
"/chunks/purchase-code.js": "/chunks/purchase-code.js?id=0c7dd358b177460faa74",
"/chunks/settings.js": "/chunks/settings.js?id=e909af7cfc70717a8771",
"/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=40d5eed52256ea23edbe",
"/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=bc110f5ee1a5b984fda2",
"/chunks/settings-password.js": "/chunks/settings-password.js?id=e318f7536b185dbe6b54",
"/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=7782ad88fc805fe75f4c",
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=22e7978fe8a5cb488e52",
"/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=367c9478591c7a4a2889",
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=7da589bd335deefd5f65",
"/chunks/shared-files.js": "/chunks/shared-files.js?id=5d9381e60cc1307f715a",
"/chunks/shared-page.js": "/chunks/shared-page.js?id=6a76b27026b3ab28f544",
"/chunks/sign-in.js": "/chunks/sign-in.js?id=703fbd23d18816590337",
"/chunks/sign-up.js": "/chunks/sign-up.js?id=cedca52c29abfb3c58f1",
"/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=b99eb91043d1321187b9",
"/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=ffaf6839286adad7bf59",
"/chunks/subscription-service.js": "/chunks/subscription-service.js?id=5781cfedee2ccf4d9e25",
"/chunks/upgrade.js": "/chunks/upgrade.js?id=a66a145b67f5f1a2892e",
"/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=48886957769dffee24bf",
"/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=d513432dd873331a60f6",
"/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=dd2df21f21ff1291c4dc",
"/chunks/user.js": "/chunks/user.js?id=d7eca242e8e982ddbae4",
"/chunks/user-create.js": "/chunks/user-create.js?id=fc1f1811516801a2bb87",
"/chunks/user-delete.js": "/chunks/user-delete.js?id=c840c8ded1acc6335f05",
"/chunks/user-detail.js": "/chunks/user-detail.js?id=ef7920c403b69c391543",
"/chunks/user-invoices.js": "/chunks/user-invoices.js?id=97d041044c0eee8f8b4b",
"/chunks/user-password.js": "/chunks/user-password.js?id=b036eeaa5ef8e798f6dd",
"/chunks/user-storage.js": "/chunks/user-storage.js?id=a99910f95c3e39caa78b",
"/chunks/user-subscription.js": "/chunks/user-subscription.js?id=e8ea1e67f9ac0a835ed0",
"/chunks/users.js": "/chunks/users.js?id=420d8c46141ab3e73395",
"/js/main.1b15b6a1bfc38e181049.hot-update.js": "/js/main.1b15b6a1bfc38e181049.hot-update.js",
"/js/main.1397c53e98b3cd47fd0b.hot-update.js": "/js/main.1397c53e98b3cd47fd0b.hot-update.js",
"/js/main.2abf2d1e5a88471c4c68.hot-update.js": "/js/main.2abf2d1e5a88471c4c68.hot-update.js",
"/js/main.bb9156b6a08223bfa879.hot-update.js": "/js/main.bb9156b6a08223bfa879.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.a646426e670c0996e277.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.a646426e670c0996e277.hot-update.js",
"/js/main.fc6645db7cda6786f916.hot-update.js": "/js/main.fc6645db7cda6786f916.hot-update.js",
"/js/main.244b62b981cf0499cb28.hot-update.js": "/js/main.244b62b981cf0499cb28.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.100e84f2e85fd0aa8029.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.100e84f2e85fd0aa8029.hot-update.js",
"/js/main.72b90a340974e9e28a43.hot-update.js": "/js/main.72b90a340974e9e28a43.hot-update.js",
"/js/main.925e1e434134c79dfc76.hot-update.js": "/js/main.925e1e434134c79dfc76.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.f2cfc9a9da661c55176a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.f2cfc9a9da661c55176a.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.b2542816ba1bee58722b.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.b2542816ba1bee58722b.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.83883e8c392a476a1bd8.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.83883e8c392a476a1bd8.hot-update.js",
"/js/main.102ce2dc9925b80dc5a4.hot-update.js": "/js/main.102ce2dc9925b80dc5a4.hot-update.js",
"/js/main.5ddaf9f76fbaf6262719.hot-update.js": "/js/main.5ddaf9f76fbaf6262719.hot-update.js",
"/js/main.f38379a3cf12bbb5f00c.hot-update.js": "/js/main.f38379a3cf12bbb5f00c.hot-update.js",
"/js/main.4f38408f26fbb377f700.hot-update.js": "/js/main.4f38408f26fbb377f700.hot-update.js",
"/js/main.2f472c3b7c3d1b51d7fd.hot-update.js": "/js/main.2f472c3b7c3d1b51d7fd.hot-update.js",
"/js/main.b83a455e1f879b3b8365.hot-update.js": "/js/main.b83a455e1f879b3b8365.hot-update.js",
"/js/main.91602a2a8c0634e980bd.hot-update.js": "/js/main.91602a2a8c0634e980bd.hot-update.js",
"/js/main.034afd4511e052077e78.hot-update.js": "/js/main.034afd4511e052077e78.hot-update.js",
"/js/main.f7d663fcceaf0e3bd928.hot-update.js": "/js/main.f7d663fcceaf0e3bd928.hot-update.js",
"/js/main.0662566766ff9876c348.hot-update.js": "/js/main.0662566766ff9876c348.hot-update.js",
"/js/main.5b721f8f1d29c456fc27.hot-update.js": "/js/main.5b721f8f1d29c456fc27.hot-update.js",
"/js/main.3d8b03017e9489e532b1.hot-update.js": "/js/main.3d8b03017e9489e532b1.hot-update.js",
"/js/main.28323327fc35deb1e7e6.hot-update.js": "/js/main.28323327fc35deb1e7e6.hot-update.js",
"/js/main.29ff0f57b8e94e822cbb.hot-update.js": "/js/main.29ff0f57b8e94e822cbb.hot-update.js",
"/js/main.27aa1a0e978355814c94.hot-update.js": "/js/main.27aa1a0e978355814c94.hot-update.js",
"/js/main.6d83af2c8156c247c3c1.hot-update.js": "/js/main.6d83af2c8156c247c3c1.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.c8d2e107710d04b0efff.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.c8d2e107710d04b0efff.hot-update.js",
"/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.1ad6d59b90b326f92256.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.1ad6d59b90b326f92256.hot-update.js",
"/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.da1b3a0dcab5ff223bda.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.da1b3a0dcab5ff223bda.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.81d7fc03c5ee88612b02.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.81d7fc03c5ee88612b02.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.f9077abac441a5d61c25.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.f9077abac441a5d61c25.hot-update.js",
"/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.2cf04ba90d9d51c84e7e.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.2cf04ba90d9d51c84e7e.hot-update.js",
"/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.225ea55c0cb78eca842f.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.225ea55c0cb78eca842f.hot-update.js",
"/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.9eaa94710c8291289ce4.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.9eaa94710c8291289ce4.hot-update.js",
"/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.6080bb32ae7c35c441d3.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.6080bb32ae7c35c441d3.hot-update.js",
"/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.d2ac1faf6c7bb396614d.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.d2ac1faf6c7bb396614d.hot-update.js",
"/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.f42f180444f095746667.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.f42f180444f095746667.hot-update.js",
"/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.1e9f5c4b709d46b4b617.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.1e9f5c4b709d46b4b617.hot-update.js",
"/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.3eccd886a3371553f96b.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.3eccd886a3371553f96b.hot-update.js",
"/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.1dea0967e92fccf1b54a.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.1dea0967e92fccf1b54a.hot-update.js",
"/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.d15ed1b887dfde8380d5.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.d15ed1b887dfde8380d5.hot-update.js",
"/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.81afa8965b935916a5d1.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.81afa8965b935916a5d1.hot-update.js",
"/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.e35ba33335dbd5346310.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.e35ba33335dbd5346310.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.174e4443834db664f0e9.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.174e4443834db664f0e9.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.df331f7a6bb8497e1fb6.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.df331f7a6bb8497e1fb6.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.4ef3189432a09708ae7f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.4ef3189432a09708ae7f.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.36702e96ced90b22b844.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.36702e96ced90b22b844.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.bdfce544f0d15c618da1.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.bdfce544f0d15c618da1.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.ba61df11a2c84d2e5ed7.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.ba61df11a2c84d2e5ed7.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.5dda7b6be0b9ce1362e3.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.5dda7b6be0b9ce1362e3.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.bbe09a3dbd45ed0b5800.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.bbe09a3dbd45ed0b5800.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.36e025cd6250ae139644.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.36e025cd6250ae139644.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.c9c6fb3c9b5072a758f0.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.c9c6fb3c9b5072a758f0.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.90de78a0671453f9f15e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.90de78a0671453f9f15e.hot-update.js",
"/js/main.42d1b2931a6652662f4a.hot-update.js": "/js/main.42d1b2931a6652662f4a.hot-update.js",
"/js/main.5fd50660eee970f0b214.hot-update.js": "/js/main.5fd50660eee970f0b214.hot-update.js",
"/js/main.ed806e58174ee6d94e30.hot-update.js": "/js/main.ed806e58174ee6d94e30.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.0e27742dfea1d6843bbe.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.0e27742dfea1d6843bbe.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.d5f66e0ce8f89640c86e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.d5f66e0ce8f89640c86e.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.ff7f7c336eba71e73f9a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.ff7f7c336eba71e73f9a.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.a7e9c22d69ab18a20826.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.a7e9c22d69ab18a20826.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.4acbddd14241bb9581a2.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.4acbddd14241bb9581a2.hot-update.js",
"/js/main.61f85bb831a8ce0a0bb9.hot-update.js": "/js/main.61f85bb831a8ce0a0bb9.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.017cc5b3cb69d3ae0237.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.017cc5b3cb69d3ae0237.hot-update.js",
"/js/main.d08b74df85c5e4f8315e.hot-update.js": "/js/main.d08b74df85c5e4f8315e.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.0fb35ad5ad5178a79976.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.0fb35ad5ad5178a79976.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.54b58c64db81ea2f4e96.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.54b58c64db81ea2f4e96.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.41393113a7f6b548ed2a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.41393113a7f6b548ed2a.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.b2519cb17b2d039304ec.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.b2519cb17b2d039304ec.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.970996598d8b291e4a8f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.970996598d8b291e4a8f.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.2fd47c0a480d5023ef63.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.2fd47c0a480d5023ef63.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.f523206e03b56667cf3e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.f523206e03b56667cf3e.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.06363e3e43fed48ad216.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.06363e3e43fed48ad216.hot-update.js",
"/js/main.8b03c2c75c9ebddad17a.hot-update.js": "/js/main.8b03c2c75c9ebddad17a.hot-update.js",
"/js/main.cc3341a209c7ebf01398.hot-update.js": "/js/main.cc3341a209c7ebf01398.hot-update.js",
"/js/main.fc32e4174b739ddf7883.hot-update.js": "/js/main.fc32e4174b739ddf7883.hot-update.js",
"/js/main.e541ca63d928438f1784.hot-update.js": "/js/main.e541ca63d928438f1784.hot-update.js",
"/js/main.b590b8bb4ac410802dcf.hot-update.js": "/js/main.b590b8bb4ac410802dcf.hot-update.js",
"/js/main.764d913e63ff91115596.hot-update.js": "/js/main.764d913e63ff91115596.hot-update.js",
"/js/main.3922d73c84ec9019720f.hot-update.js": "/js/main.3922d73c84ec9019720f.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.3bbf94a080590819af95.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.3bbf94a080590819af95.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.18c619a48f9402164ed6.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.18c619a48f9402164ed6.hot-update.js",
"/js/main.9424d65135858150b658.hot-update.js": "/js/main.9424d65135858150b658.hot-update.js",
"/js/main.77f50bf586901852ea73.hot-update.js": "/js/main.77f50bf586901852ea73.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.8eddd86957e6133bef05.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.8eddd86957e6133bef05.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.3a0302b96d731a2497e3.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.3a0302b96d731a2497e3.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.a69453bfb5f4b208e0ce.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.a69453bfb5f4b208e0ce.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.34ae601d88eda0afc960.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.34ae601d88eda0afc960.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.49577520fb9d5ec8280b.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.49577520fb9d5ec8280b.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.27cd04a5c6c9e8622189.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.27cd04a5c6c9e8622189.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.0e38d679d7a3e462a51d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.0e38d679d7a3e462a51d.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.f37f830f0bb4cbfb9fce.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.f37f830f0bb4cbfb9fce.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.ea7dd263e4dee7dc0fc0.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.ea7dd263e4dee7dc0fc0.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.f615b8e6a9f28a5d6a6f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.f615b8e6a9f28a5d6a6f.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.af70c25c40f352e21924.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.af70c25c40f352e21924.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.5d5073c9f86ce9d1696d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.5d5073c9f86ce9d1696d.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.5d9dec27a45a991b7a6b.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.5d9dec27a45a991b7a6b.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.aa21d6a368546ee08b86.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.aa21d6a368546ee08b86.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.485e5f9531f4bc7e6265.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.485e5f9531f4bc7e6265.hot-update.js",
"/js/main.33e536872229ca624ace.hot-update.js": "/js/main.33e536872229ca624ace.hot-update.js",
"/js/main.236165b893827436d19d.hot-update.js": "/js/main.236165b893827436d19d.hot-update.js",
"/js/main.5198c71e744be088bef3.hot-update.js": "/js/main.5198c71e744be088bef3.hot-update.js",
"/js/main.8722b2aa107cf56136a3.hot-update.js": "/js/main.8722b2aa107cf56136a3.hot-update.js",
"/js/main.80b3fc81391adbf73cd0.hot-update.js": "/js/main.80b3fc81391adbf73cd0.hot-update.js",
"/js/main.ae84e040aba4dde0d4a8.hot-update.js": "/js/main.ae84e040aba4dde0d4a8.hot-update.js",
"/js/main.6be99746bc950d9d995a.hot-update.js": "/js/main.6be99746bc950d9d995a.hot-update.js",
"/js/main.6b701a4828fddef3c08b.hot-update.js": "/js/main.6b701a4828fddef3c08b.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.d6b4df9043a67d3ad46d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.d6b4df9043a67d3ad46d.hot-update.js",
"/js/main.f63ac73ec8e8ccb01917.hot-update.js": "/js/main.f63ac73ec8e8ccb01917.hot-update.js",
"/js/main.bcb69359a59628b09ae7.hot-update.js": "/js/main.bcb69359a59628b09ae7.hot-update.js",
"/js/main.6681ee831567a6cce600.hot-update.js": "/js/main.6681ee831567a6cce600.hot-update.js",
"/js/main.fb9e874bbabf17949fc9.hot-update.js": "/js/main.fb9e874bbabf17949fc9.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.87240bd4f532419f4439.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.87240bd4f532419f4439.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.cb181a9c1c5c296b5649.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.cb181a9c1c5c296b5649.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.04f5620ef34b6bf77ad0.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.04f5620ef34b6bf77ad0.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.18eeb625f9be9afa6ad8.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.18eeb625f9be9afa6ad8.hot-update.js",
"/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.66b379d5e86e8937b0ef.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.66b379d5e86e8937b0ef.hot-update.js",
"/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.d53e3bba26bd30441928.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~f48e9e59.d53e3bba26bd30441928.hot-update.js"
}
+5
View File
@@ -163,11 +163,16 @@
},
mounted() {
this.$checkOS()
// Handle mobile navigation scale animation
events.$on('show:mobile-navigation', () => this.isScaledDown = true)
events.$on('hide:mobile-navigation', () => this.isScaledDown = false)
events.$on('mobileMenu:show', () => this.isScaledDown = true)
events.$on('fileItem:deselect', () => this.isScaledDown = false)
events.$on('mobileSortingAndPreview', (state) => {
this.isScaledDown = state
})
}
}
</script>
@@ -431,21 +431,22 @@ export default {
}
},
addToFavourites() {
// Check if folder is in favourites and then add/remove from favourites
if (
this.favourites &&
!this.favourites.find((el) => el.unique_id == this.item.unique_id)
) {
//Add to favourite folder that is not selected
if (this.favourites &&!this.favourites.find((el) => el.unique_id == this.item.unique_id)) {
// Add to favourite folder that is not selected
if(!this.fileInfoDetail.includes(this.item)){
this.$store.dispatch('addToFavourites', this.item)
}
//Add to favourites all selected folders
// Add to favourites all selected folders
if(this.fileInfoDetail.includes(this.item)) {
this.$store.dispatch('addToFavourites', null)
}
} else {
this.$store.dispatch('removeFromFavourites', this.item)
}
},
@@ -84,11 +84,13 @@
<ToolbarButton
source="preview-sorting"
class="preview-sorting"
:action="$t('actions.sorting_view')"
:class="{ active: sortingAndPreview }"
@click.native=" sortingAndPreview = !sortingAndPreview"
/>
<ToolbarButton
:action="$t('actions.info_panel')"
:class="{ active: fileInfoVisible }"
@click.native="$store.dispatch('fileInfoToggle')"
source="info"
@@ -196,11 +198,11 @@ export default {
watch: {
sortingAndPreview () {
if(this.sortingAndPreview) {
events.$emit('sortingAndPreview-open')
events.$emit('sortingAndPreview', true)
}
if(!this.sortingAndPreview) {
events.$emit('sortingAndPreview-close')
events.$emit('sortingAndPreview', false)
}
}
},
@@ -256,6 +258,11 @@ export default {
}
},
},
mounted () {
events.$on('sortingAndPreview', (state) => {
this.sortingAndPreview = state
})
}
};
</script>
+15 -2
View File
@@ -13,21 +13,34 @@ import {events} from '@/bus'
computed: {
...mapGetters(['fileInfoDetail']),
title(){
// Title for multiple selected items
if(this.fileInfoDetail.length > 1 && this.fileInfoDetail.includes(this.draggedItem)) {
return this.$t('file_detail.selected_multiple')
}
// Title for single item
if((this.fileInfoDetail.length < 2 || !this.fileInfoDetail.includes(this.draggedItem)) && this.draggedItem ) {
return this.draggedItem.name
}
},
subtitle(){
// 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((this.fileInfoDetail.length < 2 || !this.fileInfoDetail.includes(this.draggedItem)) && this.draggedItem && this.draggedItem.mimetype) {
return '.'+this.draggedItem.mimetype
if((this.fileInfoDetail.length < 2 || !this.fileInfoDetail.includes(this.draggedItem)) && this.draggedItem) {
// Subtitle for single folder
if(this.draggedItem.type === 'folder') {
return this.draggedItem.items == 0 ? this.$t('folder.empty') : this.$tc('folder.item_counts', this.draggedItem.items)
}
// Subtitle for single file
if(this.draggedItem !== 'folder' && this.draggedItem.mimetype){
return '.'+this.draggedItem.mimetype
}
}
},
},
@@ -230,11 +230,11 @@
}
},
created() {
events.$on('mobileSelecting-start' , () => {
events.$on('mobileSelecting:start' , () => {
this.mobileMultiSelect =true
})
events.$on('mobileSelecting-stop' , () => {
events.$on('mobileSelecting:stop' , () => {
this.mobileMultiSelect = false
})
@@ -157,6 +157,8 @@ export default {
clickedItem(e) {
events.$emit('contextMenu:hide')
events.$emit('sortingAndPreview', false)
if (!this.$isMobile()) {
if (e.ctrlKey || e.metaKey && !e.shiftKey) {
// Click + Ctrl
@@ -263,12 +265,12 @@ export default {
created() {
this.itemName = this.data.name
events.$on('mobileSelecting-start', () => {
events.$on('mobileSelecting:start', () => {
this.mobileMultiSelect = true
this.$store.commit('CLEAR_FILEINFO_DETAIL')
})
events.$on('mobileSelecting-stop', () => {
events.$on('mobileSelecting:stop', () => {
this.mobileMultiSelect = false
this.$store.commit('CLEAR_FILEINFO_DETAIL')
})
@@ -168,6 +168,8 @@ export default {
clickedItem(e) {
events.$emit('contextMenu:hide')
events.$emit('sortingAndPreview', false)
if(!this.$isMobile()) {
if( (e.ctrlKey || e.metaKey ) && !e.shiftKey) {
@@ -271,12 +273,12 @@ export default {
created() {
this.itemName = this.data.name
events.$on('mobileSelecting-start', () => {
events.$on('mobileSelecting:start', () => {
this.mobileMultiSelect = true
this.$store.commit('CLEAR_FILEINFO_DETAIL')
})
events.$on('mobileSelecting-stop', () => {
events.$on('mobileSelecting:stop', () => {
this.mobileMultiSelect = false
this.$store.commit('CLEAR_FILEINFO_DETAIL')
})
@@ -8,7 +8,7 @@
<grid-icon v-if="icon === 'th'" size="15" class="icon"></grid-icon>
<user-plus-icon v-if="icon === 'user-plus'" size="15" class="icon"></user-plus-icon>
<plus-icon v-if="icon === 'plus'" size="15" class="icon"></plus-icon>
<svg v-if="icon === 'preview-sorting'" size="15" class="icon"
<svg v-if="icon === 'preview-sorting'" size="15" class="icon preview-sorting"
width="15px" height="15px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g id="VueFileManager" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
<g id="Storage-Alert-Copy" transform="translate(-1092.000000, -28.000000)" stroke="#000000" stroke-width="1.4">
@@ -3,15 +3,15 @@
<!--Actions for trash location with MASTER permission--->
<div v-if="$isThisLocation(['trash', 'trash-root']) && $checkPermission('master')" class="mobile-actions">
<MobileActionButton :class="{'active' : mobileSortingAndPreview}" @click.native="mobileSortingAndPreview = ! mobileSortingAndPreview" icon="preview-sorting">
{{$t('preview_sorting.preview_sorting_button')}}
</MobileActionButton>
<MobileMultiSelectButton @click.native="mobileMultiSelect = !mobileMultiSelect">
{{ $t('context_menu.select') }}
</MobileMultiSelectButton>
<MobileActionButton @click.native="$store.dispatch('emptyTrash')" icon="trash">
{{ $t('context_menu.empty_trash') }}
</MobileActionButton>
<MobileMultiSelectButton @click.native="mobileMultiSelect = !mobileMultiSelect">
{{ $t('context_menu.select') }}
</MobileMultiSelectButton>
<MobileActionButton class="preview-sorting" @click.native="mobileSortingAndPreview = ! mobileSortingAndPreview" icon="preview-sorting">
{{$t('preview_sorting.preview_sorting_button')}}
</MobileActionButton>
</div>
<!--ContextMenu for Base location with MASTER permission-->
@@ -25,20 +25,19 @@
<MobileMultiSelectButton @click.native="mobileMultiSelect = !mobileMultiSelect">
{{ $t('context_menu.select') }}
</MobileMultiSelectButton>
<!--TODO: toto tlacitko nepotrebuje mat active classu, spusta iba event, nie je sucastou prebiehajucej udalosti (z pohladu UX)-->
<MobileActionButton :class="{'active' : mobileSortingAndPreview}" @click.native="mobileSortingAndPreview = ! mobileSortingAndPreview" icon="preview-sorting">
<MobileActionButton class="preview-sorting" @click.native="mobileSortingAndPreview = ! mobileSortingAndPreview" icon="preview-sorting">
{{$t('preview_sorting.preview_sorting_button')}}
</MobileActionButton>
</div>
<!--ContextMenu for Base location with VISITOR permission-->
<div v-if="($isThisLocation(['base', 'shared', 'public']) && $checkPermission('visitor')) || ($isThisLocation(['latest', 'shared']) && $checkPermission('master'))" class="mobile-actions">
<MobileActionButton :class="{'active' : mobileSortingAndPreview}" @click.native="mobileSortingAndPreview = ! mobileSortingAndPreview" icon="preview-sorting">
{{$t('preview_sorting.preview_sorting_button')}}
</MobileActionButton>
<MobileMultiSelectButton @click.native="mobileMultiSelect = !mobileMultiSelect">
{{ $t('context_menu.select') }}
</MobileMultiSelectButton>
<MobileActionButton class="preview-sorting" @click.native="mobileSortingAndPreview = ! mobileSortingAndPreview" icon="preview-sorting">
{{$t('preview_sorting.preview_sorting_button')}}
</MobileActionButton>
</div>
<!--Upload Progressbar-->
@@ -80,20 +79,22 @@
mobileMultiSelect () {
if(this.mobileMultiSelect ) {
events.$emit('mobileSelecting-start')
events.$emit('mobileSelecting:start')
}
if(!this.mobileMultiSelect) {
events.$emit('mobileSelecting-stop')
events.$emit('mobileSelecting:stop')
}
},
mobileSortingAndPreview (oldValue , newValue) {
if(this.mobileSortingAndPreview) {
events.$emit('mobileSortingAndPreview-open')
events.$emit('mobileSortingAndPreview' , true)
events.$emit('mobileSortingAndPreviewVignette' , true)
this.mobileMultiSelect = false
}
if(!this.mobileSortingAndPreview) {
events.$emit('mobileSortingAndPreview-close')
events.$emit('mobileSortingAndPreview', false)
events.$emit('mobileSortingAndPreviewVignette' , false)
}
}
},
@@ -112,12 +113,12 @@
},
},
mounted () {
events.$on('mobileSelecting-stop', () => {
events.$on('mobileSelecting:stop', () => {
this.mobileMultiSelect = false
})
events.$on('mobileSortingAndPreview-close', () => {
this.mobileSortingAndPreview = false
events.$on('mobileSortingAndPreview', (state) => {
this.mobileSortingAndPreview = state
})
@@ -128,10 +129,17 @@
<style scoped lang="scss">
@import '@assets/vue-file-manager/_variables';
@import '@assets/vue-file-manager/_mixins';
.active {
/deep/.label {
color: $theme !important;
}
.preview-sorting {
background: $light_background !important;
/deep/ .label {
color: $text !important;
}
/deep/ .preview-sorting {
path, line, polyline, rect, circle {
stroke: $text !important;
}
}
}
#mobile-actions-wrapper {
@@ -167,5 +175,16 @@
#mobile-actions-wrapper {
background: $dark_mode_background;
}
.preview-sorting {
background: $dark_mode_foreground !important;
/deep/ .label {
color: $dark_mode_text_primary !important;
}
/deep/ .preview-sorting {
path, line, polyline, rect, circle {
stroke: $theme !important;
}
}
}
}
</style>
@@ -27,11 +27,11 @@
}
},
mounted() {
events.$on('mobileSelecting-start' , () => {
events.$on('mobileSelecting:start' , () => {
this.mobileSelectingActive = true
})
events.$on('mobileSelecting-stop' , () => {
events.$on('mobileSelecting:stop' , () => {
this.mobileSelectingActive = false
})
}
@@ -30,7 +30,7 @@ export default {
},
methods: {
closeSelecting() {
events.$emit('mobileSelecting-stop')
events.$emit('mobileSelecting:stop')
},
downloadItem() {
this.fileInfoDetail.forEach((item , i) => {
@@ -52,12 +52,12 @@ export default {
}
},
created() {
events.$on('mobileSelecting-start', () => {
events.$on('mobileSelecting:start', () => {
this.mobileMultiSelect = true
})
events.$on('mobileSelecting-stop', () => {
events.$on('mobileSelecting:stop', () => {
this.mobileMultiSelect = false
})
@@ -1,6 +1,5 @@
<template>
<div class="options-wrapper">
<transition name="context-menu">
<transition name="context-menu" class="options-wrapper">
<div class="options" v-if="isVisible">
<div class="menu-options">
@@ -30,8 +29,7 @@
</ul>
<ul class="menu-option-group">
<!--TODO: co to ten c class atribute? :D -->
<li c class="menu-option" @click="sort('created_at')">
<li class="menu-option" @click="sort('created_at')">
<div class="icon">
<calendar-icon size="17"/>
</div>
@@ -44,7 +42,7 @@
</li>
<li class="menu-option" @click="sort('name')">
<div class="icon">
<alphabet-icon size="17" class="aplhabet-icon"/>
<alphabet-icon size="17" class="alphabet-icon"/>
</div>
<div class="text-label">
{{ $t('preview_sorting.sort_alphabet') }}
@@ -55,15 +53,8 @@
</li>
</ul>
</div>
</div>
</transition>
<!-- TODO: tento fade tu nemusi byt, mame uz jeden hlavny implementovany pre appku, iba odpalit spravny event, pozri Vignette.vue-->
<transition name="fade">
<div v-show="isVisible" class="vignette" @click.self="close"></div>
</transition>
</div>
</template>
<script>
@@ -104,7 +95,7 @@ export default {
methods: {
close() {
this.isVisible = false
events.$emit('mobileSortingAndPreview-close')
events.$emit('mobileSortingAndPreview', false)
},
sort(field) {
@@ -127,8 +118,11 @@ export default {
this.$getDataByLocation()
},
changePreview(previewType) {
this.$store.dispatch('changePreviewType', previewType)
}
this.close()
},
},
mounted() {
@@ -138,13 +132,8 @@ export default {
this.filter.sort = sorting ? sorting.sort : 'DESC'
this.filter.field = sorting ? sorting.field : 'created_at'
// TODO: tento event by som zrefaktoroval do jedneho, nech mame menej kodu pre takuto jednoduchu operaciu
events.$on('mobileSortingAndPreview-open', () => {
this.isVisible = true
})
events.$on('mobileSortingAndPreview-close', () => {
this.isVisible = false
events.$on('mobileSortingAndPreview', (state) => {
this.isVisible = state
})
}
}
@@ -167,10 +156,7 @@ export default {
margin-right: 20px;
line-height: 0;
/*
TODO: preklep
*/
.aplhabet-icon {
.alphabet-icon {
/deep/ line,
/deep/ polyline {
stroke: $text;
@@ -272,7 +258,7 @@ export default {
}
}
.icon {
.aplhabet-icon {
.alphabet-icon {
/deep/ line,
/deep/ polyline {
stroke: $dark_mode_text_primary;
@@ -52,7 +52,7 @@
methods: {
showMobileNavigation() {
events.$emit('show:mobile-navigation')
events.$emit('mobileSelecting-stop')
events.$emit('mobileSelecting:stop')
},
goBack() {
@@ -41,7 +41,7 @@
</li>
<li class="menu-option" @click="sort('name')" >
<div class="icon">
<alphabet-icon size="17" class="aplhabet-icon"/>
<alphabet-icon size="17" class="alphabet-icon"/>
</div>
<div class="text-label">
{{$t('preview_sorting.sort_alphabet')}}
@@ -112,7 +112,12 @@
this.$getDataByLocation()
},
changePreview(previewType) {
this.$store.dispatch('changePreviewType' , previewType)
this.isVisible = false
events.$emit('sortingAndPreview', false)
}
},
mounted () {
@@ -123,12 +128,8 @@
this.filter.sort = sorting ? sorting.sort : 'DESC'
this.filter.field = sorting ? sorting.field : 'created_at'
events.$on('sortingAndPreview-open', () => {
this.isVisible = true
})
events.$on('sortingAndPreview-close', () => {
this.isVisible = false
events.$on('sortingAndPreview', (state) => {
this.isVisible = state
})
}
@@ -153,7 +154,7 @@
.icon {
margin-right: 20px;
line-height: 0;
.aplhabet-icon {
.alphabet-icon {
/deep/line,
/deep/polyline {
stroke:$text ;
@@ -244,7 +245,7 @@
color: $dark_mode_text_primary;
.icon {
.aplhabet-icon {
.alphabet-icon {
/deep/line,
/deep/polyline {
stroke:$dark_mode_text_primary ;
@@ -18,6 +18,7 @@
closePopup() {
events.$emit('popup:close')
events.$emit('mobileMenu:hide')
events.$emit('mobileSortingAndPreview', false)
}
},
created() {
@@ -30,6 +31,10 @@
events.$on('alert:open', () => this.isVisibleVignette = true)
events.$on('success:open', () => this.isVisibleVignette = true)
events.$on('confirm:open', () => this.isVisibleVignette = true)
events.$on('mobileSortingAndPreviewVignette', (state) => {
this.isVisibleVignette = state
})
}
}
</script>
+11 -14
View File
@@ -301,9 +301,6 @@ const Helpers = {
title: i18n.t('popup_mimetypes_blacklist.title'),
message: i18n.t('popup_mimetypes_blacklist.message', {mimetype: fileType[1]}),
})
}else {
// TODO: tento else tu nemusi byt, defaultne je uz prednastaveny true cize ak sa nevykona podmienka vyssie tak vzdy bude true
validated = true
}
}
return validated
@@ -315,11 +312,11 @@ const Helpers = {
let actions = {
'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'],
'trash-root' : ['getTrash'],
// 'trash' : ['getTrash'], TODO: skontrolovat a spojazdnit
'participant_uploads' : ['getParticipantUploads'],
}
this.$store.dispatch(...actions[folder.location])
@@ -330,14 +327,14 @@ const Helpers = {
// Get data of Navigator tree
this.$store.dispatch('getFolderTree')
}
Vue.prototype.$checkOS = function() {
// Handle styled scrollbar for Windows
if (navigator.userAgent.indexOf('Windows') != -1) {
let body = document.body
body.classList.add('windows')
}
}
}
}
export default Helpers
// Handle styled scrollbar for Windows
// TODO: toto treba dat jednoznacne na svoje spravne miesto
if (navigator.userAgent.indexOf('Windows') != -1) {
let body = document.body
body.classList.add('windows')
}
export default Helpers
+3 -1
View File
@@ -6,7 +6,9 @@
"preview": "更改预览",
"share": "Share item",
"upload": "上传文件",
"close": "Close"
"close": "Close",
"sorting_view": "Sorting and View",
"info_panel": "Info panel"
},
"activation": {
"stripe": {
+3 -1
View File
@@ -8,7 +8,9 @@
"upload": "Upload file",
"download": "Download item",
"print": "Print item",
"close": "Close"
"close": "Close",
"sorting_view": "Sorting and View",
"info_panel": "Info panel"
},
"activation": {
"stripe": {
+3 -1
View File
@@ -8,7 +8,9 @@
"upload": "Nahrať súbory",
"download": "Stiahnuť položku",
"print": "Vytlačiť položku",
"close": "Zatvoriť"
"close": "Zatvoriť",
"sorting_view" : "Zoradenie a zobrazenie ",
"info_panel" : "Informačný panel"
},
"activation": {
"stripe": {
+3 -3
View File
@@ -36,11 +36,11 @@ const actions = {
commit('STORE_PREVIOUS_FOLDER', getters.currentFolder)
let url = payload.folder.location === 'trash'
? '/folders/' + payload.folder.unique_id + '?trash=true'
: '/folders/' + payload.folder.unique_id
? '/folders/' + payload.folder.unique_id + getters.sorting.URI + '&trash=true'
: '/folders/' + payload.folder.unique_id + getters.sorting.URI
axios
.get(getters.api + url + getters.sorting.URI)
.get(getters.api + url)
.then(response => {
commit('LOADING_STATE', {loading: false, data: response.data})
commit('STORE_CURRENT_FOLDER', payload.folder)