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

Reviews #15

Open
wants to merge 88 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
078dfbf
file structure
jingh999 May 27, 2024
abc76d2
folders
jingh999 May 27, 2024
baf90f5
Nav bar + hero video added
lunek1 May 28, 2024
4aef145
add htm and style for News letter, Find us and contact sections
May 28, 2024
614b9a4
add list and responsiveness, not finish
May 28, 2024
99e130d
homepage
jingh999 May 29, 2024
8108f27
Added font in html instead of css
lunek1 May 29, 2024
f22be66
Added font to text overlay
lunek1 May 29, 2024
6e460b4
Update Nav.jsx
lunek1 May 29, 2024
2d7cb9d
Merge pull request #1 from lunek1/Nav
jingh999 May 29, 2024
c832e32
Merge branch 'main' into jing-homepage
jingh999 May 29, 2024
6ef2caa
Merge pull request #2 from jingh999/jing-homepage
jingh999 May 29, 2024
91458e5
footer responsiveness and styling done and working
May 29, 2024
6b96aff
combine components
jingh999 May 29, 2024
56d6d4f
Merge branch 'main' into FOOTER
jingh999 May 29, 2024
865bc71
Merge pull request #3 from vidalhuix/FOOTER
jingh999 May 29, 2024
3dd12d3
footer position relative
jingh999 May 29, 2024
d63cd6d
add some changes
May 29, 2024
788430e
responsiveness and booking container
jingh999 May 30, 2024
71e85ed
add style to the caorusell
May 31, 2024
4e3fdab
Style
jingh999 May 31, 2024
e789d25
Merge pull request #4 from jingh999/responsive-and-booking-style
jingh999 May 31, 2024
46ad795
add styling and text description to the events, images still not matc…
May 31, 2024
1ecd4c3
add styling and text description to the events, images still not matc…
May 31, 2024
0b25787
Merge branch 'main' into FOOTER
jingh999 May 31, 2024
7ef8631
Merge pull request #5 from vidalhuix/FOOTER
jingh999 May 31, 2024
c1a40ee
hotel data
jingh999 May 31, 2024
e8ffca0
Merge pull request #6 from jingh999/backend-hotel
jingh999 May 31, 2024
a9377a1
Modified vite
lunek1 May 31, 2024
221f4a6
hotel backend
jingh999 May 31, 2024
7fd857b
Merge pull request #7 from jingh999/Hotel-API
jingh999 May 31, 2024
dd64eb8
Merge branch 'jingh999:main' into main
lunek1 May 31, 2024
e4fc29b
changed Restaurant section to Review. Add reviews and style.
Jun 2, 2024
54570b6
add read more button
Jun 2, 2024
16830c6
add BackToTopButton code and style
Jun 2, 2024
60c3f6a
add Reviews title
Jun 3, 2024
6cbfed9
Merge pull request #8 from vidalhuix/Reviews
jingh999 Jun 3, 2024
5d42bc3
responsive and hotel availability
jingh999 Jun 3, 2024
2dca74a
Merge pull request #9 from jingh999/Responsive
jingh999 Jun 3, 2024
c1418d7
Login and register page created
lunek1 Jun 3, 2024
81a5e7a
Merge branch 'jingh999:main' into Nav
lunek1 Jun 3, 2024
9b1db69
Updated App.jsx for Login & Register
lunek1 Jun 3, 2024
4c647e7
Merge branch 'Nav' of https://github.com/lunek1/w17-project-final int…
lunek1 Jun 3, 2024
97d6148
Merge pull request #10 from lunek1/Nav
jingh999 Jun 3, 2024
255c792
Updated nav with new changes
lunek1 Jun 3, 2024
17e5b5c
Merge pull request #11 from lunek1/Nav
jingh999 Jun 3, 2024
d6763f1
edit
jingh999 Jun 3, 2024
78b22eb
Merge branch 'main' into edit
jingh999 Jun 3, 2024
ee2c5d3
Merge pull request #12 from jingh999/edit
jingh999 Jun 3, 2024
f25f8e1
edit booking and hero components
jingh999 Jun 3, 2024
e64e6c4
Merge pull request #13 from jingh999/style
jingh999 Jun 3, 2024
f23e251
add styling to the carrusel and push
Jun 3, 2024
5342a0d
add styling to the carrusel and push
Jun 3, 2024
4bc945e
add netlify.toml
Jun 3, 2024
a25feb2
netlify
jingh999 Jun 3, 2024
c308160
image path
jingh999 Jun 4, 2024
41fcf0e
image path
jingh999 Jun 4, 2024
f1f123b
image path
jingh999 Jun 4, 2024
289e613
Merge branch 'jingh999:main' into main
lunek1 Jun 4, 2024
2039de7
clear files and create hotelrooms page
jingh999 Jun 4, 2024
fce08a1
Merge branch 'jingh999:main' into main
lunek1 Jun 4, 2024
03b9d27
hotelrooms page connect
jingh999 Jun 4, 2024
37c7dc7
Merge branch 'jingh999:main' into main
lunek1 Jun 4, 2024
bff3c0b
save Roomspage. Add images, grid styling and it's responsive :D
Jun 4, 2024
9b12961
add ScrollToTop component on App.jsx under <Router>
Jun 4, 2024
e8321da
Room status database
jingh999 Jun 5, 2024
a714d5e
Merge pull request #15 from jingh999/Data-model-for-room-status
jingh999 Jun 5, 2024
da21414
endpoint
jingh999 Jun 5, 2024
7e61fd3
Merge pull request #14 from vidalhuix/Reviews
jingh999 Jun 5, 2024
0edbce8
Merge branch 'jingh999:main' into main
lunek1 Jun 5, 2024
51f3359
add room component
Jun 5, 2024
dd5b63d
removed RoomDetails component
Jun 5, 2024
ceb5299
Log in, register, delete user added
lunek1 Jun 5, 2024
1d5b8c5
Merge pull request #16 from lunek1/main
jingh999 Jun 5, 2024
9b0b5e0
get available rooms data by data and guest amount
jingh999 Jun 5, 2024
2107841
Merge pull request #17 from jingh999/booking-endpoint
jingh999 Jun 5, 2024
c0d15cb
add carrusel on room images
Jun 6, 2024
a7d0b4f
add description and read more button
Jun 6, 2024
70be993
Login works, userpage created but needs backend
lunek1 Jun 7, 2024
166352a
connect Roomspage to API (not the images), add loading spinner
Jun 7, 2024
5a6c256
searching available rooms function frontend
jingh999 Jun 7, 2024
6a98e87
Merge pull request #18 from lunek1/main
jingh999 Jun 7, 2024
1d3b989
Merge branch 'main' into jing
jingh999 Jun 7, 2024
0e4bcbb
Merge pull request #20 from jingh999/jing
jingh999 Jun 7, 2024
8956d6b
units edit
jingh999 Jun 7, 2024
47497e1
booking page frontend
jingh999 Jun 7, 2024
e14b2d9
Merge pull request #21 from jingh999/hotel-data
jingh999 Jun 7, 2024
00de1a5
resolve PR issues
Jun 10, 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
1 change: 1 addition & 0 deletions backend/.env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
RESET_DB=1
72 changes: 72 additions & 0 deletions backend/data/hotel-room.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
[
{
"id": 1,
"type": "Standard",
"price": "110",
"size": "28",
"capacity": 2,
"description": "Give life a little more space. Take a break from everyday life and let time stand still for a while. Our luxury room has a scandinavian romantic interior style. With fragile lace, porcelain figurines and details.",
"image": "https://assets-global.website-files.com/643cf9faa943e87284f8e158/6474a083eba0f5b34d6e3c6a_Standardrum_Sastaholm-%20(2)-min.jpg",
"facilities": ["Free WiFi", "Air Conditioning", "Flat Screen TV", "Minibar"]
},
{
"id": 2,
"type": "Standard",
"price": "110",
"size": "28",
"capacity": 2,
"description": "Give life a little more space. Take a break from everyday life and let time stand still for a while. Our luxury room has a scandinavian romantic interior style. With fragile lace, porcelain figurines and details.",
"image": "https://assets-global.website-files.com/643cf9faa943e87284f8e158/6474a083eba0f5b34d6e3c6a_Standardrum_Sastaholm-%20(2)-min.jpg",
"facilities": ["Free WiFi", "Air Conditioning", "Flat Screen TV", "Minibar"]
},
{
"id": 3,
"type": "Standard",
"price": "110",
"size": "28",
"capacity": 2,
"description": "Give life a little more space. Take a break from everyday life and let time stand still for a while. Our luxury room has a scandinavian romantic interior style. With fragile lace, porcelain figurines and details.",
"image": "https://assets-global.website-files.com/643cf9faa943e87284f8e158/6474a083eba0f5b34d6e3c6a_Standardrum_Sastaholm-%20(2)-min.jpg",
"facilities": ["Free WiFi", "Air Conditioning", "Flat Screen TV", "Minibar"]
},
{
"id": 4,
"type": "Standard",
"price": "110",
"size": "28",
"capacity": 2,
"description": "Give life a little more space. Take a break from everyday life and let time stand still for a while. Our luxury room has a scandinavian romantic interior style. With fragile lace, porcelain figurines and details.",
"image": "https://assets-global.website-files.com/643cf9faa943e87284f8e158/6474a083eba0f5b34d6e3c6a_Standardrum_Sastaholm-%20(2)-min.jpg",
"facilities": ["Free WiFi", "Air Conditioning", "Flat Screen TV", "Minibar"]
},
{
"id": 5,
"type": "Luxury",
"price": "150",
"size": "37",
"capacity": 2,
"description": "Art deco-inspired rooms with fitted fabrics, wallpaper in period colours, sober lighting and fully tiled bathrooms. Of course you will find a comfortable workplace in these rooms, sometimes you also have to do your must dos.",
"image": "https://assets-global.website-files.com/643cf9faa943e87284f8e158/64770379e9280adf60424fa9_Juniorsvit_Shima_Niavarani_Sastaholm-%20(3)-min.jpg",
"facilities": ["Free WiFi", "Air Conditioning", "Flat Screen TV", "Minibar", "Working table"]
},
{
"id": 6,
"type": "Luxury",
"price": "150",
"size": "37",
"capacity": 2,
"description": "Art deco-inspired rooms with fitted fabrics, wallpaper in period colours, sober lighting and fully tiled bathrooms. Of course you will find a comfortable workplace in these rooms, sometimes you also have to do your must dos.",
"image": "https://assets-global.website-files.com/643cf9faa943e87284f8e158/64770379e9280adf60424fa9_Juniorsvit_Shima_Niavarani_Sastaholm-%20(3)-min.jpg",
"facilities": ["Free WiFi", "Air Conditioning", "Flat Screen TV", "Minibar", "Working table"]
},
{
"id": 7,
"type": "Premium Suite",
"price": "180",
"size": "64",
"capacity": 4,
"description": "In our suites you live extra comfortably with a separate bedroom and a living room. All suites have a double bed and sofa bed which can accommodate three adults or two adults and two children. Perfect when you want to stay with the whole family.",
"image": "https://assets-global.website-files.com/643cf9faa943e87284f8e158/6474bd14e98ef21fd5ab2925_Svit_Elin_Rombo_Sastaholm-%20(5)-min.jpg",
"facilities": ["Free WiFi", "Air Conditioning", "Flat Screen TV", "Minibar", "Working table", "Jacuzzi", "Balcony"]
}
]
Loading