diff --git a/app/Http/Controllers/AppFunctionsController.php b/app/Http/Controllers/AppFunctionsController.php
index 92f0fa3d..d13e9822 100644
--- a/app/Http/Controllers/AppFunctionsController.php
+++ b/app/Http/Controllers/AppFunctionsController.php
@@ -2,23 +2,19 @@
namespace App\Http\Controllers;
-use App;
use App\Http\Mail\SendContactMessage;
use App\Models\Content;
-use App\Models\File;
-use App\Models\Folder;
use App\Http\Requests\PublicPages\SendContactMessageRequest;
use App\Http\Resources\PageResource;
use App\Http\Tools\Demo;
use App\Models\Setting;
use App\Models\Page;
-use App\Models\User;
use Artisan;
use Doctrine\DBAL\Driver\PDOException;
+use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Cookie;
+use Illuminate\Http\Response;
use Illuminate\Support\Facades\Mail;
-use Schema;
class AppFunctionsController extends Controller
{
@@ -101,7 +97,7 @@ class AppFunctionsController extends Controller
* Send contact message from pages
*
* @param SendContactMessageRequest $request
- * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
+ * @return ResponseFactory|Response
*/
public function contact_form(SendContactMessageRequest $request)
{
diff --git a/resources/js/views/Upgrade.vue b/resources/js/views/Upgrade.vue
index 2f2e8feb..40e912eb 100644
--- a/resources/js/views/Upgrade.vue
+++ b/resources/js/views/Upgrade.vue
@@ -273,10 +273,6 @@
})
},
},
- created() {
- if (this.config.latest_upgrade === '1.7')
- this.$router.push({name: 'SignIn'})
- }
}
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index dc48a1eb..43302f6e 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -4,27 +4,27 @@
-
+
- {{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }} | {{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __('vuefilemanager.app_description') }}
+ {{ $settings->app_title ?? 'VueFileManager' }} | {{ $settings->app_description ?? __('vuefilemanager.app_description') }}
{{--StyleSheet--}}
{{--OG items--}}
-
-
+
+
{{-- Apple Mobile Web App--}}
-
+
{{--Icons--}}
-
+
{{--Format Detection--}}
@@ -37,39 +37,34 @@
let config = {
host: '{{ url('/') }}',
api: '{{ url('/api') }}',
-
locale: '{{ \Illuminate\Support\Facades\App::getLocale() }}',
- app_name: '{{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }}',
- app_description: '{{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : 'Your self-hosted storage cloud software powered by Laravel and Vue' }}',
- app_footer: '{!! isset($settings->footer_content) && $settings->footer_content ? $settings->footer_content : null !!}',
+ app_logo: '{{ $settings->app_logo ?? null }}',
+ app_footer: '{!! $settings->footer_content ?? null !!}',
+ app_name: '{{ $settings->app_title ?? 'VueFileManager' }}',
+ app_logo_horizontal: '{{ $settings->app_logo_horizontal ?? null }}',
+ app_description: '{{ $settings->app_description ?? __('vuefilemanager.app_description') }}',
- app_logo: '{{ isset($settings->app_logo) && $settings->app_logo ? $settings->app_logo : null }}',
- app_logo_horizontal: '{{ isset($settings->app_logo_horizontal) && $settings->app_logo_horizontal ? $settings->app_logo_horizontal : null }}',
+ stripe_public_key: '{{ config('cashier.key') ?? null }}',
+ app_payments_active: {{ $settings->payments_active ?? 0 }},
- app_payments_active: {{ isset($settings->payments_active) ? $settings->payments_active : 0 }},
-
- stripe_public_key: '{{ config('cashier.key') ? config('cashier.key') : null }}',
-
- userRegistration: {{ isset($settings->registration) ? $settings->registration : 1 }},
- allowHomepage: {{ isset($settings->allow_homepage) ? $settings->allow_homepage : 1 }},
- storageLimit: {{ isset($settings->storage_limitation) ? $settings->storage_limitation : 1 }},
- storageDefaultSpace: {{ isset($settings->storage_default) ? $settings->storage_default : 5 }},
+ allowHomepage: {{ $settings->allow_homepage ?? 1 }},
+ userRegistration: {{ $settings->registration ?? 1 }},
+ storageLimit: {{ $settings->storage_limitation ?? 1 }},
+ storageDefaultSpace: {{ $settings->storage_default ?? 5 }},
storageDefaultSpaceFormatted: '{{ isset($settings->storage_default) ? format_gigabytes($settings->storage_default) : format_gigabytes(5) }}',
mimetypesBlacklist: '{{ isset($settings->mimetypes_blacklist) ? $settings->mimetypes_blacklist: null}}',
uploadLimit: {{ isset($settings->upload_limit) ? format_bytes($settings->upload_limit) : 'undefined' }},
uploadLimitFormatted: '{{ isset($settings->upload_limit) ? format_megabytes($settings->upload_limit) : null }}',
+ chunkSize: {{ format_bytes(config('vuefilemanager.chunk_size')) }},
hasAuthCookie: {{ Cookie::has('token') ? 1 : 0 }},
isSaaS: {{ isset($settings->license) && $settings->license === 'Extended' ? 1 : 0 }},
isDemo: {{ env('APP_DEMO') ? 1 : 0 }},
- legal: {!! isset($legal) ? $legal : 'undefined' !!},
+ legal: {!! $legal ?? 'undefined' !!},
- installation: '{{ $installation ?? '' }}',
- latest_upgrade: '{{ isset($settings->latest_upgrade) && $settings->latest_upgrade ? $settings->latest_upgrade : null }}',
-
- chunkSize: {{ format_bytes(config('vuefilemanager.chunk_size')) }},
+ installation: '{{ $installation ?? 'initial' }}',
}
diff --git a/tests/Feature/App/AppTest.php b/tests/Feature/App/AppTest.php
index 03a5be2d..c5305714 100644
--- a/tests/Feature/App/AppTest.php
+++ b/tests/Feature/App/AppTest.php
@@ -32,8 +32,26 @@ class AppTest extends TestCase
$this->setup->seed_default_settings('Extended');
+ Setting::create([
+ 'name' => 'setup_wizard_success',
+ 'value' => 'setup-done',
+ ]);
+
$this->get('/')
- ->assertStatus(200);
+ ->assertStatus(200)
+ ->assertSee('setup-done')
+ ->assertSee('VueFileManager');
+ }
+
+ /**
+ * @test
+ */
+ public function it_get_index_page_without_setup()
+ {
+ $this->get('/')
+ ->assertStatus(200)
+ ->assertSee('setup-disclaimer')
+ ->assertSee('VueFileManager');
}
/**