Feature/booking page refactor #3035
Merged
+1,044
−565
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
zomars
reviewed
Jun 15, 2022
zomars
reviewed
Jun 15, 2022
Merged
|
Instead of making code suggestions made another PR #3067 |
d68b18e
to
e6f0ee8
Compare
* Cleanup * Cleanup * Uses zod to parse params * Type fixes * Fixes ISR * E2E fixes * Disabled dynamic bookings until post v1.7 * More test fixes
zomars
reviewed
Jun 15, 2022
zomars
reviewed
Jun 15, 2022
Comment on lines
+115
to
+117
| const eventType = user.eventTypes.find((et, i) => | ||
| user.plan === UserPlan.FREE ? i === 0 && et.slug === slug : et.slug === slug | ||
| ); |
There was a problem hiding this comment.
Fixes E2E tests that allowed free users to use more than 1 event type
zomars
reviewed
Jun 15, 2022
Comment on lines
+28
to
+31
| .refine( | ||
| (data) => !!data.eventTypeId || !!data.usernameList, | ||
| "Either usernameList or eventTypeId should be filled in." | ||
| ); |
zomars
reviewed
Jun 15, 2022
Comment on lines
+112
to
+113
| if (!currentSeats && eventType?.seatsPerTimeSlot) | ||
| currentSeats = await getCurrentSeats(eventType.id, dateFrom, dateTo); |
There was a problem hiding this comment.
So we don't overfetch if we already have this data
…g - and possibly fix spacing
zomars
reviewed
Jun 15, 2022
Removed early design artifact
Merged
zomars
added a commit
that referenced
this pull request
Jun 15, 2022
* updates api submodule * Fix credential creation flow for msteams app (#3029) * Fix credential creation flow for msteams app * Code review improve * Fix preffer early returns Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> * Flicker on booking success page (#3063) * The booker get’s the Ui option to reschedule but can’t reschedule (#3061) * Update CalendarService.ts (#3060) * Revert "The booker get’s the Ui option to reschedule but can’t reschedule (#3061)" This reverts commit 8cfc91d. * New Crowdin translations by Github Action (#3065) Co-authored-by: Crowdin Bot <support+bot@crowdin.com> * Missing calendar toggles fix (#3066) * onboarding flag fix * Adjusting text + adding into locales file Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> * fixed flickering of more event name variables (#3069) * Feature/booking page refactor (#3035) * Extracted UI related logic on the DatePicker, stripped out all logic * wip * fixed small regression due to merge * Fix alignment of the chevrons * Added isToday dot, added onMonthChange so we can fetch this month slots * Added includedDates to inverse excludedDates * removed trpcState * Improvements to the state * All params are now dynamic * This builds the flat map so not all paths block on every new build * Added requiresConfirmation * Correctly take into account getFilteredTimes to make the calendar function * Rewritten team availability, seems to work * Circumvent i18n flicker by showing the loader instead * 'You can remove this code. Its not being used now' - Hariom * Nailed a persistent little bug, new Date() caused the current day to flicker on and off * TS fixes * Fix some eventType details in AvailableTimes * '5 / 6 Seats Available' instead of '6 / Seats Available' * More type fixes * Removed unrelated merge artifact * Use WEBAPP_URL instead of hardcoded * Next round of TS fixes * I believe this was mistyped * Temporarily disabled rescheduling 'this is when you originally scheduled', so removed dep * Sorting some dead code * This page has a lot of red, not all related to this PR * A PR to your PR (#3067) * Cleanup * Cleanup * Uses zod to parse params * Type fixes * Fixes ISR * E2E fixes * Disabled dynamic bookings until post v1.7 * More test fixes * Fixed border position (transparent border) to prevent dot from jumping - and possibly fix spacing * Disabled style nitpicks * Delete useSlots.ts Removed early design artifact * Unlock DatePicker locale * Adds mini spinner to DatePicker Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> Co-authored-by: zomars <zomars@me.com> * v1.7.0 Co-authored-by: alannnc <alannnc@gmail.com> Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> Co-authored-by: GitStart <1501599+gitstart@users.noreply.github.com> Co-authored-by: m4tze <m4tze@gmx.net> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: Leo Giovanetti <hello@leog.me> Co-authored-by: Alex van Andel <me@alexvanandel.com>
emrysal
commented
Jun 16, 2022
| }, | ||
| }) | ||
| : []; | ||
| const workingHours = userSchedules.flatMap((s) => s.workingHours); |
There was a problem hiding this comment.
This works, but caused an issue I'm working around in the simplest method I could think of: #3082
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Goal of this PR: Get rid of getServerSideProps altogether, use getStaticProps & tRPC to make slot lookahead possible.
Current state: Able to take into account workingHours, the DatePicker is entirely revamped (but looks the same). Much will happen serverside going forward.