Merge pull request #147 from suvarnakale/shiksha-2.0

Issue #0000 fix: login page issues fixed
tekdi · May 23, 2024 · 33f9ccc · 33f9ccc
2 parents 3cf3e2c + a3962ea
commit 33f9ccc
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 28 deletions.
diff --git a/src/components/WeekDays.tsx b/src/components/WeekDays.tsx
@@ -21,7 +21,7 @@ const WeekDays: React.FC<WeekDaysProps> = ({ useAbbreviation }) => {
 
   const days = useAbbreviation
     ? ['S', 'M', 'T', 'W', 'T', 'F', 'S']
-    : ['Sun', 'Mon', 'Tues', 'Wed', 'Thu', 'Fri', 'Sat'];
+    : ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
 
   const currentDate = new Date();
   const currentDayIndex = currentDate.getDay();

diff --git a/src/pages/attendance-history.tsx b/src/pages/attendance-history.tsx
@@ -48,7 +48,6 @@ import { usePathname } from 'next/navigation';
 import { useRouter } from 'next/router';
 import { useTheme } from '@mui/material/styles';
 import { useTranslation } from 'next-i18next';
-
 interface user {
   userId: string;
   name: string;
@@ -59,6 +58,7 @@ interface user {
 const UserAttendanceHistory = () => {
   const theme = useTheme<any>();
   const { t } = useTranslation();
+  const { push } = useRouter();
   const [selectedDate, setSelectedDate] = useState<Date>(new Date());
   const [classId, setClassId] = React.useState('');
   const [cohortsData, setCohortsData] = React.useState<Array<cohort>>([]);
@@ -108,6 +108,18 @@ const UserAttendanceHistory = () => {
     setOpen(false);
   };
 
+  useEffect(() => {
+    if (typeof window !== 'undefined' && window.localStorage) {
+      const token = localStorage.getItem('token');
+      setLoading(false);
+      if (token) {
+        push('/dashboard');
+      } else {
+        push('/login', undefined, { locale: 'en' });
+      }
+    }
+  }, []);
+
   // API call to get center list
   useEffect(() => {
     const fetchCohortList = async () => {

diff --git a/src/pages/dashboard.tsx b/src/pages/dashboard.tsx
@@ -111,8 +111,8 @@ const Dashboard: React.FC<DashboardProps> = () => {
 
   useEffect(() => {
     if (typeof window !== 'undefined' && window.localStorage) {
-      const refreshToken = localStorage.getItem('refreshToken');
-      if (refreshToken) {
+      const token = localStorage.getItem('token');
+      if (token) {
         setIsAuthenticated(true);
       } else {
         router.push('/login');
@@ -209,10 +209,12 @@ const Dashboard: React.FC<DashboardProps> = () => {
                       const attendance = response.find(
                         (status) => status.userId === userId
                       );
-                        userAttendanceArray.push({
-                          userId,
-                          attendance: attendance?.attendance ? attendance.attendance : '',
-                        });
+                      userAttendanceArray.push({
+                        userId,
+                        attendance: attendance?.attendance
+                          ? attendance.attendance
+                          : '',
+                      });
                     });
                     return userAttendanceArray;
                   };

diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -8,28 +8,24 @@ import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
 // const Dashboard = dynamic(() => import('./Dashboard'), { ssr: false });
 
 const Home: React.FC = () => {
-  const {  push } = useRouter();
+  const { push } = useRouter();
   const { t } = useTranslation();
 
   const [loading, setLoading] = React.useState(true);
 
   useEffect(() => {
     if (typeof window !== 'undefined' && window.localStorage) {
-      const refreshToken = localStorage.getItem('refreshToken');
+      const token = localStorage.getItem('token');
       setLoading(false);
-      if (refreshToken) {
+      if (token) {
         push('/dashboard');
       } else {
         push('/login', undefined, { locale: 'en' });
       }
     }
   }, []);
 
-  return (
-    <>
-      {loading && <p>{t('COMMON.LOADING')}...</p>}
-    </>
-  );
+  return <>{loading && <p>{t('COMMON.LOADING')}...</p>}</>;
 };
 
 export async function getStaticProps({ locale }: any) {

diff --git a/src/pages/login.tsx b/src/pages/login.tsx
@@ -51,7 +51,7 @@ const LoginPage = () => {
   // const location = useLocation();
 
   const DEFAULT_POSITION: Pick<State, 'vertical' | 'horizontal'> = {
-    vertical: 'top',
+    vertical: 'bottom',
     horizontal: 'center',
   };
   const [state, setState] = React.useState<State>({
@@ -64,8 +64,8 @@ const LoginPage = () => {
     if (typeof window !== 'undefined' && window.localStorage) {
       const lang = localStorage.getItem('preferredLanguage') || 'en';
       setLanguage(lang);
-      const refreshToken = localStorage.getItem('refreshToken');
-      if (refreshToken) {
+      const token = localStorage.getItem('token');
+      if (token) {
         router.push('/dashboard');
       }
     }
@@ -222,7 +222,7 @@ const LoginPage = () => {
                   style={{
                     borderRadius: '0.5rem',
                     color: theme.palette.warning['200'],
-                    width: 'auto',
+                    width: '7rem',
                     marginBottom: '0rem',
                   }}
                 >
@@ -244,7 +244,6 @@ const LoginPage = () => {
               }}
             >
               <TextField
-                required
                 id="username"
                 InputLabelProps={{
                   shrink: true,
@@ -267,7 +266,6 @@ const LoginPage = () => {
             >
               <TextField
                 type={showPassword ? 'text' : 'password'}
-                required
                 id="password"
                 InputLabelProps={{
                   shrink: true,
@@ -294,9 +292,9 @@ const LoginPage = () => {
               />
             </Box>
 
-            <Box marginTop={'-1rem'} marginLeft={'0.5rem'}>
+            <Box marginTop={'1rem'} marginLeft={'0.5rem'}>
               <Link
-                sx={{ color: 'blue' }}
+                sx={{ color: theme.palette.secondary.main }}
                 href="https://qa.prathamteacherapp.tekdinext.com/auth/realms/pratham/login-actions/reset-credentials?client_id=security-admin-console&tab_id=R-3zEZbbbyM"
                 underline="none"
               >
@@ -313,7 +311,7 @@ const LoginPage = () => {
             <Box
               alignContent={'center'}
               textAlign={'center'}
-              marginTop={'1rem'}
+              marginTop={'5rem'}
               bottom={'1rem'}
               width={'100%'}
             >

diff --git a/src/pages/teacher-profile.tsx b/src/pages/teacher-profile.tsx
@@ -75,16 +75,15 @@ const TeacherProfile = () => {
 
   useEffect(() => {
     if (typeof window !== 'undefined' && window.localStorage) {
-      const refreshToken = localStorage.getItem('refreshToken');
-      if (refreshToken) {
+      const token = localStorage.getItem('token');
+      if (token) {
         setIsAuthenticated(true);
       } else {
         router.push('/login');
       }
     }
   }, []);
 
-
   const handleUpdateClick = async () => {
     setLoading(true);
     try {