Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
4456fd3
project: react structure created
haykbit Sep 6, 2021
0cd4010
structure: added data.json file and instaled redux dependencies
haykbit Sep 6, 2021
d7de18f
structure: redux global structure created
haykbit Sep 6, 2021
e9b4804
feat: added ajax call getPropierties
haykbit Sep 6, 2021
d004179
Merge pull request #2 from haykbit/F01/Global-Redux
haykbit Sep 6, 2021
601131b
redux redy
jonCroatanUto Sep 7, 2021
a419c78
Style: Added style file to Propierties
haykbit Sep 7, 2021
b06b5e9
feat: create card from state data
haykbit Sep 7, 2021
430450a
style: styling added
haykbit Sep 7, 2021
3c3c763
searching
jonCroatanUto Sep 7, 2021
1d6cd10
feat: react route functionality added
haykbit Sep 7, 2021
aeeeddb
Merge pull request #19 from haykbit/F18/React-Route
haykbit Sep 7, 2021
d0362a9
find match letters
jonCroatanUto Sep 7, 2021
be36e59
style: basic style added
haykbit Sep 7, 2021
1bf8b10
subimt propieties by city name
jonCroatanUto Sep 8, 2021
345ddbc
feat: structure and style of Home page
haykbit Sep 8, 2021
dce4d86
render the flats
jonCroatanUto Sep 8, 2021
38b4ef4
fix
haykbit Sep 8, 2021
1f7b401
last changes
jonCroatanUto Sep 8, 2021
77bfefa
merging master
jonCroatanUto Sep 8, 2021
df0bdef
Merge pull request #21 from haykbit/serchingInput
jonCroatanUto Sep 8, 2021
b369260
feat: proppiertes data access done
haykbit Sep 8, 2021
e83b888
button name fix
haykbit Sep 8, 2021
b0d2f78
Merge branch 'master' into F20/Home-Page-Propierties
haykbit Sep 8, 2021
b8f6fb5
rangeInput
jonCroatanUto Sep 8, 2021
8f0e043
Added style to input search
haykbit Sep 8, 2021
32b5d5b
Merge pull request #22 from haykbit/F20/Home-Page-Propierties
haykbit Sep 8, 2021
6b5e2cd
feat: Styled home buttons / React route fixed
haykbit Sep 8, 2021
27c1e14
form prepared
jonCroatanUto Sep 8, 2021
5c0d2a8
feat: redirection on button added
haykbit Sep 8, 2021
ce40bd1
Merge pull request #25 from haykbit/F23/Buttons-redirect-dashboard
haykbit Sep 8, 2021
006a567
edit: edited json
haykbit Sep 8, 2021
53b390f
Merge pull request #26 from haykbit/F23/Buttons-redirect-dashboard
haykbit Sep 8, 2021
0e54754
feat: search button redirect added
haykbit Sep 8, 2021
ac6d17a
Merge pull request #27 from haykbit/F23/Buttons-redirect-dashboard
haykbit Sep 8, 2021
53c50dd
form styles
jonCroatanUto Sep 9, 2021
b594c16
fix: fixed search engine
haykbit Sep 9, 2021
387ead5
Merge pull request #28 from haykbit/F24/Fix-Search-Engine
haykbit Sep 9, 2021
b5fefbc
feat: deleted code
haykbit Sep 9, 2021
131efa8
Merge pull request #29 from haykbit/F24/Fix-Search-Engine
haykbit Sep 9, 2021
4dfcd37
feat: created redirect function with state reseting
haykbit Sep 9, 2021
60f2335
feat: added style
haykbit Sep 9, 2021
124a12c
Merge pull request #31 from haykbit/F30/Redirection-bf
haykbit Sep 9, 2021
ae0fcc8
style: button style
haykbit Sep 9, 2021
3ddc0bb
finish to set the filters into reducer
jonCroatanUto Sep 10, 2021
6ca4a3c
finish details
jonCroatanUto Sep 10, 2021
3fc1946
mergin master
jonCroatanUto Sep 10, 2021
4ca8c3c
Merge pull request #33 from haykbit/dashboardForm
jonCroatanUto Sep 10, 2021
59f8dce
feat: filter funcionality added
haykbit Sep 10, 2021
ccb4b82
Merge pull request #35 from haykbit/F34/Filter-Functionality
haykbit Sep 10, 2021
e565329
automatizate ajax peticions
jonCroatanUto Sep 10, 2021
6b6efbf
onchenge peticion
jonCroatanUto Sep 10, 2021
ecdf133
Merge pull request #37 from haykbit/noSubmitSionchange
jonCroatanUto Sep 10, 2021
71ee991
style: filters
haykbit Sep 10, 2021
fb55a60
Merge branch 'master' of https://github.com/haykbit/redux-pill
haykbit Sep 10, 2021
892c217
styleing
jonCroatanUto Sep 10, 2021
4ac2558
code: clean code
haykbit Sep 10, 2021
fe6f657
search
haykbit Sep 10, 2021
a8958ad
style: added
haykbit Sep 10, 2021
e4516ac
fix dashboard useeffect
jonCroatanUto Sep 10, 2021
2a2021f
fixed useffect
jonCroatanUto Sep 10, 2021
9a42675
Merge pull request #38 from haykbit/fix_useffect
jonCroatanUto Sep 10, 2021
2fefef9
fix: title changed
haykbit Sep 10, 2021
e93dc2d
using real backend
jonCroatanUto Sep 14, 2021
d41fd12
session gestion, logout, register, login token
jonCroatanUto Sep 14, 2021
4d03471
feat: propieties grid and CRUD
haykbit Sep 14, 2021
dc83c65
Merge pull request #40 from haykbit/F39/CRUD-View
haykbit Sep 14, 2021
f5cd45f
bootstrap
jonCroatanUto Sep 14, 2021
96c4b3c
merge master
jonCroatanUto Sep 14, 2021
f573ce9
tooken login
jonCroatanUto Sep 14, 2021
83a2612
Merge pull request #41 from haykbit/session
jonCroatanUto Sep 14, 2021
0bd4c8e
trying destroy tokken
jonCroatanUto Sep 15, 2021
21d3022
logout out
jonCroatanUto Sep 15, 2021
a95d195
properties route fix
jonCroatanUto Sep 15, 2021
70b6ab1
route properties fixed
jonCroatanUto Sep 15, 2021
edf8126
Merge pull request #42 from haykbit/session
jonCroatanUto Sep 15, 2021
f4522f6
fix delete
jonCroatanUto Sep 15, 2021
48ba0f7
merge
jonCroatanUto Sep 15, 2021
c23065d
merge master
jonCroatanUto Sep 15, 2021
5f21bce
Merge pull request #43 from haykbit/fix_delete
jonCroatanUto Sep 15, 2021
8075b0f
including bootstrap
jonCroatanUto Sep 15, 2021
27668ab
fixed code
Sep 15, 2021
67527ea
aply bootstrap to login
jonCroatanUto Sep 15, 2021
1b738cf
Merge pull request #44 from haykbit/styleLogin
jonCroatanUto Sep 15, 2021
ef0d72b
Merge branch 'master' into Fix-errors
haykbit Sep 15, 2021
d372f57
Merge pull request #45 from haykbit/Fix-errors
haykbit Sep 15, 2021
0016409
arreglo todo soy un manitas
haykbit Sep 15, 2021
02d386d
Merge branch 'Fix-errors'
haykbit Sep 15, 2021
2d03253
fixed login and delete
haykbit Sep 16, 2021
a331d67
feat: commit for pull
haykbit Sep 16, 2021
d8dce5e
Merge pull request #49 from haykbit/F49/Data-org
haykbit Sep 16, 2021
fca4fac
styles of register page
jonCroatanUto Sep 16, 2021
abd237c
register redirect
jonCroatanUto Sep 16, 2021
e389921
fix: fixed state propagation
haykbit Sep 16, 2021
e697bf3
Merge pull request #50 from haykbit/styles_register
jonCroatanUto Sep 16, 2021
ee2456b
e.pr
haykbit Sep 16, 2021
0fdeb38
Merge pull request #51 from haykbit/F48/Update-function
haykbit Sep 16, 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
24 changes: 23 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,23 @@
node_modules
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
71 changes: 71 additions & 0 deletions .test.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{state.value.map( ( {id, image, province, offer, street, type, description, price, room, bath, size } ) => {
return (
<Paper className={classes.paper}>
<Grid container spacing={2}>
<Grid item >
<ButtonBase className={classes.image}>
<img className={classes.media} alt="complex" src={image} />
</ButtonBase>
</Grid>
<Grid item xs={12} sm container>
<Grid item xs container direction="column" spacing={2}>
<Grid item xs>
<Typography gutterBottom variant="subtitle1">
{offer} {type} {province}
</Typography>
<Typography variant="body2" gutterBottom>
{description}
</Typography>
<Typography variant="body2" color="textSecondary">
{street}
</Typography>
</Grid>
</Grid>
</Grid>
<Grid item>
<Typography variant="subtitle1" className={classes.price}>190.000,00 €</Typography>
</Grid>
</Grid>
<Grid container className={classes.iconContainer}>
<Grid item className={classes.iconItem}>
<Typography variant="body2" gutterBottom>
<KingBedIcon color="disabled"/>
<Grid item>{room}</Grid>
</Typography>
</Grid>

<Grid item className={classes.iconItem}>
<Typography variant="body2" gutterBottom>
<BathtubIcon color="disabled"/>
<Grid item>{bath}</Grid>
</Typography>
</Grid>

<Grid item className={classes.iconItem}>
<Typography variant="body2" gutterBottom>
<CropDinIcon color="disabled"/>
<Grid item>{size} m2</Grid>
</Typography>
</Grid>
</Grid>

</Paper>
)
})}



<Autocomplete
id="custom-input-demo"
options={cities}
onChange={handelChange}
renderInput={(params) => (
<div ref={params.InputProps.ref}>
<input
style={{ width: 200 }}
type="text"
{...params.inputProps}
/>
</div>
)}
/>
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
- All the code, including comments, needs to be written in English
- You must use semantic HTML5 elements for all the contents of the application, main, section, form, input types, etc


## Repository

First of all you must fork this project into your GitHub account.
Expand All @@ -51,7 +50,6 @@ To create a fork on GitHub is as easy as clicking the “fork” button on the r

\* LocalStorage


## Project delivery

To deliver this project you must follow the steps indicated in the document:
Expand Down
19 changes: 19 additions & 0 deletions data.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"posts": [
{
"id": 1,
"title": "json-server",
"author": "typicode"
}
],
"comments": [
{
"id": 1,
"body": "some comment",
"postId": 1
}
],
"profile": {
"name": "typicode"
}
}
Loading