Asset url

update

resources/views/layouts/content.blade.php

@@ -24,7 +24,7 @@
 @endsection
 
 @section('app')
-    {!! Dcat\Admin\Admin::assets()->renderStyle() !!}
+    {!! Dcat\Admin\Admin::asset()->renderStyle() !!}
 
     <div class="content-header">
         @yield('content-header')
@@ -40,7 +40,7 @@
         {!! admin_section(AdminSection::APP_INNER_AFTER) !!}
     </div>
 
-    {!! Dcat\Admin\Admin::assets()->renderScript() !!}
+    {!! Dcat\Admin\Admin::asset()->renderScript() !!}
     {!! Dcat\Admin\Admin::html() !!}
 @endsection
 
@@ -51,8 +51,8 @@
 
     <script>Dcat.pjaxResponded()</script>
 
-    {!! Dcat\Admin\Admin::assets()->renderCss() !!}
-    {!! Dcat\Admin\Admin::assets()->renderJs() !!}
+    {!! Dcat\Admin\Admin::asset()->renderCss() !!}
+    {!! Dcat\Admin\Admin::asset()->renderJs() !!}
 
     @yield('app')
 @endif

resources/views/layouts/form-content.blade.php

@@ -12,14 +12,14 @@
     <section class="form-content">{!! $content !!}</section>
 @endsection
 
-{!! Dcat\Admin\Admin::assets()->renderCss() !!}
-{!! Dcat\Admin\Admin::assets()->renderJs() !!}
+{!! Dcat\Admin\Admin::asset()->renderCss() !!}
+{!! Dcat\Admin\Admin::asset()->renderJs() !!}
 
-{!! Dcat\Admin\Admin::assets()->renderStyle() !!}
+{!! Dcat\Admin\Admin::asset()->renderStyle() !!}
 
 @yield('content')
 
-{!! Dcat\Admin\Admin::assets()->renderScript() !!}
+{!! Dcat\Admin\Admin::asset()->renderScript() !!}
 {!! Dcat\Admin\Admin::html() !!}
 
 {{--select2下拉选框z-index必须大于弹窗的值--}}

resources/views/layouts/full-content.blade.php

@@ -10,7 +10,7 @@
 @endsection
 
 @section('app')
-    {!! Dcat\Admin\Admin::assets()->renderStyle() !!}
+    {!! Dcat\Admin\Admin::asset()->renderStyle() !!}
 
     <div class="content-body" id="app">
         {{-- 页面埋点--}}
@@ -22,7 +22,7 @@
         {!! admin_section(AdminSection::APP_INNER_AFTER) !!}
     </div>
 
-    {!! Dcat\Admin\Admin::assets()->renderScript() !!}
+    {!! Dcat\Admin\Admin::asset()->renderScript() !!}
     {!! Dcat\Admin\Admin::html() !!}
 @endsection
 
@@ -34,8 +34,8 @@
 
     <script>Dcat.pjaxResponded();</script>
 
-    {!! Dcat\Admin\Admin::assets()->renderCss() !!}
-    {!! Dcat\Admin\Admin::assets()->renderJs() !!}
+    {!! Dcat\Admin\Admin::asset()->renderCss() !!}
+    {!! Dcat\Admin\Admin::asset()->renderJs() !!}
 
     @yield('app')
 @endif

resources/views/layouts/full-page.blade.php

@@ -20,9 +20,9 @@
 
     {!! admin_section(\AdminSection::HEAD) !!}
 
-    {!! Dcat\Admin\Admin::assets()->renderCss() !!}
+    {!! Dcat\Admin\Admin::asset()->renderCss() !!}
 
-    {!! Dcat\Admin\Admin::assets()->renderHeaderJs() !!}
+    {!! Dcat\Admin\Admin::asset()->renderHeaderJs() !!}
 
     @yield('head')
 </head>
@@ -46,7 +46,7 @@
 
 {!! admin_section(\AdminSection::BODY_INNER_AFTER) !!}
 
-{!! Dcat\Admin\Admin::assets()->renderJs() !!}
+{!! Dcat\Admin\Admin::asset()->renderJs() !!}
 
 </body>
 </html>

resources/views/layouts/page.blade.php

@@ -20,9 +20,9 @@
 
     {!! admin_section(\AdminSection::HEAD) !!}
 
-    {!! Dcat\Admin\Admin::assets()->renderCss() !!}
+    {!! Dcat\Admin\Admin::asset()->renderCss() !!}
 
-    {!! Dcat\Admin\Admin::assets()->renderHeaderJs() !!}
+    {!! Dcat\Admin\Admin::asset()->renderHeaderJs() !!}
 
     <!--[if lt IE 9]>
     <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>

resources/views/layouts/vertical.blade.php

@@ -70,7 +70,7 @@
     {!! admin_section(\AdminSection::BODY_INNER_AFTER) !!}
 
         <!-- REQUIRED JS SCRIPTS -->
-    {!! Dcat\Admin\Admin::assets()->renderJs() !!}
+    {!! Dcat\Admin\Admin::asset()->renderJs() !!}
 
 </body>
 

src/AdminServiceProvider.php

@@ -2,7 +2,7 @@
 
 namespace Dcat\Admin;
 
-use Dcat\Admin\Layout\Assets;
+use Dcat\Admin\Layout\Asset;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Layout\Menu;
 use Dcat\Admin\Layout\Navbar;
