Add ss 120

webapp/src/app/api/auth/route.ts

@@ -65,7 +65,7 @@ export async function POST(req : Request)
                     $set: {
                         "token" : {
                             value: authToken,
-                            expiresAt: Math.floor(Date.now() / 1000) + 3 * 60 * 60,
+                            expiresAt: Math.floor(Date.now() / 1000) + 30 * 60 * 60,
                         }
                     }
                 })
@@ -138,7 +138,7 @@ export async function GET(req: Request)
             }
             // if the authToken if valid we check if it expired or not yet
             // we throw error if expired
-            if(userDoc.token.expiresAt < (Date.now() / 1000))
+            if(userDoc.token.expiresAt < (Date.now() / 1000))  //1000 for 3 hours
             {
                 console.log('SERVER ::: token expired')
                 throw {

webapp/src/components/dashboard/home/membersOverviewChart.tsx

@@ -10,8 +10,7 @@ import { useDispatch } from 'react-redux';
 import { AppDispatch } from '@/redux/store';
 import { setCurrentMembersGeneralOverviewDuration } from '@/redux/features/statistics-slice'
 
-export default function MembersOverviewChart()
+export default function MembersOverviewChart() {
-{
     // get needed redux state
     const report = useAppSelector((state) => state.statisticsReducer.value.report)
     const currentMembersGeneralOverviewDuration = useAppSelector((state) => state.statisticsReducer.value.currentMembersGeneralOverviewDuration)
@@ -29,8 +28,7 @@ export default function MembersOverviewChart()
     // prepare chart series and handle the transaction between currentMembersGeneralOverviewDuration
     useEffect(() => {
         // if chart duration is set to this week
-        if(currentMembersGeneralOverviewDuration == 'thisWeek')
+        if (currentMembersGeneralOverviewDuration == 'thisWeek') {
-        {
             // set the labels       
             setLabels([t('sat'), t('sun'), t('mon'), t('tue'), t('wed'), t('thu'), t('fri')])
             // init this weekdata
@@ -86,9 +84,15 @@ export default function MembersOverviewChart()
                 }
             }
             // if there is a data from the backend we overwrite the currentData
-            if(report?.membersGeneralOverview?.value.thisWeek.days) {        
+            // if(report?.membersGeneralOverview?.value.thisWeek.days) {        
-                data_thisWeek = report?.membersGeneralOverview?.value.thisWeek.days;
+            //     data_thisWeek = report?.membersGeneralOverview?.value.thisWeek.days;
+            // }
+
+            // To this:
+            if (report?.membersGeneralOverview?.thisWeek?.days) {
+                data_thisWeek = report.membersGeneralOverview.thisWeek.days;
             }
+
             // prepare the chart series
             setChartSeries([
                 {
@@ -114,8 +118,7 @@ export default function MembersOverviewChart()
             ])
         }
         // if chart duration is set to this month
-        else if(currentMembersGeneralOverviewDuration == 'thisMonth')
+        else if (currentMembersGeneralOverviewDuration == 'thisMonth') {
-        {
             let thisMonthTotalSum: {
                 week: number,
                 thisWeekSum: {
@@ -126,8 +129,7 @@ export default function MembersOverviewChart()
                     "totalGirlsMembers": number
                 }
             }[];
-            if(report?.membersGeneralOverview?.value.thisMonth)
+            if (report?.membersGeneralOverview?.value.thisMonth) {
-            {
                 // if we founded a data for the current month
                 thisMonthTotalSum = report?.membersGeneralOverview?.value.thisMonth.weeks.map((v: any, i: number): {
                     week: number,
@@ -285,8 +287,7 @@ export default function MembersOverviewChart()
             }
         }
         // if chart duration is set to this month
-        else if(currentMembersGeneralOverviewDuration == 'thisYear')
+        else if (currentMembersGeneralOverviewDuration == 'thisYear') {
-        {
             // set the labels       
             setLabels([t('1month'), t('2month'), t('3month'), t('4month'), t('5month'), t('6month'), t('7month'), t('8month'), t('9month'), t('10month'), t('11month')])
             // check if there is current month report
@@ -300,8 +301,7 @@ export default function MembersOverviewChart()
                     "totalGirlsMembers": number
                 }
             }[]
-            if(report?.membersGeneralOverview?.value.thisYear)
+            if (report?.membersGeneralOverview?.value.thisYear) {
-            {
                 // if we founded a data for the current month
                 thisYearTotalSum = report?.membersGeneralOverview?.value.thisYear.months.map((v: any, i: number): {
                     month: number,
@@ -400,13 +400,15 @@ export default function MembersOverviewChart()
                         "totalGirlsMembers": 0
                     }
 
-                    summedWeeks.map((v : {week: number, weekSum: {
+                    summedWeeks.map((v: {
+                        week: number, weekSum: {
                             "totalMembers": number,
                             "totalActiveSubs": number,
                             "totalUnActiveSubs": number,
                             "totalMansMembers": number,
                             "totalGirlsMembers": number
-                    }[]},i : number) => {
+                        }[]
+                    }, i: number) => {
                         thisMonthWeeksSum.totalMembers += v.weekSum[0].totalMembers
                         thisMonthWeeksSum.totalActiveSubs += v.weekSum[0].totalActiveSubs
                         thisMonthWeeksSum.totalUnActiveSubs += v.weekSum[0].totalUnActiveSubs
@@ -564,8 +566,7 @@ export default function MembersOverviewChart()
                 tickAmount: 7,
                 labels: {
                     formatter: (value: number) => {
-                        if(value > 1000)
+                        if (value > 1000) {
-                        {
                             return parseInt(value.toFixed(0)) + t('k')
                         }
                         else {