Skip to content

Commit accbbda

Browse files
authored
Merge pull request #186 from Code-4-Community/169-dev---implement-new-expanded-grant-view
169 dev implement new expanded grant view
2 parents 1292b4a + 5fd91a4 commit accbbda

File tree

8 files changed

+613
-73
lines changed

8 files changed

+613
-73
lines changed

frontend/src/custom/RingButton.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ import "../styles/button.css";
33

44
/* Maintained with button.css */
55
export enum ButtonColorOption {
6-
GREEN,
7-
GRAY,
8-
ORANGE,
6+
GREEN = "#5AB911",
7+
GRAY = "#D3D3D3",
8+
ORANGE = "#F7A781",
99
}
1010

11+
12+
1113
/* API for components to setup a button with expected system colors */
1214
interface RingButtonProps {
1315
/* The text to display for the button */

frontend/src/main-page/grants/filter-bar/FilterBar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useState } from "react";
22
import { Link } from "react-router-dom";
33
import {
44
Status,
5-
statusToString,
5+
stringToStatus,
66
} from "../../../../../middle-layer/types/Status.ts";
77
import {
88
updateFilter,
@@ -38,7 +38,7 @@ const FilterBar: React.FC = observer(() => {
3838
) {
3939
if (!linkTo) {
4040
e.preventDefault();
41-
updateFilter(statusToString(category));
41+
updateFilter(stringToStatus(category));
4242
setSelected(category);
4343
}
4444
}

0 commit comments

Comments
 (0)