FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename mix_public() to public_mix() for consistency with public_asset()

Browse Source
This commit is contained in:
Nabeel Shahzad
2019-08-28 10:52:35 -04:00
parent 09f3e3cfdf
commit e62e4a865d
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers.php
View File

@@ -167,8 +167,8 @@ if (!function_exists('public_asset')) {
/* /*
* Call mix() and then prepend the proper public URL * Call mix() and then prepend the proper public URL
*/ */
if (!function_exists('mix_public')) { if (!function_exists('public_mix')) {
function mix_public($path, array $parameters = []) function public_mix($path, array $parameters = [])
{ {
try { try {
$path = mix($path); $path = mix($path);

10
resources/views/admin/app.blade.php
View File

@@ -21,9 +21,9 @@
<link href='https://fonts.googleapis.com/css?family=Muli:400,300' rel='stylesheet' type='text/css'/> <link href='https://fonts.googleapis.com/css?family=Muli:400,300' rel='stylesheet' type='text/css'/>
<link href="https://fonts.googleapis.com/css?family=Roboto:400,700,300" rel="stylesheet" type="text/css"/> <link href="https://fonts.googleapis.com/css?family=Roboto:400,700,300" rel="stylesheet" type="text/css"/>
<link rel="stylesheet" href="{{ mix_public('/assets/global/css/vendor.css') }}"/> <link rel="stylesheet" href="{{ public_mix('/assets/global/css/vendor.css') }}"/>
<link rel="stylesheet" href="{{ mix_public('/assets/admin/css/vendor.css') }}"/> <link rel="stylesheet" href="{{ public_mix('/assets/admin/css/vendor.css') }}"/>
<link rel="stylesheet" href="{{ mix_public('/assets/admin/css/admin.css') }}"/> <link rel="stylesheet" href="{{ public_mix('/assets/admin/css/admin.css') }}"/>
<style type="text/css"> <style type="text/css">
@yield('css') @yield('css')
@@ -91,8 +91,8 @@
</body> </body>
<script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script> <script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script>
<script defer src="{{ mix_public('/assets/admin/js/vendor.js') }}"></script> <script defer src="{{ public_mix('/assets/admin/js/vendor.js') }}"></script>
<script defer src="{{ mix_public('/assets/admin/js/app.js') }}"></script> <script defer src="{{ public_mix('/assets/admin/js/app.js') }}"></script>
<script> <script>
/** /**

6
resources/views/layouts/default/app.blade.php
View File

@@ -20,7 +20,7 @@
<link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/> <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
{{-- Start of the required files in the head block --}} {{-- Start of the required files in the head block --}}
<link href="{{ mix_public('/assets/global/css/vendor.css') }}" rel="stylesheet"/> <link href="{{ public_mix('/assets/global/css/vendor.css') }}" rel="stylesheet"/>
<style type="text/css"> <style type="text/css">
@yield('css') @yield('css')
</style> </style>
@@ -84,8 +84,8 @@
<script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script> <script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script>
{{-- Start of the required tags block. Don't remove these or things will break!! --}} {{-- Start of the required tags block. Don't remove these or things will break!! --}}
<script src="{{ mix_public('/assets/global/js/vendor.js') }}"></script> <script src="{{ public_mix('/assets/global/js/vendor.js') }}"></script>
<script src="{{ mix_public('/assets/frontend/js/app.js') }}"></script> <script src="{{ public_mix('/assets/frontend/js/app.js') }}"></script>
@yield('scripts') @yield('scripts')
{{-- {{--