From 007111ba8da382b3a6c3b8b1e77227429e06754a Mon Sep 17 00:00:00 2001 From: AQIB-NAWAB Date: Wed, 19 Mar 2025 19:36:56 +0500 Subject: [PATCH 1/5] fix the frontend issues and improvements --- app/components/CodeEditor/CodeEditor.module.css | 6 ++++++ app/components/MyBtn/MyBtn.tsx | 1 + app/components/Output/Output.tsx | 2 +- app/styles/icons/HiChevronRightGreen.tsx | 1 + .../02-Primitive-Types/09-Combining-Types/instructions.mdx | 2 +- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/components/CodeEditor/CodeEditor.module.css b/app/components/CodeEditor/CodeEditor.module.css index e71d01a..101179e 100644 --- a/app/components/CodeEditor/CodeEditor.module.css +++ b/app/components/CodeEditor/CodeEditor.module.css @@ -15,3 +15,9 @@ padding-left: 16px; padding-right: 32px; } + + +.myBtn:hover .nextIcon{ + color: black !important; + fill: black !important; +} \ No newline at end of file diff --git a/app/components/MyBtn/MyBtn.tsx b/app/components/MyBtn/MyBtn.tsx index f8d135c..5914c99 100644 --- a/app/components/MyBtn/MyBtn.tsx +++ b/app/components/MyBtn/MyBtn.tsx @@ -31,6 +31,7 @@ export default function MyBtn({ textTransform={"uppercase"} isDisabled={isDisabled} fontWeight={"bold"} + className="myBtn" > {children} diff --git a/app/components/Output/Output.tsx b/app/components/Output/Output.tsx index de743bd..682c5e9 100644 --- a/app/components/Output/Output.tsx +++ b/app/components/Output/Output.tsx @@ -67,7 +67,7 @@ const SchemaError = ({ schemaPath }: { schemaPath: string }) => { Details: {errorDetails}
-
Possible Fixes:
+ Possible Fixes: {possibleFixes.map((fix, index) => ( {fix} diff --git a/app/styles/icons/HiChevronRightGreen.tsx b/app/styles/icons/HiChevronRightGreen.tsx index 4792471..aae8175 100644 --- a/app/styles/icons/HiChevronRightGreen.tsx +++ b/app/styles/icons/HiChevronRightGreen.tsx @@ -23,6 +23,7 @@ function Icon({ clipRule="evenodd" d="M3.83439 9.7656C3.68441 9.61557 3.60016 9.41213 3.60016 9.2C3.60016 8.98786 3.68441 8.78442 3.83439 8.6344L6.46879 6L3.83439 3.3656C3.68866 3.21471 3.60803 3.01263 3.60985 2.80288C3.61167 2.59312 3.69581 2.39247 3.84413 2.24414C3.99246 2.09581 4.19311 2.01168 4.40287 2.00986C4.61262 2.00803 4.81471 2.08867 4.96559 2.2344L8.16559 5.4344C8.31556 5.58442 8.39982 5.78786 8.39982 6C8.39982 6.21213 8.31556 6.41557 8.16559 6.5656L4.96559 9.7656C4.81557 9.91557 4.61212 9.99983 4.39999 9.99983C4.18786 9.99983 3.98441 9.91557 3.83439 9.7656Z" fill={color} + className="nextIcon" /> ); diff --git a/content/02-Primitive-Types/09-Combining-Types/instructions.mdx b/content/02-Primitive-Types/09-Combining-Types/instructions.mdx index 4a4cbf0..9e2d24b 100644 --- a/content/02-Primitive-Types/09-Combining-Types/instructions.mdx +++ b/content/02-Primitive-Types/09-Combining-Types/instructions.mdx @@ -20,7 +20,7 @@ Let's add a new property `hasAgreedToTerms` to the JSON object. This property sh ### Boolean -A `boolean` type can have two values: `true` or `false`. you can define a boolean type as follows: +A `boolean` type can have two values: `true` or `false`. You can define a boolean type as follows: ```json { From f04a7ad345a552b57d4fcb5b9738cb92a3e47448 Mon Sep 17 00:00:00 2001 From: AQIB-NAWAB Date: Wed, 19 Mar 2025 19:44:43 +0500 Subject: [PATCH 2/5] black color --- app/components/CodeEditor/CodeEditor.module.css | 3 ++- app/styles/globals.css | 5 +++++ app/styles/icons/HiChevronRightGreen.tsx | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/components/CodeEditor/CodeEditor.module.css b/app/components/CodeEditor/CodeEditor.module.css index 101179e..80c24ab 100644 --- a/app/components/CodeEditor/CodeEditor.module.css +++ b/app/components/CodeEditor/CodeEditor.module.css @@ -18,6 +18,7 @@ .myBtn:hover .nextIcon{ - color: black !important; + color: red !important; fill: black !important; + background-color: magenta !important; } \ No newline at end of file diff --git a/app/styles/globals.css b/app/styles/globals.css index 45a27d6..d71853d 100644 --- a/app/styles/globals.css +++ b/app/styles/globals.css @@ -75,3 +75,8 @@ html { main { height: 100%; } + + +.myBtn:hover .nextIcon{ + fill: black !important; +} \ No newline at end of file diff --git a/app/styles/icons/HiChevronRightGreen.tsx b/app/styles/icons/HiChevronRightGreen.tsx index aae8175..986edef 100644 --- a/app/styles/icons/HiChevronRightGreen.tsx +++ b/app/styles/icons/HiChevronRightGreen.tsx @@ -22,8 +22,8 @@ function Icon({ fillRule="evenodd" clipRule="evenodd" d="M3.83439 9.7656C3.68441 9.61557 3.60016 9.41213 3.60016 9.2C3.60016 8.98786 3.68441 8.78442 3.83439 8.6344L6.46879 6L3.83439 3.3656C3.68866 3.21471 3.60803 3.01263 3.60985 2.80288C3.61167 2.59312 3.69581 2.39247 3.84413 2.24414C3.99246 2.09581 4.19311 2.01168 4.40287 2.00986C4.61262 2.00803 4.81471 2.08867 4.96559 2.2344L8.16559 5.4344C8.31556 5.58442 8.39982 5.78786 8.39982 6C8.39982 6.21213 8.31556 6.41557 8.16559 6.5656L4.96559 9.7656C4.81557 9.91557 4.61212 9.99983 4.39999 9.99983C4.18786 9.99983 3.98441 9.91557 3.83439 9.7656Z" - fill={color} className="nextIcon" + fill={color} /> ); From 43871999ce2af8ddec61692fb480352a0d7f5dd7 Mon Sep 17 00:00:00 2001 From: AQIB-NAWAB Date: Wed, 19 Mar 2025 19:46:03 +0500 Subject: [PATCH 3/5] remove --- app/components/CodeEditor/CodeEditor.module.css | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/components/CodeEditor/CodeEditor.module.css b/app/components/CodeEditor/CodeEditor.module.css index 80c24ab..e71d01a 100644 --- a/app/components/CodeEditor/CodeEditor.module.css +++ b/app/components/CodeEditor/CodeEditor.module.css @@ -15,10 +15,3 @@ padding-left: 16px; padding-right: 32px; } - - -.myBtn:hover .nextIcon{ - color: red !important; - fill: black !important; - background-color: magenta !important; -} \ No newline at end of file From e14b902751fb82237186a5827d2ee239c1b31c12 Mon Sep 17 00:00:00 2001 From: AQIB-NAWAB Date: Sun, 23 Mar 2025 05:03:41 +0500 Subject: [PATCH 4/5] resolve the css issues --- app/components/MyBtn/MyBtn.module.css | 3 +++ app/components/MyBtn/MyBtn.tsx | 3 ++- app/styles/globals.css | 5 ----- app/styles/icons/HiChevronRightGreen.tsx | 1 - 4 files changed, 5 insertions(+), 7 deletions(-) create mode 100644 app/components/MyBtn/MyBtn.module.css diff --git a/app/components/MyBtn/MyBtn.module.css b/app/components/MyBtn/MyBtn.module.css new file mode 100644 index 0000000..5ebe43f --- /dev/null +++ b/app/components/MyBtn/MyBtn.module.css @@ -0,0 +1,3 @@ +.myBtn:hover svg path{ + fill: black !important; +} \ No newline at end of file diff --git a/app/components/MyBtn/MyBtn.tsx b/app/components/MyBtn/MyBtn.tsx index 5914c99..3059a8b 100644 --- a/app/components/MyBtn/MyBtn.tsx +++ b/app/components/MyBtn/MyBtn.tsx @@ -1,5 +1,6 @@ import { Button, Tooltip } from "@chakra-ui/react"; import { sendGAEvent } from "@next/third-parties/google"; +import styles from "./MyBtn.module.css"; export default function MyBtn({ children, @@ -31,7 +32,7 @@ export default function MyBtn({ textTransform={"uppercase"} isDisabled={isDisabled} fontWeight={"bold"} - className="myBtn" + className={styles.myBtn} > {children} diff --git a/app/styles/globals.css b/app/styles/globals.css index d71853d..aa2abaf 100644 --- a/app/styles/globals.css +++ b/app/styles/globals.css @@ -74,9 +74,4 @@ html { main { height: 100%; -} - - -.myBtn:hover .nextIcon{ - fill: black !important; } \ No newline at end of file diff --git a/app/styles/icons/HiChevronRightGreen.tsx b/app/styles/icons/HiChevronRightGreen.tsx index 986edef..4792471 100644 --- a/app/styles/icons/HiChevronRightGreen.tsx +++ b/app/styles/icons/HiChevronRightGreen.tsx @@ -22,7 +22,6 @@ function Icon({ fillRule="evenodd" clipRule="evenodd" d="M3.83439 9.7656C3.68441 9.61557 3.60016 9.41213 3.60016 9.2C3.60016 8.98786 3.68441 8.78442 3.83439 8.6344L6.46879 6L3.83439 3.3656C3.68866 3.21471 3.60803 3.01263 3.60985 2.80288C3.61167 2.59312 3.69581 2.39247 3.84413 2.24414C3.99246 2.09581 4.19311 2.01168 4.40287 2.00986C4.61262 2.00803 4.81471 2.08867 4.96559 2.2344L8.16559 5.4344C8.31556 5.58442 8.39982 5.78786 8.39982 6C8.39982 6.21213 8.31556 6.41557 8.16559 6.5656L4.96559 9.7656C4.81557 9.91557 4.61212 9.99983 4.39999 9.99983C4.18786 9.99983 3.98441 9.91557 3.83439 9.7656Z" - className="nextIcon" fill={color} /> From e7375e010d71b8a580c5281d731e73b8f6a51b2a Mon Sep 17 00:00:00 2001 From: AQIB-NAWAB Date: Mon, 31 Mar 2025 21:21:10 +0500 Subject: [PATCH 5/5] delete the uncessary files and use the variant --- app/components/MyBtn/MyBtn.module.css | 3 --- app/components/MyBtn/MyBtn.tsx | 2 -- app/styles/theme.ts | 4 +++- 3 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 app/components/MyBtn/MyBtn.module.css diff --git a/app/components/MyBtn/MyBtn.module.css b/app/components/MyBtn/MyBtn.module.css deleted file mode 100644 index 5ebe43f..0000000 --- a/app/components/MyBtn/MyBtn.module.css +++ /dev/null @@ -1,3 +0,0 @@ -.myBtn:hover svg path{ - fill: black !important; -} \ No newline at end of file diff --git a/app/components/MyBtn/MyBtn.tsx b/app/components/MyBtn/MyBtn.tsx index 3059a8b..f8d135c 100644 --- a/app/components/MyBtn/MyBtn.tsx +++ b/app/components/MyBtn/MyBtn.tsx @@ -1,6 +1,5 @@ import { Button, Tooltip } from "@chakra-ui/react"; import { sendGAEvent } from "@next/third-parties/google"; -import styles from "./MyBtn.module.css"; export default function MyBtn({ children, @@ -32,7 +31,6 @@ export default function MyBtn({ textTransform={"uppercase"} isDisabled={isDisabled} fontWeight={"bold"} - className={styles.myBtn} > {children} diff --git a/app/styles/theme.ts b/app/styles/theme.ts index 50c053f..a3e5f51 100644 --- a/app/styles/theme.ts +++ b/app/styles/theme.ts @@ -17,7 +17,6 @@ const Button = { }, success: { color: "hsl(var(--success))", - borderColor: "hsl(var(--success))", borderWidth: "1px", _disabled: { @@ -26,6 +25,9 @@ const Button = { _hover: { bg: "hsl(var(--success))", color: "black", + "& svg path": { + fill: "black", + }, _disabled: { color: "hsl(var(--success) / 0.4)", },