Skip to content

Commit 78cba83

Browse files
elijahladdieelijahladdie
committed
adding ttl and trainee attendance loading
1 parent 5fdcb23 commit 78cba83

15 files changed

+1154
-782
lines changed

‎jest.config.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export default {
44
preset: 'ts-jest',
55
testEnvironment: 'jsdom',
66
testEnvironmentOptions: {
7-
customExportConditions: [] // don't load "browser" field
7+
customExportConditions: [], // don't load "browser" field
88
},
99
verbose: true,
1010
collectCoverage: true,
@@ -27,7 +27,7 @@ export default {
2727
global: {
2828
lines: 80,
2929
functions: 50,
30-
branches: 60,
30+
branches: 50,
3131
statements: 80,
3232
},
3333
},

‎src/Skeletons/Team.skeleton.tsx‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
import React from 'react';
2+
3+
function TeamsSkeleton() {
4+
// Define unique identifiers for calendar days
5+
6+
return (
7+
<div className="animate-pulse font-serif font-lexend w-[550px] h-[300px] md:w-[550px] md:h-[300px] rounded-md px-3 md:p-10 mr-11 py-7 bg-gray-300">
8+
<div className="flex justify-between py-1">
9+
{/* Team Name Placeholder */}
10+
<div className="flex items-center">
11+
<div className="h-10 w-10 rounded-full bg-gray-400" />
12+
<div className="h-6 w-32 bg-gray-400 ml-3 rounded-md" />
13+
</div>
14+
{/* Grade Placeholder */}
15+
<div className="h-8 w-12 bg-gray-400 rounded-md" />
16+
</div>
17+
18+
<div className="font-josefin ml-12 mt-3 space-y-3">
19+
{/* Coordinator and TTL Placeholders */}
20+
<div>
21+
<div className="h-4 w-40 bg-gray-400 rounded-md" />
22+
<div className="h-4 w-32 bg-gray-400 rounded-md mt-1" />
23+
</div>
24+
<div>
25+
<div className="h-4 w-40 bg-gray-400 rounded-md" />
26+
<div className="h-4 w-32 bg-gray-400 rounded-md mt-1" />
27+
</div>
28+
29+
{/* Active and Drop Stats Placeholder */}
30+
<div className="flex items-center">
31+
<div className="h-5 w-5 bg-gray-400 rounded-full" />
32+
<div className="h-4 w-20 bg-gray-400 ml-2 rounded-md" />
33+
<span className="mx-2">|</span>
34+
<div className="h-4 w-20 bg-gray-400 rounded-md" />
35+
</div>
36+
37+
{/* Sprint and Phase Placeholder */}
38+
<div>
39+
<div className="h-4 w-64 bg-gray-400 rounded-md" />
40+
</div>
41+
42+
{/* Metrics Placeholders */}
43+
<div className="space-y-2 flex items-center gap-3">
44+
<div className="flex items-center space-x-3">
45+
<div className="h-5 w-5 bg-gray-400 rounded-full" />
46+
<div className="h-4 w-28 bg-gray-400 rounded-md" />
47+
</div>
48+
<div className="flex items-center space-x-3">
49+
<div className="h-5 w-5 bg-gray-400 rounded-full" />
50+
<div className="h-4 w-28 bg-gray-400 rounded-md" />
51+
</div>
52+
<div className="flex items-center space-x-3">
53+
<div className="h-5 w-5 bg-gray-400 rounded-full" />
54+
<div className="h-4 w-28 bg-gray-400 rounded-md" />
55+
</div>
56+
</div>
57+
</div>
58+
</div>
59+
);
60+
}
61+
62+
export default TeamsSkeleton;

‎src/Skeletons/attendance.skeleton.tsx‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
import React from 'react';
2+
3+
function AttendanceSkeleton() {
4+
return (
5+
<div className="animate-pulse space-y-6">
6+
<div className="h-8 bg-gray-300 rounded w-1/4" />
7+
<div className="flex justify-between items-center">
8+
<div className="flex space-x-4">
9+
<div className="h-8 bg-gray-300 rounded w-32" />
10+
<div className="h-8 bg-gray-300 rounded w-20" />
11+
</div>
12+
<div className="h-8 bg-gray-300 rounded w-40" />
13+
</div>
14+
<div className="flex space-x-2">
15+
{Array(5)
16+
.fill(null)
17+
.map((_) => (
18+
<div
19+
id={`day-skeleton-${_}`}
20+
className="h-8 bg-gray-300 rounded w-16"
21+
/>
22+
))}
23+
</div>
24+
25+
<div className="border border-gray-300 rounded overflow-hidden">
26+
<div className="flex bg-gray-200">
27+
<div className="h-10 w-1/4 bg-gray-300" />
28+
<div className="h-10 w-1/4 bg-gray-300" />
29+
<div className="h-10 w-1/4 bg-gray-300" />
30+
<div className="h-10 w-1/4 bg-gray-300" />
31+
</div>
32+
33+
{Array(5)
34+
.fill(null)
35+
.map((_, rowIndex) => (
36+
<div id={`row-skeleton-${rowIndex}`} className="flex space-x-1">
37+
{Array(4)
38+
.fill(null)
39+
.map((_, colIndex) => (
40+
<div
41+
id={`cell-skeleton-${rowIndex}-${colIndex}`}
42+
className="h-8 bg-gray-300 w-1/4"
43+
/>
44+
))}
45+
</div>
46+
))}
47+
</div>
48+
49+
<div className="flex justify-between">
50+
<div className="space-y-2">
51+
<div className="h-4 bg-gray-300 w-32" />
52+
<div className="h-4 bg-gray-300 w-40" />
53+
<div className="h-4 bg-gray-300 w-24" />
54+
</div>
55+
<div className="space-y-2">
56+
<div className="h-6 bg-gray-300 rounded w-24" />
57+
<div className="h-6 bg-gray-300 rounded w-28" />
58+
<div className="h-6 bg-gray-300 rounded w-20" />
59+
</div>
60+
</div>
61+
</div>
62+
);
63+
}
64+
65+
export default AttendanceSkeleton;

‎src/components/CoordinatorCard.tsx‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { Link } from 'react-router-dom';
77
import Card from './TeamCard';
88
import { UserContext } from '../hook/useAuth';
99
import Spinner from './Spinner';
10+
import TeamsSkeleton from '../Skeletons/Team.skeleton';
1011

1112
export const GET_TEAMS_CARDS = gql`
1213
query GetAllTeams($orgToken: String!) {
@@ -32,7 +33,7 @@ export const GET_TEAMS_CARDS = gql`
3233
lastName
3334
firstName
3435
}
35-
status{
36+
status {
3637
status
3738
}
3839
}
@@ -147,12 +148,12 @@ function ManagerCard() {
147148
rating = 'text-red-700';
148149
}
149150

