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

Added rooms sorting by favorites first #173

Merged
merged 31 commits into from
Jul 10, 2024
Merged

Added rooms sorting by favorites first #173

merged 31 commits into from
Jul 10, 2024

Commits on Jun 26, 2024

  1. added logic to show starting times in the time picker, and combined i… 

    …t to the availableroomlist thru bookingview
    Ilkka Korhonen authored and Ilkka Korhonen committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    fa3828c View commit details
    Browse the repository at this point in the history

  2. fix show durations in bookingdrawer

    Ilkka Korhonen authored and Ilkka Korhonen committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    9da87b8 View commit details
    Browse the repository at this point in the history

  3. format

    Ilkka Korhonen authored and Ilkka Korhonen committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    4b57462 View commit details
    Browse the repository at this point in the history

  4. tests fixed

    Ilkka Korhonen authored and Ilkka Korhonen committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    678ff56 View commit details
    Browse the repository at this point in the history

  5. format again

    Ilkka Korhonen authored and Ilkka Korhonen committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    fdbb679 View commit details
    Browse the repository at this point in the history

  6. format again & some css fixing in order to get the buttons use at lea… 

    …st 100% of the width (durationpicker)
    Ilkka Korhonen authored and Ilkka Korhonen committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    382c099 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. added multisectiondigitalclock for starting time selection (custom), … 

    …custom button still missing
    Ilkka Korhonen authored and Ilkka Korhonen committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    cabd8e7 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. puzzling with set constant duration buttons (quick duration selection)

    Ilkka Korhonen authored and Ilkka Korhonen committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    a49cb74 View commit details
    Browse the repository at this point in the history

  2. custom starting time & duration buttons, 1st draft for presentation

    Ilkka Korhonen authored and Ilkka Korhonen committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    63dafe0 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. added custom duration possibility, adds extra button if custom durati… 

    …on selected
    Ilkka Korhonen authored and Ilkka Korhonen committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    899138f View commit details
    Browse the repository at this point in the history

  2. added custom button and custom value button for starting time working… 

    … so that custom value is seen as additional button and removed when non-custom value selected
    Ilkka Korhonen authored and Ilkka Korhonen committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    3e04d6a View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2024

  1. fixed starting time and duration to not use redux anymore, and bug fi… 

    …xes so that these both button groups now work
    Ilkka Korhonen authored and Ilkka Korhonen committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    8c7e471 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Added rooms sorted by favorites first

    @villepynttari
    villepynttari committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    6d0684e View commit details
    Browse the repository at this point in the history

  2. merge from summer 2024 branch

    Ilkka Korhonen authored and Ilkka Korhonen committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    6969371 View commit details
    Browse the repository at this point in the history

  3. fixed problems found after merge

    Ilkka Korhonen authored and Ilkka Korhonen committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    4411325 View commit details
    Browse the repository at this point in the history

  4. fixed problems found after merge, v2

    Ilkka Korhonen authored and Ilkka Korhonen committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    3340d93 View commit details
    Browse the repository at this point in the history

  5. ready for pr

    Ilkka Korhonen authored and Ilkka Korhonen committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    f333728 View commit details
    Browse the repository at this point in the history

  6. trying to fix styled engine build error

    Ilkka Korhonen authored and Ilkka Korhonen committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    33c76fe View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. first jest test refactored to vitest

    Ilkka Korhonen authored and Ilkka Korhonen committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    aa56e21 View commit details
    Browse the repository at this point in the history

  2. rest of the jest tests converted to vitest

    Ilkka Korhonen authored and Ilkka Korhonen committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    48db87f View commit details
    Browse the repository at this point in the history

  3. based on review: remove unnecessary onchange and move logic to child … 

    …component
    Ilkka Korhonen authored and Ilkka Korhonen committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    3de8eb8 View commit details
    Browse the repository at this point in the history

  4. rest of code review changes, refactoring etc.

    Ilkka Korhonen authored and Ilkka Korhonen committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    b3e9d81 View commit details
    Browse the repository at this point in the history

  5. one test was not refactored to vitest, now trying again

    Ilkka Korhonen authored and Ilkka Korhonen committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    dac1cdb View commit details
    Browse the repository at this point in the history

  6. fix

    Ilkka Korhonen authored and Ilkka Korhonen committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    0d81741 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #175 from Vincit/feature/ilkka_starting_time_freely 

    Feature/ilkka starting time freely & duration time can be set freely too
    @iltelko2
    iltelko2 committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    87346a7 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Added rooms sorted by favorites first

    @villepynttari
    villepynttari committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    0b26c56 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'github/feature/sort-favorited-rooms-fir… 

    …st' into feature/sort-favorited-rooms-first

# Conflicts:
#	frontend/src/components/AvailableRoomList/AvailableRoomList.tsx
    @villepynttari
    villepynttari committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    cb39a0d View commit details
    Browse the repository at this point in the history

  3. Updated test to vitest

    @villepynttari
    villepynttari committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    3ca7957 View commit details
    Browse the repository at this point in the history

  4. Moved vitest imports to setup file

    @villepynttari
    villepynttari committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    33894dc View commit details
    Browse the repository at this point in the history

  5. Fixed vitest type checkings

    @villepynttari
    villepynttari committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    196951e View commit details
    Browse the repository at this point in the history

  6. Fixing test types

    @villepynttari
    villepynttari committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    36ef9a4 View commit details
    Browse the repository at this point in the history