Code

Accessivility with b😅#41

Code

Open

vidalhuix wants to merge 181 commits intoTechnigo:mainTechnigo/project-final:mainfrom jingh999:Accessivilityjingh999/w17-project-final:AccessivilityCopy head branch name to clipboard

+17,638-30

Commits

Commits on May 27, 2024

• file structure

  jingh999

  committed
  078dfbf

• folders

  jingh999

  committed
  abc76d2

Commits on May 28, 2024

• Nav bar + hero video added

  lunek1

  committed
  baf90f5

• add htm and style for News letter, Find us and contact sections

  

  Your Name

  committed
  4aef145

• add list and responsiveness, not finish

  

  Your Name

  committed
  614b9a4

Commits on May 29, 2024

• homepage

  jingh999

  committed
  99e130d

• Added font in html instead of css

  lunek1

  committed
  8108f27

• Added font to text overlay

  lunek1

  committed
  f22be66

• Update Nav.jsx

  lunek1

  authored
  6e460b4

• Merge pull request #1 from lunek1/Nav

  Show description for 2d7cb9d
  jingh999

  authored
  2d7cb9d

• Merge branch 'main' into jing-homepage

  jingh999

  authored
  c832e32

• Merge pull request #2 from jingh999/jing-homepage

  Show description for 6ef2caa
  jingh999

  authored
  6ef2caa

• footer responsiveness and styling done and working

  

  Your Name

  committed
  91458e5

• combine components

  jingh999

  committed
  6b96aff

• Merge branch 'main' into FOOTER

  jingh999

  authored
  56d6d4f

• Merge pull request #3 from vidalhuix/FOOTER

  Show description for 865bc71
  jingh999

  authored
  865bc71

• footer position relative

  jingh999

  committed
  3dd12d3

• add some changes

  

  Your Name

  committed
  d63cd6d

Commits on May 30, 2024

• responsiveness and booking container

  jingh999

  committed
  788430e

Commits on May 31, 2024

• add style to the caorusell

  

  Your Name

  committed
  71e85ed

• Style

  jingh999

  committed
  4e3fdab

• Merge pull request #4 from jingh999/responsive-and-booking-style

  Show description for e789d25
  jingh999

  authored
  e789d25

• add styling and text description to the events, images still not matching the description

  

  Your Name

  committed
  46ad795

• add styling and text description to the events, images still not matching the description

  

  Your Name

  committed
  1ecd4c3

• Merge branch 'main' into FOOTER

  jingh999

  authored
  0b25787

• Merge pull request #5 from vidalhuix/FOOTER

  Show description for 7ef8631
  jingh999

  authored
  7ef8631

• hotel data

  jingh999

  committed
  c1a40ee

• Merge pull request #6 from jingh999/backend-hotel

  Show description for e8ffca0
  jingh999

  authored
  e8ffca0

• Modified vite

  lunek1

  committed
  a9377a1

• hotel backend

  jingh999

  committed
  221f4a6

• Merge pull request #7 from jingh999/Hotel-API

  Show description for 7fd857b
  jingh999

  authored
  7fd857b

• Merge branch 'jingh999:main' into main

  lunek1

  authored
  dd64eb8

Commits on Jun 2, 2024

• changed Restaurant section to Review. Add reviews and style.

  

  Your Name

  committed
  e4fc29b

• add read more button

  

  Your Name

  committed
  54570b6

• add BackToTopButton code and style

  

  Your Name

  committed
  16830c6

Commits on Jun 3, 2024

• add Reviews title

  

  Your Name

  committed
  60c3f6a

• Merge pull request #8 from vidalhuix/Reviews

  Show description for 6cbfed9
  jingh999

  authored
  6cbfed9

• responsive and hotel availability

  jingh999

  committed
  5d42bc3

• Merge pull request #9 from jingh999/Responsive

  Show description for 2dca74a
  jingh999

  authored
  2dca74a

• Login and register page created

  lunek1

  committed
  c1418d7

• Merge branch 'jingh999:main' into Nav

  lunek1

  authored
  81a5e7a

• Updated App.jsx for Login & Register

  lunek1

  committed
  9b1db69

• Merge branch 'Nav' of https://github.com/lunek1/w17-project-final into Nav

  lunek1

  committed
  4c647e7

