From 03e78245b8d3790c38f03764b312c3232b1292f0 Mon Sep 17 00:00:00 2001
From: mjaydenkim <mjaydenkim@gmail.com>
Date: Thu, 16 Jan 2025 22:48:53 -0500
Subject: [PATCH] Fixed styles

---
 .../modules/Course/Components/ReviewModal.tsx | 12 +++---
 .../modules/Profile/Component/UserInfo.tsx    | 38 ++++++++++++-------
 .../Profile/Styles/UserInfo.module.css        | 12 +++++-
 3 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/client/src/modules/Course/Components/ReviewModal.tsx b/client/src/modules/Course/Components/ReviewModal.tsx
index 1448a899..8c4ccfaa 100644
--- a/client/src/modules/Course/Components/ReviewModal.tsx
+++ b/client/src/modules/Course/Components/ReviewModal.tsx
@@ -235,6 +235,12 @@ const ReviewModal = ({
                 isOverall={false}
               />
             </div>
+            <SingleSelect
+              options={gradeoptions}
+              value={selectedGrade}
+              onChange={onGradeChange}
+              placeholder="Grade Received"
+            />
             {!loadingMajors && (!isLoggedIn || userMajors.length === 0) && (
               <MultiSelect
                 options={majorOptions}
@@ -244,12 +250,6 @@ const ReviewModal = ({
                 placeholder="Major"
               />
             )}
-            <SingleSelect
-              options={gradeoptions}
-              value={selectedGrade}
-              onChange={onGradeChange}
-              placeholder="Grade Received"
-            />
           </div>
           <div className={styles.textcol}>
             <textarea
diff --git a/client/src/modules/Profile/Component/UserInfo.tsx b/client/src/modules/Profile/Component/UserInfo.tsx
index b28ffdfd..406d56a5 100644
--- a/client/src/modules/Profile/Component/UserInfo.tsx
+++ b/client/src/modules/Profile/Component/UserInfo.tsx
@@ -64,9 +64,17 @@ const UserInfo = ({
         src={profilePicture}
         alt="user profile bear"
       />
-      <div className={styles.netid}>{netId}</div>
-      {userMajors.length > 0 &&
-        'Major' + (userMajors.length > 1 ? 's' : '') + ': ' + userMajors.join(', ')}
+      <div>
+        <div className={styles.netid}>
+          <span className={styles.bold}>{netId}</span>
+          {userMajors.length > 0 && " is studying"}
+          <p className={styles.bold}>
+            {userMajors.join(', ').replace(/(, )(?!.*\1)/,
+              (userMajors.length > 2 ? ', and ' : ' and ')
+            )}
+          </p>
+        </div>
+      </div>
       <div className={styles.subtitle}>User Statistics</div>
       <div className={styles.statssection}>
         <ProfileCard
@@ -81,15 +89,14 @@ const UserInfo = ({
         ></ProfileCard>
       </div>
       {!showMajorUpdate && (
-        <button
-          className={styles.btn}
-          onClick={() => setShowMajorUpdate(true)}
-        >
-          {userMajors.length === 0 ? "Set your major(s)" : "Update your major(s)"}
+        <button className={styles.btn} onClick={() => setShowMajorUpdate(true)}>
+          {userMajors.length === 0
+            ? 'Set your major(s)'
+            : 'Update your major(s)'}
         </button>
       )}
       {showMajorUpdate && (
-        <div>
+        <div className={styles.majorcard}>
           <MultiSelect
             options={majorOptions}
             value={selectedMajors}
@@ -102,12 +109,17 @@ const UserInfo = ({
               className={styles.btn}
               onClick={updateMajors}
               disabled={!validMajor}
-              title={validMajor ? "" : "Majors have not been changed"}
+              title={validMajor ? '' : "You've already selected these majors!"}
             >
-              {(selectedMajors.length === 0 && validMajor) ? "Submit (clear)" : "Submit"}
+              {selectedMajors.length === 0 && validMajor
+                ? 'Submit (clear)'
+                : 'Submit'}
             </button>
-            <button className={styles.btn} onClick={() => setShowMajorUpdate(false)}>
-              Close menu
+            <button
+              className={styles.btn}
+              onClick={() => setShowMajorUpdate(false)}
+            >
+              Cancel
             </button>
           </div>
         </div>
diff --git a/client/src/modules/Profile/Styles/UserInfo.module.css b/client/src/modules/Profile/Styles/UserInfo.module.css
index 7c4cd3bf..0a365237 100644
--- a/client/src/modules/Profile/Styles/UserInfo.module.css
+++ b/client/src/modules/Profile/Styles/UserInfo.module.css
@@ -29,10 +29,20 @@
   text-align: center;
 }
 
+.bold {
+  font-weight: 700;
+}
+
 .netid {
   text-align: center;
   color: var(--clr-gray-300);
-  font-size: 0.85em;
+  font-size: 1em;
+}
+
+.majorcard {
+  background: var(--clr-gray-100);
+  border-radius: 10px;
+  padding: 12px;
 }
 
 .statssection {