Skip to content

Commit 5b2944b

Browse files
GSinseswa721Bananayosostene
authored andcommitted
sPPS C:\Users\B Sostene\Desktop\atlp-pulse-fn> git checkout develop
error: Your local changes to the following files would be overwritten by checkout: tests/pages/TraineeAttendance.test.tsx Please commit your changes or stash them before you switch branches. edit 7d95521 sort invitations by descending or ascending (#590) s fix-docs (#587) s b1a22b6 fix Internanationalization testimonial section (#592) s df093d2 changing undrop icon (#583) s b7cb194 fx<search> improving search invitation to listern to typing event (#591) s 9e05149 fix(#404):login activies display in a table (#576) s 464657e fix(#403):adding a not found page (#593) s cc142ef fix(#599): Improve invitation table pagination (#553) s f08afd4 fix(#595):Improve the dark mode skeleton to match dark design (#598) s 4321d94 fix(#404): add skeleton loader on login activities table (#600) s d72b882 Remove ratings legacy feature #225 (#594) s 6ea7721 fix(#391):Enable Consistent Edit For All Cohorts (#607) s fe125aa fix(#605):table responsiveness (#611) s acbeb7e (#606) Harmonize action button theme across tables in TTL's portal (#613) s 643274e fix(#394): Resolve Trainee Detail View Errors (#614) s 75d247a average ratings (#617) s 4c9fc7c TTL-Page improvement (#601) s 2e47213 #513 refactoring attendance feature on trainee side (#603) s 58eb885 fix: move client-side attendance logic to server (#596) s a14728e Enable admin to view all programs with user breakdown per program-#422 (#618) s 31852e3 (fix): add coordinator dashboard page (#608)S C:\Users\B Sostene\Desktop\atlp-pulse-fn> git checkout develop error: Your local changes to the following files would be overwritten by checkout: tests/pages/TraineeAttendance.test.tsx Please commit your changes or stash them before you switch branches. s 7d95521 sort invitations by descending or ascending (#590) s 711747f fix-docs (#587) s b2a22b6 fix Internanationalization testimonial section (#592) s df093d2 changing undrop icon (#583) s b7cb194 fx<search> improving search invitation to listern to typing event (#591) s 9e05149 fix(#404):login activies display in a table (#576) s 464657e fix(#403):adding a not found page (#593) s cc142ef fix(#599): Improve invitation table pagination (#553) s f08afd4 fix(#595):Improve the dark mode skeleton to match dark design (#598) s 4321d94 fix(#404): add skeleton loader on login activities table (#600) s d72b882 Remove ratings legacy feature #225 (#594) s 6ea7721 fix(#391):Enable Consistent Edit For All Cohorts (#607) s fe125aa fix(#605):table responsiveness (#611) s acbeb7e (#606) Harmonize action button theme across tables in TTL's portal (#613) s 643274e fix(#394): Resolve Trainee Detail View Errors (#614) s 75d247a average ratings (#617) s 4c9fc7c TTL-Page improvement (#601) s 2e47213 #513 refactoring attendance feature on trainee side (#603) s 58eb885 fix: move client-side attendance logic to server (#596) s a14728e Enable admin to view all programs with user breakdown per program-#422 (#618) s 31852e3 (fix): add coordinator dashboard page (#608)ort invitations by descending or ascending (#590) Co-authored-by: niyobertin <[email protected]> fix-docs (#587) fix Internanationalization testimonial section (#592) changing undrop icon (#583) fx<search> improving search invitation to listern to typing event (#591) fix(#404):login activies display in a table (#576) fix(#403):adding a not found page (#593) fix(#599): Improve invitation table pagination (#553) fix(#595):Improve the dark mode skeleton to match dark design (#598) fix(#404): add skeleton loader on login activities table (#600) Remove ratings legacy feature #225 (#594) fix(#391):Enable Consistent Edit For All Cohorts (#607) -As an admin, I have ability to edit all cohorts that I am permitted to manage fix(#605):table responsiveness (#611) Co-authored-by: niyobertin <[email protected]> (#606) Harmonize action button theme across tables in TTL's portal (#613) fix(#394): Resolve Trainee Detail View Errors (#614) average ratings (#617) TTL-Page improvement (#601) * droping and undropping ttl * ft-droping-and-undropping-ttl * ft-droping-and-undropping-ttl * ft-ttl-page-improvement * fix: move client-side attendance logic to server * feat(trainee-attendance): implements a trainee-side attendance fix: move client-side attendance logic to server (#596) Enable admin to view all programs with user breakdown per program-#422 (#618) (fix): add coordinator dashboard page (#608) main admin dashboard new piechart and stats updated new piechart and stats updated ft-admin-dashboard-can-vieww-table-teams new piechart and stats updated
1 parent 4b358e0 commit 5b2944b

File tree

115 files changed

+11405
-4093
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+11405
-4093
lines changed

package-lock.json

Lines changed: 739 additions & 131 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"@mui/styled-engine": "^5.13.2",
4949
"@mui/x-data-grid": "^5.17.26",
5050
"@react-pdf-viewer/core": "^3.12.0",
51+
"@tanstack/react-table": "^8.20.5",
5152
"@testing-library/dom": "^8.20.1",
5253
"@testing-library/user-event": "^14.4.3",
5354
"@types/node": "^20.4.2",
@@ -56,7 +57,7 @@
5657
"apollo-upload-client": "^17.0.0",
5758
"autoprefixer": "^10.4.14",
5859
"axios": "^1.6.1",
59-
"chart.js": "^4.3.2",
60+
"chart.js": "^4.4.6",
6061
"cleave.js": "^1.6.0",
6162
"cloudinary": "^1.39.0",
6263
"cloudinary-react": "^1.8.1",
@@ -78,6 +79,7 @@
7879
"jsonwebtoken": "^9.0.1",
7980
"jwt-decode": "^3.1.2",
8081
"lottie-react": "^2.4.0",
82+
"lucide-react": "^0.453.0",
8183
"moment": "^2.29.4",
8284
"pnpm": "^8.6.11",
8385
"react-apexcharts": "^1.4.1",

public/locales/en/translation.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,5 +346,13 @@
346346
"Please fill all fields": "Please fill all fields",
347347
"Boost your organization": "Boost your organizations productivity with Pulse",
348348
"Please wait to be added to a program or cohort": "Please wait to be added to a program or cohort",
349-
"Are you sure you want to delete this user?": "Are you sure you want to delete this user?"
349+
"Are you sure you want to delete this user?": "Are you sure you want to delete this user?",
350+
"Come shape the future together": "Come shape the future together",
351+
"Content1": "I'm extremely impressed with Pulse and their performance management platform. Since using their services, it has been a game-changer for our organization. The platform is intuitive, easy to navigate, and packed with powerful features.",
352+
"Content2": "I'm delighted to share my positive experience with Pulse and their exceptional performance management platform. Implementing their services has led to remarkable improvements in our performance tracking and management processes.",
353+
"Content3": "We are thrilled with the services provided by Pulse. Their performance management platform has exceeded our expectations in every way. The user-friendly interface and comprehensive features have made tracking and monitoring our performance metrics a breeze.",
354+
"Sr.Manager": "Sr.Manager",
355+
"Director": "Director",
356+
"Andela": "Andela",
357+
"University of Rwanda": "University of Rwanda"
350358
}

