Merge pull request #34 from oslabs-beta/nathan

this commit will initialize the user database on first register

Author: WongJonathann

server/routes/dbRouter.ts

@@ -4,16 +4,16 @@
  */
 import { Router, Request, Response } from 'express';
 import dbController from '../controllers/dbController';
-  
+
 const router = Router();
 
 // Route handler: instantiates user and roles tables of database, adds role types 
 router.get('/',
   dbController.createRoles,
   dbController.insertRoles,
   dbController.createTable,
-  dbController.createAdminPassword,
-  dbController.insertAdmin,
+  // dbController.createAdminPassword,
+  // dbController.insertAdmin,
   (req: Request, res: Response) => {
     return res.status(200).json('Database initialized successfully');
   }

src/components/SignUp.tsx

@@ -17,6 +17,7 @@ import PasswordStrengthBar from 'react-password-strength-bar';
 
 // Helper Functions
 import {
+  checkDbInit,
   handleNewUser,
   checkPasswordLength,
   confirmPassword,
@@ -51,7 +52,10 @@ const SignUp = () => {
           className='settingsForm'
           component='form'
           autoComplete='off'
-          onSubmit={(e: any) => handleNewUser(e, '1')}
+          onSubmit={(e: any) => {
+            checkDbInit();
+            handleNewUser(e, '1');
+          }}
           sx={{ color: 'blue' }}
         >
 
@@ -84,7 +88,7 @@ const SignUp = () => {
               type={values.showPassword ? 'text' : 'password'}
               onChange={(e) => {
                 checkPasswordLength();
-                setValues({ ...values, password: e.target.value })
+                setValues({ ...values, password: e.target.value });
               }}
               endAdornment={
                 <InputAdornment position="end">
@@ -111,8 +115,8 @@ const SignUp = () => {
             type='password'
             required
             onChange={(e) => {
-              setValues({ ...values, passwordConfirmation: e.target.value })
-              confirmPassword()
+              setValues({ ...values, passwordConfirmation: e.target.value });
+              confirmPassword();
             }}
             sx={{
               m: 1
@@ -131,7 +135,7 @@ const SignUp = () => {
 
             onChange={() => {
               const inputElement = (document.getElementById('signupPhone') as HTMLInputElement).value;
-              checkPhone(inputElement)
+              checkPhone(inputElement);
             }}
             sx={{
               m: 1
@@ -145,7 +149,7 @@ const SignUp = () => {
               variant='contained'
               size='medium'
               onClick={() => {
-                history.back()
+                history.back();
               }}
               sx={{
                 m: 1
@@ -167,7 +171,7 @@ const SignUp = () => {
         </Box>
       </div>
     </div>
-  )
-}
+  );
+};
 
 export default SignUp;

src/components/helper/newUserHelper.ts

@@ -102,8 +102,8 @@ export const createNewUser = (email: string, username: string, password: string,
 
       window.alert(`New user has been successfully created. \n\n
           An email with the user's credentials and login instructions has been sent to ${email}`);
-  
-    }). then (() =>{
+
+    }).then(() => {
       getUpdatedUserList();
     })
     .catch((err) => {
@@ -133,6 +133,13 @@ export const getUpdatedUserList = () => {
     });
 };
 
-export const updateUserList = (data: object[]) => {  
+export const updateUserList = (data: object[]) => {
   store.dispatch(actions.updateUserList(data));
 };
+
+export const checkDbInit = () => {
+  fetch('http://localhost:3000/db')
+    .then((response) => response.json())
+    .then((data) => console.log(data))
+    .catch((err) => { console.log(err); });
+};