Skip to content

Add Loader to validate button #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 14, 2025
Merged

Add Loader to validate button #144

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
88929a2
add loader to the validate button
AQIB-NAWAB Mar 13, 2025
fea3fb2
Merge branch 'loader'
AQIB-NAWAB Mar 13, 2025
9477404
add the types again and create handleValidateFunction
AQIB-NAWAB Mar 13, 2025
2411348
add the type for event
AQIB-NAWAB Mar 14, 2025
bdcb9a8
resolved the branch issue
AQIB-NAWAB Mar 14, 2025
753f6b0
refactor CodeEditor component by extracting custom hooks and creating…
JeelRajodiya Mar 14, 2025
af1fbae
fix: correct spacing in validation button text
JeelRajodiya Mar 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 35 additions & 37 deletions app/components/CodeEditor/CodeEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import Editor from "@monaco-editor/react";
import { Flex, useColorMode } from "@chakra-ui/react";
import { useEffect, useState, useRef } from "react";
import MyBtn from "../MyBtn";
import { CodeFile, OutputResult } from "@/lib/types";
import { OutputReducerAction } from "@/lib/reducers";
import { tryFormattingCode, validateCode } from "@/lib/client-functions";
import FiChevronRight from "@/app/styles/icons/HiChevronRightGreen";
import { useRouter } from "next/navigation";
Expand All @@ -24,22 +22,14 @@ export default function CodeEditor({
stepIndex,
chapterIndex,
outputResult,
}: {
codeString: string;
setCodeString: (codeString: string) => void;
codeFile: CodeFile;
dispatchOutput: React.Dispatch<OutputReducerAction>;
nextStepPath: string | undefined;
stepIndex: number;
chapterIndex: number;
outputResult: OutputResult;
}) {
const { colorMode } = useColorMode();
const [monaco, setMonaco] = useState<any>(null);
const [monaco, setMonaco] = useState(null);
const [isValidating, setIsValidating] = useState(false);
const router = useRouter();
const editorStore = useEditorStore();
const userSolutionStore = useUserSolutionStore();
const editorRef = useRef<any>(null);
const editorRef = useRef(null);

useEffect(() => {
if (monaco) {
Expand All @@ -54,26 +44,30 @@ export default function CodeEditor({
monaco.editor.setTheme(colorMode === "light" ? "light" : "my-theme");
}
}, [monaco, colorMode]);

useEffect(() => {
const handleKeyDown = (event: KeyboardEvent) => {
const handleKeyDown = (event) => {
if (event.key == "Enter" && event.shiftKey) {
sendGAEvent("event", "buttonClicked", {
value: "Validate (through shortcut)",
});
event.preventDefault();
tryFormattingCode(editorRef, setCodeString);
validateCode(
codeString,
codeFile,
dispatchOutput,
stepIndex,
chapterIndex,
);
setIsValidating(true);
setTimeout(() => {
tryFormattingCode(editorRef, setCodeString);
validateCode(
codeString,
codeFile,
dispatchOutput,
stepIndex,
chapterIndex,
);
setIsValidating(false);
}, 500);
}
};

document.addEventListener("keydown", handleKeyDown);

return () => {
document.removeEventListener("keydown", handleKeyDown);
};
Expand Down Expand Up @@ -111,11 +105,10 @@ export default function CodeEditor({
defaultValue={codeString}
theme={colorMode === "light" ? "light" : "my-theme"}
value={codeString}
height={"100%"}
height="100%"
onChange={(codeString) => setCodeString(codeString ?? "")}
options={{
minimap: { enabled: false },

fontSize: 14,
formatOnPaste: true,
formatOnType: true,
Expand All @@ -129,32 +122,37 @@ export default function CodeEditor({
/>
</div>
<div className={styles.buttonsWrapper}>
<Flex dir="row" gap={"8px"} alignItems={"end"}>
<Flex dir="row" gap="8px" alignItems="end">
<MyBtn
onClick={async () => {
tryFormattingCode(editorRef, setCodeString);
validateCode(
codeString,
codeFile,
dispatchOutput,
stepIndex,
chapterIndex,
);
onClick={() => {
setIsValidating(true);
setTimeout(() => {
tryFormattingCode(editorRef, setCodeString);
validateCode(
codeString,
codeFile,
dispatchOutput,
stepIndex,
chapterIndex,
);
setIsValidating(false);
}, 500);
}}
isDisabled={isValidating}
variant={
outputResult.validityStatus === "valid" ? "success" : "default"
}
tooltip="Shift + Enter"
>
Validate
{isValidating ? "Validating..." : "Validate"}
</MyBtn>

<MyBtn
onClick={() => {
setCodeString(JSON.stringify(codeFile.code, null, 2));
dispatchOutput({ type: "RESET" });
}}
variant={"error"}
variant="error"
>
Reset
</MyBtn>
Expand Down