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: { $set: {
"token" : { "token" : {
value: authToken, 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 // if the authToken if valid we check if it expired or not yet
// we throw error if expired // 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') console.log('SERVER ::: token expired')
throw { throw {

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

@ -10,7 +10,8 @@ import { useDispatch } from 'react-redux';
import { AppDispatch } from '@/redux/store'; import { AppDispatch } from '@/redux/store';
import { setCurrentMembersGeneralOverviewDuration } from '@/redux/features/statistics-slice' import { setCurrentMembersGeneralOverviewDuration } from '@/redux/features/statistics-slice'
export default function MembersOverviewChart() { export default function MembersOverviewChart()
{
// get needed redux state // get needed redux state
const report = useAppSelector((state) => state.statisticsReducer.value.report) const report = useAppSelector((state) => state.statisticsReducer.value.report)
const currentMembersGeneralOverviewDuration = useAppSelector((state) => state.statisticsReducer.value.currentMembersGeneralOverviewDuration) const currentMembersGeneralOverviewDuration = useAppSelector((state) => state.statisticsReducer.value.currentMembersGeneralOverviewDuration)
@ -22,15 +23,16 @@ export default function MembersOverviewChart() {
const locale = cookies.get("NEXT_LOCALE") const locale = cookies.get("NEXT_LOCALE")
const isRtl = locale == 'ar' ? true : false const isRtl = locale == 'ar' ? true : false
const isDark = themeType == 'dark' ? true : false const isDark = themeType == 'dark' ? true : false
const [chartSeries, setChartSeries] = useState<{}[]>([]); const [chartSeries , setChartSeries] = useState<{}[]>([]);
const [labels, setLabels] = useState<string[]>([]) const [labels , setLabels] = useState<string[]>([])
// revenue Chart // revenue Chart
// prepare chart series and handle the transaction between currentMembersGeneralOverviewDuration // prepare chart series and handle the transaction between currentMembersGeneralOverviewDuration
useEffect(() => { useEffect(() => {
// if chart duration is set to this week // if chart duration is set to this week
if (currentMembersGeneralOverviewDuration == 'thisWeek') { if(currentMembersGeneralOverviewDuration == 'thisWeek')
{
// set the labels // set the labels
setLabels([t('sat'), t('sun'), t('mon'), t('tue'), t('wed'), t('thu'), t('fri')]) setLabels([t('sat') , t('sun') , t('mon') , t('tue') , t('wed') , t('thu') , t('fri')])
// init this weekdata // init this weekdata
let data_thisWeek = { let data_thisWeek = {
'sat': { 'sat': {
@ -84,15 +86,9 @@ export default function MembersOverviewChart() {
} }
} }
// if there is a data from the backend we overwrite the currentData // 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 // prepare the chart series
setChartSeries([ setChartSeries([
{ {
@ -118,10 +114,11 @@ export default function MembersOverviewChart() {
]) ])
} }
// if chart duration is set to this month // if chart duration is set to this month
else if (currentMembersGeneralOverviewDuration == 'thisMonth') { else if(currentMembersGeneralOverviewDuration == 'thisMonth')
let thisMonthTotalSum: { {
week: number, let thisMonthTotalSum : {
thisWeekSum: { week : number,
thisWeekSum : {
"totalMembers": number, "totalMembers": number,
"totalActiveSubs": number, "totalActiveSubs": number,
"totalUnActiveSubs": number, "totalUnActiveSubs": number,
@ -129,11 +126,12 @@ export default function MembersOverviewChart() {
"totalGirlsMembers": number "totalGirlsMembers": number
} }
}[]; }[];
if (report?.membersGeneralOverview?.value.thisMonth) { if(report?.membersGeneralOverview?.value.thisMonth)
{
// if we founded a data for the current month // if we founded a data for the current month
thisMonthTotalSum = report?.membersGeneralOverview?.value.thisMonth.weeks.map((v: any, i: number): { thisMonthTotalSum = report?.membersGeneralOverview?.value.thisMonth.weeks.map((v : any , i : number) : {
week: number, week : number,
thisWeekSum: { thisWeekSum : {
"totalMembers": number, "totalMembers": number,
"totalActiveSubs": number, "totalActiveSubs": number,
"totalUnActiveSubs": number, "totalUnActiveSubs": number,
@ -143,14 +141,14 @@ export default function MembersOverviewChart() {
} => { } => {
// we init the this week sum // we init the this week sum
let thisWeekSum = { let thisWeekSum = {
"totalMembers": 0, "totalMembers": 0,
"totalActiveSubs": 0, "totalActiveSubs": 0,
"totalUnActiveSubs": 0, "totalUnActiveSubs": 0,
"totalMansMembers": 0, "totalMansMembers": 0,
"totalGirlsMembers": 0 "totalGirlsMembers": 0
} }
// we map through this month weeks // we map through this month weeks
v.days.map((w: { v.days.map((w : {
'sat': { 'sat': {
'totalMembers': number, 'totalMembers': number,
'totalActiveSubs': number, 'totalActiveSubs': number,
@ -200,10 +198,10 @@ export default function MembersOverviewChart() {
'totalMansMembers': number, 'totalMansMembers': number,
'totalGirlsMembers': number, 'totalGirlsMembers': number,
} }
}, i: number) => { } , i : number) => {
// we loop through week days and we sum there data // we loop through week days and we sum there data
Object.keys(w).forEach(function (key: "sat" | "sun" | "mon" | "tue" | "wed" | "thu" | "fri" | "_id", index: number) { Object.keys(w).forEach(function(key : "sat" | "sun" | "mon" | "tue" | "wed" | "thu" | "fri" | "_id" , index : number) {
if (key == '_id') return if(key == '_id') return
thisWeekSum.totalMembers = thisWeekSum.totalMembers + w[key].totalMembers thisWeekSum.totalMembers = thisWeekSum.totalMembers + w[key].totalMembers
thisWeekSum.totalActiveSubs = thisWeekSum.totalActiveSubs + w[key].totalActiveSubs thisWeekSum.totalActiveSubs = thisWeekSum.totalActiveSubs + w[key].totalActiveSubs
thisWeekSum.totalUnActiveSubs = thisWeekSum.totalUnActiveSubs + w[key].totalUnActiveSubs thisWeekSum.totalUnActiveSubs = thisWeekSum.totalUnActiveSubs + w[key].totalUnActiveSubs
@ -217,14 +215,14 @@ export default function MembersOverviewChart() {
thisWeekSum: thisWeekSum thisWeekSum: thisWeekSum
} }
}) })
let labels: [] = []; let labels : [] = [];
thisMonthTotalSum.forEach(function (v, i) { thisMonthTotalSum.forEach(function(v , i) {
labels.push(t('week') + ' ' + thisMonthTotalSum[i]["week"]) labels.push(t('week')+ ' ' +thisMonthTotalSum[i]["week"])
}) })
// set the labels // set the labels
setLabels(labels) setLabels(labels)
// we setup chart_series ( chart data ) // we setup chart_series ( chart data )
let a: { let a : {
name: string, name: string,
data: { data: {
"totalMembers": number, "totalMembers": number,
@ -233,7 +231,7 @@ export default function MembersOverviewChart() {
"totalMansMembers": number, "totalMansMembers": number,
"totalGirlsMembers": number "totalGirlsMembers": number
} }
}[] = ['totalMembers', 'totalActiveSubs', 'totalUnActiveSubs', 'totalMansMembers', 'totalGirlsMembers'].map((v: string, i: number): { }[] = ['totalMembers' , 'totalActiveSubs' , 'totalUnActiveSubs' , 'totalMansMembers' , 'totalGirlsMembers'].map((v : string , i : number) : {
name: string, name: string,
data: { data: {
"totalMembers": number, "totalMembers": number,
@ -243,7 +241,7 @@ export default function MembersOverviewChart() {
"totalGirlsMembers": number "totalGirlsMembers": number
} }
} => { } => {
let data = thisMonthTotalSum.map((v2: { let data = thisMonthTotalSum.map((v2 : {
week: number, week: number,
thisWeekSum: { thisWeekSum: {
"totalMembers": number, "totalMembers": number,
@ -252,8 +250,8 @@ export default function MembersOverviewChart() {
"totalMansMembers": number, "totalMansMembers": number,
"totalGirlsMembers": number "totalGirlsMembers": number
} }
}, i2: number) => { },i2 : number) => {
let index: 'totalMembers' | 'totalActiveSubs' | 'totalUnActiveSubs' | 'totalMansMembers' | 'totalGirlsMembers' = v; let index : 'totalMembers' | 'totalActiveSubs' | 'totalUnActiveSubs' | 'totalMansMembers' | 'totalGirlsMembers' = v;
return v2.thisWeekSum[index]; return v2.thisWeekSum[index];
}) })
// return the line data // return the line data
@ -268,30 +266,31 @@ export default function MembersOverviewChart() {
else { else {
setChartSeries([ setChartSeries([
{ {
name: '1' + t('week'), name: '1'+t('week'),
data: [0, 0, 0, 0, 0], data: [0,0,0,0,0],
}, },
{ {
name: '2' + t('week'), name: '2'+t('week'),
data: [0, 0, 0, 0, 0], data: [0,0,0,0,0],
}, },
{ {
name: '3' + t('week'), name: '3'+t('week'),
data: [0, 0, 0, 0, 0], data: [0,0,0,0,0],
}, },
{ {
name: '4' + t('week'), name: '4'+t('week'),
data: [0, 0, 0, 0, 0], data: [0,0,0,0,0],
} }
]) ])
} }
} }
// if chart duration is set to this month // if chart duration is set to this month
else if (currentMembersGeneralOverviewDuration == 'thisYear') { else if(currentMembersGeneralOverviewDuration == 'thisYear')
{
// set the labels // 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')]) 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 // check if there is current month report
let thisYearTotalSum: { let thisYearTotalSum : {
month: number, month: number,
thisMonthWeeksSum: { thisMonthWeeksSum: {
"totalMembers": number, "totalMembers": number,
@ -301,11 +300,12 @@ export default function MembersOverviewChart() {
"totalGirlsMembers": number "totalGirlsMembers": number
} }
}[] }[]
if (report?.membersGeneralOverview?.value.thisYear) { if(report?.membersGeneralOverview?.value.thisYear)
{
// if we founded a data for the current month // if we founded a data for the current month
thisYearTotalSum = report?.membersGeneralOverview?.value.thisYear.months.map((v: any, i: number): { thisYearTotalSum = report?.membersGeneralOverview?.value.thisYear.months.map((v : any , i : number) : {
month: number, month : number,
thisMonthWeeksSum: { thisMonthWeeksSum : {
"totalMembers": number, "totalMembers": number,
"totalActiveSubs": number, "totalActiveSubs": number,
"totalUnActiveSubs": number, "totalUnActiveSubs": number,
@ -313,9 +313,9 @@ export default function MembersOverviewChart() {
"totalGirlsMembers": number "totalGirlsMembers": number
} }
} => { } => {
let summedWeeks = v.weeks.map((w: any, i: number) => { let summedWeeks = v.weeks.map((w : any , i : number) => {
// we map through this month weeks // we map through this month weeks
let weekSum = w.days.map((d: { let weekSum = w.days.map((d : {
'sat': { 'sat': {
'totalMembers': number, 'totalMembers': number,
'totalActiveSubs': number, 'totalActiveSubs': number,
@ -365,7 +365,7 @@ export default function MembersOverviewChart() {
'totalMansMembers': number, 'totalMansMembers': number,
'totalGirlsMembers': number, 'totalGirlsMembers': number,
} }
}, i: number) => { } , i : number) => {
// we init the this week sum // we init the this week sum
let thisWeekSum = { let thisWeekSum = {
"totalMembers": 0, "totalMembers": 0,
@ -375,8 +375,8 @@ export default function MembersOverviewChart() {
"totalGirlsMembers": 0 "totalGirlsMembers": 0
} }
// we loop through week days and we sum there data // we loop through week days and we sum there data
Object.keys(d).forEach(function (key: "sat" | "sun" | "mon" | "tue" | "wed" | "thu" | "fri" | "_id", index: number) { Object.keys(d).forEach(function(key : "sat" | "sun" | "mon" | "tue" | "wed" | "thu" | "fri" | "_id" , index : number) {
if (key == '_id') return if(key == '_id') return
thisWeekSum.totalMembers = thisWeekSum.totalMembers + d[key].totalMembers thisWeekSum.totalMembers = thisWeekSum.totalMembers + d[key].totalMembers
thisWeekSum.totalActiveSubs = thisWeekSum.totalActiveSubs + d[key].totalActiveSubs thisWeekSum.totalActiveSubs = thisWeekSum.totalActiveSubs + d[key].totalActiveSubs
thisWeekSum.totalUnActiveSubs = thisWeekSum.totalUnActiveSubs + d[key].totalUnActiveSubs thisWeekSum.totalUnActiveSubs = thisWeekSum.totalUnActiveSubs + d[key].totalUnActiveSubs
@ -400,35 +400,33 @@ export default function MembersOverviewChart() {
"totalGirlsMembers": 0 "totalGirlsMembers": 0
} }
summedWeeks.map((v: { summedWeeks.map((v : {week: number, weekSum: {
week: number, weekSum: { "totalMembers": number,
"totalMembers": number, "totalActiveSubs": number,
"totalActiveSubs": number, "totalUnActiveSubs": number,
"totalUnActiveSubs": number, "totalMansMembers": number,
"totalMansMembers": number, "totalGirlsMembers": number
"totalGirlsMembers": number }[]},i : number) => {
}[]
}, i: number) => {
thisMonthWeeksSum.totalMembers += v.weekSum[0].totalMembers thisMonthWeeksSum.totalMembers += v.weekSum[0].totalMembers
thisMonthWeeksSum.totalActiveSubs += v.weekSum[0].totalActiveSubs thisMonthWeeksSum.totalActiveSubs += v.weekSum[0].totalActiveSubs
thisMonthWeeksSum.totalUnActiveSubs += v.weekSum[0].totalUnActiveSubs thisMonthWeeksSum.totalUnActiveSubs += v.weekSum[0].totalUnActiveSubs
thisMonthWeeksSum.totalMansMembers += v.weekSum[0].totalMansMembers thisMonthWeeksSum.totalMansMembers += v.weekSum[0].totalMansMembers
thisMonthWeeksSum.totalGirlsMembers += v.weekSum[0].totalGirlsMembers thisMonthWeeksSum.totalGirlsMembers += v.weekSum[0].totalGirlsMembers
}) })
return { return {
month: v.month, month: v.month,
thisMonthWeeksSum: thisMonthWeeksSum thisMonthWeeksSum: thisMonthWeeksSum
} }
}) })
// prepare the labels // prepare the labels
let labels: [] = []; let labels : [] = [];
thisYearTotalSum.forEach(function (v, i) { thisYearTotalSum.forEach(function(v , i) {
labels.push(t(thisYearTotalSum[i]["month"] + "month")) labels.push(t(thisYearTotalSum[i]["month"]+"month"))
}) })
setLabels(labels) setLabels(labels)
// we setup chart_series ( chart data ) // we setup chart_series ( chart data )
let a: { let a : {
name: string, name: string,
data: { data: {
"totalMembers": number, "totalMembers": number,
@ -437,7 +435,7 @@ export default function MembersOverviewChart() {
"totalMansMembers": number, "totalMansMembers": number,
"totalGirlsMembers": number "totalGirlsMembers": number
} }
}[] = ['totalMembers', 'totalActiveSubs', 'totalUnActiveSubs', 'totalMansMembers', 'totalGirlsMembers'].map((v: string, i: number): { }[] = ['totalMembers' , 'totalActiveSubs' , 'totalUnActiveSubs' , 'totalMansMembers' , 'totalGirlsMembers'].map((v : string , i : number) : {
name: string, name: string,
data: { data: {
"totalMembers": number, "totalMembers": number,
@ -447,7 +445,7 @@ export default function MembersOverviewChart() {
"totalGirlsMembers": number "totalGirlsMembers": number
} }
} => { } => {
let data = thisYearTotalSum.map((v2: { let data = thisYearTotalSum.map((v2 : {
month: number, month: number,
thisMonthWeeksSum: { thisMonthWeeksSum: {
"totalMembers": number, "totalMembers": number,
@ -456,8 +454,8 @@ export default function MembersOverviewChart() {
"totalMansMembers": number, "totalMansMembers": number,
"totalGirlsMembers": number "totalGirlsMembers": number
} }
}, i2: number) => { },i2 : number) => {
let index: 'totalMembers' | 'totalActiveSubs' | 'totalUnActiveSubs' | 'totalMansMembers' | 'totalGirlsMembers' = v; let index : 'totalMembers' | 'totalActiveSubs' | 'totalUnActiveSubs' | 'totalMansMembers' | 'totalGirlsMembers' = v;
return v2.thisMonthWeeksSum[index]; return v2.thisMonthWeeksSum[index];
}) })
// return the line data // return the line data
@ -472,27 +470,27 @@ export default function MembersOverviewChart() {
else { else {
setChartSeries([ setChartSeries([
{ {
name: '1' + t('week'), name: '1'+t('week'),
data: [0, 0, 0, 0, 0], data: [0,0,0,0,0],
}, },
{ {
name: '2' + t('week'), name: '2'+t('week'),
data: [0, 0, 0, 0, 0], data: [0,0,0,0,0],
}, },
{ {
name: '3' + t('week'), name: '3'+t('week'),
data: [0, 0, 0, 0, 0], data: [0,0,0,0,0],
}, },
{ {
name: '4' + t('week'), name: '4'+t('week'),
data: [0, 0, 0, 0, 0], data: [0,0,0,0,0],
} }
]) ])
} }
} }
}, [currentMembersGeneralOverviewDuration]) }, [currentMembersGeneralOverviewDuration])
// prepare the chart options // prepare the chart options
const options: any = { const options : any = {
series: chartSeries, series: chartSeries,
options: { options: {
chart: { chart: {
@ -522,7 +520,7 @@ export default function MembersOverviewChart() {
left: -7, left: -7,
top: 22, top: 22,
}, },
colors: ['#38C172', '#38C172', '#E3342F', '#0263FF', '#FF30F7'], colors: ['#38C172', '#38C172' , '#E3342F' , '#0263FF', '#FF30F7'],
markers: { markers: {
//discrete: [ //discrete: [
// { // {
@ -566,11 +564,12 @@ export default function MembersOverviewChart() {
tickAmount: 7, tickAmount: 7,
labels: { labels: {
formatter: (value: number) => { formatter: (value: number) => {
if (value > 1000) { if(value > 1000)
{
return parseInt(value.toFixed(0)) + t('k') return parseInt(value.toFixed(0)) + t('k')
} }
else { else {
return parseInt(value.toFixed(0)) return parseInt(value.toFixed(0))
} }
}, },
offsetX: isRtl ? -30 : -10, offsetX: isRtl ? -30 : -10,