fix(dependencies): updated dependencies

updated dependencies and fix perfect-scrollbar style issue
xmlking · Dec 9, 2018 · b592827 · b592827
1 parent 46abb0f
commit b592827
Show file tree

Hide file tree

Showing 12 changed files with 697 additions and 250 deletions.
diff --git a/apps/webapp/src/assets/data/notifications.json b/apps/webapp/src/assets/data/notifications.json
@@ -1,19 +1,5 @@
 [
   [
-    {
-      "id": 11,
-      "title": "title for sumo3 next",
-      "body": "sample body for sumo3 next",
-      "target": "sumo3",
-      "targetType": "user",
-      "icon": "notifications",
-      "color": "primary",
-      "read": false,
-      "native": true,
-      "createdAt": "2018-12-04T16:26:11.107Z",
-      "updatedAt": "2018-12-04T16:26:11.107Z",
-      "isActive": true
-    },
     {
       "id": 9,
       "title": "title for sumo3 2",
@@ -24,9 +10,9 @@
       "color": "primary",
       "read": false,
       "native": false,
+      "isActive": true,
       "createdAt": "2018-12-04T16:25:33.506Z",
-      "updatedAt": "2018-12-04T16:25:33.506Z",
-      "isActive": true
+      "updatedAt": "2018-12-09T06:22:38.677Z"
     },
     {
       "id": 7,
@@ -38,9 +24,65 @@
       "color": "primary",
       "read": false,
       "native": true,
+      "isActive": true,
       "createdAt": "2018-12-04T16:24:49.813Z",
-      "updatedAt": "2018-12-04T16:24:49.813Z",
-      "isActive": true
+      "updatedAt": "2018-12-09T06:22:08.201Z"
+    },
+    {
+      "id": 10,
+      "title": "title for sumo1",
+      "body": "sample body for sumo1",
+      "target": "sumo1",
+      "targetType": "user",
+      "icon": "notifications",
+      "color": "primary",
+      "read": false,
+      "native": true,
+      "isActive": true,
+      "createdAt": "2018-12-04T16:25:42.546Z",
+      "updatedAt": "2018-12-04T16:25:42.546Z"
+    },
+    {
+      "id": 5,
+      "title": "title for topic1",
+      "body": "sample body for topic1",
+      "target": "topic_1",
+      "targetType": "topic",
+      "icon": "notifications",
+      "color": "primary",
+      "read": false,
+      "native": false,
+      "isActive": true,
+      "createdAt": "2018-12-04T16:23:25.712Z",
+      "updatedAt": "2018-12-04T16:23:25.712Z"
+    },
+    {
+      "id": 6,
+      "title": "title for topic2",
+      "body": "sample body for topic2",
+      "target": "topic_2",
+      "targetType": "topic",
+      "icon": "notifications",
+      "color": "primary",
+      "read": false,
+      "native": true,
+      "isActive": true,
+      "createdAt": "2018-12-04T16:24:25.001Z",
+      "updatedAt": "2018-12-04T16:24:25.001Z"
+    },
+    {
+      "id": 3,
+      "title": "sumo3 sending by admin",
+      "body": "sumo3 sending by admin",
+      "target": "sumo3",
+      "targetType": "user",
+      "icon": "notifications",
+      "color": "primary",
+      "read": false,
+      "native": true,
+      "isActive": true,
+      "createdAt": "2018-12-04T16:26:11.107Z",
+      "updatedAt": "2018-12-09T07:08:44.868Z"
     },
     {
       "id": 2,
@@ -52,10 +94,38 @@
       "color": "primary",
       "read": false,
       "native": false,
+      "isActive": true,
       "createdAt": "2018-12-04T16:17:32.512Z",
-      "updatedAt": "2018-12-04T16:35:30.142Z",
-      "isActive": true
+      "updatedAt": "2018-12-08T00:41:58.748Z"
+    },
+    {
+      "id": 8,
+      "title": "title for sumo2",
+      "body": "sample body for sumo2",
+      "target": "sumo2",
+      "targetType": "user",
+      "icon": "notifications",
+      "color": "primary",
+      "read": false,
+      "native": true,
+      "isActive": true,
+      "createdAt": "2018-12-04T16:25:23.540Z",
+      "updatedAt": "2018-12-04T16:25:23.540Z"
+    },
+    {
+      "id": 14,
+      "title": "title111222",
+      "body": "body111",
+      "target": "all",
+      "targetType": "all",
+      "icon": "notifications",
+      "color": "warn",
+      "read": false,
+      "native": true,
+      "isActive": true,
+      "createdAt": "2018-12-09T04:41:07.043Z",
+      "updatedAt": "2018-12-09T06:00:41.401Z"
     }
   ],
-  4
+  9
 ]
