diff --git a/src/modules/Common/Authentication/pages/Onboarding/UserInterest/UserInterest.tsx b/src/modules/Common/Authentication/pages/Onboarding/UserInterest/UserInterest.tsx index 68b821748..1858ece18 100644 --- a/src/modules/Common/Authentication/pages/Onboarding/UserInterest/UserInterest.tsx +++ b/src/modules/Common/Authentication/pages/Onboarding/UserInterest/UserInterest.tsx @@ -23,18 +23,19 @@ const CheckMark = () => ( ); const INITIAL_INTERESTS = [ - { title: "Software", value: "software", img: software, checked: false }, - { title: "Maker", value: "maker", img: maker, checked: false }, - { title: "Management", value: "management", img: management, checked: false }, + { title: "Coder", value: "coder", img: software, checked: false }, + { title: "Hardware", value: "hardware", img: maker, checked: false }, + { title: "Manager", value: "manager", img: management, checked: false }, { title: "Creative", value: "creative", img: creative, checked: false }, { title: "Others", value: "others", img: others, checked: false } ]; const INITIAL_ENDGOALS = [ { title: "Job", value: "job", checked: false }, - { title: "Higher Education", value: "higher_education", checked: false }, + { title: "Research & Development", value: "r&d", checked: false }, { title: "Entrepreneurship", value: "entrepreneurship", checked: false }, { title: "Gig Works", value: "gig_work", checked: false }, + { title: "Higher Education", value: "higher_education", checked: false }, { title: "Others", value: "others", checked: false } ]; @@ -201,9 +202,9 @@ export default function UserInterest() {
mulearn -

{stepTwo ? "What describes you the most!" : "Your dynamic area of interest!"}

+

{stepTwo ? "What do you expect by MuLearning " : "What describes you the most!"}

- {stepTwo ? "Choose one or goals you expect from µLearn." : "Please select your interested area"} + {stepTwo ? "Pick your goal." : "Please select your interested area"}

{stepTwo ? renderItems(endgoals, false) : renderItems(interests, true)} diff --git a/src/modules/Dashboard/components/SideNavBarBody.tsx b/src/modules/Dashboard/components/SideNavBarBody.tsx index 6e2d60a43..48992a133 100644 --- a/src/modules/Dashboard/components/SideNavBarBody.tsx +++ b/src/modules/Dashboard/components/SideNavBarBody.tsx @@ -191,7 +191,7 @@ const SideNavBarBody = ({ } - onClick={() => navigate("/dashboard/settings")} + onClick={() => navigate("/dashboard/settings/account")} style={{ color: "#9297AA", backgroundColor: "#fff" diff --git a/src/modules/Dashboard/modules/InterestGroup/InterestGroupForm.tsx b/src/modules/Dashboard/modules/InterestGroup/InterestGroupForm.tsx index 9a43ef6fd..196aac755 100644 --- a/src/modules/Dashboard/modules/InterestGroup/InterestGroupForm.tsx +++ b/src/modules/Dashboard/modules/InterestGroup/InterestGroupForm.tsx @@ -16,11 +16,11 @@ const IntrestGroupForm = forwardRef( category: "others" }); const interestGroup = [ - { label: "Software", value: "software" }, - { label: "Maker", value: "maker" }, + { label: "Coder", value: "coder" }, + { label: "Hardware", value: "hardware" }, { - label: "Management", - value: "management" + label: "Manager", + value: "manager" }, { label: "Creative", value: "creative" }, { label: "Others", value: "others" } diff --git a/src/modules/Dashboard/modules/Settings/pages/Organization/Organization.tsx b/src/modules/Dashboard/modules/Settings/pages/Organization/Organization.tsx index 59a125bfe..bb29ca52d 100644 --- a/src/modules/Dashboard/modules/Settings/pages/Organization/Organization.tsx +++ b/src/modules/Dashboard/modules/Settings/pages/Organization/Organization.tsx @@ -12,6 +12,7 @@ import { } from "../../../../../Common/Authentication/services/newOnboardingApis"; import ReactSelect, { SingleValue } from "react-select"; import { useLocation, useNavigate } from "react-router-dom"; +import { selectOrganization } from "../../settingsApis"; // Define the Option type for ReactSelect type Option = { @@ -61,7 +62,9 @@ export default function CollegePage({}: {}) { const [roles, setRoles] = useState([{ id: "", title: "" }]); const [selectedCollege, setSelectedCollege] = useState