nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-05-27 14:54:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

index.blade.php refactored

Browse Source
This commit is contained in:
Peter Papp
2021-03-13 19:32:56 +01:00
parent deaac3717c
commit 9c3c044623
4 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AppFunctionsController.php
+3 -7
View File
@@ -2,23 +2,19 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App;
use App\Http\Mail\SendContactMessage; use App\Http\Mail\SendContactMessage;
use App\Models\Content; use App\Models\Content;
use App\Models\File;
use App\Models\Folder;
use App\Http\Requests\PublicPages\SendContactMessageRequest; use App\Http\Requests\PublicPages\SendContactMessageRequest;
use App\Http\Resources\PageResource; use App\Http\Resources\PageResource;
use App\Http\Tools\Demo; use App\Http\Tools\Demo;
use App\Models\Setting; use App\Models\Setting;
use App\Models\Page; use App\Models\Page;
use App\Models\User;
use Artisan; use Artisan;
use Doctrine\DBAL\Driver\PDOException; use Doctrine\DBAL\Driver\PDOException;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cookie; use Illuminate\Http\Response;
use Illuminate\Support\Facades\Mail; use Illuminate\Support\Facades\Mail;
use Schema;
class AppFunctionsController extends Controller class AppFunctionsController extends Controller
{ {
@@ -101,7 +97,7 @@ class AppFunctionsController extends Controller
* Send contact message from pages * Send contact message from pages
* *
* @param SendContactMessageRequest $request * @param SendContactMessageRequest $request
* @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response * @return ResponseFactory|Response
*/ */
public function contact_form(SendContactMessageRequest $request) public function contact_form(SendContactMessageRequest $request)
{ {
resources/js/views/Upgrade.vue
-4
View File
@@ -273,10 +273,6 @@
}) })
}, },
}, },
created() {
if (this.config.latest_upgrade === '1.7')
this.$router.push({name: 'SignIn'})
}
} }
</script> </script>
resources/views/index.blade.php
+20 -25
View File
@@ -4,27 +4,27 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
<meta name="description" content="{{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __('vuefilemanager.app_description') }}"> <meta name="description" content="{{ $settings->app_description ?? __('vuefilemanager.app_description') }}">
<title>{{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }} | {{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __('vuefilemanager.app_description') }}</title> <title>{{ $settings->app_title ?? 'VueFileManager' }} | {{ $settings->app_description ?? __('vuefilemanager.app_description') }}</title>
{{--StyleSheet--}} {{--StyleSheet--}}
<link href="{{ asset('css/app.css') }}?v={{ get_version() }}" rel="stylesheet"> <link href="{{ asset('css/app.css') }}?v={{ get_version() }}" rel="stylesheet">
{{--OG items--}} {{--OG items--}}
<meta property="og:url" content="{{ url('/') }}"> <meta property="og:url" content="{{ url('/') }}">
<meta property="og:title" content="{{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }} | {{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __('vuefilemanager.app_description') }}"> <meta property="og:title" content="{{ $settings->app_title ?? 'VueFileManager' }} | {{ $settings->app_description ?? __('vuefilemanager.app_description') }}">
<meta property="og:description" content="{{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __('vuefilemanager.app_description') }}"> <meta property="og:description" content="{{ $settings->app_description ?? __('vuefilemanager.app_description') }}">
<meta property="og:image" content="{{ asset('assets/images/vuefilemanager-og-image.jpg') }}"> <meta property="og:image" content="{{ asset('assets/images/vuefilemanager-og-image.jpg') }}">
{{-- Apple Mobile Web App--}} {{-- Apple Mobile Web App--}}
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="white"> <meta name="apple-mobile-web-app-status-bar-style" content="white">
<meta name="apple-mobile-web-app-title" content="{{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }}"> <meta name="apple-mobile-web-app-title" content="{{ $settings->app_title ?? 'VueFileManager' }}">
{{--Icons--}} {{--Icons--}}
<link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ asset('assets/images/app-icon.png') }}"> <link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ asset('assets/images/app-icon.png') }}">
<link rel="icon" href="{{ isset($settings->app_favicon) && $settings->app_favicon ? $settings->app_favicon : asset('favicon.png') }}?v={{ get_version() }}"> <link rel="icon" href="{{ $settings->app_favicon ?? asset('favicon.png') }}?v={{ get_version() }}">
{{--Format Detection--}} {{--Format Detection--}}
<meta name="format-detection" content="telephone=no"> <meta name="format-detection" content="telephone=no">
@@ -37,39 +37,34 @@
let config = { let config = {
host: '{{ url('/') }}', host: '{{ url('/') }}',
api: '{{ url('/api') }}', api: '{{ url('/api') }}',
locale: '{{ \Illuminate\Support\Facades\App::getLocale() }}', locale: '{{ \Illuminate\Support\Facades\App::getLocale() }}',
app_name: '{{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }}', app_logo: '{{ $settings->app_logo ?? null }}',
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: '{!! $settings->footer_content ?? null !!}',
app_footer: '{!! isset($settings->footer_content) && $settings->footer_content ? $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 }}', stripe_public_key: '{{ config('cashier.key') ?? null }}',
app_logo_horizontal: '{{ isset($settings->app_logo_horizontal) && $settings->app_logo_horizontal ? $settings->app_logo_horizontal : null }}', app_payments_active: {{ $settings->payments_active ?? 0 }},
app_payments_active: {{ isset($settings->payments_active) ? $settings->payments_active : 0 }}, allowHomepage: {{ $settings->allow_homepage ?? 1 }},
userRegistration: {{ $settings->registration ?? 1 }},
stripe_public_key: '{{ config('cashier.key') ? config('cashier.key') : null }}', storageLimit: {{ $settings->storage_limitation ?? 1 }},
storageDefaultSpace: {{ $settings->storage_default ?? 5 }},
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 }},
storageDefaultSpaceFormatted: '{{ isset($settings->storage_default) ? format_gigabytes($settings->storage_default) : format_gigabytes(5) }}', storageDefaultSpaceFormatted: '{{ isset($settings->storage_default) ? format_gigabytes($settings->storage_default) : format_gigabytes(5) }}',
mimetypesBlacklist: '{{ isset($settings->mimetypes_blacklist) ? $settings->mimetypes_blacklist: null}}', mimetypesBlacklist: '{{ isset($settings->mimetypes_blacklist) ? $settings->mimetypes_blacklist: null}}',
uploadLimit: {{ isset($settings->upload_limit) ? format_bytes($settings->upload_limit) : 'undefined' }}, uploadLimit: {{ isset($settings->upload_limit) ? format_bytes($settings->upload_limit) : 'undefined' }},
uploadLimitFormatted: '{{ isset($settings->upload_limit) ? format_megabytes($settings->upload_limit) : null }}', uploadLimitFormatted: '{{ isset($settings->upload_limit) ? format_megabytes($settings->upload_limit) : null }}',
chunkSize: {{ format_bytes(config('vuefilemanager.chunk_size')) }},
hasAuthCookie: {{ Cookie::has('token') ? 1 : 0 }}, hasAuthCookie: {{ Cookie::has('token') ? 1 : 0 }},
isSaaS: {{ isset($settings->license) && $settings->license === 'Extended' ? 1 : 0 }}, isSaaS: {{ isset($settings->license) && $settings->license === 'Extended' ? 1 : 0 }},
isDemo: {{ env('APP_DEMO') ? 1 : 0 }}, isDemo: {{ env('APP_DEMO') ? 1 : 0 }},
legal: {!! isset($legal) ? $legal : 'undefined' !!}, legal: {!! $legal ?? 'undefined' !!},
installation: '{{ $installation ?? '' }}', installation: '{{ $installation ?? 'initial' }}',
latest_upgrade: '{{ isset($settings->latest_upgrade) && $settings->latest_upgrade ? $settings->latest_upgrade : null }}',
chunkSize: {{ format_bytes(config('vuefilemanager.chunk_size')) }},
} }
</script> </script>
tests/Feature/App/AppTest.php
+19 -1
View File
@@ -32,8 +32,26 @@ class AppTest extends TestCase
$this->setup->seed_default_settings('Extended'); $this->setup->seed_default_settings('Extended');
Setting::create([
'name' => 'setup_wizard_success',
'value' => 'setup-done',
]);
$this->get('/') $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');
} }
/** /**