Commit graph

68 commits

Author SHA1 Message Date
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
8c589b9dc1 Merge branch 'main' into feature/scheduling 2021-06-30 01:45:24 +00:00
Alex van Andel
e78a34e2ce Implements slot logic with the DatePicker, more tests for slots 2021-06-30 01:35:08 +00:00
Bailey Pumfleet
51c0556d30 Hide Calendso branding 2021-06-29 17:08:55 +01: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
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
Peer Richelsen
afa2e19f03 added more meta data to booking page 2021-06-23 12:14:19 +01:00
Bailey Pumfleet
629a34262e
Merge branch 'main' into bugfix/lowercase-usernames 2021-06-23 11:29:56 +01:00
Peer_Rich
c428c3f80e
Merge pull request #300 from Malte-D/feature/og-image
Added og-image to booking pages
2021-06-22 19:24:45 +01:00
Malte Delfs
0e27e7e3d9 changed og-image link 2021-06-22 20:14:28 +02:00
Alex van Andel
892ba8a335 Lowercase the router.query.user & some typescript fixes 2021-06-22 17:42:32 +00:00
Malte Delfs
e4b977c001 fix for single quotes 2021-06-22 18:01:03 +02:00
Malte Delfs
a3b4cbeadd use https://github.com/calendso/og-image to show dynamic og-image of booking links with avatar and title of booking. 2021-06-22 17:52:52 +02:00
Alex van Andel
1dce84fa8f Merge branch 'main' into feature/scheduling 2021-06-22 15:19:28 +00:00
Alex van Andel
78451a98b1 Updated timeFormat to something more sensible 2021-06-22 14:25:01 +00:00
Alex van Andel
b50fe16566 Moved DatePicker and PoweredByCalendso to seperate components 2021-06-21 20:26:04 +00:00
Alex van Andel
88fc22ddd4 Updated to latest 2021-06-21 10:39:01 +00: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
b423f2894a WIP to save progress 2021-06-19 22:50:47 +00:00
femyeda
ad0b561cca fix: eventType not defined on [user]/[type] 2021-06-19 10:17:23 -05:00
Alex van Andel
cc1b3fa7dd Return 404 when requesting event url that does not exist 2021-06-18 20:41:12 +00:00
Alex van Andel
7584b77811 Updated useEffect so it only fires once (added []) 2021-06-17 19:29:42 +00:00
nicolas
e92b2e01fc UI for rescheduling 2021-06-09 20:28:39 +02:00
Alex van Andel
cf06e91e30 Implemented sticky time options based on localStorage 2021-05-26 18:40:22 +00:00
Heath Daniel
71e50c58d6 Add ability to select first day of week 2021-05-17 18:10:40 -04: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
Paras Gupta
977e879406 fix: busy time in slot interval 2021-05-10 02:48:12 +05:30
Paras Gupta
3da430b577 fix: check for overlapping appointments 2021-05-10 02:28:05 +05:30
Fernando Barrios
ba2feb2c15 feat: Add support to use gravatar as a fallback avatar 2021-05-08 14:26:19 -06:00
Bailey Pumfleet
5615db5491
Merge branch 'main' into bugfix/crash-when-username-does-not-exist-#144 2021-05-07 20:40:12 +01:00
Bailey Pumfleet
5553d14631
Merge branch 'main' into main 2021-05-07 20:37:18 +01:00
Bailey Pumfleet
edec0226c4
Update branding link to calendso.com 2021-05-07 20:34:03 +01:00
Peer Richelsen
a49ac34b7a fixed logo 2021-05-07 19:23:00 +01:00
Peer Richelsen
52d9f94711 inverted color 2021-05-07 19:21:42 +01:00
Peer Richelsen
44e5158941 added powered by calendso 2021-05-07 19:18:41 +01:00
vklimontovich
db05c587a3 collect pageview for pages not wrapped in Shell 2021-05-07 20:07:36 +03:00
Alex van Andel
9ce82360c0 Check if user exists or return a 404 before proceeding 2021-05-07 15:17:06 +00:00
Bailey Pumfleet
5be885de19 UI improvements to time settings 2021-05-06 21:44:55 +01:00
Leonardo Stenico
084c7db559 Now a user can choose a timezone to display slots when scheduling a meeting 2021-05-06 19:36:57 +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
5cb0e44b00
Merge branch 'main' into fix/calendar-style 2021-05-05 15:42:36 +01:00
Bailey Pumfleet
f7295afaa2
Merge branch 'main' into main 2021-05-05 15:18:58 +01:00
Choongkyu Kim
e036e9b216 fix calendar style and resolve some TS lint errors 2021-05-04 20:42:01 -07:00
Bailey Pumfleet
ea31607598 Fix a bunch of TypeScript errors 2021-04-29 14:47:01 +01:00
Bailey Pumfleet
a1eed7c77e Add URL slugs 2021-04-28 13:24:16 +01:00