From fde1efa15424882818220bdd312789532537312e Mon Sep 17 00:00:00 2001 From: Nevo David <100117126+nevo-david@users.noreply.github.com> Date: Mon, 30 Sep 2024 14:28:56 +0700 Subject: [PATCH 1/5] Update README.md --- README.md | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 88678384..df62e7aa 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,3 @@ - -

- - Follow me - -
- - - DevFest - - -

-

-

@@ -68,6 +54,22 @@
+ +

+


+

We participate in Hacktoberfest 2024! 🎉🎊

+

We are sending a t-shirt for every merged PR! (max 1 per person)

+

Rules:

+ +

+


+

+

From 566d13f015b34e9ef96b9828a85289b2677397b6 Mon Sep 17 00:00:00 2001 From: Ikko Eltociear Ashimine Date: Tue, 1 Oct 2024 01:07:49 +0900 Subject: [PATCH 2/5] docs: update CONTRIBUTING.md Brabch -> Branch --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index be4a1fa5..619dee9c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,7 +16,7 @@ As a general rule; ## How to contribute -This project follows a Fork/Feature Brabch/Pull Request model. If you're not familiar with this, here's how it works: +This project follows a Fork/Feature Branch/Pull Request model. If you're not familiar with this, here's how it works: 1. Fork the project to your GitHub account. 2. Clone your fork to your local machine. From 57a3a9094118c1477d60729652910d9252493a8f Mon Sep 17 00:00:00 2001 From: JeevaRamanathan Date: Tue, 1 Oct 2024 17:18:00 +0530 Subject: [PATCH 3/5] fix: Checkbox tick visible on both modes Signed-off-by: JeevaRamanathan --- .../src/form/checkbox.tsx | 51 ++++++++++++++----- 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/libraries/react-shared-libraries/src/form/checkbox.tsx b/libraries/react-shared-libraries/src/form/checkbox.tsx index a16521b7..4e54b560 100644 --- a/libraries/react-shared-libraries/src/form/checkbox.tsx +++ b/libraries/react-shared-libraries/src/form/checkbox.tsx @@ -4,21 +4,26 @@ import clsx from 'clsx'; import Image from 'next/image'; import { useFormContext, useWatch } from 'react-hook-form'; -export const Checkbox = forwardRef void; - variant?: 'default' | 'hollow'; -}>((props, ref: any) => { +export const Checkbox = forwardRef< + null, + { + checked?: boolean; + disableForm?: boolean; + name?: string; + className?: string; + onChange?: (event: { target: { name?: string; value: boolean } }) => void; + variant?: 'default' | 'hollow'; + } +>((props, ref: any) => { const { checked, className, disableForm, variant } = props; const form = useFormContext(); const register = disableForm ? {} : form.register(props.name!); - const watch = disableForm ? undefined : useWatch({ - name: props.name!, - }); + const watch = disableForm + ? undefined + : useWatch({ + name: props.name!, + }); const [currentStatus, setCurrentStatus] = useState(watch || checked); const changeStatus = useCallback(() => { @@ -26,7 +31,9 @@ export const Checkbox = forwardRef {currentStatus && ( - Checked +
+ + + +
)} ); From f21ea604cefc4bb483237a367788531f2981bb8b Mon Sep 17 00:00:00 2001 From: JeevaRamanathan Date: Tue, 1 Oct 2024 17:33:34 +0530 Subject: [PATCH 4/5] removed formatting --- .../src/form/checkbox.tsx | 67 ++++++++----------- 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/libraries/react-shared-libraries/src/form/checkbox.tsx b/libraries/react-shared-libraries/src/form/checkbox.tsx index 4e54b560..8090d000 100644 --- a/libraries/react-shared-libraries/src/form/checkbox.tsx +++ b/libraries/react-shared-libraries/src/form/checkbox.tsx @@ -4,26 +4,21 @@ import clsx from 'clsx'; import Image from 'next/image'; import { useFormContext, useWatch } from 'react-hook-form'; -export const Checkbox = forwardRef< - null, - { - checked?: boolean; - disableForm?: boolean; - name?: string; - className?: string; - onChange?: (event: { target: { name?: string; value: boolean } }) => void; - variant?: 'default' | 'hollow'; - } ->((props, ref: any) => { +export const Checkbox = forwardRef void; + variant?: 'default' | 'hollow'; +}>((props, ref: any) => { const { checked, className, disableForm, variant } = props; const form = useFormContext(); const register = disableForm ? {} : form.register(props.name!); - const watch = disableForm - ? undefined - : useWatch({ - name: props.name!, - }); + const watch = disableForm ? undefined : useWatch({ + name: props.name!, + }); const [currentStatus, setCurrentStatus] = useState(watch || checked); const changeStatus = useCallback(() => { @@ -31,9 +26,7 @@ export const Checkbox = forwardRef< props?.onChange?.({ target: { name: props.name!, value: !currentStatus } }); if (!disableForm) { // @ts-ignore - register?.onChange?.({ - target: { name: props.name!, value: !currentStatus }, - }); + register?.onChange?.({ target: { name: props.name!, value: !currentStatus } }); } }, [currentStatus]); @@ -44,29 +37,27 @@ export const Checkbox = forwardRef< onClick={changeStatus} className={clsx( 'cursor-pointer rounded-[4px] select-none w-[24px] h-[24px] justify-center items-center flex', - variant === 'default' || !variant - ? 'bg-forth' - : 'border-customColor1 border-2 bg-customColor2', + variant === 'default' || !variant ? ('bg-forth') : ('border-customColor1 border-2 bg-customColor2'), className )} > {currentStatus && ( -
- - - -
- )} +
+ + + +
+ )} ); }); From b2be32cad745acfbf57e88eba9581a658d6282db Mon Sep 17 00:00:00 2001 From: JeevaRamanathan Date: Wed, 2 Oct 2024 19:25:06 +0530 Subject: [PATCH 5/5] fix:Improve Icon and Toast Text Visibility in Profile Settings Screen for Light Mode --- apps/frontend/src/components/layout/settings.component.tsx | 4 ++-- libraries/react-shared-libraries/src/toaster/toaster.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/frontend/src/components/layout/settings.component.tsx b/apps/frontend/src/components/layout/settings.component.tsx index a0d8e817..c229216b 100644 --- a/apps/frontend/src/components/layout/settings.component.tsx +++ b/apps/frontend/src/components/layout/settings.component.tsx @@ -155,7 +155,7 @@ export const SettingsPopup: FC<{ getRef?: Ref }> = (props) => { /> -
+
Upload image
@@ -173,7 +173,7 @@ export const SettingsPopup: FC<{ getRef?: Ref }> = (props) => { >
diff --git a/libraries/react-shared-libraries/src/toaster/toaster.tsx b/libraries/react-shared-libraries/src/toaster/toaster.tsx index 88eb1c93..5768ca7b 100644 --- a/libraries/react-shared-libraries/src/toaster/toaster.tsx +++ b/libraries/react-shared-libraries/src/toaster/toaster.tsx @@ -68,7 +68,7 @@ export const Toaster = () => { )} -
{toasterText}
+
{toasterText}