update

shinoshu · Dec 16, 2019 · 4fc8100 · 4fc8100
1 parent 052becd
commit 4fc8100
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,18 @@
+{
+    "workbench.colorCustomizations": {
+        "activityBar.background": "#d04649",
+        "activityBar.activeBorder": "#37cb34",
+        "activityBar.foreground": "#e7e7e7",
+        "activityBar.inactiveForeground": "#e7e7e799",
+        "activityBarBadge.background": "#37cb34",
+        "activityBarBadge.foreground": "#15202b",
+        "titleBar.activeBackground": "#b52e31",
+        "titleBar.inactiveBackground": "#b52e3199",
+        "titleBar.activeForeground": "#e7e7e7",
+        "titleBar.inactiveForeground": "#e7e7e799",
+        "statusBar.background": "#b52e31",
+        "statusBarItem.hoverBackground": "#d04649",
+        "statusBar.foreground": "#e7e7e7"
+    },
+    "peacock.color": "#b52e31"
+}
diff --git a/src/app/users/components/user-additional-dialog/user-additional-dialog.component.ts b/src/app/users/components/user-additional-dialog/user-additional-dialog.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, EventEmitter, Output } from '@angular/core';
-import { FormGroup, FormControl, FormBuilder } from '@angular/forms';
+import { FormGroup, FormControl, FormBuilder, Validators } from '@angular/forms';
 import { MatDialogRef } from '@angular/material';
 import { v4 } from 'uuid';
 
@@ -11,8 +11,8 @@ import { v4 } from 'uuid';
 export class UserAdditionalDialogComponent implements OnInit {
   form = this.fb.group({
     id: [v4()],
-    name: [''],
-    email: [''],
+    name: ['', Validators.required],
+    email: ['', Validators.required],
   });
 
   constructor(

diff --git a/src/app/users/components/user-editing-dialog/user-editing-dialog.component.ts b/src/app/users/components/user-editing-dialog/user-editing-dialog.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, EventEmitter, Output } from '@angular/core';
-import { FormGroup, FormControl, FormBuilder } from '@angular/forms';
+import { FormGroup, FormControl, FormBuilder, Validators } from '@angular/forms';
 import { MatDialogRef } from '@angular/material';
 import { v4 } from 'uuid';
 
@@ -11,8 +11,8 @@ import { v4 } from 'uuid';
 export class UserEditingDialogComponent implements OnInit {
   form = this.fb.group({
     id: [v4()],
-    name: [''],
-    email: [''],
+    name: ['', Validators.required],
+    email: ['', Validators.required],
   });
 
   constructor(

diff --git a/src/app/users/containers/collection-page/collection-page.component.ts b/src/app/users/containers/collection-page/collection-page.component.ts
@@ -30,15 +30,19 @@ export class CollectionPageComponent implements OnInit {
     const dialogRef = this.dialog.open(UserAdditionalDialogComponent);
 
     dialogRef.afterClosed().subscribe(result => {
-      this.store.dispatch(addUser({ user: result }));
+      if (result) {
+        this.store.dispatch(addUser({ user: result }));
+      }
     });
   }
 
   openEditingDialog() {
     const dialogRef = this.dialog.open(UserEditingDialogComponent);
 
     dialogRef.afterClosed().subscribe(result => {
-      this.store.dispatch(addUser({ user: result }));
+      if (result) {
+        this.store.dispatch(addUser({ user: result }));
+      }
     });
   }
 }