yazan/ironGym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: yazan:6babb7fe2033eebb1f46a3aeb8db11bc2e1e64d7
Branches Tags
yazan:main
..
compare: yazan:8d1c19e5b04714206356e171ed21f3b891c3680c
Branches Tags
yazan:main

No commits in common. "6babb7fe2033eebb1f46a3aeb8db11bc2e1e64d7" and "8d1c19e5b04714206356e171ed21f3b891c3680c" have entirely different histories.
6babb7fe20 ... 8d1c19e5b0

2 changed files with 89 additions and 90 deletions
Show Stats Expand all files Collapse all files

4
webapp/src/app/api/auth/route.ts
View File

@ -65,7 +65,7 @@ export async function POST(req : Request)
$set: {
"token" : {
value: authToken,
expiresAt: Math.floor(Date.now() / 1000) + 30 * 60 * 60,
expiresAt: Math.floor(Date.now() / 1000) + 3 * 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)) //1000 for 3 hours
if(userDoc.token.expiresAt < (Date.now() / 1000))
{
console.log('SERVER ::: token expired')
throw {

37
webapp/src/components/dashboard/home/membersOverviewChart.tsx
View File

@ -10,7 +10,8 @@ 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)
@ -28,7 +29,8 @@ 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
@ -84,15 +86,9 @@ export default function MembersOverviewChart() {
}
}
// if there is a data from the backend we overwrite the currentData
// if(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;
if(report?.membersGeneralOverview?.value.thisWeek.days) {
data_thisWeek = report?.membersGeneralOverview?.value.thisWeek.days;
}
// prepare the chart series
setChartSeries([
{
@ -118,7 +114,8 @@ 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 : {
@ -129,7 +126,8 @@ 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,
@ -287,7 +285,8 @@ 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
@ -301,7 +300,8 @@ 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,15 +400,13 @@ 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
@ -566,7 +564,8 @@ export default function MembersOverviewChart() {
tickAmount: 7,
labels: {
formatter: (value: number) => {
if (value > 1000) {
if(value > 1000)
{
return parseInt(value.toFixed(0)) + t('k')
}
else {