Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
743ebee
create navbar component with style #40
Nov 1, 2021
3e7fbfc
create user info card
muhammadharoun Nov 2, 2021
d67fb18
make data as props
muhammadharoun Nov 2, 2021
3fabdd6
create home images
muhammadharoun Nov 2, 2021
6688ceb
create profile page with components and style #55
Nov 2, 2021
162dc4d
edit state name to logged #40
Nov 3, 2021
77d3074
edit qurey to select all data like agent info. , estate agent #80
Nov 3, 2021
793762f
get all data from api and display it in profile #55
Nov 3, 2021
16d675c
search endpoint #82
ElhamFadel Nov 4, 2021
9279265
property card
muhammadharoun Nov 4, 2021
350caca
change func and file name
muhammadharoun Nov 4, 2021
3344af2
change func name add margin
muhammadharoun Nov 4, 2021
b804838
query to fetch estates #82
ElhamFadel Nov 4, 2021
992a909
solve conflict #82
ElhamFadel Nov 4, 2021
2b31215
query for filterr function
ElhamFadel Nov 4, 2021
d238c47
Reslove conflicts
Mu7ammadAbed Nov 5, 2021
8358748
edit link router #40
Nov 6, 2021
1a5be00
Changes Requested
muhammadharoun Nov 7, 2021
5d4e5a8
remove comment
muhammadharoun Nov 7, 2021
bca9f7a
add changes
muhammadharoun Nov 7, 2021
70bc9a8
create query for get agent,and edit query estates #80
mohammedsalah7 Nov 7, 2021
ff24d02
Merge pull request #77 from GSG-G10/53-user-contact-card
Mu7ammadAbed Nov 7, 2021
f31301e
Merge pull request #78 from GSG-G10/54-home-images-section
Mu7ammadAbed Nov 7, 2021
f506223
create router in app , and format style #40
mohammedsalah7 Nov 7, 2021
d2085b8
solve conflict #40
mohammedsalah7 Nov 7, 2021
1d3c26a
Merge pull request #74 from GSG-G10/40-navbar
Mu7ammadAbed Nov 7, 2021
358bcbe
Merge pull request #81 from GSG-G10/80-edit-query
Mu7ammadAbed Nov 7, 2021
f021b2c
add PropertyCard and change file name
muhammadharoun Nov 7, 2021
a584905
solve conflect
muhammadharoun Nov 7, 2021
de0882c
convert h1 to div
muhammadharoun Nov 7, 2021
5ba39c8
fix rectangle
muhammadharoun Nov 7, 2021
2e4488d
Merge pull request #84 from GSG-G10/51-property-card
muhammadharoun Nov 7, 2021
e4d9087
add query and controler
muhammadharoun Nov 7, 2021
e535cfd
complete function
muhammadharoun Nov 7, 2021
737a5e8
add changes
muhammadharoun Nov 8, 2021
cc22fcf
Merge pull request #91 from GSG-G10/90-getEstateQuer
muhammadharoun Nov 8, 2021
3b648bf
Remove unnecessary adds
Mu7ammadAbed Nov 8, 2021
72e5328
Merge branch 'development' of github.com:GSG-G10/Housy into 90-getEst…
Mu7ammadAbed Nov 8, 2021
3353ec5
test filter estate controller #82
ElhamFadel Nov 8, 2021
4dabb77
solve conflict #82
ElhamFadel Nov 8, 2021
bd9b5bf
Merge pull request #92 from GSG-G10/82-search
Mu7ammadAbed Nov 8, 2021
7e54ab3
create login component #64
mohammedsalah7 Nov 8, 2021
695d545
edit fetch data #55
mohammedsalah7 Nov 8, 2021
a8f96d0
add heroku postbuild script
Mu7ammadAbed Nov 8, 2021
800905e
Install airbnb as devdependencies
Mu7ammadAbed Nov 8, 2021
0d068f0
Edit ssl connection
Mu7ammadAbed Nov 8, 2021
539594c
edit style login component #64
mohammedsalah7 Nov 8, 2021
b53196b
Merge pull request #93 from GSG-G10/64-login-client
mohammedsalah7 Nov 10, 2021
3beed61
Merge pull request #79 from GSG-G10/55-profile
mohammedsalah7 Nov 10, 2021
af60a04
sign up
muhammadharoun Nov 10, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ package-lock.json

# production
/build

