Merge pull request #115 from avored/dev

dev to master
avored · Jun 10, 2020 · c691553 · c691553
2 parents 3a911b8 + 00d82bf
commit c691553
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/resources/components/catalog/category/CategorySave.vue b/resources/components/catalog/category/CategorySave.vue
@@ -4,17 +4,11 @@ export default {
   props: ['category', 'baseUrl'],
   data () {
     return {
-        categoryForm: this.$form.createForm(this),
+        
     };
   },
   methods: {
-      handleSubmit() {
-          this.categoryForm.validateFields((err, values) => {
-            if (err) {
-              e.preventDefault();
-            }
-          });
-      },
+      
       cancelCategory() {
           window.location = this.baseUrl + '/category';
       }

diff --git a/resources/components/catalog/category/CategoryTable.vue b/resources/components/catalog/category/CategoryTable.vue
@@ -5,7 +5,6 @@
         button-text="Create"
         html-type="link" 
         :link-url="createUrl">
-
       </avored-button>
     </div>
     <div class="mt-3">

diff --git a/resources/views/catalog/category/create.blade.php b/resources/views/catalog/category/create.blade.php
@@ -10,13 +10,19 @@
 
 @section('content')
 <div class="mt-3">
-        <category-save base-url="{{ asset(config('avored.admin_url')) }}" inline-template>
+        <category-save 
+            base-url="{{ asset(config('avored.admin_url')) }}" 
+            inline-template>
         <div>
-            <form action="{{ route('admin.category.store') }}" @submit="handleSubmit" method="post">
+            <form action="{{ route('admin.category.store') }}"  method="post">
                 @csrf
-                <a-tabs tabbar-gutter="15" tab-position="left" default-active-key="catalog.category.basic">
+                <a-tabs tabbar-gutter="15" tab-position="left" 
+                    default-active-key="catalog.category.info">
                     @foreach ($tabs as $tab)
-                        <a-tab-pane :force-render="true"  tab="{{ $tab->label() }}" key="{{ $tab->key() }}">
+                        <a-tab-pane 
+                            :force-render="true" 
+                            tab="{{ $tab->label() }}" 
+                            key="{{ $tab->key() }}">
                             @php
                                 $path = $tab->view();
                             @endphp
@@ -25,13 +31,15 @@
                     @endforeach
                 </a-tabs>
 
-                <div class="flex mt-3">
+                <div class="flex mt-5">
                     <button type="submit"
                         class="px-4 py-2 font-semibold leading-7 text-white hover:text-white bg-red-600 rounded hover:bg-red-700">
                         <svg class="h-4 w-4 inline-block" fill="currentColor" viewBox="0 0 24 24">
                             <path d="M0 2C0 .9.9 0 2 0h14l4 4v14a2 2 0 01-2 2H2a2 2 0 01-2-2V2zm5 0v6h10V2H5zm6 1h3v4h-3V3z"/>
                         </svg>
-                        <span class="inline-block">{{ __('avored::system.btn.save') }}</span>
+                        <span class="inline-block">
+                            {{ __('avored::system.btn.save') }}
+                        </span>
                     </button>
 
                     <a 

diff --git a/resources/views/catalog/category/edit.blade.php b/resources/views/catalog/category/edit.blade.php
@@ -17,11 +17,11 @@
             <form 
                 method="post"
                 action="{{ route('admin.category.update', $category->id) }}"                    
-                @submit="handleSubmit"
+
             >
                 @csrf
                 @method('put')
-                <a-tabs tabbar-gutter="15" tab-position="left" default-active-key="catalog.category.basic">
+                <a-tabs tabbar-gutter="15" tab-position="left" default-active-key="catalog.category.info">
                     @foreach ($tabs as $tab)
                         <a-tab-pane :force-render="true" tab="{{ $tab->label() }}" key="{{ $tab->key() }}">
                             @php
@@ -32,7 +32,7 @@
                     @endforeach
                 </a-tabs>
 
-                <div class="flex mt-3">
+                <div class="flex mt-5">
                     <button type="submit"
                         class="px-4 py-2 font-semibold leading-7 text-white hover:text-white bg-red-600 rounded hover:bg-red-700">
                         <svg class="h-4 w-4 inline-block" fill="currentColor" viewBox="0 0 24 24">

diff --git a/src/System/Controllers/DashboardController.php b/src/System/Controllers/DashboardController.php
@@ -13,7 +13,6 @@ class DashboardController
     public function index()
     {
         $orderWidget = Widget::get('avored-total-order');
-        dd($orderWidget);
         $customerWidget = Widget::get('avored-total-customer');
         $revenueWidget = Widget::get('avored-total-revenue');