diff --git a/web/src/assets/auis_white.png b/web/src/assets/auis_white.png new file mode 100644 index 00000000..c22ead97 Binary files /dev/null and b/web/src/assets/auis_white.png differ diff --git a/web/src/assets/peacock-logo.png b/web/src/assets/peacock-logo.png new file mode 100644 index 00000000..3d2164f2 Binary files /dev/null and b/web/src/assets/peacock-logo.png differ diff --git a/web/src/components/Header.tsx b/web/src/components/Header.tsx index 35c19f55..0fc8dc08 100644 --- a/web/src/components/Header.tsx +++ b/web/src/components/Header.tsx @@ -1,9 +1,34 @@ +import peacockLogo from '../assets/peacock-logo.png'; +import whiteName from '../assets/auis_white.png'; + function Header() { - return ( -
-

Header

-
- ); + return ( +
+ {/* Images and logo */} + + + + + {/* Links */} + + {/* Login signup buttons */} +
+ + + + + + +
+
+ ); } export default Header; diff --git a/web/src/main.tsx b/web/src/main.tsx index ab44d193..cdaa71b7 100644 --- a/web/src/main.tsx +++ b/web/src/main.tsx @@ -10,7 +10,6 @@ import { RouterProvider } from "react-router-dom"; import App from "./App.tsx"; import "./index.css"; - import HomeScreen from "./screens/HomeScreen.tsx"; import TestScreen from "./screens/Test.tsx"; import ExecScreen from "./screens/ExecScreen.tsx"; @@ -18,6 +17,7 @@ import LoginScreen from "./screens/LoginScreen.tsx"; import SignUpScreen from "./screens/SignUpScreen.tsx"; import PhotosScreen from "./screens/PhotosScreen.tsx"; import PPVScreen from "./screens/PPVScreen.tsx"; +import CreditsScreen from './screens/CreditsScreen.tsx'; import { execs } from "./data/data.ts"; //Add any routes for screens below @@ -31,6 +31,7 @@ const router = createBrowserRouter( } /> } /> } /> + } /> ) );