Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Missions conditional components #39

Merged
merged 2 commits into from
Jul 25, 2023
Merged

Missions conditional components #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9907b40
Render the correct mission button and badge using conditional renderi…
Kidd254 Jul 25, 2023
abdb8c9
Update the CSS styles of the missions badges
Kidd254 Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/assets/styles/Missions.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@
text-transform: uppercase;
}

.missions-table .active-member .mission-status {
.missions-table .mission-status .active-member {
text-transform: capitalize;
}
19 changes: 15 additions & 4 deletions src/components/MissionItem.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,24 @@ const MissionItem = ({ mission }) => {
return (
<tr>
<td className="mission-name">{ mission.mission_name }</td>
<td className="mission-description">{ mission.description}</td>
<td className="mission-description">{ mission.description }</td>
<td className="mission-status">
<span className="badge badge-gray">Not a member</span>
{
mission.reserved ? (
<span className="badge badge-blue active-member">Active member</span>
)
: (
<span className="badge badge-gray">Not a member</span>
)
}
</td>
<td className="mission-join-button">
<button type="button" className="btn btn-gray" onClick={handleClickAddReservedMission}>Join Mission</button>
<button type="button" className="btn btn-pink" onClick={handleClickLeaveMission}>Leave Mission</button>
{mission.reserved ? (
<button type="button" className="btn btn-pink" onClick={handleClickLeaveMission}>Leave Mission</button>
)
: (
<button type="button" className="btn btn-gray" onClick={handleClickAddReservedMission}>Join Mission</button>
)}
</td>
</tr>
);
Expand Down