public/locales/fr/translation.json

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,15 @@
463463
"Provide Quantity range between 1-2": "Fournir une gamme de quantité comprise entre 1-2",
464464
"Provide Professional_Skills range between 1-2": "Fournir une gamme de compétences professionnelles comprise entre 1-2",
465465
"Sprint Ratings": "Sprint Notations",
466-
"Please wait to be added to a program or cohort": "Veuillez attendre d'être ajouté à un programme ou à une cohorte",
467-
"Enter all the required information": "Entrez toutes les informations requises",
468-
"Are you sure you want to delete this user?": "Êtes-vous sûr de vouloir supprimer cet utilisateur ?"
466+
"Please wait to be added to a program or cohort": "Veuillez attendre d'être ajouté à un programme ou à une cohorte",
467+
"Enter all the required information": "Entrez toutes les informations requises",
468+
"Are you sure you want to delete this user?": "Êtes-vous sûr de vouloir supprimer cet utilisateur ?",
469+
"Come shape the future together": "Venez former l'avenir ensemble",
470+
"Content1": "Je suis extrêmement impressionné par Pulse et leur plateforme de gestion de la performance. Depuis que nous utilisons leurs services, cela a été un véritable changement pour notre organisation. La plateforme est intuitive, facile à naviguer et riche en fonctionnalités puissantes",
471+
"Content2": "Je suis ravi de partager mon expérience positive avec Pulse et leur plateforme exceptionnelle de gestion de la performance. La mise en œuvre de leurs services a conduit à des améliorations remarquables dans nos processus de suivi et de gestion de la performance.",
472+
"Content3": "Nous sommes ravis des services fournis par Pulse. Leur plateforme de gestion de la performance a dépassé nos attentes à tous égards. L'interface conviviale et les fonctionnalités complètes ont facilité le suivi et la surveillance de nos indicateurs de performance",
473+
"Sr.Manager": "Gestionnaire principal",
474+
"Director": "Directeur",
475+
"Andela": "Andela",
476+
"University of Rwanda": "Université du Rwanda"
469477
}

