Commit Graph

49 Commits (c91b46c9fb8e2ffdc33320ba5550ed538bbf5130)

Author SHA1 Message Date
Adrien La 1567feb75e
i18n - Translate booking status when empty screen (#1219)
* i18n translate booking status when empty screen

* i18n - status key added to fr & en

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2021-12-27 13:29:43 +01:00
Omar López 21103580f7
Zomars/cal 748 paid bookings are failing (#1335)
* E2E video adjustments

* Adds test to add Stripe integration

* Type fix

* WIP: Payment troubleshooting

* Paid bookings shouldn't be confirmed by default

* Runs stripe test only if installed

* BookingListItem Adjustments

* Pending paid bookings should be unconfirmed

* Attempt to fix paid bookings

* Type fixes

* Type fixes

* Tests fixes

* Adds paid booking to seeder

* Moves stripe tests to own file

* Matches app locale to Stripe's

* Fixes minimun price for testing

* Stripe test fixes

* Fixes stripe frame test

* Added some Stripe TODOs
2021-12-17 16:58:23 +00:00
Alex Johansson 5af159cf4e
fix loading flicker on `/bookings` (#1062) 2021-10-28 16:12:30 +00:00
Mihai C f91de82daf
feat: add infinite scroll on bookings tabs (#1059)
* feat: add infinite scroll on bookings tabs

* bookings page infinite scroll PR comments (#1060)

* check if `InteractionObserver` is supported

* revert query cell and use bespoke behaviour

* Update pages/bookings/[status].tsx

Co-authored-by: Mihai C <34626017+mihaic195@users.noreply.github.com>

* load more button

* make inview as a callback

Co-authored-by: Mihai C <34626017+mihaic195@users.noreply.github.com>

* mt-6

* fix: translation strings and remove unnecessary stuff

Co-authored-by: Alex Johansson <alexander@n1s.se>
2021-10-28 15:02:22 +00:00
Omar López 0861d7cc61
Ends the war between tRPC and next-i18next (#939)
* Ends the war between tRPC and next-i18next

* Locale fixes

* Linting

* Linting

* trpc i18n (not working) (#942)

* simplify i18n handler and remove redundant(?) fn check

* split up viewer to a "logged in only" and "public"

* wip -- skip first render

Co-authored-by: Omar López <zomars@me.com>

* Linting

* I18n fixes

* We don't need serverSideTranslations in every page anymore

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Alex Johansson <alexander@n1s.se>
2021-10-14 13:57:49 +03:00
Mihai C 9e2f8de313
chore: i18n/extract strings (#934) 2021-10-13 11:49:15 +01:00
Alex Johansson abe4f38a5e
`<QueryCell />` type inference improvement (#849)
* asserts that `query.data` is never `null` when using `<QueryCell />`
2021-10-04 10:48:40 +01:00
Alex Johansson eb93e778bd
simplify `/bookings/[status]` logic (#845) 2021-10-02 13:29:26 +00:00
Omar López 342ea3e5d2
Adds specfific empty copy by status (#842)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-10-02 12:08:35 +01:00
Alex Johansson 4879479981
add `<QueryCell />` to remove bespoke loading/error/empty/success logic (#835) 2021-10-01 15:12:47 +00:00
Omar López dc6841e761
Bookings UI improvements (#826) 2021-09-30 11:46:39 +01:00
Omar López a04336ba06
Added booking tabs, type fixing and refactoring (#825)
* More type fixes

* More type fixes

* Type fixes

* Adds inputMode to email fields

* Added booking tabs

* Adds aditional notes to bookings
2021-09-29 22:33:18 +01:00
Alex Johansson 7779c098dc
confirming event gives no visual (#803) 2021-09-28 09:16:02 +00:00
Alex Johansson dcea723ea4
confirming event gives no visual feedback (#804) 2021-09-27 18:11:52 -06:00
Alex Johansson 34300650e4
add tRPC (#614)
* add trpc

* trpc specific

* fix deps

* lint fix

* upgrade prisma

* nativeTypes

* nope, not needed

* fix app propviders

* Revert "upgrade prisma"

This reverts commit e6f2d2542a.

* rev

* up trpc

* simplify

* wip - bookings page with trpc

* bookings using trpc

* fix `Shell` props

* call it viewerRouter instead

* cleanuop

* ssg helper

* fix lint

* fix types

* skip

* add `useRedirectToLoginIfUnauthenticated`

* exhaustive-deps

* fix callbackUrl

* rewrite `/availability` using trpc

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-09-27 14:47:55 +00:00
Peer Richelsen a8ec6e7060
replaced window.location with NEXT_PUBLIC_APP_URL (#769)
* replaced window.location with process.env.NEXT_PUBLIC_APP_URL, removed empty classNames

* wip
2021-09-24 09:03:28 -06:00
Omar López 420daec147
CAL-473 Fixes client-side routing for authed pages (#763) 2021-09-24 11:16:46 +01:00
Omar López d194878bb2
Suggestion: let prettier sort imports order (#673)
* Suggestion: let prettier sort imports order

# Conflicts:
#	yarn.lock

* AUTO SORT ALL THE IMPORTS

* Linting

* Fixes test
2021-09-22 13:52:38 -06:00
Peer Richelsen 3c089af58a
new EmptyScreen component, using it in /bookings (#708)
* new EmptyScreen component, using it in /bookings

* Linting fixes

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-21 11:36:29 +01:00
Peer_Rich 4c6bf96213
fixed booking buttons on mobile (#682)
* fixed booking buttons on mobile

* fixed mobile layout for reject and confirm booking
2021-09-17 20:25:23 +01:00
Alex van Andel 738ee5d992
OOPS, sorry guys (#655) 2021-09-15 16:47:49 +01:00
Alex van Andel 9980dcad6b
Fixed booking page not rendering due to missing linked event type (#654) 2021-09-15 15:27:55 +01:00
Alex van Andel 6ab741b927
Feature/round robin (#613)
* Heavy WIP

* More WIP

* Playing with backwards compat

* Moar wip

* wip

* Email changes for group feature

* Committing in redundant migrations for reference

* Combine all WIP migrations into a single feature migration

* Make backup of current version of radio area pending refactor

* Improved accessibility through keyboard

* Cleanup in seperate commit so I can cherrypick later

* Added RadioArea component

* wip

* Ignore .yarn file

* Kinda stable

* Getting closer...

* Hide header when there are only personal events

* Added uid to event create, updated EventTypeDescription

* Delete redundant migration

* Committing new team related migrations

* Optimising & implemented backwards compatibility

* Removed now redundant pages

* Undid prototyping to calendarClient I did not end up using

* Properly typed Select & fixed lint throughout

* How'd that get here, removed.

* TODO: investigate why userData is not compatible with passed type

* This likely matches the event type that is created for a user

* Few bugfixes

* Adding datepicker optimisations

* Fixed new event type spacing, initial profile should always be there

* Gave NEXT_PUBLIC_BASE_URL a try but I think it's not the right solution

* Updated EventTypeDescription to account for long titles, added logo to team page.

* Added logo to team query

* Added cancel Cypress test because an upcoming merge contains changes

* Fix for when the event type description is long

* Turned Theme into the useTheme hook, and made it fully compatible with teams pages

* Built AvatarGroup ui component + moved Avatar to ui

* Give the avatar some space fom the description

* Fixed timeZone selector

* Disabled tooltip +1-...

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-14 09:45:28 +01:00
Peer_Rich e9ff62109d
upgraded radix-ui as to asChild, refactored <button className=""> to <Button color="secondary"> (#632) 2021-09-14 09:20:24 +01:00
Alex van Andel 8ee68e2ace
Converts booking deletion to soft-delete + more robust cancellation (#581)
* Converts booking deletion to soft-delete + more robust cancellation

* Update pages/api/cancel.ts

infer type :)

Co-authored-by: Alex Johansson <alexander@n1s.se>

Co-authored-by: Alex Johansson <alexander@n1s.se>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-13 09:57:56 +01:00
Alex Johansson 2f1ede9bcd
use `getSession()` from `@lib/auth` everywhere (#563) 2021-09-03 21:51:21 +01:00
Mihai C a37411b8af
refactor: add next-seo (#531)
* refactor: add next-seo

* refactor: change naming of seo component
2021-08-27 15:35:20 +03:00
Peer Richelsen 7b2b75c25c wip 2021-08-12 15:55:09 +02:00
Peer Richelsen 3bfee8a7bf replaced Loading... with Loader component 2021-08-08 22:31:08 +02:00
Peer Richelsen 9b9db3565a hide preview and copy link button on mobile 2021-08-05 21:03:33 +02:00
Peer Richelsen 7ef29453bf minor changes to integrations type eslint 2021-08-05 13:36:24 +02:00
Peer Richelsen b9125a54c8 ignore unused response ESLint error 2021-08-03 12:29:51 +02:00
Peer Richelsen 90aed4a2b9 removed zoom (caused some issues with dialogs) and removed lorem ipsum (whoopsie) 2021-08-03 11:32:37 +02:00
Peer Richelsen 2d36b5d229 /booking truncate event name for mobile 2021-08-03 11:09:15 +02:00
Peer Richelsen a4c1ac8275 added icons to buttons, added mailto to /booking, moved date into one column 2021-08-03 10:47:01 +02:00
Peer Richelsen a151dcfd01 removed unused imports 2021-08-03 10:34:43 +02:00
Peer Richelsen 8340fce157 extracted classNames into helpers 2021-08-03 10:30:35 +02:00
Bailey Pumfleet 59a1346325
Merge branch 'main' into main 2021-08-03 08:05:03 +01:00
Syed Ali Shahbaz 4becb21d53 Cleaned up the code 2021-08-03 05:59:38 +05:30
Syed Ali Shahbaz 5388ea0610 Added date and time to booking entries 2021-08-03 05:52:17 +05:30
Peer Richelsen a35ac3487b fixed layout for bookings on mobile 2021-08-02 18:54:27 +02:00
Peer Richelsen bd7443017a fixed layout for react-select 2021-08-02 17:24:01 +02:00
Peer Richelsen 64961cada1 added bottom nav, replaced png with svg integration icons, added subtitle to shell component 2021-08-02 16:10:24 +02:00
Bailey Pumfleet a608f94590 Initial restyling 2021-07-31 00:05:38 +01:00
Peer Richelsen 062b92be29 fixed overflow bug on long booking items 2021-07-30 11:53:21 +02:00
Malte Delfs a2bf242c9e opt in booking 2021-07-18 20:28:54 +02:00
nicolas 3c09837104 Resolved conflicts 2021-07-07 12:43:13 +02:00
Bailey Pumfleet 80898ea706 Revamp bookings page 2021-06-30 15:14:10 +01:00
Bailey Pumfleet ebb3e87284 Add bookings page 2021-06-24 14:36:31 +01:00