Merge pull request #623 from AkshataKatwal16/login-fix

Issue feat: login, profile fixes

Author: rushi-tekdi

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

@@ -22,7 +22,9 @@ const LoginPage = () => {
   const router = useRouter();
   const theme = useTheme();
   const isMobile = useMediaQuery(theme.breakpoints.down('sm'));
-  const handleAddAccount = () => {};
+  const handleAddAccount = () => {
+    router.push('/');
+  };
 
   useEffect(() => {
     const init = async () => {

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

@@ -7,6 +7,7 @@ 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 { baseurl } from '@learner/utils/API/EndUrls';
 type FilterDetails = {
   status?: string[];
@@ -16,10 +17,8 @@ type FilterDetails = {
 const ProfilePage = () => {
   const [filters] = useState<FilterDetails>({
     status: ['completed', 'viewCertificate'],
-    tenantId:
-      (typeof window !== 'undefined' && localStorage.getItem('tenantId')) || '',
-    userId:
-      (typeof window !== 'undefined' && localStorage.getItem('userId')) || '',
+    tenantId: localStorage.getItem('tenantId') || '',
+    userId: localStorage.getItem('userId') || '',
   });
   const [showCertificate, setShowCertificate] = useState(false);
   const [certificateId, setCertificateId] = useState('');
@@ -61,7 +60,7 @@ const ProfilePage = () => {
             userId: item.userId,
             courseId: item.courseId,
             certificateId: item.certificateId,
-            completedOn: item.completedOn,
+            completedOn: item.issuedOn,
             description: courseDetails.description || '',
             posterImage: courseDetails.posterImage || '',
             program: courseDetails.program || [],

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

@@ -41,7 +41,7 @@ const CourseCertificateCard: React.FC<CertificateCardProps> = ({
         <CardMedia
           component="img"
           height="200"
-          image={imageUrl || '/images/default.png'}
+          image={imageUrl || '/images/image_ver.png'}
           alt={title}
           sx={{
             width: '100%',
@@ -71,7 +71,14 @@ const CourseCertificateCard: React.FC<CertificateCardProps> = ({
               fontSize: 12,
             }}
           >
-            Completed on {completionDate}
+            Issued certificate on{' '}
+            {new Date(completionDate)
+              .toLocaleDateString('en-US', {
+                day: 'numeric',
+                month: 'long',
+                year: 'numeric',
+              })
+              .replace(',', ',')}
           </Typography>
         </Box>
       </Box>

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

@@ -51,7 +51,7 @@ const App: React.FC<LayoutProps> = ({ children, ...props }) => {
         title: t('LEARNER_APP.COMMON.PROFILE'),
         icon: <AccountBox />,
         to: () => router.push('/profile'),
-        isActive: currentPage === '/content',
+        isActive: currentPage === '/profile',
       },
     ]);
   }, [t, router]);