...

1 files changed, 15 insertions, 3 deletions

diff --git a/FrontEnd/src/app/views/admin/Admin.tsx b/FrontEnd/src/app/views/admin/Admin.tsx
index e17da5bc..ac640700 100644
--- a/FrontEnd/src/app/views/admin/Admin.tsx
+++ b/FrontEnd/src/app/views/admin/Admin.tsx
@@ -1,9 +1,12 @@
 import React, { Fragment } from "react";
 import { Redirect, Route, Switch, useRouteMatch, match } from "react-router";
+import { Container } from "react-bootstrap";
 
 import { AuthUser } from "@/services/user";
 
+import AdminNav from "./AdminNav";
 import UserAdmin from "./UserAdmin";
+import HighlightTimelineAdmin from "./HighlightTimelineAdmin";
 
 interface AdminProps {
   user: AuthUser;
@@ -20,9 +23,18 @@ const Admin: React.FC<AdminProps> = ({ user }) => {
           {(p) => {
             const match = p.match as match<{ name: string }>;
             const name = match.params["name"];
-            if (name === "users") {
-              return <UserAdmin user={user} />;
-            }
+            return (
+              <Container>
+                <AdminNav />
+                {(() => {
+                  if (name === "users") {
+                    return <UserAdmin user={user} />;
+                  } else if (name === "highlighttimelines") {
+                    return <HighlightTimelineAdmin user={user} />;
+                  }
+                })()}
+              </Container>
+            );
           }}
         </Route>
       </Switch>