Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
laravel-adminpanel
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
laravel-adminpanel
Commits
2de3c975
Commit
2de3c975
authored
Mar 13, 2019
by
Viral Solani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reslove blade compilation error for laravel 5.8
parent
37ad12d0
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
57 additions
and
55 deletions
+57
-55
BladeServiceProvider.php
app/Providers/BladeServiceProvider.php
+3
-3
composer.lock
composer.lock
+5
-5
app.php
config/app.php
+40
-40
app.blade.php
resources/views/backend/layouts/app.blade.php
+3
-2
app.blade.php
resources/views/frontend/layouts/app.blade.php
+4
-3
master.blade.php
resources/views/vendor/log-viewer/_template/master.blade.php
+2
-2
No files found.
app/Providers/BladeServiceProvider.php
View file @
2de3c975
...
@@ -20,14 +20,14 @@ class BladeServiceProvider extends ServiceProvider
...
@@ -20,14 +20,14 @@ class BladeServiceProvider extends ServiceProvider
/**
/**
* Register any misc. blade extensions.
* Register any misc. blade extensions.
*/
*/
public
function
register
()
public
function
boot
()
{
{
/*
/*
* The block of code inside this directive indicates
* The block of code inside this directive indicates
* the chosen language requests RTL support.
* the chosen language requests RTL support.
*/
*/
Blade
::
directive
(
'langRTL'
,
function
(
)
{
Blade
::
if
(
'langrtl'
,
function
(
$session_identifier
=
'lang-rtl'
)
{
return
"<?php if (session()->has('lang-rtl')): ?>"
;
return
session
()
->
has
(
$session_identifier
)
;
});
});
}
}
}
}
composer.lock
View file @
2de3c975
...
@@ -1303,16 +1303,16 @@
...
@@ -1303,16 +1303,16 @@
},
},
{
{
"name": "laravel/framework",
"name": "laravel/framework",
"version": "v5.8.
3
",
"version": "v5.8.
4
",
"source": {
"source": {
"type": "git",
"type": "git",
"url": "https://github.com/laravel/framework.git",
"url": "https://github.com/laravel/framework.git",
"reference": "d
36d74acd3added5abbe7e7a84342b54bb0b0521
"
"reference": "d
651f8bd25c6baf7ae4913bc51f02849fad4e925
"
},
},
"dist": {
"dist": {
"type": "zip",
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/d
36d74acd3added5abbe7e7a84342b54bb0b0521
",
"url": "https://api.github.com/repos/laravel/framework/zipball/d
651f8bd25c6baf7ae4913bc51f02849fad4e925
",
"reference": "d
36d74acd3added5abbe7e7a84342b54bb0b0521
",
"reference": "d
651f8bd25c6baf7ae4913bc51f02849fad4e925
",
"shasum": ""
"shasum": ""
},
},
"require": {
"require": {
...
@@ -1446,7 +1446,7 @@
...
@@ -1446,7 +1446,7 @@
"framework",
"framework",
"laravel"
"laravel"
],
],
"time": "2019-03-
05T13:51:19
+00:00"
"time": "2019-03-
12T13:33:14
+00:00"
},
},
{
{
"name": "laravel/socialite",
"name": "laravel/socialite",
...
...
config/app.php
View file @
2de3c975
...
@@ -191,7 +191,7 @@ return [
...
@@ -191,7 +191,7 @@ return [
App\Providers\AccessServiceProvider
::
class
,
App\Providers\AccessServiceProvider
::
class
,
App\Providers\AppServiceProvider
::
class
,
App\Providers\AppServiceProvider
::
class
,
App\Providers\AuthServiceProvider
::
class
,
App\Providers\AuthServiceProvider
::
class
,
//
App\Providers\BladeServiceProvider::class,
App\Providers\BladeServiceProvider
::
class
,
//App\Providers\BroadcastServiceProvider::class,
//App\Providers\BroadcastServiceProvider::class,
App\Providers\ComposerServiceProvider
::
class
,
App\Providers\ComposerServiceProvider
::
class
,
App\Providers\EventServiceProvider
::
class
,
App\Providers\EventServiceProvider
::
class
,
...
@@ -214,51 +214,51 @@ return [
...
@@ -214,51 +214,51 @@ return [
*/
*/
'aliases'
=>
[
'aliases'
=>
[
'App'
=>
Illuminate\Support\Facades\App
::
class
,
'App'
=>
Illuminate\Support\Facades\App
::
class
,
'Artisan'
=>
Illuminate\Support\Facades\Artisan
::
class
,
'Artisan'
=>
Illuminate\Support\Facades\Artisan
::
class
,
'Auth'
=>
Illuminate\Support\Facades\Auth
::
class
,
'Auth'
=>
Illuminate\Support\Facades\Auth
::
class
,
'Blade'
=>
Illuminate\Support\Facades\Blade
::
class
,
'Blade'
=>
Illuminate\Support\Facades\Blade
::
class
,
'Broadcast'
=>
Illuminate\Support\Facades\Broadcast
::
class
,
'Broadcast'
=>
Illuminate\Support\Facades\Broadcast
::
class
,
'Bus'
=>
Illuminate\Support\Facades\Bus
::
class
,
'Bus'
=>
Illuminate\Support\Facades\Bus
::
class
,
'Cache'
=>
Illuminate\Support\Facades\Cache
::
class
,
'Cache'
=>
Illuminate\Support\Facades\Cache
::
class
,
'Config'
=>
Illuminate\Support\Facades\Config
::
class
,
'Config'
=>
Illuminate\Support\Facades\Config
::
class
,
'Cookie'
=>
Illuminate\Support\Facades\Cookie
::
class
,
'Cookie'
=>
Illuminate\Support\Facades\Cookie
::
class
,
'Crypt'
=>
Illuminate\Support\Facades\Crypt
::
class
,
'Crypt'
=>
Illuminate\Support\Facades\Crypt
::
class
,
'DB'
=>
Illuminate\Support\Facades\DB
::
class
,
'DB'
=>
Illuminate\Support\Facades\DB
::
class
,
'Eloquent'
=>
Illuminate\Database\Eloquent\Model
::
class
,
'Eloquent'
=>
Illuminate\Database\Eloquent\Model
::
class
,
'Event'
=>
Illuminate\Support\Facades\Event
::
class
,
'Event'
=>
Illuminate\Support\Facades\Event
::
class
,
'File'
=>
Illuminate\Support\Facades\File
::
class
,
'File'
=>
Illuminate\Support\Facades\File
::
class
,
'Gate'
=>
Illuminate\Support\Facades\Gate
::
class
,
'Gate'
=>
Illuminate\Support\Facades\Gate
::
class
,
'Hash'
=>
Illuminate\Support\Facades\Hash
::
class
,
'Hash'
=>
Illuminate\Support\Facades\Hash
::
class
,
'Lang'
=>
Illuminate\Support\Facades\Lang
::
class
,
'Lang'
=>
Illuminate\Support\Facades\Lang
::
class
,
'Log'
=>
Illuminate\Support\Facades\Log
::
class
,
'Log'
=>
Illuminate\Support\Facades\Log
::
class
,
'Mail'
=>
Illuminate\Support\Facades\Mail
::
class
,
'Mail'
=>
Illuminate\Support\Facades\Mail
::
class
,
'Notification'
=>
Illuminate\Support\Facades\Notification
::
class
,
'Notification'
=>
Illuminate\Support\Facades\Notification
::
class
,
'Password'
=>
Illuminate\Support\Facades\Password
::
class
,
'Password'
=>
Illuminate\Support\Facades\Password
::
class
,
'Queue'
=>
Illuminate\Support\Facades\Queue
::
class
,
'Queue'
=>
Illuminate\Support\Facades\Queue
::
class
,
'Redirect'
=>
Illuminate\Support\Facades\Redirect
::
class
,
'Redirect'
=>
Illuminate\Support\Facades\Redirect
::
class
,
'Redis'
=>
Illuminate\Support\Facades\Redis
::
class
,
'Redis'
=>
Illuminate\Support\Facades\Redis
::
class
,
'Request'
=>
Illuminate\Support\Facades\Request
::
class
,
'Request'
=>
Illuminate\Support\Facades\Request
::
class
,
'Response'
=>
Illuminate\Support\Facades\Response
::
class
,
'Response'
=>
Illuminate\Support\Facades\Response
::
class
,
'Route'
=>
Illuminate\Support\Facades\Route
::
class
,
'Route'
=>
Illuminate\Support\Facades\Route
::
class
,
'Schema'
=>
Illuminate\Support\Facades\Schema
::
class
,
'Schema'
=>
Illuminate\Support\Facades\Schema
::
class
,
'Session'
=>
Illuminate\Support\Facades\Session
::
class
,
'Session'
=>
Illuminate\Support\Facades\Session
::
class
,
'Storage'
=>
Illuminate\Support\Facades\Storage
::
class
,
'Storage'
=>
Illuminate\Support\Facades\Storage
::
class
,
'URL'
=>
Illuminate\Support\Facades\URL
::
class
,
'URL'
=>
Illuminate\Support\Facades\URL
::
class
,
'Validator'
=>
Illuminate\Support\Facades\Validator
::
class
,
'Validator'
=>
Illuminate\Support\Facades\Validator
::
class
,
'View'
=>
Illuminate\Support\Facades\View
::
class
,
'View'
=>
Illuminate\Support\Facades\View
::
class
,
/*
/*
* Third Party Aliases
* Third Party Aliases
*/
*/
'Active'
=>
HieuLe\Active\Facades\Active
::
class
,
'Active'
=>
HieuLe\Active\Facades\Active
::
class
,
'Breadcrumbs'
=>
DaveJamesMiller\Breadcrumbs\Facade
::
class
,
'Breadcrumbs'
=>
DaveJamesMiller\Breadcrumbs\Facade
::
class
,
'Captcha'
=>
Arcanedev\NoCaptcha\Facades\NoCaptcha
::
class
,
'Captcha'
=>
Arcanedev\NoCaptcha\Facades\NoCaptcha
::
class
,
'Form'
=>
Collective\Html\FormFacade
::
class
,
'Form'
=>
Collective\Html\FormFacade
::
class
,
'Gravatar'
=>
Creativeorange\Gravatar\Facades\Gravatar
::
class
,
'Gravatar'
=>
Creativeorange\Gravatar\Facades\Gravatar
::
class
,
'Html'
=>
Collective\Html\HtmlFacade
::
class
,
'Html'
=>
Collective\Html\HtmlFacade
::
class
,
'Socialite'
=>
Laravel\Socialite\Facades\Socialite
::
class
,
'Socialite'
=>
Laravel\Socialite\Facades\Socialite
::
class
,
'JWTAuth'
=>
Tymon\JWTAuth\Facades\JWTAuth
::
class
,
'JWTAuth'
=>
Tymon\JWTAuth\Facades\JWTAuth
::
class
,
//'Datatables' => Yajra\DataTables\Facades\DataTables::class
//'Datatables' => Yajra\DataTables\Facades\DataTables::class
],
],
];
];
resources/views/backend/layouts/app.blade.php
View file @
2de3c975
...
@@ -19,11 +19,12 @@
...
@@ -19,11 +19,12 @@
<!-- Check if the language is set to RTL, so apply the RTL layouts -->
<!-- Check if the language is set to RTL, so apply the RTL layouts -->
<!-- Otherwise apply the normal LTR layouts -->
<!-- Otherwise apply the normal LTR layouts -->
@lang
RTL
@lang
rtl
{{ Html::style(getRtlCss(mix('css/backend.css'))) }}
{{ Html::style(getRtlCss(mix('css/backend.css'))) }}
@else
@else
{{ Html::style(mix('css/backend.css')) }}
{{ Html::style(mix('css/backend.css')) }}
@endif
@endlangrtl
{{ Html::style(mix('css/backend-custom.css')) }}
{{ Html::style(mix('css/backend-custom.css')) }}
@yield('after-styles')
@yield('after-styles')
...
...
resources/views/frontend/layouts/app.blade.php
View file @
2de3c975
...
@@ -20,12 +20,13 @@
...
@@ -20,12 +20,13 @@
<!-- Check if the language is set to RTL, so apply the RTL layouts -->
<!-- Check if the language is set to RTL, so apply the RTL layouts -->
<!-- Otherwise apply the normal LTR layouts -->
<!-- Otherwise apply the normal LTR layouts -->
@lang
RTL
@lang
rtl
{{ Html::style(getRtlCss(mix('css/frontend.css'))) }}
{{ Html::style(getRtlCss(mix('css/frontend.css'))) }}
@else
@else
{{ Html::style(mix('css/frontend.css')) }}
{{ Html::style(mix('css/frontend.css')) }}
@endif
@endlangrtl
{!! Html::style('js/select2/select2.min.css') !!}
{!! Html::style('js/select2/select2.min.css') !!}
@yield('after-styles')
@yield('after-styles')
<!-- Scripts -->
<!-- Scripts -->
...
...
resources/views/vendor/log-viewer/_template/master.blade.php
View file @
2de3c975
...
@@ -13,11 +13,11 @@
...
@@ -13,11 +13,11 @@
<!-- Check if the language is set to RTL, so apply the RTL layouts -->
<!-- Check if the language is set to RTL, so apply the RTL layouts -->
<!-- Otherwise apply the normal LTR layouts -->
<!-- Otherwise apply the normal LTR layouts -->
@lang
RTL
@lang
rtl
{{ Html::style(getRtlCss(mix('css/backend.css'))) }}
{{ Html::style(getRtlCss(mix('css/backend.css'))) }}
@else
@else
{{ Html::style(mix('css/backend.css')) }}
{{ Html::style(mix('css/backend.css')) }}
@end
if
@end
langrtl
{!! Html::style('css/custom-style.css') !!}
{!! Html::style('css/custom-style.css') !!}
@yield('after-styles-end')
@yield('after-styles-end')
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment