Skip to content

Commit 65a6f1f

Browse files
committed
Merge branch 'dev' of github.com:rubydevi/react-group-project into f/rocket-test
2 parents d9e51c0 + e6bf56d commit 65a6f1f

File tree

3 files changed

+56
-14
lines changed

3 files changed

+56
-14
lines changed

src/components/JoinedMissions.js

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
1-
import React from 'react';
1+
import { ListGroup } from 'react-bootstrap';
2+
import { useSelector } from 'react-redux/es/hooks/useSelector';
23

3-
const JoinedMissions = () => (
4-
<div>JoinedMissions</div>
5-
);
4+
const JoinedMissions = () => {
5+
const missions = useSelector((state) => state.missions.missions);
6+
const joinmission = missions.filter((mission) => mission.reserved === true);
7+
8+
return (
9+
<>
10+
{joinmission.length > 0 ? (
11+
<ListGroup>
12+
{joinmission.map((mission) => (
13+
<ListGroup.Item key={mission.mission_id}>{mission.mission_name}</ListGroup.Item>
14+
))}
15+
</ListGroup>
16+
) : (<div>You have no Reserved Missions</div>)}
17+
</>
18+
);
19+
};
620

721
export default JoinedMissions;

src/components/MyProfile.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +0,0 @@
1-
import React from 'react';
2-
3-
const MyProfile = () => (
4-
<div>MyProfile</div>
5-
);
6-
7-
export default MyProfile;

src/components/ReservedDragons.js

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,42 @@
11
import React from 'react';
2+
import { useSelector } from 'react-redux';
3+
import ListGroup from 'react-bootstrap/ListGroup';
4+
import { Container } from 'react-bootstrap';
5+
import Row from 'react-bootstrap/Row';
6+
import Col from 'react-bootstrap/Col';
7+
import Badge from 'react-bootstrap/Badge';
28

3-
const ReservedDragons = () => (
4-
<div>ReservedDragons</div>
5-
);
9+
const ReservedDragons = () => {
10+
const { dragons } = useSelector((state) => state.dragons);
11+
const reservedDragons = dragons.filter((dragon) => dragon.reserved === true);
12+
13+
return (
14+
<Container className="mt-4">
15+
<Row>
16+
{reservedDragons.length > 0 ? (
17+
<Col>
18+
<ListGroup>
19+
{
20+
reservedDragons.map((dragon) => (
21+
<ListGroup.Item key={dragon.id}>{dragon.name}</ListGroup.Item>
22+
))
23+
}
24+
</ListGroup>
25+
</Col>
26+
) : (
27+
<Col>
28+
<h5>
29+
Dragons
30+
{' '}
31+
<Badge bg="info">No dragon reserved</Badge>
32+
</h5>
33+
</Col>
34+
)}
35+
36+
</Row>
37+
</Container>
38+
39+
);
40+
};
641

742
export default ReservedDragons;

0 commit comments

Comments
 (0)