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
2 changes: 1 addition & 1 deletion frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<link rel="icon" type="image/png" href="/Designer.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>frontend</title>
</head>
Expand Down
Binary file added frontend/public/Designer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
77 changes: 63 additions & 14 deletions frontend/src/App.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
/* ---------------- Global Reset ---------------- */

:root {
--primary: #C60E30;
--primary-dark: #9e0b26;
--surface-page: #dcdcdc;
--surface-main: #e6e6e6;
--surface-panel: #e0e0e0;
--surface-card: #f2f2f2;
--text-main: #111;
--nav-hover: #c7c7c7;
}

* {
box-sizing: border-box; /* include padding/border in width */
}
Expand All @@ -21,11 +33,11 @@ body {
}

.logo:hover {
filter: drop-shadow(0 0 2em #646cffaa);
filter: drop-shadow(0 0 2em #c60e30aa);
}

.logo.react:hover {
filter: drop-shadow(0 0 2em #61dafbaa);
filter: drop-shadow(0 0 2em #9e0b26aa);
}

@keyframes logo-spin {
Expand All @@ -39,25 +51,39 @@ body {
}
}

.logo-container {
margin-top: 20px;
}

.logo-container img {
height: 220px;
display: block;
margin-left: -20px; /* tweak this */
}

/* ---------------- Layout ---------------- */
.layout {
display: flex;
min-height: 100vh;
width: 100vw; /* ensures layout spans full viewport */
background-color: var(--surface-page);
}

.sidebar {
width: 220px;
padding: 20px;
background-color: #f4f4f4;
background-color: var(--surface-panel);
border-right: 1px solid #ddd;
color: var(--text-main);
}

.main {
flex: 1; /* already there */
padding: 12px 12px 0 12px; /* tighter top/bottom padding */
display: flex; /* allow cards to grow */
flex-direction: column;
background-color: var(--surface-main);
color: var(--text-main);
}

/* ---------------- Cards ---------------- */
Expand All @@ -67,7 +93,7 @@ body {
max-width: none;
margin: 0 0 12px 0;
padding: 1.5rem;
background-color: #fff;
background-color: var(--surface-card);
border-radius: 12px;
box-shadow: 0 6px 20px rgba(0,0,0,0.08);
text-align: center;
Expand All @@ -76,6 +102,15 @@ body {
gap: 1rem;
}

.sidebar h3,
.sidebar h4,
.sidebar h5,
.main h1,
.results-card h3,
.course-text {
color: var(--text-main);
}

.search-card {
flex: 0; /* stop stretching */
padding: 1rem; /* reduce vertical size */
Expand Down Expand Up @@ -126,8 +161,8 @@ body {
.card input:focus,
.card select:focus {
outline: none;
border-color: #4a90e2;
box-shadow: 0 0 6px rgba(74, 144, 226, 0.3);
border-color: var(--primary);
box-shadow: 0 0 6px rgba(198, 14, 48, 0.3);
}

.card select {
Expand All @@ -148,15 +183,15 @@ body {
padding: 12px 0;
border-radius: 8px;
border: none;
background-color: #4a90e2;
background-color: var(--primary);
color: white;
font-size: 16px;
cursor: pointer;
transition: background-color 0.2s;
}

.card button:hover {
background-color: #357ab7;
background-color: var(--primary-dark);
}

/* ---------------- Lists ---------------- */
Expand Down Expand Up @@ -212,12 +247,12 @@ body {
/* Hover effect */
.top-bar .nav-link:hover {
text-decoration: underline;
color: #ffcc00; /* optional highlight color */
color: var(--nav-hover);
}

/* Optional: highlight the active page */
.top-bar .nav-link.active {
border-bottom: 2px solid #ffcc00;
border-bottom: 2px solid var(--primary-dark);
}

/* Top bar container */
Expand All @@ -238,12 +273,12 @@ body {

/* Highlight active link */
.nav-link.active {
border-bottom: 2px solid #ffcc00;
border-bottom: 2px solid var(--primary-dark);
}

/* Hover effect */
.nav-link:hover {
color: #ffcc00;
color: var(--nav-hover);
text-decoration: underline;
}

Expand All @@ -267,15 +302,29 @@ body {
}

.day-btn.selected {
background: #007bff;
background: var(--primary);
color: white;
border-color: #007bff;
border-color: var(--primary);
}

.fc-day-today {
background-color: transparent !important;
}

/* FullCalendar red theme overrides */
.Schedule .fc {
--fc-event-bg-color: var(--primary);
--fc-event-border-color: var(--primary);
--fc-event-text-color: #fff;
--fc-button-bg-color: var(--primary);
--fc-button-border-color: var(--primary);
--fc-button-hover-bg-color: var(--primary-dark);
--fc-button-hover-border-color: var(--primary-dark);
--fc-button-active-bg-color: var(--primary-dark);
--fc-button-active-border-color: var(--primary-dark);
--fc-today-bg-color: rgba(198, 14, 48, 0.08);
}

.results-card ul {
list-style: none;
padding: 0;
Expand Down
11 changes: 8 additions & 3 deletions frontend/src/SearchPage.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Toaster, toast } from "react-hot-toast";
import { useEffect, useState, useRef } from 'react';
import pandaLogo from './assets/Designer.png';


interface CourseTime {
Expand Down Expand Up @@ -380,6 +381,10 @@ export default function SearchPage() {
Clear All Filters
</button>

<div className="logo-container">
<img src={pandaLogo} alt="Red Panda Logo" />
</div>

</div>

{/* MAIN CONTENT */}
Expand Down Expand Up @@ -456,7 +461,7 @@ export default function SearchPage() {
style={{
border: 'none',
background: 'none',
color: currentPage === 1 ? '#0a58ca' : 'inherit',
color: currentPage === 1 ? '#c60e30' : 'inherit',
textDecoration: 'underline',
cursor: 'pointer',
fontWeight: currentPage === 1 ? 700 : 400,
Expand All @@ -477,7 +482,7 @@ export default function SearchPage() {
style={{
border: 'none',
background: 'none',
color: page === currentPage ? '#0a58ca' : 'inherit',
color: page === currentPage ? '#c60e30' : 'inherit',
textDecoration: 'underline',
cursor: 'pointer',
fontWeight: page === currentPage ? 700 : 400,
Expand All @@ -497,7 +502,7 @@ export default function SearchPage() {
style={{
border: 'none',
background: 'none',
color: currentPage === totalPages ? '#0a58ca' : 'inherit',
color: currentPage === totalPages ? '#c60e30' : 'inherit',
textDecoration: 'underline',
cursor: 'pointer',
fontWeight: currentPage === totalPages ? 700 : 400,
Expand Down
Binary file added frontend/src/assets/Designer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions frontend/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@

a {
font-weight: 500;
color: #646cff;
color: #c60e30;
text-decoration: inherit;
}
a:hover {
color: #535bf2;
color: #9e0b26;
}

body {
Expand Down Expand Up @@ -47,7 +47,7 @@ button {
transition: border-color 0.25s;
}
button:hover {
border-color: #646cff;
border-color: #9e0b26;
}
button:focus,
button:focus-visible {
Expand All @@ -60,7 +60,7 @@ button:focus-visible {
background-color: #ffffff;
}
a:hover {
color: #747bff;
color: #9e0b26;
}
button {
background-color: #f9f9f9;
Expand Down
Loading