Commit Graph

359 Commits

Author SHA1 Message Date
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
Bailey Pumfleet 35f7b30097 Add success modal 2021-04-20 13:56:50 +01:00
Bailey Pumfleet 0d35bcfe38 Implement mobile menu 2021-04-16 17:36:27 +01:00
Bailey Pumfleet 15d9267b7d Update profile dropdown links 2021-04-09 16:49:02 +01:00
Bailey Pumfleet 2c4b5c2846 Create, edit and delete event types 2021-04-08 15:20:38 +01:00
Bailey Pumfleet f55f2f6321 Add settings section 2021-04-07 16:03:02 +01:00
Bailey Pumfleet 443febac8d Add more empty states 2021-03-31 21:10:53 +01:00
Bailey Pumfleet f6c50106bd Highlight nav items if routes are active 2021-03-30 13:25:09 +01:00
Bailey Pumfleet 1582cfd43f Add self-authentication with Google Calendar API 2021-03-26 15:51:19 +00:00
Bailey Pumfleet 388ff394c7 Add base admin interface 2021-03-24 15:03:04 +00:00