Upgrade to Laravel 5.8 and AdminLTE3

2019-06-02 15:35:48 +10:00
parent 5a036cdc64
commit 41d6a07196
135 changed files with 20724 additions and 103787 deletions
--- a/resources/theme/frontend/metronic/layouts/app.blade.php
+++ b/resources/theme/frontend/metronic/layouts/app.blade.php
@@ -3,60 +3,60 @@
 <!--[if IE 9]> <html lang="en" class="ie9 no-js"> <![endif]-->
 <!--[if !IE]><!--> <html lang="en"> <!--<![endif]-->

-@section('htmlheader')
-	@include('layouts.partials.htmlheader')
-@show
-
-<!-- Body BEGIN -->
-<body class="corporate">
-
-	<div class="wrapper">
-		@include('layouts.partials.mainheader')
-
-		@include('layouts.partials.sidebar')
-
-		<!-- Content Wrapper. Contains page content -->
-		<div class="content-wrapper">
-
-			@include('layouts.partials.contentheader')
-
-			<!-- Main content -->
-			<section class="content">
-				<!-- Your Page Content Here -->
-				<div class="main">
-					<div class="container">
-						@yield('breadcrumb')
-
-						<div class="row margin-bottom-40">
-							@yield('main-content')
-						</div>
-					</div>
-				</div>
-			</section><!-- /.content -->
-		</div><!-- /.content-wrapper -->
-
-		@include('layouts.partials.controlsidebar')
-
-		@include('layouts.partials.footer')
-
-	</div><!-- ./wrapper -->
-
-	@section('scripts')
-		{{-- BEGIN CORE PLUGINS (REQUIRED FOR ALL PAGES) --}}
-		@js('/site/js/jquery/1.11.2/js/jquery.min.js','jquery')
-		@js('/site/js/bootstrap/3.3.5/js/bootstrap.min.js','bootstrap-js','jquery')
-		@js('/site/js/jquery/plugins/migrate/1.2.1/js/jquery-migrate.min.js','jq-migrate','jquery')
-		@js('/site/js/jquery/plugins/back-to-top/back-to-top.js','back-to-top','jquery')
-		{{-- END CORE PLUGINS --}}
-
-		@include('layouts.partials.scripts')
-
-		{{-- Scripts --}}
-		{!! Asset::scripts() !!}
-
-		@yield('page-scripts')
+	@section('htmlheader')
+		@include('layouts.partials.htmlheader')
 	@show

-</body>
-<!-- BODY End-->
+	<body class="corporate">
+		<div id="app">
+			<div class="wrapper">
+				@include('layouts.partials.mainheader')
+
+				@include('layouts.partials.sidebar')
+
+				<!-- Content Wrapper. Contains page content -->
+				<div class="content-wrapper">
+
+					@include('layouts.partials.contentheader')
+
+					<!-- Main content -->
+					<section class="content">
+						<!-- Your Page Content Here -->
+						<div class="main">
+							<div class="container">
+								@yield('breadcrumb')
+
+								<div class="row margin-bottom-40">
+									@yield('main-content')
+								</div>
+							</div>
+						</div>
+					</section><!-- /.content -->
+				</div><!-- /.content-wrapper -->
+
+				@include('layouts.partials.controlsidebar')
+
+				@include('layouts.partials.footer')
+
+			</div><!-- ./wrapper -->
+		</div> <!-- ./app -->
+
+		@section('scripts')
+
+			{{-- BEGIN CORE PLUGINS (REQUIRED FOR ALL PAGES) --}}
+			@js('/site/js/jquery/1.11.2/js/jquery.min.js','jquery')
+			@js('/site/js/bootstrap/3.3.5/js/bootstrap.min.js','bootstrap-js','jquery')
+			@js('/site/js/jquery/plugins/migrate/1.2.1/js/jquery-migrate.min.js','jq-migrate','jquery')
+			@js('/site/js/jquery/plugins/back-to-top/back-to-top.js','back-to-top','jquery')
+			{{-- END CORE PLUGINS --}}
+
+			{{-- Scripts --}}
+			{!! Asset::scripts() !!}
+
+			@include('layouts.partials.scripts')
+
+			@yield('page-scripts')
+		@show
+
+	</body>
 </html>
