Merge pull request #650 from tekdi/main-learner

Main learner qa

Author: rushi-tekdi

apps/learner-web-app/src/app/change-password/page.tsx

@@ -14,7 +14,7 @@ import PasswordResetSuccess from '@forget-password/Components/PasswordResetSucce
 import { login, resetPassword } from '@learner/utils/API/LoginService';
 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
 import Layout from '../../components/Layout';
-
+import { checkAuth } from '@shared-lib-v2/utils/AuthService';
 const ChangePassword = () => {
   const [otp, setOtp] = useState<string[]>(['', '', '', '']);
   const [otpmodal, setOtpModal] = useState(false);
@@ -131,6 +131,12 @@ const ChangePassword = () => {
 
     setResetPasswordSuccessModal(false);
   };
+  useEffect(() => {
+    // const token = localStorage.getItem('token');
+    if (!checkAuth()) {
+      router.push('/login');
+    }
+  }, []);
 
   return (
     <>

apps/learner-web-app/src/app/change-username/page.tsx

@@ -12,6 +12,8 @@ import UsernameSuggestion from '@learner/components/UsernameSuggestion/UsernameS
 import { updateUser, userNameExist } from '@learner/utils/API/userService';
 import js from '@eslint/js';
 import SimpleModal from '@learner/components/SimpleModal/SimpleModal';
+import { checkAuth } from '@shared-lib-v2/utils/AuthService';
+
 const ChangeUserNamePage = () => {
   const router = useRouter();
   const [username, setUsername] = useState('');
@@ -86,6 +88,11 @@ const ChangeUserNamePage = () => {
     setUsernameChangedSuceesModal(false);
     router.push('/profile');
   };
+  useEffect(() => {
+    if (!checkAuth()) {
+      router.push('/login');
+    }
+  }, []);
   return (
     <Layout>
       <Box

apps/learner-web-app/src/app/login/page.tsx

@@ -11,6 +11,7 @@ import { useRouter } from 'next/navigation';
 import { useMediaQuery, useTheme } from '@mui/material';
 import FingerprintJS from '@fingerprintjs/fingerprintjs';
 import { Loader, useTranslation } from '@shared-lib';
+import { preserveLocalStorage } from '@learner/utils/helper';
 
 const Login = dynamic(
   () => import('@login/Components/LoginComponent/LoginComponent'),
@@ -31,6 +32,9 @@ const LoginPage = () => {
   useEffect(() => {
     const init = async () => {
       try {
+        // localStorage.clear();()
+        preserveLocalStorage();
+
         const access_token = localStorage.getItem('token');
         const refresh_token = localStorage.getItem('refreshToken');
         if (access_token) {
@@ -91,6 +95,7 @@ const LoginPage = () => {
         display="flex"
         flexDirection="column"
         overflow="hidden"
+        sx={{ overflowWrap: 'break-word', wordBreak: 'break-word' }}
       >
         {/* Fixed Header */}
         <Header />

apps/learner-web-app/src/app/profile-complition/page.tsx

@@ -7,7 +7,6 @@ import { useSearchParams } from 'next/navigation';
 const ProfileComplitionInner = () => {
   const searchParams = useSearchParams();
   const isComplition = searchParams.get('isComplition');
-
   return <EditProfile completeProfile={isComplition ? true : false} />;
 };
 

apps/learner-web-app/src/app/profile/page.tsx

@@ -7,6 +7,8 @@ import UserProfileCard from '@learner/components/UserProfileCard/UserProfileCard
 import CourseCertificateCard from '@learner/components/CourseCertificateCard/CourseCertificateCard';
 import { courseWiseLernerList } from '@shared-lib-v2/utils/CertificateService/coursesCertificates';
 import { CertificateModal, get } from '@shared-lib';
+import { useRouter } from 'next/navigation';
+import { checkAuth } from '@shared-lib-v2/utils/AuthService';
 
 import { baseurl } from '@learner/utils/API/EndUrls';
 type FilterDetails = {
@@ -15,6 +17,8 @@ type FilterDetails = {
   userId?: string;
 };
 const ProfilePage = () => {
+  const router = useRouter();
+
   const [filters] = useState<FilterDetails>({
     status: ['completed', 'viewCertificate'],
     tenantId:
@@ -81,7 +85,12 @@ const ProfilePage = () => {
     };
     prepareCertificateData();
   }, []);
-
+  useEffect(() => {
+    // const token = localStorage.getItem('token');
+    if (!checkAuth()) {
+      router.push('/login');
+    }
+  }, []);
   return (
     <Layout>
       <Box display="flex" flexDirection={{ xs: 'column', md: 'row' }} gap={2}>

apps/learner-web-app/src/app/registration/RegisterUser.tsx

@@ -68,6 +68,8 @@ const RegisterUser = () => {
   const [username, setUsername] = useState('');
   const [password, setPassword] = useState('');
   const [mobile, setMobile] = useState('');
+  const [tenantName, setTenantName] = useState('');
+
   const router = useRouter();
 
   const [confirmPassword, setConfirmPassword] = useState('');
@@ -77,6 +79,10 @@ const RegisterUser = () => {
   // const [schema, setSchema] = useState(facilitatorSearchSchema);
   // const [uiSchema, setUiSchema] = useState(facilitatorSearchUISchema);
   function checkTenantId(tenantIdToCheck: any, tenantData: any) {
+    const name = tenantData?.find(
+      (item: any) => item.tenantId === tenantIdToCheck
+    ).name;
+    setTenantName(name);
     return tenantData?.some((item: any) => item.tenantId === tenantIdToCheck);
   }
   useEffect(() => {
@@ -480,7 +486,7 @@ const RegisterUser = () => {
             }}
           >
             <Typography variant="h2" fontWeight="bold" gutterBottom>
-              Sign Up for YouthNet
+              Sign Up for {tenantName}
             </Typography>
 
             <Typography variant="body1" color="text.secondary" mb={2}>

apps/learner-web-app/src/components/EditProfile/EditProfile.tsx

@@ -27,6 +27,8 @@ import ArrowBackIcon from '@mui/icons-material/ArrowBack';
 //build issue fix for  ⨯ useSearchParams() should be wrapped in a suspense boundary at page
 import { useSearchParams } from 'next/navigation';
 import { getTenantInfo } from '@learner/utils/API/ProgramService';
+import { checkAuth } from '@shared-lib-v2/utils/AuthService';
+
 import Image from 'next/image';
 import { set } from 'lodash';
 import {
@@ -65,7 +67,12 @@ const EditProfile = ({ completeProfile }: EditProfileProps) => {
 
   // const [schema, setSchema] = useState(facilitatorSearchSchema);
   // const [uiSchema, setUiSchema] = useState(facilitatorSearchUISchema);
-
+  useEffect(() => {
+    // const token = localStorage.getItem('token');
+    if (!checkAuth()) {
+      router.push('/login');
+    }
+  }, []);
   useEffect(() => {
     // Fetch form schema from API and set it in state.
     const fetchData = async () => {

apps/learner-web-app/src/components/UserProfileCard/UserProfileCard.tsx

@@ -187,7 +187,7 @@ const UserProfileCard = () => {
   };
 
   return (
-    <Box>
+    <Box sx={{ overflowWrap: 'break-word', wordBreak: 'break-word' }}>
       <Box
         sx={{
           background: 'linear-gradient(to bottom, #FFFDF6, #F8EFDA)',

apps/learner-web-app/src/utils/helper.ts

@@ -195,3 +195,30 @@ export const maskMobileNumber = (mobile: string) => {
     return first + masked + last;
   }
 };
+export const preserveLocalStorage = () => {
+  const keysToKeep = [
+    'preferredLanguage',
+    'mui-mode',
+    'mui-color-scheme-dark',
+    'mui-color-scheme-light',
+    'hasSeenTutorial',
+    'lang',
+  ];
+
+  const valuesToKeep: { [key: string]: any } = {};
+
+  keysToKeep.forEach((key: string) => {
+    const value = localStorage.getItem(key);
+    if (value !== null) {
+      valuesToKeep[key] = value;
+    }
+  });
+
+  localStorage.clear();
+
+  keysToKeep.forEach((key: string) => {
+    if (valuesToKeep[key] !== undefined) {
+      localStorage.setItem(key, valuesToKeep[key]);
+    }
+  });
+};

libs/shared-lib-v2/src/lib/context/LanguageContext.tsx

@@ -68,14 +68,15 @@ export const LanguageProvider: React.FC<LanguageProviderProps> = ({
   // Translate function
   const t = useMemo(() => {
     return (key: string): string => {
-      const keys = key.split('.');
+      const keys = key?.split('.');
       let result: any = translations[language];
-
-      for (const k of keys) {
-        if (result?.[k] === undefined) {
-          return key; // fallback if any level is missing
+      if (keys) {
+        for (const k of keys) {
+          if (result?.[k] === undefined) {
+            return key; // fallback if any level is missing
+          }
+          result = result[k];
         }
-        result = result[k];
       }
 
       return typeof result === 'string' ? result : key;