From 6f2278b90898c60af5707d3064b2955d8f235260 Mon Sep 17 00:00:00 2001 From: Milos Holba Date: Sun, 7 Feb 2021 12:29:08 +0100 Subject: [PATCH 1/2] fix function shared_send_via_email in ShareController --- .../FileFunctions/ShareController.php | 9 +- public/mix-manifest.json | 144 ++++++++++-------- 2 files changed, 84 insertions(+), 69 deletions(-) diff --git a/app/Http/Controllers/FileFunctions/ShareController.php b/app/Http/Controllers/FileFunctions/ShareController.php index 02864493..05eede61 100644 --- a/app/Http/Controllers/FileFunctions/ShareController.php +++ b/app/Http/Controllers/FileFunctions/ShareController.php @@ -147,18 +147,15 @@ class ShareController extends Controller // Return error if ($validator->fails()) abort(400, 'Bad emails input'); - // Get shared by token - $share = Share::where('token', $token) - ->where('user_id', Auth::id()) - ->first(); - // Demo preview if (env('APP_DEMO')) { return response('Done!', 204); } // Send share link via email - $share->sendSharedLinkViaEmail($request->emails, $token); + foreach ($request->emails as $email) { + Notification::route('mail', $email)->notify(new SharedSendViaEmail($token)); + } return response('Done!', 204); } diff --git a/public/mix-manifest.json b/public/mix-manifest.json index ee49b11f..6658cbaf 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,65 +1,83 @@ { - "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=c8919a606e744f2fbc37", - "/js/main.js": "/js/main.js?id=60a19a5c7e57ef7bea94", - "/css/app.css": "/css/app.css?id=dfd52fc997b919cd3686", - "/chunks/admin.js": "/chunks/admin.js?id=7672646537b5813becf0", - "/chunks/admin-account.js": "/chunks/admin-account.js?id=3f5a34aa8341af8d2b4c", - "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=9ec9a42482cb302a05f6", - "/chunks/app-billings.js": "/chunks/app-billings.js?id=92903bd1d316b3db1dfa", - "/chunks/app-email.js": "/chunks/app-email.js?id=9d646578982ba61813b6", - "/chunks/app-index.js": "/chunks/app-index.js?id=043af032ce49b2a79a78", - "/chunks/app-others.js": "/chunks/app-others.js?id=b19a701cdfa06e4817ff", - "/chunks/app-payments.js": "/chunks/app-payments.js?id=11c86d822269f1a1577e", - "/chunks/app-settings.js": "/chunks/app-settings.js?id=6784314933372fb1adf0", - "/chunks/app-setup.js": "/chunks/app-setup.js?id=d304bcf7d4157e81f3e2", - "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=b73a5b6f7d2a448cc5ab", - "/chunks/contact-us.js": "/chunks/contact-us.js?id=81906d205ba0107c5105", - "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=004908727045abd0852e", - "/chunks/dashboard.js": "/chunks/dashboard.js?id=08e4f7d923ce9e49dcc3", - "/chunks/database.js": "/chunks/database.js?id=b8d8269f77c52f78c784", - "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=2e3af103d13536c50757", - "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=106f81cefe76c62d476e", - "/chunks/files.js": "/chunks/files.js?id=b213d4fe15c2a9933f32", - "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=95ce5e5685dc9315f515", - "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=6db12008aa646ad5fb6f", - "/chunks/invoices.js": "/chunks/invoices.js?id=83389adf0760820af6f5", - "/chunks/landing-page.js": "/chunks/landing-page.js?id=70b32067c32a554eb600", - "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=848666d6c49c613f7f99", - "/chunks/page-edit.js": "/chunks/page-edit.js?id=bd41ae13951c2a5025c3", - "/chunks/pages.js": "/chunks/pages.js?id=df7245abef9e3b77a218", - "/chunks/plan.js": "/chunks/plan.js?id=cfd7b4ee7e21639a837d", - "/chunks/plan-create.js": "/chunks/plan-create.js?id=9bb62af36193ee9648d3", - "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=7b7601f044e0ef47720b", - "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=8d3e75ff9adb22a25d57", - "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=3b4a29497fc878f503db", - "/chunks/plans.js": "/chunks/plans.js?id=feb924949bffcdf3d9fb", - "/chunks/profile.js": "/chunks/profile.js?id=f990697f8d4ff45df434", - "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=5d7406ecd84c676db8fb", - "/chunks/settings.js": "/chunks/settings.js?id=d16d9e2cda6aa3a3f6dc", - "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=b05e24dd8be60f62ee27", - "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=72d317b39264987e6ed0", - "/chunks/settings-password.js": "/chunks/settings-password.js?id=014597c63c94d3ac9f60", - "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=2a0ea9cf661deba6fc13", - "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=b3f25de02dd4ef072df0", - "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=aa3d963f578d7bc5ff88", - "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=47090233afc7b0cdf855", - "/chunks/shared-files.js": "/chunks/shared-files.js?id=ba10fd3f52a7b62d3092", - "/chunks/shared-page.js": "/chunks/shared-page.js?id=491c2440f10a7e7cbe04", - "/chunks/sign-in.js": "/chunks/sign-in.js?id=c52ce81c3dad56d7a7d8", - "/chunks/sign-up.js": "/chunks/sign-up.js?id=2f12850d320b2413cf54", - "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=6622381f1d96e8319999", - "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=f1b093a3bcfebd5bc8a5", - "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=e0e2f821aac16b32da34", - "/chunks/upgrade.js": "/chunks/upgrade.js?id=0c8d40bed72e86359529", - "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=a8db2246f9326e5c5957", - "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=f050f10627424b730dc2", - "/chunks/user.js": "/chunks/user.js?id=6f2ab796211a3ac8670f", - "/chunks/user-create.js": "/chunks/user-create.js?id=0d630acda4552c315417", - "/chunks/user-delete.js": "/chunks/user-delete.js?id=db041eae3aef3e45197a", - "/chunks/user-detail.js": "/chunks/user-detail.js?id=8cf2fe554e8d67ac8677", - "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=a0613909cb0c21817804", - "/chunks/user-password.js": "/chunks/user-password.js?id=653bba3eb8d117c3a043", - "/chunks/user-storage.js": "/chunks/user-storage.js?id=630b0ff649e16d3627af", - "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=0b4226ba77f10b83de4a", - "/chunks/users.js": "/chunks/users.js?id=04ca09662595fae56488" + "/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=029eb4097331e6c3d501", + "/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=011cf18ecefd0bc759c8", + "/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=0038b582194491015a50", + "/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.929d4043832e154e4107.hot-update.js": "/js/main.929d4043832e154e4107.hot-update.js", + "/js/main.a7dbc5836b9344e3e26d.hot-update.js": "/js/main.a7dbc5836b9344e3e26d.hot-update.js", + "/chunks/app-index.a7dbc5836b9344e3e26d.hot-update.js": "/chunks/app-index.a7dbc5836b9344e3e26d.hot-update.js", + "/chunks/files~chunks/shared-files~chunks/shared-page.a7dbc5836b9344e3e26d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.a7dbc5836b9344e3e26d.hot-update.js", + "/chunks/landing-page.a7dbc5836b9344e3e26d.hot-update.js": "/chunks/landing-page.a7dbc5836b9344e3e26d.hot-update.js" } From 18b97866f24239cea49816180f7daba0932f0dca Mon Sep 17 00:00:00 2001 From: Milos Holba Date: Sun, 7 Feb 2021 13:26:42 +0100 Subject: [PATCH 2/2] MultiEmailInput first email dont need to be separated by comma or space, RenameItem comment ActionButton for more options --- public/mix-manifest.json | 24 ++++++++++++- .../Others/Forms/MultiEmailInput.vue | 36 +++++++++++-------- resources/js/components/Others/RenameItem.vue | 2 +- 3 files changed, 46 insertions(+), 16 deletions(-) diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 6658cbaf..884f008a 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -79,5 +79,27 @@ "/js/main.a7dbc5836b9344e3e26d.hot-update.js": "/js/main.a7dbc5836b9344e3e26d.hot-update.js", "/chunks/app-index.a7dbc5836b9344e3e26d.hot-update.js": "/chunks/app-index.a7dbc5836b9344e3e26d.hot-update.js", "/chunks/files~chunks/shared-files~chunks/shared-page.a7dbc5836b9344e3e26d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.a7dbc5836b9344e3e26d.hot-update.js", - "/chunks/landing-page.a7dbc5836b9344e3e26d.hot-update.js": "/chunks/landing-page.a7dbc5836b9344e3e26d.hot-update.js" + "/chunks/landing-page.a7dbc5836b9344e3e26d.hot-update.js": "/chunks/landing-page.a7dbc5836b9344e3e26d.hot-update.js", + "/js/main.58e20853c0060fabb694.hot-update.js": "/js/main.58e20853c0060fabb694.hot-update.js", + "/js/main.d36b7327b7ceaf48dc23.hot-update.js": "/js/main.d36b7327b7ceaf48dc23.hot-update.js", + "/js/main.9056b6a318b4426467c6.hot-update.js": "/js/main.9056b6a318b4426467c6.hot-update.js", + "/js/main.a5fba33e4585e691dfb5.hot-update.js": "/js/main.a5fba33e4585e691dfb5.hot-update.js", + "/js/main.3f82c127a8cdfffb8c3b.hot-update.js": "/js/main.3f82c127a8cdfffb8c3b.hot-update.js", + "/js/main.99a11c7584bb53f9658d.hot-update.js": "/js/main.99a11c7584bb53f9658d.hot-update.js", + "/js/main.e54fbdcbcaa3e8b1973d.hot-update.js": "/js/main.e54fbdcbcaa3e8b1973d.hot-update.js", + "/js/main.74fd773f486eb60eed39.hot-update.js": "/js/main.74fd773f486eb60eed39.hot-update.js", + "/js/main.f3711fed88e414972ddd.hot-update.js": "/js/main.f3711fed88e414972ddd.hot-update.js", + "/js/main.9fb564020f9aa4ea00bc.hot-update.js": "/js/main.9fb564020f9aa4ea00bc.hot-update.js", + "/js/main.6efe9661a328f278feb0.hot-update.js": "/js/main.6efe9661a328f278feb0.hot-update.js", + "/js/main.cc811fdbaeca808728a1.hot-update.js": "/js/main.cc811fdbaeca808728a1.hot-update.js", + "/js/main.7e7e628c5fedbb621b23.hot-update.js": "/js/main.7e7e628c5fedbb621b23.hot-update.js", + "/js/main.2021da8323a75241a20d.hot-update.js": "/js/main.2021da8323a75241a20d.hot-update.js", + "/js/main.07ef3eb8bf1bebbe0567.hot-update.js": "/js/main.07ef3eb8bf1bebbe0567.hot-update.js", + "/js/main.ff29433b11932e0747e8.hot-update.js": "/js/main.ff29433b11932e0747e8.hot-update.js", + "/js/main.65b0d39be7a6dc0bebb7.hot-update.js": "/js/main.65b0d39be7a6dc0bebb7.hot-update.js", + "/js/main.1860fe9ef49b805cfc53.hot-update.js": "/js/main.1860fe9ef49b805cfc53.hot-update.js", + "/js/main.faedd50fd36ecf8b5ae2.hot-update.js": "/js/main.faedd50fd36ecf8b5ae2.hot-update.js", + "/js/main.7228d3845cd3e5c790c8.hot-update.js": "/js/main.7228d3845cd3e5c790c8.hot-update.js", + "/js/main.691fbeffd45e163fe5e1.hot-update.js": "/js/main.691fbeffd45e163fe5e1.hot-update.js", + "/js/main.e804714e7fba8134c127.hot-update.js": "/js/main.e804714e7fba8134c127.hot-update.js" } diff --git a/resources/js/components/Others/Forms/MultiEmailInput.vue b/resources/js/components/Others/Forms/MultiEmailInput.vue index a0bdc647..ebbd5612 100644 --- a/resources/js/components/Others/Forms/MultiEmailInput.vue +++ b/resources/js/components/Others/Forms/MultiEmailInput.vue @@ -24,10 +24,10 @@ export default { props: ['isError', 'label'], computed: { getCharactersLength() { - return this.emails.join('').length + return this.emails.join( '' ).length }, placeHolder() { - return !this.emails.length ? this.$t('shared_form.email_placeholder') : '' + return !this.emails.length ? this.$t( 'shared_form.email_placeholder' ) : '' }, inputSize() { return this.email && this.email.length > 14 ? this.email.length : 14 @@ -40,36 +40,44 @@ export default { } }, methods: { - removeEmail(email) { - this.emails = this.emails.filter(item => item !== email) + removeEmail( email ) { + this.emails = this.emails.filter( item => item !== email ) + + // After romove email send new emails list to parent + events.$emit( 'emailsInputValues', this.emails ) }, - removeLastEmail(event) { + removeLastEmail( event ) { // If is input empty and presse backspace remove last email from array - if (event.code === 'Backspace' && this.email === '') + if ( event.code === 'Backspace' && this.email === '' ) this.emails.pop() }, handleEmail() { - if (this.email.length > 0) { + if ( this.email.length > 0 ) { // Get index of @ and last dot - let lastDot = this.email.lastIndexOf('.') - let at = this.email.indexOf('@') + let lastDot = this.email.lastIndexOf( '.' ) + let at = this.email.indexOf( '@' ) // Check if is after @ some dot, if email have @ anf if dont have more like one - if (lastDot < at || at === -1 || this.email.match(/@/g).length > 1) return + if ( lastDot < at || at === -1 || this.email.match(/@/g).length > 1 ) return + + // First email dont need to be separated by comma or space to be sended + if( this.emails.length === 0 ) + events.$emit('emailsInputValues', [this.email]) + // After come or backspace push the single email to array or emails - if (this.email.includes(',') || this.email.includes(' ')) { + if ( this.email.includes(',') || this.email.includes(' ') ) { - let email = this.email.replace(/[","," "]/, '') + let email = this.email.replace( /[","," "]/, '' ) this.email = '' // Push single email to aray of emails - this.emails.push(email) + this.emails.push( email ) - events.$emit('emailsInputValues', this.emails) + events.$emit( 'emailsInputValues', this.emails ) } } } diff --git a/resources/js/components/Others/RenameItem.vue b/resources/js/components/Others/RenameItem.vue index ab4c0493..6694f212 100644 --- a/resources/js/components/Others/RenameItem.vue +++ b/resources/js/components/Others/RenameItem.vue @@ -26,7 +26,7 @@ - {{ moreOptionsTitle }} +