diff --git a/database/migrations/2021_12_15_104544_notifications.php b/database/migrations/2021_12_15_104544_notifications.php new file mode 100644 index 000000000..f18844341 --- /dev/null +++ b/database/migrations/2021_12_15_104544_notifications.php @@ -0,0 +1,35 @@ +increments('id'); + $table->string('type'); + $table->boolean('read')->default(0); + $table->integer('order_id')->unsigned(); + $table->foreign('order_id')->references('id')->on('orders')->onDelete('cascade'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('notifications'); + } +} diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php index a8b8f2ac5..5850176de 100755 --- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php @@ -85,7 +85,7 @@ class AdminServiceProvider extends ServiceProvider */ protected function composeView() { - view()->composer(['admin::layouts.nav-left', 'admin::layouts.nav-aside', 'admin::layouts.tabs','admin::layouts.mobile-nav'], function ($view) { + view()->composer(['admin::layouts.nav-left','admin::layouts.tabs','admin::layouts.mobile-nav'], function ($view) { $tree = Tree::create(); $permissionType = auth()->guard('admin')->user()->role->permission_type; diff --git a/packages/Webkul/Admin/src/Resources/assets/js/app.js b/packages/Webkul/Admin/src/Resources/assets/js/app.js index 4ce5bf995..be714c297 100755 --- a/packages/Webkul/Admin/src/Resources/assets/js/app.js +++ b/packages/Webkul/Admin/src/Resources/assets/js/app.js @@ -5,6 +5,7 @@ import Vue from 'vue'; import VeeValidate from 'vee-validate'; import './bootstrap'; import Echo from 'laravel-echo'; +import pagination from 'laravel-vue-pagination' /** * Lang imports. @@ -64,11 +65,11 @@ Vue.component( 'notification', require('./components/navigation/notification').default ); - Vue.component( 'notification-list', require('./components/navigation/notification-list').default ); +Vue.component('pagination', pagination); $(function() { Vue.config.ignoredElements = ['option-wrapper', 'group-form', 'group-list']; diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/partials/_dark.scss b/packages/Webkul/Admin/src/Resources/assets/sass/partials/_dark.scss index 08542e3e2..3be915dbe 100644 --- a/packages/Webkul/Admin/src/Resources/assets/sass/partials/_dark.scss +++ b/packages/Webkul/Admin/src/Resources/assets/sass/partials/_dark.scss @@ -173,7 +173,6 @@ background-color: $drak-bg; } } - .nav-container { @@ -254,9 +253,10 @@ .table{ background-color: #04101b; + table { - background-color: #04101b; thead th { + background-color: rgba(7, 30, 55,0.2) !important; color: rgba(255,255,255,.8); } tbody td { @@ -280,6 +280,14 @@ } } + .accordian, accordian { + .accordian-header, div[slot*="header"] { + color: $font-color; + border-top: solid 1px $border-color; + border-bottom: solid 1px $border-color; + } + } + @media only screen and (max-width: 1300px) { .table { table { diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index d2c9d1aec..619d33604 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -44,6 +44,7 @@ return [ 'layouts' => [ 'app-version' => 'Version : :version', + 'account-title' => 'Account', 'my-account' => 'My Account', 'logout' => 'Logout', 'visit-shop' => 'Visit Shop', @@ -84,6 +85,7 @@ return [ 'cms' => 'CMS', 'transactions' => 'Transactions', 'newsletter-subscriptions' => 'Newsletter Subscriptions', + 'mode' => 'Mode' ], 'acl' => [ diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/mobile-nav.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/mobile-nav.blade.php index e9863c687..a613bfe95 100644 --- a/packages/Webkul/Admin/src/Resources/views/layouts/mobile-nav.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/mobile-nav.blade.php @@ -10,7 +10,6 @@ $config = $tree; - $allLocales = core()->getAllLocales()->pluck('name', 'code'); $currentLocaleCode = core()->getRequestedLocaleCode('admin_locale'); @@ -105,17 +104,17 @@ - Account + {{ __('admin::app.layouts.account-title') }}