Skip to content
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,010 changes: 0 additions & 1,010 deletions frontend/package-lock.json

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"bootstrap": "^5.3.2",
"mdbreact": "^5.2.0",
"react": "^18.2.0",
"react-bootstrap": "^2.9.1",
"react-bootstrap-icons": "^1.10.3",
Expand Down
8 changes: 5 additions & 3 deletions frontend/src/App.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { Route, Routes, Navigate } from "react-router-dom";
import { Route, Routes } from "react-router-dom";
import Home from "./pages/Home.js";
import ArticleList from "./pages/ArticleList.js";
import ArticleView from "./pages/ArticleView.js";


import ArticleExample from "./pages/ArticleExample.js";

function App() {
return (
Expand All @@ -18,6 +17,9 @@ function App() {
<Route index element={<ArticleView />} />
<Route path=":name" element={<ArticleView />} />
</Route>

{/*Temporary route to display article components until we construct the full article page */}
<Route index path="/article_example" element={<ArticleExample />} />
<Route
path="*"
element={<h1 className="text-center">404 - Page Not Found</h1>}
Expand Down
14 changes: 14 additions & 0 deletions frontend/src/Components/Article/SectionHeader.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { Col, Container, Row } from "react-bootstrap";

export default function SectionHeader({ header }) {
return (
<Container>
<Row>
<Col md={12} className="d-flex align-items-center gap-4">
<div className="section-header-marker h-100"></div>
<h2 className="d-inline">{header}</h2>
</Col>
</Row>
</Container>
);
}
2 changes: 1 addition & 1 deletion frontend/src/Components/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default function Header() {
<>
<Stack gap={3}>
<div>
<Navbar expand="lg" fixed="top" bg="primary">
<Navbar expand="lg" fixed="top" className="sticky-top" bg="primary">
<Stack direction="horizontal" gap={2}>
<Nav.Link href="/">
<Image className="p-1" src={logo} roundedCircle width={65} />
Expand Down
Loading