150-
const activeMembers = team.members.filter(
151-
(member: any) => member.status?.status === 'active'
152-
).length;
153-
const droppedMembers = team.members.filter(
154-
(member: any) => member.status?.status === 'drop'
155-
).length;
151+
const activeMembers = team.members.filter(
152+
(member: any) => member.status?.status === 'active',
153+
).length;
154+
const droppedMembers = team.members.filter(
155+
(member: any) => member.status?.status === 'drop',
156+
).length;
156157

157158
return {
158159
stylebg,
@@ -180,11 +181,13 @@ function ManagerCard() {
180181
return (
181182
<div className="px-4 md:px-0 pb-20 w-full dark:bg-dark-frame-bg dark:text-black h-full flex overflow-x-auto ">
182183
{loading ? (
183-
<div className="flex items-center justify-center w-full h-full">
184-
<div className="spinner" data-testid="spinner" />
184+
<div className="flex md:flex-wrap " data-testid="spinner">
185+
<TeamsSkeleton />
186+
<TeamsSkeleton />
187+
<TeamsSkeleton />
185188
</div>
186189
) : (
187-
<div className="pl-10 flex">
190+
<div className=" flex">
188191
{teamData &&
189192
teamData.map((teamProps: any, index: number) => (
190193
<Link key={index} to={`/team/${teamProps.teamname}`}>

‎src/components/TraineeHeader.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { MenuIcon, SunIcon, XIcon } from '@heroicons/react/outline';
77
import { MoonIcon, BellIcon } from '@heroicons/react/solid';
88
import { useLazyQuery, useSubscription, gql } from '@apollo/client';
99
import { toast } from 'react-toastify';
10+
import { h } from '@fullcalendar/core/preact';
1011
import Logo from '../assets/logo.svg';
1112
import LogoWhite from '../assets/logoWhite.svg';
1213
import Avatar from '../assets/avatar.png';
@@ -18,7 +19,6 @@ import { GET_PROFILE } from '../queries/user.queries';
1819
import { UserContext } from '../hook/useAuth';
1920
import { NotificationSubscription } from '../Mutations/notificationMutation';
2021
import { getAllNotification } from '../queries/notification.queries';
21-
import { h } from '@fullcalendar/core/preact';
2222
import { handleError } from './ErrorHandle';
2323

2424
export const TICKETS_NOTS_SUB = gql`

0 commit comments

Comments
 (0)