public-offering
/
cal.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,070 Commits
797 Branches
196 Tags
353 MiB
Commit Graph

86 Commits (230c82e316d8416b74e8d0c3ed8c26acbdcaf27f)

Author SHA1 Message Date
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
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
Omar López 3add84a279
Adds Stripe integration (#717) 
* Adds Stripe integration

* Moves Stripe instrucctions to ee

* Adds NEXT_PUBLIC_APP_URL variable

* Adds fallback for NEXT_PUBLIC_APP_URL

* Throws error objects instead

* Improved error handling

* Removes deprecated method

* Bug fixing

* Payment refactoring

* PaymentPage fixes

* Fixes preview links

* More preview link fixes

* Fixes client links

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
 2021-09-22 19:36:13 +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_Rich dcb619af1f
Merge pull request #434 from joshsny/bugfix/cancel 
Fix 500 error when trying to cancel a booking that was already cancelled.
 2021-08-16 13:31:13 +02:00
Alex van Andel 3a5e7dd61c Delete old redundant page 2021-08-14 16:43:34 +00:00
Joshua Snyder 6415b561b7
Update pages/availability/troubleshoot.tsx 
Co-authored-by: Nico <spam@nicolasjessen.de>
 2021-08-12 06:54:01 +02:00
joshsny 03407a3738 removed empty array from useEffect 2021-08-10 11:00:05 +02:00
joshsny 7874e17b1c fixed bugs on availability 2021-08-09 11:24:39 +02:00
nicolas 560bd19472 Merge branch 'main' into bugfix/unify-email-sending 2021-08-08 21:21:33 +02:00
Peer Richelsen 7ef29453bf minor changes to integrations type eslint 2021-08-05 13:36:24 +02:00
Peer Richelsen 57b4e25647 changed zIndex of modal backfrop to 0 2021-08-03 13:23:19 +02:00
Peer Richelsen ae836321c9 changed zIndex of modal backfrop to 10 2021-08-03 13:21:21 +02:00
Peer Richelsen 39ee723dc5 moved zIndex for modal to 50 from 10 2021-08-03 13:19:32 +02:00
Peer Richelsen e5550b72ba added <Loader> component 2021-08-02 22:57:58 +02:00
nicolas 40938bdf6a Merged main into current branch; lots of linting 2021-08-02 22:51:57 +02:00
Peer Richelsen f71c5d2075 fixed integrations button absolute positioning 2021-08-02 19:16:20 +02:00
Peer Richelsen 4c2b8f5b6f styled teams section 2021-08-02 17:36:28 +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
nicolas bd28636af5 Merge branch 'main' into bugfix/unify-email-sending 2021-07-28 22:01:58 +02:00
nicolas 86e2add30f Resolved conflicts; included reference creation into EventManager; use EventManager everywhere 2021-07-24 22:24:00 +02:00
Alex van Andel 9234f74bec Added accompanying frontend 2021-07-23 20:19:23 +00:00
Bailey Pumfleet 02dd0eb8e2
Merge pull request #371 from Malte-D/feature/opt-in-booking 
Feature/opt in booking
 2021-07-22 11:30:48 +01:00
nicolas e0abbbb2f1 Fixed linting errors 2021-07-20 20:18:26 +02:00
Bailey Pumfleet 9375f337d7 Fix Codacy issues 2021-07-19 16:56:58 +01:00
Malte Delfs a2bf242c9e opt in booking 2021-07-18 20:28:54 +02:00
nicolas b4ed8ae87e Merge branch 'main' into bugfix/unify-email-sending 2021-07-18 15:12:18 +02:00
Femi Odugbesan 45689059c7
Feat/cal 95/date range on event types (#353) 
* add edit links to events on dashboard

* fit elements on screen for mobile

* initialize components for consistent text styles

* add more fine grained width/height settings

* add higher level setting for when an event is available

- db: add supporting values to period allow setting an amount of days,
 a range, or unlimited number days an event is available

* fix issue where periodDates are null

* return minimal required data, handle date parsing

* [ui] limit booking days based on user period settings

* api: validate user period settings

* [db] migration for event type period settings
 2021-07-15 09:10:26 -05:00
Egor Zaitsev 1dadf9f9a6 fix: same problem on the availability page 2021-07-14 14:19:55 +03:00
Bailey Pumfleet db7c467d73 Merge branch 'main' of https://github.com/calendso/calendso into main 2021-07-08 10:23:48 +01:00
Bailey Pumfleet 5c699f8471 Add troubleshoot page & add loading spinners 2021-07-08 10:23:22 +01:00
nicolas 3c09837104 Resolved conflicts 2021-07-07 12:43:13 +02:00
Alex van Andel b136941948 Fixes #337: Event times ordered seemingly random 2021-07-03 14:24:30 +00:00
Alex van Andel 5d30586a24 Heavily simplified the startTime and endTime display by removing dayjs from SetTimesModal 2021-06-29 22:00:25 +00:00
Alex van Andel 575747bcd3 Final thing to check is timezones, currently if I am in Kuala Lumpur the time is correct, but it jumps 8 hours due to being out of bound on Seoul. 2021-06-29 01:45:58 +00:00
Alex van Andel 7030851efb Merged with main, fixed issue that caused multiple AvailableTimes refreshes. 2021-06-27 21:34:38 +00:00
Alex van Andel 28edb86c14 Don't render location if there is none for now 2021-06-24 22:48:01 +00:00
nicolas bc47975316 Added zoom as an event location and fixed ESLint 2021-06-25 00:26:55 +02:00
Alex van Andel ef3274d8f3 Working version ready for testing 
* More tests to be added to verify slots logic
* Adds Jest
* Implements logic to the booking code to take into account grayed days
* Slots take workhours into account

TODO: Improve the tests, evaluate the structure, small re-orgs here and
there for improved readability / better code
 2021-06-24 22:15:18 +00:00
Alex van Andel 1dce84fa8f Merge branch 'main' into feature/scheduling 2021-06-22 15:19:28 +00:00
Malte Delfs 0ea36cb3f8 added edit/remove for customEventTypeInputs 2021-06-22 17:10:52 +02:00
Femi Odugbesan 7690350124
feat: allow users to set google meet as a location for events (#287) 
* feat: allow users to set google meet as a location for events

- add google meet location with support for other integrations

* return location types from server

also avoids potential leaks of user credentials

* chore: remove unused variable

* fix: return minimal required data from server
 2021-06-21 18:15:29 -05:00
Alex van Andel b2812deeff Merge branch 'main' into feature/scheduling 2021-06-21 20:37:19 +00:00
Bailey Pumfleet e9b75b90ba
Merge branch 'main' into feature/custom-fields-on-the-booking-page 2021-06-21 11:35:59 +01:00
Alex van Andel f99729c392 Merged with main 2021-06-20 17:52:18 +00:00
nicolas ebc42f0c96 Merge branch 'main' into feature/zoom-integration 
# Conflicts:
#	lib/calendarClient.ts
#	lib/emails/new-event.ts
#	pages/[user]/book.tsx
#	pages/api/availability/[user].ts
#	pages/api/book/[user].ts
#	pages/integrations/index.tsx
 2021-06-20 16:37:51 +02:00