--- a/resources/theme/frontend/metronic/layouts/partials/htmlheader.blade.php
+++ b/resources/theme/frontend/metronic/layouts/partials/htmlheader.blade.php
@@ -1,13 +1,11 @@
 <head>
 	<meta charset="UTF-8">
-	<title>{{ config('app.name') }} - {{ $so->site_name }}</title>
-	<meta content="width=device-width, initial-scale=1.0" name="viewport" />
-
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+	<title>{{ config('app.name') }} - @yield('htmlheader_title', 'Your title here')</title>
+	<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
 	<!-- CSRF Token -->
 	<meta name="csrf-token" content="{{ csrf_token() }}">

-	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-
 	<meta property="og:site_name" content="{{ config('app.name') }}" />
 	<meta property="og:title" content="{{ $so->site_name }}" />
 	<meta property="og:description" content="{{ $so->site_description }}" />
@@ -17,22 +15,21 @@

 	<link rel="shortcut icon" href="{{ object_get($so,'favicon','favicon.ico') }}" />

-	{{-- Fonts START --}}
-	<link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700|PT+Sans+Narrow|Source+Sans+Pro:200,300,400,600,700,900&amp;subset=all" rel="stylesheet" type="text/css">
-	{{-- Fonts END --}}
-
-	@css('/assets/font-awesome/css/font-awesome.min.css')
 	@css('/site/js/bootstrap/3.3.5/css/bootstrap.min.css')

-	{{-- Theme styles START --}}
+	<!-- Font Awesome Icons -->
+	@css('/plugin/font-awesome/css/font-awesome.min.css','font-awesome','app')
+	<!-- Theme style -->
 	@css('/site/css/components.css')
 	@css('/site/css/slider.css')
 	@css('/site/css/style.css')
 	@css('/site/css/style-responsive.css')
 	@css('/site/css/themes/blue.css')
 	@css('/site/css/custom.css')
-	{{-- Theme styles END --}}
+	<!-- Google Font: Source Sans Pro -->
+	<link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700|PT+Sans+Narrow|Source+Sans+Pro:200,300,400,600,700,900&amp;subset=all" rel="stylesheet" type="text/css">
+	@css('/site/js/bootstrap/3.3.5/css/bootstrap.min.css')

-	{{-- Styles --}}
+	<!-- STYLESHEETS -->
 	{!! Asset::styles() !!}
 </head>
--- a/resources/theme/frontend/metronic/layouts/partials/mainheader.blade.php
+++ b/resources/theme/frontend/metronic/layouts/partials/mainheader.blade.php
@@ -62,8 +62,8 @@
 							<div class="input-group">
 								<input type="text" placeholder="Search" class="form-control">
 								<span class="input-group-btn">
-										<button class="btn btn-primary" type="submit">Search</button>
-									</span>
+									<button class="btn btn-primary" type="submit">Search</button>
+								</span>
 							</div>
 						</form>
 					</div>
--- a/resources/theme/frontend/metronic/layouts/partials/scripts.blade.php
+++ b/resources/theme/frontend/metronic/layouts/partials/scripts.blade.php
@@ -1,2 +1,10 @@
-<!-- Compiled app javascript -->
-{{-- <script src="{{ url (mix('/js/app.js')) }}"></script> --}}
+<!-- REQUIRED JS SCRIPTS -->
+
+<script type="text/javascript">
+	// Our CSRF token to each interaction
+	$.ajaxSetup({
+		headers: {
+			'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+		}
+	});
+</script>
--- a/resources/theme/frontend/metronic/order.blade.php
+++ b/resources/theme/frontend/metronic/order.blade.php
@@ -271,7 +271,7 @@
@endsection

@section('page-scripts')
-	@js('/js/jqBootstrapValidation.js','jq-validation','jquery')
+	@js('/plugin/jqBootstrapValidation/jqBootstrapValidation.js','jq-validation','jquery')
 	<script src="//code.jquery.com/ui/1.12.1/jquery-ui.js"></script>

 	<script>
--- a/resources/theme/frontend/metronic/welcome.blade.php
+++ b/resources/theme/frontend/metronic/welcome.blade.php
@@ -76,8 +76,7 @@
 </body>
@endsection

-@section('scripts')
-
+@section('page-scripts')
 	<script type="text/javascript">
        jQuery(document).ready(function() {
            Layout.init();