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.

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

Updated MenuBar and SideBar #25

Merged
merged 1 commit into from
Dec 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion web-app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,4 @@
</body>
<script type="text/javascript" src="https://unpkg.com/monaco-themes/dist/monaco-themes.js"></script>
<script src="https://kit.fontawesome.com/f614d99ea8.js" crossorigin="anonymous"></script>

</html>
12 changes: 6 additions & 6 deletions web-app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 8 additions & 7 deletions web-app/src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ li{
background-color: var(--content-box-bg-color);
width: 21vw;
box-shadow: 0px 8px 16px 0px rgb(53, 53, 53);
padding-left: 10px;
padding-right: 12px;
padding-bottom: 10px;
padding-top: 10px;
border-radius: 6px;
padding-left: 9px;
padding-right: 11px;
padding-bottom: 9px;
padding-top: 9px;
border-radius: 5px;
z-index: 2;
position: absolute;
}
Expand Down Expand Up @@ -267,7 +267,6 @@ li{
}

.sidebarscontent{
display: none;
width: 20vw;
height: 90vh;
background-color: var(--main-bg-color);
Expand All @@ -279,9 +278,11 @@ li{
#searcharea{
display: none;
}
#filepioneer{

#filepioneerarea{
display: none;
}

#extensions{
display: none;
}
3 changes: 2 additions & 1 deletion web-app/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import SideBar from './components/SideBar/SideBar.jsx'
import ReviewBar from './components/ReviewBar/ReviewBar.jsx'
import StatusBar from './components/StatusBar/StatusBar.jsx'
import Tabs from './components/Tabs/Tabs.jsx'
import FilePioneer from './components/SideBar/Main Components/filePioneer/filePioneer.jsx';
import Search from './components/SideBar/Main Components/Search/Search.jsx';
import Extensions from './components/SideBar/Main Components/Extensions/Extensions.jsx';
import FilePioneer from './components/SideBar/Main Components/filePioneer/filePioneer.jsx'



function App() {
Expand Down
23 changes: 20 additions & 3 deletions web-app/src/components/MenuBar/MenuBar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'


function MenuBar(props) {
const filePicker = () => {
function filePicker() {
let input = document.createElement('input');
input.type = 'file';
input.click();
}
const quit = () => {
function quit() {
window.close()
}
return (
Expand Down Expand Up @@ -101,7 +101,24 @@ function MenuBar(props) {
<div className="dropdown">
<span className='dropdown-trigger-btn'>{props.go}</span>
<div className="dropdown-content">
<li>New File</li>
<li>Switch Editor</li>
<li>Switch Group</li>
<hr className='dropdowncontent-hr' />
<li>Go to File</li>
<li>Go to Symbol in Workspace</li>
<hr className='dropdowncontent-hr' />
<li>Go to Symbol in Editor</li>
<li>Go to Definition</li>
<li>Go to Declaration</li>
<li>Go to Type Definition</li>
<li>Go to Implementations</li>
<li>Go to References</li>
<hr className='dropdowncontent-hr' />
<li>Go to Line/Column</li>
<li>Go to Bracket</li>
<hr className='dropdowncontent-hr' />
<li>Next Problem</li>
<li>Previous Problem</li>
</div>
</div>
<div className="dropdown">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React from 'react'
const Debug = () => {
return (
<div id="debug" className='sidebarscontent'>
<h6>File Pioneer</h6>
<h6>Debug</h6>
</div>
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react'

function FilePioneer() {
return (
<div id="filepioneer" className='sidebarscontent'>
<div id="filepioneerarea" className='sidebarscontent'>
<h6>File Pioneer</h6>
</div>
)
Expand Down
96 changes: 8 additions & 88 deletions web-app/src/components/SideBar/SideBar.jsx
Original file line number Diff line number Diff line change
@@ -1,120 +1,40 @@
import React, { useState } from 'react'
import ReactDOM from "react-dom";

export default function SideBar(props) {
const sidebarscontent = document.getElementsByClassName('sidebarscontent')
const MonacoEditor = document.getElementById('editorwrapper')
let Search = document.getElementById('searcharea')
let Extensions = document.getElementById('extensions')
let Debug = document.getElementById('debug')
let CodeBlocks = document.getElementById('codeblocks')
let Github = document.getElementById('github')
let Git = document.getElementById('git')
let Terminal = document.getElementById('terminal')
let filepioneer = document.getElementById('filepioneer');
const toggleSearch = () => {
console.log("toggled")
if (Search.style.display === "none") {
Search.style.display = "flex";
Extensions.style.display = "none";
// Debug.style.display = "none";
// CodeBlocks.style.display = "none";
// Github.style.display = "none";
// Git.style.display = "none";
filepioneer.style.display = "none";
MonacoEditor.style.width = "72vw";
} else {
Search.style.display = "none"
Extensions.style.display = "none";
// Debug.style.display = "none";
// CodeBlocks.style.display = "none";
// Github.style.display = "none";
// Git.style.display = "none";
filepioneer.style.display = "none";
MonacoEditor.style.width = "92vw";
}
}

const toggleExtensions = () => {
console.log("toggled")
if (Search.style.display === "none") {
Search.style.display = "flex";
Extensions.style.display = "none";
// Debug.style.display = "none";
// CodeBlocks.style.display = "none";
// Github.style.display = "none";
// Git.style.display = "none";
filepioneer.style.display = "none";
MonacoEditor.style.width = "72vw";
} else {
Search.style.display = "none"
Extensions.style.display = "none";
// Debug.style.display = "none";
// CodeBlocks.style.display = "none";
// Github.style.display = "none";
// Git.style.display = "none";
filepioneer.style.display = "none";
MonacoEditor.style.width = "92vw";
}
}
const toggleFilePioneer = () => {
console.log("toggled")
if (filepioneer.style.display === "none") {
filepioneer.style.display = "flex";
Extensions.style.display = "none";
// Debug.style.display = "none";
// CodeBlocks.style.display = "none";
// Github.style.display = "none";
// Git.style.display = "none";
Search.style.display = "none"
MonacoEditor.style.width = "72vw";
} else {
Extensions.style.display = "none";
// Debug.style.display = "none";
// CodeBlocks.style.display = "none";
// Github.style.display = "none";
// Git.style.display = "none";
Search.style.display = "none"
filepioneer.style.display = "none";
MonacoEditor.style.width = "92vw";
}
}


export default function SideBar() {
return (
<>
<div className="sidebar">
<div className="iconWrapper">
<div className="sidebaricons" onClick={toggleFilePioneer}><i className="fa-regular fa-file fa-xl"></i></div>
<div id="filepioneer" className="sidebaricons" aria-expanded="false" aria-selected="false"><i className="fa-regular fa-file fa-xl"></i></div>
<span className="sidebarIconBar"></span>
</div>
<div className="iconWrapper">
<div className="search sidebaricons" onClick={toggleSearch}><i className="fa-solid fa-magnifying-glass fa-xl"></i></div>
<div className="search sidebaricons" aria-expanded="false"><i className="fa-solid fa-magnifying-glass fa-xl"></i></div>
<span className="sidebarIconBar"></span>
</div>

<div className="iconWrapper">
<div className="terminal sidebaricons" onClick={toggleExtensions}><i className="fa-solid fa-terminal fa-xl"></i></div>
<div className="terminal sidebaricons" aria-expanded="false"><i className="fa-solid fa-terminal fa-xl"></i></div>
<span className="sidebarIconBar"></span>
</div>

<div className="iconWrapper">
<div className="debug sidebaricons"><i className="fa-solid fa-bug-slash fa-xl"></i></div>
<div className="debug sidebaricons" aria-expanded="false"><i className="fa-solid fa-bug-slash fa-xl"></i></div>
<span className="sidebarIconBar"></span>
</div>

<div className="iconWrapper">
<div className="git sidebaricons"><i className="fa-brands fa-git-alt fa-xl"></i></div>
<div className="git sidebaricons" aria-expanded="false"><i className="fa-brands fa-git-alt fa-xl"></i></div>
<span className="sidebarIconBar"></span>
</div>

<div className="iconWrapper">
<div className="github sidebaricons"><i className="fa-brands fa-github fa-xl"></i></div>
<div className="github sidebaricons" aria-expanded="false"><i className="fa-brands fa-github fa-xl"></i></div>
<span className="sidebarIconBar"></span>
</div>

<div className="iconWrapper">
<div className="extensions sidebaricons"><i className="fa-solid fa-puzzle-piece fa-xl"></i></div>
<div className="extensions sidebaricons" aria-expanded="false"><i className="fa-solid fa-puzzle-piece fa-xl"></i></div>
<span className="sidebarIconBar"></span>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion web-app/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ import react from '@vitejs/plugin-react-swc'
// https://vitejs.dev/config/
export default defineConfig({
plugins: [react()],
})
})