Shared link expiration backend

Redirect from sign in page when user is logged
Updated README.md

README.md

@@ -23,7 +23,8 @@ But, it can't be done without you, development is more and more complicated and
     - [Recover Failed Installation](#installation-failed)
     - [Update Guide](#update-guide)
         - [Instructions](#instructions)
-        - [Update from 1.7.x to 1.7.7 & 1.7.8](#update-from-17x-to-177-&178)
+        - [Update from 1.7.8 to 1.7.9](#update-from-178-to-179)
+        - [Update from 1.7.x to 1.7.8](#update-from-17x-to-178)
         - [Update from 1.6.x to 1.7](#update-from-16x-to-17)
 - [Payments](#payments)
     - [Get your active plans](#get-your-active-plans)
@@ -104,6 +105,13 @@ At first step you have to verify your purchase code. **Subscription service with
 
 That was the hardest part of installation proces. Please follow instructions in every step of Setup Wizard to successfully install VueFileManager.
 
+#### 7. Set up Cron
+
+Add the following Cron entry to your server
+```
+* * * * * cd /path-to-your-project && php artisan schedule:run >> /dev/null 2>&1
+```
+
 ## PHP Configuration
 There are several PHP settings good to know to setup before you try upload any file. Please set these values in your php.ini, we provide minimal setup for you. When you set `-1` then you set infinity limits.
 
@@ -203,7 +211,17 @@ Follow this steps:
 - Upload and replace all the files on your server with what's inside the app folder.
 - Restore your `.env` config file on your server.
 
-## Update from 1.7.x to 1.7.7 & 1.7.8
+## Update from 1.7.8 to 1.7.9
+After uploaded new files, log in as admin to the app and go to `your-domain.com/upgrade-database`. This will upgrade your database on the background.
+
+After that, **update path to your project in command below** and add the following **Cron** entry to your server:
+```
+* * * * * cd /path-to-your-project && php artisan schedule:run >> /dev/null 2>&1
+```
+
+That's all.
+
+## Update from 1.7.x to 1.7.8
 If you are upgrading app to 1.7.7 from 1.7.x, make sure you have copied new /vendor folder or if you are using terminal or git, run `composer update` command to update your vendors.
 
 ## Update from 1.6.x to 1.7

app/Console/Kernel.php

@@ -6,6 +6,8 @@ use App\Console\Commands\Deploy;
 use App\Console\Commands\SetupDevEnvironment;
 use App\Console\Commands\SetupProductionEnvironment;
 use App\Console\Commands\UpgradeApp;
+use App\Share;
+use Carbon\Carbon;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -23,13 +25,14 @@ class Kernel extends ConsoleKernel
     /**
      * Define the application's command schedule.
      *
-     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
+     * @param \Illuminate\Console\Scheduling\Schedule $schedule
      * @return void
      */
     protected function schedule(Schedule $schedule)
     {
-        // $schedule->command('inspire')
+        $schedule->call(function () {
-        //          ->hourly();
+            $this->delete_expired_shared_links();
+        })->hourly();
     }
 
     /**
@@ -39,8 +42,28 @@ class Kernel extends ConsoleKernel
      */
     protected function commands()
     {
-        $this->load(__DIR__.'/Commands');
+        $this->load(__DIR__ . '/Commands');
 
         require base_path('routes/console.php');
     }
+
+    /**
+     * Get and delete expired shared links
+     */
+    protected function delete_expired_shared_links(): void
+    {
+        // Get all shares with expiration time
+        $shares = Share::whereNotNull('expire_in')->get();
+
+        $shares->each(function ($share) {
+
+            // Get dates
+            $created_at = Carbon::parse($share->created_at);
+
+            // If time was over, then delete share record
+            if ($created_at->diffInHours(Carbon::now()) >= $share->expire_in) {
+                $share->delete();
+            }
+        });
+    }
 }

app/Http/Controllers/FileBrowser/BrowseController.php

@@ -69,12 +69,12 @@ class BrowseController extends Controller
             ->pluck('item_id');
 
         // Get folders and files
-        $folders = FileManagerFolder::with(['parent', 'shared:token,id,item_id,permission,protected'])
+        $folders = FileManagerFolder::with(['parent', 'shared:token,id,item_id,permission,protected,expire_in'])
             ->where('user_id', $user_id)
             ->whereIn('unique_id', $folder_ids)
             ->get();
 
-        $files = FileManagerFile::with(['parent', 'shared:token,id,item_id,permission,protected'])
+        $files = FileManagerFile::with(['parent', 'shared:token,id,item_id,permission,protected,expire_in'])
             ->where('user_id', $user_id)
             ->whereIn('unique_id', $file_ids)
             ->get();
@@ -145,13 +145,13 @@ class BrowseController extends Controller
         }
 
         // Get folders and files
-        $folders = FileManagerFolder::with(['parent', 'shared:token,id,item_id,permission,protected'])
+        $folders = FileManagerFolder::with(['parent', 'shared:token,id,item_id,permission,protected,expire_in'])
             ->where('user_id', $user_id)
             ->where('parent_id', $unique_id)
             ->orderBy('created_at', 'DESC')
             ->get();
 
-        $files = FileManagerFile::with(['parent', 'shared:token,id,item_id,permission,protected'])
+        $files = FileManagerFile::with(['parent', 'shared:token,id,item_id,permission,protected,expire_in'])
             ->where('user_id', $user_id)
             ->where('folder_id', $unique_id)
             ->orderBy('created_at', 'DESC')
@@ -217,7 +217,7 @@ class BrowseController extends Controller
         // Get user id
         $user_id = Auth::id();
 
-        return FileManagerFile::with(['shared:token,id,item_id,permission,protected'])
+        return FileManagerFile::with(['shared:token,id,item_id,permission,protected,expire_in'])
             ->where('user_id', $user_id)
             ->where('unique_id', $unique_id)
             ->firstOrFail();

app/Http/Controllers/FileFunctions/ShareController.php

@@ -51,6 +51,7 @@ class ShareController extends Controller
             'protected'  => $request->isPassword,
             'permission' => $request->permission,
             'item_id'    => $request->unique_id,
+            'expire_in'  => $request->expiration,
             'user_id'    => Auth::id(),
             'token'      => $token,
         ];
@@ -77,6 +78,7 @@ class ShareController extends Controller
         $shared->update([
             'permission' => $request->permission,
             'protected'  => $request->protected,
+            'expire_in'  => $request->expiration,
             'password'   => $request->password ? Hash::make($request->password) : $shared->password,
         ]);
 

app/Http/Controllers/General/UpgradeAppController.php

@@ -7,6 +7,7 @@ use App\Page;
 use App\Setting;
 use Artisan;
 use Illuminate\Http\Request;
+use Schema;
 
 class UpgradeAppController extends Controller
 {
@@ -123,4 +124,28 @@ class UpgradeAppController extends Controller
 
         return response('Done', 200);
     }
+
+    /**
+     *  Upgrade database
+     */
+    public function upgrade_database()
+    {
+        /*
+         * Upgrade expire_in in shares table
+         *
+         * @since v1.7.9
+        */
+        if (! Schema::hasColumn('shares', 'expire_in')) {
+
+            $command = Artisan::call('migrate');
+
+            if ($command === 0) {
+                echo 'Operation was successful.';
+            }
+
+            if ($command === 1) {
+                echo 'Operation failed.';
+            }
+        }
+    }
 }

app/Http/Requests/Share/CreateShareRequest.php

@@ -28,6 +28,7 @@ class CreateShareRequest extends FormRequest
             'isPassword' => 'required|boolean',
             'unique_id'  => 'required|integer',
             'type'       => 'required|string',
+            'expiration' => 'integer|nullable',
             'permission' => 'string',
             'password'   => 'string',
         ];

app/Http/Requests/Share/UpdateShareRequest.php

@@ -27,6 +27,7 @@ class UpdateShareRequest extends FormRequest
         return [
             'protected'  => 'required|boolean',
             'permission' => 'nullable|string',
+            'expiration' => 'integer|nullable',
             'password'   => 'string',
         ];
     }

app/Http/Resources/ShareResource.php

@@ -22,6 +22,7 @@ class ShareResource extends JsonResource
                     'permission' => $this->permission,
                     'protected'  => (int) $this->protected,
                     'item_id'    => (int) $this->item_id,
+                    'expire_in'  => (int) $this->expire_in,
                     'token'      => $this->token,
                     'link'       => $this->link,
                     'type'       => $this->type,

app/User.php

@@ -194,7 +194,7 @@ class User extends Authenticatable
      */
     public function getFolderTreeAttribute()
     {
-        return FileManagerFolder::with(['folders.shared', 'shared:token,id,item_id,permission,protected'])
+        return FileManagerFolder::with(['folders.shared', 'shared:token,id,item_id,permission,protected,expire_in'])
             ->where('parent_id', 0)
             ->where('user_id', $this->id)
             ->get();
@@ -259,7 +259,7 @@ class User extends Authenticatable
      */
     public function favourite_folders()
     {
-        return $this->belongsToMany(FileManagerFolder::class, 'favourite_folder', 'user_id', 'folder_unique_id', 'id', 'unique_id')->with('shared:token,id,item_id,permission,protected');
+        return $this->belongsToMany(FileManagerFolder::class, 'favourite_folder', 'user_id', 'folder_unique_id', 'id', 'unique_id')->with('shared:token,id,item_id,permission,protected,expire_in');
     }
 
     /**

database/migrations/2020_08_25_143449_add_expiration_at_attribute_to_shares_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddExpirationAtAttributeToSharesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('shares', function (Blueprint $table) {
+            $table->integer('expire_in')->after('password')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('shares', function (Blueprint $table) {
+            //
+        });
+    }
+}

public/chunks/setup-wizard.js

@@ -1 +1 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[42],{584:function(e,t,r){"use strict";r.r(t);var n=r(7);function o(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function i(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}var c={name:"SetupWizard",computed:function(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?o(Object(r),!0).forEach((function(t){i(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):o(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}({},Object(n.b)(["config"])),mounted:function(){"setup-done"!==this.config.installation&&"quiet-update"!==this.config.installation||this.$router.push({name:"SignIn"})}},u=r(0),a=Object(u.a)(c,(function(){var e=this.$createElement;return(this._self._c||e)("router-view")}),[],!1,null,null,null);t.default=a.exports}}]);
+(window.webpackJsonp=window.webpackJsonp||[]).push([[42],{556:function(e,t,r){"use strict";r.r(t);var n=r(7);function o(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function i(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}var c={name:"SetupWizard",computed:function(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?o(Object(r),!0).forEach((function(t){i(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):o(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}({},Object(n.b)(["config"])),mounted:function(){"setup-done"!==this.config.installation&&"quiet-update"!==this.config.installation||this.$router.push({name:"SignIn"})}},u=r(0),a=Object(u.a)(c,(function(){var e=this.$createElement;return(this._self._c||e)("router-view")}),[],!1,null,null,null);t.default=a.exports}}]);

public/mix-manifest.json

@@ -1,35 +1,25 @@
 {
+    "/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",
@@ -44,7 +34,6 @@
     "/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",
@@ -64,7 +53,6 @@
     "/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",
@@ -74,7 +62,5 @@
     "/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"
 }

resources/js/components/Others/ActionButton.vue

@@ -1,6 +1,7 @@
 <template>
     <div class="action-button">
-        <FontAwesomeIcon class="icon" :icon="icon" />
+        <x-icon size="12" class="icon" v-if="icon === 'x'"></x-icon>
+        <edit-2-icon size="12" class="icon" v-if="icon === 'pencil-alt'"></edit-2-icon>
         <span class="label">
             <slot></slot>
         </span>
@@ -8,9 +9,15 @@
 </template>
 
 <script>
+    import { Edit2Icon, XIcon } from 'vue-feather-icons'
+
     export default {
         name: 'ActionButton',
         props: ['icon'],
+        components: {
+            Edit2Icon,
+            XIcon,
+        }
     }
 </script>
 
@@ -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 {
+            path, circle, line {
-                fill: $theme;
+                stroke: $theme;
             }
         }
     }

resources/js/components/Others/Forms/SelectBoxInput.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="select-box">
         <div class="box-item"
-             :class="{'selected': item.value === value}"
+             :class="{'selected': item.value === input}"
              @click="getSelectedValue(item)"
              v-for="(item, i) in data" :key="i"
         >
@@ -13,21 +13,28 @@
 <script>
     export default {
         name: 'SelectBoxInput',
-        props: ['data'],
+        props: [
+            'data',
+            'value',
+        ],
         data() {
             return {
-                value: undefined,
+                input: undefined,
             }
         },
         methods: {
             getSelectedValue(item) {
-                if (! this.value || this.value !== item.value)
+                if (! this.input || this.input !== item.value)
-                    this.value = item.value
+                    this.input = item.value
                 else
-                    this.value = undefined
+                    this.input = undefined
 
-                this.$emit('input', this.value)
+                this.$emit('input', this.input)
             }
+        },
+        created() {
+            if (this.value)
+                this.input = this.value
         }
     }
 </script>
@@ -41,14 +48,21 @@
     .select-box {
         display: flex;
         justify-content: space-between;
+        flex-wrap: wrap;
+        flex-direction: row;
+        margin-bottom: 10px;
 
         .box-item {
-            padding: 12px 14px;
+            margin-bottom: 10px;
+            padding: 12px 4px;
+            text-align: center;
             background: $light_background;
             border-radius: 8px;
             font-weight: 700;
             border: 2px solid $light_background;
             cursor: pointer;
+            flex-direction: column;
+            flex-basis: 55px;
 
             .box-value {
                 @include font-size(15);
@@ -65,6 +79,15 @@
         }
     }
 
+    @media only screen and (max-width: 960px) {
+        .select-box {
+
+            .box-item {
+                flex-basis: calc(34% - 10px);
+            }
+        }
+    }
+
 
     @media (prefers-color-scheme: dark) {
 

resources/js/components/Others/ShareCreate.vue

@@ -33,11 +33,17 @@
                     <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                 </ValidationProvider>
 
-                <!--Set expiration-->
+                <!--More options-->
-                <div class="input-wrapper">
+                <div class="more-options" v-if="isMoreOptions">
-                    <label class="input-label">{{ $t('shared_form.label_expiration') }}:</label>
+
-                    <SelectBoxInput v-model="shareOptions.expiration" :data="expirationList" class="box"/>
+                    <!--Set expiration-->
+                    <div class="input-wrapper">
+                        <label class="input-label">{{ $t('shared_form.label_expiration') }}:</label>
+                        <SelectBoxInput v-model="shareOptions.expiration" :data="expirationList" class="box"/>
+                    </div>
                 </div>
+
+                <ActionButton @click.native="moreOptions" :icon="isMoreOptions ? 'x' : 'pencil-alt'">{{ moreOptionsTitle }}</ActionButton>
             </ValidationObserver>
 
             <!--Copy generated link-->
@@ -80,6 +86,7 @@
     import SwitchInput from '@/components/Others/Forms/SwitchInput'
     import SelectInput from '@/components/Others/Forms/SelectInput'
     import ThumbnailItem from '@/components/Others/ThumbnailItem'
+    import ActionButton from '@/components/Others/ActionButton'
     import CopyInput from '@/components/Others/Forms/CopyInput'
     import ButtonBase from '@/components/FilesView/ButtonBase'
     import {required} from 'vee-validate/dist/rules'
@@ -94,6 +101,7 @@
             ValidationObserver,
             SelectBoxInput,
             ThumbnailItem,
+            ActionButton,
             PopupWrapper,
             PopupActions,
             PopupContent,
@@ -105,7 +113,10 @@
             required,
         },
         computed: {
-            ...mapGetters(['permissionOptions']),
+            ...mapGetters([
+                'permissionOptions',
+                'expirationList',
+            ]),
             itemTypeTitle() {
                 return this.pickedItem && this.pickedItem.type === 'folder' ? this.$t('types.folder') : this.$t('types.file')
             },
@@ -114,40 +125,13 @@
             },
             submitButtonText() {
                 return this.isGeneratedShared ? this.$t('shared_form.button_done') : this.$t('shared_form.button_generate')
+            },
+            moreOptionsTitle() {
+                return this.isMoreOptions ? this.$t('shared_form.button_close_options') : this.$t('shared_form.button_more_options')
             }
         },
         data() {
             return {
-                expirationList: [
-                    {
-                        label: this.$t('shared_form.expiration_hour', {value: 1}),
-                        value: '1',
-                    },
-                    {
-                        label: this.$t('shared_form.expiration_hour', {value: 2}),
-                        value: '2',
-                    },
-                    {
-                        label: this.$t('shared_form.expiration_hour', {value: 6}),
-                        value: '6',
-                    },
-                    {
-                        label: this.$t('shared_form.expiration_hour', {value: 12}),
-                        value: '12',
-                    },
-                    {
-                        label: this.$t('shared_form.expiration_day', {value: 1}),
-                        value: '24',
-                    },
-                    {
-                        label: this.$t('shared_form.expiration_day', {value: 2}),
-                        value: '48',
-                    },
-                    {
-                        label: this.$t('shared_form.expiration_day', {value: 7}),
-                        value: '168',
-                    },
-                ],
                 shareOptions: {
                     isPassword: false,
                     expiration: undefined,
@@ -160,9 +144,16 @@
                 shareLink: undefined,
                 isGeneratedShared: false,
                 isLoading: false,
+                isMoreOptions: false,
             }
         },
         methods: {
+            moreOptions() {
+                this.isMoreOptions = ! this.isMoreOptions
+
+                if (! this.isMoreOptions)
+                    this.shareOptions.expiration = undefined
+            },
             async submitShareOptions() {
 
                 // If shared was generated, then close popup
@@ -224,10 +215,12 @@
                         permission: undefined,
                         password: undefined,
                         isPassword: false,
+                        expiration: undefined,
                         type: undefined,
                         unique_id: undefined,
                     }
                     this.isGeneratedShared = false
+                    this.isMoreOptions = false
                     this.shareLink = undefined
                 }, 150)
             })
@@ -239,6 +232,10 @@
     @import "@assets/vue-file-manager/_inapp-forms.scss";
     @import '@assets/vue-file-manager/_forms';
 
+    .more-options {
+        margin-bottom: 10px;
+    }
+
     .input-wrapper {
 
         &.password {

resources/js/components/Others/ShareEdit.vue

@@ -31,7 +31,7 @@
                         <label class="input-label">{{ $t('shared_form.label_password_protection') }}:</label>
                         <SwitchInput v-model="shareOptions.isProtected" :state="shareOptions.isProtected" class="switch"/>
                     </div>
-                    <ActionButton v-if="(pickedItem.shared.protected && canChangePassword) && shareOptions.isProtected" @click.native="changePassword" icon="pencil-alt">{{ $t('popup_share_edit.change_pass') }}</ActionButton>
+                    <ActionButton v-if="(pickedItem.shared.protected && canChangePassword) && shareOptions.isProtected" @click.native="changePassword" class="change-password">{{ $t('popup_share_edit.change_pass') }}</ActionButton>
                 </div>
 
                 <!--Set password-->
@@ -40,6 +40,18 @@
                     <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                 </ValidationProvider>
 
+                <!--More options-->
+                <div class="more-options" v-if="isMoreOptions">
+
+                    <!--Set expiration-->
+                    <div class="input-wrapper">
+                        <label class="input-label">{{ $t('shared_form.label_expiration') }}:</label>
+                        <SelectBoxInput v-model="shareOptions.expiration" :data="expirationList" :value="shareOptions.expiration" class="box"/>
+                    </div>
+                </div>
+
+                <ActionButton @click.native="moreOptions" :icon="isMoreOptions || shareOptions.expiration ? 'x' : 'pencil-alt'">{{ moreOptionsTitle }}</ActionButton>
+
             </ValidationObserver>
 
         </PopupContent>
@@ -68,6 +80,7 @@
 
 <script>
     import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
+    import SelectBoxInput from '@/components/Others/Forms/SelectBoxInput'
     import PopupWrapper from '@/components/Others/Popup/PopupWrapper'
     import PopupActions from '@/components/Others/Popup/PopupActions'
     import PopupContent from '@/components/Others/Popup/PopupContent'
@@ -88,6 +101,7 @@
         components: {
             ValidationProvider,
             ValidationObserver,
+            SelectBoxInput,
             ThumbnailItem,
             ActionButton,
             PopupWrapper,
@@ -101,7 +115,12 @@
             required,
         },
         computed: {
-            ...mapGetters(['user', 'permissionOptions', 'currentFolder']),
+            ...mapGetters([
+                'permissionOptions',
+                'expirationList',
+                'currentFolder',
+                'user',
+            ]),
             isFolder() {
                 return this.pickedItem && this.pickedItem.type === 'folder'
             },
@@ -114,18 +133,28 @@
             isSharedLocation() {
                 return this.currentFolder && this.currentFolder.location === 'shared'
             },
+            moreOptionsTitle() {
+                return this.isMoreOptions ? this.$t('shared_form.button_close_options') : this.$t('shared_form.button_more_options')
+            }
         },
         data() {
             return {
+                isConfirmedDestroy: false,
+                canChangePassword: false,
                 shareOptions: undefined,
                 pickedItem: undefined,
-                isLoading: false,
+                isMoreOptions: false,
                 isDeleting: false,
-                canChangePassword: false,
+                isLoading: false,
-                isConfirmedDestroy: false,
             }
         },
         methods: {
+            moreOptions() {
+                this.isMoreOptions = ! this.isMoreOptions
+
+                if (! this.isMoreOptions)
+                    this.shareOptions.expiration = undefined
+            },
             changePassword() {
                 this.canChangePassword = false
             },
@@ -187,22 +216,22 @@
                     .post('/api/share/' + this.shareOptions.token, {
                         permission: this.shareOptions.permission,
                         protected: this.shareOptions.isProtected,
+                        expiration: this.shareOptions.expiration,
                         password: this.shareOptions.password ? this.shareOptions.password : undefined,
                         _method: 'patch'
                     })
                     .then(response => {
 
-                        // End loading
-                        this.isLoading = false
-
                         // Update shared data
                         this.$store.commit('UPDATE_SHARED_ITEM', response.data.data.attributes)
 
                         events.$emit('popup:close')
                     })
-                    .catch(error => {
+                    .catch(() => {
 
-                        // todo: catch errors
+                        this.$isSomethingWrong()
+                    })
+                    .finally(() => {
 
                         // End loading
                         this.isLoading = false
@@ -222,11 +251,15 @@
                 // Store shared options
                 this.shareOptions = {
                     token: args.item.shared.token,
+                    expiration: args.item.shared.expire_in,
                     isProtected: args.item.shared.protected,
                     permission: args.item.shared.permission,
                     password: undefined,
                 }
 
+                if (args.item.shared.expire_in)
+                    this.isMoreOptions = true
+
                 this.canChangePassword = args.item.shared.protected
             })
 
@@ -256,6 +289,11 @@
         }
     }
 
+    .change-password {
+        opacity: 0.7;
+        text-decoration: underline;
+    }
+
     .item-thumbnail {
         margin-bottom: 20px;
     }

resources/js/helpers.js

@@ -52,7 +52,7 @@ const Helpers = {
         }
 
         Vue.prototype.$getImage = function (source) {
-            return source ? '/' + source : ''
+            return source ? this.$store.getters.config.host + '/' + source : ''
         }
 
         Vue.prototype.$getCreditCardBrand = function (brand) {

resources/js/i18n/lang/cn.json

@@ -626,6 +626,8 @@
 		"visitor": "仅可以查看或下载文件"
 	},
 	"shared_form": {
+		"button_more_options": "More Options",
+		"button_close_options": "Close Options",
 		"button_done": "太好了！",
 		"button_generate": "生成分享链接",
 		"label_password_protection": "密码保护",

resources/js/i18n/lang/en.json

@@ -626,6 +626,8 @@
 		"visitor": "Can only view and download"
 	},
 	"shared_form": {
+		"button_more_options": "More Options",
+		"button_close_options": "Close Options",
 		"button_done": "Awesome, I’m done!",
 		"button_generate": "Generate Link",
 		"label_password_protection": "Password Protected",

resources/js/i18n/lang/sk.json

@@ -626,6 +626,8 @@
 		"visitor": "Môže len vidieť a sťahovať súbory"
 	},
 	"shared_form": {
+		"button_more_options": "Viac nastavení",
+		"button_close_options": "Zavrieť viac možností",
 		"button_done": "Super, som hotový!",
 		"button_generate": "Vygenerovať link",
 		"label_password_protection": "Chrániť heslom",

resources/js/store/modules/app.js

@@ -263,9 +263,39 @@ const defaultState = {
 		{label: 'Zambia', value: 'ZM'},
 		{label: 'Zimbabwe', value: 'ZW'}
 	],
+	expirationList: [
+		{
+			label: i18n.t('shared_form.expiration_hour', {value: 1}),
+			value: 1,
+		},
+		{
+			label: i18n.t('shared_form.expiration_hour', {value: 2}),
+			value: 2,
+		},
+		{
+			label: i18n.t('shared_form.expiration_hour', {value: 6}),
+			value: 6,
+		},
+		{
+			label: i18n.t('shared_form.expiration_hour', {value: 12}),
+			value: 12,
+		},
+		{
+			label: i18n.t('shared_form.expiration_day', {value: 1}),
+			value: 24,
+		},
+		{
+			label: i18n.t('shared_form.expiration_day', {value: 2}),
+			value: 48,
+		},
+		{
+			label: i18n.t('shared_form.expiration_day', {value: 7}),
+			value: 168,
+		},
+	],
 }
 const actions = {
-	changePreviewType: ({commit, dispatch, state, getters}) => {
+	changePreviewType: ({commit, state}) => {
 		// Get preview type
 		let previewType = state.FilePreviewType == 'grid' ? 'list' : 'grid'
 
@@ -320,6 +350,7 @@ const mutations = {
 const getters = {
 	fileInfoVisible: state => state.fileInfoPanelVisible,
 	FilePreviewType: state => state.FilePreviewType,
+	expirationList: state => state.expirationList,
 	homeDirectory: state => state.homeDirectory,
 	requestedPlan: state => state.requestedPlan,
 	countries: state => state.countries,

resources/js/store/modules/userAuth.js

@@ -17,6 +17,10 @@ const actions = {
                 .then((response) => {
                     resolve(response)
 
+                    // Redirect user if is logged
+                    if (router.currentRoute.name === 'SignIn')
+                        router.push({ name: 'Files' })
+
                     commit('RETRIEVE_USER', response.data)
 
                 }).catch((error) => {

resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue

@@ -2,7 +2,7 @@
     <PageTab :is-loading="isLoading" class="form-fixed-width">
 
         <!--Personal Information-->
-        <PageTabGroup>
+        <PageTabGroup v-if="! isLoading">
             <div class="form block-form">
                 <FormLabel>{{ $t('admin_settings.appearance.section_general') }}</FormLabel>
 

resources/sass/vue-file-manager/_inapp-forms.scss

@@ -52,11 +52,11 @@
 }
 
 .input-label {
-  @include font-size(12);
+  @include font-size(14);
   color: $text;
   font-weight: 700;
   display: block;
-  margin-bottom: 5px;
+  margin-bottom: 8px;
 }
 
 @media (prefers-color-scheme: dark) {

routes/web.php

@@ -32,10 +32,16 @@ Route::group(['middleware' => ['auth:api', 'auth.shared', 'auth.master', 'scope:
     Route::get('/file/{name}', 'FileAccessController@get_file')->name('file');
 });
 
+// Get user invoice
 Route::group(['middleware' => ['auth:api', 'auth.master', 'scope:master']], function () {
     Route::get('/invoice/{customer}/{token}', 'Admin\InvoiceController@show');
 });
 
+// Admin system tools
+Route::group(['middleware' => ['auth:api', 'auth.master', 'auth.admin', 'scope:master']], function () {
+    Route::get('/upgrade-database', 'General\UpgradeAppController@upgrade_database');
+});
+
 // Get og site for web crawlers
 if( Crawler::isCrawler()) {
     Route::get('/shared/{token}', 'AppFunctionsController@og_site');