maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,472 Commits 866 Branches 211 Tags 815 MiB
Commit Graph

359 Commits

Author SHA1 Message Date
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
Chris c0330acd83
Add two-factor authentication (#692) 
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2021-09-21 10:29:20 +01:00
Peer_Rich a4b1264db1
removed arrow from dropdown (#685) 2021-09-19 20:48:15 +01:00
Nico 961f297ba8
No confirmation shall be needed when rescheduling events that need confirmation (#440) 
* No reconfirmation needed when rescheduling

* adapted success page

* Parse query as string

Co-authored-by: nicolas <privat@nicolasjessen.de>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: Peer_Rich <peeroke@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
 2021-09-17 22:31:44 +01:00
Peer Richelsen b2f10eb528 renamed in-person to link or in-person meeting 2021-09-15 21:54:40 +01:00
Alex van Andel cf7f5ae53c
Replace all instances of calendso.com with cal.com and add a new logo for Cal.com emails (#662) 2021-09-15 21:35:55 +01:00
Peer_Rich 9fcd458d25
renamed more calendso to cal.com (#659) 2021-09-15 19:18:16 +01:00
Omar López 820c25f948
[CAL-394] Dropdown refactoring (#644) 
* [CAL-394] WIP: Dropdown refactoring

* Formatting

* Prepares Button to pass refs for radix-ui

* [CAL-394] Upgrades @radix-ui/react-dropdown-menu

* Fixes Dialog crash by upgrading

* Uses radux Dropdown

* radix-ui fix for Dodal cancel button

Co-authored-by: Alex van Andel <me@alexvanandel.com>
 2021-09-15 13:33:00 +01:00
Alex van Andel d3fa6cec80
Fixes timeZone() by no longer needing timeZone() (#646) 
* Fixes timeZone() by no longer needing timeZone()

* Added simple testcase to demonstrate the behaviour of parseZone() vs dayjs()

* Fixed eslint errors
 2021-09-15 03:58:29 +01:00
Peer_Rich 52e3b78875
minor style changes to team pages (#639) 
* minor style changes to team pages

* more minor changes to team dashboard, added badge variant = gray

* added border to dropdown and removed blue focus ring on hover
 2021-09-14 14:27:41 +01:00
Femi Odugbesan 47b6e29333
clarify necessity for app password when connecting apple calendar (#634) 
support react element in dialog header props
 2021-09-14 14:21:18 +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
Peer_Rich 8ae43ea990
fixed Dialog action buttons (#630) 
* fixed Dialog action

* added asChild
 2021-09-13 12:28:17 +01:00
Peer_Rich d37ca84ebe
fixed "Disband Team" Button (likely Radix upgrade) (#631) 
* applied same fix for as={Button}, likely radix upgrade bug

* using asChild to prevent <button><button></button></button>
 2021-09-13 12:26:08 +01:00
Alex Johansson ab78bb3802
move calendso branding into pro (#629) 
* badge

* mv branding to paid plan

* upgrade ts

* hideBranding check

* user.plan

* lint fixes

* `isBrandingHidden` helper

* hide pro for non-pros
 2021-09-13 10:48:55 +01:00
Mihai C 903f7729c7
feat: add better error handling (#605) 
* feat: add better error handling

* refactor: update after review

* refactor: remove unnecessary code

* refactor: better path structure

* refactor: fetch-wrapper after code review

Co-authored-by: Mihai Colceriu <colceriumi@gmail.com>
 2021-09-09 16:51:06 +03:00
Alex Johansson 7e6e935ed3
add free plan (#549) 
- add new fields to support this
- when free:
  - fade out all event types after first
  - hide events after first on booking page
  - make booking page after the first one 404 if accessed directly
- add e2e tests
 2021-09-06 13:51:15 +00:00
Syed Ali Shahbaz fa35af7bd8
Cal 262 refactor edit teams according to the design reference (#516) 
* refactored settings/team landing page

* changed team edit flow, WIP

* merge conflict fix for teams.tsx

* minor fixes to edit team, WIP

* invite-member and disband team APIs attached inside edit-team page

* added remove-member API in edit-team page, minor fixes

* minor code fix, WIP

* WIP

* add logo, bio, branding to team schema

* bio, logo, branding, slug patch API and minor code fix-- WIP

* fn to Disband team directly from the dropdown menu in settings/teams page, removed debug remnants --WIP

* Pull latest data after an action in settings/teams-edit page

* added slug conflict check at Patch time

* code clean-up

* initial change request fixes --WIP

* prop type fix and add warn button color theme --WIP

* added warn Button to Dialog

* remaining change request fixes

* added noop from react-query

* updated invited team-list design

* prettier fix for api/teams/profile

* removed noop import and added custom noop

* minor Button fix

* requested changes addressed
 2021-09-06 14:22:22 +01:00
Alex van Andel 43b275bc30
Implemented Button, hide 'Prev step' on first step (#583) 
* Implemented Button, hide 'Prev step' on first step

* Changed 00:00:00 -> 00:00 whilst keeping values unchanged

* Updated to localizedFormat (future i18n) + remove unused const

* Going native for now, can revisit later

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2021-09-06 09:14:01 +00:00
Peer_Rich 1d22c32904
reverting App Store naming back to Integrations, closes #576 (#584) 2021-09-05 01:27:19 +02:00
Alex Johansson ab33cbde4c
fix: `<Button/>` types of `StartIcon`/`EndIcon` (#562) 2021-09-03 16:34:57 +01:00
Femi Odugbesan 2d23a8b7db
Onboarding Flow (#503) 
* wip

* wip

* db: schedule schema

* fix adding time goes into new day

fix adding new time not keeping updating ranges

fix updating ranges not maintaining changed values

* remove photo upload

* remove unused code

* remove more unused code

* undo time lib

* didnt actually change this

* dont show onboardi
ng flow for users created before sept 1 2021

* use more consistent max-widths

* align all inputs in scheduler component

* allow overriding of default styles

* match figma designs

implement goto previous step

* add more types, match figma

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2021-09-02 13:13:19 +01:00
Alex Johansson f63c9311e5
use `JSX.IntrinsicElements` for pass-through props (#545) 2021-09-02 10:02:45 +00:00
Alex van Andel 252179f3be
Add 'Button' component & update to current best practise (#523) 
* Add 'Button' component & update to current best practise

* Use literal string for type, renamed alert -> variety

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2021-08-27 14:22:49 +00: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
Alex van Andel 160727c0e2
Extracted PhoneInput, fixed styling (#520) 2021-08-25 11:18:37 +01:00
Omar López 7a9a5f08db
fixes #513 (#514) 2021-08-23 23:17:05 +01:00
Peer Richelsen 5fe4a37908 added floating action button props to <Button> and using it in event types on mobile 2021-08-23 22:42:24 +02:00
Alex Johansson a77a15056a
`<Button>`-component (#480) 
-`<Button/>` component
- Uses `next/link` + `<a/>` if you supply a `href` otherwise `<button/>`
- Add UI sandbox
- Change the `event-types/index` to use a query param for deciding if modal is open or not
 2021-08-23 14:45:25 +02:00
Alex van Andel ce64080160
Implement the new Avatar interface to the teams page (#512) 2021-08-23 10:40:57 +01:00
Alex van Andel bc97237858
Remove image from session, add /api/me, update Avatar component (#493) 
* Remove image from session, add /api/me, update Avatar component

* Fixed Avatar on Desktop

* Added emailMd5 to session + load md5 from props on /settings/profile

* Explicitly select which fields to expose in /api/me

* Abstracted Gravatar, defaults avatar for /api/me, removed session dep from UserDropdown

* Delete md5.js :)

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2021-08-22 14:16:42 +01:00
Alex van Andel 44e0af9641
Small fixes to darkmode on teams page & event type select (#509) 
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2021-08-22 13:48:33 +01:00
Alex van Andel afb8ce7109
Fixes #494: TimeOptions 24h clock toggle broken (#495) 2021-08-19 14:36:17 +02:00
Alex Johansson f63aa5d550
add linting in CI + fix lint errors (#473) 
* run `yarn lint --fix`

* Revert "Revert "add linting to ci""

This reverts commit 0bbbbee4be.

* Fixed some errors

* remove unused code - not sure why this was here?

* assert env var

* more type fixes

* fix typings og gcal callback - needs testing

* rename `md5.ts` to `md5.js`

it is js.

* fix types

* fix types

* fix lint errors

* fix last lint error

Co-authored-by: Alex van Andel <me@alexvanandel.com>
 2021-08-19 14:27:01 +02:00
Peer_Rich a162949cf1
added useNotification @lib, using it in EventType (#468) 2021-08-18 10:18:18 +02:00
Peer_Rich 83bef7d95e
Merge pull request #448 from femyeda/team-pages 
Team pages
 2021-08-15 18:44:42 +02:00
Syed Ali Shahbaz f07d727a3f Cleaned up code and removed debug remnants 2021-08-15 17:05:30 +05:30
Syed Ali Shahbaz 81c16fea23 fixed min-value-setter issue 2021-08-15 16:57:06 +05:30
Syed Ali Shahbaz c3959e3cd4 added design elements to the slider 2021-08-15 16:57:06 +05:30
Syed Ali Shahbaz 2fb510723c radix-ui-slider added 2021-08-15 16:57:06 +05:30
Peer_Rich 610ea6c9ef
Merge branch 'main' into main 2021-08-15 12:48:48 +02:00
Peer Richelsen 21c709ee46 fixed booking layout for tablet 2021-08-14 14:26:33 +02:00
Peer Richelsen 8e2e798572 wip 2021-08-14 14:19:57 +02:00
Syed Ali Shahbaz 6b7fbe9ecf removed debug remnants 2021-08-14 09:20:11 +05:30
femyeda 60a4b8b29e add page for teams 2021-08-13 14:46:42 -05:00
femyeda b46cf39ef2 use classnames, remove css 2021-08-13 13:18:14 -05:00
Peer Richelsen 7ff55b29e0 minor changes to availability headline in booking page 2021-08-12 19:10:57 +02:00
Peer Richelsen 99e003153e moved og:image outside of isReady scope so it renders on the server 2021-08-12 19:05:46 +02:00
Peer Richelsen d682804c5f wip 2021-08-12 16:35:08 +02:00
Peer Richelsen 1dc6ae1d26 added border to date picker days on mobile 2021-08-12 16:29:48 +02:00
Peer Richelsen c322690cf5 applied new styles to available times 2021-08-12 15:54:05 +02:00
Peer Richelsen 655b2b18e8 another booking page design revision 2021-08-12 15:51:40 +02:00
Syed Ali Shahbaz 867e582342 code improvement and accept image only for image uploader input 2021-08-12 16:08:01 +05:30
Syed Ali Shahbaz 0c3ec98062 added image-uploader component and refactored profile settings page 2021-08-12 10:14:11 +05:30
Alex van Andel abdfd1d412 Resolved errors on the pages/event-types/[type].tsx page 2021-08-10 22:25:26 +00:00
Alex van Andel 4759aed51d Fixed dismiss on toggle + implemented switch component 2021-08-09 22:43:57 +00:00
nicolas 560bd19472 Merge branch 'main' into bugfix/unify-email-sending 2021-08-08 21:21:33 +02:00
Peer Richelsen ded399e8f6 removed unused import 2021-08-08 18:17:17 +02:00
Peer Richelsen 7699783c17 added hover state to date picker 2021-08-08 17:56:34 +02:00
Peer Richelsen d32d8ea4c3 more minor styling changes to booking 2021-08-08 17:46:21 +02:00
Peer Richelsen 425055fd36 minor styling to booking page 2021-08-08 17:29:45 +02:00
Peer Richelsen b263970b4f padding to powered by and svg fixes 2021-08-08 17:13:31 +02:00
Peer Richelsen e2d88f1a55 Merge branch 'main' of github.com:calendso/calendso 2021-08-07 22:51:25 +02:00
Peer Richelsen c9cb36d24e added ToolTip component and added to EventTypes 2021-08-07 14:02:01 +02:00
Bailey Pumfleet f3a780188f Redesign date & time selection page 2021-08-06 16:29:09 +01:00
Peer Richelsen 2b19a28f89 removed unused imports and function in integrations 2021-08-06 14:32:08 +02:00
Peer Richelsen 110ee2ac4a min width 360px for Dialog.tsx 2021-08-06 14:05:14 +02:00
Peer_Rich eb1572fc37
Merge branch 'main' into renaming-integrations 2021-08-05 17:23:53 +02:00
Peer Richelsen a92ee0f149 renamed integrations to apps 2021-08-05 14:02:59 +02:00
Peer Richelsen c84eae8bda smaller trash icon for scheduler 2021-08-05 13:50:54 +02:00
Peer Richelsen 7ef29453bf minor changes to integrations type eslint 2021-08-05 13:36:24 +02:00
Peer Richelsen 2a18516d19 first half of revisions 2021-08-05 12:02:06 +02:00
Peer Richelsen 0572d5653e replaced iphone check with general standalone mode media query for padding bottom on bottom nav 2021-08-05 11:31:37 +02:00
Peer Richelsen 67bd82fcea added padding bottom for iphone x and beyond 2021-08-05 10:55:28 +02:00
Peer Richelsen 5ff7377797 added loader to dark mode 2021-08-04 21:39:59 +02:00
Alex van Andel 4225016829 Changed the mechanism by which we center the dialog 2021-08-03 22:17:12 +00:00
Alex van Andel 972a8dcb76 Merged with main 2021-08-03 17:52:10 +00:00
Alex van Andel c02eaf2486 Implemented @radix-ui/dialog for creating new event types 2021-08-03 17:36:55 +00: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 59748b4d40 relative top bar on mobile 2021-08-03 13:13:48 +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
Peer Richelsen 0bc0119362 Merge branch 'main' of github.com:calendso/calendso 2021-08-03 10:12:17 +02:00
Peer Richelsen 3119c35749 removed unused code 2021-08-03 10:07:39 +02:00
Bailey Pumfleet 2a7e78f4c6
Merge pull request #396 from mfts/pr-fix-datepicker-color 
Adjust chevron color in DatePicker to make it more intuitive
 2021-08-03 08:18:30 +01:00
Peer Richelsen 554edc1a47 wip 2021-08-02 23:26:07 +02:00
Peer Richelsen 5f1f24635d fixed scrollbar bug in profile 2021-08-02 23:25:37 +02:00
Peer Richelsen 3efc4e0fb7 changed logo link 2021-08-02 23:17:12 +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 72b24508f1 fixed zIndex bug of bottom nav on eventTypes 2021-08-02 19:50:52 +02:00
Peer Richelsen 7734664dbe added slack target blank noreferrer 2021-08-02 19:40:13 +02:00
Peer Richelsen 0568e7250c fixed mobile tabs in settings 2021-08-02 19:29:34 +02:00
Peer Richelsen 0fdcefbc56 eslint fixes 2021-08-02 19:06:44 +02:00
Peer Richelsen aa9a4c5426 eslint fixes 2021-08-02 19:06:24 +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
Peer Richelsen c16dd21a94 added logo 2021-08-02 13:04:37 +02:00
Peer Richelsen 15225c5f67 redesign: tiny changes 2021-07-31 18:29:54 +02:00
Bailey Pumfleet a608f94590 Initial restyling 2021-07-31 00:05:38 +01:00
Marc Seitz 9f8b1f372e add dark and light variants chevron color 2021-07-30 15:48:51 +03:00
Marc Seitz 56ad417fee fix chevron text color 2021-07-30 15:19:40 +03: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 4368ad0289 Implement minimum booking notice 2021-07-22 22:52:27 +00:00
Peer Richelsen 7ad0ce17c5 fixed UTM for powered by calendso link 2021-07-22 21:59:54 +02:00
Peer Richelsen c5d0636da0 added target _blank to powered by calendso banner, so iframes dont load the page inside the embed 2021-07-22 21:56:29 +02: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
Femi Odugbesan f7a9c077b0
fix: styles missing on headline component (#366) 2021-07-15 09:19:17 -05: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
Femi Odugbesan 793351fe96
[cal-184] add and handle date query params for event types (#359) 2021-07-13 11:10:22 -05:00
Peer Richelsen 61fd300bc8 re-added last two commits (<br> fix and dark mode for all booked today text 2021-07-13 15:11:01 +02:00
Peer Richelsen f2c5ecbb99 darkmode fix for <person> is all booked today text 2021-07-13 14:37:42 +02:00
Alex van Andel 4d7427ad91 Fixes some linting + codacy issues 2021-07-11 19:43:28 +00:00
Alex van Andel 5206fb4f88 Implemented theme through user preferences 2021-07-09 23:13:34 +00:00
Bailey Pumfleet a9b45c1057
Merge pull request #351 from calendso/darkmode 
hotfix: added dark mode for profile page
 2021-07-09 14:14:53 +01:00
Peer Richelsen 73c4ef815b wip 2021-07-09 15:14:05 +02:00
Peer Richelsen cc2dde6a84 wip 2021-07-09 15:08:55 +02:00
Peer Richelsen bf85cff76d added dark mode for profile page 2021-07-09 13:34:00 +02:00
Bailey Pumfleet c02c69073d
Merge pull request #346 from calendso/darkmode 
added darkmode classes to [type] and /book and dashboard
 2021-07-09 11:46:16 +01:00
Alex van Andel be102b1b09 Fixes #347 & some other minor things when timezones differ 2021-07-08 21:14:29 +00:00
Peer Richelsen 01fc00b92f added darkmode classs to ¢[type] and /book 2021-07-07 21:58:18 +02:00
nicolas 3c09837104 Resolved conflicts 2021-07-07 12:43:13 +02:00
Peer Richelsen 58c1c935c2 moved powered by calendso to center on mobile 2021-07-03 22:22:56 +02:00
Alex van Andel a7173a32a0 Updated booking link to proper username 2021-07-01 10:31:38 +00:00
Alex van Andel a28cb455f1 Fixed bug that kept the date enabled when the time slot was less than 30m 2021-06-30 15:41:38 +00:00
Alex van Andel bfc7cce688 Make sure the slots equal the month and date of the invitee so we can check isSame with freebusy 2021-06-30 15:27:49 +00:00
Alex van Andel 9fe11ea10d Make sure the currently selected date is active 2021-06-30 02:41:22 +00:00
Alex van Andel e78a34e2ce Implements slot logic with the DatePicker, more tests for slots 2021-06-30 01:35:08 +00:00
Alex van Andel 0da99f0d07 Removed code bloat, fixed tests 2021-06-29 22:35:13 +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 1eba242820 Compare busyTimes in UTC, re-implement hasErrors 2021-06-27 22:30:11 +00:00
Alex van Andel 698c64e657 Re-implemented * is all booked today in Slots() component 2021-06-27 22:02:27 +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 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
femyeda 3c8b9da54d fix: busy times are shown on booking 2021-06-24 16:21:25 -05:00
Malte Delfs 646ff4a107 eslint fixes 2021-06-24 18:12:22 +02:00
Malte Delfs 917b2c4821 Merge branch 'main' into feature/refresh-tokens-and-error-handling 2021-06-24 18:03:54 +02:00
Alex van Andel 5334c350e2
The page was being rendered during the async router.replace call (#306) 
* The page was being rendered during the async router.replace call

* Adding a different, slightly smaller fix
 2021-06-24 08:46:35 -05:00
Bailey Pumfleet ebb3e87284 Add bookings page 2021-06-24 14:36:31 +01:00
Alex van Andel 1668785678 Prevent users from entering mixed case usernames 
Booking pages are case insensitive new, so no more case sensitive
usernames.
 2021-06-23 16:10:58 +00:00
Alex van Andel 1dce84fa8f Merge branch 'main' into feature/scheduling 2021-06-22 15:19:28 +00:00
Alex van Andel b2812deeff Merge branch 'main' into feature/scheduling 2021-06-21 20:37:19 +00:00
Alex van Andel b50fe16566 Moved DatePicker and PoweredByCalendso to seperate components 2021-06-21 20:26:04 +00:00
Malte Delfs 88ab985ac4 Merge branch 'main' into feature/refresh-tokens-and-error-handling 
# Conflicts:
#	lib/calendarClient.ts
#	pages/[user]/[type].tsx
#	pages/[user]/book.tsx
#	pages/api/book/[user].ts
 2021-06-21 17:56:14 +02:00
Alex van Andel 88fc22ddd4 Updated to latest 2021-06-21 10:39:01 +00:00
Bailey Pumfleet 47b39a58e7
Merge pull request #278 from sourceinteractive/fix/gravatar-url 
fix: Use proper url parameter for profile img placeholder
 2021-06-21 11:35:05 +01:00
Alex van Andel 881ba671d5 Change to run getSlots() every time so it updates when selectedDate changes 2021-06-20 21:01:41 +00:00
Malte Delfs 931e6b26f1 error handling WIP 2021-06-20 21:02:15 +02: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
Alex van Andel a463fded8f Added <AvailableTimes /> and <TimeOptions /> components 2021-06-20 14:19:41 +00:00
Alex van Andel d904dd7a00 AvailableTimes refactor complete, it all seems much simpler now 2021-06-20 00:10:08 +00:00
Alex van Andel 01eacedde8 Timezone should never be unless it has no state yet, so used that to simplify TimeOptions 2021-06-20 00:08:48 +00:00
Alex van Andel b423f2894a WIP to save progress 2021-06-19 22:50:47 +00:00
Rrrricky 46698e4a40 fix: Use proper url parameter for profile img placeholder 2021-06-17 16:47:49 +02:00
Alex van Andel 9d5186f1e3 Functionality works, only thing left is a bit of cleaning up and all done 2021-06-16 22:27:27 +00:00
Peer Richelsen 87f7984d76 added billing to settings 2021-06-16 13:42:30 +01:00
Alex van Andel 03f583b021 Save WIP 2021-06-14 18:53:20 +00:00
Bailey Pumfleet 65c7960b76
Merge branch 'main' into feature/invite-external-users 2021-06-11 22:02:07 +01:00
nicolas d249c62620 Added button to add integrations 2021-06-10 22:54:48 +02:00
Alex van Andel 40eb9036f4 Implements inviting external users to teams 2021-06-09 21:43:37 +00:00
Alex van Andel e8a5357a89 Restricted usernames to be unique, removes the potential for username conflicts 2021-06-09 12:26:00 +00:00
Bailey Pumfleet 7d81a1f1fb Minor UI changes to teams 2021-06-08 17:00:06 +01:00
Alex van Andel 5d3e39ea6e Better error handling during team member invitation 
Now tells you if you have already added this member / invite is pending.
Behaviour a little bit more predictable during team editting.
 2021-06-07 15:12:00 +00:00
Alex van Andel 9f12ccf5c1 Teams are now refreshed properly when TeamListItems change 2021-06-05 23:41:05 +00:00
Alex van Andel 7a31cb0f6a Implemented the API, split the teams page up into multiple components 2021-06-05 22:53:33 +00:00
Alex van Andel e2942224ab Tracking work in progress changes 2021-06-03 20:55:34 +00:00
Alex van Andel e0563de28e stroke-width -> strokeWidth + 4-tab to 2-tab 2021-06-03 20:42:05 +00:00
Alex van Andel b2c25ba943 ActiveLink extends Link by adding an activated class when page is active 2021-06-01 22:30:40 +00:00
Bailey Pumfleet 6023a8a314 Add loading spinner to book button 2021-05-27 21:34:02 +01:00
Bailey Pumfleet 01d150092f Mobile UI fixes 2021-05-26 20:47:06 +01:00
Bailey Pumfleet 2726c8c87b Add embed section in Settings 2021-05-26 17:24:10 +01:00
Peer Richelsen 8e1d688ae2 fixed mobile menu layout 2021-05-17 18:50:30 +01:00
Bailey Pumfleet f66a59b7e3 Update donation banner 2021-05-13 15:44:48 +01:00
Peer Richelsen 8fe7de9d02 added donation banner for self-hosted 2021-05-13 14:07:27 +01:00
Bailey Pumfleet e845673662
Merge pull request #177 from jfernandogt/add-gravatar-support 
feat: Add support to use gravatar as a fallback avatar
 2021-05-11 14:26:43 +01:00
Bailey Pumfleet 3a6eae8b8f Update dashboard 2021-05-11 14:11:17 +01:00
Bailey Pumfleet 209791d86d Get user ID from session instead of looking it up 2021-05-11 10:21:05 +01:00
Fernando Barrios ba2feb2c15 feat: Add support to use gravatar as a fallback avatar 2021-05-08 14:26:19 -06:00
Bailey Pumfleet c867edcad8
Merge pull request #169 from emrysal/feature/server-side-settings-redirect 
Added redirects() entry to next.config.js, changed Settings url to /settings/profile
 2021-05-07 20:41:43 +01:00
Bailey Pumfleet 7cf0504ce6
Merge pull request #171 from emrysal/feature/simplify-code-by-handling-auth-in-shell-component 
Removed redirect clientside session logic from pages and moved to shell
 2021-05-07 20:39:02 +01:00
vklimontovich 3739d7752d Telemetry enhancements (mainly, data masking improvements) 
- data masking is moved to a separate function;
 - hostnames and urls are masked now
 - collect pageview for pages not wrapped in Shell
 2021-05-07 20:05:33 +03:00
Alex van Andel 880c4e91a3 Removed redirect clientside session logic from pages and moved to shell 2021-05-07 16:01:29 +00:00
Alex van Andel d2ca59adb8 Added redirects() function to next.config.js, changed Settings url 2021-05-07 15:04:56 +00:00
Bailey Pumfleet 17b880335a
Merge pull request #156 from MaZderMind/link-to-public-page 
Add Links to Public Pages
 2021-05-06 22:22:33 +01:00
Peter Körner 15a6799421 add links to public pages 2021-05-05 22:01:56 +02:00
vklimontovich ca1979fac2 - Updated jitsu to 2.0.1 
- Mask sensitive information (such as page title and IP address)
 2021-05-05 18:04:53 +03:00
Bailey Pumfleet f7295afaa2
Merge branch 'main' into main 2021-05-05 15:18:58 +01:00
Bailey Pumfleet ea31607598 Fix a bunch of TypeScript errors 2021-04-29 14:47:01 +01:00
vklimontovich 2894be8689 Added telemetry collection (through jitsu.com) 
- Introduced useTelemetry() hook
 - Telemetry events are sent for page_view, booking_confirmed, time_selected, date_selected events
 - Telemetry is configured (and can be disabled) with NEXT_PUBLIC_TELEMETRY_KEY env variable
 2021-04-27 17:19:12 +03:00
Alex van Andel d482b54fda Implemented react-timezone-select library, required the installation of 'next-transpile-modules', due to import and export not being natively supported within Next.js. 2021-04-26 12:14:23 +00:00
Bailey Pumfleet ce398bd77c Replace all SVG icons with Heroicons components 2021-04-21 11:10:27 +01:00
Bailey Pumfleet ccd7d0d47e Redirect on logout 2021-04-20 13:59:25 +01:00