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
Binary file added client/public/assets/developers/Chloe Wu.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/assets/developers/David Sadka.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/assets/developers/Peter Yu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/assets/developers/Tanav Prabhu.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/assets/logos/HudsonRiverTrading.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/assets/logos/MiniMax.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 16 additions & 10 deletions client/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,26 @@ import Account from "./pages/account";
import Unknown from "./pages/unknown";
import LoginError from "./pages/loginError";
import Navbar from "./components/Navbar";
import Footer from "./components/Footer";

const App = () => {
return (
<Router>
<Navbar/>
<Routes>
<Route path="/" element={<PrivateRoute Component={Home} unknownBlocked={true}/>} />
<Route path="/about" element={<PrivateRoute Component={About} unknownBlocked={true}/>} />
<Route path="/account" element={<PrivateRoute Component={Account} unknownBlocked={true}/>} />
<Route path="/login" element={<Login />} />
<Route path="/login-error" element={<UnprivateRoute Component={LoginError} />} />
<Route path="/unknown" element={<PrivateRoute Component={Unknown} knownBlocked={true}/>} />
<Route path="/*" element={<PrivateRoute Component={Home} unknownBlocked={true}/>} />
</Routes>
<div className="flex flex-col min-h-screen">
<Navbar/>
<main className="flex-grow">
<Routes>
<Route path="/" element={<PrivateRoute Component={Home} unknownBlocked={true}/>} />
<Route path="/about" element={<PrivateRoute Component={About} unknownBlocked={true}/>} />
<Route path="/account" element={<PrivateRoute Component={Account} unknownBlocked={true}/>} />
<Route path="/login" element={<Login />} />
<Route path="/login-error" element={<UnprivateRoute Component={LoginError} />} />
<Route path="/unknown" element={<PrivateRoute Component={Unknown} knownBlocked={true}/>} />
<Route path="/*" element={<PrivateRoute Component={Home} unknownBlocked={true}/>} />
</Routes>
</main>
<Footer />
</div>
</Router>
);
};
Expand Down
18 changes: 18 additions & 0 deletions client/src/components/Footer.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
const Footer = () => {
return (
<footer className="bg-white border-t border-gray-200 py-6 mt-auto">
<div className="max-w-7xl mx-auto px-6 flex flex-col items-center justify-center">
<div className="flex items-center justify-center gap-4 mb-4">
<a href="https://www.hudsonrivertrading.com/" target="_blank" rel="noopener noreferrer">
<img src="/assets/logos/HudsonRiverTrading.png" alt="Hudson River Trading" width={40} height={40} className="hover:opacity-80 transition-opacity"/>
</a>
<a href="https://www.minimax.com/" target="_blank" rel="noopener noreferrer">
<img src="/assets/logos/MiniMax.png" alt="MiniMax" width={40} height={40} className="hover:opacity-80 transition-opacity"/>
</a>
</div>
</div>
</footer>
);
};

export default Footer;
30 changes: 30 additions & 0 deletions client/src/pages/about.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ const About = () => {
<a href="https://github.com/YaleComputerSociety/ylabs" target="_blank" rel="noopener noreferrer">
<img src="/assets/icons/github-icon.png" alt="RDB Github" width={40} height={40} className="inline-block mx-2"/>
</a>
<a href="https://www.hudsonrivertrading.com/" target="_blank" rel="noopener noreferrer">
<img src="/assets/logos/HudsonRiverTrading.png" alt="Hudson River Trading" width={40} height={40} className="inline-block mx-2"/>
</a>
<a href="https://www.minimax.com/" target="_blank" rel="noopener noreferrer">
<img src="/assets/logos/MiniMax.png" alt="MiniMax" width={40} height={40} className="inline-block mx-2"/>
</a>
</div>
<div className="max-w-6xl text-center mt-16">
<h2 className="text-3xl font-bold mb-10">Meet our team</h2>
Expand Down Expand Up @@ -133,6 +139,30 @@ const currentDevelopers = [
image: "/assets/developers/ChristinaXu.jpeg",
location: "Lincoln, Nebraska",
github: "https://github.com/shadaxiong",
},
{
name: "Chloe Wu",
position: "Developer",
image: "/assets/developers/Chloe Wu.JPG",
location: "",
},
{
name: "David Sadka",
position: "Developer",
image: "/assets/developers/David Sadka.png",
location: "",
},
{
name: "Peter Yu",
position: "Developer",
image: "/assets/developers/Peter Yu.png",
location: "",
},
{
name: "Tanav Prabhu",
position: "Developer",
image: "/assets/developers/Tanav Prabhu.jpg",
location: "",
}
]

Expand Down