Skip to content
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

Jump to bottom

changing editor layout #49

Closed
wants to merge 9 commits into from
Closed

changing editor layout #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1b59077
changing editor layout
doriroz May 27, 2024
4207119
Merge remote-tracking branch 'upstream/main' into cd-editor
doriroz May 28, 2024
e770461
Merge branch 'main' into cd-editor
doriroz May 31, 2024
1c2a950
few changes for update conflicts
doriroz Jun 4, 2024
8b038f6
Merge branch 'main' into cd-editor
doriroz Jun 4, 2024
693c064
Update EditorComponent.js
doriroz Jun 5, 2024
d0f6a6c
Delete src/pages/EditorDori.jsx
doriroz Jun 5, 2024
d72d9d9
Merge branch 'main' into cd-editor
doriroz Jun 8, 2024
16f5ea9
Merge branch 'main' into cd-editor
doriroz Jun 14, 2024
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
16 changes: 16 additions & 0 deletions src/components/css/EditorComponent.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,19 @@
.output pre:hover {
background-color: #9d4444; /* Change background color on hover */
}

pre {
margin: 0;
}

.layout {
display: flex;
}

.sidebar {
display: flex;
flex-direction: column;
width: 15vw;
gap: 1rem;
align-items: center;
}
247 changes: 194 additions & 53 deletions src/pages/EditorComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,37 @@
import "../components/css/EditorComponent.css"; // Optional for styling
import "@fortawesome/fontawesome-free/css/all.css";
import { useSnackbar } from "notistack";
import { Button, CircularProgress, styled } from "@mui/material";
import { LANGUAGES, judge0SubmitUrl, rapidApiHost, rapidApiKey } from "../constants/constants";
import LanguageSelect from "../components/js/LanguageSelect";

const StyledButton = styled(Button)({
display: "flex",
alignItems: "center",
justifyContent: "center",
gap: "0.5rem",
});
import {
LANGUAGES,
judge0SubmitUrl,
rapidApiHost,
rapidApiKey,
} from "../constants/constants";

function EditorComponent() {
const [code, setCode] = useState(null);
const [output, setOutput] = useState("");
const [currentLanguage, setCurrentLanguage] = useState(LANGUAGES[0].DEFAULT_LANGUAGE);
const [currentLanguage, setCurrentLanguage] = useState(
LANGUAGES[0].DEFAULT_LANGUAGE
);
const [languageDetails, setLanguageDetails] = useState(LANGUAGES[0]);
const [loading, setLoading] = useState(false);

Check warning on line 21 in src/pages/EditorComponent.js

View workflow job for this annotation

GitHub Actions / Performs linting on the application 

'loading' is assigned a value but never used
const { enqueueSnackbar } = useSnackbar();
// Reference to the Monaco editor instance
const editorRef = useRef(null);

useEffect(() => {
const selectedLanguage = LANGUAGES.find((lang) => lang.DEFAULT_LANGUAGE === currentLanguage);
const selectedLanguage = LANGUAGES.find(
(language) => language.DEFAULT_LANGUAGE === currentLanguage
);


setLanguageDetails({
LANGUAGE_ID: selectedLanguage.ID,
LANGUAGE_NAME: selectedLanguage.NAME,
DEFAULT_LANGUAGE: selectedLanguage.DEFAULT_LANGUAGE,
NAME: selectedLanguage.NAME,
});
setCode(selectedLanguage.HELLO_WORLD);
}, [currentLanguage]);
// Function to handle editor mounting
function handleEditorDidMount(editor, monaco) {
Expand All @@ -44,12 +45,7 @@
submitCode();
});
}

const getLanguageLogoById = (id) => {
const language = LANGUAGES.find(lang => parseInt(lang.ID) === parseInt(id));
return language ? language.LOGO : null;
};


// Function to handle code submission
async function submitCode() {
const codeToSubmit = editorRef.current.getValue();
Expand Down Expand Up @@ -82,6 +78,7 @@
setLoading(false);
return;
}

const data = await response.json();
const submissionId = data["token"];

Expand Down Expand Up @@ -121,53 +118,83 @@
}

