diff --git a/packages/Webkul/Admin/package.json b/packages/Webkul/Admin/package.json index 55fed7df7..796638709 100644 --- a/packages/Webkul/Admin/package.json +++ b/packages/Webkul/Admin/package.json @@ -1,20 +1,23 @@ { - "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 + "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" + }, + "dependencies": { + "vee-validate": "^2.1.0-beta.3" + } +} diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index 72478898c..034d5c951 100644 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -22,6 +22,11 @@ Route::group(['middleware' => ['web']], function () { 'view' => 'admin::users.index' ])->name('admin.users.index'); + Route::get('/account', 'Webkul\User\Http\Controllers\AccountController@edit')->defaults('_config', [ + 'view' => 'admin::account.edit' + ])->name('admin.account.edit'); + + Route::put('/account', 'Webkul\User\Http\Controllers\AccountController@update')->name('admin.account.update'); Route::get('/permissions', 'Webkul\User\Http\Controllers\PermissionController@index')->defaults('_config', [ 'view' => 'admin::permissions.index' diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php index 94692fb4b..08e93f427 100644 --- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php @@ -50,13 +50,16 @@ class AdminServiceProvider extends ServiceProvider Event::listen('admin.menu.build', function($menu) { $menu->add('dashboard', 'Dashboard', route('admin.dashboard.index'), 1, 'icon-dashboard'); - $menu->add('configuration', 'Configure', route('admin.users.index'), 6, 'icon-configuration'); + $menu->add('configuration', 'Configure', route('admin.account.edit'), 6, 'icon-configuration'); + + $menu->add('configuration.account', 'My Account', route('admin.account.edit'), 1, ''); $menu->add('settings', 'Settings', '', 6, 'icon-settings'); $menu->add('settings.users', 'Users', route('admin.users.index'), 1, ''); $menu->add('settings.roles', 'Roles', route('admin.permissions.index'), 2, ''); + }); } @@ -73,21 +76,21 @@ class AdminServiceProvider extends ServiceProvider }); view()->composer('admin::layouts.nav-aside', function($view) { - $menu = current(Event::fire('admin.menu.create')); - - foreach ($menu->items as $item) { - $currentKey = current(explode('.', $menu->currentKey)); + $parentMenu = current(Event::fire('admin.menu.create')); + $menu = []; + foreach ($parentMenu->items as $item) { + $currentKey = current(explode('.', $parentMenu->currentKey)); if($item['key'] != $currentKey) continue; $menu = [ - 'items' => $menu->sortItems($item['children']), - 'current' => $menu->current, - 'currentKey' => $menu->currentKey + 'items' => $parentMenu->sortItems($item['children']), + 'current' => $parentMenu->current, + 'currentKey' => $parentMenu->currentKey ]; - - $view->with('menu', $menu); } + + $view->with('menu', $menu); }); } diff --git a/packages/Webkul/Admin/src/Resources/assets/js/app.js b/packages/Webkul/Admin/src/Resources/assets/js/app.js index e69de29bb..96aedec71 100644 --- a/packages/Webkul/Admin/src/Resources/assets/js/app.js +++ b/packages/Webkul/Admin/src/Resources/assets/js/app.js @@ -0,0 +1,24 @@ +window.jQuery = window.$ = $ = require('jquery'); +window.Vue = require('vue'); +window.VeeValidate = require('vee-validate'); + +Vue.use(VeeValidate); + +$(document).ready(function () { + const form = new Vue({ + el: 'form', + + mounted: function() { + this.addServerErrors() + }, + + methods: { + addServerErrors: function() { + // this.errors.add('email', "Hello") + // for (var key in serverErrors) { + // this.errors.add(key, serverErrors[key][0]) + // } + } + } + }); +}); \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss index 6fb6e75de..f1ff25532 100644 --- a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss @@ -13,30 +13,6 @@ body { font-weight: 500; } -* { - box-sizing: border-box; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -*:focus { - outline: none; -} - -a:link, -a:hover, -a:visited, -a:focus, -a:active { - text-decoration: none; -} - -ul { - margin: 0; - padding: 0; - list-style: none; -} - .navbar-top { height: 60px; background: #FFFFFF; @@ -168,7 +144,24 @@ ul { } .content { - padding: 15px; - padding-left: 295px; + padding: 25px; + padding-left: 305px; + + .page-header { + display: block; + + .page-title { + float: left; + } + + .page-action { + float: right; + } + } + + .page-content { + width: 100%; + display: inline-block; + } } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/account/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/account/edit.blade.php new file mode 100644 index 000000000..b234aa53b --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/account/edit.blade.php @@ -0,0 +1,53 @@ +@extends('admin::layouts.master') + +@section('content') + @include ('admin::layouts.nav-aside') + +