.env
# misc
.DS_Store
.env.local
Expand Down
5 changes: 4 additions & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,18 @@
"dependencies": {
"@emotion/react": "^11.5.0",
"@emotion/styled": "^11.3.0",
"@mui/icons-material": "^5.0.5",
"@mui/material": "^5.0.4",
"@mui/styles": "^5.0.2",
"axios": "^0.23.0",
"eslint-config-react-app": "^6.0.0",
"prop-types": "^15.7.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-icons": "^4.3.1",
"react-router-dom": "^5.3.0",
"react-scripts": "4.0.3"
"react-scripts": "4.0.3",
"yup": "^0.32.11"
},
"scripts": {
"start": "react-scripts start",
Expand Down
10 changes: 8 additions & 2 deletions client/src/App.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import { BrowserRouter as Router } from 'react-router-dom';
import NavBar from './components/Navbar';
import { Footer } from './components';
import Signup from './components/Signup';

function App() {
return (
<div className="App">
<Footer />
<Router>
<NavBar />
<Signup />
<Footer />
</Router>
</div>

);
}

export default App;
Binary file added client/src/assetes/house.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/Iconfacebook.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/Icongoogle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/bath.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/beds.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/profile-picture.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/rooms.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/space.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/asstes/avatar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/asstes/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
118 changes: 118 additions & 0 deletions client/src/components/Agent/EstateAgent/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
/* eslint-disable no-console */
/* eslint-disable react/prop-types */
/* eslint-disable import/no-extraneous-dependencies */
import {
Container,
} from '@mui/material';
import Card from '@mui/material/Card';
// import CardActions from '@mui/material/CardActions';
import CardContent from '@mui/material/CardContent';
import DeleteIcon from '@mui/icons-material/Delete';
import Button from '@mui/material/Button';
import Typography from '@mui/material/Typography';
import House from '../../../assetes/house.jpeg';
import './style.css';

const AgenteEstate = ({ data }) => (
<Container
maxWidth="xl"
sx={{
width: '100%',
height: 300,
mb: 15,

}}
>

{data.length ? data[0].estateData.map((datas) => (

<Card sx={{
width: 500,
height: 200,
border: 'none',
marginTop: 2,
display: 'flex',
color: '#000',

}}
>
<CardContent sx={{
display: 'flex', width: '100%',

}}
>
<img
// src={datas.image}
src={datas.image === null ? House : datas.image}
alt={datas.title}
className="img-house"
/>

<CardContent sx={{
display: 'flex', flexDirection: 'column', width: '100%',
}}
>

<Typography sx={{ mt: -2, fontSize: 18 }}>
{datas.title}
{' '}

</Typography>
<Typography
component="div"
sx={{
mb: 1,
display: 'flex',
flexDirection: 'row',
fontSize: 15,
color: '#5e5e5e',
}}
>
{datas.description}
</Typography>
<Typography sx={{ mb: 1, display: 'flex', flexDirection: 'row' }}>

{datas.category}
{' '}

</Typography>
<Typography sx={{ mb: 1, display: 'flex', flexDirection: 'row' }}>

{datas.type}
{' '}

</Typography>

</CardContent>
</CardContent>
<Typography sx={{ mb: 1, display: 'flex', flexDirection: 'row' }}>
<Button
variant="outlined"
sx={{
mt: 20,
mr: 1,
minWidth: 0,
padding: 0,
border: 'none',
'&:hover': { border: 'none' },

}}
>
<DeleteIcon sx={{
color: 'red',
'&:hover': {
border: '1px solid red',
borderRadius: 1,
},
}}
/>
</Button>
</Typography>

</Card>
)) : ' You are still not published any estate' }

</Container>
);

export default AgenteEstate;
4 changes: 4 additions & 0 deletions client/src/components/Agent/EstateAgent/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.img-house{
width: 150px;
height: 150px;
}
149 changes: 149 additions & 0 deletions client/src/components/Agent/Favroit/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
/* eslint-disable import/no-extraneous-dependencies */
import {
Container,
} from '@mui/material';
import Card from '@mui/material/Card';
// import CardActions from '@mui/material/CardActions';
import CardContent from '@mui/material/CardContent';
import Button from '@mui/material/Button';
import Typography from '@mui/material/Typography';
import List from '@mui/material/List';
import ListItem from '@mui/material/ListItem';
import Divider from '@mui/material/Divider';
import ListItemText from '@mui/material/ListItemText';
import ListItemAvatar from '@mui/material/ListItemAvatar';
import Avatar from '@mui/material/Avatar';
import House from '../../../assetes/house.jpeg';

const AgenteFavariot = () => (
<Container
maxWidth="xl"
sx={{
width: '45%',
mb: 15,

}}
>

<Card sx={{
width: 400,
marginLeft: 20,
marginTop: 2,
display: 'flex',
color: '#000',

}}
>
<CardContent sx={{
display: 'flex', width: '100%',

}}
>

<CardContent sx={{
display: 'flex', flexDirection: 'column', width: '100%',
}}
>

<Typography sx={{ mb: 1.5, fontSize: 18 }}>
Favatiot Estate
{' '}
</Typography>

<List sx={{ width: '100%', maxWidth: 360, bgcolor: 'background.paper' }}>
<ListItem alignItems="flex-start">
<ListItemAvatar>
<Avatar alt="Travis Howard" src={House} />
</ListItemAvatar>
<ListItemText
primary="Rhoncus sed vestibulum"
secondary={(
<>
<Typography
sx={{
display: 'inline',
fontSize: 15,
color: '#5e5e5e',
}}
component="span"
variant="body2"
color="text.primary"
>
massa volutpat convallis morbi odio odio elementum eu interdum eu tincidunt in

</Typography>

</>
)}
/>
<Typography>
<Button
variant="outlined"
sx={{
ml: 2,
mt: 2,
minWidth: 0,
padding: 0,
border: 'none',
color: 'red',
'&:hover': { border: 'none' },

}}
>
X
</Button>
</Typography>
</ListItem>
<Divider variant="inset" component="li" />
<ListItem alignItems="flex-start">
<ListItemAvatar>
<Avatar alt="Travis Howard" src={House} />
</ListItemAvatar>
<ListItemText
primary="Rhoncus sed vestibulum"
secondary={(
<>
<Typography
sx={{
display: 'inline',
fontSize: 15,
color: '#5e5e5e',
}}
component="span"
variant="body2"
color="text.primary"
>
massa volutpat convallis morbi odio odio elementum eu interdum eu tincidunt in
</Typography>
</>
)}
/>
<Typography>
<Button
variant="outlined"
sx={{
ml: 2,
mt: 2,
minWidth: 0,
padding: 0,
color: 'red',
border: 'none',
'&:hover': { border: 'none' },

}}
>
X
</Button>
</Typography>
</ListItem>
</List>

</CardContent>
</CardContent>

</Card>

</Container>
);

export default AgenteFavariot;
Loading