• Merge pull request #10 from lunek1/Nav

  Show description for 97d6148
  jingh999

  authored
  97d6148

• Updated nav with new changes

  lunek1

  committed
  255c792

• Merge pull request #11 from lunek1/Nav

  Show description for 17e5b5c
  jingh999

  authored
  17e5b5c

• edit

  jingh999

  committed
  d6763f1

• Merge branch 'main' into edit

  jingh999

  authored
  78b22eb

• Merge pull request #12 from jingh999/edit

  Show description for ee2c5d3
  jingh999

  authored
  ee2c5d3

• edit booking and hero components

  jingh999

  committed
  f25f8e1

• Merge pull request #13 from jingh999/style

  Show description for e64e6c4
  jingh999

  authored
  e64e6c4

• add styling to the carrusel and push

  

  Your Name

  committed
  f23e251

• add styling to the carrusel and push

  

  Your Name

  committed
  5342a0d

• add netlify.toml

  

  Your Name

  committed
  4bc945e

• netlify

  jingh999

  committed
  a25feb2

Commits on Jun 4, 2024

• image path

  jingh999

  committed
  c308160

• image path

  jingh999

  committed
  41fcf0e

• image path

  jingh999

  committed
  f1f123b

• Merge branch 'jingh999:main' into main

  lunek1

  authored
  289e613

• clear files and create hotelrooms page

  jingh999

  committed
  2039de7

• Merge branch 'jingh999:main' into main

  lunek1

  authored
  fce08a1

• hotelrooms page connect

  jingh999

  committed
  03b9d27

• Merge branch 'jingh999:main' into main

  lunek1

  authored
  37c7dc7

• save Roomspage. Add images, grid styling and it's responsive :D

  

  Your Name

  committed
  bff3c0b

• add ScrollToTop component on App.jsx under <Router>

  

  Your Name

  committed
  9b12961

Commits on Jun 5, 2024

• Room status database

  jingh999

  committed
  e8321da

• Merge pull request #15 from jingh999/Data-model-for-room-status

  Show description for a714d5e
  jingh999

  authored
  a714d5e

• endpoint

  jingh999

  committed
  da21414

• Merge pull request #14 from vidalhuix/Reviews

  Show description for 7e61fd3
  jingh999

  authored
  7e61fd3

• Merge branch 'jingh999:main' into main

  lunek1

  authored
  0edbce8

• add room component

  

  Your Name

  committed
  51f3359

• removed RoomDetails component

  

  Your Name

  committed
  dd5b63d

• Log in, register, delete user added

  lunek1

  committed
  ceb5299

• Merge pull request #16 from lunek1/main

  Show description for 1d5b8c5
  jingh999

  authored
  1d5b8c5

• get available rooms data by data and guest amount

  jingh999

  committed
  9b0b5e0

• Merge pull request #17 from jingh999/booking-endpoint

  Show description for 2107841
  jingh999

  authored
  2107841

Commits on Jun 6, 2024

• add carrusel on room images

  

  Your Name

  committed
  c0d15cb

• add description and read more button

  

  Your Name

  committed
  a7d0b4f

Commits on Jun 7, 2024

• Login works, userpage created but needs backend

  lunek1

  committed
  70be993

• connect Roomspage to API (not the images), add loading spinner

  

  Your Name

  committed
  166352a

• searching available rooms function frontend

  jingh999

  committed
  5a6c256

• Merge pull request #18 from lunek1/main

  Show description for 6a98e87
  jingh999

  authored
  6a98e87

• Merge branch 'main' into jing

  jingh999

  authored
  1d3b989

• Merge pull request #20 from jingh999/jing

  Show description for 0e4bcbb
  jingh999

  authored
  0e4bcbb

• units edit

  jingh999

  committed
  8956d6b

• booking page frontend

  jingh999

  committed
  47497e1

• Merge pull request #21 from jingh999/hotel-data

  Show description for e14b2d9
  jingh999

  authored
  e14b2d9

• made AboutUs component

  

  Your Name

  committed
  be89621

Commits on Jun 10, 2024

• change some styling on Footer and About

  

  Your Name

  committed
  6e4494c

• Frontend register connected to backend

  lunek1

  committed
  ddc13f9

• Merge pull request #22 from lunek1/main

  Show description for a91eb26
  jingh999

  authored
  a91eb26

• date input

  jingh999

  committed
  d3c0bb7

