From 26c0d29ccdfc89b1a0e166e68b5520ce0d41a40c Mon Sep 17 00:00:00 2001 From: Diego Vidal Lopez Date: Fri, 28 Jul 2023 16:51:42 -0600 Subject: [PATCH 1/4] Create and import MyProfile.css into MyProfile.jsx componenet --- src/pages/MyProfile.jsx | 2 ++ src/styles/MyProfile.css | 0 2 files changed, 2 insertions(+) create mode 100644 src/styles/MyProfile.css diff --git a/src/pages/MyProfile.jsx b/src/pages/MyProfile.jsx index 51d805b..ee187c6 100644 --- a/src/pages/MyProfile.jsx +++ b/src/pages/MyProfile.jsx @@ -1,5 +1,7 @@ +import '../styles/MyProfile.css'; import { useSelector } from "react-redux"; + const MyProfile = () => { const rockets = useSelector((state) => state.rockets); const missions = useSelector((state) => state.missions.missions); diff --git a/src/styles/MyProfile.css b/src/styles/MyProfile.css new file mode 100644 index 0000000..e69de29 From 5937f66684e836d0880b2780a89c0aea94b5f705 Mon Sep 17 00:00:00 2001 From: Diego Vidal Lopez Date: Fri, 28 Jul 2023 16:56:37 -0600 Subject: [PATCH 2/4] display as flex myprofile main container --- src/styles/MyProfile.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/styles/MyProfile.css b/src/styles/MyProfile.css index e69de29..41bb654 100644 --- a/src/styles/MyProfile.css +++ b/src/styles/MyProfile.css @@ -0,0 +1,3 @@ +.my-profile-container { + display: flex; +} \ No newline at end of file From 78027c1d5f34163622f52ef21dd1d97c52b00906 Mon Sep 17 00:00:00 2001 From: Diego Vidal Lopez Date: Fri, 28 Jul 2023 17:58:37 -0600 Subject: [PATCH 3/4] Add styling for myProfile section --- src/pages/MyProfile.jsx | 8 ++++---- src/styles/MyProfile.css | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/src/pages/MyProfile.jsx b/src/pages/MyProfile.jsx index ee187c6..7ce4324 100644 --- a/src/pages/MyProfile.jsx +++ b/src/pages/MyProfile.jsx @@ -10,16 +10,16 @@ const MyProfile = () => { return (
-
    -

    My Missions

    +

    My Missions

    +
      {missions.filter((mission) => mission.reserved).map((mission) => { { return
    • {mission.name}
    • } })}
-
    -

    My Rockets

    +

    My Rockets

    +
      {rockets.filter((rocket) => rocket.reserved).map((rocket) => { { return
    • {rocket.rocket_name}
    • } })} diff --git a/src/styles/MyProfile.css b/src/styles/MyProfile.css index 41bb654..a4d447d 100644 --- a/src/styles/MyProfile.css +++ b/src/styles/MyProfile.css @@ -1,3 +1,30 @@ .my-profile-container { display: flex; + border-top: 2px solid gray; + width: 90%; + margin-left: auto; + margin-right: auto; + margin-top: 2.5%; +} + +.reserved-rockets-container { + width: 45%; + margin-left: auto; + margin-right: auto; + margin-top: 1.75%; +} + +.reserved-rockets-container .reserved-list { + margin-top: 5%; + border: 1px solid gray; + border-radius: 5px; + gap: 0; +} + +.reserved-rockets-container .reserved-list li { + padding: 3%; +} + +.reserved-rockets-container .reserved-list li + li { + border-top: 1px gray solid; } \ No newline at end of file From 3b1722b7c3607ddec55e8ebb460de7d8e92d01dd Mon Sep 17 00:00:00 2001 From: Diego Vidal Lopez Date: Fri, 28 Jul 2023 17:59:11 -0600 Subject: [PATCH 4/4] fix linters errors --- src/styles/MyProfile.css | 36 ++++++++++++++++++------------------ src/styles/Rockets.css | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/styles/MyProfile.css b/src/styles/MyProfile.css index a4d447d..17b2992 100644 --- a/src/styles/MyProfile.css +++ b/src/styles/MyProfile.css @@ -1,30 +1,30 @@ .my-profile-container { - display: flex; - border-top: 2px solid gray; - width: 90%; - margin-left: auto; - margin-right: auto; - margin-top: 2.5%; + display: flex; + border-top: 2px solid gray; + width: 90%; + margin-left: auto; + margin-right: auto; + margin-top: 2.5%; } .reserved-rockets-container { - width: 45%; - margin-left: auto; - margin-right: auto; - margin-top: 1.75%; + width: 45%; + margin-left: auto; + margin-right: auto; + margin-top: 1.75%; } -.reserved-rockets-container .reserved-list { - margin-top: 5%; - border: 1px solid gray; - border-radius: 5px; - gap: 0; +.reserved-rockets-container .reserved-list { + margin-top: 5%; + border: 1px solid gray; + border-radius: 5px; + gap: 0; } .reserved-rockets-container .reserved-list li { - padding: 3%; + padding: 3%; } .reserved-rockets-container .reserved-list li + li { - border-top: 1px gray solid; -} \ No newline at end of file + border-top: 1px gray solid; +} diff --git a/src/styles/Rockets.css b/src/styles/Rockets.css index bffe157..ba061c3 100644 --- a/src/styles/Rockets.css +++ b/src/styles/Rockets.css @@ -25,7 +25,7 @@ display: flex; flex-direction: column; align-items: flex-start; - gap:1.25vw; + gap: 1.25vw; } .rocket-data p {