commonscomputer/cal.diy
5
0 Fork 0
Code Issues Pull Requests Actions 2.2k Packages Projects Releases Wiki Activity
884 Commits 2 Branches 621 Tags
5fe4a379084bc21fbfcae0dcd5f8a648d0de9506
Commit Graph
527 Commits
Author SHA1 Message Date
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
Peer Richelsen 21b3134e1f closes #476 Google Calendar Modal not scrollable 2021-08-23 17:28:28 +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 AndelandBailey Pumfleet 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
Mihai Cmihaic195Bailey Pumfleet
 		3894ee12d1 feat: CustomEventType placeholder and API fixes (#446) 
* feat: add optional placeholder for text/multi-line text custom inputs on event types

* fix: delete associations of event type first

* fix: remove unneeded check

* fix: minor tweak

Co-authored-by: mihaic195 <mihai@sortlist.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2021-08-22 14:06:26 +01:00
Alex van AndelandBailey Pumfleet 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
Mihai Candmihaic195 eaaa36c4a4 fix: clickable checkbox/label and minor styling (#442) 
* fix: clickable checkbox/label

* fix: change location radiogroup color to dark

* fix: same classes for labels

Co-authored-by: mihaic195 <mihai@sortlist.com>
 2021-08-20 14:11:08 +02:00
Alex JohanssonandAlex van Andel 6d158e0c50 fix google auth callback (#500) 
* maybe fix?

* fix

* Update pages/api/integrations/googlecalendar/callback.ts

Co-authored-by: Alex Johansson <alexander@n1s.se>

Co-authored-by: Alex van Andel <me@alexvanandel.com>
 2021-08-19 15:37:18 +01:00
Peer_Rich f8a3f73a25 added dark mode to ics icon (#498) 2021-08-19 14:46:12 +02:00
Alex Johansson a8ef195546 add query params parser util (#496) 2021-08-19 12:32:51 +00:00
Alex JohanssonandAlex van Andel 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
Alex Johansson 5a9961f608 quick fix for location error (#492) 2021-08-18 22:07:59 +02:00
Alex Johansson 2af160a13e make pages/[user]/[type].tsx type-safe (#484) 
* make `pages/[user]/[type].tsx` type-safe
* deprecate `whereAndSelect`
 2021-08-18 12:21:52 +00:00
Alex Johansson aed9757409 fix bad auth commit (#487) 2021-08-18 12:15:22 +00:00
Alex Johansson a0a0ec86f0 add type-safe getSession() (#486) 
* fix types for auth
* implement safer to use `getSession`
 2021-08-18 11:52:25 +00:00
Peer_Rich a162949cf1 added useNotification @lib, using it in EventType (#468) 2021-08-18 10:18:18 +02:00
Bailey Pumfleet 77ada9667a Merge pull request #430 from mihaic195/fix/next-auth-issues 
Fix next-auth issues
 2021-08-17 09:52:11 +01:00
Bailey Pumfleet c9ea8fd624 Merge pull request #445 from mihaic195/fix/feedback-on-event-type-update 
fix: add success modal on event-type update
 2021-08-17 09:41:19 +01:00
Peer_Rich 52ca44a3a2 Merge pull request #464 from emrysal/hotfix/inclusive-exclusive-should-be-other-way 2021-08-17 06:12:00 +02:00
Alex van Andel 3a00ab0d0e Switched exclusivity, initial bugfix was incorrect 2021-08-16 22:51:52 +00:00
Peer Richelsen bf598a21d4 dark mode for add to calendar buttons 2021-08-16 23:10:06 +02:00
femyeda 49e7cbf803 fix issue where user could not connect to caldav 
Uses base caldav adapter to ensure connectivity

rethrows all errors on CalDavCalendarAdapter
 2021-08-16 09:34:49 -05: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
Bailey Pumfleet 06dce130b2 Merge pull request #450 from emrysal/bugfix/custom-inputs 2021-08-16 10:35:28 +01:00
Bailey Pumfleet ceacf02383 Merge pull request #449 from kanji-keraliya/office-365-integration-domain 
Fixed: Office 365 integration redirection URL issue
 2021-08-16 10:23:45 +01:00
Bailey Pumfleet 3d725a9573 Merge pull request #412 from emrysal/bugfix/eventType-merge-artifacts 
Removed selectedEventType + fixed missing booking.eventTypeId
 2021-08-16 10:22:38 +01:00
Peer_Rich 83bef7d95e Merge pull request #448 from femyeda/team-pages 
Team pages
 2021-08-15 18:44:42 +02:00
Peer Richelsen b1c2db91e7 Merge branch 'main' of github.com:calendso/calendso 2021-08-15 18:38:15 +02:00
Peer Richelsen 73bec6287d replaced caldav icon 2021-08-15 18:37:50 +02:00
femyeda 19ef588fa5 fix issue where client side vali 
dation not happening

show error message from server
 2021-08-15 09:22:05 -05:00
femyeda 420839bcf5 fix issue where user cant cancel caldav dialog 2021-08-15 08:49:30 -05:00
Peer Richelsen a15d05be86 tried fixing the layout of new CalDav integration 2021-08-15 13:10:01 +02:00
Peer_Rich 610ea6c9ef Merge branch 'main' into main 2021-08-15 12:48:48 +02:00
Femi Odugbesan 65366b7c5b cal-101-caldav-integration (#419) 
* add generic calendar icon for caldav

* module for symmetric encrypt/decrypt

* caldav integration

* use Radix dialog

* Move caldav components to /caldav

* remove duplicate cancel button, unused function

* ensure app can connect to caldav server before adding

* fix calendar clients can possibly return null

* fix: add caldav dialog does not close when submitted

* safely attempt all caldav operations

* clarify variable name, fix typo

* use common helper for stripping html

* remove usage of request lib until "completed"

* add types and usage comments to crypto lib

* add encryption key to example env file
 2021-08-14 20:53:59 -05:00
Alex van Andel 252a329f09 Fixed issues relating to custom-inputs 
* Don't duplicate custom input when editing before db persist
* Remove correct custom input during delete pre db persist (id undefined)
* Moved typings to prisma, keeping backwards compatibility with @map
* Updated all usages of the enum
 2021-08-14 17:03:50 +00:00
Alex van Andel 3a5e7dd61c Delete old redundant page 2021-08-14 16:43:34 +00:00
Alex van Andel 03cfd4ba8b Detect conflicts when the time is the same as startTime 2021-08-14 15:01:05 +00:00
Alex van Andel 92d3f08f70 Merge branch 'main' into bugfix/eventType-merge-artifacts 2021-08-14 14:56:34 +00:00
Kanji Keraliya 4c48410e2d Fixed: Office 365 integration redirection url issue 2021-08-14 11:55:43 +05:30
femyeda 216a7c0c48 prevent duplicate team names 2021-08-13 14:50:11 -05:00
femyeda 60a4b8b29e add page for teams 2021-08-13 14:46:42 -05:00
mihaic195 5193b723a4 fix: add success modal on event-type update 2021-08-13 12:48:20 +03:00
Bailey Pumfleet da98a1ff1d Merge pull request #413 from emrysal/bugfix/fix-zoom-calendar-conflict 2021-08-13 09:08:04 +01: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 7b2b75c25c wip 2021-08-12 15:55:09 +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
joshsny bcb2835648 fixed bug when eventType does not exist for booking 2021-08-12 12:23:10 +02:00
Joshua SnyderandNico 6415b561b7 Update pages/availability/troubleshoot.tsx 
Co-authored-by: Nico <spam@nicolasjessen.de>
 2021-08-12 06:54:01 +02:00
Syed Ali Shahbaz 0c3ec98062 added image-uploader component and refactored profile settings page 2021-08-12 10:14:11 +05:30