Autoload issue fixed

composer.json

@@ -21,7 +21,8 @@
     },
     "replace": {
         "webkul/laravel-user": "self.version",
-        "webkul/laravel-admin": "self.version"
+        "webkul/laravel-admin": "self.version",
+        "webkul/laravel-ui": "self.version"
     },
     "autoload": {
         "classmap": [
@@ -29,9 +30,7 @@
             "database/factories"
         ],
         "psr-4": {
-            "App\\": "app/",
-            "Webkul\\User\\": "packages/Webkul/User/src",
-            "Webkul\\Admin\\": "packages/Webkul/Admin/src"
+            "App\\": "app/"
         }
     },
     "autoload-dev": {

config/app.php

@@ -158,12 +158,7 @@ return [
         App\Providers\AuthServiceProvider::class,
         // App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
-        App\Providers\RouteServiceProvider::class,
-
-        
-        Webkul\User\Providers\UserServiceProvider::class,
-        Webkul\Admin\Providers\AdminServiceProvider::class
-
+        App\Providers\RouteServiceProvider::class
     ],
 
     /*

packages/Webkul/Admin/composer.json

@@ -7,16 +7,22 @@
             "email": "jitendra@webkul.com"
         }
     ],
+    "require": {
+        "webkul/laravel-admin": "dev-master",
+        "webkul/laravel-ui": "dev-master"
+    },
+    "autoload": {
+        "psr-4": {
+            "Webkul\\Admin\\": "src/"
+        }
+    },
     "extra": {
         "laravel": {
             "providers": [
                 "Webkul\\Admin\\AdminServiceProvider"
             ],
-            "aliases": {
-                
-            }
+            "aliases": {}
         }
     },
-    "minimum-stability": "dev",
-    "require": {}
+    "minimum-stability": "dev"
 }

packages/Webkul/Admin/src/Providers/AdminServiceProvider.php

@@ -18,7 +18,7 @@ class AdminServiceProvider extends ServiceProvider
         include __DIR__ . '/../Http/routes.php';
 
         $this->publishes([
-            __DIR__ . '/../Resources/assets' => public_path('vendor/admin'),
+            __DIR__ . '/../../publishable/assets' => public_path('vendor/webkul/admin/assets'),
         ], 'public');
 
         $this->loadMigrationsFrom(__DIR__ . '/../Database/migrations');

packages/Webkul/Admin/src/Resources/assets/sass/app.scss

@@ -3,4 +3,6 @@
 
 .navbar-top  {
     height: 60px;
+    background: #FFFFFF;
+    box-shadow: 0 3px 6px 0 rgba(0,0,0,0.05);
 }

packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php

@@ -7,8 +7,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="csrf-token" content="{{ csrf_token() }}">
 
-        <!-- Laravel Mix - CSS File -->
-        <link rel="stylesheet" href="{{ asset('css/admin.css') }}">
+        <link rel="stylesheet" href="{{ asset('vendor/webkul/admin/assets/css/admin.css') }}">
 
         @yield('css')
         

packages/Webkul/Admin/webpack.mix.js

@@ -1,7 +1,8 @@
 const { mix } = require('laravel-mix');
 require('laravel-mix-merge-manifest');
 
-mix.setPublicPath('../../../public').mergeManifest();
+mix.setPublicPath('../../../public/vendor/webkul/admin/assets').mergeManifest();
+// mix.setPublicPath('publishable/assets').mergeManifest();
 
 mix.js(__dirname + '/src/Resources/assets/js/app.js', 'js/admin.js')
     .sass( __dirname + '/src/Resources/assets/sass/app.scss', 'css/admin.css');

packages/Webkul/Ui/.gitignore

@@ -0,0 +1 @@
+/node_modules

packages/Webkul/Ui/composer.json

@@ -0,0 +1,25 @@
+{
+    "name": "webkul/laravel-ui",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Jitendra Singh",
+            "email": "jitendra@webkul.com"
+        }
+    ],
+    "require": {},
+    "autoload": {
+        "psr-4": {
+            "Webkul\\Ui\\": "src/"
+        }
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Webkul\\Ui\\UiServiceProvider"
+            ],
+            "aliases": {}
+        }
+    },
+    "minimum-stability": "dev"
+}

packages/Webkul/Ui/package.json

@@ -0,0 +1,20 @@
+{
+    "private": true,
+    "scripts": {
+        "dev": "npm run development",
+        "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "watch-poll": "npm run watch -- --watch-poll",
+        "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "prod": "npm run production",
+        "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
+    },
+    "devDependencies": {
+        "axios": "^0.18",
+        "cross-env": "^5.1.4",
+        "laravel-mix": "^2.1",
+        "laravel-mix-merge-manifest": "^0.1.1",
+        "jquery": "^3.2",
+        "vue": "^2.1.10"
+    }
+}

packages/Webkul/Ui/src/Providers/UiServiceProvider.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Webkul\Ui\Providers;
+
+use Illuminate\Support\ServiceProvider;
+
+class UiServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        $this->publishes([
+            __DIR__ . '/../../publishable/assets' => public_path('vendor/webkul/ui/assets'),
+        ], 'public');
+    }
+
+    /**
+     * Register services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+    }
+}

packages/Webkul/Ui/webpack.mix.js

@@ -0,0 +1,12 @@
+const { mix } = require('laravel-mix');
+require('laravel-mix-merge-manifest');
+
+mix.setPublicPath('../../../public/vendor/webkul/ui/assets').mergeManifest();
+// mix.setPublicPath('publishable/assets').mergeManifest();
+
+mix.js(__dirname + '/src/Resources/assets/js/app.js', 'js/ui.js')
+    .sass( __dirname + '/src/Resources/assets/sass/app.scss', 'css/ui.css');
+
+if (mix.inProduction()) {
+    mix.version();
+}

packages/Webkul/User/composer.json

@@ -7,6 +7,12 @@
             "email": "jitendra@webkul.com"
         }
     ],
+    "require": {},
+    "autoload": {
+        "psr-4": {
+            "Webkul\\User\\": "src/"
+        }
+    },
     "extra": {
         "laravel": {
             "providers": [
@@ -17,6 +23,5 @@
             }
         }
     },
-    "minimum-stability": "dev",
-    "require": {}
+    "minimum-stability": "dev"
 }

public/css/admin.css

@@ -1,4 +0,0 @@
-.navbar-top {
-  height: 60px;
-}
-

public/mix-manifest.json

@@ -2,5 +2,9 @@
     "/js/app.js": "/js/app.js",
     "/css/app.css": "/css/app.css",
     "/js/admin.js": "/js/admin.js",
-    "/css/admin.css": "/css/admin.css"
+    "/css/admin.css": "/css/admin.css",
+    "/public/vendor/admin/js/admin.js": "/public/vendor/admin/js/admin.js",
+    "/public/vendor/admin/css/admin.css": "/public/vendor/admin/css/admin.css",
+    "/vendor/admin/js/admin.js": "/vendor/admin/js/admin.js",
+    "/vendor/admin/css/admin.css": "/vendor/admin/css/admin.css"
 }

public/vendor/webkul/admin/assets/css/admin.css

@@ -0,0 +1,7 @@
+.navbar-top {
+  height: 60px;
+  background: #FFFFFF;
+  -webkit-box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.05);
+          box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.05);
+}
+

public/vendor/webkul/admin/assets/mix-manifest.json

@@ -0,0 +1,4 @@
+{
+    "/js/admin.js": "/js/admin.js",
+    "/css/admin.css": "/css/admin.css"
+}