Merge remote-tracking branch 'origin/v2' into oasis

# Conflicts:
#	app/Http/Controllers/User/AccountController.php
#	app/Http/helpers.php
#	public/mix-manifest.json
#	resources/js/components/FilesView/Icons/AlphabetIcon.vue
#	resources/js/components/FilesView/MobileActionButton.vue
#	resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue
#	resources/js/views/Admin/Users/UserTabs/UserDetail.vue
#	resources/js/views/Upgrade/UpgradeBilling.vue
#	resources/views/index.blade.php
#	resources/views/vuefilemanager/invoice.blade.php
#	resources/views/vuefilemanager/others/color-template.blade.php

app/Services/DemoService.php

@@ -39,8 +39,8 @@ class DemoService
             'items'      => '0',
             'color'      => isset($request->icon['color']) ? $request->icon['color'] : null,
             'emoji'      => isset($request->icon['emoji']) ? $request->icon['emoji'] : null,
-            'updated_at' => Carbon::now()->format('j M Y \a\t H:i'),
-            'created_at' => Carbon::now()->format('j M Y \a\t H:i'),
+            'updated_at' => now()->format('j M Y \a\t H:i'),
+            'created_at' => now()->format('j M Y \a\t H:i'),
         ];
     }
 
@@ -111,24 +111,15 @@ class DemoService
             'type'       => $filetype,
             'file_url'   => 'https://vuefilemanager.hi5ve.digital/assets/vue-file-manager-preview.jpg',
             'author'     => $request->user() ? 'user' : 'visitor',
-            'created_at' => Carbon::now()->format('j M Y \a\t H:i'),
-            'updated_at' => Carbon::now()->format('j M Y \a\t H:i'),
+            'created_at' => now()->format('j M Y \a\t H:i'),
+            'updated_at' => now()->format('j M Y \a\t H:i'),
         ];
     }
 
     /**
      * Return 204 status
      *
-     * @return ResponseFactory|\Illuminate\Http\Response
-     */
-    function response_with_no_content()
-    {
-        return response('Done!', 204);
-    }
-
-    /**
-     * Return 204 status
-     *
+     * @param $user
      * @return ResponseFactory|\Illuminate\Http\Response
      */
     function favourites($user)

app/Services/HelperService.php

@@ -59,15 +59,15 @@ class HelperService
         $accessible_folder_ids = Arr::flatten([filter_folders_ids($foldersIds), $shared->item_id]);
 
         // Check user access
-        if ( is_array($requested_id) ) {
+        if (is_array($requested_id)) {
             foreach ($requested_id as $id) {
                 if (!in_array($id, $accessible_folder_ids))
                     abort(403);
             }
         }
 
-        if (! is_array($requested_id)) {
-            if (! in_array($requested_id, $accessible_folder_ids))
+        if (!is_array($requested_id)) {
+            if (!in_array($requested_id, $accessible_folder_ids))
                 abort(403);
         }
     }
@@ -323,4 +323,35 @@ class HelperService
             }
         }
     }
+
+    /**
+     * @param $license
+     * @param $locale
+     */
+    function create_default_language_translations($license, $locale)
+    {
+        $translations = [
+            'extended' => collect([
+                config("language-translations.extended"),
+                config("language-translations.regular"),
+                config("custom-language-translations")
+            ])->collapse(),
+            'regular'  => collect([
+                config("language-translations.regular"),
+                config("custom-language-translations")
+            ])->collapse(),
+        ];
+
+        $translations = $translations[strtolower($license)]
+            ->map(function ($value, $key) use ($locale) {
+                return [
+                    'lang'  => $locale,
+                    'value' => $value,
+                    'key'   => $key,
+                ];
+            })->toArray();
+
+        DB::table('language_translations')
+            ->insert($translations);
+    }
 }

app/Services/SchedulerService.php

@@ -17,7 +17,7 @@ class SchedulerService
      */
     public function delete_old_zips(): void
     {
-        Zip::where('created_at', '<=', Carbon::now()->subDay()->toDateTimeString())
+        Zip::where('created_at', '<=', now()->subDay()->toDateTimeString())
             ->get()
             ->each(function ($zip) {
 
@@ -42,7 +42,7 @@ class SchedulerService
                 $created_at = Carbon::parse($share->created_at);
 
                 // If time was over, then delete share record
-                if ($created_at->diffInHours(Carbon::now()) >= $share->expire_in) {
+                if ($created_at->diffInHours(now()) >= $share->expire_in) {
                     $share->delete();
                 }
             });
@@ -69,7 +69,7 @@ class SchedulerService
 
             // Get diffInHours
             $diff = Carbon::parse($last_modified)
-                ->diffInHours(Carbon::now());
+                ->diffInHours(now());
 
             // Delete if file is in local storage more than 24 hours
             if ($diff >= 24) {

app/Services/SetupService.php

@@ -2,6 +2,7 @@
 
 namespace App\Services;
 
+use App\Models\Language;
 use App\Models\Page;
 use App\Models\Setting;
 use Illuminate\Support\Facades\Storage;
@@ -48,4 +49,22 @@ class SetupService
                 Setting::forceCreate($content);
             });
     }
+
+    /**
+     * Store default VueFileManager settings into database
+     *
+     * @param $license
+     */
+    public function seed_default_language()
+    {
+        Language::create([
+            'name'   => 'English',
+            'locale' => 'en'
+        ]);
+
+        Setting::create([
+            'name'  => 'language',
+            'value' => 'en',
+        ]);
+    }
 }