wip

Author: Jovert Lota Palonpon

app/Http/Controllers/Api/UsersController.php

@@ -41,7 +41,7 @@ public function store(Request $request) : JsonResponse
                 'nullable|date:Y-m-d|before:'.now()->subYear(10)->format('Y-m-d'),
             'address' => 'nullable|string|max:510',
 
-            'email' => 'required|email|unique:users',
+            'email' => 'required|email|unique:users,email,NULL,id,deleted_at,NULL',
             'username' => 'nullable|unique:users'
         ]);
 

resources/js/ui/Snackbar.js

@@ -39,6 +39,32 @@ const Snackbar = props => {
     } = props;
     const Icon = icons[type];
 
+    let primaryAction = null;
+
+    if (action && actionText) {
+        primaryAction = (
+            <Button key="undo" color="inherit" size="small" onClick={action}>
+                {actionText}
+            </Button>
+        );
+    }
+
+    let actions = [
+        <IconButton
+            key="close"
+            aria-label="Close"
+            color="inherit"
+            className={classes.close}
+            onClick={closed}
+        >
+            <CloseIcon className={classes.icon} />
+        </IconButton>,
+    ];
+
+    if (primaryAction) {
+        actions.push(primaryAction);
+    }
+
     return (
         <MuiSnackbar
             anchorOrigin={{
@@ -63,26 +89,7 @@ const Snackbar = props => {
                         {body}
                     </span>
                 }
-                action={[
-                    <Button
-                        key="undo"
-                        color="inherit"
-                        size="small"
-                        onClick={action}
-                    >
-                        {actionText}
-                    </Button>,
-
-                    <IconButton
-                        key="close"
-                        aria-label="Close"
-                        color="inherit"
-                        className={classes.close}
-                        onClick={closed}
-                    >
-                        <CloseIcon className={classes.icon} />
-                    </IconButton>,
-                ]}
+                action={actions.reverse()}
                 {...other}
             />
         </MuiSnackbar>