From 8d04a94dbcdc777467540dab78b90ccefea28edb Mon Sep 17 00:00:00 2001 From: Peter Papp Date: Sun, 7 Feb 2021 11:19:21 +0100 Subject: [PATCH] - on-demand notification - error message on failed after shared link was created - Shared link email text edit --- .../FileFunctions/ShareController.php | 9 +- app/Notifications/SharedSendViaEmail.php | 14 +- app/Share.php | 15 +- public/mix-manifest.json | 196 ++++------ .../Others/Forms/MultiEmailInput.vue | 4 + .../components/Others/Popup/PopupWrapper.vue | 2 +- .../js/components/Others/ShareCreate.vue | 367 +++++++++--------- resources/js/components/Others/ShareEdit.vue | 4 - resources/js/components/Others/Vignette.vue | 2 +- resources/lang/cn/vuefilemanager.php | 4 +- resources/lang/en/vuefilemanager.php | 4 +- resources/lang/sk/vuefilemanager.php | 4 +- 12 files changed, 280 insertions(+), 345 deletions(-) diff --git a/app/Http/Controllers/FileFunctions/ShareController.php b/app/Http/Controllers/FileFunctions/ShareController.php index 9cee2edf..02864493 100644 --- a/app/Http/Controllers/FileFunctions/ShareController.php +++ b/app/Http/Controllers/FileFunctions/ShareController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\FileFunctions; use App\Http\Requests\Share\CreateShareRequest; use App\Http\Requests\Share\UpdateShareRequest; use App\Http\Resources\ShareResource; +use App\Notifications\SharedSendViaEmail; use App\Zip; use Illuminate\Contracts\Routing\ResponseFactory; use App\Http\Controllers\Controller; @@ -12,6 +13,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; +use Illuminate\Support\Facades\Notification; use Illuminate\Support\Str; use App\Share; use Validator; @@ -62,8 +64,11 @@ class ShareController extends Controller $share = new ShareResource(Share::create($options)); // Send shared link via email - if($request->emails) { - $share->sendSharedLinkViaEmail($request->emails, $token); + if($request->has('emails')) { + + foreach ($request->emails as $email) { + Notification::route('mail', $email)->notify(new SharedSendViaEmail($token)); + } } return $share; diff --git a/app/Notifications/SharedSendViaEmail.php b/app/Notifications/SharedSendViaEmail.php index 950c3728..20f2e467 100644 --- a/app/Notifications/SharedSendViaEmail.php +++ b/app/Notifications/SharedSendViaEmail.php @@ -14,11 +14,10 @@ class SharedSendViaEmail extends Notification /** * Create a new notification instance. * - * @return void + * @param $token */ - public function __construct($emails, $token) + public function __construct($token) { - $this->emails = $emails; $this->token = $token; $this->user = Auth::user(); } @@ -42,16 +41,11 @@ class SharedSendViaEmail extends Notification */ public function toMail($notifiable) { - $notifiable->email = $this->emails; - $shared_link = url(env('APP_URL') . '/shared' . '/' . $this->token ); - - return (new MailMessage) - ->subject(__('vuefilemanager.shared_link_email_subject' , ['user' => $this->user->name]) . config('vuefilemanager.app_name')) + ->subject(__('vuefilemanager.shared_link_email_subject' , ['user' => $this->user->name])) ->greeting(__('vuefilemanager.shared_link_email_greeting')) ->line(__('vuefilemanager.shared_link_email_user', ['user' => $this->user->name, 'email' => $this->user->email])) - ->action(__('vuefilemanager.shared_link_email_link'), $shared_link); - + ->action(__('vuefilemanager.shared_link_email_link'), url('/shared', ['token' => $this->token])); } /** diff --git a/app/Share.php b/app/Share.php index 18cd3912..b0bb5a5f 100644 --- a/app/Share.php +++ b/app/Share.php @@ -50,19 +50,8 @@ class Share extends Model * * @return string */ - public function getLinkAttribute() { - + public function getLinkAttribute() + { return url('/shared', ['token' => $this->attributes['token']]); } - - /** - * Send the sahared link notification. - * - * @param string $token $emails - * @return void - */ - public function sendSharedLinkViaEmail($emails, $token) - { - $this->notify(new SharedSendViaEmail($emails, $token)); - } } diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 000c5954..a1e4f204 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,125 +1,79 @@ { "/js/main.js": "/js/main.js", "/css/app.css": "/css/app.css", - "/chunks/admin.js": "/chunks/admin.js?id=03478fff46fc7903ecc4", - "/chunks/admin-account.js": "/chunks/admin-account.js?id=d687d4a3e71881044040", - "/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=07b0ad73181498d46930", - "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js?id=6cb8c3f7a9aed769ec61", - "/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=ff7684a6d7dbd9518d8b", - "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=b99a5c881b7f15a7e8c5", - "/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=9e50edacd8630aa6fc22", - "/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=2e6c6594ea5506c30ba4", - "/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=d066e2c40f4c0ca68bf1", - "/chunks/app-billings.js": "/chunks/app-billings.js?id=aac5bd51067578358164", - "/chunks/app-email.js": "/chunks/app-email.js?id=9d1631b19f6492b8cae4", - "/chunks/app-index.js": "/chunks/app-index.js?id=e06d6644ee1f846ae157", - "/chunks/app-others.js": "/chunks/app-others.js?id=44efcfb317747ff3b508", - "/chunks/app-payments.js": "/chunks/app-payments.js?id=187ecc16f9f7fbc4ccac", - "/chunks/app-settings.js": "/chunks/app-settings.js?id=b6b0eba13665133c0a19", - "/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=52e8a931f975c4e03a3c", - "/chunks/app-setup.js": "/chunks/app-setup.js?id=65857e375e79bbaca9c8", - "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=e84968ddf7a1a0e0381d", - "/chunks/contact-us.js": "/chunks/contact-us.js?id=cc28795de7e668d5919b", - "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js": "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js?id=a4b8a7017c82de28296b", - "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=108dcc4b5af4c973be56", - "/chunks/dashboard.js": "/chunks/dashboard.js?id=993552e5f134268cfc44", - "/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=cc1b4cbd4aa7f70151f7", - "/chunks/database.js": "/chunks/database.js?id=1fc78cfeb3befbd92423", - "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=f7ff36abf37571173944", - "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=a2eed5073e52410cab54", - "/chunks/files.js": "/chunks/files.js?id=b738eb9054e663cc32b7", - "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js?id=b646ec02fb9d6a497e74", - "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=48524061ae633d993344", - "/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=47ade53389e84dd64310", - "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=d5e39543eeb619cb5513", - "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=be9304e6ba2c61b6cab3", - "/chunks/invoices.js": "/chunks/invoices.js?id=0dddc007dba47ac5785e", - "/chunks/landing-page.js": "/chunks/landing-page.js?id=79ccc65e3b1795b8fb93", - "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=8c8ee101f3445e086040", - "/chunks/page-edit.js": "/chunks/page-edit.js?id=0952cc3fb3aa4797a679", - "/chunks/pages.js": "/chunks/pages.js?id=313adabcad5dafb0f932", - "/chunks/plan.js": "/chunks/plan.js?id=41d7a74e57ac07ce3619", - "/chunks/plan-create.js": "/chunks/plan-create.js?id=75b5346c75513e821097", - "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=4da54a76628aef67ea3e", - "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=e608674e1719be65fe6f", - "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=26fbcc2472b65a745366", - "/chunks/plans.js": "/chunks/plans.js?id=d6d92de642403caa999b", - "/chunks/profile.js": "/chunks/profile.js?id=015a2fcbaf2946f7eb11", - "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=f9e2ea1515204b5c63b6", - "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=9c4a9daae2237285f35b", - "/chunks/settings.js": "/chunks/settings.js?id=2638798e697164161f7c", - "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=4b2742e154eba9a7022a", - "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=ed9e52bea6e3a1f892ad", - "/chunks/settings-password.js": "/chunks/settings-password.js?id=0229d51aca95ffc75902", - "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=2841bc16a6028d8d315c", - "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=0ec77e47b2622ee5e253", - "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=3fde45b386de89651a24", - "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=b671f4f3198119b48449", - "/chunks/shared-files.js": "/chunks/shared-files.js?id=b13068f12911fbf79f74", - "/chunks/shared-page.js": "/chunks/shared-page.js?id=09252cb95089d52ee56a", - "/chunks/sign-in.js": "/chunks/sign-in.js?id=7b6565f5df2060b45bc0", - "/chunks/sign-up.js": "/chunks/sign-up.js?id=39de7293c26fb3cef1a3", - "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=57235ac99a66b55fbf7c", - "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=51a2856dd0631053b42e", - "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=7176521fbf0047110ae1", - "/chunks/upgrade.js": "/chunks/upgrade.js?id=ee2f061bc040513f1d0d", - "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=ce929dd655322c11151c", - "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=a589c99d29f03bc71487", - "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=8bf12e8b93c7eaee4171", - "/chunks/user.js": "/chunks/user.js?id=bdb8a51693952859f5e1", - "/chunks/user-create.js": "/chunks/user-create.js?id=d0056a5db2089bc05508", - "/chunks/user-delete.js": "/chunks/user-delete.js?id=91d17d44835dd32ec36f", - "/chunks/user-detail.js": "/chunks/user-detail.js?id=b5b474dd8fea7b99c766", - "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=04b8c39ed83dc89f739a", - "/chunks/user-password.js": "/chunks/user-password.js?id=ac51d17a4aa7ae50bc88", - "/chunks/user-storage.js": "/chunks/user-storage.js?id=5cfec8a8f8a8aef24ef2", - "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=c001bef2d6d5171cb359", - "/chunks/users.js": "/chunks/users.js?id=6e68cb068f69fba3199c", - "/js/main.4e29a386090b114584ea.hot-update.js": "/js/main.4e29a386090b114584ea.hot-update.js", - "/js/main.2fdefb69f54e4b8c00e6.hot-update.js": "/js/main.2fdefb69f54e4b8c00e6.hot-update.js", - "/js/main.271588bda7c0940a4033.hot-update.js": "/js/main.271588bda7c0940a4033.hot-update.js", - "/js/main.8e3b6cf5a0d361f1b845.hot-update.js": "/js/main.8e3b6cf5a0d361f1b845.hot-update.js", - "/js/main.b8522fe8b5cab05205f4.hot-update.js": "/js/main.b8522fe8b5cab05205f4.hot-update.js", - "/js/main.8e67e210f52f898100c2.hot-update.js": "/js/main.8e67e210f52f898100c2.hot-update.js", - "/js/main.8471decdbdcd43cd398d.hot-update.js": "/js/main.8471decdbdcd43cd398d.hot-update.js", - "/js/main.a358c3d297609a98eac2.hot-update.js": "/js/main.a358c3d297609a98eac2.hot-update.js", - "/js/main.9e31f51ba6b5c6a365e1.hot-update.js": "/js/main.9e31f51ba6b5c6a365e1.hot-update.js", - "/js/main.842b53f7b7ceff459f4c.hot-update.js": "/js/main.842b53f7b7ceff459f4c.hot-update.js", - "/js/main.19c7adbbf0f219e6e254.hot-update.js": "/js/main.19c7adbbf0f219e6e254.hot-update.js", - "/js/main.6dfda574e47791c34f14.hot-update.js": "/js/main.6dfda574e47791c34f14.hot-update.js", - "/js/main.a56035dd2c712e1131bb.hot-update.js": "/js/main.a56035dd2c712e1131bb.hot-update.js", - "/js/main.61571eb2fa8385232639.hot-update.js": "/js/main.61571eb2fa8385232639.hot-update.js", - "/js/main.ceef7c69e12ee366591c.hot-update.js": "/js/main.ceef7c69e12ee366591c.hot-update.js", - "/js/main.a14fa7b4d5eb18432fe9.hot-update.js": "/js/main.a14fa7b4d5eb18432fe9.hot-update.js", - "/js/main.dce1cbc02573395e84a5.hot-update.js": "/js/main.dce1cbc02573395e84a5.hot-update.js", - "/js/main.fefb1a0a3b3c24a23785.hot-update.js": "/js/main.fefb1a0a3b3c24a23785.hot-update.js", - "/js/main.c3dafff76cd8bb437e12.hot-update.js": "/js/main.c3dafff76cd8bb437e12.hot-update.js", - "/js/main.0a6e85fd56ce3c4d96d4.hot-update.js": "/js/main.0a6e85fd56ce3c4d96d4.hot-update.js", - "/js/main.8b7b19418ef42d51c267.hot-update.js": "/js/main.8b7b19418ef42d51c267.hot-update.js", - "/js/main.a3e8447618aad63432f7.hot-update.js": "/js/main.a3e8447618aad63432f7.hot-update.js", - "/js/main.273bb322dc0a3fac4efb.hot-update.js": "/js/main.273bb322dc0a3fac4efb.hot-update.js", - "/js/main.cd83ad023a8887e21b43.hot-update.js": "/js/main.cd83ad023a8887e21b43.hot-update.js", - "/js/main.6119137c47b0b6b7d1ca.hot-update.js": "/js/main.6119137c47b0b6b7d1ca.hot-update.js", - "/js/main.42f5fc1356c297eac494.hot-update.js": "/js/main.42f5fc1356c297eac494.hot-update.js", - "/js/main.ed009554f42acc7059fb.hot-update.js": "/js/main.ed009554f42acc7059fb.hot-update.js", - "/js/main.8af6aed088cce9d2503a.hot-update.js": "/js/main.8af6aed088cce9d2503a.hot-update.js", - "/js/main.b4e7551d1a7f420c8f0e.hot-update.js": "/js/main.b4e7551d1a7f420c8f0e.hot-update.js", - "/js/main.145b9cc816f7a7d1b022.hot-update.js": "/js/main.145b9cc816f7a7d1b022.hot-update.js", - "/js/main.214f22daa6757ca9f68f.hot-update.js": "/js/main.214f22daa6757ca9f68f.hot-update.js", - "/js/main.fe0320b4f10ad980f85e.hot-update.js": "/js/main.fe0320b4f10ad980f85e.hot-update.js", - "/js/main.a2572a909190641e2778.hot-update.js": "/js/main.a2572a909190641e2778.hot-update.js", - "/js/main.05f2d326ed98de34d1f5.hot-update.js": "/js/main.05f2d326ed98de34d1f5.hot-update.js", - "/js/main.fba9ee79f2a35d48634d.hot-update.js": "/js/main.fba9ee79f2a35d48634d.hot-update.js", - "/js/main.233edbc80eb26071c8bd.hot-update.js": "/js/main.233edbc80eb26071c8bd.hot-update.js", - "/js/main.6a8993c29429334b8bed.hot-update.js": "/js/main.6a8993c29429334b8bed.hot-update.js", - "/js/main.c8936cee582db6351854.hot-update.js": "/js/main.c8936cee582db6351854.hot-update.js", - "/js/main.7327a6d5abc5e53338b6.hot-update.js": "/js/main.7327a6d5abc5e53338b6.hot-update.js", - "/js/main.94786b794f722913db2f.hot-update.js": "/js/main.94786b794f722913db2f.hot-update.js", - "/js/main.5b97e99de82c004b7040.hot-update.js": "/js/main.5b97e99de82c004b7040.hot-update.js", - "/js/main.0994c3cbbe38c708be78.hot-update.js": "/js/main.0994c3cbbe38c708be78.hot-update.js", - "/js/main.1743a74cb9afb57f23a8.hot-update.js": "/js/main.1743a74cb9afb57f23a8.hot-update.js", - "/js/main.4d61823678463591028f.hot-update.js": "/js/main.4d61823678463591028f.hot-update.js", - "/chunks/files.4d61823678463591028f.hot-update.js": "/chunks/files.4d61823678463591028f.hot-update.js", - "/chunks/files~chunks/shared-files~chunks/shared-page.4d61823678463591028f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.4d61823678463591028f.hot-update.js", - "/chunks/sign-in.4d61823678463591028f.hot-update.js": "/chunks/sign-in.4d61823678463591028f.hot-update.js" + "/chunks/admin.js": "/chunks/admin.js?id=06067d0f4cff64abd1e4", + "/chunks/admin-account.js": "/chunks/admin-account.js?id=fde37ee0820a1d2dc1f9", + "/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=1ad1b7b56512338223eb", + "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js?id=6c02fe91a2e167b63a98", + "/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=50155ecdafab2d18dda1", + "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=ba3c9a7acbaacc20af9e", + "/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=fd3c7242b5c765b469e4", + "/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=60421d0349712350e866", + "/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=a8bd98f9f181d9ee68fd", + "/chunks/app-billings.js": "/chunks/app-billings.js?id=97f5c44884d8c2128c56", + "/chunks/app-email.js": "/chunks/app-email.js?id=59c27449f65145dc208e", + "/chunks/app-index.js": "/chunks/app-index.js?id=4c5894cf174848d787bf", + "/chunks/app-others.js": "/chunks/app-others.js?id=1655c151466b066ee1c5", + "/chunks/app-payments.js": "/chunks/app-payments.js?id=cb8ea484a0e605ace175", + "/chunks/app-settings.js": "/chunks/app-settings.js?id=e8ee87b4fb155d3edb6b", + "/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=99eb5ed6af46738c97e0", + "/chunks/app-setup.js": "/chunks/app-setup.js?id=777ebaef548d5b4c61be", + "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=0eec974c6f0ee4e6ecab", + "/chunks/contact-us.js": "/chunks/contact-us.js?id=b243adc35233292f8ad6", + "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js": "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js?id=96ac1ede73f3fc9afa37", + "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=00b75239db203720652c", + "/chunks/dashboard.js": "/chunks/dashboard.js?id=887b8d232e3944beebdd", + "/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=d7795f20187163939276", + "/chunks/database.js": "/chunks/database.js?id=212e2d81f6f5c54c2dd2", + "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=1d8ee4bfbcde69c97021", + "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=374911110bca4e1b3f91", + "/chunks/files.js": "/chunks/files.js?id=d47d2964ef535ad5754c", + "/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=e285e842f58178d681c4", + "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=01cf689e830ec7689e39", + "/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=539a5b88c5f32511449e", + "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=f430110273d76b28906f", + "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=94c75dac20c4ccf7bde0", + "/chunks/invoices.js": "/chunks/invoices.js?id=02089f329654fbbc894d", + "/chunks/landing-page.js": "/chunks/landing-page.js?id=06ced087cb7064a13979", + "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=6666b81edc5ff6f60e82", + "/chunks/page-edit.js": "/chunks/page-edit.js?id=7e6363b9a35e62dd560c", + "/chunks/pages.js": "/chunks/pages.js?id=ca712437ecc7e5aeee5c", + "/chunks/plan.js": "/chunks/plan.js?id=cc041fb9c2cb9ad8f0ff", + "/chunks/plan-create.js": "/chunks/plan-create.js?id=24bb1297c55fe70c1dd0", + "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=e06dc32848cf3bfb9e6b", + "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=242cb0706c986d08c484", + "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=36a86cf6f3d8a2868504", + "/chunks/plans.js": "/chunks/plans.js?id=282268d939f8b52f6acd", + "/chunks/profile.js": "/chunks/profile.js?id=060bceb3f703969fb135", + "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=a44394b1fa09f996a9fd", + "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=8c1d40ff91c04fcefcfc", + "/chunks/settings.js": "/chunks/settings.js?id=463a3b35eb4020fdcc77", + "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=4d1a070566ee2069e1bd", + "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=603b7f706f34d9c89a62", + "/chunks/settings-password.js": "/chunks/settings-password.js?id=0df4bd46f1d3d90e360a", + "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=37955b9e8262af7fe525", + "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=013b6f15f907caaecd1e", + "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=5d702de3662f601fccca", + "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=99b4f321902fe6b0eb23", + "/chunks/shared-files.js": "/chunks/shared-files.js?id=1860b9031f41ed46d0e0", + "/chunks/shared-page.js": "/chunks/shared-page.js?id=da4c97784a340b3080c9", + "/chunks/sign-in.js": "/chunks/sign-in.js?id=6b961e6324b09384dfd0", + "/chunks/sign-up.js": "/chunks/sign-up.js?id=a46f57a34f8f862a24a8", + "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=080bade1ed512f512591", + "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=5b2f00a9e19520adc31e", + "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=1ac6b87f8797b491ef77", + "/chunks/upgrade.js": "/chunks/upgrade.js?id=ac1ff92a934e448ca6b4", + "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=198bfc33644f85bfc075", + "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=7e805915ede7c330c6d1", + "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=2811533956c0c185714d", + "/chunks/user.js": "/chunks/user.js?id=a400499012c6786a3652", + "/chunks/user-create.js": "/chunks/user-create.js?id=d5066d3ff9d7625ba7f1", + "/chunks/user-delete.js": "/chunks/user-delete.js?id=5d392a3df7b05cf93930", + "/chunks/user-detail.js": "/chunks/user-detail.js?id=fbfe45c7762f7ae123e4", + "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=97c78350b65914e4b16d", + "/chunks/user-password.js": "/chunks/user-password.js?id=ad772e769a8562c42c17", + "/chunks/user-storage.js": "/chunks/user-storage.js?id=2c5f4cdd17574255ea05", + "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=d6683735de17fd8c55c8", + "/chunks/users.js": "/chunks/users.js?id=f2359ae7c0c166001c33", + "/js/main.35244e7c7e5023240865.hot-update.js": "/js/main.35244e7c7e5023240865.hot-update.js" } diff --git a/resources/js/components/Others/Forms/MultiEmailInput.vue b/resources/js/components/Others/Forms/MultiEmailInput.vue index b6ff31d9..a0bdc647 100644 --- a/resources/js/components/Others/Forms/MultiEmailInput.vue +++ b/resources/js/components/Others/Forms/MultiEmailInput.vue @@ -122,6 +122,10 @@ export default { .email-list { display: flex; flex-wrap: wrap; + + .email-input { + font-size: 14px; + } } .email-tag { diff --git a/resources/js/components/Others/Popup/PopupWrapper.vue b/resources/js/components/Others/Popup/PopupWrapper.vue index 999a8cb2..7e5945e0 100644 --- a/resources/js/components/Others/Popup/PopupWrapper.vue +++ b/resources/js/components/Others/Popup/PopupWrapper.vue @@ -58,7 +58,7 @@ left: 0; right: 0; bottom: 0; - z-index: 20; + z-index: 19; overflow-y: auto; display: grid; padding: 40px; diff --git a/resources/js/components/Others/ShareCreate.vue b/resources/js/components/Others/ShareCreate.vue index 9fae18d8..61c25496 100644 --- a/resources/js/components/Others/ShareCreate.vue +++ b/resources/js/components/Others/ShareCreate.vue @@ -1,7 +1,7 @@ diff --git a/resources/js/components/Others/ShareEdit.vue b/resources/js/components/Others/ShareEdit.vue index 9194a214..8d154677 100644 --- a/resources/js/components/Others/ShareEdit.vue +++ b/resources/js/components/Others/ShareEdit.vue @@ -207,7 +207,6 @@ emails: this.emails }) .catch(() => { - this.$isSomethingWrong() }) .finally(() => { @@ -297,12 +296,9 @@ events.$emit('popup:close') }) .catch(() => { - this.$isSomethingWrong() }) .finally(() => { - - // End loading this.isLoading = false }) }, diff --git a/resources/js/components/Others/Vignette.vue b/resources/js/components/Others/Vignette.vue index 7b32d207..5d77c87a 100644 --- a/resources/js/components/Others/Vignette.vue +++ b/resources/js/components/Others/Vignette.vue @@ -56,7 +56,7 @@ right: 0; left: 0; bottom: 0; - z-index: 19; + z-index: 18; background: $light_mode_vignette; } diff --git a/resources/lang/cn/vuefilemanager.php b/resources/lang/cn/vuefilemanager.php index dfaf00fb..627117ba 100644 --- a/resources/lang/cn/vuefilemanager.php +++ b/resources/lang/cn/vuefilemanager.php @@ -8,10 +8,10 @@ return [ 'home' => '首页', //Shared link email message - 'shared_link_email_subject' => ':user sned you shared files.', + 'shared_link_email_subject' => '🙋 :user share some files with you. Look at it!', 'shared_link_email_greeting' => 'Hello!', 'shared_link_email_user' => ':user (:email) send you a link to shared files.', - 'shared_link_email_link' => 'Your files', + 'shared_link_email_link' => 'Open your files', // Reset password email 'reset_password_greeting' => 'Hello!', diff --git a/resources/lang/en/vuefilemanager.php b/resources/lang/en/vuefilemanager.php index da3347dd..c0717c38 100644 --- a/resources/lang/en/vuefilemanager.php +++ b/resources/lang/en/vuefilemanager.php @@ -8,10 +8,10 @@ return [ 'home' => 'Home', //Shared link email message - 'shared_link_email_subject' => ':user sned you shared files.', + 'shared_link_email_subject' => '🙋 :user share some files with you. Look at it!', 'shared_link_email_greeting' => 'Hello!', 'shared_link_email_user' => ':user (:email) send you a link to shared files.', - 'shared_link_email_link' => 'Your files', + 'shared_link_email_link' => 'Open your files', // Reset password email 'reset_password_greeting' => 'Hello!', diff --git a/resources/lang/sk/vuefilemanager.php b/resources/lang/sk/vuefilemanager.php index c75862cf..0d88dc5f 100644 --- a/resources/lang/sk/vuefilemanager.php +++ b/resources/lang/sk/vuefilemanager.php @@ -8,9 +8,9 @@ return [ 'home' => 'Domov', //Shared link email message - 'shared_link_email_subject' => ':user vám posiela zdielany odkaz.', + 'shared_link_email_subject' => '🙋 :user vám posiela zdieľané súbory.', 'shared_link_email_greeting' => 'Ahoj!', - 'shared_link_email_user' => ':user (:email) vám posiela odkaz pre zdielane súbory.', + 'shared_link_email_user' => ':user (:email) vám posiela odkaz pre zdieľané súbory.', 'shared_link_email_link' => 'Vaše súbory', // Reset password email