Skip to content

Commit d38560a

Browse files
committed
Loading feedback when fetching all targets
1 parent 84d2973 commit d38560a

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

frontend/app/src/components/public/TargetSearch.tsx

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
Form,
1010
Col,
1111
Jumbotron,
12+
Spinner,
1213
} from "react-bootstrap";
1314
import { Link } from "react-router-dom";
1415

@@ -24,6 +25,7 @@ export const TargetSearch: FC = () => {
2425
const [targets, setTargets] = useState<Target[]>([]);
2526
const [targetsDefault, setTargetsDefault] = useState<Target[]>([]);
2627
const [searchQuery, setSearchQuery] = useState<string>("");
28+
const [loading, setLoading] = useState<boolean>(true);
2729

2830
useEffect(() => {
2931
document.title = "Home";
@@ -32,6 +34,7 @@ export const TargetSearch: FC = () => {
3234
.then((data) => {
3335
setTargetsDefault(data);
3436
setTargets(data);
37+
setLoading(false);
3538
})
3639
.catch(console.error);
3740
}, []);
@@ -40,10 +43,12 @@ export const TargetSearch: FC = () => {
4043
const input = event.target.value;
4144
setSearchQuery(input);
4245
setTargets(
43-
targetsDefault.filter(
44-
(elem) =>
45-
elem.first_name.toLowerCase().includes(input.toLowerCase()) ||
46-
elem.last_name.toLowerCase().includes(input.toLowerCase())
46+
targetsDefault.filter((elem) =>
47+
(
48+
elem.first_name.toLowerCase() +
49+
" " +
50+
elem.last_name.toLowerCase()
51+
).includes(input.toLowerCase())
4752
)
4853
);
4954
};
@@ -82,9 +87,18 @@ export const TargetSearch: FC = () => {
8287
</Jumbotron>
8388
</Col>
8489
</Row>
90+
8591
<Row>
86-
<Col>
87-
<CardColumns>{listTargets}</CardColumns>
92+
<Col style={{ textAlign: "center" }}>
93+
{loading ? (
94+
<Spinner
95+
variant="primary"
96+
style={{ height: 200, width: 200 }}
97+
animation="border"
98+
/>
99+
) : (
100+
<CardColumns>{listTargets}</CardColumns>
101+
)}
88102
</Col>
89103
</Row>
90104
</Container>

0 commit comments

Comments
 (0)