public/locales/kn/translation.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,5 +453,13 @@
453453
"Sprint Ratings": "Amanota ya Sprint",
454454
"Please wait to be added to a program or cohort": "Tegereza tukongere muri porogarame cyangwa itsinda",
455455
"Enter all the required information": "Shyiramo amakuru yose asabwa",
456-
"Are you sure you want to delete this user?": "urashaka kwemeza ikigikorwa cyo gusiba uyumuntu ?"
456+
"Are you sure you want to delete this user?": "urashaka kwemeza ikigikorwa cyo gusiba uyumuntu ?",
457+
"Come shape the future together": "Dufatanye kwubaka ejo Hazaza",
458+
"Content1": "Nshimishijwe cyane na Pulse n'ikoranabuhanga ryabo ryo gucunga imikorere. Kuva natangira gukoresha serivisi zabo, byabaye impinduka ikomeye mu kigo cyacu. iri koranabuhanga riroroshye kurikoresha, kandi ryubakanye ubuhanga n' ubushobozi buhanitse.",
459+
"Content2": "Nshimishijwe no gusangiza uburambe bwanjye bwiza na Pulse n'ikoranabuhanga ryabo rihambaye ryo gucunga imikorere. Gushyira mu bikorwa serivisi zabo byazanye impinduka zikomeye mu gukurikirana no gucunga imikorere yacu",
460+
"Content3": "Turishimye cyane ku bwa Pulse. Ikoranabuhanga rya yo ryo gucunga imikorere ryarenze ibyifuzo byacu mu buryo bwose. Iroroshye kuyikoresha kandi yatumye tubasha gukurikirana no kugenzura imikorere yacu",
461+
"Sr.Manager": "Umuyobozi wungirije",
462+
"Director": "Umuyobozi mukuru",
463+
"Andela": "Andela",
464+
"University of Rwanda": "Kaminuza y' u Rwanda"
457465
}

src/App.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,20 @@ import './index.css';
77
import MainRoutes from './containers/Routes';
88
import LandingPage from './pages/Home';
99
import { TraineesProvider } from './hook/useTraineesData';
10+
import NotFound from './components/NotFoundPage';
1011

