Skip to content

Commit f638152

Browse files
committed
Merge branch 'develop' of https://github.com/bluewave-labs/verifywise into rb-sept-15-slack-integration
2 parents 6d35287 + 9b7827e commit f638152

20 files changed

Lines changed: 122 additions & 55 deletions

File tree

Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading

Clients/src/presentation/components/ProjectsList/ProjectsList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// New component file: ProjectList.tsx
22
import { useState, useMemo } from "react";
33
import { Box, Typography, InputBase, IconButton } from "@mui/material";
4-
import SearchIcon from "@mui/icons-material/Search";
4+
import { ReactComponent as SearchIcon } from "../../assets/icons/search.svg";
55
import ProjectCard from "../Cards/ProjectCard";
66
import ProjectTableView from "./ProjectTableView";
77
import NoProject from "../NoProject/NoProject";
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
import React from "react";
2+
import { Box, InputBase, SxProps, Theme } from "@mui/material";
3+
import { ReactComponent as SearchIcon } from "../../../assets/icons/search.svg";
4+
5+
export interface SearchBoxProps {
6+
placeholder?: string;
7+
value: string;
8+
onChange: (value: string) => void;
9+
sx?: SxProps<Theme>;
10+
inputProps?: React.InputHTMLAttributes<HTMLInputElement>;
11+
disabled?: boolean;
12+
fullWidth?: boolean;
13+
}
14+
15+
const SearchBox: React.FC<SearchBoxProps> = ({
16+
placeholder = "Search...",
17+
value,
18+
onChange,
19+
sx = {},
20+
inputProps = {},
21+
disabled = false,
22+
fullWidth = true,
23+
}) => {
24+
const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
25+
onChange(event.target.value);
26+
};
27+
28+
const searchBoxStyle: SxProps<Theme> = {
29+
display: "flex",
30+
alignItems: "center",
31+
border: "1px solid #eaecf0",
32+
borderRadius: 1,
33+
p: "4px 6px",
34+
bgcolor: "#fff",
35+
height: "34px",
36+
...(fullWidth && { flex: 1 }),
37+
...sx,
38+
};
39+
40+
const searchInputStyle: SxProps<Theme> = {
41+
flex: 1,
42+
fontSize: "13px",
43+
fontFamily: "inherit",
44+
};
45+
46+
return (
47+
<Box sx={searchBoxStyle}>
48+
<SearchIcon style={{ color: "#6b7280", marginRight: "8px" }} />
49+
<InputBase
50+
placeholder={placeholder}
51+
value={value}
52+
onChange={handleChange}
53+
sx={searchInputStyle}
54+
inputProps={{
55+
"aria-label": "Search",
56+
...inputProps,
57+
}}
58+
disabled={disabled}
59+
/>
60+
</Box>
61+
);
62+
};
63+
64+
export default SearchBox;
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export { default as SearchBox } from "./SearchBox";
2+
export type { SearchBoxProps } from "./SearchBox";

Clients/src/presentation/components/Sidebar/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ const Sidebar = () => {
269269
component="aside"
270270
className={`sidebar-menu ${collapsed ? "collapsed" : "expanded"}`}
271271
py={theme.spacing(6)}
272-
gap={theme.spacing(6)}
272+
gap={theme.spacing(2)}
273273
sx={{
274274
height: "100vh",
275275
border: 1,
@@ -946,7 +946,7 @@ const Sidebar = () => {
946946
<MenuItem
947947
onClick={() => {
948948
window.open(
949-
"https://github.com/bluewave-labs/verifywise/discussions",
949+
"https://verifywise.ai/contact",
950950
"_blank",
951951
"noreferrer"
952952
);

Clients/src/presentation/components/VWQuestion/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Box, Chip, Stack, Tooltip, Typography, Dialog, useTheme } from "@mui/material";
22
import { Question } from "../../../domain/types/Question";
3-
import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
3+
import { ReactComponent as GreyCircleInfoIcon } from "../../assets/icons/info-circle-grey.svg";
44
import {
55
priorities,
66
PriorityLevel,
@@ -262,7 +262,7 @@ const QuestionFrame = ({
262262
},
263263
}}
264264
>
265-
<InfoOutlinedIcon fontSize="inherit" />
265+
<GreyCircleInfoIcon fontSize="inherit" />
266266
</Tooltip>
267267
</Box>
268268
)}

Clients/src/presentation/pages/AITrustCenter/Resources/index.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ import {
1313
import Alert from "../../../components/Alert";
1414
import VisibilityIcon from "@mui/icons-material/Visibility";
1515
import VisibilityOffIcon from "@mui/icons-material/VisibilityOff";
16-
import AddIcon from "@mui/icons-material/Add";
17-
16+
import { ReactComponent as AddCircleOutlineIcon } from "../../../assets/icons/plus-circle-white.svg";
1817
import { ReactComponent as CloseGreyIcon } from "../../../assets/icons/close-grey.svg";
1918
import Toggle from "../../../components/Inputs/Toggle";
2019
import { useStyles } from "./styles";
@@ -503,7 +502,7 @@ const TrustCenterResources: React.FC = () => {
503502
onClick={handleOpenAddModal}
504503
isDisabled={!formData?.info?.resources_visible}
505504
text="Add new resource"
506-
icon={<AddIcon />}
505+
icon={<AddCircleOutlineIcon />}
507506
/>
508507
<Box sx={styles.toggleRow}>
509508
<Typography sx={styles.toggleLabel}>Enabled and visible</Typography>

Clients/src/presentation/pages/AITrustCenter/Subprocessors/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import Field from "../../../components/Inputs/Field";
1515
import CustomizableButton from "../../../components/Button/CustomizableButton";
1616
import { Modal, IconButton } from "@mui/material";
1717
import { ReactComponent as CloseGreyIcon } from "../../../assets/icons/close-grey.svg";
18-
import AddIcon from "@mui/icons-material/Add";
18+
import { ReactComponent as AddCircleOutlineIcon } from "../../../assets/icons/plus-circle-white.svg";
1919
import { useTheme } from "@mui/material/styles";
2020
import AITrustCenterTable from "../../../components/Table/AITrustCenterTable";
2121
import Alert from "../../../components/Alert";
@@ -428,7 +428,7 @@ const AITrustCenterSubprocessors: React.FC = () => {
428428
onClick={handleOpenAddModal}
429429
isDisabled={!formData?.info?.subprocessor_visible}
430430
text="Add new subprocessor"
431-
icon={<AddIcon />}
431+
icon={<AddCircleOutlineIcon />}
432432
/>
433433
<Box sx={styles.toggleRow}>
434434
<Typography sx={styles.toggleLabel}>

Clients/src/presentation/pages/Assessment/NewAssessment/AssessmentQuestions/AssessmentQuestions.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
Typography,
1212
useTheme,
1313
} from "@mui/material";
14-
import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
14+
import { ReactComponent as GreyCircleInfoIcon } from "../../assets/icons/info-circle-grey.svg";
1515
import RichTextEditor from "../../../../components/RichTextEditor";
1616
import { priorities, PriorityLevel } from "../priorities";
1717
import { Topic } from "../../../../../application/hooks/useAssessmentAnswers";
@@ -104,7 +104,7 @@ const AssessmentQuestions = ({
104104
},
105105
}}
106106
>
107-
<InfoOutlinedIcon fontSize="inherit" />
107+
<GreyCircleInfoIcon fontSize="inherit" />
108108
</Tooltip>
109109
</Box>
110110
)}

0 commit comments

Comments
 (0)