From 4d44f696ee0a34352d1c6afa9cbec42df0e6497d Mon Sep 17 00:00:00 2001
From: Bjarke Madsen <bjarke@nordu.net>
Date: Mon, 31 Jul 2023 16:40:27 +0200
Subject: [PATCH] use shared navbar component
---
compendium-frontend/src/App.tsx | 2 +-
.../components/global/ExternalPageNavBar.tsx | 51 -------------------
.../src/shared/ExternalPageNavBar.tsx | 5 --
3 files changed, 1 insertion(+), 57 deletions(-)
delete mode 100644 compendium-frontend/src/components/global/ExternalPageNavBar.tsx
diff --git a/compendium-frontend/src/App.tsx b/compendium-frontend/src/App.tsx
index 8c8fbe33..0102a5de 100644
--- a/compendium-frontend/src/App.tsx
+++ b/compendium-frontend/src/App.tsx
@@ -1,7 +1,7 @@
import React, { ReactElement, useState } from "react";
import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
import Landing from "./pages/Landing";
-import ExternalPageNavBar from "./components/global/ExternalPageNavBar";
+import ExternalPageNavBar from "./shared/ExternalPageNavBar";
import GeantFooter from "./components/global/GeantFooter";
import BudgetPage from "./pages/Budget";
import CompendiumData from "./pages/CompendiumData";
diff --git a/compendium-frontend/src/components/global/ExternalPageNavBar.tsx b/compendium-frontend/src/components/global/ExternalPageNavBar.tsx
deleted file mode 100644
index bb2ac21e..00000000
--- a/compendium-frontend/src/components/global/ExternalPageNavBar.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import React, { ReactElement } from "react";
-import { Col, Container, Row } from "react-bootstrap";
-import Login from "../../shared/Login";
-import GeantLogo from "../../images/geant_logo_f2020_new.svg";
-
-/**
- * NavBar
- *
- * This NavBar is only to be used when doing development, as the main site will run inside an iframe with
- * the correct menu around it
- */
-function ExternalPageNavBar(): ReactElement {
- return (
- <div className={'external-page-nav-bar'}>
-
- <Container>
- <Row>
- <Col xs={10}>
- <div className="nav-wrapper">
- <nav className="header-nav">
- <a href="https://geant.org/"><img src={GeantLogo} /></a>
-
- <ul>
- <li><a className="nav-link-entry" href="https://network.geant.org/">NETWORK</a></li>
- <li><a className="nav-link-entry" href="https://geant.org/services/">SERVICES</a></li>
- <li><a className="nav-link-entry" href="https://community.geant.org/">COMMUNITY</a></li>
- <li><a className="nav-link-entry" href="https://tnc23.geant.org/">TNC</a></li>
- <li><a className="nav-link-entry" href="https://geant.org/projects/">PROJECTS</a></li>
- <li><a className="nav-link-entry" href="https://connect.geant.org/">CONNECT</a></li>
- <li><a className="nav-link-entry" href="https://impact.geant.org/">IMPACT</a></li>
- <li><a className="nav-link-entry" href="https://careers.geant.org/">CAREERS</a></li>
- <li><a className="nav-link-entry" href="https://about.geant.org/">ABOUT</a></li>
- <li><a className="nav-link-entry" href="https://connect.geant.org/community-news">NEWS</a></li>
- <li><a className="nav-link-entry" href="https://resources.geant.org/">RESOURCES</a></li>
- </ul>
-
- </nav>
- </div>
-
- </Col>
-
- <Col align="right">
- <Login />
- </Col>
- </Row>
- </Container>
- </div >
- );
-}
-
-export default ExternalPageNavBar;
\ No newline at end of file
diff --git a/compendium-frontend/src/shared/ExternalPageNavBar.tsx b/compendium-frontend/src/shared/ExternalPageNavBar.tsx
index ce7c3edc..f1372aa3 100644
--- a/compendium-frontend/src/shared/ExternalPageNavBar.tsx
+++ b/compendium-frontend/src/shared/ExternalPageNavBar.tsx
@@ -1,6 +1,5 @@
import React, { ReactElement } from "react";
import { Col, Container, Row } from "react-bootstrap";
-import Login from "./Login";
import GeantLogo from "../images/geant_logo_f2020_new.svg";
@@ -33,10 +32,6 @@ function ExternalPageNavBar(): ReactElement {
</div>
</Col>
-
- <Col align="right">
- <Login />
- </Col>
</Row>
</Container>
</div >
--
GitLab