Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
2
2022-257
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
2022-257
2022-257
Commits
8f0789e6
Commit
8f0789e6
authored
Oct 11, 2022
by
Sachintha Nipun M.M. it19046594
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'IT19177410' into 'master'
It19177410 See merge request
!27
parents
b5b8ab6d
6a9a106b
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
22 additions
and
16 deletions
+22
-16
bussifinder/src/components/Auth/SignIn.js
bussifinder/src/components/Auth/SignIn.js
+1
-1
bussifinder/src/components/Auth/SignUp.js
bussifinder/src/components/Auth/SignUp.js
+1
-1
bussifinder/src/components/BusinessTypePage.js
bussifinder/src/components/BusinessTypePage.js
+4
-4
bussifinder/src/components/HomePageHeader.js
bussifinder/src/components/HomePageHeader.js
+1
-1
bussifinder/src/components/Hotel Input/ServiceDetailsForm.js
bussifinder/src/components/Hotel Input/ServiceDetailsForm.js
+5
-5
bussifinder/src/components/PropertyType.js
bussifinder/src/components/PropertyType.js
+3
-2
bussifinder/src/components/Results.js
bussifinder/src/components/Results.js
+1
-1
bussifinder/src/features/business.js
bussifinder/src/features/business.js
+6
-1
bussifinder/src/images/headerPic.png
bussifinder/src/images/headerPic.png
+0
-0
No files found.
bussifinder/src/components/Auth/SignIn.js
View file @
8f0789e6
...
...
@@ -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
View file @
8f0789e6
...
...
@@ -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
View file @
8f0789e6
...
...
@@ -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
{
add
New
Business
}
from
'
./../features/business
'
;
const
GetStarted
=
styled
(
Button
)(()
=>
({
...
...
@@ -94,17 +94,17 @@ const BusinessTypePage = () => {
const
navigateToHInputForm
=
()
=>
{
console
.
log
(
"
first
"
)
dispatch
(
addBusiness
({
'
type
'
:
'
hotel
'
}))
dispatch
(
add
New
Business
({
'
type
'
:
'
hotel
'
}))
navigate
(
`/inputHotel`
);
}
const
navigateToRInputForm
=
()
=>
{
dispatch
(
addBusiness
({
'
type
'
:
'
restaurant
'
}))
dispatch
(
add
New
Business
({
'
type
'
:
'
restaurant
'
}))
navigate
(
`/inputHotel`
)
}
const
navigateToLocationBasedPredic
=
()
=>
{
dispatch
(
addBusiness
({
'
type
'
:
'
locationBased
'
}))
dispatch
(
add
New
Business
({
'
type
'
:
'
locationBased
'
}))
navigate
(
`/locationBasedPredict`
)
}
return
(
...
...
bussifinder/src/components/HomePageHeader.js
View file @
8f0789e6
...
...
@@ -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
View file @
8f0789e6
...
...
@@ -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
View file @
8f0789e6
...
...
@@ -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
(
add
New
Business
({
'
type
'
:
'
hotel
'
}))
navigate
(
'
/inputHotel
'
);
}
const
navigateToRInputForm
=
()
=>
{
dispatch
(
addBusiness
({
'
type
'
:
'
restaurant
'
}))
dispatch
(
add
New
Business
({
'
type
'
:
'
restaurant
'
}))
navigate
(
`/inputHotel`
)
}
...
...
bussifinder/src/components/Results.js
View file @
8f0789e6
...
...
@@ -69,7 +69,7 @@ export const options = {
},
title
:
{
display
:
true
,
text
:
'
C
hart.js Bar Chart
'
,
text
:
'
C
ompetitors
'
,
},
},
};
...
...
bussifinder/src/features/business.js
View file @
8f0789e6
...
...
@@ -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
bussifinder/src/images/headerPic.png
0 → 100644
View file @
8f0789e6
109 KB
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment