From b0456b4f478d7667cc885de2c82ddfc2d63aa3f9 Mon Sep 17 00:00:00 2001 From: Dhrubajyoti Biswas Date: Sun, 17 Dec 2023 13:25:39 +0530 Subject: [PATCH] Updated MenuBar and SideBar --- web-app/index.html | 1 - web-app/package-lock.json | 12 +-- web-app/src/App.css | 15 +-- web-app/src/App.jsx | 3 +- web-app/src/components/MenuBar/MenuBar.jsx | 23 ++++- .../SideBar/Main Components/Debug/Debug.jsx | 2 +- .../filePioneer/filePioneer.jsx | 2 +- web-app/src/components/SideBar/SideBar.jsx | 96 ++----------------- web-app/vite.config.js | 2 +- 9 files changed, 47 insertions(+), 109 deletions(-) diff --git a/web-app/index.html b/web-app/index.html index fc2d65b..0803852 100644 --- a/web-app/index.html +++ b/web-app/index.html @@ -23,5 +23,4 @@ - \ No newline at end of file diff --git a/web-app/package-lock.json b/web-app/package-lock.json index 63a73bd..2640917 100644 --- a/web-app/package-lock.json +++ b/web-app/package-lock.json @@ -2866,9 +2866,9 @@ } }, "node_modules/postcss": { - "version": "8.4.31", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", - "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", + "version": "8.4.24", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz", + "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==", "dev": true, "funding": [ { @@ -3165,9 +3165,9 @@ } }, "node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "bin": { "semver": "bin/semver.js" } diff --git a/web-app/src/App.css b/web-app/src/App.css index e3dc46c..ba1dcc7 100644 --- a/web-app/src/App.css +++ b/web-app/src/App.css @@ -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; } @@ -267,7 +267,6 @@ li{ } .sidebarscontent{ - display: none; width: 20vw; height: 90vh; background-color: var(--main-bg-color); @@ -279,9 +278,11 @@ li{ #searcharea{ display: none; } -#filepioneer{ + +#filepioneerarea{ display: none; } + #extensions{ display: none; } \ No newline at end of file diff --git a/web-app/src/App.jsx b/web-app/src/App.jsx index 37ddf2f..fefa5f5 100644 --- a/web-app/src/App.jsx +++ b/web-app/src/App.jsx @@ -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() { diff --git a/web-app/src/components/MenuBar/MenuBar.jsx b/web-app/src/components/MenuBar/MenuBar.jsx index 0740376..c1b2958 100644 --- a/web-app/src/components/MenuBar/MenuBar.jsx +++ b/web-app/src/components/MenuBar/MenuBar.jsx @@ -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 ( @@ -101,7 +101,24 @@ function MenuBar(props) {
{props.go}
-
  • New File
    • +
  • Switch Editor
    • +
  • Switch Group
    • +
    +
  • Go to File
    • +
  • Go to Symbol in Workspace
    • +
    +
  • Go to Symbol in Editor
    • +
  • Go to Definition
    • +
  • Go to Declaration
    • +
  • Go to Type Definition
    • +
  • Go to Implementations
    • +
  • Go to References
    • +
    +
  • Go to Line/Column
    • +
  • Go to Bracket
    • +
    +
  • Next Problem
    • +
  • Previous Problem
    • diff --git a/web-app/src/components/SideBar/Main Components/Debug/Debug.jsx b/web-app/src/components/SideBar/Main Components/Debug/Debug.jsx index d125b59..6bd5ae9 100644 --- a/web-app/src/components/SideBar/Main Components/Debug/Debug.jsx +++ b/web-app/src/components/SideBar/Main Components/Debug/Debug.jsx @@ -3,7 +3,7 @@ import React from 'react' const Debug = () => { return (
    -
    File Pioneer
    +
    Debug
    ) } diff --git a/web-app/src/components/SideBar/Main Components/filePioneer/filePioneer.jsx b/web-app/src/components/SideBar/Main Components/filePioneer/filePioneer.jsx index 776e367..6a64f30 100644 --- a/web-app/src/components/SideBar/Main Components/filePioneer/filePioneer.jsx +++ b/web-app/src/components/SideBar/Main Components/filePioneer/filePioneer.jsx @@ -2,7 +2,7 @@ import React from 'react' function FilePioneer() { return ( -
    +
    File Pioneer
    ) diff --git a/web-app/src/components/SideBar/SideBar.jsx b/web-app/src/components/SideBar/SideBar.jsx index 809fec7..a5c241b 100644 --- a/web-app/src/components/SideBar/SideBar.jsx +++ b/web-app/src/components/SideBar/SideBar.jsx @@ -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 ( <>
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    diff --git a/web-app/vite.config.js b/web-app/vite.config.js index 861b04b..943a816 100644 --- a/web-app/vite.config.js +++ b/web-app/vite.config.js @@ -4,4 +4,4 @@ import react from '@vitejs/plugin-react-swc' // https://vitejs.dev/config/ export default defineConfig({ plugins: [react()], -}) +}) \ No newline at end of file