Commit graph

78 commits

Author SHA1 Message Date
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