Merge branch 'IT19177410' into 'master'

It19177410

See merge request !27

bussifinder/src/components/Auth/SignIn.js

@@ -25,7 +25,7 @@ import { GoogleLogin } from 'react-google-login'
 import { gapi } from 'gapi-script'
 import { styled } from '@mui/material/styles';
 import { useNavigate } from "react-router-dom";
-import Logo from './../../images/logo.png'
+import Logo from './../../images/logo-new-dark.png'
 import API from '../../api';
 import jwt_decode from "jwt-decode";
 import { useSelector, useDispatch } from 'react-redux';

bussifinder/src/components/Auth/SignUp.js

@@ -20,7 +20,7 @@ import Social from './../../images/social.gif'
 import Woman from './../../images/woman.png'
 import { makeStyles } from '@mui/styles';
 import { useNavigate } from "react-router-dom";
-import Logo from './../../images/logo.png'
+import Logo from './../../images/logo-new-dark.png'
 import API from '../../api';
 import Snackbar from '@mui/material/Snackbar';
 import MuiAlert, { AlertProps } from '@mui/material/Alert';

bussifinder/src/components/BusinessTypePage.js

@@ -14,7 +14,7 @@ import Tab from '@mui/material/Tab';
 import TabContext from '@mui/lab/TabContext';
 import TabList from '@mui/lab/TabList';
 import TabPanel from '@mui/lab/TabPanel';
-import { addBusiness } from './../features/business';
+import { addNewBusiness } from './../features/business';
 
 
 const GetStarted = styled(Button)(() => ({
@@ -94,17 +94,17 @@ const BusinessTypePage = () => {
 
     const navigateToHInputForm = () => {
         console.log("first")
-        dispatch(addBusiness({ 'type': 'hotel' }))
+        dispatch(addNewBusiness({ 'type': 'hotel' }))
         navigate(`/inputHotel`);
     }
     
     const navigateToRInputForm = () => {
-        dispatch(addBusiness({ 'type': 'restaurant' }))
+        dispatch(addNewBusiness({ 'type': 'restaurant' }))
         navigate(`/inputHotel`)
     }
 
     const navigateToLocationBasedPredic = () => {
-        dispatch(addBusiness({ 'type': 'locationBased' }))
+        dispatch(addNewBusiness({ 'type': 'locationBased' }))
         navigate(`/locationBasedPredict`)
     }
 return (

bussifinder/src/components/HomePageHeader.js

@@ -106,7 +106,7 @@ const HomePageHeader = () => {
                     },
                 }}>
                     <img className={classes.vectorImg} src={require('../images/HomeVector.svg').default} alt="HomeVector"/>
-                    <img className={classes.vectorImgSvg} src={require('../images/mentalhealth.svg').default} alt="HomeVector"/>
+                    <img className={classes.vectorImgSvg} src={require('../images/headerPic.png')} alt="HomeVector"/>
             
                 </Box>
                 <div  className={classes.particle}><Particle/></div>

bussifinder/src/components/Hotel Input/ServiceDetailsForm.js

@@ -99,9 +99,9 @@ export default function ServiceDetailsForm() {
         parking: businessDetails && businessDetails.value[0].serviceDetails && businessDetails.value[0].serviceDetails.parking ? businessDetails.value[0].serviceDetails.parking : false,
     })
     const [restaurantServiceDetails, setRestaurantServiceDetails] = useState({
-        opening: businessDetails && businessDetails.value[0].serviceDetails && businessDetails.value[0].serviceDetails.opening ? businessDetails.value[0].serviceDetails.opening : false,
-        closing: businessDetails && businessDetails.value[0].serviceDetails && businessDetails.value[0].serviceDetails.closing ? businessDetails.value[0].serviceDetails.closing : false,
-        delivery: businessDetails && businessDetails.value[0].serviceDetails && businessDetails.value[0].serviceDetails.delivery ? businessDetails.value[0].serviceDetails.delivery : false,
+        opening: businessDetails && businessDetails.value[0].serviceDetails && businessDetails.value[0].serviceDetails.opening ? businessDetails.value[0].serviceDetails.opening : "Morning",
+        closing: businessDetails && businessDetails.value[0].serviceDetails && businessDetails.value[0].serviceDetails.closing ? businessDetails.value[0].serviceDetails.closing : "Night",
+        delivery: businessDetails && businessDetails.value[0].serviceDetails && businessDetails.value[0].serviceDetails.delivery ? businessDetails.value[0].serviceDetails.delivery : "Contactless Delivery",
     })
     const dispatch = useDispatch();
 
@@ -279,8 +279,8 @@ export default function ServiceDetailsForm() {
                                         ml:3
                                     }}
                                 >
-                                    <FormControlLabel value="Night" control={<Radio />} label="Morning" />
-                                    <FormControlLabel value="Late Night" control={<Radio />} label="Evening" />
+                                    <FormControlLabel value="Night" control={<Radio />} label="Night" />
+                                    <FormControlLabel value="Late Night" control={<Radio />} label="Late Night" />
                                     <FormControlLabel value="24 hours" control={<Radio />} label="24 hours" />
                                 </RadioGroup>
                             </FormControl>

bussifinder/src/components/PropertyType.js

@@ -16,6 +16,7 @@ import { RiHotelLine } from 'react-icons/ri';
 import { IoRestaurantOutline } from 'react-icons/io5';
 import { MdOutlineMedicalServices } from 'react-icons/md';
 import { IoStorefrontOutline } from 'react-icons/io5';
+import { addNewBusiness } from './../features/business';
 
 const useStyles = makeStyles({
 
@@ -116,12 +117,12 @@ const PropertyType = () => {
 
 
   const navigateToHInputForm = () => {
-    dispatch(addBusiness({ 'type': 'hotel' }))
+    dispatch(addNewBusiness({ 'type': 'hotel' }))
     navigate('/inputHotel');
   }
 
   const navigateToRInputForm = () => {
-    dispatch(addBusiness({ 'type': 'restaurant' }))
+    dispatch(addNewBusiness({ 'type': 'restaurant' }))
     navigate(`/inputHotel`)
   }
 

bussifinder/src/components/Results.js

@@ -69,7 +69,7 @@ export const options = {
         },
         title: {
             display: true,
-            text: 'Chart.js Bar Chart',
+            text: 'Competitors',
         },
     },
 };

bussifinder/src/features/business.js

@@ -38,6 +38,11 @@ export const businessSlice = createSlice({
             // state.value.push(action.payload)
             state.value[0] = action.payload
         },
+        addNewBusiness: (state, action) => {
+            // state.value.push(action.payload)
+            state.value= [];
+            state.value[0] = action.payload
+        },
         compareBusiness: (state, action) => {
             console.log("action.payload", action.payload)
             state.value[action.payload.length] = state.value[0]
@@ -52,5 +57,5 @@ export const businessSlice = createSlice({
         // }
     }
 });
-export const { addBusiness: addBusiness, compareBusiness: compareBusiness } = businessSlice.actions;
+export const { addBusiness: addBusiness, compareBusiness: compareBusiness ,addNewBusiness:addNewBusiness} = businessSlice.actions;
 export default businessSlice.reducer;
\ No newline at end of file