diff --git a/composer.json b/composer.json
index cc2925658..4f2fa1d2c 100644
--- a/composer.json
+++ b/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": {
diff --git a/config/app.php b/config/app.php
index 8a6d73db1..2114e1401 100644
--- a/config/app.php
+++ b/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
],
/*
diff --git a/packages/Webkul/Admin/composer.json b/packages/Webkul/Admin/composer.json
index b7b04cbef..060a74a2f 100644
--- a/packages/Webkul/Admin/composer.json
+++ b/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"
}
diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php
index fed88baf1..b7f562d62 100644
--- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php
+++ b/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');
diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss
index d398bd7fe..02a014f25 100644
--- a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss
+++ b/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);
}
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
index 3a43f0200..ad944e17a 100644
--- a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
@@ -7,8 +7,7 @@
-
-
+
@yield('css')
diff --git a/packages/Webkul/Admin/webpack.mix.js b/packages/Webkul/Admin/webpack.mix.js
index a4c124111..57c80ae6c 100644
--- a/packages/Webkul/Admin/webpack.mix.js
+++ b/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');
diff --git a/packages/Webkul/Ui/.gitignore b/packages/Webkul/Ui/.gitignore
new file mode 100644
index 000000000..30bc16279
--- /dev/null
+++ b/packages/Webkul/Ui/.gitignore
@@ -0,0 +1 @@
+/node_modules
\ No newline at end of file
diff --git a/packages/Webkul/Ui/composer.json b/packages/Webkul/Ui/composer.json
new file mode 100644
index 000000000..8bb57cdef
--- /dev/null
+++ b/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"
+}
diff --git a/packages/Webkul/Ui/package.json b/packages/Webkul/Ui/package.json
new file mode 100644
index 000000000..55fed7df7
--- /dev/null
+++ b/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"
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Ui/publishable/assets/images/preview.png b/packages/Webkul/Ui/publishable/assets/images/preview.png
new file mode 100644
index 000000000..8af17a802
Binary files /dev/null and b/packages/Webkul/Ui/publishable/assets/images/preview.png differ
diff --git a/packages/Webkul/Ui/src/Providers/.gitkeep b/packages/Webkul/Ui/src/Providers/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/Webkul/Ui/src/Providers/UiServiceProvider.php b/packages/Webkul/Ui/src/Providers/UiServiceProvider.php
new file mode 100644
index 000000000..3be8b7a67
--- /dev/null
+++ b/packages/Webkul/Ui/src/Providers/UiServiceProvider.php
@@ -0,0 +1,29 @@
+publishes([
+ __DIR__ . '/../../publishable/assets' => public_path('vendor/webkul/ui/assets'),
+ ], 'public');
+ }
+
+ /**
+ * Register services.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ }
+}
diff --git a/packages/Webkul/Ui/src/Resources/assets/.gitkeep b/packages/Webkul/Ui/src/Resources/assets/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/Webkul/Ui/src/Resources/assets/images/logo.png b/packages/Webkul/Ui/src/Resources/assets/images/logo.png
new file mode 100644
index 000000000..8af17a802
Binary files /dev/null and b/packages/Webkul/Ui/src/Resources/assets/images/logo.png differ
diff --git a/packages/Webkul/Ui/webpack.mix.js b/packages/Webkul/Ui/webpack.mix.js
new file mode 100644
index 000000000..6b096e739
--- /dev/null
+++ b/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();
+}
\ No newline at end of file
diff --git a/packages/Webkul/User/composer.json b/packages/Webkul/User/composer.json
index 5920e837c..de612856b 100644
--- a/packages/Webkul/User/composer.json
+++ b/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"
}
diff --git a/public/css/admin.css b/public/css/admin.css
deleted file mode 100644
index ddbe783dc..000000000
--- a/public/css/admin.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.navbar-top {
- height: 60px;
-}
-
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index d714c5b74..72bfa4180 100644
--- a/public/mix-manifest.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/vendor/webkul/admin/assets/css/admin.css b/public/vendor/webkul/admin/assets/css/admin.css
new file mode 100644
index 000000000..6fb6b7c9d
--- /dev/null
+++ b/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);
+}
+
diff --git a/public/js/admin.js b/public/vendor/webkul/admin/assets/js/admin.js
similarity index 100%
rename from public/js/admin.js
rename to public/vendor/webkul/admin/assets/js/admin.js
diff --git a/public/vendor/webkul/admin/assets/mix-manifest.json b/public/vendor/webkul/admin/assets/mix-manifest.json
new file mode 100644
index 000000000..9d0d5d564
--- /dev/null
+++ b/public/vendor/webkul/admin/assets/mix-manifest.json
@@ -0,0 +1,4 @@
+{
+ "/js/admin.js": "/js/admin.js",
+ "/css/admin.css": "/css/admin.css"
+}
\ No newline at end of file
diff --git a/public/vendor/webkul/ui/assets/images/preview.png b/public/vendor/webkul/ui/assets/images/preview.png
new file mode 100644
index 000000000..8af17a802
Binary files /dev/null and b/public/vendor/webkul/ui/assets/images/preview.png differ