From 2e77d56b2e043dcf0bf61350cb89ed50b3628bee Mon Sep 17 00:00:00 2001 From: Jane Kamata Date: Fri, 20 Feb 2026 22:54:48 -0500 Subject: [PATCH 1/9] Removing unused css files and updating all buttons to button component; added favicon --- frontend/index.html | 1 + frontend/public/favicon.ico | Bin 0 -> 15086 bytes frontend/src/Login.tsx | 11 +-- frontend/src/custom/RingButton.tsx | 49 ------------ frontend/src/main-page/MainPage.tsx | 2 +- .../main-page/dashboard/CsvExportButton.tsx | 48 +++++++----- .../src/main-page/dashboard/Dashboard.tsx | 4 +- .../src/main-page/dashboard/DateFilter.tsx | 27 +++---- .../main-page/grants/grant-view/GrantView.tsx | 2 +- .../main-page/grants/new-grant/POCEntry.tsx | 43 ----------- .../grants/styles/CostBenefitAnalysis.css | 27 ------- .../grants/styles/GrantAttributes.css | 31 -------- .../main-page/grants/styles/GrantDetails.css | 38 --------- .../src/main-page/grants/styles/GrantItem.css | 73 ------------------ .../main-page/grants/styles/GrantLabels.css | 10 --- .../src/main-page/grants/styles/GrantList.css | 9 --- .../src/main-page/grants/styles/GrantPage.css | 43 ----------- .../main-page/settings/components/Button.tsx | 8 +- frontend/src/sign-up/SignUpButton.tsx | 17 ++-- frontend/src/styles/button.css | 13 ---- 20 files changed, 66 insertions(+), 390 deletions(-) create mode 100644 frontend/public/favicon.ico delete mode 100644 frontend/src/custom/RingButton.tsx delete mode 100644 frontend/src/main-page/grants/new-grant/POCEntry.tsx delete mode 100644 frontend/src/main-page/grants/styles/CostBenefitAnalysis.css delete mode 100644 frontend/src/main-page/grants/styles/GrantAttributes.css delete mode 100644 frontend/src/main-page/grants/styles/GrantDetails.css delete mode 100644 frontend/src/main-page/grants/styles/GrantItem.css delete mode 100644 frontend/src/main-page/grants/styles/GrantLabels.css delete mode 100644 frontend/src/main-page/grants/styles/GrantList.css delete mode 100644 frontend/src/main-page/grants/styles/GrantPage.css delete mode 100644 frontend/src/styles/button.css diff --git a/frontend/index.html b/frontend/index.html index b3c29836..7ce682c6 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -9,6 +9,7 @@ +
diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..7b1ef7826190d11e66fb1a70b3d8d055fd07a5d4 GIT binary patch literal 15086 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 Lq#Ux)f$skS+0i@R literal 0 HcmV?d00001 diff --git a/frontend/src/Login.tsx b/frontend/src/Login.tsx index 931085fb..c4205dd3 100644 --- a/frontend/src/Login.tsx +++ b/frontend/src/Login.tsx @@ -4,6 +4,7 @@ import { observer } from "mobx-react-lite"; import logo from "./images/logo.svg"; import { useNavigate } from "react-router-dom"; import "./external/bcanSatchel/mutators"; +import Button from "./main-page/settings/components/Button"; /** * Registered users can log in here @@ -83,12 +84,12 @@ const Login = observer(() => {
{" "}
)} - + onClick={() => {}} + className="w-full block grow bg-primary-900 text-white mt-8 text-base placeholder:text-gray-500" + />
or
diff --git a/frontend/src/custom/RingButton.tsx b/frontend/src/custom/RingButton.tsx deleted file mode 100644 index c2ec18c8..00000000 --- a/frontend/src/custom/RingButton.tsx +++ /dev/null @@ -1,49 +0,0 @@ -import "../styles/button.css"; - -/* Maintained with button.css */ -export enum ButtonColorOption { - GREEN = "var(--color-green)", - GRAY = "var(--color-grey-400)", - BLUE = "var(--color-blue-light)", -} - -/* API for components to setup a button with expected system colors */ -interface RingButtonProps { - /* The text to display for the button */ - text: string; - - /* The color of the button */ - color: ButtonColorOption; -} - -/* Generic Button Component With: - * Text - * Color - */ -export default function RingButton({ text, color }: RingButtonProps) { - return ( - <> - {ButtonColorOption.GREEN === color && ( -
- {text} -
- )} - {ButtonColorOption.BLUE === color && ( -
- {text} -
- )} - {ButtonColorOption.GRAY === color && ( -
- {text} -
- )} - - ); -} diff --git a/frontend/src/main-page/MainPage.tsx b/frontend/src/main-page/MainPage.tsx index 5074dfc9..8a9619ad 100644 --- a/frontend/src/main-page/MainPage.tsx +++ b/frontend/src/main-page/MainPage.tsx @@ -14,7 +14,7 @@ function MainPage() {
-
+
} /> diff --git a/frontend/src/main-page/dashboard/CsvExportButton.tsx b/frontend/src/main-page/dashboard/CsvExportButton.tsx index 8970ec5d..d924e42d 100644 --- a/frontend/src/main-page/dashboard/CsvExportButton.tsx +++ b/frontend/src/main-page/dashboard/CsvExportButton.tsx @@ -4,9 +4,10 @@ import { Grant } from "../../../../middle-layer/types/Grant"; import { ProcessGrantData } from "../../main-page/grants/filter-bar/processGrantData"; import { observer } from "mobx-react-lite"; import { getAppStore } from "../../external/bcanSatchel/store"; -import { BiExport } from "react-icons/bi"; +import { faDownload } from "@fortawesome/free-solid-svg-icons"; import Attachment from "../../../../middle-layer/types/Attachment"; import POC from "../../../../middle-layer/types/POC"; +import Button from "../settings/components/Button"; // Define the columns for the CSV export, including any necessary formatting. const columns: CsvColumn[] = [ { key: "grantId", title: "Grant ID" }, @@ -14,7 +15,8 @@ const columns: CsvColumn[] = [ { key: "does_bcan_qualify", title: "BCAN Qualifies?", - formatValue: (value: boolean) => (value !== null ? (value ? "Yes" : "No") : ""), + formatValue: (value: boolean) => + value !== null ? (value ? "Yes" : "No") : "", }, { key: "status", title: "Status" }, { @@ -25,18 +27,19 @@ const columns: CsvColumn[] = [ { key: "grant_start_date", title: "Grant Start Date", - formatValue: (value: string) => (value ? new Date(value).toLocaleDateString() : ""), + formatValue: (value: string) => + value ? new Date(value).toLocaleDateString() : "", }, { key: "application_deadline", title: "Application Deadline", - formatValue: (value: string) => (value ? new Date(value).toLocaleDateString() : ""), + formatValue: (value: string) => + value ? new Date(value).toLocaleDateString() : "", }, { key: "report_deadlines", title: "Report Deadlines", - formatValue: (value?: string[]) => - value?.length ? value.join(", ") : "", + formatValue: (value?: string[]) => (value?.length ? value.join(", ") : ""), }, { key: "description", @@ -59,20 +62,27 @@ const columns: CsvColumn[] = [ { key: "bcan_poc", title: "BCAN POC", - formatValue: (value: POC) => - value && value.POC_name && value.POC_email ? - `${value.POC_name}${value.POC_email ? ` (${value.POC_email})` : ""}` : "", + formatValue: (value: POC) => + value && value.POC_name && value.POC_email + ? `${value.POC_name}${value.POC_email ? ` (${value.POC_email})` : ""}` + : "", }, { key: "attachments", title: "Attachments", formatValue: (attachments: Attachment[]) => - attachments?.length ? attachments.map((a) => a.url).filter((u) => u).join(" | ") : "", + attachments?.length + ? attachments + .map((a) => a.url) + .filter((u) => u) + .join(" | ") + : "", }, { key: "isRestricted", title: "Restricted?", - formatValue: (value: boolean) => (value !== null ? (value ? "Yes" : "No") : ""), + formatValue: (value: boolean) => + value !== null ? (value ? "Yes" : "No") : "", }, ]; @@ -100,22 +110,20 @@ const CsvExportButton: React.FC = observer(() => { columns, `BCAN Data ${(yearFilter ?? []).join("_")} as of ${ new Date().toISOString().split("T")[0] - }` + }`, ); setIsProcessing(false); }; return ( - + logo={faDownload} + logoPosition="right" + className="text-xs lg:text-sm bg-white border-grey-500 flex justify-between items-center" + /> ); }); diff --git a/frontend/src/main-page/dashboard/Dashboard.tsx b/frontend/src/main-page/dashboard/Dashboard.tsx index b744008c..dc490c83 100644 --- a/frontend/src/main-page/dashboard/Dashboard.tsx +++ b/frontend/src/main-page/dashboard/Dashboard.tsx @@ -47,10 +47,12 @@ const Dashboard = observer(() => { return (
-
+
Dashboard
+
+
diff --git a/frontend/src/main-page/dashboard/DateFilter.tsx b/frontend/src/main-page/dashboard/DateFilter.tsx index 34e22074..faf7b814 100644 --- a/frontend/src/main-page/dashboard/DateFilter.tsx +++ b/frontend/src/main-page/dashboard/DateFilter.tsx @@ -2,9 +2,10 @@ import { useState, useEffect } from "react"; import { updateYearFilter } from "../../external/bcanSatchel/actions"; import { getAppStore } from "../../external/bcanSatchel/store"; import { observer } from "mobx-react-lite"; -import { FaChevronDown } from "react-icons/fa"; -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { faChevronDown } from "@fortawesome/free-solid-svg-icons"; import { faXmark } from "@fortawesome/free-solid-svg-icons"; +import Button from "../settings/components/Button"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; const DateFilter: React.FC = observer(() => { const { allGrants, yearFilter } = getAppStore(); @@ -52,30 +53,26 @@ const DateFilter: React.FC = observer(() => { return (
- + onClick={() => setShowDropdown(!showDropdown)} + logo={faChevronDown} + logoPosition="right" + className="bg-white border-grey-500 inline-flex items-center justify-between text-xs lg:text-sm" + />
    = observer(({ grant }) => {
    + }`}/> ); } diff --git a/frontend/src/styles/button.css b/frontend/src/styles/button.css deleted file mode 100644 index 1d556b9c..00000000 --- a/frontend/src/styles/button.css +++ /dev/null @@ -1,13 +0,0 @@ -/* Optional: styling for the preview of the status button */ -.status-button-preview { - cursor: pointer; -} - -/* Button preview defaults */ -.button-default { - color: black; - text-align: center; - padding: 0.5rem 0; - border-radius: 15px; - z-index: 0; -} \ No newline at end of file From f8acb53920ca7e95a60531b8ce4cb17542a9d698 Mon Sep 17 00:00:00 2001 From: Jane Kamata Date: Sat, 21 Feb 2026 00:03:34 -0500 Subject: [PATCH 2/9] Updated button formatting and removing unused css --- frontend/src/Login.tsx | 2 +- frontend/src/main-page/Footer.tsx | 7 +-- frontend/src/main-page/MainPage.tsx | 2 +- .../grants/filter-bar/GrantSearch.tsx | 61 ++++++++----------- .../main-page/grants/styles/GrantSearch.css | 38 ------------ frontend/src/main-page/settings/Settings.tsx | 2 +- .../main-page/settings/components/Button.tsx | 4 +- frontend/src/sign-up/LoginPrompt.tsx | 2 +- frontend/src/sign-up/PasswordField.tsx | 2 +- frontend/src/styles/Footer.css | 28 --------- frontend/src/styles/index.css | 8 ++- 11 files changed, 44 insertions(+), 112 deletions(-) delete mode 100644 frontend/src/main-page/grants/styles/GrantSearch.css delete mode 100644 frontend/src/styles/Footer.css diff --git a/frontend/src/Login.tsx b/frontend/src/Login.tsx index c4205dd3..0a4d0610 100644 --- a/frontend/src/Login.tsx +++ b/frontend/src/Login.tsx @@ -100,7 +100,7 @@ const Login = observer(() => { diff --git a/frontend/src/main-page/Footer.tsx b/frontend/src/main-page/Footer.tsx index 44b05ceb..c3effd0a 100644 --- a/frontend/src/main-page/Footer.tsx +++ b/frontend/src/main-page/Footer.tsx @@ -1,12 +1,11 @@ import React from "react"; -import "../styles/Footer.css"; import { Group, Text, Link } from "@chakra-ui/react"; import { FooterText } from "../translations/general"; const Footer: React.FC = () => { return ( -
    - +
    + {FooterText.C4C_Motto} @@ -17,7 +16,7 @@ const Footer: React.FC = () => { {FooterText.Org} - {FooterText.NEU} + {FooterText.NEU}
    ); diff --git a/frontend/src/main-page/MainPage.tsx b/frontend/src/main-page/MainPage.tsx index 8a9619ad..6e050116 100644 --- a/frontend/src/main-page/MainPage.tsx +++ b/frontend/src/main-page/MainPage.tsx @@ -15,7 +15,7 @@ function MainPage() {
    -
    +
    } /> -
    -
    - {/* Absolutely-positioned icon */} - - { - if (e.key === "Enter") { - e.preventDefault(); - } - }} - /> -
    -
    +
    + {/* Absolutely-positioned icon */} + + { + if (e.key === "Enter") { + e.preventDefault(); + } + }} + />
    ); } diff --git a/frontend/src/main-page/grants/styles/GrantSearch.css b/frontend/src/main-page/grants/styles/GrantSearch.css deleted file mode 100644 index eaa7d3df..00000000 --- a/frontend/src/main-page/grants/styles/GrantSearch.css +++ /dev/null @@ -1,38 +0,0 @@ -.search-bar-main-container { - width: 100%; - min-width: 300px; -} - -.search-container { - position: relative; - display: flex; - align-items: center; - gap: 8px; - height: 42px; -} - -.search-input-container { - position: relative; - width: 100%; - border: 0px solid black; - border-radius: 15px; -} - -.search-input { - color: black; - padding: 8px; - border-radius: 15px; - border: 0.1rem solid var(--color-grey-500); - width: 100%; - background-color: var(--color-grey-100); -} - -.search-input:focus { - outline: none !important; - border:0.1rem solid var(--color-primary-800); -} - - -.filter-state { - color: whitesmoke; -} \ No newline at end of file diff --git a/frontend/src/main-page/settings/Settings.tsx b/frontend/src/main-page/settings/Settings.tsx index 1bf0b6dd..d4709ea4 100644 --- a/frontend/src/main-page/settings/Settings.tsx +++ b/frontend/src/main-page/settings/Settings.tsx @@ -63,7 +63,7 @@ export default function Settings() {

    Change Password

    -

    +

    Re-enter your current password in order to change your password.

    diff --git a/frontend/src/main-page/settings/components/Button.tsx b/frontend/src/main-page/settings/components/Button.tsx index 05eea4ce..f18332cc 100644 --- a/frontend/src/main-page/settings/components/Button.tsx +++ b/frontend/src/main-page/settings/components/Button.tsx @@ -19,8 +19,8 @@ export default function Button({ text, onClick, className, logo, logoPosition, d return ( diff --git a/frontend/src/sign-up/PasswordField.tsx b/frontend/src/sign-up/PasswordField.tsx index e0555baf..162fe777 100644 --- a/frontend/src/sign-up/PasswordField.tsx +++ b/frontend/src/sign-up/PasswordField.tsx @@ -78,7 +78,7 @@ export default function PasswordField({ id={id} type={visible ? "text" : "password"} className={`block w-full rounded-md border bg-white py-2.5 pl-4 pr-10 text-base placeholder:text-grey-500 ${ - error ? "border-red" : "border-grey-400" + error ? "border-red" : "border-grey-500" }`} {...inputProps} /> diff --git a/frontend/src/styles/Footer.css b/frontend/src/styles/Footer.css deleted file mode 100644 index fe1cce96..00000000 --- a/frontend/src/styles/Footer.css +++ /dev/null @@ -1,28 +0,0 @@ -.footer { - display: flex; - justify-content: space-evenly; - align-items: center; - flex-direction: column; - flex-grow: 1; - - border-color: var(--color-grey-100); - width: 100%; - padding: 1em; - - /* Text */ - font-size: var(--font-size-base); - color: var(--color-grey-700); -} - -.text-block { - width: 50%; - display: flex; - flex-direction: column; - padding: 8px; -} - -.northeastern-uni-caption { - font-size: var(--font-size-sm); - line-height: 1rem; - color: var(--color-grey-600); -} diff --git a/frontend/src/styles/index.css b/frontend/src/styles/index.css index 4501a0d7..f64b7c4e 100644 --- a/frontend/src/styles/index.css +++ b/frontend/src/styles/index.css @@ -143,6 +143,12 @@ button:focus-visible { } } +input { + border-width: 2px; + background-color: white; +} + input:focus { - outline: 1px solid var(--color-primary-900); + border-color: var(--color-primary-900); + outline: transparent; } From e2c04a7590edd53e667e3273e44d4506158a44d1 Mon Sep 17 00:00:00 2001 From: Jane Kamata Date: Sat, 21 Feb 2026 00:09:02 -0500 Subject: [PATCH 3/9] Spacing --- frontend/src/main-page/grants/GrantPage.tsx | 2 +- frontend/src/main-page/navbar/NavBar.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/main-page/grants/GrantPage.tsx b/frontend/src/main-page/grants/GrantPage.tsx index 2ec013c7..a739dd3f 100644 --- a/frontend/src/main-page/grants/GrantPage.tsx +++ b/frontend/src/main-page/grants/GrantPage.tsx @@ -115,7 +115,7 @@ function GrantPage({}: GrantPageProps) {
    -
    +
    FILTERS GO HERE diff --git a/frontend/src/main-page/navbar/NavBar.tsx b/frontend/src/main-page/navbar/NavBar.tsx index 7a1a40c6..58446c0e 100644 --- a/frontend/src/main-page/navbar/NavBar.tsx +++ b/frontend/src/main-page/navbar/NavBar.tsx @@ -32,9 +32,9 @@ const NavBar: React.FC = observer(() => { }; return ( -