@@ -146,7 +146,7 @@ class AdminServiceProvider extends ServiceProvider
             $this->publishes([__DIR__.'/../config' => config_path()], 'dcat-admin-config');
             $this->publishes([__DIR__.'/../resources/lang' => resource_path('lang')], 'dcat-admin-lang');
             $this->publishes([__DIR__.'/../database/migrations' => database_path('migrations')], 'dcat-admin-migrations');
-            $this->publishes([__DIR__.'/../resources/assets/dist' => public_path(Admin::assets()->getRealPath('@admin'))], 'dcat-admin-assets');
+            $this->publishes([__DIR__.'/../resources/assets/dist' => public_path(Admin::asset()->getRealPath('@admin'))], 'dcat-admin-assets');
         }
     }
 
@@ -197,7 +197,7 @@ class AdminServiceProvider extends ServiceProvider
 
     protected function registerServices()
     {
-        $this->app->singleton('admin.assets', Assets::class);
+        $this->app->singleton('admin.asset', Asset::class);
         $this->app->singleton('admin.color', Color::class);
         $this->app->singleton('admin.sections', SectionManager::class);
         $this->app->singleton('admin.navbar', Navbar::class);

src/Console/Development/LinkCommand.php

@@ -31,7 +31,7 @@ class LinkCommand extends Command
 
     protected function linkAssets()
     {
-        $basePath = Admin::assets()->getRealPath('@admin');
+        $basePath = Admin::asset()->getRealPath('@admin');
         $publicPath = public_path($basePath);
 
         if (! is_dir($publicPath.'/..')) {
@@ -42,7 +42,7 @@ class LinkCommand extends Command
             return $this->error("The \"{$basePath}\" directory already exists.");
         }
 
-        $distPath = realpath(__DIR__ . '/../../resources/dist');
+        $distPath = realpath(__DIR__ . '/../../../resources/dist');
 
         $this->laravel->make('files')->link(
             $distPath, $publicPath

src/Console/ImportCommand.php

@@ -72,7 +72,7 @@ class ImportCommand extends VendorPublishCommand
             $this->publishItem(
                 $assets,
                 public_path(
-                    Admin::assets()->getRealPath('@extension').'/'.$extension::NAME
+                    Admin::asset()->getRealPath('@extension').'/'.$extension::NAME
                 )
             );
         }

src/Console/UninstallCommand.php

@@ -45,8 +45,8 @@ class UninstallCommand extends Command
     protected function removeFilesAndDirectories()
     {
         $this->laravel['files']->deleteDirectory(config('admin.directory'));
-        $this->laravel['files']->deleteDirectory(public_path(Admin::assets()->getRealPath('@extension')));
-        $this->laravel['files']->deleteDirectory(public_path(Admin::assets()->getRealPath('@admin')));
+        $this->laravel['files']->deleteDirectory(public_path(Admin::asset()->getRealPath('@extension')));
+        $this->laravel['files']->deleteDirectory(public_path(Admin::asset()->getRealPath('@admin')));
         $this->laravel['files']->delete(config_path('admin.php'));
     }
 }

src/Traits/HasAssets.php

@@ -26,11 +26,11 @@ trait HasAssets
     }
 
     /**
-     * @return \Dcat\Admin\Layout\Assets
+     * @return \Dcat\Admin\Layout\Asset
      */
-    public static function assets()
+    public static function asset()
     {
-        return app('admin.assets');
+        return app('admin.asset');
     }
 
     /**
@@ -41,7 +41,7 @@ trait HasAssets
      */
     public static function collectAssets(string $name, string $type = '')
     {
-        static::assets()->collect($name, $type);
+        static::asset()->collect($name, $type);
     }
 
     /**
@@ -53,7 +53,7 @@ trait HasAssets
      */
     public static function css($css)
     {
-        static::assets()->css($css);
+        static::asset()->css($css);
     }
 
     /**
@@ -65,7 +65,7 @@ trait HasAssets
      */
     public static function baseCss(array $css)
     {
-        static::assets()->baseCss($css);
+        static::asset()->baseCss($css);
     }
 
     /**
@@ -77,7 +77,7 @@ trait HasAssets
      */
     public static function js($js)
     {
-        static::assets()->js($js);
+        static::asset()->js($js);
     }
 
     /**
@@ -89,7 +89,7 @@ trait HasAssets
      */
     public static function headerJs($js)
     {
-        static::assets()->headerJs($js);
+        static::asset()->headerJs($js);
     }
 
     /**
@@ -101,7 +101,7 @@ trait HasAssets
      */
     public static function baseJs(array $js)
     {
-        static::assets()->baseJs($js);
+        static::asset()->baseJs($js);
     }
 
     /**
@@ -111,7 +111,7 @@ trait HasAssets
      */
     public static function script($script)
     {
-        static::assets()->script($script);
+        static::asset()->script($script);
     }
 
     /**
@@ -121,7 +121,7 @@ trait HasAssets
      */
     public static function style($style)
     {
-        static::assets()->style($style);
+        static::asset()->style($style);
     }
 
     /**
@@ -131,6 +131,6 @@ trait HasAssets
      */
     public static function fonts($font)
     {
-        static::assets()->fonts = $font;
+        static::asset()->fonts = $font;
     }
 }

src/Widgets/DialogForm.php

@@ -306,7 +306,7 @@ JS
         Admin::baseJs([]);
         Admin::fonts(false);
 
-        Admin::assets()->full();
+        Admin::asset()->full();
 
         $form->wrap(function ($v) {
             return $v;