• resolve PR issues

  

  Your Name

  committed
  00de1a5

• Merge pull request #19 from jingh999/Reviews

  Show description for f6e3f84
  jingh999

  authored
  f6e3f84

• Merge pull request #23 from jingh999/final-week---booking-system

  Show description for 04feaab
  jingh999

  authored
  04feaab

• merged main to Arnau

  

  Your Name

  committed
  4d858dc

• Merge branch 'main' into Arnau

  vidalhuix

  authored
  354ea50

• save changes before changing branch

  

  Your Name

  committed
  a154dad

• trap in a merge situation

  

  Your Name

  committed
  64cf7f4

• delete repeated booking section

  

  Your Name

  committed
  4202e27

• Add check room availability endpoint

  jingh999

  committed
  0fdace6

• Merge pull request #25 from jingh999/check-room-availability

  Show description for b083822
  jingh999

  authored
  b083822

• Check room availability and if so redirect to login page

  jingh999

  committed
  f280972

• Merge pull request #26 from jingh999/feat/handle-booking

  Show description for 64fb501
  jingh999

  authored
  64fb501

Commits on Jun 11, 2024

• Merge pull request #24 from jingh999/Arnau

  Show description for 35c40fd
  jingh999

  authored
  35c40fd

• bookingSection

  jingh999

  committed
  7396536

• Userpage fetching from endpoint, delete user works

  lunek1

  committed
  6225bf3

• Page to confirm the bookin and register

  jingh999

  committed
  fc4cd8b

• Merge pull request #27 from lunek1/main

  Show description for e69b2d1
  jingh999

  authored
  e69b2d1

• Merge branch 'main' into Book-confirming-and-register-page

  jingh999

  authored
  9b9795f

• Merge pull request #28 from jingh999/Book-confirming-and-register-page

  Show description for 7d1b22f
  jingh999

  authored
  7d1b22f

• logo on booking confirm page

  jingh999

  committed
  8d34096

• set check-out date start value and pass the guest value to the confirm page

  jingh999

  committed
  18beb07

• Merge pull request #29 from jingh999/check-out-start-date-and-guest-value

  Show description for f48c2bb
  jingh999

  authored
  f48c2bb

• save last changes, hash link working and created a separated component for MainPage

  

  Your Name

  committed
  a9f81f8

• Merge branch 'main' of https://github.com/jingh999/w17-project-final

  

  Your Name

  committed
  e0258b5

• I had to commit something to be able to change branch

  

  Your Name

  committed
  5007aa9

• add changes to About and created Conference & Event page

  

  Your Name

  committed
  8b7bcd1

• add changes to About and created Conference & Event page

  

  Your Name

  committed
  c9ef95c

Commits on Jun 12, 2024

• text color

  jingh999

  committed
  b58c2bc

• Merge pull request #30 from jingh999/jing-text-color

  Show description for c04fe33
  jingh999

  authored
  c04fe33

• changed Roomspage removed fetch from API and add data from FE

  

  Your Name

  committed
  18fe14c

• Cleaned up UserPage.jsx

  lunek1

  committed
  15fe814

• Responsiveness - pages of bookingrooms and bookingconfirm

  jingh999

  committed
  052832f

• Merge pull request #31 from jingh999/jing--responsiveness

  Show description for 4deec19
  jingh999

  authored
  4deec19

• responsive

  jingh999

  committed
  b12436d

• room-image

  jingh999

  committed
  16e6d14

• Bookinginfo show up on userpage but is not saved

  lunek1

  committed
  e6d9a11

• Removed comments, changed BookingContext

  lunek1

  committed
  e293ce1

• Removed comment

  lunek1

  committed
  9e59557

• Merge branch 'main' of https://github.com/lunek1/w17-project-final

  lunek1

  committed
  83d7a1f

• Merge pull request #32 from lunek1/main

  Show description for 2bb1207
  jingh999

  authored
  2bb1207

• add animation styling to the pages

  

  Your Name

  committed
  4235a53

• create booking endpoint and edit the responsiveness of userpage

  jingh999

  committed
  a5434ee

• Merge pull request #34 from jingh999/bookingpoint-and-responsiveness

  Show description for 5181e44
  jingh999

  authored
  5181e44

• Confirm booking on user register

  jingh999

  committed
  073771e