diff --git a/apps/webapp/src/assets/data/notifications.user.json b/apps/webapp/src/assets/data/notifications.user.json
@@ -0,0 +1,75 @@
+[
+  [
+    {
+      "id": 9,
+      "title": "title for sumo3 2",
+      "body": "sample body for sumo3 2",
+      "target": "sumo3",
+      "targetType": "user",
+      "icon": "notifications",
+      "color": "primary",
+      "read": false,
+      "native": false,
+      "isActive": true,
+      "createdAt": "2018-12-04T16:25:33.506Z",
+      "updatedAt": "2018-12-09T06:22:38.677Z"
+    },
+    {
+      "id": 7,
+      "title": "title for sumo3",
+      "body": "sample body for sumo3",
+      "target": "sumo3",
+      "targetType": "user",
+      "icon": "notifications",
+      "color": "primary",
+      "read": false,
+      "native": true,
+      "isActive": true,
+      "createdAt": "2018-12-04T16:24:49.813Z",
+      "updatedAt": "2018-12-09T06:22:08.201Z"
+    },
+    {
+      "id": 3,
+      "title": "sumo3 sending by admin",
+      "body": "sumo3 sending by admin",
+      "target": "sumo3",
+      "targetType": "user",
+      "icon": "notifications",
+      "color": "primary",
+      "read": true,
+      "native": true,
+      "isActive": true,
+      "createdAt": "2018-12-04T16:26:11.107Z",
+      "updatedAt": "2018-12-09T08:12:52.262Z"
+    },
+    {
+      "id": 2,
+      "title": "title for all",
+      "body": "sample body for all",
+      "target": "all",
+      "targetType": "all",
+      "icon": "notifications",
+      "color": "primary",
+      "read": false,
+      "native": false,
+      "isActive": true,
+      "createdAt": "2018-12-04T16:17:32.512Z",
+      "updatedAt": "2018-12-08T00:41:58.748Z"
+    },
+    {
+      "id": 14,
+      "title": "title111222",
+      "body": "body111",
+      "target": "all",
+      "targetType": "all",
+      "icon": "notifications",
+      "color": "warn",
+      "read": false,
+      "native": true,
+      "isActive": true,
+      "createdAt": "2018-12-09T04:41:07.043Z",
+      "updatedAt": "2018-12-09T06:00:41.401Z"
+    }
+  ],
+  5
+]
diff --git a/apps/webapp/src/assets/data/subscription.json b/apps/webapp/src/assets/data/subscription.json
@@ -0,0 +1,15 @@
+[
+  [
+    {
+      "id": 13,
+      "endpoint": "https://fcm.googleapis.com/fcm/send/c8eq7G-b2mc:APA91bFp2Gof...",
+      "auth": "yu_cVYbAPA91bFp2Gof",
+      "p256dh": "BIt3gcVYbAPA91bFp2GofB0Y7N-zvcVYbAPA91bFp2Gof-0jqPlmfIwtcVYbAPA91bFp2GofYBgvk",
+      "userId": "sumo3",
+      "topics": ["topic_1", "topic_2"],
+      "createdAt": "2018-11-21T18:50:45.325Z",
+      "updatedAt": "2018-11-21T18:50:45.325Z"
+    }
+  ],
+  1
+]
diff --git a/libs/admin/src/lib/containers/admin-layout/admin-layout.component.html b/libs/admin/src/lib/containers/admin-layout/admin-layout.component.html
@@ -8,7 +8,7 @@
     <!--<ngx-topnav></ngx-topnav>-->
     <div class="wrapper">
       <ngx-breadcrumbs title="Admin" [crumbs]="crumbs$ | async"></ngx-breadcrumbs>
-      <perfect-scrollbar [usePSClass]="noPSClass" style="overflow: visible">
+      <perfect-scrollbar [usePSClass]="false" style="overflow: visible">
         <div [@routeAnimation]="depth$ | async"><router-outlet (activate)="onActivate($event)"></router-outlet></div>
       </perfect-scrollbar>
     </div>

diff --git a/libs/admin/src/lib/containers/admin-layout/admin-layout.component.ts b/libs/admin/src/lib/containers/admin-layout/admin-layout.component.ts
@@ -13,8 +13,6 @@ import { NotificationsComponent } from '../notifications/notifications.component
   animations: [hierarchicalRouteAnimation],
 })
 export class AdminLayoutComponent implements OnInit {
-  // @ViewChild('sumo') sumoTpl: TemplateRef<any>;
-  @ViewChild('demo') demoTpl: TemplateRef<any>;
   quickpanelOpen = false;
   crumbs$;
   depth$;