fix: minor fixes

mohammad-haji · Aug 15, 2018 · 1d9ebeb · 1d9ebeb
1 parent 01db181
commit 1d9ebeb
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 30 deletions.
diff --git a/src/app/pages/reviews/list/table.config.ts b/src/app/pages/reviews/list/table.config.ts
@@ -14,20 +14,20 @@ export const TABLE_CONFIG = {
     confirmDelete: true,
   },
   actions: {
-    add: false,
-    edit: false,
-    delete: false
+    add: true,
+    edit: true,
+    delete: true
   },
   columns: {
-    title: {
+    name: {
       title: 'عنوان',
       type: 'string',
     },
     status: {
       title: 'وضعیت',
       type: 'string',
     },
-    created: {
+    createdAt: {
       title: 'تاریخ ثبت نام',
       type: 'date',
     },

diff --git a/src/app/pages/users/add/add-user.component.ts b/src/app/pages/users/add/add-user.component.ts
@@ -18,18 +18,6 @@ export class AddUserComponent implements OnInit {
   }
 
   ngOnInit() {
-    // this.apiDataProviderService.createApi('users').getAll().subscribe(res => {
-    //   console.log('getAll ', res);
-    // });
-    // this.apiDataProviderService.createApi('users').getById().subscribe(res => {
-    //   console.log('getById ', res);
-    // });
-    // this.apiDataProviderService.createApi('users').create({
-    //   firstName: 'mohammad',
-    //   lastName: 'haji'
-    // }).subscribe(res => {
-    //   console.log('getById ', res);
-    // });
     this.initPageWithConfig(_.cloneDeep(this.activatedRoute.snapshot.data));
   }
 

diff --git a/src/app/pages/users/list/table.config.ts b/src/app/pages/users/list/table.config.ts
@@ -1,4 +1,5 @@
 export const TABLE_CONFIG = {
+  mode: 'external',
   add: {
     addButtonContent: '<i class="nb-plus"></i>',
     createButtonContent: '<i class="nb-checkmark"></i>',
@@ -8,15 +9,16 @@ export const TABLE_CONFIG = {
     editButtonContent: '<i class="nb-edit"></i>',
     saveButtonContent: '<i class="nb-checkmark"></i>',
     cancelButtonContent: '<i class="nb-close"></i>',
+    confirmSave: true
   },
   delete: {
     deleteButtonContent: '<i class="nb-trash"></i>',
     confirmDelete: true,
   },
   actions: {
-    add: false,
-    edit: false,
-    delete: false,
+    add: true,
+    edit: true,
+    delete: true,
   },
   columns: {
     id: {

diff --git a/src/app/pages/users/users-routing.module.ts b/src/app/pages/users/users-routing.module.ts
@@ -40,11 +40,35 @@ const routes: Routes = [{
       form: FormLoaderService,
     }
   }, {
-    path: 'detail',
+    path: 'detail/:id',
     component: DetailUserComponent,
   }, {
-    path: 'edit',
+    path: 'edit/:id',
     component: EditUserComponent,
+    data: {
+      TITLE_TAG_KEY: 'users.edit',
+      pageTitle: 'ویرایش کاربر',
+      forms: {
+        basic_info: {
+          title: 'اطلاعات اصلی',
+          containerClass: 'col-sm-6',
+          path: 'users/basic-info-users'
+        },
+        edit_users: {
+          title: 'فرم نقش های کاربر',
+          containerClass: 'col-sm-6',
+          path: 'users/edit-users'
+        },
+        add_users: {
+          title: 'اطلاعات پایه کاربر',
+          containerClass: 'col-sm-6',
+          path: 'users/add-users'
+        },
+      }
+    },
+    resolve: {
+      form: FormLoaderService,
+    }
   }, {
     path: 'list',
     component: ListUserComponent,

diff --git a/src/assets/config/api/api-config.json b/src/assets/config/api/api-config.json
@@ -12,5 +12,10 @@
       "url": "/user/:id",
       "method": "GET"
     }
+  },
+  "comments": {
+    "getAll": {
+      "url": "/comments"
+    }
   }
 }
diff --git a/src/assets/config/title-tags/title-tags.config.json b/src/assets/config/title-tags/title-tags.config.json
@@ -83,6 +83,27 @@
           "content": "ngir عالی است"
         }
       ]
+    },
+    "edit": {
+      "title": "ویرایش کاربر",
+      "metaTags": [
+        {
+          "name": "twitter:card",
+          "content": "summary_large_image"
+        },
+        {
+          "name": "twitter:site",
+          "content": "ngir"
+        },
+        {
+          "name": "twitter:description",
+          "content": "بهترین فروشگاه ایران"
+        },
+        {
+          "name": "twitter:title",
+          "content": "ngir عالی است"
+        }
+      ]
     }
   },
   "products": {

diff --git a/src/assets/data/menus/side-bar-menu-fa.json b/src/assets/data/menus/side-bar-menu-fa.json
@@ -14,10 +14,6 @@
     "icon": "nb-keypad",
     "link": "/pages/users",
     "children": [
-      {
-        "title": "افزودن کاربر جدید",
-        "link": "/pages/users/add"
-      },
       {
         "title": "لیست کاربران",
         "link": "/pages/users/list"

diff --git a/src/assets/data/menus/side-bar-menu.json b/src/assets/data/menus/side-bar-menu.json
@@ -14,10 +14,6 @@
     "icon": "nb-keypad",
     "link": "/pages/users",
     "children": [
-      {
-        "title": "افزودن کاربر جدید",
-        "link": "/pages/users/add"
-      },
       {
         "title": "لیست کاربران",
         "link": "/pages/users/list"