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.

Sign up for GitHub

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

Jump to bottom

Reviews #15

Open
wants to merge 88 commits into
base: main
Choose a base branch
from
Open

Reviews #15

wants to merge 88 commits into from

Commits on May 27, 2024

  1. file structure

    @jingh999
    jingh999 committed May 27, 2024
    Configuration menu
    Copy the full SHA
    078dfbf View commit details
    Browse the repository at this point in the history

  2. folders

    @jingh999
    jingh999 committed May 27, 2024
    Configuration menu
    Copy the full SHA
    abc76d2 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Nav bar + hero video added

    @lunek1
    lunek1 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    baf90f5 View commit details
    Browse the repository at this point in the history

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

    Your Name committed May 28, 2024
    Configuration menu
    Copy the full SHA
    4aef145 View commit details
    Browse the repository at this point in the history

  3. add list and responsiveness, not finish

    Your Name committed May 28, 2024
    Configuration menu
    Copy the full SHA
    614b9a4 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. homepage

    @jingh999
    jingh999 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    99e130d View commit details
    Browse the repository at this point in the history

  2. Added font in html instead of css

    @lunek1
    lunek1 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    8108f27 View commit details
    Browse the repository at this point in the history

  3. Added font to text overlay

    @lunek1
    lunek1 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    f22be66 View commit details
    Browse the repository at this point in the history

  4. Update Nav.jsx

    @lunek1
    lunek1 authored May 29, 2024
    Configuration menu
    Copy the full SHA
    6e460b4 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1 from lunek1/Nav 

    Nav
    @jingh999
    jingh999 authored May 29, 2024
    Configuration menu
    Copy the full SHA
    2d7cb9d View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into jing-homepage

    @jingh999
    jingh999 authored May 29, 2024
    Configuration menu
    Copy the full SHA
    c832e32 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #2 from jingh999/jing-homepage 

    Jing-homepage
    @jingh999
    jingh999 authored May 29, 2024
    Configuration menu
    Copy the full SHA
    6ef2caa View commit details
    Browse the repository at this point in the history

  8. footer responsiveness and styling done and working

    Your Name committed May 29, 2024
    Configuration menu
    Copy the full SHA
    91458e5 View commit details
    Browse the repository at this point in the history

  9. combine components

    @jingh999
    jingh999 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    6b96aff View commit details
    Browse the repository at this point in the history

  10. Merge branch 'main' into FOOTER

    @jingh999
    jingh999 authored May 29, 2024
    Configuration menu
    Copy the full SHA
    56d6d4f View commit details
    Browse the repository at this point in the history

  11. Merge pull request #3 from vidalhuix/FOOTER 

    Footer
    @jingh999
    jingh999 authored May 29, 2024
    Configuration menu
    Copy the full SHA
    865bc71 View commit details
    Browse the repository at this point in the history

  12. footer position relative

    @jingh999
    jingh999 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    3dd12d3 View commit details
    Browse the repository at this point in the history

  13. add some changes

    Your Name committed May 29, 2024
    Configuration menu
    Copy the full SHA
    d63cd6d View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. responsiveness and booking container

    @jingh999
    jingh999 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    788430e View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. add style to the caorusell

    Your Name committed May 31, 2024
    Configuration menu
    Copy the full SHA
    71e85ed View commit details
    Browse the repository at this point in the history

  2. Style

    @jingh999
    jingh999 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    4e3fdab View commit details
    Browse the repository at this point in the history

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

    Responsive-and-booking-style
    @jingh999
    jingh999 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    e789d25 View commit details
    Browse the repository at this point in the history

  4. add styling and text description to the events, images still not matc… 

    …hing the description
    Your Name committed May 31, 2024
    Configuration menu
    Copy the full SHA
    46ad795 View commit details
    Browse the repository at this point in the history

  5. add styling and text description to the events, images still not matc… 

    …hing the description
    Your Name committed May 31, 2024
    Configuration menu
    Copy the full SHA
    1ecd4c3 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into FOOTER

    @jingh999
    jingh999 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    0b25787 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #5 from vidalhuix/FOOTER 

    Footer
    @jingh999
    jingh999 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    7ef8631 View commit details
    Browse the repository at this point in the history

  8. hotel data

    @jingh999
    jingh999 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    c1a40ee View commit details
    Browse the repository at this point in the history

  9. Merge pull request #6 from jingh999/backend-hotel 

    hotel data
    @jingh999
    jingh999 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    e8ffca0 View commit details
    Browse the repository at this point in the history

  10. Modified vite

    @lunek1
    lunek1 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    a9377a1 View commit details
    Browse the repository at this point in the history

  11. hotel backend

    @jingh999
    jingh999 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    221f4a6 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #7 from jingh999/Hotel-API 

    Hotel-API
    @jingh999
    jingh999 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    7fd857b View commit details
    Browse the repository at this point in the history

  13. Merge branch 'jingh999:main' into main

    @lunek1
    lunek1 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    dd64eb8 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2024

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

    Your Name committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    e4fc29b View commit details
    Browse the repository at this point in the history

  2. add read more button

    Your Name committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    54570b6 View commit details
    Browse the repository at this point in the history

  3. add BackToTopButton code and style

    Your Name committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    16830c6 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. add Reviews title

    Your Name committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    60c3f6a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8 from vidalhuix/Reviews 

    Reviews
    @jingh999
    jingh999 authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    6cbfed9 View commit details
    Browse the repository at this point in the history

  3. responsive and hotel availability

    @jingh999
    jingh999 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    5d42bc3 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #9 from jingh999/Responsive 

    Responsive
    @jingh999
    jingh999 authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    2dca74a View commit details
    Browse the repository at this point in the history

  5. Login and register page created

    @lunek1
    lunek1 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    c1418d7 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'jingh999:main' into Nav

    @lunek1
    lunek1 authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    81a5e7a View commit details
    Browse the repository at this point in the history

  7. Updated App.jsx for Login & Register

    @lunek1
    lunek1 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    9b1db69 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'Nav' of https://github.com/lunek1/w17-project-final int… 

    …o Nav
    @lunek1
    lunek1 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    4c647e7 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #10 from lunek1/Nav 

    Nav
    @jingh999
    jingh999 authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    97d6148 View commit details
    Browse the repository at this point in the history

  10. Updated nav with new changes

    @lunek1
    lunek1 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    255c792 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #11 from lunek1/Nav 

    Updated nav with new changes
    @jingh999
    jingh999 authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    17e5b5c View commit details
    Browse the repository at this point in the history

  12. edit

    @jingh999
    jingh999 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    d6763f1 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'main' into edit

    @jingh999
    jingh999 authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    78b22eb View commit details
    Browse the repository at this point in the history

  14. Merge pull request #12 from jingh999/edit 

    Edit
    @jingh999
    jingh999 authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    ee2c5d3 View commit details
    Browse the repository at this point in the history

  15. edit booking and hero components

    @jingh999
    jingh999 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    f25f8e1 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #13 from jingh999/style 

    Style
    @jingh999
    jingh999 authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    e64e6c4 View commit details
    Browse the repository at this point in the history

  17. add styling to the carrusel and push

    Your Name committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    f23e251 View commit details
    Browse the repository at this point in the history

  18. add styling to the carrusel and push

    Your Name committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    5342a0d View commit details
    Browse the repository at this point in the history

  19. add netlify.toml

    Your Name committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    4bc945e View commit details
    Browse the repository at this point in the history

  20. netlify

    @jingh999
    jingh999 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    a25feb2 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. image path

    @jingh999
    jingh999 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    c308160 View commit details
    Browse the repository at this point in the history

  2. image path

    @jingh999
    jingh999 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    41fcf0e View commit details
    Browse the repository at this point in the history

  3. image path

    @jingh999
    jingh999 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    f1f123b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'jingh999:main' into main

    @lunek1
    lunek1 authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    289e613 View commit details
    Browse the repository at this point in the history

  5. clear files and create hotelrooms page

    @jingh999
    jingh999 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    2039de7 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'jingh999:main' into main

    @lunek1
    lunek1 authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    fce08a1 View commit details
    Browse the repository at this point in the history

  7. hotelrooms page connect

    @jingh999
    jingh999 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    03b9d27 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'jingh999:main' into main

    @lunek1
    lunek1 authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    37c7dc7 View commit details
    Browse the repository at this point in the history

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

    Your Name committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    bff3c0b View commit details
    Browse the repository at this point in the history

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

    Your Name committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    9b12961 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Room status database

    @jingh999
    jingh999 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    e8321da View commit details
    Browse the repository at this point in the history

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

    Data-model-for-room-status
    @jingh999
    jingh999 authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    a714d5e View commit details
    Browse the repository at this point in the history

  3. endpoint

    @jingh999
    jingh999 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    da21414 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #14 from vidalhuix/Reviews 

    Reviews
    @jingh999
    jingh999 authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    7e61fd3 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'jingh999:main' into main

    @lunek1
    lunek1 authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    0edbce8 View commit details
    Browse the repository at this point in the history

  6. add room component

    Your Name committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    51f3359 View commit details
    Browse the repository at this point in the history

  7. removed RoomDetails component

    Your Name committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    dd5b63d View commit details
    Browse the repository at this point in the history

  8. Log in, register, delete user added

    @lunek1
    lunek1 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    ceb5299 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #16 from lunek1/main 

    Backend login, register, delete, user-details endpoints added
    @jingh999
    jingh999 authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    1d5b8c5 View commit details
    Browse the repository at this point in the history

  10. get available rooms data by data and guest amount

    @jingh999
    jingh999 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    9b0b5e0 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #17 from jingh999/booking-endpoint 

    Booking-endpoint
    @jingh999
    jingh999 authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    2107841 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. add carrusel on room images

    Your Name committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    c0d15cb View commit details
    Browse the repository at this point in the history

  2. add description and read more button

    Your Name committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    a7d0b4f View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. Login works, userpage created but needs backend

    @lunek1
    lunek1 committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    70be993 View commit details
    Browse the repository at this point in the history

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

    Your Name committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    166352a View commit details
    Browse the repository at this point in the history

  3. searching available rooms function frontend

    @jingh999
    jingh999 committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    5a6c256 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #18 from lunek1/main 

    Login works, userpage created but needs backend
    @jingh999
    jingh999 authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    6a98e87 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into jing

    @jingh999
    jingh999 authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    1d3b989 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #20 from jingh999/jing 

    Searching function & connect the frontend and backend
    @jingh999
    jingh999 authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    0e4bcbb View commit details
    Browse the repository at this point in the history

  7. units edit

    @jingh999
    jingh999 committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    8956d6b View commit details
    Browse the repository at this point in the history

  8. booking page frontend

    @jingh999
    jingh999 committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    47497e1 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #21 from jingh999/hotel-data 

    Hotel-data
    @jingh999
    jingh999 authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    e14b2d9 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. resolve PR issues

    Your Name committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    00de1a5 View commit details
    Browse the repository at this point in the history