1112
function App() {
1213
return (
1314
<div className="min-h-screen">
15+
1416
<TicketsProvider>
1517
<TraineesProvider>
1618
<Router>
1719
<ScrollToTop>
1820
<Routes>
1921
<Route path="/" element={<LandingPage />} />
2022
<Route path="/*" element={<MainRoutes />} />
23+
<Route path="*" element={<NotFound />} />
2124
</Routes>
2225
</ScrollToTop>
2326
</Router>

src/Chart/BarChart.tsx

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
import React from 'react';
2+
import { Bar } from 'react-chartjs-2';
3+
import {
4+
Chart as ChartJS,
5+
CategoryScale,
6+
LinearScale,
7+
BarElement,
8+
Title,
9+
Tooltip,
10+
Legend,
11+
} from 'chart.js';
12+
13+
ChartJS.register(
14+
CategoryScale,
15+
LinearScale,
16+
BarElement,
17+
Title,
18+
Tooltip,
19+
Legend,
20+
);
21+
22+
interface Props {}
23+
24+
// eslint-disable-next-line react/function-component-definition
25+
const BarChart: React.FC<Props> = () => {
26+
const data = {
27+
labels: [
28+
'01',
29+
'02',
30+
'03',
31+
'04',
32+
'05',
33+
'06',
34+
'07',
35+
'08',
36+
'09',
37+
'10',
38+
'11',
39+
'12',
40+
],
41+
datasets: [
42+
{
43+
label: 'Nova',
44+
data: [12, 19, 3, 5, 2, 3, 12, 14, 5, 7, 9, 11],
45+
backgroundColor: '#5A6ACF',
46+
borderRadius: 0,
47+
barThickness: 8,
48+
},
49+
{
50+
label: 'Fighters',
51+
data: [10, 15, 5, 8, 6, 9, 13, 9, 6, 8, 7, 10],
52+
backgroundColor: '#D1D5DB',
53+
borderRadius: 0,
54+
barThickness: 8,
55+
},
56+
],
57+
};
58+
59+
const options = {
60+
responsive: true,
61+
maintainAspectRatio: false,
62+
plugins: {
63+
legend: {
64+
position: 'bottom' as const,
65+
labels: {
66+
color: '#D1D5DB',
67+
},
68+
},
69+
tooltip: {
70+
enabled: true,
71+
},
72+
},
73+
scales: {
74+
x: {
75+
grid: {
76+
display: false,
77+
},
78+
ticks: {
79+
color: '#737B8B',
80+
},
81+
},
82+
y: {
83+
grid: {
84+
borderDash: [5, 5],
85+
color: '#ffffff',
86+
},
87+
ticks: {
88+
color: '#ffffff',
89+
},
90+
},
91+
},
92+
};
93+
94+
return (
95+
<div className="w-full h-[300px]">
96+
<Bar data={data} options={options} className="-ml-8" />
97+
</div>
98+
);
99+
};
100+
101+
export default BarChart;

src/Chart/PieChart.tsx

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
import React from 'react';
2+
import { Doughnut } from 'react-chartjs-2';
3+
import { Chart as ChartJS, ArcElement, Tooltip, Legend } from 'chart.js';
4+
5+
ChartJS.register(ArcElement, Tooltip, Legend);
6+
7+
// eslint-disable-next-line react/function-component-definition
8+
const PieChart: React.FC = () => {
9+
const data = {
10+
labels: ['new pie chart'],
11+
datasets: [
12+
{
13+
label: 'rates',
14+
data: [30, 100],
15+
backgroundColor: ['#4F46E5', '#A5B4FC'],
16+
hoverOffset: 4,
17+
},
18+
],
19+
};
20+
const data2 = {
21+
labels: ['new pie chart'],
22+
datasets: [
23+
{
24+
label: 'rates',
25+
data: [30, 70],
26+
backgroundColor: ['#4F46E5', '#A5B4FC'],
27+
hoverOffset: 4,
28+
},
29+
],
30+
};
31+
const data3 = {
32+
labels: ['new pie chart'],
33+
datasets: [
34+
{
35+
label: 'rates',
36+
data: [60, 60],
37+
backgroundColor: ['#4F46E5', '#A5B4FC'],
38+
hoverOffset: 4,
39+
},
40+
],
41+
};
42+
43+
const options = {
44+
responsive: true,
45+
cutout: '70%',
46+
plugins: {
47+
tooltip: {
48+
callbacks: {
49+
// eslint-disable-next-line func-names, object-shorthand
50+
label: function (tooltipItem: any) {
51+
return `${tooltipItem.label}: ${tooltipItem.raw}%`;
52+
},
53+
},
54+
},
55+
legend: {
56+
display: false,
57+
},
58+
},
59+
};
60+
61+
return (
62+
<div className="flex flex-col items-center -ml-8 mb-8">
63+
<div className="flex space-x-8">
64+
<div className="relative w-[200px] h-[200px] bg-red-200 p-2 rounded">
65+
<Doughnut data={data} options={options} />
66+
<div className="absolute inset-0 flex items-center justify-center">
67+
<div className="text-center">
68+
<p className="text-2xl font-semibold text-gray-500">10</p>
69+
</div>
70+
</div>
71+
<p className="text-center mt-2">New Invitations & Registration</p>
72+
</div>
73+
<div className="relative w-[200px] h-[200px] bg-green-200 p-2 rounded">
74+
<Doughnut data={data2} options={options} />
75+
<div className="absolute inset-0 flex items-center justify-center">
76+
<div className="text-center">
77+
<p className="text-2xl font-semibold text-gray-500">20</p>
78+
</div>
79+
</div>
80+
<p className="text-center mt-2">Upcoming Events</p>
81+
</div>
82+
<div className="relative w-[200px] h-[200px] bg-yellow-200 p-2 rounded">
83+
<Doughnut data={data3} options={options} />
84+
<div className="absolute inset-0 flex items-center justify-center">
85+
<div className="text-center">
86+
<p className="text-2xl font-semibold text-gray-500">50</p>
87+
</div>
88+
</div>
89+
<p className="text-center mt-2">Active& Progressive Tickets</p>
90+
</div>
91+
</div>
92+
</div>
93+
);
94+
};
95+
96+
export default PieChart;

0 commit comments

Comments
 (0)