return (
<div className="editor-container" style={styles.container}>
<div style={styles.flexBetween}>

<div style={styles.container}>
{/* Language toggle button (top right corner) */}
<div style={{ backgroundColor: "#b7b8a9" }}>
{/* Current Language Logo */}
<div style={styles.flexStart}>
{getLanguageLogoById(languageDetails.LANGUAGE_ID)}
<div style={{ fontWeight: "bold" }}>{languageDetails.LANGUAGE_NAME}</div>
{currentLanguage === LANGUAGES[0].DEFAULT_LANGUAGE ? (
<JavascriptLogo />
) : (
<PythonLogo />
)}

<div style={{ fontWeight: "bold" }}>
{languageDetails.LANGUAGE_NAME}
</div>
</div>
<div style={styles.languageDropdown}>
<LanguageSelect handleLanguageChange={handleLanguageChange} defaultLanguage={languageDetails} />
</div>
<div className="layout">
<Editor
height="70vh"
width="85vw"
theme="vs-dark"
onMount={handleEditorDidMount}
// ... other editor configuration options
value={code} // Set initial value
onChange={(value) => setCode(value)} // Update code state on change
language={languageDetails.DEFAULT_LANGUAGE} // Set default language to JavaScript
/>
<div className="sidebar">
<select
style={styles.select}
// style={{ padding: "0.5em 1em" }}
onChange={handleLanguageChange}
>
{LANGUAGES.map((language, index) => (
<option
key={index}
style={{ padding: "0.2em 0.5em" }}
value={language.DEFAULT_LANGUAGE}
>
{language.NAME}
</option>
))}
</select>
<button onClick={submitCode} style={styles.button}>
<FaPlay size="16" /> Run {languageDetails.LANGUAGE_NAME} Code
</button>
</div>
</div>
<div
style={{
backgroundColor: "#eceddd",
height: "22.3vh",
}}
>
{output}
{/* className="output" */}
{/* <pre> */}
{/* <p>{output}</p> */}
{/* </pre> */}

<Editor
height="70vh"
width="100%"
theme="vs-dark"
onMount={handleEditorDidMount}
// ... other editor configuration options
value={code} // Set initial value
onChange={setCode} // Update code state on change
language={languageDetails.DEFAULT_LANGUAGE} // Set default language to JavaScript
/>
<StyledButton onClick={submitCode} style={styles.button} variant="contained" color="primary" disabled={loading}>
<span>
{loading ? (
<CircularProgress size={16} />
) : (
<FaPlay size="16" />
)}
</span>
Run {languageDetails.LANGUAGE_NAME} Code
</StyledButton>
<div id="counter">A user can do 50 executions/day in total (irrespective of the language)</div>
<div className="output">
<pre>
<p>{output}</p>
</pre>
</div>
</div>
);
}

const styles = {
// container: {
// textAlign: 'center',
// },

flexStart: {
display: "flex",
justifyContent: "flex-start",
alignItems: "center",
gap: "0.6em",
padding: ".5rem",
},
flexBetween: {
display: "flex",
Expand All @@ -177,21 +204,135 @@
height: "60px",
},
button: {
marginLeft: "5px",
// marginLeft: "2.5rem",
marginTop: "5px",
padding: "10px 20px",
padding: "10px",
backgroundColor: "#252525",
color: "#fff",
border: "none",
borderRadius: "5px",
fontSize: "1.2em",
fontSize: ".9em",
cursor: "pointer",
boxShadow: "0 4px 6px rgba(0, 0, 0, 0.1)",
height: "3rem",
width: "11rem",
},
select: {
width: "11rem",
height: "2.5rem",
borderRadius: "5px",
padding: "0.5em 1em",
marginTop: "1rem",
},
error: {
backgroundColor: "#e5ebce",
display: "flex",
justifyContent: "space-between",
position: "fixed",
top: "10rem",
left: "10rem",
width: "60%",
height: "20%",
borderRadius: ".5rem",
fontSize: "20px",
padding: "5px 0 0 15px",
zIndex: "1000",
},
cancel: {
backgroundColor: "#e5ebce",
height: "1.5rem",
border: "none",
fontSize: "20px",
marginRight: "1rem",
cursor: "pointer",
},
languageDropdown: {
display: "flex",
alignItems: "center",
},
};

