Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature card mohammed #49

Open
wants to merge 78 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
2fe8d17
Basis (Code uit mijn vorige project)
Robin1224 May 17, 2024
39a90e9
Revert "Basis (Code uit mijn vorige project)"
Robin1224 May 17, 2024
4c81ee8
Update server.js
Robin1224 May 17, 2024
d868697
Code uit vorige project overgezet
Robin1224 May 17, 2024
6c5492d
Update INSTRUCTIONS.md
Robin1224 May 17, 2024
047ab45
Merge pull request #3 from Robin1224/basis-code-robin
Robin1224 May 17, 2024
11bc444
footer
Jaywesterlow May 17, 2024
a9cb1b6
Added comments to clientside JS
Robin1224 May 19, 2024
4123455
Added breadcrumbs
Robin1224 May 19, 2024
0e7a871
Added comment explaining breadcrumbs partial
Robin1224 May 19, 2024
746513d
Changed indentation according to team rules
Robin1224 May 19, 2024
53dd5a9
Update style.css
Robin1224 May 19, 2024
8f70143
Made page title dynamic
Robin1224 May 19, 2024
a4a6a26
Removed faulty body closing tag
Robin1224 May 19, 2024
23c6df2
Updated line 47
Robin1224 May 21, 2024
89229eb
Fixed indentation
Robin1224 May 21, 2024
3fd9d1f
Merge clientside JS comments
Robin1224 May 21, 2024
8c14c32
Indentation
Robin1224 May 21, 2024
38e8d87
nodemon
Mossati May 22, 2024
f0ed23b
nodemon toegevoegd
Remy2072 May 22, 2024
ade3f2c
api urls
Mossati May 22, 2024
d435ff0
code
Mossati May 22, 2024
d30aaee
Merge branch 'main' into feature-detail-remy
Remy2072 May 22, 2024
045a6ca
code
Mossati May 22, 2024
dfd2557
Merge branch 'main' into feature-leden-mohammed
Mossati May 22, 2024
1b02a94
code
Mossati May 22, 2024
6b67457
dialog
Mossati May 23, 2024
feb0b6d
Added mobile nav menu
Robin1224 May 24, 2024
d9fd808
Slightly changed mobile nav styling
Robin1224 May 24, 2024
578e11b
detailpage gmaakt
Remy2072 May 24, 2024
8a52300
v2.0 detailpage
Remy2072 May 24, 2024
3c97694
Merge pull request #23 from Robin1224/feature-detail-remy
Remy2072 May 24, 2024
b8c68e2
Merge remote-tracking branch 'origin' into feature-footer-jaymar
Jaywesterlow May 24, 2024
da54389
onnodig ejs bestand verwijderd
Jaywesterlow May 24, 2024
b212056
theme-color added
Remy2072 May 24, 2024
10e8e0c
Merge conflicts resolved // footer merged
Jaywesterlow May 24, 2024
c2487e8
Added toast notifications (Toastify)
Robin1224 May 24, 2024
3d24cb1
Merge branch 'feature-errorstate-robin'
Robin1224 May 24, 2024
d9c4832
Merge branch 'feature-convergeren-navbars-robin'
Robin1224 May 24, 2024
5c96e92
Update package-lock.json
Robin1224 May 24, 2024
8f17393
Update detail.ejs
Robin1224 May 24, 2024
20019fa
Fixed grid overflow
Robin1224 May 24, 2024
a475b32
Fixed detail page head
Robin1224 May 24, 2024
405daed
Added submit button enhancement
Robin1224 May 24, 2024
ed23961
Update favorieten.js
Robin1224 May 24, 2024
d31b572
Update favorieten.js
Robin1224 May 24, 2024
9ce3e4e
Added fetch functionality for ratings
Robin1224 May 24, 2024
3a9596b
Delete search-json.js
Robin1224 May 24, 2024
8dfa144
Added rendering of ratings
Robin1224 May 24, 2024
55dac41
Fixed invisible menu buttons still changing cursor
Robin1224 May 24, 2024
472a52f
Removed debug console.log
Robin1224 May 24, 2024
2e00a7b
PE footer dropdown functionality
Jaywesterlow May 26, 2024
3ecba70
Merge remote-tracking branch 'origin' into feature-footer-jaymar
Jaywesterlow May 26, 2024
fee8819
Merge pull request #26 from Robin1224/enhancement-submit-button-robin
Mossati May 27, 2024
b9ffc20
Merge branch 'main' of https://github.com/Robin1224/pleasurable-ui
Jaywesterlow May 27, 2024
45787d5
fix
Mossati May 27, 2024
a1f688e
Merge branch 'feature-leden-mohammed'
Remy2072 May 27, 2024
54523cf
Fixed rating
Robin1224 May 27, 2024
b01987d
borders
Remy2072 May 27, 2024
9d05b34
Update style.css
Robin1224 May 27, 2024
dee80b0
Updated padding for grid
Robin1224 May 27, 2024
b0e352a
Fixed padding at top on mobile layout
Robin1224 May 27, 2024
4b21170
css changes
Remy2072 May 27, 2024
76b4cf5
Fixed navbar
Robin1224 May 27, 2024
e241bee
Merge branch 'main' of https://github.com/Robin1224/pleasurable-ui in…
Remy2072 May 27, 2024
a6747ce
code
Mossati May 27, 2024
f325cd3
Merge branch 'main' of https://github.com/Robin1224/pleasurable-ui in…
Remy2072 May 27, 2024
df6dcff
Merge branch 'main' of https://github.com/Robin1224/pleasurable-ui
Mossati May 27, 2024
68977be
Fixed nav hover
Robin1224 May 27, 2024
66d0c72
Merge branch 'main' of https://github.com/Robin1224/pleasurable-ui
Robin1224 May 27, 2024
74c6dde
fix
Mossati May 27, 2024
3c646c8
Merge branch 'main' of https://github.com/Robin1224/pleasurable-ui
Mossati May 27, 2024
1db5329
Added confetti on 5 star rating
Robin1224 May 27, 2024
7c06ad7
Added scaling on rating stars
Robin1224 May 27, 2024
918e2c3
Added some comments in client side JS
Robin1224 May 27, 2024
787cfe5
Merge pull request #29 from Robin1224/feature-pleasurable-ratings-robin
Remy2072 May 27, 2024
6e46b87
leden
Mossati May 28, 2024
34ded02
fix
Mossati May 29, 2024
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
20 changes: 20 additions & 0 deletions helpers/fetch-json.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/**
* An asynchronous helper function that wraps the standard node.js fetch API.
* This function calls an API url passed as the first and mandatory parameter,
* there is an optional payload parameter to send a json object, eg. a filter.
* It then calls the API and returns the response body parsed as a json object.
* @example <caption>fetchJson as returning function using the await keyword</caption>
* const data = await fetchJson('https://api-url.com/endpoint/')
* @example <caption>fetchJson as oneliner using the then() structure.</caption>
* fetchJson('https://api-url.com/endpoint/').then((data)=>{
* // use data...
* })
* @param {string} url the api endpoint to address
* @param {object} [payload] the payload to send to the API
* @returns the response from the API endpoint parsed as a json object
*/
export default async function fetchJson(url, payload = {}) {
return await fetch(url, payload)
.then((response) => response.json())
.catch((error) => error)
}
1,190 changes: 1,190 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"doc": "docs"
},
"scripts": {
"start": "node server.js"
"start": "node server.js",
"dev": "nodemon server.js"
},
"repository": {
"type": "git",
Expand All @@ -27,6 +28,7 @@
"homepage": "https://github.com/fdnd-task/pleasurable-ui#readme",
"dependencies": {
"ejs": "^3.1.10",
"express": "^4.19.2"
"express": "^4.19.2",
"nodemon": "^3.1.0"
}
}
Binary file added public/assets/favicon.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 public/assets/font/ProximaNova-Black.woff
Binary file not shown.
Binary file added public/assets/font/ProximaNova-Black.woff2
Binary file not shown.
Binary file added public/assets/font/ProximaNova-BlackIt.woff
Binary file not shown.
Binary file added public/assets/font/ProximaNova-BlackIt.woff2
Binary file not shown.
Binary file added public/assets/font/ProximaNova-Bold.woff
Binary file not shown.
Binary file added public/assets/font/ProximaNova-Bold.woff2
Binary file not shown.
Binary file added public/assets/font/ProximaNova-BoldIt.woff
Binary file not shown.
Binary file added public/assets/font/ProximaNova-BoldIt.woff2
Binary file not shown.
Binary file added public/assets/font/ProximaNova-Extrabld.woff
Binary file not shown.
Binary file added public/assets/font/ProximaNova-Extrabld.woff2
Binary file not shown.
Binary file added public/assets/font/ProximaNova-ExtrabldIt.woff
Binary file not shown.
Binary file added public/assets/font/ProximaNova-ExtrabldIt.woff2
Binary file not shown.
Binary file added public/assets/font/ProximaNova-Light.woff
Binary file not shown.
Binary file added public/assets/font/ProximaNova-Light.woff2
Binary file not shown.
Binary file added public/assets/font/ProximaNova-LightIt.woff
Binary file not shown.
Binary file added public/assets/font/ProximaNova-LightIt.woff2
Binary file not shown.
Binary file added public/assets/font/ProximaNova-Medium.woff
Binary file not shown.
Binary file added public/assets/font/ProximaNova-Medium.woff2
Binary file not shown.
Binary file added public/assets/font/ProximaNova-MediumIt.woff
Binary file not shown.
Binary file added public/assets/font/ProximaNova-MediumIt.woff2
Binary file not shown.
Binary file added public/assets/font/ProximaNova-Regular.woff
Binary file not shown.
Binary file added public/assets/font/ProximaNova-Regular.woff2
Binary file not shown.
Binary file added public/assets/font/ProximaNova-RegularIt.woff
Binary file not shown.
Binary file added public/assets/font/ProximaNova-RegularIt.woff2
Binary file not shown.
Binary file added public/assets/font/ProximaNova-Semibold.woff
Binary file not shown.
Binary file added public/assets/font/ProximaNova-Semibold.woff2
Binary file not shown.
Binary file added public/assets/font/ProximaNova-SemiboldIt.woff
Binary file not shown.
Binary file added public/assets/font/ProximaNova-SemiboldIt.woff2
Binary file not shown.
Binary file added public/assets/font/ProximaNova-ThinIt.woff
Binary file not shown.
Binary file added public/assets/font/ProximaNova-ThinIt.woff2
Binary file not shown.
Binary file added public/assets/font/ProximaNovaT-Thin.woff
Binary file not shown.
Binary file added public/assets/font/ProximaNovaT-Thin.woff2
Binary file not shown.
198 changes: 198 additions & 0 deletions public/assets/font/stylesheet.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-BoldIt.woff2') format('woff2'),
url('ProximaNova-BoldIt.woff') format('woff');
font-weight: bold;
font-style: italic;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-Extrabld.woff2') format('woff2'),
url('ProximaNova-Extrabld.woff') format('woff');
font-weight: 800;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-Bold.woff2') format('woff2'),
url('ProximaNova-Bold.woff') format('woff');
font-weight: bold;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-Black.woff2') format('woff2'),
url('ProximaNova-Black.woff') format('woff');
font-weight: 900;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-Light.woff2') format('woff2'),
url('ProximaNova-Light.woff') format('woff');
font-weight: 300;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-ExtrabldIt.woff2') format('woff2'),
url('ProximaNova-ExtrabldIt.woff') format('woff');
font-weight: 800;
font-style: italic;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-LightIt.woff2') format('woff2'),
url('ProximaNova-LightIt.woff') format('woff');
font-weight: 300;
font-style: italic;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-BlackIt.woff2') format('woff2'),
url('ProximaNova-BlackIt.woff') format('woff');
font-weight: 900;
font-style: italic;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-Medium.woff2') format('woff2'),
url('ProximaNova-Medium.woff') format('woff');
font-weight: 500;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-Regular.woff2') format('woff2'),
url('ProximaNova-Regular.woff') format('woff');
font-weight: normal;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-Regular.woff2') format('woff2'),
url('ProximaNova-Regular.woff') format('woff');
font-weight: normal;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-Semibold.woff2') format('woff2'),
url('ProximaNova-Semibold.woff') format('woff');
font-weight: 600;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-RegularIt.woff2') format('woff2'),
url('ProximaNova-RegularIt.woff') format('woff');
font-weight: normal;
font-style: italic;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-Semibold.woff2') format('woff2'),
url('ProximaNova-Semibold.woff') format('woff');
font-weight: 600;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-SemiboldIt.woff2') format('woff2'),
url('ProximaNova-SemiboldIt.woff') format('woff');
font-weight: 600;
font-style: italic;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-Semibold.woff2') format('woff2'),
url('ProximaNova-Semibold.woff') format('woff');
font-weight: 600;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNovaT-Thin.woff2') format('woff2'),
url('ProximaNovaT-Thin.woff') format('woff');
font-weight: 100;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-MediumIt.woff2') format('woff2'),
url('ProximaNova-MediumIt.woff') format('woff');
font-weight: 500;
font-style: italic;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-ThinIt.woff2') format('woff2'),
url('ProximaNova-ThinIt.woff') format('woff');
font-weight: 100;
font-style: italic;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-RegularIt.woff2') format('woff2'),
url('ProximaNova-RegularIt.woff') format('woff');
font-weight: normal;
font-style: italic;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-SemiboldIt.woff2') format('woff2'),
url('ProximaNova-SemiboldIt.woff') format('woff');
font-weight: 600;
font-style: italic;
font-display: swap;
}

@font-face {
font-family: 'Proxima Nova';
src: url('ProximaNova-Regular.woff2') format('woff2'),
url('ProximaNova-Regular.woff') format('woff');
font-weight: normal;
font-style: normal;
font-display: swap;
}

1 change: 1 addition & 0 deletions public/assets/icons/agent-img.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icons/icon-close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icons/icon-energy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icons/icon-garden.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icons/icon-room.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icons/icon-size.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icons/icon-sort.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icons/icon-user-2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/icons/icon-user.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file added public/fonts/ProximaNova-Regular_2607783814.otf
Binary file not shown.
Binary file added public/fonts/ProximaNova-Semibold_3872794340.otf
Binary file not shown.
10 changes: 10 additions & 0 deletions public/scripts/detail.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
const price = document.querySelector(".house-price span");
const priceValue = parseInt(price.textContent, 10);
const priceFormatted = priceValue.toLocaleString("nl-NL");
const formattedPrice = formatPrice(priceValue);

function formatPrice(priceValue) {
return new Intl.NumberFormat("nl-NL").format(priceValue);
}

price.textContent = formattedPrice;
Loading