diff --git a/src/modules/Dashboard/modules/Profile/components/BasicDetails/pages/BasicDetails.module.css b/src/modules/Dashboard/modules/Profile/components/BasicDetails/pages/BasicDetails.module.css index 34dd94844..88270e6db 100644 --- a/src/modules/Dashboard/modules/Profile/components/BasicDetails/pages/BasicDetails.module.css +++ b/src/modules/Dashboard/modules/Profile/components/BasicDetails/pages/BasicDetails.module.css @@ -122,7 +122,7 @@ & p { padding: 5px; - width: 80px; + width: 50px; border-radius: 8px; margin-left: 10px; text-align: center; @@ -130,21 +130,6 @@ } } - .igText { - display: flex; - flex-direction: column; - line-height: 1.2; - } - - .igName { - font-weight: 600; - font-size: 0.9rem; - } - - .igKarma { - font-size: 0.9rem; - } - .igs_add { display: flex; align-items: center; diff --git a/src/modules/Dashboard/modules/Profile/components/BasicDetails/pages/BasicDetails.tsx b/src/modules/Dashboard/modules/Profile/components/BasicDetails/pages/BasicDetails.tsx index 0096d9646..4e4753b2d 100644 --- a/src/modules/Dashboard/modules/Profile/components/BasicDetails/pages/BasicDetails.tsx +++ b/src/modules/Dashboard/modules/Profile/components/BasicDetails/pages/BasicDetails.tsx @@ -10,19 +10,16 @@ type Props = { }; const BasicDetails = (props: Props) => { const [editIg, setEditIg] = useState(false); - const [allIg, setAllIg] = useState([]); - const [ig, setIg] = useState(props.userProfile.interest_groups); + const [allIg, setAllIg] = useState([]); + const [ig, setIg] = useState(props.userProfile.interest_groups); const { id } = useParams<{ id: string }>(); useEffect(() => { getAllIg(setAllIg); }, []); - const ig_sorted = [...ig] - .filter((ig) => ig.selected) - .sort((a, b) => a.name.localeCompare(b.name)); - - const capitalize = (text = "") => - text.charAt(0).toUpperCase() + text.slice(1); + const ig_sorted = ig.sort((a: any, b: any) => { + return a.name > b.name ? 1 : -1; + }); return ( <> @@ -73,51 +70,58 @@ const BasicDetails = (props: Props) => {
- {ig_sorted.length > 0 ? ( - ig_sorted.map((data: any, i: number) => ( -
- {editIg && ( - { - if (ig_sorted.length > 1) { - setIg((prev) => - prev.map((item) => - item.name === data.name - ? { ...item, selected: false } - : item - ) - ); - } else { - toast.error( - "You must have at least one interest group" - ); - } - }} - className="fi fi-sr-circle-xmark" - > - )} -
- {data.name} - - Karma:{" "} - {data.karma != null && data.karma > 1000 - ? (data.karma / 1000).toPrecision(2) + "K" - : data.karma ?? "0"} - + {props.userProfile.interest_groups.length !== 0 ? ( + ig.map((data: any, i: number) => { + return ( +
+ {editIg && ( + { + if (ig.length > 1) { + setIg( + ig.filter( + (ig: any) => + ig.name !== + data.name + ) + ); + } else { + toast.error( + "You must have at least one interest group" + ); + } + }} + className="fi fi-sr-circle-xmark" + > + )} + {data.name} +

+ {data.karma !== null + ? data.karma > 1000 + ? ( + data.karma / 1000 + ).toPrecision(2) + "K" + : data.karma + ? data.karma + : "0" + : "0"} +

-

- {capitalize(data.level.unit)}{" "} - {data.level.count} -

-
- )) + ); + }) ) : (

- No Interest Groups Selected, Must be level 4 or above to select + No Interest Groups to Selected, Must be level 4 or above to select

)} {editIg &&
} @@ -125,66 +129,47 @@ const BasicDetails = (props: Props) => { {editIg && (
{allIg - .filter( - (data: any) => - !ig.some( - (item: any) => - item.name === data.name && item.selected - ) - ) - .map((data: any, i: number) => ( -
- { - if (ig_sorted.length < 3) { - if (ig.some((item) => item.name === data.name)) { - setIg((prev) => - prev.map((item) => - item.name === data.name - ? { ...item, selected: true } - : item - ) - ); - } else { - setIg((prev) => { - const exists = prev.some( - (item: any) => item.name === data.name + .filter((data: any) => { + return !ig.some( + (ig: any) => ig.name === data.name + ); + }) + .map((data: any, i: number) => { + return ( +
+ { + { + ig.length < 3 && + setIg( + ( + prevState: any + ) => [ + ...prevState, + data + ] ); - if (exists) { - return prev.map((item: any) => - item.name === data.name - ? { ...item, selected: true } - : item - ); - } - return [ - ...prev, - { ...data, selected: true }, - ]; - }); } - } else { - toast.error("You can only select up to 3 interest groups"); - } - // editIgDetails( - // toast, - // [...ig, data].map( - // (ig: any) => { - // return ig.id; - // } - // ) - // ).then(() => { - // // getIgDetails( - // // toast, - // // setIg - // // ); - // }); - }} - className="fi fi-sr-add" - > - {data.name} -
- ))} + // editIgDetails( + // toast, + // [...ig, data].map( + // (ig: any) => { + // return ig.id; + // } + // ) + // ).then(() => { + // // getIgDetails( + // // toast, + // // setIg + // // ); + // }); + }} + className="fi fi-sr-add" + >
+ {data.name} +
+ ); + })}
)}
diff --git a/src/modules/Dashboard/modules/Profile/pages/Profile.tsx b/src/modules/Dashboard/modules/Profile/pages/Profile.tsx index 1ced9465b..b22a5bc07 100644 --- a/src/modules/Dashboard/modules/Profile/pages/Profile.tsx +++ b/src/modules/Dashboard/modules/Profile/pages/Profile.tsx @@ -72,7 +72,7 @@ const Profile = () => { full_name: "", college_code: "", college_id: "", - interest_groups: [{ name: "", karma: 0, selected: true, level: { count: 0, unit: "level" } }], + interest_groups: [{ name: "", karma: 0 }], karma_distribution: [{ task_type: "", karma: 0 }], gender: "", id: "",