function JavascriptLogo({ width = 40, height = 40 }) {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
x="0px"
y="0px"
width={width}
height={height}
viewBox="0,0,256,256"
>
<g transform="">
<g
fill="none"
fillRule="nonzero"
stroke="none"
strokeWidth="1"
strokeLinecap="butt"
strokeLinejoin="miter"
strokeMiterlimit="10"
strokeDasharray=""
strokeDashoffset="0"
fontFamily="none"
fontWeight="none"
fontSize="none"
textAnchor="none"
style={{ mixBlendMode: "normal" }}
>
<g transform="scale(5.33333,5.33333)">
<path d="M6,42v-36h36v36z" fill="#ffd600"></path>
<path
d="M29.538,32.947c0.692,1.124 1.444,2.201 3.037,2.201c1.338,0 2.04,-0.665 2.04,-1.585c0,-1.101 -0.726,-1.492 -2.198,-2.133l-0.807,-0.344c-2.329,-0.988 -3.878,-2.226 -3.878,-4.841c0,-2.41 1.845,-4.244 4.728,-4.244c2.053,0 3.528,0.711 4.592,2.573l-2.514,1.607c-0.553,-0.988 -1.151,-1.377 -2.078,-1.377c-0.946,0 -1.545,0.597 -1.545,1.377c0,0.964 0.6,1.354 1.985,1.951l0.807,0.344c2.745,1.169 4.293,2.363 4.293,5.047c0,2.892 -2.284,4.477 -5.35,4.477c-2.999,0 -4.702,-1.505 -5.65,-3.368zM17.952,33.029c0.506,0.906 1.275,1.603 2.381,1.603c1.058,0 1.667,-0.418 1.667,-2.043v-10.589h3.333v11.101c0,3.367 -1.953,4.899 -4.805,4.899c-2.577,0 -4.437,-1.746 -5.195,-3.368z"
fill="#000001"
></path>
</g>
</g>
</g>
</svg>
);
}

function PythonLogo({ width = 40, height = 40 }) {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
x="0px"
y="0px"
width={width}
height={height}
viewBox="0,0,256,256"
>
<g transform="translate(30.72,30.72) scale(0.76,0.76)">
<g
fill="none"
fillRule="nonzero"
stroke="none"
strokeWidth="1"
strokeLinecap="butt"
strokeLinejoin="miter"
strokeMiterlimit="10"
strokeDasharray=""
strokeDashoffset="0"
fontFamily="none"
fontWeight="none"
fontSize="none"
textAnchor="none"
style={{ mixBlendMode: "normal" }}
>
<g transform="scale(5.33333,5.33333)">
<path
d="M24.047,5c-1.555,0.005 -2.633,0.142 -3.936,0.367c-3.848,0.67 -4.549,2.077 -4.549,4.67v3.963h9v2h-9.342h-4.35c-2.636,0 -4.943,1.242 -5.674,4.219c-0.826,3.417 -0.863,5.557 0,9.125c0.655,2.661 2.098,4.656 4.735,4.656h3.632v-5.104c0,-2.966 2.686,-5.896 5.764,-5.896h7.236c2.523,0 5,-1.862 5,-4.377v-8.586c0,-2.439 -1.759,-4.263 -4.218,-4.672c0.061,-0.006 -1.756,-0.371 -3.298,-0.365zM19.063,9c0.821,0 1.5,0.677 1.5,1.502c0,0.833 -0.679,1.498 -1.5,1.498c-0.837,0 -1.5,-0.664 -1.5,-1.498c0,-0.822 0.663,-1.502 1.5,-1.502z"
fill="#0277bd"
></path>
<path
d="M23.078,43c1.555,-0.005 2.633,-0.142 3.936,-0.367c3.848,-0.67 4.549,-2.077 4.549,-4.67v-3.963h-9v-2h9.343h4.35c2.636,0 4.943,-1.242 5.674,-4.219c0.826,-3.417 0.863,-5.557 0,-9.125c-0.656,-2.661 -2.099,-4.656 -4.736,-4.656h-3.632v5.104c0,2.966 -2.686,5.896 -5.764,5.896h-7.236c-2.523,0 -5,1.862 -5,4.377v8.586c0,2.439 1.759,4.263 4.218,4.672c-0.061,0.006 1.756,0.371 3.298,0.365zM28.063,39c-0.821,0 -1.5,-0.677 -1.5,-1.502c0,-0.833 0.679,-1.498 1.5,-1.498c0.837,0 1.5,0.664 1.5,1.498c0,0.822 -0.664,1.502 -1.5,1.502z"
fill="#ffc107"
></path>
</g>
</g>
</g>
</svg>
);
}

export default EditorComponent;
8 changes: 5 additions & 3 deletions src/pages/LandingPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ function LandingPage() {
return (
<div className="landing-page" style={styles.container}>
<h1 style={styles.heading}>Welcome</h1>
<Stars/>
<Link to="/editor" style={styles.link}><button style={styles.button}>Click Here to Proceed</button></Link>
<Stars />
<Link to="/editor" style={styles.link}>
<button style={styles.button}>Click Here to Proceed</button>
</Link>
</div>
);
}
Expand Down Expand Up @@ -38,7 +40,7 @@ const styles = {
fontSize: "1.2em",
cursor: "pointer",
boxShadow: "0 4px 6px rgba(0, 0, 0, 0.1)",
}
},
};

export default LandingPage;