fix: hotfix for career page language selection and profile registrati…

…on (#501)

* fix: adding unblur message and fixing language selection

* fix: fixing user preregister profile

* feat: redirect to application link

apps/career/src/App.tsx

@@ -27,6 +27,7 @@ const PageRoutes = ({
   profile,
   setProfile,
   isRegistered,
+  setIsRegistered,
   onJobApplied,
 }: CareerComponentProps) => {
   return (
@@ -38,6 +39,7 @@ const PageRoutes = ({
             profile={profile}
             setProfile={setProfile}
             isRegistered={isRegistered}
+            setIsRegistered={setIsRegistered}
           />
         }
         path="/"
@@ -168,7 +170,9 @@ const InnerApp = () => {
             profile={profile}
             setProfile={setProfile}
             isRegistered={isRegistered}
+            setIsRegistered={setIsRegistered}
             onJobApplied={handleJobApplied}
+            setIsRegsitered={setIsRegistered}
           />
         </div>
       </div>

apps/career/src/components/common/AgreeModal.tsx

@@ -20,7 +20,14 @@ const AgreeModal: React.FC<AgreeModalProps> = ({
 }) => {
   const handleAgree = async () => {
     try {
-      const idToken = await getIdToken() // Correctly awaiting the Promise
+      // Check if job.apply is a URL and redirect if so
+      if (job.apply) {
+        window.open(job.apply, "_blank") // Open the URL in a new tab
+        onAgree() // Optionally call onAgree if needed after redirection
+        return // Return early to avoid executing the rest of the function
+      }
+
+      const idToken = await getIdToken() // Continue with existing logic if job.apply is not a URL
       if (idToken) {
         await postApplication(profile, job, idToken)
         onAgree()

apps/career/src/components/joblist/Joblist.tsx

@@ -13,6 +13,7 @@ const Joblist: React.FC<CareerComponentProps> = ({
   profile,
   setProfile,
   isRegistered,
+  setIsRegistered,
 }) => {
   const [isSignInModalOpen, setSignInModalOpen] = useState(false)
   const [isLoggedIn, setIsLoggedIn] = useState(false)
@@ -68,7 +69,12 @@ const Joblist: React.FC<CareerComponentProps> = ({
                   setProfile={setProfile}
                 />
               ) : (
-                <PreRegisterProfile profile={profile} setProfile={setProfile} />
+                <PreRegisterProfile
+                  isRegistered={isRegistered}
+                  profile={profile}
+                  setIsRegistered={setIsRegistered}
+                  setProfile={setProfile}
+                />
               )}
             </div>
           </div>

apps/career/src/components/joblist/PreRegisterProfile.tsx

@@ -5,6 +5,8 @@ import CareerComponentProps from "@app/types/careerComponentProps"
 import ProfileComponentProps from "@app/types/profileComponentProps"
 
 const PreRegisterProfile: React.FC<ProfileComponentProps> = ({
+  isRegistered,
+  setIsRegistered,
   profile,
   setProfile,
 }) => {
@@ -26,6 +28,9 @@ const PreRegisterProfile: React.FC<ProfileComponentProps> = ({
         </div>
       </div>
       <div className="p-4">
+        <p className="font-bold leading-relaxed">
+          Register profile to unblur detail!
+        </p>
         <p className="leading-relaxed">
           Please register your user profile to apply for WasedaTime Careers. The
           data collected is isolated and will only be used in the Careers page.
@@ -45,6 +50,7 @@ const PreRegisterProfile: React.FC<ProfileComponentProps> = ({
           profile={profile}
           setProfile={setProfile}
           closeModal={toggleModal}
+          setIsRegistered={setIsRegistered}
         />
       )}
     </div>

apps/career/src/components/joblist/ProfileModal.tsx

@@ -25,6 +25,7 @@ const ProfileModal: React.FC<ProfileModalProps> = ({
   setProfile,
   closeModal,
   isRegistered,
+  setIsRegistered,
 }) => {
   const [expandSchool, setExpandSchool] = useState(false)
   const [userToken, setUserToken] = useState("")
@@ -69,7 +70,9 @@ const ProfileModal: React.FC<ProfileModalProps> = ({
 
       // Handling language and level dropdowns
       if (name.startsWith("language") || name.startsWith("Level")) {
-        const index = name.endsWith("2") ? 1 : 0 // Determine the index based on the dropdown name
+        // Extract the number from the name to determine the index
+        const indexMatch = name.match(/\d+/)
+        const index = indexMatch ? parseInt(indexMatch[0], 10) - 1 : 0
         const key = name.startsWith("language") ? "language" : "level"
 
         // Update the specific language or level
@@ -125,15 +128,23 @@ const ProfileModal: React.FC<ProfileModalProps> = ({
     }
   }
 
-  const handleSubmit = () => {
-    if (isRegistered) {
-      patchProfile(profile)
-    } else {
-      postProfile(profile)
+  const handleSubmit = async () => {
+    try {
+      if (isRegistered) {
+        await patchProfile(profile)
+      } else {
+        await postProfile(profile)
+        if (setIsRegistered) {
+          setIsRegistered(true)
+        }
+      }
+    } catch (error) {
+      console.error("Error in submitting profile:", error)
+    } finally {
+      closeModal()
     }
-
-    closeModal()
   }
+
   return (
     <div className="fixed inset-0 z-[1000] h-full w-full overflow-y-auto bg-gray-600 bg-opacity-50">
       <div className="flex h-full items-center justify-center">

apps/career/src/types/careerComponentProps.ts

@@ -5,6 +5,7 @@ type CareerComponentProps = {
   jobData: JobProps[]
   profile: UserProfile
   setProfile?: React.Dispatch<React.SetStateAction<UserProfile>>
+  setIsRegistered?: React.Dispatch<React.SetStateAction<boolean>>
   isRegistered?: boolean
   onJobApplied?: (jobId: string) => void
 }

apps/career/src/types/profileComponentProps.ts

@@ -3,7 +3,8 @@ import UserProfile from "./userProfile"
 export interface ProfileComponentProps {
   profile: UserProfile
   setProfile: React.Dispatch<React.SetStateAction<UserProfile>>
-  isRegistered?: boolean // Include only if needed in both components
+  isRegistered?: boolean
+  setIsRegistered?: React.Dispatch<React.SetStateAction<boolean>>
 }
 
 export default ProfileComponentProps