Skip to content

Commit 4cdfda0

Browse files
authored
Change navbar links in MCC (#324)
# Purpose To change the navbar links in the MCC to be consistent with the ARO. Notion task: https://www.notion.so/uworbital/Change-the-Navbar-links-in-MCC-1908a26d767780af950cde20585f8ae0 ![image.png](https://github.com/user-attachments/assets/b82478a7-2f87-4f9f-8c33-03fd4aad52ee) # New Changes - Changed navbar links in the MCC to use react-router - Changed the navbar design to make it match the ARO (added the UW Orbital logo on the left and made the navbar background black) # Testing - Tested it locally # Outstanding Changes - Generalize the navbar into a separate directory
1 parent 40e1365 commit 4cdfda0

File tree

4 files changed

+57
-47
lines changed

4 files changed

+57
-47
lines changed

gs/frontend/aro/src/common/navbar.tsx

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,19 @@ import profile from "../assets/profile.png";
44

55
function Navbar() {
66
return (
7-
<div>
8-
<div className="nav">
9-
<Link to="/">
10-
<img src={logo} alt="orbital logo"></img>
7+
<div className="nav">
8+
<Link to="/">
9+
<img src={logo} alt="orbital logo"></img>
10+
</Link>
11+
<div className="navmenu">
12+
<Link to="/">Home</Link>
13+
<Link to="/new-request">New</Link>
14+
<Link to="/requests">Requests</Link>
15+
<Link to="/profile">
16+
<div className="profile">
17+
<img src={profile} alt="profile"></img>
18+
</div>
1119
</Link>
12-
<div className="navmenu">
13-
<Link to="/">Home</Link>
14-
<Link to="/new-request">New</Link>
15-
<Link to="/requests">Requests</Link>
16-
<Link to="/profile">
17-
<div className="profile">
18-
<img src={profile} alt="profile"></img>
19-
</div>
20-
</Link>
21-
</div>
2220
</div>
2321
</div>
2422
);
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
.nav img {
2+
height: 75px;
3+
margin: 0;
4+
}
5+
6+
.nav {
7+
background: black;
8+
display: flex;
9+
justify-content: space-between;
10+
align-items: center;
11+
padding: 0.5rem 0 0 0;
12+
width: 100%;
13+
overflow: hidden;
14+
}
15+
16+
.navmenu {
17+
display: flex;
18+
align-items: center;
19+
}
20+
21+
.navmenu a {
22+
display: block;
23+
color: #f2f2f2;
24+
text-align: center;
25+
padding: 0 16px;
26+
text-decoration: none;
27+
font-size: 18px;
28+
}
29+
30+
.navmenu a:hover {
31+
color: rgb(67, 146, 196);
32+
}

gs/frontend/mcc/src/common/header.tsx

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,20 @@
1-
import Nav from "react-bootstrap/Nav";
21
import { Link } from "react-router-dom";
2+
import logo from "../assets/logo.png";
3+
import "./header.css";
34

45
function Header() {
56
return (
6-
<Nav className="header">
7-
<Nav.Item className="item">
8-
<Nav.Link eventKey="link-1">
9-
<Link to="/">Dashboard</Link>
10-
</Nav.Link>
11-
</Nav.Item>
12-
<Nav.Item className="item">
13-
<Nav.Link eventKey="link-2">
14-
<Link to="/mission-commands">Mission Commands</Link>
15-
</Nav.Link>
16-
</Nav.Item>
17-
<Nav.Item className="item">
18-
<Nav.Link eventKey="link-3">
19-
<Link to="/telemetry-data">Telemetry Data</Link>
20-
</Nav.Link>
21-
</Nav.Item>
22-
<Nav.Item className="item">
23-
<Nav.Link eventKey="link-4">
24-
<Link to="/aro-requests">ARO Requests</Link>
25-
</Nav.Link>
26-
</Nav.Item>
27-
</Nav>
7+
<div className="nav">
8+
<Link to="/">
9+
<img src={logo} alt="orbital logo"></img>
10+
</Link>
11+
<div className="navmenu">
12+
<Link to="/">Dashboard</Link>
13+
<Link to="/mission-commands">Mission Commands</Link>
14+
<Link to="/telemetry-data">Telemetry Data</Link>
15+
<Link to="/aro-requests">ARO Requests</Link>
16+
</div>
17+
</div>
2818
);
2919
}
3020

gs/frontend/mcc/src/index.css

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,6 @@ code {
2525
monospace;
2626
}
2727

28-
.header {
29-
background-image: url("./assets/banner.png");
30-
border-bottom: 1px solid darkblue;
31-
}
32-
33-
.header a {
34-
text-decoration: none;
35-
color: white;
36-
}
37-
3828
.layout {
3929
display: flex;
4030
flex-direction: column;

0 commit comments

Comments
 (0)