• Merge pull request #35 from jingh999/feat/create-booking-on-register

  Show description for 8c562a3
  jingh999

  authored
  8c562a3

• Add get user bookings endpoint

  jingh999

  committed
  26dd0ba

• Merge pull request #36 from jingh999/feat/get-user-booking-endpoint

  Show description for 4ea1d52
  jingh999

  authored
  4ea1d52

• Authenticate user for get user bookings endpoint

  jingh999

  committed
  44b5ffb

• Merge pull request #37 from jingh999/feat/show-booking-info-on-user-page

  Show description for 1eb4e13
  jingh999

  authored
  1eb4e13

• Show user bookings on user page

  jingh999

  committed
  3a7a9ba

• Merge branch 'main' into Arnau

  jingh999

  authored
  28a240f

• solve conflicts

  jingh999

  committed
  8569e90

• Merge pull request #33 from jingh999/Arnau

  Show description for afa9c4b
  jingh999

  authored
  afa9c4b

• Merge app-new into app

  jingh999

  committed
  57ba0aa

• Merge pull request #38 from jingh999/fix/conflicts-and-remove-app-new

  Show description for 6893a45
  jingh999

  authored
  6893a45

Commits on Jun 13, 2024

• Edit mainpage and App components

  jingh999

  committed
  73bac05

• Merge pull request #39 from jingh999/Mainpage-and-App-component

  Show description for 33d817e
  jingh999

  authored
  33d817e

• new endpoint for changing status. Log in page to pass the booking details

  jingh999

  committed
  a88633b

• image

  jingh999

  committed
  2efb9c7

• footer and hero text

  jingh999

  committed
  8589890

• Merge pull request #40 from jingh999/backend-and-frontend

  Show description for 9f87e9b
  jingh999

  authored
  9f87e9b

• frontend on userpage

  jingh999

  committed
  bc1b860

• styling

  jingh999

  committed
  c59b5f2

• Merge pull request #41 from jingh999/backend-and-frontend

  Show description for 4b75281
  jingh999

  authored
  4b75281

• connect booking and log-in

  jingh999

  committed
  6c8e464

• Merge pull request #42 from jingh999/backend-and-frontend

  Show description for d876f3f
  jingh999

  authored
  d876f3f

• image path

  jingh999

  committed
  389c2e8

• images paths

  jingh999

  committed
  fb11549

• Updated some font-sizes, removed booking-context

  lunek1

  committed
  7b29ec5

• Merge branch 'main' of https://github.com/lunek1/w17-project-final

  lunek1

  committed
  028c645

• Changed max chars in email and name

  lunek1

  committed
  8411fcc

• Router path case-sensitive

  jingh999

  committed
  356e042

• test for deploy link

  jingh999

  committed
  7ef949a

• Responsiveness header for login, register, user

  lunek1

  committed
  f3d31fb

• Merge branch 'jingh999:main' into main

  lunek1

  authored
  7cf9d8c

• Merge pull request #43 from lunek1/main

  Show description for f6dabe5
  jingh999

  authored
  f6dabe5

• fix responsiveness to mobile screens on pages

  

  Your Name

  committed
  f2fb4d9

• Merge branch 'main' into Responsiveness

  jingh999

  authored
  4ff8d7e

• Merge pull request #44 from jingh999/Responsiveness

  Show description for 7610afd
  jingh999

  authored
  7610afd

• add readme

  

  Your Name

  committed
  5009e0e

• Add back deleted codes. Clear bookingDetails on login when booking is confirmed on register account already.

  jingh999

  committed
  2f4895a

• improved accessibility on main pages, still really poor performance

  

  Your Name

  committed
  4a06a90

• backend for changing room status after booking or cancel

  jingh999

  committed
  5ec2f5d

• Fix a 404 response data

  jingh999

  committed
  46951d5

• change room status after booking successfully and make the room unavailable to book

  jingh999

  committed
  1348037

Commits on Jun 14, 2024

• deploy test

  jingh999

  committed
  0e13b02

Commits on Jun 16, 2024

• Accessibility front page fixed

  lunek1

  committed
  233fe06

• Merge pull request #45 from lunek1/main

  Show description for 2f31a3d
  jingh999

  authored
  2f31a3d

Commits on Jun 21, 2024

• Merge branch 'main' into Accessivility

  jingh999

  authored
  48f7e40