Merge pull request #2 from coronasafe/develop

merge #2
ohcnetwork · Mar 24, 2020 · b1ff038 · b1ff038
2 parents 5d4f379 + 52f0255
commit b1ff038
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 14 deletions.
diff --git a/src/Components/Ambulance/AmbulanceOnboarding.tsx b/src/Components/Ambulance/AmbulanceOnboarding.tsx
@@ -86,7 +86,6 @@ export default function AmbulanceOnboarding() {
         setVehicleObj(val);
         setValue(1);
     };
-    console.log('vehicleObj: ', vehicleObj);
 
     return (
 

diff --git a/src/Components/Ambulance/DriverDetailsForm.tsx b/src/Components/Ambulance/DriverDetailsForm.tsx
@@ -4,6 +4,7 @@ import { TextInputField } from '../Common/HelperInputFields';
 import { useDispatch } from "react-redux";
 import { postAmbulance } from "../../Redux/actions";
 import { isEmpty, get } from "lodash";
+import { navigate } from 'hookrouter';
 
 
 export const DriverDetailsForm = (props:any) => {
@@ -43,7 +44,7 @@ export const DriverDetailsForm = (props:any) => {
   };
 
   const validateData = () => {
-    const err = Object.assign({});
+    const err:any = {};
     Object.keys(form).forEach((key) => {
       const value = form[key];
       switch (key) {
@@ -76,6 +77,7 @@ export const DriverDetailsForm = (props:any) => {
     });
     if (!isEmpty(err)) {
       setErrors(err);
+      return false;
     }
     return form;
   };
@@ -122,8 +124,9 @@ export const DriverDetailsForm = (props:any) => {
         const statusCode = get(resp, 'status', '');
         if (res && statusCode === 401) {
           alert('Something went wrong..!');
-        } else if (res && statusCode === 200) {
+        } else if (res && statusCode === 201) {
           alert('Ambulance Added Successfully');
+          navigate("/")
         }
       })
     }
@@ -140,7 +143,8 @@ export const DriverDetailsForm = (props:any) => {
                 <h4>Driver 1</h4>
                 <TextInputField
                   name="driverName1"
-                  placeholder="Driver Name"
+                  label="Driver Name"
+                  placeholder=""
                   variant="outlined"
                   margin="dense"
                   value={form.driverName1}
@@ -150,7 +154,8 @@ export const DriverDetailsForm = (props:any) => {
                 <TextInputField
                   type="number"
                   name="cellNumber1"
-                  placeholder="Cellphone Number"
+                  label="Cellphone Number"
+                  placeholder=""
                   variant="outlined"
                   margin="dense"
                   value={form.cellNumber1}
@@ -168,7 +173,8 @@ export const DriverDetailsForm = (props:any) => {
                 <h4>Driver 2</h4>
                 <TextInputField
                   name="driverName2"
-                  placeholder="Driver Name"
+                  label="Driver Name"
+                  placeholder=""
                   variant="outlined"
                   margin="dense"
                   value={form.driverName2}
@@ -178,7 +184,8 @@ export const DriverDetailsForm = (props:any) => {
                 <TextInputField
                   type="number"
                   name="cellNumber2"
-                  placeholder="Cellphone Number"
+                  label="Cellphone Number"
+                  placeholder=""
                   variant="outlined"
                   margin="dense"
                   value={form.cellNumber2}

diff --git a/src/Components/Ambulance/VehicleDetailsForm.tsx b/src/Components/Ambulance/VehicleDetailsForm.tsx
@@ -66,7 +66,7 @@ export const VehicleDetailsForm = (props: any) => {
     };
 
     const validateData = () => {
-        const err = Object.assign({}, errors);
+        const err:any = {};
         Object.keys(form).forEach(key => {
             const value = form[key];
             switch (key) {
@@ -126,8 +126,9 @@ export const VehicleDetailsForm = (props: any) => {
                             <CardContent className={classes.cardContent}>
                                 <Box display="flex" flexDirection="column">
                                     <TextInputField
+                                        label="Vehicle registration number"
                                         name="registrationNumber"
-                                        placeholder="Vehicle registration number"
+                                        placeholder=""
                                         variant="outlined"
                                         margin="dense"
                                         InputLabelProps={{shrink: !!form.registrationNumber}}
@@ -158,8 +159,9 @@ export const VehicleDetailsForm = (props: any) => {
                                         />
                                     </div>
                                     <TextInputField
+                                        label="Name of owner"
                                         name="nameOfOwner"
-                                        placeholder="Name of owner"
+                                        placeholder=""
                                         variant="outlined"
                                         margin="dense"
                                         value={form.nameOfOwner}
@@ -168,8 +170,9 @@ export const VehicleDetailsForm = (props: any) => {
                                         errors={errors.nameOfOwner}
                                     />
                                     <TextInputField
+                                        label="Owner phone number"
                                         name="ownerPhoneNumber"
-                                        placeholder="Owner phone number"
+                                        placeholder=""
                                         variant="outlined"
                                         margin="dense"
                                         value={form.ownerPhoneNumber}

diff --git a/src/Components/Common/Header.tsx b/src/Components/Common/Header.tsx
@@ -126,7 +126,7 @@ const Header = () => {
               <MenuIcon/>
             </IconButton>
             <Typography variant="h6">
-              <img src={img} alt="care logo"style={{ height: '25px' }}/>
+            <A href='/'> <img src={img} alt="care logo"style={{ height: '25px' }}/></A>
             </Typography>
             <div className={classes.flexGrow}>
 

diff --git a/src/Components/Common/HelperInputFields.tsx b/src/Components/Common/HelperInputFields.tsx
@@ -5,10 +5,11 @@ import DateFnsUtils from '@date-io/date-fns';
 import DeleteIcon from '@material-ui/icons/Delete';
 
 export const TextInputField = (props: any) => {
-    const { placeholder, onChange, value, name, variant, type, margin, errors } = props;
+    const { placeholder, onChange, value, name, variant, type, margin, errors, label } = props;
     return (
         <div>
             <TextField
+                label={label}
                 type={type}
                 fullWidth
                 variant={variant}

diff --git a/src/Components/Common/TopBar.tsx b/src/Components/Common/TopBar.tsx
@@ -1,13 +1,14 @@
 import React from 'react';
 import { AppBar, Toolbar, Typography, } from '@material-ui/core';
+import {A} from "hookrouter";
 
 const img = 'https://care-staging-coronasafe.s3.amazonaws.com/static/images/logos/black-logo.svg';
 const TopBar = () => {
     return (
         <AppBar position="fixed" className="appBar">
         <Toolbar>
             <Typography variant="h5">
-                <img src= {img} style={{height:"25px"}}  alt="care logo"/>
+                <A href={'/'} ><img src= {img} style={{height:"25px"}}  alt="care logo"/> </A>
             </Typography>
         </Toolbar>
         </AppBar>