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

Updated Menu Bar and Welcome Page UI and UX #36

Merged
merged 1 commit into from
Jan 6, 2024
Merged

Updated Menu Bar and Welcome Page UI and UX #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion web-app/src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@ body {
}

nav {
display: flex;
width: auto;
height: 4vh;
display: flex;
flex-direction: row;
background: var(--main-bg-color);
align-items: center;
justify-content: space-between;
padding: 12px;
border-radius: 12px;
margin: 5px;
Expand Down Expand Up @@ -60,6 +62,16 @@ li {
padding: 0 19px;
}

#sidebarControls{
display: flex;
align-items: center;
}

#sidebarSettings{
display: flex;
align-items: center;
}

.dropdown-trigger-btn {
display: inline-flex;
border-radius: 3px;
Expand Down Expand Up @@ -307,6 +319,7 @@ li {
}

.welcomePage {
width: 92vw;
padding: 2vw;
background-color: var(--welcome-page);
}
Expand Down
60 changes: 4 additions & 56 deletions web-app/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState } from "react";
import React, { useState } from 'react';
import "./App.css";
import MenuBar from "./components/MenuBar/MenuBar.jsx";
import MonacoEditor from "./components/Editor/MonacoEditor.jsx";
Expand All @@ -15,8 +15,9 @@ import Debug from "./components/SideBar/Main Components/Debug/Debug.jsx";
import CodeBlocks from "./components/SideBar/Main Components/Code Blocks/CodeBlocks.jsx";
import Git from "./components/SideBar/Main Components/Git/Git.jsx";
import DefaultPage from "./components/DefaultPage/DefaultPage.jsx";
import WelcomePage from "./components/WelcomePage/WelcomePage.jsx"

function App(props) {
function App() {
let [ariaExpandedisplayfilepioneer, changeariaExpandedisplayfilepioneer] = useState('none');
let [ariaExpandedisplaysearch, changeariaExpandedisplaysearch] = useState('none');
let [ariaExpandedisplaycodeblocks, changeariaExpandedisplaycodeblocks] = useState('none');
Expand Down Expand Up @@ -287,61 +288,8 @@ function App(props) {
<div className="maincodearea">
<DefaultPage DefaultPageDisplay={DefaultPageDisplay} dimensionsDefaultPage={insidemaincodeareaStyle} />
<Tabs tabDisplay={TabDisplay} toggleWelcomePagedisplay={toggleWelcomePageDisplay} />
<WelcomePage DimensionsWelcomePage={insidemaincodeareaStyle} WelcomePageDisplay={WelcomePageDisplay} />
<MonacoEditor style={insidemaincodeareaStyle} />
<div className={`welcomePage d-${WelcomePageDisplay}`} style={insidemaincodeareaStyle}>
<div className="welcomePageSection">
<h1>Welcome back to Tilder!</h1>
<p>Code like a pro!</p>
</div>
<div className="welcomePageSection">
<h2>Quick Links</h2>
<div id="importantLinks">
<a href="https://github.com" className="linkto" target="_blank">
<div className="link">
<div className="link-icon">
<i className="fa-brands fa-github fa-2xl"></i>
</div>
<div className="link-content">
<h4>Github</h4>
<p>Host your code!</p>
</div>
</div>
</a>
<a href="https://www.youtube.com" className="linkto" target="_blank">
<div className="link">
<div className="link-icon">
<i className="fa-brands fa-youtube fa-2xl"></i>
</div>
<div className="link-content">
<h4>Youtube</h4>
<p>Watch Videos!</p>
</div>
</div>
</a>
<a href="" className="linkto" target="_blank">
<div className="link">
<div className="link-icon">
</div>
<div className="link-content">
<h4>DSoft</h4>
<p>Explore our other products.</p>
</div>
</div>
</a>
<a href="https://stackoverflow.com" className="linkto" target="_blank">
<div className="link">
<div className="link-icon">
<i className="fa-brands fa-stack-overflow fa-2xl"></i>
</div>
<div className="link-content">
<h4>Stack Overflow</h4>
<p>Fix your problem!</p>
</div>
</div>
</a>
</div>
</div>
</div>
</div>
</div>
<div className="SideBarmainwrper">
Expand Down
Loading