Merge pull request #167 from avored/developed

Developed
avored · Dec 21, 2020 · 19358f1 · 19358f1
2 parents 3d5556b + 1ce4fd6
commit 19358f1
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 16,350 deletions.
diff --git a/dist/js/app.js b/dist/js/app.js
diff --git a/dist/js/app.js.LICENSE.txt b/dist/js/app.js.LICENSE.txt
@@ -1,7 +1,7 @@
 /*!
- * Chart.js v2.9.3
+ * Chart.js v2.9.4
  * https://www.chartjs.org
- * (c) 2019 Chart.js Contributors
+ * (c) 2020 Chart.js Contributors
  * Released under the MIT License
  */
 
@@ -12,13 +12,13 @@
  */
 
 /*!
- * vue-i18n v8.22.0 
+ * vue-i18n v8.22.2 
  * (c) 2020 kazuya kawaguchi
  * Released under the MIT License.
  */
 
 /*!
- * vuex v3.5.1
+ * vuex v3.6.0
  * (c) 2020 Evan You
  * @license MIT
  */

diff --git a/dist/js/avored.js b/dist/js/avored.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -51,11 +51,11 @@
     </div>
     @if(env('APP_ENV') === 'testing' && file_exists(public_path('mix-manifest.json')))
         <script src="{{ mix('/vendor/avored/js/avored.js') }}"></script>
-        @push('scripts')
+        @stack('scripts')
         <script src="{{ mix('/vendor/avored/js/app.js') }}"></script>
     @else
         <script src="{{ route('admin.script', 'avored.avored.js') }}"></script>
-        @push('scripts')
+        @stack('scripts')
         <script src="{{ route('admin.script', 'avored.app.js') }}"></script>
     @endif
 

diff --git a/webpack.mix.js b/webpack.mix.js
@@ -29,17 +29,17 @@ require('laravel-mix-alias')
  }
 
 
-// let publicPath = '../../../public'
-let publicPath = 'dist/'
+let publicPath = '../../../public'
+// let publicPath = 'dist/'
 
 mix.setPublicPath(publicPath)
 
 
 
 mix.alias({'@': 'resources/js'})
 
-// filePath = 'vendor/avored/'
-let filePath = ''
+filePath = 'vendo   r/avored/'
+// let filePath = ''
 
 /******** AVORED ADMIN JS  **********/
 

diff --git a/yarn.lock b/yarn.lock