From e62e4a865d41b8d7e7261f28060a94b9a6639d58 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Wed, 28 Aug 2019 10:52:35 -0400
Subject: [PATCH] Rename mix_public() to public_mix() for consistency with
 public_asset()

---
 app/helpers.php                               |  4 ++--
 resources/views/admin/app.blade.php           | 10 +++++-----
 resources/views/layouts/default/app.blade.php |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/helpers.php b/app/helpers.php
index e0284c77..4c5efdc7 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -167,8 +167,8 @@ if (!function_exists('public_asset')) {
 /*
  * Call mix() and then prepend the proper public URL
  */
-if (!function_exists('mix_public')) {
-    function mix_public($path, array $parameters = [])
+if (!function_exists('public_mix')) {
+    function public_mix($path, array $parameters = [])
     {
         try {
             $path = mix($path);
diff --git a/resources/views/admin/app.blade.php b/resources/views/admin/app.blade.php
index f3a5eb90..b8b7557e 100644
--- a/resources/views/admin/app.blade.php
+++ b/resources/views/admin/app.blade.php
@@ -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=Roboto:400,700,300" rel="stylesheet" type="text/css"/>
 
-    <link rel="stylesheet" href="{{ mix_public('/assets/global/css/vendor.css') }}"/>
-    <link rel="stylesheet" href="{{ mix_public('/assets/admin/css/vendor.css') }}"/>
-    <link rel="stylesheet" href="{{ mix_public('/assets/admin/css/admin.css') }}"/>
+    <link rel="stylesheet" href="{{ public_mix('/assets/global/css/vendor.css') }}"/>
+    <link rel="stylesheet" href="{{ public_mix('/assets/admin/css/vendor.css') }}"/>
+    <link rel="stylesheet" href="{{ public_mix('/assets/admin/css/admin.css') }}"/>
 
     <style type="text/css">
     @yield('css')
@@ -91,8 +91,8 @@
 </body>
 
 <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="{{ mix_public('/assets/admin/js/app.js') }}"></script>
+<script defer src="{{ public_mix('/assets/admin/js/vendor.js') }}"></script>
+<script defer src="{{ public_mix('/assets/admin/js/app.js') }}"></script>
 
 <script>
 /**
diff --git a/resources/views/layouts/default/app.blade.php b/resources/views/layouts/default/app.blade.php
index 7045e6b6..e7d8a12a 100644
--- a/resources/views/layouts/default/app.blade.php
+++ b/resources/views/layouts/default/app.blade.php
@@ -20,7 +20,7 @@
     <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
 
     {{-- 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">
     @yield('css')
     </style>
@@ -84,8 +84,8 @@
 <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!! --}}
-<script src="{{ mix_public('/assets/global/js/vendor.js') }}"></script>
-<script src="{{ mix_public('/assets/frontend/js/app.js') }}"></script>
+<script src="{{ public_mix('/assets/global/js/vendor.js') }}"></script>
+<script src="{{ public_mix('/assets/frontend/js/app.js') }}"></script>
 @yield('scripts')
 
 {{--