From 6f300ba1d555adc2350ebe0e9d45eddb573f9c77 Mon Sep 17 00:00:00 2001 From: Peter Papp Date: Tue, 25 Aug 2020 15:25:18 +0200 Subject: [PATCH 1/4] Link expiration frontend --- .../Sharing/FileSharingController.php | 3 +- public/mix-manifest.json | 18 ++++- .../Others/Forms/SelectBoxInput.vue | 72 +++++++++++++++++++ .../js/components/Others/ShareCreate.vue | 39 ++++++++++ resources/js/i18n/lang/cn.json | 3 + resources/js/i18n/lang/en.json | 3 + resources/js/i18n/lang/sk.json | 3 + 7 files changed, 138 insertions(+), 3 deletions(-) create mode 100644 resources/js/components/Others/Forms/SelectBoxInput.vue diff --git a/app/Http/Controllers/Sharing/FileSharingController.php b/app/Http/Controllers/Sharing/FileSharingController.php index c624334e..1534c038 100644 --- a/app/Http/Controllers/Sharing/FileSharingController.php +++ b/app/Http/Controllers/Sharing/FileSharingController.php @@ -32,7 +32,8 @@ class FileSharingController extends Controller public function index($token) { // Get shared token - $shared = get_shared($token); + $shared = Share::where(\DB::raw('BINARY `token`'), $token) + ->first(); if (! $shared) { return view("index"); diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 6f123fd7..09ef7213 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,25 +1,35 @@ { - "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js", "/js/main.js": "/js/main.js", "/css/app.css": "/css/app.css", "/chunks/admin.js": "/chunks/admin.js", "/chunks/admin-account.js": "/chunks/admin-account.js", + "/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", + "/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", + "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/trash.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/trash.js", "/chunks/app-appearance.js": "/chunks/app-appearance.js", + "/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", + "/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", + "/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", "/chunks/app-billings.js": "/chunks/app-billings.js", "/chunks/app-email.js": "/chunks/app-email.js", "/chunks/app-index.js": "/chunks/app-index.js", "/chunks/app-others.js": "/chunks/app-others.js", "/chunks/app-payments.js": "/chunks/app-payments.js", "/chunks/app-settings.js": "/chunks/app-settings.js", + "/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", "/chunks/app-setup.js": "/chunks/app-setup.js", "/chunks/billings-detail.js": "/chunks/billings-detail.js", "/chunks/contact-us.js": "/chunks/contact-us.js", + "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js": "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js", "/chunks/create-new-password.js": "/chunks/create-new-password.js", "/chunks/dashboard.js": "/chunks/dashboard.js", + "/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", "/chunks/database.js": "/chunks/database.js", "/chunks/dynamic-page.js": "/chunks/dynamic-page.js", "/chunks/environment-setup.js": "/chunks/environment-setup.js", "/chunks/files.js": "/chunks/files.js", + "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js", + "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js", "/chunks/forgotten-password.js": "/chunks/forgotten-password.js", "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js", "/chunks/invoices.js": "/chunks/invoices.js", @@ -34,6 +44,7 @@ "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js", "/chunks/plans.js": "/chunks/plans.js", "/chunks/profile.js": "/chunks/profile.js", + "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js", "/chunks/purchase-code.js": "/chunks/purchase-code.js", "/chunks/settings.js": "/chunks/settings.js", "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js", @@ -53,6 +64,7 @@ "/chunks/trash.js": "/chunks/trash.js", "/chunks/upgrade.js": "/chunks/upgrade.js", "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js", + "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js", "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js", "/chunks/user.js": "/chunks/user.js", "/chunks/user-create.js": "/chunks/user-create.js", @@ -62,5 +74,7 @@ "/chunks/user-password.js": "/chunks/user-password.js", "/chunks/user-storage.js": "/chunks/user-storage.js", "/chunks/user-subscription.js": "/chunks/user-subscription.js", - "/chunks/users.js": "/chunks/users.js" + "/chunks/users.js": "/chunks/users.js", + "/js/main.f24b569f92d899b00643.hot-update.js": "/js/main.f24b569f92d899b00643.hot-update.js", + "/js/main.ea6fa811b950bdc666de.hot-update.js": "/js/main.ea6fa811b950bdc666de.hot-update.js" } diff --git a/resources/js/components/Others/Forms/SelectBoxInput.vue b/resources/js/components/Others/Forms/SelectBoxInput.vue new file mode 100644 index 00000000..84d21dcd --- /dev/null +++ b/resources/js/components/Others/Forms/SelectBoxInput.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/resources/js/components/Others/ShareCreate.vue b/resources/js/components/Others/ShareCreate.vue index 84590c69..94184ea1 100644 --- a/resources/js/components/Others/ShareCreate.vue +++ b/resources/js/components/Others/ShareCreate.vue @@ -32,6 +32,12 @@ {{ errors[0] }} + + +
+ + +
@@ -66,6 +72,7 @@ @@ -23,18 +30,17 @@ .label { @include font-size(12); - color: $theme; font-weight: 600; - text-decoration: underline; } .icon { @include font-size(10); + vertical-align: middle; display: inline-block; margin-right: 2px; - path { - fill: $theme; + path, circle, line { + stroke: $theme; } } } diff --git a/resources/js/components/Others/Forms/SelectBoxInput.vue b/resources/js/components/Others/Forms/SelectBoxInput.vue index 84d21dcd..4ae7f034 100644 --- a/resources/js/components/Others/Forms/SelectBoxInput.vue +++ b/resources/js/components/Others/Forms/SelectBoxInput.vue @@ -1,7 +1,7 @@