diff --git a/frontend/src/Login.tsx b/frontend/src/Login.tsx index 282bbd9f..4bcbb317 100644 --- a/frontend/src/Login.tsx +++ b/frontend/src/Login.tsx @@ -52,7 +52,7 @@ const Login = observer(() => { required onChange={(e) => setUsername(e.target.value)} placeholder="Enter your email" - className="block min-w-0 rounded-md grow bg-white py-1.5 pr-3 pl-4 text-base placeholder:text-gray-500 border border-medium-gray" + className="block min-w-0 rounded-md grow bg-white py-1.5 pr-3 pl-4 text-base placeholder:text-gray-500 border border-grey-400" /> @@ -69,14 +69,14 @@ const Login = observer(() => { required onChange={(e) => setPassword(e.target.value)} placeholder="Enter your password" - className="block min-w-0 rounded-md grow bg-white py-1.5 pr-3 pl-4 text-base placeholder:text-gray-500 border border-medium-gray" + className="block min-w-0 rounded-md grow bg-white py-1.5 pr-3 pl-4 text-base placeholder:text-gray-500 border border-grey-400" />
{failure ? ( -
+
Your password is incorrect or this account doesn't exist.
) : ( @@ -85,21 +85,21 @@ const Login = observer(() => {
-
-
or
-
+
+
or
+
Don't have an account?{" "} @@ -109,7 +109,7 @@ const Login = observer(() => { {/*/ Right side: logo */}
-
+
{ return (
-
+
{/*/ Left side: Registration form */}

Get Started Now

@@ -111,7 +111,7 @@ const Register = observer(() => { required onChange={(e) => setUsername(e.target.value)} placeholder="Enter your username" - className="block min-w-0 rounded-md grow bg-white py-1.5 pr-3 pl-4 text-base placeholder:text-gray-500 border border-medium-gray" + className="block min-w-0 rounded-md grow bg-white py-1.5 pr-3 pl-4 text-base placeholder:text-gray-500 border border-grey-400" />
@@ -130,8 +130,8 @@ const Register = observer(() => { placeholder="Enter your email" className={`block min-w-0 rounded-md grow bg-white py-1.5 pr-3 pl-4 text-base placeholder:text-gray-500 border ${ failure.item === "email" - ? "border-[#D33221]" - : "border-medium-gray" + ? "border-red" + : "border-grey-400" }`} />
@@ -151,8 +151,8 @@ const Register = observer(() => { placeholder="Enter your password" className={`block min-w-0 rounded-md grow bg-white py-1.5 pr-3 pl-4 text-base placeholder:text-gray-500 border ${ failure.item === "password" - ? "border-[#D33221]" - : "border-medium-gray" + ? "border-red" + : "border-grey-400" }`} />
@@ -172,8 +172,8 @@ const Register = observer(() => { placeholder="Re-enter your password" className={`block min-w-0 rounded-md grow bg-white py-1.5 pr-3 pl-4 text-base placeholder:text-gray-500 border ${ failure.item === "password" - ? "border-[#D33221]" - : "border-medium-gray" + ? "border-red" + : "border-grey-400" }`} />
@@ -183,8 +183,8 @@ const Register = observer(() => {
{failure.state ? failure.message : defaultPasswordMessage} @@ -193,21 +193,21 @@ const Register = observer(() => {
-
-
or
-
+
+
or
+
Have an account?{" "} @@ -216,7 +216,7 @@ const Register = observer(() => {
{/*/ Right side: logo */}
-
+
{ return (
-
+
{
diff --git a/frontend/src/main-page/grants/filter-bar/FilterBar.tsx b/frontend/src/main-page/grants/filter-bar/FilterBar.tsx index a61497c1..eeab6f9c 100644 --- a/frontend/src/main-page/grants/filter-bar/FilterBar.tsx +++ b/frontend/src/main-page/grants/filter-bar/FilterBar.tsx @@ -44,7 +44,7 @@ const FilterBar: React.FC = observer(() => { } return ( -
+
{"Filter by Date"}
@@ -59,15 +59,14 @@ const FilterBar: React.FC = observer(() => { to={item.linkTo ? item.linkTo : "#"} >
{item.name} diff --git a/frontend/src/main-page/grants/filter-bar/GrantSearch.tsx b/frontend/src/main-page/grants/filter-bar/GrantSearch.tsx index adcb3ce8..87b2e1fa 100644 --- a/frontend/src/main-page/grants/filter-bar/GrantSearch.tsx +++ b/frontend/src/main-page/grants/filter-bar/GrantSearch.tsx @@ -35,8 +35,7 @@ function GrantSearch() {
{/* Absolutely-positioned icon */} = ({ grant placeholder="Enter rate" value={hourlyRate} onChange={(e) => setHourlyRate(e.target.value)} - className="w-full h-[42px] px-3 py-4 border border-gray-400 rounded-md bg-[#F2EBE4]" + className="w-full h-[42px] px-3 py-4 border border-gray-400 rounded-md bg-tan" />
@@ -85,14 +85,14 @@ export const CostBenefitAnalysis: React.FC = ({ grant console.log('Time per report changed to:', e.target.value); setTimePerReport(e.target.value); }} - className="w-full h-[42px] px-3 py-4 border border-gray-400 rounded-md bg-[#F2EBE4]" + className="w-full h-[42px] px-3 py-4 border border-gray-400 rounded-md bg-tan" />
{/* Calculate Button */} @@ -102,7 +102,7 @@ export const CostBenefitAnalysis: React.FC = ({ grant Net Benefit:
diff --git a/frontend/src/main-page/grants/grant-details/GrantAttributes.tsx b/frontend/src/main-page/grants/grant-details/GrantAttributes.tsx index 15e2bac3..b1a3c516 100644 --- a/frontend/src/main-page/grants/grant-details/GrantAttributes.tsx +++ b/frontend/src/main-page/grants/grant-details/GrantAttributes.tsx @@ -23,7 +23,7 @@ export const GrantAttributes: React.FC = ({curGrant, setCu }; return ( -
+
Status
= observer( Application Date
{formatDate(curGrant.application_deadline)}
@@ -241,7 +241,7 @@ const GrantItem: React.FC = observer( Grant Start Date
@@ -318,7 +318,7 @@ const GrantItem: React.FC = observer( Report Deadlines
{/*Map each available report deadline to a div label If no deadlines, add "No deadlines" text */} @@ -328,7 +328,7 @@ const GrantItem: React.FC = observer( (deadline: string, index: number) => (
{formatDate(deadline)}
@@ -363,17 +363,11 @@ const GrantItem: React.FC = observer( {/*Box div*/}

= observer( {/*Box div*/}

= observer(
{curGrant.does_bcan_qualify ? "Yes" : "No"} @@ -472,10 +466,10 @@ const GrantItem: React.FC = observer(
{curGrant.status} @@ -492,7 +486,7 @@ const GrantItem: React.FC = observer(
{curGrant.isRestricted @@ -510,7 +504,7 @@ const GrantItem: React.FC = observer(
{/*Map each available report deadline to a div label @@ -582,7 +576,7 @@ const GrantItem: React.FC = observer(
<> ); diff --git a/frontend/src/main-page/grants/new-grant/NewGrantModal.tsx b/frontend/src/main-page/grants/new-grant/NewGrantModal.tsx index a3eaa674..dc4c7c50 100644 --- a/frontend/src/main-page/grants/new-grant/NewGrantModal.tsx +++ b/frontend/src/main-page/grants/new-grant/NewGrantModal.tsx @@ -470,7 +470,7 @@ const NewGrantModal: React.FC<{ Organization Name * @@ -561,10 +561,10 @@ const NewGrantModal: React.FC<{ Report Deadlines