From 60bb1cc263f5e152b2af4fa0e74a43737cc9d21b Mon Sep 17 00:00:00 2001 From: ngecu Date: Wed, 27 Mar 2024 13:11:59 +0300 Subject: [PATCH 1/7] student results page resolved --- backend/controllers/examResultController.js | 24 ++ backend/requests/examResults.http | 12 + backend/routes/examResultRoutes.js | 6 +- frontend/src/actions/examResultActions.jsx | 34 ++ .../src/constants/examResultConstants.jsx | 4 + frontend/src/reducers/examResultReducers.jsx | 16 + .../Parent/parentStudentExamResultsScreen.jsx | 317 ++++++++++++++++++ .../Student/studentExamResultScreen.jsx | 135 +++----- frontend/src/store.jsx | 2 + 9 files changed, 458 insertions(+), 92 deletions(-) create mode 100644 backend/requests/examResults.http create mode 100644 frontend/src/screens/Parent/parentStudentExamResultsScreen.jsx diff --git a/backend/controllers/examResultController.js b/backend/controllers/examResultController.js index dac77e5..5035619 100644 --- a/backend/controllers/examResultController.js +++ b/backend/controllers/examResultController.js @@ -38,6 +38,30 @@ export const getExamResultById = asyncHandler(async (req, res) => { } }); +// @desc Get a single exam result by ID +// @route GET /api/exam-results/:id +// @access Public +export const getExamResultByStudents = asyncHandler(async (req, res) => { + console.log(req.body); + const {students} = req.body; + + try { + const examResults = []; + for (const studentId of students) { + console.log("Student ID: ", studentId); + const examResult = await ExamResult.find({ student: studentId }).populate('student exam'); + examResults.push(...examResult); + } + + res.json(examResults); + } catch (error) { + + res.status(500).json({ message: `Server Error : ${error}` }); + } +}); + + + // @desc Update an existing exam result // @route PUT /api/exam-results/:id // @access Private diff --git a/backend/requests/examResults.http b/backend/requests/examResults.http new file mode 100644 index 0000000..7f832c6 --- /dev/null +++ b/backend/requests/examResults.http @@ -0,0 +1,12 @@ +GET http://localhost:5000/api/exam-results +Content-Type: application/json +Authorization:Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjY2MDE2Zjg2MWYxMzBmYzBhY2QxNDRiYSIsImlhdCI6MTcxMTUyNzYwMiwiZXhwIjoxNzE0MTE5NjAyfQ.v4BwGwcund1mLtOp3NOwceH0GN4OOEnEeQy3ZbkD1h8 + +### +POST http://localhost:5000/api/exam-results/student/ +Content-Type: application/json +Authorization:Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjY2MDE2Zjg2MWYxMzBmYzBhY2QxNDRiYSIsImlhdCI6MTcxMTUyNzYwMiwiZXhwIjoxNzE0MTE5NjAyfQ.v4BwGwcund1mLtOp3NOwceH0GN4OOEnEeQy3ZbkD1h8 + +{ + "students":["66016f851f130fc0acd144b6"] +} \ No newline at end of file diff --git a/backend/routes/examResultRoutes.js b/backend/routes/examResultRoutes.js index 90a2011..157bd69 100644 --- a/backend/routes/examResultRoutes.js +++ b/backend/routes/examResultRoutes.js @@ -1,14 +1,14 @@ import express from 'express' -import { createExam, deleteExam, getAllExams, getExamByCourse, getExamById, updateExam } from '../controllers/examController.js' -import { createExamResult, deleteExamResult, getAllExamResults, getExamResultById, updateExamResult } from '../controllers/examResultController.js' +import { createExamResult, deleteExamResult, getAllExamResults, getExamResultById, getExamResultByStudents, updateExamResult } from '../controllers/examResultController.js' const router = express.Router() import { protect, admin } from '../middleware/authMiddleware.js' -router.route('/').post(protect, createExamResult) router.route('/').get(protect, getAllExamResults) router.route('/:id').get(protect, getExamResultById) +router.route('/student').post(protect, getExamResultByStudents) router.route('/:id').put(protect, updateExamResult) router.route('/:id').delete(protect, deleteExamResult) +router.route('/').post(protect, createExamResult) export default router diff --git a/frontend/src/actions/examResultActions.jsx b/frontend/src/actions/examResultActions.jsx index 0118f6e..17b5c26 100644 --- a/frontend/src/actions/examResultActions.jsx +++ b/frontend/src/actions/examResultActions.jsx @@ -15,6 +15,9 @@ import { EXAM_RESULT_DELETE_REQUEST, EXAM_RESULT_DELETE_SUCCESS, EXAM_RESULT_DELETE_FAIL, + GET_EXAM_RESULTS_BY_STUDENT_REQUEST, + GET_EXAM_RESULTS_BY_STUDENT_SUCCESS, + GET_EXAM_RESULTS_BY_STUDENT_FAIL, } from '../constants/examResultConstants'; const base_url = `http://localhost:5000/api/exam-results`; @@ -172,4 +175,35 @@ export const deleteExamResult = (examResultId) => async (dispatch, getState) => : error.message, }); } +}; + +export const getExamResultsByStudents = (studentIds) => async (dispatch, getState) => { + try { + dispatch({ type: GET_EXAM_RESULTS_BY_STUDENT_REQUEST }); + + const { + userLogin: { userInfo }, + } = getState(); + + const config = { + headers: { + Authorization: `Bearer ${userInfo.token}`, + }, + }; + + const { data } = await axios.post(`${base_url}/student/`,{students:studentIds}, config); + + dispatch({ + type: GET_EXAM_RESULTS_BY_STUDENT_SUCCESS, + payload: data, + }); + } catch (error) { + dispatch({ + type: GET_EXAM_RESULTS_BY_STUDENT_FAIL, + payload: + error.response && error.response.data.message + ? error.response.data.message + : error.message, + }); + } }; \ No newline at end of file diff --git a/frontend/src/constants/examResultConstants.jsx b/frontend/src/constants/examResultConstants.jsx index 88fb7f1..9c1d5d4 100644 --- a/frontend/src/constants/examResultConstants.jsx +++ b/frontend/src/constants/examResultConstants.jsx @@ -19,3 +19,7 @@ export const EXAM_RESULT_UPDATE_FAIL = 'EXAM_RESULT_UPDATE_FAIL'; export const EXAM_RESULT_DELETE_REQUEST = 'EXAM_RESULT_DELETE_REQUEST'; export const EXAM_RESULT_DELETE_SUCCESS = 'EXAM_RESULT_DELETE_SUCCESS'; export const EXAM_RESULT_DELETE_FAIL = 'EXAM_RESULT_DELETE_FAIL'; + +export const GET_EXAM_RESULTS_BY_STUDENT_REQUEST = 'GET_EXAM_RESULTS_BY_STUDENT_REQUEST'; +export const GET_EXAM_RESULTS_BY_STUDENT_SUCCESS = 'GET_EXAM_RESULTS_BY_STUDENT_SUCCESS'; +export const GET_EXAM_RESULTS_BY_STUDENT_FAIL = 'GET_EXAM_RESULTS_BY_STUDENT_FAIL'; \ No newline at end of file diff --git a/frontend/src/reducers/examResultReducers.jsx b/frontend/src/reducers/examResultReducers.jsx index 4a2f346..2a90b1f 100644 --- a/frontend/src/reducers/examResultReducers.jsx +++ b/frontend/src/reducers/examResultReducers.jsx @@ -16,6 +16,9 @@ import { EXAM_RESULT_DELETE_REQUEST, EXAM_RESULT_DELETE_SUCCESS, EXAM_RESULT_DELETE_FAIL, + GET_EXAM_RESULTS_BY_STUDENT_REQUEST, + GET_EXAM_RESULTS_BY_STUDENT_SUCCESS, + GET_EXAM_RESULTS_BY_STUDENT_FAIL, } from '../constants/examResultConstants'; const initialState = { @@ -49,6 +52,19 @@ import { return state; } }; + + export const examResultsByStudentsReducer = (state = { examResults: [] }, action) => { + switch (action.type) { + case GET_EXAM_RESULTS_BY_STUDENT_REQUEST: + return { loading: true, success: false, error: null }; + case GET_EXAM_RESULTS_BY_STUDENT_SUCCESS: + return { loading: false, success: true, error: null, examResults: action.payload }; + case GET_EXAM_RESULTS_BY_STUDENT_FAIL: + return { loading: false, success: false, error: action.payload, examResults: [] }; + default: + return state; + } + }; export const getExamResultDetailsReducer = (state = { examResult: {} }, action) => { switch (action.type) { diff --git a/frontend/src/screens/Parent/parentStudentExamResultsScreen.jsx b/frontend/src/screens/Parent/parentStudentExamResultsScreen.jsx new file mode 100644 index 0000000..50a9270 --- /dev/null +++ b/frontend/src/screens/Parent/parentStudentExamResultsScreen.jsx @@ -0,0 +1,317 @@ +import React, { useState, useEffect } from 'react'; +import { Row, Col, ListGroup, Container, Button } from 'react-bootstrap'; +import { useDispatch, useSelector } from 'react-redux'; +import Message from '../../components/Message'; +import Loader from '../../components/Loader'; +import { Link, useLocation } from 'react-router-dom'; +import { useRouteMatch } from 'react-router-dom'; +import { useHistory } from 'react-router-dom/cjs/react-router-dom.min'; +import Sidebar from './components/Sidebar' +import { Calendar, momentLocalizer } from 'react-big-calendar' +import moment from 'moment' +import 'react-big-calendar/lib/css/react-big-calendar.css'; +import { getFeesByStudent } from '../../actions/feeActions'; +import { Modal, Form, Input, DatePicker, Select,Table } from 'antd'; +import { createPaymentTransaction, initiateStkPush, listPaymentTransactionsByFee } from '../../actions/paymentActions'; +import {v4} from 'uuid' +import { NavLink } from 'react-router-dom'; +import Topbar from './components/Topbar'; +import { Badge } from 'react-bootstrap'; + + +const localizer = momentLocalizer(moment) +const { Option } = Select; + +const parentFeeScreen = () => { + const [isMpesa, setIsMpesa] = useState(true); + + + const [isModalOpen, setIsModalOpen] = useState(false); + const showModal = () => { + setIsModalOpen(true); + }; + const handleOk = () => { + setIsModalOpen(false); + }; + const handleCancel = () => { + setIsModalOpen(false); + }; + + + + const location = useLocation(); + const { pathname } = location; + + + + const dispatch = useDispatch(); + + + const userLogin = useSelector((state) => state.userLogin); + const { userInfo } = userLogin; + + const feesByStudent = useSelector((state) => state.getFeesByStudent); // Assuming you have a fees reducer + const { loading, error, fees } = feesByStudent; + + const paymentTransactionsByFee = useSelector((state) => state.paymentTransactionByFee); + const { loading: paymentTransactionsLoading, error: paymentTransactionsError, paymentTransactions } = paymentTransactionsByFee; + + + console.log("fees is ",fees) + const logoutHandler = () => { + dispatch(logout()); + }; + + + useEffect(() => { + if (userInfo && userInfo._id) { + dispatch(getFeesByStudent(userInfo.userData._id)); // Dispatch the action with the student's ID + } + }, [dispatch, userInfo]); + + useEffect(() => { + if (fees && fees._id) { + + dispatch(listPaymentTransactionsByFee(fees._id)); + } + }, [dispatch, fees,userInfo]); + + const [form] = Form.useForm(); + + const onFinish = (values) => { + // Handle the form submission, e.g., send the payment details to the backend + values.schoolFees = fees._id + values.transactionId = v4() + + // makePayment(values); + + if(values.paymentMethod == "mpesa"){ + dispatch(initiateStkPush(values)) + } + else{ + + dispatch(createPaymentTransaction(values)) + + } + }; + + + const columns = [ + { + title: 'Transaction ID', + dataIndex: 'transactionId', + key: 'transactionId', + }, + { + title: 'Amount Paid', + dataIndex: 'amountPaid', + key: 'amountPaid', + }, + { + title: 'approved', + dataIndex: 'approved', + key: 'approved', + render: (approved) => ( + + {approved ? 'Approved' : 'Not Approved'} + + ), + }, + { + title: 'Amount Remaining', + dataIndex: 'amountRemaining', + key: 'amountRemaining', + }, + { + title: 'Payment Method', + dataIndex: 'paymentMethod', + key: 'paymentMethod', + }, + { + title: 'Date', + dataIndex: 'date', + key: 'date', + }, + ]; +// Calculate the total amount paid from transactions where approved is true +const totalAmountPaid = paymentTransactions + .filter(transaction => transaction.approved) // Filter transactions with approved === true + .reduce((total, transaction) => total + transaction.amount, 0); // Sum the amounts + + + const data = paymentTransactions.map((transaction) => ({ + key: transaction._id, + transactionId: transaction.transactionId, + amountPaid: transaction.amount, + approved: transaction.approved, + amountRemaining:(fees.amount - transaction.amount), + // amountRemaining: transaction.amountRemaining, + paymentMethod: transaction.paymentMethod, + date: moment(transaction.createdAt).format('YYYY-MM-DD'), + })); + + return ( +
+
+ + + +
+ +
+ + +
+ +
+
+
+ + + FEE DASHBOARD + {!error && !loading && fees &&
+ + + View Invoice + + + + + +
+ + } + + + + + +
+ + + + + + + + + + +{isMpesa && ( + + + +)} + + + + +
+ + +
+ +
+
+
+
+ +
+ + + {loading ? ( + + ) : error ? ( + {error} + ) : ( + <> +
+ +
+
+
+
Semester Fee :
+ +

{fees && fees.amount + totalAmountPaid}

+ +
+
+
+ +
+
+
+
paid :
+ +

{totalAmountPaid}

+
+
+
+ +
+
+
+
Remaining :
+ +

{fees && fees.amount}

+
+
+
+
+ )} + +
+ +
+
+
+
+ Transaction History +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + ); +}; + +export default parentFeeScreen; diff --git a/frontend/src/screens/Student/studentExamResultScreen.jsx b/frontend/src/screens/Student/studentExamResultScreen.jsx index a5e31aa..aceebb1 100644 --- a/frontend/src/screens/Student/studentExamResultScreen.jsx +++ b/frontend/src/screens/Student/studentExamResultScreen.jsx @@ -11,6 +11,7 @@ import { Calendar, momentLocalizer } from 'react-big-calendar' import moment from 'moment' import 'react-big-calendar/lib/css/react-big-calendar.css'; import Topbar from './components/Topbar'; +import { getExamResultsByStudents } from '../../actions/examResultActions'; const localizer = momentLocalizer(moment) // or globalizeLocalizer @@ -27,13 +28,6 @@ const MyCalendar = (props) => ( ) const studentExamResultScreen = () => { - const [name, setName] = useState(''); - const [email, setEmail] = useState(''); - const [password, setPassword] = useState(''); - const [confirmPassword, setConfirmPassword] = useState(''); - const [message, setMessage] = useState(null); - const match = useRouteMatch(); - const history = useHistory(); const location = useLocation(); const { pathname } = location; @@ -42,28 +36,21 @@ const studentExamResultScreen = () => { const dispatch = useDispatch(); - const userDetails = useSelector((state) => state.userDetails); - const { loading, error, user } = userDetails; + const userLogin = useSelector((state) => state.userLogin); const { userInfo } = userLogin; - const logoutHandler = () => { - dispatch(logout()); - }; + const examResultsByStudents = useSelector(state => state.examResultsByStudents); + const { loading,error,examResults} = examResultsByStudents; - const localizer = momentLocalizer(moment) // or globalizeLocalizer + console.log("user info ",userInfo); + const students = [userInfo.userData._id] + + useEffect(() => { + dispatch(getExamResultsByStudents(students)); + }, [dispatch]); - const MyCalendar = (props) => ( -
- -
- ) return (
@@ -75,72 +62,42 @@ const studentExamResultScreen = () => {
- -
-
-
-
Exam Results
-
-
-
-
- -
-
- -
-
- -
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
Exam TypeCourse UnitGradeDate
MainCriminal LawA2023-01-01
CatCriminal LawC2023-02-01
-
- -
-
-
-
- - - - - + {loading ? ( + + ) : error ? ( + {error} + ) : ( +
+
+
+
Exam Results
+
+
+ + + + + + + + + + + {examResults.map((result, index) => ( + + + + + + + ))} + +
Exam TypeTypeMarksDate
{result.exam.examType}{result.exam.title}{result.marksObtained}{new Date(result.exam.date).toLocaleDateString()}
+ +
+
+
+ )}
diff --git a/frontend/src/store.jsx b/frontend/src/store.jsx index 53bb2c9..1adca81 100644 --- a/frontend/src/store.jsx +++ b/frontend/src/store.jsx @@ -118,6 +118,7 @@ import { getExamResultDetailsReducer, examResultUpdateReducer, examResultDeleteReducer, + examResultsByStudentsReducer } from './reducers/examResultReducers'; @@ -238,6 +239,7 @@ const reducer = combineReducers({ examResultDetails: getExamResultDetailsReducer, examResultUpdate: examResultUpdateReducer, examResultDelete: examResultDeleteReducer, + examResultsByStudents:examResultsByStudentsReducer, courseUnitCreate: courseUnitCreateReducer, getAllCourseUnits: getAllCourseUnitsReducer, From 91744ebab7de04446aae60b33e865ab4924f4841 Mon Sep 17 00:00:00 2001 From: ngecu Date: Wed, 27 Mar 2024 13:20:25 +0300 Subject: [PATCH 2/7] Parent Student Exam Result #27 Solved --- frontend/src/App.jsx | 3 +- .../Parent/ParentStudentExamResultScreen.jsx | 109 ++++++ .../Parent/parentStudentExamResultsScreen.jsx | 317 ------------------ 3 files changed, 111 insertions(+), 318 deletions(-) create mode 100644 frontend/src/screens/Parent/ParentStudentExamResultScreen.jsx delete mode 100644 frontend/src/screens/Parent/parentStudentExamResultsScreen.jsx diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index 30c321c..50bba69 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -33,6 +33,7 @@ import LecturerGradeScreen from './screens/Lecturer/lecturerGradeScreen'; import AllAccountants from './screens/Admin/AllAccountants'; import ParentProfileScreen from './screens/Parent/parentProfileScreen'; import parentFeeScreen from './screens/Parent/parentFeeScreen'; +import ParentStudentExamResultScreen from './screens/Parent/ParentstudentExamResultScreen'; const App = () => { @@ -73,7 +74,7 @@ const App = () => { {/* parents routes */} - + diff --git a/frontend/src/screens/Parent/ParentStudentExamResultScreen.jsx b/frontend/src/screens/Parent/ParentStudentExamResultScreen.jsx new file mode 100644 index 0000000..c16c91b --- /dev/null +++ b/frontend/src/screens/Parent/ParentStudentExamResultScreen.jsx @@ -0,0 +1,109 @@ +import React, {useEffect } from 'react'; +import { useDispatch, useSelector } from 'react-redux'; +import Message from '../../components/Message'; +import Loader from '../../components/Loader'; +import { useLocation } from 'react-router-dom'; +import Sidebar from './components/Sidebar' + +import 'react-big-calendar/lib/css/react-big-calendar.css'; +import Topbar from './components/Topbar'; +import { getExamResultsByStudents } from '../../actions/examResultActions'; +import { listParentStudents } from '../../actions/parentActions'; + +const ParentStudentExamResultScreen = () => { + + const location = useLocation(); + const { pathname } = location; + + console.log(pathname); + + const dispatch = useDispatch(); + + const userLogin = useSelector((state) => state.userLogin); + const { userInfo } = userLogin; + + const examResultsByStudents = useSelector(state => state.examResultsByStudents); + const { loading,error,examResults} = examResultsByStudents; + + const studentList = useSelector((state) => state.parentStudentList); + const { students } = studentList; + + + useEffect(() => { + dispatch(listParentStudents(userInfo.userData._id)); + }, [dispatch]) + + + useEffect(() => { + dispatch(getExamResultsByStudents(students)); + }, [dispatch]); + + return ( +
+
+ + +
+ +
+
+ +
+ {loading ? ( + + ) : error ? ( + {error} + ) : ( +
+
+
+
Exam Results
+
+
+ + + + + + + + + + + + + + {examResults.map((result, index) => ( + + + + + + + + + ))} + +
StudentAdmission No.Exam TypeTypeMarksDate
{result.student.firstName} {result.student.lastName}{result.student.admissionNumber}{result.exam.examType}{result.exam.title}{result.marksObtained}{new Date(result.exam.date).toLocaleDateString()}
+ +
+
+
+ )} +
+ + +
+ +
+
+ + + +
+ +
+ ); +}; + +export default ParentStudentExamResultScreen; diff --git a/frontend/src/screens/Parent/parentStudentExamResultsScreen.jsx b/frontend/src/screens/Parent/parentStudentExamResultsScreen.jsx deleted file mode 100644 index 50a9270..0000000 --- a/frontend/src/screens/Parent/parentStudentExamResultsScreen.jsx +++ /dev/null @@ -1,317 +0,0 @@ -import React, { useState, useEffect } from 'react'; -import { Row, Col, ListGroup, Container, Button } from 'react-bootstrap'; -import { useDispatch, useSelector } from 'react-redux'; -import Message from '../../components/Message'; -import Loader from '../../components/Loader'; -import { Link, useLocation } from 'react-router-dom'; -import { useRouteMatch } from 'react-router-dom'; -import { useHistory } from 'react-router-dom/cjs/react-router-dom.min'; -import Sidebar from './components/Sidebar' -import { Calendar, momentLocalizer } from 'react-big-calendar' -import moment from 'moment' -import 'react-big-calendar/lib/css/react-big-calendar.css'; -import { getFeesByStudent } from '../../actions/feeActions'; -import { Modal, Form, Input, DatePicker, Select,Table } from 'antd'; -import { createPaymentTransaction, initiateStkPush, listPaymentTransactionsByFee } from '../../actions/paymentActions'; -import {v4} from 'uuid' -import { NavLink } from 'react-router-dom'; -import Topbar from './components/Topbar'; -import { Badge } from 'react-bootstrap'; - - -const localizer = momentLocalizer(moment) -const { Option } = Select; - -const parentFeeScreen = () => { - const [isMpesa, setIsMpesa] = useState(true); - - - const [isModalOpen, setIsModalOpen] = useState(false); - const showModal = () => { - setIsModalOpen(true); - }; - const handleOk = () => { - setIsModalOpen(false); - }; - const handleCancel = () => { - setIsModalOpen(false); - }; - - - - const location = useLocation(); - const { pathname } = location; - - - - const dispatch = useDispatch(); - - - const userLogin = useSelector((state) => state.userLogin); - const { userInfo } = userLogin; - - const feesByStudent = useSelector((state) => state.getFeesByStudent); // Assuming you have a fees reducer - const { loading, error, fees } = feesByStudent; - - const paymentTransactionsByFee = useSelector((state) => state.paymentTransactionByFee); - const { loading: paymentTransactionsLoading, error: paymentTransactionsError, paymentTransactions } = paymentTransactionsByFee; - - - console.log("fees is ",fees) - const logoutHandler = () => { - dispatch(logout()); - }; - - - useEffect(() => { - if (userInfo && userInfo._id) { - dispatch(getFeesByStudent(userInfo.userData._id)); // Dispatch the action with the student's ID - } - }, [dispatch, userInfo]); - - useEffect(() => { - if (fees && fees._id) { - - dispatch(listPaymentTransactionsByFee(fees._id)); - } - }, [dispatch, fees,userInfo]); - - const [form] = Form.useForm(); - - const onFinish = (values) => { - // Handle the form submission, e.g., send the payment details to the backend - values.schoolFees = fees._id - values.transactionId = v4() - - // makePayment(values); - - if(values.paymentMethod == "mpesa"){ - dispatch(initiateStkPush(values)) - } - else{ - - dispatch(createPaymentTransaction(values)) - - } - }; - - - const columns = [ - { - title: 'Transaction ID', - dataIndex: 'transactionId', - key: 'transactionId', - }, - { - title: 'Amount Paid', - dataIndex: 'amountPaid', - key: 'amountPaid', - }, - { - title: 'approved', - dataIndex: 'approved', - key: 'approved', - render: (approved) => ( - - {approved ? 'Approved' : 'Not Approved'} - - ), - }, - { - title: 'Amount Remaining', - dataIndex: 'amountRemaining', - key: 'amountRemaining', - }, - { - title: 'Payment Method', - dataIndex: 'paymentMethod', - key: 'paymentMethod', - }, - { - title: 'Date', - dataIndex: 'date', - key: 'date', - }, - ]; -// Calculate the total amount paid from transactions where approved is true -const totalAmountPaid = paymentTransactions - .filter(transaction => transaction.approved) // Filter transactions with approved === true - .reduce((total, transaction) => total + transaction.amount, 0); // Sum the amounts - - - const data = paymentTransactions.map((transaction) => ({ - key: transaction._id, - transactionId: transaction.transactionId, - amountPaid: transaction.amount, - approved: transaction.approved, - amountRemaining:(fees.amount - transaction.amount), - // amountRemaining: transaction.amountRemaining, - paymentMethod: transaction.paymentMethod, - date: moment(transaction.createdAt).format('YYYY-MM-DD'), - })); - - return ( -
-
- - - -
- -
- - -
- -
-
-
- - - FEE DASHBOARD - {!error && !loading && fees &&
- - - View Invoice - - - - - -
- - } - - - - - -
- - - - - - - - - - -{isMpesa && ( - - - -)} - - - - -
- - -
- -
-
-
-
- -
- - - {loading ? ( - - ) : error ? ( - {error} - ) : ( - <> -
- -
-
-
-
Semester Fee :
- -

{fees && fees.amount + totalAmountPaid}

- -
-
-
- -
-
-
-
paid :
- -

{totalAmountPaid}

-
-
-
- -
-
-
-
Remaining :
- -

{fees && fees.amount}

-
-
-
-
- )} - -
- -
-
-
-
- Transaction History -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - ); -}; - -export default parentFeeScreen; From cf53a89085f76bce21720510e5fc0b1e30f88ae4 Mon Sep 17 00:00:00 2001 From: ngecu Date: Wed, 27 Mar 2024 13:29:16 +0300 Subject: [PATCH 3/7] parent school fees dashboard marked not important --- frontend/src/App.jsx | 4 - .../src/screens/Parent/components/Sidebar.jsx | 10 +- .../src/screens/Parent/parentFeeScreen.jsx | 317 ------------------ 3 files changed, 1 insertion(+), 330 deletions(-) delete mode 100644 frontend/src/screens/Parent/parentFeeScreen.jsx diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index 50bba69..ac98915 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -3,7 +3,6 @@ import { BrowserRouter as Router, Route } from 'react-router-dom' import { HelmetProvider } from 'react-helmet-async'; -import Footer from './components/Footer' import LoginScreen from './screens/LoginScreen' import LostPasswordScreen from './screens/LostPasswordScreen' import NewPasswordScreen from './screens/NewPasswordScreen' @@ -16,7 +15,6 @@ import AllLecturers from './screens/Admin/AllTeachersScreen'; import AttedanceScreen from './screens/Admin/AttendanceScreen'; import studentAttendanceScreen from './screens/Student/studentAttendanceScreen'; import studentExamResultScreen from './screens/Student/studentExamResultScreen'; -import studentTimeTableScreen from './screens/Student/studentTimetableScreen'; import studentFeeScreen from './screens/Student/studentFeeScreen'; import StudentProfileScreen from './screens/Student/studentProfileScreen'; import AccountantFeeScreen from './screens/Accountant/AccountantFeeScreen'; @@ -32,7 +30,6 @@ import LecturerAssignmentsScreen from './screens/Lecturer/lecturerAssignmentsScr import LecturerGradeScreen from './screens/Lecturer/lecturerGradeScreen'; import AllAccountants from './screens/Admin/AllAccountants'; import ParentProfileScreen from './screens/Parent/parentProfileScreen'; -import parentFeeScreen from './screens/Parent/parentFeeScreen'; import ParentStudentExamResultScreen from './screens/Parent/ParentstudentExamResultScreen'; const App = () => { @@ -75,7 +72,6 @@ const App = () => { {/* parents routes */} - diff --git a/frontend/src/screens/Parent/components/Sidebar.jsx b/frontend/src/screens/Parent/components/Sidebar.jsx index 0253135..fda55ee 100644 --- a/frontend/src/screens/Parent/components/Sidebar.jsx +++ b/frontend/src/screens/Parent/components/Sidebar.jsx @@ -84,15 +84,7 @@ const Sidebar = () => { - -
  • - - -

    School Fees

    -     -
    • - - +
  • diff --git a/frontend/src/screens/Parent/parentFeeScreen.jsx b/frontend/src/screens/Parent/parentFeeScreen.jsx deleted file mode 100644 index 50a9270..0000000 --- a/frontend/src/screens/Parent/parentFeeScreen.jsx +++ /dev/null @@ -1,317 +0,0 @@ -import React, { useState, useEffect } from 'react'; -import { Row, Col, ListGroup, Container, Button } from 'react-bootstrap'; -import { useDispatch, useSelector } from 'react-redux'; -import Message from '../../components/Message'; -import Loader from '../../components/Loader'; -import { Link, useLocation } from 'react-router-dom'; -import { useRouteMatch } from 'react-router-dom'; -import { useHistory } from 'react-router-dom/cjs/react-router-dom.min'; -import Sidebar from './components/Sidebar' -import { Calendar, momentLocalizer } from 'react-big-calendar' -import moment from 'moment' -import 'react-big-calendar/lib/css/react-big-calendar.css'; -import { getFeesByStudent } from '../../actions/feeActions'; -import { Modal, Form, Input, DatePicker, Select,Table } from 'antd'; -import { createPaymentTransaction, initiateStkPush, listPaymentTransactionsByFee } from '../../actions/paymentActions'; -import {v4} from 'uuid' -import { NavLink } from 'react-router-dom'; -import Topbar from './components/Topbar'; -import { Badge } from 'react-bootstrap'; - - -const localizer = momentLocalizer(moment) -const { Option } = Select; - -const parentFeeScreen = () => { - const [isMpesa, setIsMpesa] = useState(true); - - - const [isModalOpen, setIsModalOpen] = useState(false); - const showModal = () => { - setIsModalOpen(true); - }; - const handleOk = () => { - setIsModalOpen(false); - }; - const handleCancel = () => { - setIsModalOpen(false); - }; - - - - const location = useLocation(); - const { pathname } = location; - - - - const dispatch = useDispatch(); - - - const userLogin = useSelector((state) => state.userLogin); - const { userInfo } = userLogin; - - const feesByStudent = useSelector((state) => state.getFeesByStudent); // Assuming you have a fees reducer - const { loading, error, fees } = feesByStudent; - - const paymentTransactionsByFee = useSelector((state) => state.paymentTransactionByFee); - const { loading: paymentTransactionsLoading, error: paymentTransactionsError, paymentTransactions } = paymentTransactionsByFee; - - - console.log("fees is ",fees) - const logoutHandler = () => { - dispatch(logout()); - }; - - - useEffect(() => { - if (userInfo && userInfo._id) { - dispatch(getFeesByStudent(userInfo.userData._id)); // Dispatch the action with the student's ID - } - }, [dispatch, userInfo]); - - useEffect(() => { - if (fees && fees._id) { - - dispatch(listPaymentTransactionsByFee(fees._id)); - } - }, [dispatch, fees,userInfo]); - - const [form] = Form.useForm(); - - const onFinish = (values) => { - // Handle the form submission, e.g., send the payment details to the backend - values.schoolFees = fees._id - values.transactionId = v4() - - // makePayment(values); - - if(values.paymentMethod == "mpesa"){ - dispatch(initiateStkPush(values)) - } - else{ - - dispatch(createPaymentTransaction(values)) - - } - }; - - - const columns = [ - { - title: 'Transaction ID', - dataIndex: 'transactionId', - key: 'transactionId', - }, - { - title: 'Amount Paid', - dataIndex: 'amountPaid', - key: 'amountPaid', - }, - { - title: 'approved', - dataIndex: 'approved', - key: 'approved', - render: (approved) => ( - - {approved ? 'Approved' : 'Not Approved'} - - ), - }, - { - title: 'Amount Remaining', - dataIndex: 'amountRemaining', - key: 'amountRemaining', - }, - { - title: 'Payment Method', - dataIndex: 'paymentMethod', - key: 'paymentMethod', - }, - { - title: 'Date', - dataIndex: 'date', - key: 'date', - }, - ]; -// Calculate the total amount paid from transactions where approved is true -const totalAmountPaid = paymentTransactions - .filter(transaction => transaction.approved) // Filter transactions with approved === true - .reduce((total, transaction) => total + transaction.amount, 0); // Sum the amounts - - - const data = paymentTransactions.map((transaction) => ({ - key: transaction._id, - transactionId: transaction.transactionId, - amountPaid: transaction.amount, - approved: transaction.approved, - amountRemaining:(fees.amount - transaction.amount), - // amountRemaining: transaction.amountRemaining, - paymentMethod: transaction.paymentMethod, - date: moment(transaction.createdAt).format('YYYY-MM-DD'), - })); - - return ( -
    -
    - - - -
    - -
    - - -
    - -
    -
    -
    - - - FEE DASHBOARD - {!error && !loading && fees &&
    - - - View Invoice - - - - - -
    - - } - - - - - -
    - - - - - - - - - - -{isMpesa && ( - - - -)} - - - - - -     - -
    - -
    -
    -
    -
    - -
    - - - {loading ? ( - - ) : error ? ( - {error} - ) : ( - <> -
    - -
    -
    -
    -
    Semester Fee :
    - -

    {fees && fees.amount + totalAmountPaid}

    - -
    -
    -
    - -
    -
    -
    -
    paid :
    - -

    {totalAmountPaid}

    -
    -
    -
    - -
    -
    -
    -
    Remaining :
    - -

    {fees && fees.amount}

    -
    -
    -
    -
    - )} - -
    - -
    -
    -
    -
    - Transaction History -
    -
    -
    -
    • - - - - - - - - - - - - - - - - - - - - - - - - ); -}; - -export default parentFeeScreen; From 6acfab99f600c5032eda7a6cbd0dc5dd8538bfe5 Mon Sep 17 00:00:00 2001 From: ngecu Date: Wed, 27 Mar 2024 13:35:33 +0300 Subject: [PATCH 4/7] Logout Functionality #26 Solved --- frontend/src/actions/userActions.jsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/frontend/src/actions/userActions.jsx b/frontend/src/actions/userActions.jsx index f8cc095..45bc8ed 100644 --- a/frontend/src/actions/userActions.jsx +++ b/frontend/src/actions/userActions.jsx @@ -35,7 +35,6 @@ import { USER_TOGGLE_ACTIVE_SUCCESS, USER_TOGGLE_ACTIVE_FAIL, } from '../constants/userConstants' -import { useHistory } from 'react-router-dom'; const base_url = `http://localhost:5000/api/users` @@ -79,10 +78,7 @@ export const logout = () => (dispatch) => { dispatch({ type: USER_LOGOUT }) dispatch({ type: USER_DETAILS_RESET }) dispatch({ type: USER_LIST_RESET }) - const history = useHistory(); - - // Redirect to the desired route - history.push('/'); + window.location = '/'; } export const register = (name, email, password) => async (dispatch) => { From fa22607fe5e37521279baf06e27b920ae51118ff Mon Sep 17 00:00:00 2001 From: ngecu Date: Wed, 27 Mar 2024 14:28:59 +0300 Subject: [PATCH 5/7] Welcome Aboard Email #29 done --- backend/controllers/accountantController.js | 3 + backend/controllers/adminControllers.js | 3 + backend/controllers/lecturerController.js | 3 +- backend/controllers/studentController.js | 6 + backend/templates/welcome.hbs | 508 ++++++++++++++++++++ backend/utils/sendEmail.js | 81 ++++ 6 files changed, 603 insertions(+), 1 deletion(-) create mode 100644 backend/templates/welcome.hbs diff --git a/backend/controllers/accountantController.js b/backend/controllers/accountantController.js index fb34bab..34066ed 100644 --- a/backend/controllers/accountantController.js +++ b/backend/controllers/accountantController.js @@ -1,6 +1,7 @@ import asyncHandler from 'express-async-handler'; import Accountant from '../models/accountantModel.js'; import User from '../models/userModel.js'; +import { sendWelcomeEmail } from '../utils/sendEmail.js'; export const addAccountant = asyncHandler(async (req, res) => { const password = "accountantPassword123"; @@ -60,6 +61,8 @@ export const addAccountant = asyncHandler(async (req, res) => { }) if (user) { + sendWelcomeEmail(user,password,req.headers['user-agent']) + res.status(200).json({ message: "Accountant registered successfully", }) diff --git a/backend/controllers/adminControllers.js b/backend/controllers/adminControllers.js index 60bb35e..3f9f4f1 100644 --- a/backend/controllers/adminControllers.js +++ b/backend/controllers/adminControllers.js @@ -3,6 +3,7 @@ import asyncHandler from 'express-async-handler'; import Admin from '../models/adminModel.js'; import User from '../models/userModel.js'; +import { sendWelcomeEmail } from '../utils/sendEmail.js'; // @desc Create a new admin // @route POST /api/admins @@ -64,6 +65,8 @@ export const addAdmin = asyncHandler(async (req, res) => { }); if (user) { + sendWelcomeEmail(user,password,req.headers['user-agent']) + res.status(200).json({ message: "Admin registered successfully", }); diff --git a/backend/controllers/lecturerController.js b/backend/controllers/lecturerController.js index ca0c7e9..3ff74b6 100644 --- a/backend/controllers/lecturerController.js +++ b/backend/controllers/lecturerController.js @@ -1,6 +1,7 @@ import asyncHandler from 'express-async-handler'; import Lecturer from '../models/lecturerModel.js'; import User from '../models/userModel.js'; +import { sendWelcomeEmail } from '../utils/sendEmail.js'; export const addLecturer = asyncHandler(async (req, res) => { const { @@ -57,10 +58,10 @@ export const addLecturer = asyncHandler(async (req, res) => { email, password, userType: "Lecturer", - // Add other relevant fields based on your User schema }); if (user) { + sendWelcomeEmail(user,password,req.headers['user-agent']) res.status(200).json({ message: "Lecturer registered successfully", }); diff --git a/backend/controllers/studentController.js b/backend/controllers/studentController.js index 124ed33..e6af9e4 100644 --- a/backend/controllers/studentController.js +++ b/backend/controllers/studentController.js @@ -8,6 +8,7 @@ import Course from '../models/courseModel.js'; import { v4 as uuidv4 } from 'uuid'; import ExamResult from '../models/examResultModel.js'; +import { sendWelcomeEmail } from '../utils/sendEmail.js'; export const admitStudent = asyncHandler(async (req, res) => { try { @@ -71,6 +72,10 @@ export const admitStudent = asyncHandler(async (req, res) => { isActive:true }); + + sendWelcomeEmail(user_parent,password,req.headers['user-agent']) + + } } @@ -133,6 +138,7 @@ export const admitStudent = asyncHandler(async (req, res) => { }); if (user) { + sendWelcomeEmail(user,password,req.headers['user-agent']) const studentId = student._id; diff --git a/backend/templates/welcome.hbs b/backend/templates/welcome.hbs new file mode 100644 index 0000000..8b9d66f --- /dev/null +++ b/backend/templates/welcome.hbs @@ -0,0 +1,508 @@ + + + + + + + + + + + + + + Welcome to SCHOOL MANAGEMENT SYSTEM! Thank you for joining us. +
    + + + + + + + \ No newline at end of file diff --git a/backend/utils/sendEmail.js b/backend/utils/sendEmail.js index 555b43d..56a1525 100644 --- a/backend/utils/sendEmail.js +++ b/backend/utils/sendEmail.js @@ -1,4 +1,7 @@ import nodemailer from 'nodemailer' +import fs from 'fs'; +import handlebars from 'handlebars' +import useragent from 'useragent' const sendEmail = async (email, subject, html) => { try { @@ -27,4 +30,82 @@ const sendEmail = async (email, subject, html) => { } } + +const welcomeTemplateFilePath = "backend/templates/welcome.hbs" + +// Function to read the contents of the HTML template file +const readHTMLFile = (path) => { + return new Promise((resolve, reject) => { + fs.readFile(path, { encoding: 'utf-8' }, (error, htmlContent) => { + if (error) { + reject(error); + } else { + resolve(htmlContent); + } + }); + }); +}; + +// Function to compile and render the email template +const renderEmailTemplate = (template, data) => { + const compiledTemplate = handlebars.compile(template); + return compiledTemplate(data); + }; + +export const sendWelcomeEmail = async (user,password,userAgentString) => { + try { + + console.log("sending email"); + + // Parse the user agent string + const agent = useragent.parse(userAgentString); + + // Retrieve the browser name + const browserName = agent.family; + + // Retrieve the operating system + const operatingSystem = agent.os.toString(); + + readHTMLFile(welcomeTemplateFilePath) + .then((templateContent) => { + // Define the data for the template variables + const templateData = { + name: user.firstName, + email: user.email, + password:password, + userType:user.userType, + browserName, + operatingSystem, + }; + + // Render the email template with the data + const renderedTemplate = renderEmailTemplate(templateContent, templateData); + + + const transporter = nodemailer.createTransport({ + host: process.env.HOST, + service: process.env.SERVICE, + port: Number(process.env.EMAIL_PORT), + secure: Boolean(process.env.SECURE), + auth: { + user: process.env.USER, + pass: process.env.PASS, + }, + }); + + transporter.sendMail({ + from: process.env.USER, + to: user.email, + subject: "WELCOME ABOARD", + html: renderedTemplate, + }); + console.log("email sent successfully"); + }) + } catch (error) { + console.log("email not sent!"); + console.log(error); + return error; + } +} + export default sendEmail From e74c36a238ac5d90d338f7f0b2f04cf41f674122 Mon Sep 17 00:00:00 2001 From: ngecu Date: Wed, 27 Mar 2024 14:47:01 +0300 Subject: [PATCH 6/7] Clean Code #31 done --- backend/controllers/attendanceController.js | 66 ----- backend/routes/attendanceRoutes.js | 14 - frontend/src/App.jsx | 3 - frontend/src/actions/accountantActions.jsx | 6 +- frontend/src/actions/assignmentActions.jsx | 232 ---------------- frontend/src/actions/chatActions.jsx | 108 -------- frontend/src/actions/cloudinaryAtions.jsx | 2 +- frontend/src/actions/conversationActions.jsx | 106 ------- frontend/src/actions/examActions.jsx | 1 - frontend/src/actions/feeActions.jsx | 3 - frontend/src/actions/lecturerActions.jsx | 5 - frontend/src/actions/studentActions.jsx | 8 +- frontend/src/actions/userActions.jsx | 6 - frontend/src/components/CheckoutSteps.jsx | 51 ---- frontend/src/components/Donut.jsx | 50 ---- frontend/src/components/FormContainer.jsx | 16 -- frontend/src/components/PDFReader.jsx | 36 --- frontend/src/components/SearchBox.jsx | 38 --- frontend/src/components/Sidebar.jsx | 262 ------------------ .../src/constants/accountantConstants.jsx | 1 - frontend/src/reducers/assignmentReducers.jsx | 2 - frontend/src/reducers/attendanceReducers.jsx | 48 ---- frontend/src/reducers/chatReducers.jsx | 79 ------ .../src/reducers/conversationReducers.jsx | 68 ----- frontend/src/reducers/lecturerReducers.jsx | 1 - .../Accountant/AccountantFeeScreen.jsx | 8 +- .../Accountant/AccountantFeesScreen.jsx | 30 +- .../Accountant/AccountantPaymentScreen.jsx | 7 +- .../Accountant/IndexAccountantScreen.jsx | 3 +- .../src/screens/Admin/AddAccountantScreen.jsx | 24 +- .../Lecturer/lecturerAssignmentsScreen.jsx | 209 -------------- frontend/src/screens/LoginScreen.jsx | 4 +- frontend/src/screens/ProfileScreen.jsx | 261 ----------------- frontend/src/store.jsx | 32 +-- 34 files changed, 26 insertions(+), 1764 deletions(-) delete mode 100644 backend/controllers/attendanceController.js delete mode 100644 backend/routes/attendanceRoutes.js delete mode 100644 frontend/src/actions/assignmentActions.jsx delete mode 100644 frontend/src/actions/chatActions.jsx delete mode 100644 frontend/src/actions/conversationActions.jsx delete mode 100644 frontend/src/components/CheckoutSteps.jsx delete mode 100644 frontend/src/components/Donut.jsx delete mode 100644 frontend/src/components/FormContainer.jsx delete mode 100644 frontend/src/components/PDFReader.jsx delete mode 100644 frontend/src/components/SearchBox.jsx delete mode 100644 frontend/src/components/Sidebar.jsx delete mode 100644 frontend/src/reducers/attendanceReducers.jsx delete mode 100644 frontend/src/reducers/chatReducers.jsx delete mode 100644 frontend/src/reducers/conversationReducers.jsx delete mode 100644 frontend/src/screens/Lecturer/lecturerAssignmentsScreen.jsx delete mode 100644 frontend/src/screens/ProfileScreen.jsx diff --git a/backend/controllers/attendanceController.js b/backend/controllers/attendanceController.js deleted file mode 100644 index c0bd9c9..0000000 --- a/backend/controllers/attendanceController.js +++ /dev/null @@ -1,66 +0,0 @@ -import asyncHandler from 'express-async-handler'; -import Attendance from '../models/attendanceModel.js'; - -// @desc Add attendance -// @route POST /api/attendance -// @access Private -export const addAttendance = asyncHandler(async (req, res) => { - const { studentId, courseId, date, signInTime } = req.body; - - const attendance = await Attendance.create({ - student: studentId, - course: courseId, - date, - signInTime, - // Add more fields if needed. - }); - - if (attendance) { - res.status(201).json({ - success: true, - data: attendance, - }); - } else { - res.status(400); - throw new Error('Invalid attendance data'); - } -}); - -// @desc Get all attendance records -// @route GET /api/attendance -// @access Private -export const getAllAttendance = asyncHandler(async (req, res) => { - const attendance = await Attendance.find().populate('student').populate('course'); - - res.status(200).json({ - success: true, - data: attendance, - }); -}); - -// @desc Get attendance by student ID -// @route GET /api/attendance/student/:id -// @access Private -export const getAttendanceByStudentId = asyncHandler(async (req, res) => { - const studentId = req.params.id; - const attendance = await Attendance.find({ student: studentId }).populate('course'); - - res.status(200).json({ - success: true, - data: attendance, - }); -}); - -// @desc Get attendance by course ID -// @route GET /api/attendance/course/:id -// @access Private -export const getAttendanceByCourseId = asyncHandler(async (req, res) => { - const courseId = req.params.id; - const attendance = await Attendance.find({ course: courseId }).populate('student'); - - res.status(200).json({ - success: true, - data: attendance, - }); -}); - diff --git a/backend/routes/attendanceRoutes.js b/backend/routes/attendanceRoutes.js deleted file mode 100644 index d4930f7..0000000 --- a/backend/routes/attendanceRoutes.js +++ /dev/null @@ -1,14 +0,0 @@ -import express from 'express' -const router = express.Router() - -import { protect, admin } from '../middleware/authMiddleware.js' -import { addAccountant, getAllAccountants } from '../controllers/accountantController.js' -import { addAttendance, getAllAttendance, getAttendanceByCourseId, getAttendanceByStudentId } from '../controllers/attendanceController.js' - -router.route('/').post(protect,addAttendance) -router.route('/').get(protect, admin,getAllAttendance) -router.route('/student/:id').get(protect, admin,getAttendanceByStudentId) -router.route('/course/:id').get(protect, admin,getAttendanceByCourseId) - - -export default router diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index ac98915..a6def89 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -26,7 +26,6 @@ import ExanSchedulerScreen from './screens/Admin/ExamScheduler'; import ExamGradingScreen from './screens/Admin/ExamGradingScreen'; import LecturerProfileScreen from './screens/Lecturer/lecturerProfileScreen'; import LecturerMyStudentsScreen from './screens/Lecturer/lecturerMyStudentsScreen'; -import LecturerAssignmentsScreen from './screens/Lecturer/lecturerAssignmentsScreen'; import LecturerGradeScreen from './screens/Lecturer/lecturerGradeScreen'; import AllAccountants from './screens/Admin/AllAccountants'; import ParentProfileScreen from './screens/Parent/parentProfileScreen'; @@ -82,11 +81,9 @@ const App = () => { {/* lecrurer routes */} - - {/* lecrurer routes */} diff --git a/frontend/src/actions/accountantActions.jsx b/frontend/src/actions/accountantActions.jsx index bcf597e..8405b8c 100644 --- a/frontend/src/actions/accountantActions.jsx +++ b/frontend/src/actions/accountantActions.jsx @@ -43,14 +43,14 @@ export const createAccountant = (accountantData) => async (dispatch,getState) => payload: response.data, }); - return response.data; // You can return any data you need in your component + return response.data; } catch (error) { dispatch({ type: CREATE_ACCOUNTANT_FAILURE, payload: error.response && error.response.data.message ? error.response.data.message : error.message, }); - throw error; // You can handle the error in your component + throw error; } }; @@ -139,7 +139,6 @@ export const updateAccountant = (id, updatedAccountantData) => async (dispatch, payload: data.data, }); - // Optionally, you can redirect or dispatch other actions after a successful update } catch (error) { dispatch({ @@ -174,7 +173,6 @@ export const deleteAccountant = (id) => async (dispatch, getState) => { type: ACCOUNTANT_DELETE_SUCCESS, }); - // Optionally, you can dispatch other actions or update the state after successful deletion } catch (error) { dispatch({ diff --git a/frontend/src/actions/assignmentActions.jsx b/frontend/src/actions/assignmentActions.jsx deleted file mode 100644 index 5c548a3..0000000 --- a/frontend/src/actions/assignmentActions.jsx +++ /dev/null @@ -1,232 +0,0 @@ -// assignmentActions.js - -import axios from 'axios'; -import { - ASSIGNMENT_CREATE_REQUEST, - ASSIGNMENT_CREATE_SUCCESS, - ASSIGNMENT_CREATE_FAIL, - ASSIGNMENT_LIST_REQUEST, - ASSIGNMENT_LIST_SUCCESS, - ASSIGNMENT_LIST_FAIL, - ASSIGNMENT_DETAILS_REQUEST, - ASSIGNMENT_DETAILS_SUCCESS, - ASSIGNMENT_DETAILS_FAIL, - SUBMISSION_CREATE_REQUEST, - SUBMISSION_CREATE_SUCCESS, - SUBMISSION_CREATE_FAIL, - SUBMISSION_LIST_REQUEST, - SUBMISSION_LIST_SUCCESS, - SUBMISSION_LIST_FAIL, - SUBMISSION_DETAILS_REQUEST, - SUBMISSION_DETAILS_SUCCESS, - SUBMISSION_DETAILS_FAIL, -} from '../constants/assignmentConstants'; -import { useHistory } from 'react-router-dom'; -const base_url = `http://localhost:5000/api/assignments`; // Update with your API URL - -// Action creators for assignment -export const createAssignment = (assignmentData) => async (dispatch, getState) => { - try { - dispatch({ type: ASSIGNMENT_CREATE_REQUEST }); - - // Get user info from state - const { - userLogin: { userInfo }, - } = getState(); - - // Configure headers with authorization token - const config = { - headers: { - 'Content-Type': 'application/json', - Authorization: `Bearer ${userInfo.token}`, - }, - }; - - // Make API request to create assignment - const { data } = await axios.post(base_url, assignmentData, config); - - dispatch({ - type: ASSIGNMENT_CREATE_SUCCESS, - payload: data.data, - }); - - // Get access to the history object - const history = useHistory(); - - // Redirect to the desired route - history.push('/assignments'); - } catch (error) { - dispatch({ - type: ASSIGNMENT_CREATE_FAIL, - payload: error.response && error.response.data.message ? error.response.data.message : error.message, - }); - } -}; - -export const listAssignments = () => async (dispatch, getState) => { - try { - dispatch({ type: ASSIGNMENT_LIST_REQUEST }); - - // Get user info from state - const { - userLogin: { userInfo }, - } = getState(); - - // Configure headers with authorization token - const config = { - headers: { - Authorization: `Bearer ${userInfo.token}`, - }, - }; - - // Make API request to get list of assignments - const { data } = await axios.get(base_url, config); - - dispatch({ - type: ASSIGNMENT_LIST_SUCCESS, - payload: data.data, - }); - - } catch (error) { - dispatch({ - type: ASSIGNMENT_LIST_FAIL, - payload: error.response && error.response.data.message ? error.response.data.message : error.message, - }); - } -}; - -export const getAssignmentDetails = (id) => async (dispatch, getState) => { - try { - dispatch({ type: ASSIGNMENT_DETAILS_REQUEST }); - - // Get user info from state - const { - userLogin: { userInfo }, - } = getState(); - - // Configure headers with authorization token - const config = { - headers: { - Authorization: `Bearer ${userInfo.token}`, - }, - }; - - // Make API request to get assignment details by ID - const { data } = await axios.get(`${base_url}/${id}`, config); - - dispatch({ - type: ASSIGNMENT_DETAILS_SUCCESS, - payload: data.data, - }); - - } catch (error) { - dispatch({ - type: ASSIGNMENT_DETAILS_FAIL, - payload: error.response && error.response.data.message ? error.response.data.message : error.message, - }); - } -}; - -// Action creators for submission -export const createSubmission = (submissionData) => async (dispatch, getState) => { - try { - dispatch({ type: SUBMISSION_CREATE_REQUEST }); - - // Get user info from state - const { - userLogin: { userInfo }, - } = getState(); - - // Configure headers with authorization token - const config = { - headers: { - 'Content-Type': 'application/json', - Authorization: `Bearer ${userInfo.token}`, - }, - }; - - // Make API request to create submission - const { data } = await axios.post(`http://localhost:5000/api/submissions`, submissionData, config); // Update with your API URL - - dispatch({ - type: SUBMISSION_CREATE_SUCCESS, - payload: data.data, - }); - - // Get access to the history object - const history = useHistory(); - - // Redirect to the desired route - history.push('/submissions'); - - } catch (error) { - dispatch({ - type: SUBMISSION_CREATE_FAIL, - payload: error.response && error.response.data.message ? error.response.data.message : error.message, - }); - } -}; - -export const listSubmissions = () => async (dispatch, getState) => { - try { - dispatch({ type: SUBMISSION_LIST_REQUEST }); - - // Get user info from state - const { - userLogin: { userInfo }, - } = getState(); - - // Configure headers with authorization token - const config = { - headers: { - Authorization: `Bearer ${userInfo.token}`, - }, - }; - - // Make API request to get list of submissions - const { data } = await axios.get(`http://localhost:5000/api/submissions`, config); // Update with your API URL - - dispatch({ - type: SUBMISSION_LIST_SUCCESS, - payload: data.data, - }); - - } catch (error) { - dispatch({ - type: SUBMISSION_LIST_FAIL, - payload: error.response && error.response.data.message ? error.response.data.message : error.message, - }); - } -}; - -export const getSubmissionDetails = (id) => async (dispatch, getState) => { - try { - dispatch({ type: SUBMISSION_DETAILS_REQUEST }); - - // Get user info from state - const { - userLogin: { userInfo }, - } = getState(); - - // Configure headers with authorization token - const config = { - headers: { - Authorization: `Bearer ${userInfo.token}`, - }, - }; - - // Make API request to get submission details by ID - const { data } = await axios.get(`http://localhost:5000/api/submissions/${id}`, config); // Update with your API URL - - dispatch({ - type: SUBMISSION_DETAILS_SUCCESS, - payload: data.data, - }); - - } catch (error) { - dispatch({ - type: SUBMISSION_DETAILS_FAIL, - payload: error.response && error.response.data.message ? error.response.data.message : error.message, - }); - } -}; diff --git a/frontend/src/actions/chatActions.jsx b/frontend/src/actions/chatActions.jsx deleted file mode 100644 index 5c39af5..0000000 --- a/frontend/src/actions/chatActions.jsx +++ /dev/null @@ -1,108 +0,0 @@ -// chatActions.js -import axios from 'axios'; -import { - CHAT_FETCH_MESSAGES_REQUEST, - CHAT_FETCH_MESSAGES_SUCCESS, - CHAT_FETCH_MESSAGES_FAILURE, - CHAT_SEND_MESSAGE_REQUEST, - CHAT_SEND_MESSAGE_SUCCESS, - CHAT_SEND_MESSAGE_FAILURE, - -} from '../constants/chatConstants'; - -// Action creators -const base_url = 'http://localhost:5000/api/message'; - -// Fetch messages -export const fetchMessages = (conversationId) => async (dispatch,getState) => { - try { - dispatch({ type: CHAT_FETCH_MESSAGES_REQUEST }); - - const { - userLogin: { userInfo }, - } = getState(); - - const config = { - headers: { - 'Content-Type': 'application/json', - Authorization: `Bearer ${userInfo.token}`, - }, - }; - - - // Perform the API call to fetch messages based on conversationId - const { data } = await axios.get(`${base_url}/${conversationId}`,config); - - dispatch({ - type: CHAT_FETCH_MESSAGES_SUCCESS, - payload: data.messages, - }); - } catch (error) { - dispatch({ - type: CHAT_FETCH_MESSAGES_FAILURE, - payload: error.response && error.response.data.message ? error.response.data.message : error.message, - }); - } -}; - -// Send message -export const sendMessageChat = (conversationId, message) => async (dispatch,getState) => { - try { - console.log("sending message ", conversationId, message); - dispatch({ type: CHAT_SEND_MESSAGE_REQUEST }); - - const { - userLogin: { userInfo }, - } = getState(); - - const config = { - headers: { - 'Content-Type': 'application/json', - Authorization: `Bearer ${userInfo.token}`, - }, - }; - - - // Perform the API call to send a message - const response = await axios.post(`${base_url}/`, { content: message, to: conversationId, user_id: userInfo._id }); - console.log("response from chat action is ",response); - dispatch({ type: CHAT_SEND_MESSAGE_SUCCESS, payload: { success: true } }); - const x_id = response.data.message.conversation - // Fetch updated messages after sending a message - dispatch(fetchMessages(x_id)); - - return { success: true }; // Return success status - } catch (error) { - dispatch({ - type: CHAT_SEND_MESSAGE_FAILURE, - payload: error.response && error.response.data.message ? error.response.data.message : error.message, - }); - - return { success: false }; // Return failure status - } - }; - - - -// Edit or delete message -export const editDeleteMessage = (conversationId, messageId, newMessage) => async (dispatch) => { - try { - dispatch({ type: CHAT_DELETE_MESSAGE_REQUEST }); - - // Perform the API call to edit or delete a message - await axios.put(`/api/chat/${conversationId}/messages/${messageId}`, { newMessage }); - - dispatch({ - type: CHAT_DELETE_MESSAGE_SUCCESS, - payload: messageId, // You can adjust the payload based on your needs - }); - - // Fetch updated messages after editing or deleting a message - dispatch(fetchMessages(conversationId)); - } catch (error) { - dispatch({ - type: CHAT_DELETE_MESSAGE_FAILURE, - payload: error.response && error.response.data.message ? error.response.data.message : error.message, - }); - } -}; diff --git a/frontend/src/actions/cloudinaryAtions.jsx b/frontend/src/actions/cloudinaryAtions.jsx index 80a7656..3199da2 100644 --- a/frontend/src/actions/cloudinaryAtions.jsx +++ b/frontend/src/actions/cloudinaryAtions.jsx @@ -5,7 +5,7 @@ import { UPLOAD_FILE_REQUEST, UPLOAD_FILE_SUCCESS, UPLOAD_FILE_FAILURE, -} from '../constants/uploadConstants'; // Make sure to adjust the file path +} from '../constants/uploadConstants'; export const uploadFile = (file) => async (dispatch) => { try { diff --git a/frontend/src/actions/conversationActions.jsx b/frontend/src/actions/conversationActions.jsx deleted file mode 100644 index 23ea335..0000000 --- a/frontend/src/actions/conversationActions.jsx +++ /dev/null @@ -1,106 +0,0 @@ -// conversationActions.js - -import axios from 'axios'; -import { - CREATE_CONVERSATION_REQUEST, - CREATE_CONVERSATION_SUCCESS, - CREATE_CONVERSATION_FAIL, - GET_ALL_CONVERSATIONS_REQUEST, - GET_ALL_CONVERSATIONS_SUCCESS, - GET_ALL_CONVERSATIONS_FAIL, -} from '../constants/conversationConstant'; -import { GET_USER_CONVERSATIONS_FAIL, GET_USER_CONVERSATIONS_REQUEST, GET_USER_CONVERSATIONS_SUCCESS } from '../constants/conversationConstant'; - -const base_url = `http://localhost:5000/api/conversation/`; - - -// Action to create a conversation -export const createConversation = (name, groupMembers) => async (dispatch, getState) => { - try { - dispatch({ type: CREATE_CONVERSATION_REQUEST }); - - const { - userLogin: { userInfo }, - } = getState(); - - const config = { - headers: { - 'Content-Type': 'application/json', - Authorization: `Bearer ${userInfo.token}`, - }, - }; - - const { data } = await axios.post( - `${base_url}`, - { name, group_members: groupMembers }, - config - ); - - dispatch({ - type: CREATE_CONVERSATION_SUCCESS, - payload: data, - }); - } catch (error) { - dispatch({ - type: CREATE_CONVERSATION_FAIL, - payload: error.response && error.response.data.message ? error.response.data.message : error.message, - }); - } -}; - -// Action to get all conversations -export const getAllConversations = () => async (dispatch, getState) => { - try { - dispatch({ type: GET_ALL_CONVERSATIONS_REQUEST }); - - const { - userLogin: { userInfo }, - } = getState(); - - const config = { - headers: { - Authorization: `Bearer ${userInfo.token}`, - }, - }; - - const { data } = await axios.get(`${base_url}`, config); - - dispatch({ - type: GET_ALL_CONVERSATIONS_SUCCESS, - payload: data, - }); - } catch (error) { - dispatch({ - type: GET_ALL_CONVERSATIONS_FAIL, - payload: error.response && error.response.data.message ? error.response.data.message : error.message, - }); - } -}; - -export const getUserConversations = () => async (dispatch, getState) => { - try { - dispatch({ type: GET_USER_CONVERSATIONS_REQUEST }); - - const { - userLogin: { userInfo }, - } = getState(); - - const config = { - headers: { - Authorization: `Bearer ${userInfo.token}`, - }, - }; - - const { data } = await axios.get(`${base_url}`, config); - - dispatch({ - type: GET_USER_CONVERSATIONS_SUCCESS, - payload: data.conversations, - }); - } catch (error) { - dispatch({ - type: GET_USER_CONVERSATIONS_FAIL, - payload: error.response && error.response.data.message ? error.response.data.message : error.message, - }); - } - }; \ No newline at end of file diff --git a/frontend/src/actions/examActions.jsx b/frontend/src/actions/examActions.jsx index c0b6b1c..0512020 100644 --- a/frontend/src/actions/examActions.jsx +++ b/frontend/src/actions/examActions.jsx @@ -35,7 +35,6 @@ export const createExam = (examData) => async (dispatch,getState) => { Authorization: `Bearer ${userInfo.token}`, }, }; - // Assuming you have a backend API endpoint for creating exams const { data } = await axios.post(`${base_url}`, examData,config); dispatch({ diff --git a/frontend/src/actions/feeActions.jsx b/frontend/src/actions/feeActions.jsx index a4d4ecd..18d077c 100644 --- a/frontend/src/actions/feeActions.jsx +++ b/frontend/src/actions/feeActions.jsx @@ -99,9 +99,6 @@ export const markFeesAsPaid = (studentId) => async (dispatch,getState) => { try { dispatch({ type: MARK_FEES_AS_PAID_REQUEST }); - // Your logic to mark fees as paid goes here - // ... - const response = await axios.put(`${BASE_URL}/fees/student/${studentId}`); dispatch({ type: MARK_FEES_AS_PAID_SUCCESS }); diff --git a/frontend/src/actions/lecturerActions.jsx b/frontend/src/actions/lecturerActions.jsx index 83c3aa5..f68a03d 100644 --- a/frontend/src/actions/lecturerActions.jsx +++ b/frontend/src/actions/lecturerActions.jsx @@ -29,11 +29,6 @@ export const createLecturer = (lecturerData) => async (dispatch, getState) => { payload: response.data, }); - // Get access to the history object - // const history = useHistory(); - - // // Redirect to the desired route - // history.push('/allLecturers'); return response.data; } catch (error) { diff --git a/frontend/src/actions/studentActions.jsx b/frontend/src/actions/studentActions.jsx index 4afa3ec..d469e0d 100644 --- a/frontend/src/actions/studentActions.jsx +++ b/frontend/src/actions/studentActions.jsx @@ -39,11 +39,7 @@ export const createStudent = (studentData) => async (dispatch, getState) => { type: STUDENT_CREATE_SUCCESS, payload: response.data, }); - // Get access to the history object - // const history = useHistory(); - // alert() - // // Redirect to the desired route - // history.push('/allStudents'); + return response.data; } catch (error) { @@ -142,7 +138,6 @@ export const updateStudent = (id, updatedStudentData) => async (dispatch, getSta payload: data.data, }); - // Optionally, you can redirect or dispatch other actions after a successful update } catch (error) { dispatch({ @@ -176,7 +171,6 @@ export const deleteStudent = (id) => async (dispatch, getState) => { type: STUDENT_DELETE_SUCCESS, }); - // Optionally, you can dispatch other actions or update the state after successful deletion } catch (error) { dispatch({ diff --git a/frontend/src/actions/userActions.jsx b/frontend/src/actions/userActions.jsx index 45bc8ed..3070150 100644 --- a/frontend/src/actions/userActions.jsx +++ b/frontend/src/actions/userActions.jsx @@ -18,12 +18,6 @@ import { USER_LIST_SUCCESS, USER_LIST_REQUEST, USER_LIST_RESET, - USER_DELETE_REQUEST, - USER_DELETE_SUCCESS, - USER_DELETE_FAIL, - USER_UPDATE_FAIL, - USER_UPDATE_SUCCESS, - USER_UPDATE_REQUEST, USER_RESET_PASSWORD_REQUEST, USER_RESET_PASSWORD_SUCCESS, USER_RESET_PASSWORD_FAIL, diff --git a/frontend/src/components/CheckoutSteps.jsx b/frontend/src/components/CheckoutSteps.jsx deleted file mode 100644 index ea373b0..0000000 --- a/frontend/src/components/CheckoutSteps.jsx +++ /dev/null @@ -1,51 +0,0 @@ -import React from 'react' -import { Nav } from 'react-bootstrap' -import { LinkContainer } from 'react-router-bootstrap' - -const CheckoutSteps = ({ step1, step2, step3, step4 }) => { - return ( - - ) -} - -export default CheckoutSteps diff --git a/frontend/src/components/Donut.jsx b/frontend/src/components/Donut.jsx deleted file mode 100644 index b3c84d1..0000000 --- a/frontend/src/components/Donut.jsx +++ /dev/null @@ -1,50 +0,0 @@ -import { Donut } from '@antv/g2plot'; - -const data = [ - { - type: '分类一', - value: 27, - }, - { - type: '分类二', - value: 25, - }, - { - type: '分类三', - value: 18, - }, - { - type: '分类四', - value: 15, - }, - { - type: '分类五', - value: 10, - }, - { - type: '其它', - value: 5, - }, -]; - -const donutPlot = new Donut(document.getElementById('container'), { - forceFit: true, - title: { - visible: true, - text: '环图-指标卡', - }, - description: { - visible: true, - text: '环图指标卡能够代替tooltip，在环图中心挖空部分显示各分类的详细信息。', - }, - radius: 0.8, - padding: 'auto', - data, - angleField: 'value', - colorField: 'type', - statistic: { - visible: true, - }, -}); - -donutPlot.render(); diff --git a/frontend/src/components/FormContainer.jsx b/frontend/src/components/FormContainer.jsx deleted file mode 100644 index 17b4459..0000000 --- a/frontend/src/components/FormContainer.jsx +++ /dev/null @@ -1,16 +0,0 @@ -import React from 'react' -import { Container, Row, Col } from 'react-bootstrap' - -const FormContainer = ({ children }) => { - return ( - - - - {children} - - - - ) -} - -export default FormContainer diff --git a/frontend/src/components/PDFReader.jsx b/frontend/src/components/PDFReader.jsx deleted file mode 100644 index a7a94be..0000000 --- a/frontend/src/components/PDFReader.jsx +++ /dev/null @@ -1,36 +0,0 @@ -import React from 'react'; -import { Page, Text, View, Document, StyleSheet } from '@react-pdf/renderer'; -import { PDFViewer } from '@react-pdf/renderer'; - -// Create styles -const styles = StyleSheet.create({ - page: { - flexDirection: 'row', - backgroundColor: '#E4E4E4' - }, - section: { - margin: 10, - padding: 10, - flexGrow: 1 - } -}); - -// Create Document Component -const MyDocument = () => ( - - - - Section #1 - - - Section #2 - - - -); - - - - - - diff --git a/frontend/src/components/SearchBox.jsx b/frontend/src/components/SearchBox.jsx deleted file mode 100644 index 80821c7..0000000 --- a/frontend/src/components/SearchBox.jsx +++ /dev/null @@ -1,38 +0,0 @@ -import React, { useState } from 'react' -import { Form, Button } from 'react-bootstrap' -import { Input } from 'antd'; - - -const { Search } = Input; - -const SearchBox = ({ history }) => { - const [keyword, setKeyword] = useState('') - - const submitHandler = () => { - - if (keyword.trim()) { - history.push(`/search/${keyword}`) - } else { - history.push('/') - } - } - - return ( -
    - - setKeyword(e.target.value)} - - onSearch={(e)=>submitHandler(e)} - /> - - - - ) -} - -export default SearchBox diff --git a/frontend/src/components/Sidebar.jsx b/frontend/src/components/Sidebar.jsx deleted file mode 100644 index ae75a57..0000000 --- a/frontend/src/components/Sidebar.jsx +++ /dev/null @@ -1,262 +0,0 @@ -import { useDispatch, useSelector } from "react-redux" -import { logout } from '../actions/userActions' -import { useEffect, useState } from "react" -import { NavLink } from "react-router-dom/cjs/react-router-dom.min" -import { Button } from "react-bootstrap" - -const Sidebar = () => { - const dispatch = useDispatch() - - const userLogin = useSelector((state) => state.userLogin) - const { userInfo } = userLogin - - const logoutHandler = () => { - dispatch(logout()) - } - const [currentDateTime, setCurrentDateTime] = useState(new Date()); - - useEffect(() => { - // Update the date-time every second - const intervalId = setInterval(() => { - setCurrentDateTime(new Date()); - }, 1000); - - // Cleanup interval on component unmount - return () => clearInterval(intervalId); - }, []); - - - - return ( - - - - )} - - - export default Sidebar; \ No newline at end of file diff --git a/frontend/src/constants/accountantConstants.jsx b/frontend/src/constants/accountantConstants.jsx index 54912e6..910b85f 100644 --- a/frontend/src/constants/accountantConstants.jsx +++ b/frontend/src/constants/accountantConstants.jsx @@ -21,7 +21,6 @@ export const ACCOUNTANT_UPDATE_SUCCESS = 'ACCOUNTANT_UPDATE_SUCCESS'; export const ACCOUNTANT_UPDATE_FAIL = 'ACCOUNTANT_UPDATE_FAIL'; export const ACCOUNTANT_UPDATE_RESET = 'ACCOUNTANT_UPDATE_RESET'; -// ACCOUNTANT Delete Constants export const ACCOUNTANT_DELETE_REQUEST = 'ACCOUNTANT_DELETE_REQUEST'; export const ACCOUNTANT_DELETE_SUCCESS = 'ACCOUNTANT_DELETE_SUCCESS'; export const ACCOUNTANT_DELETE_FAIL = 'ACCOUNTANT_DELETE_FAIL'; diff --git a/frontend/src/reducers/assignmentReducers.jsx b/frontend/src/reducers/assignmentReducers.jsx index af0e80c..2654fbd 100644 --- a/frontend/src/reducers/assignmentReducers.jsx +++ b/frontend/src/reducers/assignmentReducers.jsx @@ -1,5 +1,3 @@ -// assignmentReducers.js - import { ASSIGNMENT_CREATE_REQUEST, ASSIGNMENT_CREATE_SUCCESS, diff --git a/frontend/src/reducers/attendanceReducers.jsx b/frontend/src/reducers/attendanceReducers.jsx deleted file mode 100644 index 07aa9e5..0000000 --- a/frontend/src/reducers/attendanceReducers.jsx +++ /dev/null @@ -1,48 +0,0 @@ -import { ATTENDANCE_CREATE_FAIL, ATTENDANCE_CREATE_REQUEST, ATTENDANCE_CREATE_SUCCESS, ATTENDANCE_DETAILS_FAIL, ATTENDANCE_DETAILS_REQUEST, ATTENDANCE_DETAILS_RESET, ATTENDANCE_DETAILS_SUCCESS, ATTENDANCE_LIST_FAIL, ATTENDANCE_LIST_REQUEST, ATTENDANCE_LIST_RESET, ATTENDANCE_LIST_SUCCESS } from "../constants/attendanceConstants"; - -// Attendance Create Reducers -export const attendanceCreateReducer = (state = {}, action) => { - switch (action.type) { - case ATTENDANCE_CREATE_REQUEST: - return { loading: true }; - case ATTENDANCE_CREATE_SUCCESS: - return { loading: false, success: true, attendance: action.payload }; - case ATTENDANCE_CREATE_FAIL: - return { loading: false, error: action.payload }; - default: - return state; - } - }; - - // Attendance List Reducers - export const attendanceListReducer = (state = { attendances: [] }, action) => { - switch (action.type) { - case ATTENDANCE_LIST_REQUEST: - return { loading: true, attendances: [] }; - case ATTENDANCE_LIST_SUCCESS: - return { loading: false, attendances: action.payload }; - case ATTENDANCE_LIST_FAIL: - return { loading: false, error: action.payload, attendances: [] }; - case ATTENDANCE_LIST_RESET: - return { attendances: [] }; - default: - return state; - } - }; - - // Attendance Details Reducers - export const attendanceDetailsReducer = (state = { attendance: {} }, action) => { - switch (action.type) { - case ATTENDANCE_DETAILS_REQUEST: - return { ...state, loading: true }; - case ATTENDANCE_DETAILS_SUCCESS: - return { loading: false, attendance: action.payload }; - case ATTENDANCE_DETAILS_FAIL: - return { loading: false, error: action.payload }; - case ATTENDANCE_DETAILS_RESET: - return { attendance: {} }; - default: - return state; - } - }; - \ No newline at end of file diff --git a/frontend/src/reducers/chatReducers.jsx b/frontend/src/reducers/chatReducers.jsx deleted file mode 100644 index 68d15d6..0000000 --- a/frontend/src/reducers/chatReducers.jsx +++ /dev/null @@ -1,79 +0,0 @@ -import { - CHAT_FETCH_MESSAGES_REQUEST, - CHAT_FETCH_MESSAGES_SUCCESS, - CHAT_FETCH_MESSAGES_FAILURE, - CHAT_SEND_MESSAGE_REQUEST, - CHAT_SEND_MESSAGE_SUCCESS, - CHAT_SEND_MESSAGE_FAILURE, - - CHAT_DELETE_MESSAGE_SUCCESS, - CHAT_EDIT_MESSAGE_SUCCESS, - CHAT_LEAVE_CONVERSATION_SUCCESS, - CHAT_JOIN_CONVERSATION_SUCCESS, - } from '../constants/chatConstants'; - - // Chat Fetch Messages Reducer -export const chatFetchMessagesReducer = (state = { messages: [] }, action) => { - switch (action.type) { - case CHAT_FETCH_MESSAGES_REQUEST: - return { ...state, loading: true, messages: [] }; - case CHAT_FETCH_MESSAGES_SUCCESS: - return { loading: false, messages: action.payload }; - case CHAT_FETCH_MESSAGES_FAILURE: - return { loading: false, error: action.payload, messages: [] }; - default: - return state; - } - }; - - // Chat Send Message Reducer - export const chatSendMessageReducer = (state = {}, action) => { - switch (action.type) { - case CHAT_SEND_MESSAGE_REQUEST: - return { loading: true }; - case CHAT_SEND_MESSAGE_SUCCESS: - return { loading: false, success: true }; - case CHAT_SEND_MESSAGE_FAILURE: - return { loading: false, error: action.payload }; - default: - return state; - } - }; - - // Chat Active Conversation Reducer - export const chatActiveConversationReducer = (state = null, action) => { - switch (action.type) { - case CHAT_JOIN_CONVERSATION_SUCCESS: // Fix the action type - return action.payload.userId; - case CHAT_LEAVE_CONVERSATION_SUCCESS: // Fix the action type - return null; - default: - return state; - } - }; - - // Chat Edit and Delete Message Reducer - export const chatEditDeleteMessageReducer = (state = { messages: [] }, action) => { - switch (action.type) { - case CHAT_EDIT_MESSAGE_SUCCESS: // Fix the action type - return { - ...state, - messages: state.messages.map((message) => - message.id === action.payload.messageId - ? { ...message, text: action.payload.updatedMessage } - : message - ), - }; - case CHAT_DELETE_MESSAGE_SUCCESS: // Fix the action type - return { - ...state, - messages: state.messages.filter( - (message) => message.id !== action.payload.messageId - ), - }; - default: - return state; - } - }; - - \ No newline at end of file diff --git a/frontend/src/reducers/conversationReducers.jsx b/frontend/src/reducers/conversationReducers.jsx deleted file mode 100644 index 2483dd2..0000000 --- a/frontend/src/reducers/conversationReducers.jsx +++ /dev/null @@ -1,68 +0,0 @@ -// reducers/conversationReducers.js - -import { - CREATE_CONVERSATION_REQUEST, - CREATE_CONVERSATION_SUCCESS, - CREATE_CONVERSATION_FAIL, - GET_ALL_CONVERSATIONS_REQUEST, - GET_ALL_CONVERSATIONS_SUCCESS, - GET_ALL_CONVERSATIONS_FAIL, - GET_USER_CONVERSATIONS_REQUEST, - GET_USER_CONVERSATIONS_SUCCESS, - GET_USER_CONVERSATIONS_FAIL, - } from '../constants/conversationConstant'; - - - - // Reducer for creating a conversation - export const createConversationReducer = (state = {}, action) => { - switch (action.type) { - case CREATE_CONVERSATION_REQUEST: - return { - loading: true, - }; - case CREATE_CONVERSATION_SUCCESS: - return { - loading: false, - success: true, - conversation: action.payload.conversation, - }; - case CREATE_CONVERSATION_FAIL: - return { - loading: false, - success: false, - error: action.payload, - }; - default: - return state; - } - }; - - // Reducer for getting all conversations - export const getAllConversationsReducer = (state = { conversations: [] }, action) => { - switch (action.type) { - case GET_ALL_CONVERSATIONS_REQUEST: - return { loading: true, conversations: [] }; - case GET_ALL_CONVERSATIONS_SUCCESS: - return { loading: false, conversations: action.payload.conversations }; - case GET_ALL_CONVERSATIONS_FAIL: - return { loading: false, error: action.payload, conversations: [] }; - default: - return state; - } - }; - - // Reducer for getting user conversations - export const getUserConversationsReducer = (state = { userConversations: [] }, action) => { - switch (action.type) { - case GET_USER_CONVERSATIONS_REQUEST: - return { loading: true, userConversations: [] }; - case GET_USER_CONVERSATIONS_SUCCESS: - return { loading: false, userConversations: action.payload }; - case GET_USER_CONVERSATIONS_FAIL: - return { loading: false, error: action.payload, userConversations: [] }; - default: - return state; - } - }; - \ No newline at end of file diff --git a/frontend/src/reducers/lecturerReducers.jsx b/frontend/src/reducers/lecturerReducers.jsx index 2d1eb9c..080785d 100644 --- a/frontend/src/reducers/lecturerReducers.jsx +++ b/frontend/src/reducers/lecturerReducers.jsx @@ -1,4 +1,3 @@ -// Import your lecturer action constants import { LECTURER_CREATE_REQUEST, LECTURER_CREATE_SUCCESS, diff --git a/frontend/src/screens/Accountant/AccountantFeeScreen.jsx b/frontend/src/screens/Accountant/AccountantFeeScreen.jsx index a946d75..23724bf 100644 --- a/frontend/src/screens/Accountant/AccountantFeeScreen.jsx +++ b/frontend/src/screens/Accountant/AccountantFeeScreen.jsx @@ -3,11 +3,9 @@ import { Table, Form, Row, Col, Pagination } from 'react-bootstrap'; import { useDispatch, useSelector } from 'react-redux'; import Message from '../../components/Message'; import Loader from '../../components/Loader'; -import { Link, useLocation } from 'react-router-dom'; -import { useRouteMatch } from 'react-router-dom'; -import { useHistory } from 'react-router-dom/cjs/react-router-dom.min'; +import { useLocation } from 'react-router-dom' import Sidebar from './components/Sidebar' -import { AllFees, getFeesByStudent } from '../../actions/feeActions'; +import { AllFees} from '../../actions/feeActions'; import Topbar from './components/Topbar'; const AccountantFeeScreen = () => { @@ -18,7 +16,7 @@ const AccountantFeeScreen = () => { const userLogin = useSelector((state) => state.userLogin); const { userInfo } = userLogin; - const getAllFees = useSelector((state) => state.getAllFees); // Assuming you have a fees reducer + const getAllFees = useSelector((state) => state.getAllFees); const { loading, error, fees } = getAllFees; diff --git a/frontend/src/screens/Accountant/AccountantFeesScreen.jsx b/frontend/src/screens/Accountant/AccountantFeesScreen.jsx index a43a9af..05be942 100644 --- a/frontend/src/screens/Accountant/AccountantFeesScreen.jsx +++ b/frontend/src/screens/Accountant/AccountantFeesScreen.jsx @@ -1,14 +1,9 @@ -import React, { useState, useEffect } from 'react'; -import { Form, Button, Row, Col, ListGroup, Container } from 'react-bootstrap'; +import React, { useEffect } from 'react'; import { Table, Space, Tag } from 'antd'; import { useDispatch, useSelector } from 'react-redux'; -import Message from '../../components/Message'; -import Loader from '../../components/Loader'; -import { Link, useLocation } from 'react-router-dom'; -import { useRouteMatch } from 'react-router-dom'; -import { useHistory } from 'react-router-dom/cjs/react-router-dom.min'; +import { useLocation } from 'react-router-dom'; import Sidebar from './components/Sidebar' -import { AllFees, getAllFees } from '../../actions/feeActions'; +import { AllFees } from '../../actions/feeActions'; import Topbar from './components/Topbar'; const AccountantFeeScreen = () => { @@ -20,30 +15,17 @@ const AccountantFeeScreen = () => { const dispatch = useDispatch(); -const getAllFeesState = useSelector((state) => state.getAllFees); -const { loading: allFeesLoading, error: allFeesError, fees: allFees } = getAllFeesState; - -const getFeesByStudentState = useSelector((state) => state.getFeesByStudent); -const { loading: feesByStudentLoading, error: feesByStudentError, fees: feesByStudent } = getFeesByStudentState; - - - - - const userLogin = useSelector((state) => state.userLogin); const { userInfo } = userLogin; - const logoutHandler = () => { - dispatch(logout()); - }; useEffect(() => { if (userInfo && userInfo._id) { - dispatch(AllFees()); // Dispatch the action with the student's ID + dispatch(AllFees()); } }, [dispatch, userInfo]); - // Assuming you have the data for SchoolFees fetched from the backend + const data = fees const columns = [ @@ -82,7 +64,7 @@ const { loading: feesByStudentLoading, error: feesByStudentError, fees: feesBySt key: 'action', render: (text, record) => ( - {/* You can add actions here, e.g., Edit, Delete buttons */} + ), diff --git a/frontend/src/screens/Accountant/AccountantPaymentScreen.jsx b/frontend/src/screens/Accountant/AccountantPaymentScreen.jsx index 7531e80..27a7289 100644 --- a/frontend/src/screens/Accountant/AccountantPaymentScreen.jsx +++ b/frontend/src/screens/Accountant/AccountantPaymentScreen.jsx @@ -3,23 +3,18 @@ import { Table, Form, Button, Row, Col,Pagination } from 'react-bootstrap'; import { useDispatch, useSelector } from 'react-redux'; import Message from '../../components/Message'; import Loader from '../../components/Loader'; -import { Link, useLocation } from 'react-router-dom'; -import { useRouteMatch } from 'react-router-dom'; -import { useHistory } from 'react-router-dom/cjs/react-router-dom.min'; import Sidebar from './components/Sidebar' -import { AllFees } from '../../actions/feeActions'; import { listPaymentTransactions, togglePaymentApproval } from '../../actions/paymentActions'; import Topbar from './components/Topbar'; const AccountantPaymentScreen = () => { - const [studentId, setStudentId] = useState(''); const dispatch = useDispatch(); const userLogin = useSelector((state) => state.userLogin); const { userInfo } = userLogin; - const paymentTransactionList = useSelector((state) => state.paymentTransactionList); // Assuming you have a fees reducer + const paymentTransactionList = useSelector((state) => state.paymentTransactionList); const { loading, error, paymentTransactions } = paymentTransactionList; const paymentTogleActive = useSelector((state)=> state.paymentTransactionUpdate) diff --git a/frontend/src/screens/Accountant/IndexAccountantScreen.jsx b/frontend/src/screens/Accountant/IndexAccountantScreen.jsx index 87d5bb9..9f3dd7e 100644 --- a/frontend/src/screens/Accountant/IndexAccountantScreen.jsx +++ b/frontend/src/screens/Accountant/IndexAccountantScreen.jsx @@ -147,7 +147,6 @@ const data = {
    - {/* */}
    @@ -201,7 +200,7 @@ const data = {
    -
    {/* Set a max-width to prevent it from overflowing */} +
    diff --git a/frontend/src/screens/Admin/AddAccountantScreen.jsx b/frontend/src/screens/Admin/AddAccountantScreen.jsx index f25dc8b..34b6f7c 100644 --- a/frontend/src/screens/Admin/AddAccountantScreen.jsx +++ b/frontend/src/screens/Admin/AddAccountantScreen.jsx @@ -1,14 +1,10 @@ -import React, { useState, useEffect, useCallback } from 'react'; +import React, { useState, useCallback } from 'react'; import { Form, Input, Select, message,Row,Col } from 'antd' -import { useDispatch, useSelector } from 'react-redux'; -import Message from '../../components/Message'; -import Loader from '../../components/Loader'; -import { Link, useLocation } from 'react-router-dom'; +import { useDispatch } from 'react-redux'; +import { useLocation } from 'react-router-dom'; import { useRouteMatch } from 'react-router-dom'; import { useHistory } from 'react-router-dom/cjs/react-router-dom.min'; -import { Collapse } from 'antd'; import Sidebar from './components/Sidebar' -import { listStudents } from '../../actions/studentActions'; import { createAccountant } from '../../actions/accountantActions'; import {useDropzone} from 'react-dropzone' import { uploadFile } from '../../actions/cloudinaryAtions'; @@ -33,7 +29,6 @@ const AddAccountant = () => { const uploadedFileUrl = await dispatch(uploadFile(selectedImages[0])); if (uploadedFileUrl !== null) { - // If the file is uploaded successfully, add the secure_url to the values values.photo = uploadedFileUrl; values.userType = "Accountant" @@ -42,16 +37,15 @@ const AddAccountant = () => { }; - // Calculate age based on date of birth const dob = new Date(values.dob); const ageDiffMs = Date.now() - dob.getTime(); const ageDate = new Date(ageDiffMs); // Epoch const age = Math.abs(ageDate.getUTCFullYear() - 1970); - // Check if age is at least 18 years + if (age < 18) { message.error('Accountant must be at least 18 years old.'); - return; // Stop execution if age is less than 18 + return; } dispatch(createAccountant(values)) @@ -63,8 +57,8 @@ const AddAccountant = () => { }); } const [selectedImages, setSelectedImages] = useState([]); - // Add this - const [uploadStatus, setUploadStatus] = useState(""); + + const onDrop = useCallback((acceptedFiles, rejectedFiles) => { acceptedFiles.forEach((file) => { setSelectedImages((prevState) => [...prevState, file]); @@ -76,9 +70,7 @@ const AddAccountant = () => { const { getRootProps, getInputProps, - isDragActive, - isDragAccept, - isDragReject, + isDragActive } = useDropzone({ onDrop, accept: acceptedImageTypes.join(','), diff --git a/frontend/src/screens/Lecturer/lecturerAssignmentsScreen.jsx b/frontend/src/screens/Lecturer/lecturerAssignmentsScreen.jsx deleted file mode 100644 index 78559f1..0000000 --- a/frontend/src/screens/Lecturer/lecturerAssignmentsScreen.jsx +++ /dev/null @@ -1,209 +0,0 @@ -import React, {useCallback, useState, useEffect } from 'react'; -import { Button} from 'react-bootstrap'; -import { useDispatch, useSelector } from 'react-redux'; -import Message from '../../components/Message'; -import Loader from '../../components/Loader'; -import { Link, useLocation } from 'react-router-dom'; -import Sidebar from './components/Sidebar' -import { getSchoolDetails } from '../../actions/schoolActions'; -import Topbar from './components/Topbar'; -import { listStudents } from '../../actions/studentActions'; -import { Table,Form, Input, DatePicker, Select ,Collapse} from 'antd'; -import { createAssignment, listAssignments } from '../../actions/assignmentActions'; -const { Option } = Select; -const { Panel } = Collapse; -const LecturerAssignmentsScreen = () => { - - - const dispatch = useDispatch(); - - const userLogin = useSelector((state) => state.userLogin); - const { userInfo } = userLogin; - - const schoolDetails = useSelector((state) => state.schoolDetails); - const { school } = schoolDetails; - - const assignmentList = useSelector((state) => state.assignmentList); - const {loading,assignments} = assignmentList - - useEffect(() => { - dispatch(getSchoolDetails(userInfo.userData.school)) - dispatch(listAssignments()) - }, [dispatch]); - - - - const onFinish = (values) => { - console.log(values); - dispatch(createAssignment(values)); - // form.resetFields(); - }; - - - const columns = [ - { - title: 'Title', - dataIndex: 'title', - key: 'title', - }, - { - title: 'Description', - dataIndex: 'description', - key: 'description', - }, - { - title: 'Due Date', - dataIndex: 'dueDate', - key: 'dueDate', - }, - ]; - - - return ( -
    -
    - - - -
    - -
    -
    - -
    - -
    -
    -
    - Given Assigments : {school && school.name} -
    -
    -
    - -
    -
    -
    - Submissions: {userInfo && userInfo.userData.courses.length} -
    -
    -
    - -
    -
    -
    - Approved Submissions: -
    -
    -
    - -
    -
    -
    - Average Assignment Credits: -
    -
    -
    - -
    -
    -
    -
    -
    ASSIGNMENT PAGE
    - - -
    - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    -     - - - - - - - - - - - - - - - - - - - - - - - ); -}; - -export default LecturerAssignmentsScreen; diff --git a/frontend/src/screens/LoginScreen.jsx b/frontend/src/screens/LoginScreen.jsx index 89bea7c..314c446 100644 --- a/frontend/src/screens/LoginScreen.jsx +++ b/frontend/src/screens/LoginScreen.jsx @@ -6,9 +6,7 @@ import Message from '../components/Message' import Loader from '../components/Loader' import { login, register } from '../actions/userActions' import { Checkbox, Form, Input } from 'antd' -// import ProfileScreen from './ProfileScreen' -import logourl from '../assets/logo.png' -import ProfileScreen from './ProfileScreen' + import IndexAdminScreen from './Admin/IndexAdminScreen' import IndexAccountantScreen from './Accountant/IndexAccountantScreen' import IndexLecturerScreen from './Lecturer/IndexLecturerScreen' diff --git a/frontend/src/screens/ProfileScreen.jsx b/frontend/src/screens/ProfileScreen.jsx deleted file mode 100644 index d1c2ab1..0000000 --- a/frontend/src/screens/ProfileScreen.jsx +++ /dev/null @@ -1,261 +0,0 @@ -import React, { useState, useEffect } from 'react'; -import { Table, Form, Button, Row, Col, ListGroup, Container } from 'react-bootstrap'; -import { useDispatch, useSelector } from 'react-redux'; -import Message from '../components/Message'; -import Loader from '../components/Loader'; -import { Link, useLocation } from 'react-router-dom'; -import { useRouteMatch } from 'react-router-dom'; -import { useHistory } from 'react-router-dom/cjs/react-router-dom.min'; -import { Collapse } from 'antd'; -import Sidebar from '../components/Sidebar' -const ProfileScreen = () => { - const [name, setName] = useState(''); - const [email, setEmail] = useState(''); - const [password, setPassword] = useState(''); - const [confirmPassword, setConfirmPassword] = useState(''); - const [message, setMessage] = useState(null); - const match = useRouteMatch(); - const history = useHistory(); - - const location = useLocation(); - const { pathname } = location; - - console.log(pathname); - - const dispatch = useDispatch(); - - const userDetails = useSelector((state) => state.userDetails); - const { loading, error, user } = userDetails; - - const userLogin = useSelector((state) => state.userLogin); - const { userInfo } = userLogin; - - const logoutHandler = () => { - dispatch(logout()); - }; - - - return ( -
    -
    - - - - - - - - -
    - -
    -
    - -
    - -
    -
    -
    -
    -
    -
    Students
    -
    20
    -
    - -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    Teachers
    -
    20
    -
    - -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    Classes
    -
    20
    -
    - -
    -
    -
    - -
    -
    -
    -
    -
    -
    - - -
    - -
    -
    - - - -
    - -
    - ); -}; - -export default ProfileScreen; diff --git a/frontend/src/store.jsx b/frontend/src/store.jsx index 1adca81..c333cc8 100644 --- a/frontend/src/store.jsx +++ b/frontend/src/store.jsx @@ -59,20 +59,9 @@ import { parentStudentListReducer, } from './reducers/parentReducers'; -import { - // Attendance reducers - attendanceCreateReducer, - attendanceListReducer, - attendanceDetailsReducer, -} from './reducers/attendanceReducers'; -import { - // Chat reducers - chatFetchMessagesReducer, - chatSendMessageReducer, - chatActiveConversationReducer, - chatEditDeleteMessageReducer, -} from './reducers/chatReducers'; + + import { // Payment Transaction reducers @@ -98,7 +87,6 @@ import { import { uploadFileReducer } from './reducers/uploadReducers'; import { timetableByCourseReducer, timetableCreateReducer, timetableDeleteReducer, timetableDetailsReducer, timetableListReducer, timetableUpdateReducer } from './reducers/timetableReducers'; import { createFeesReducer, getAllFeesReducer, getFeesByStudentReducer, markFeesAsPaidReducer } from './reducers/feeReducers'; -import { createConversationReducer, getAllConversationsReducer, getUserConversationsReducer } from './reducers/conversationReducers'; import { accountantCreateReducer, accountantDeleteReducer, accountantDetailsReducer, accountantListReducer, accountantUpdateReducer } from './reducers/accountantReducers'; import { courseUnitCreateReducer, getAllCourseUnitsReducer, getCourseUnitsByCourseReducer } from './reducers/courseUnitReducers'; @@ -170,17 +158,6 @@ const reducer = combineReducers({ parentUpdate: parentUpdateReducer, parentDelete: parentDeleteReducer, parentStudentList:parentStudentListReducer, - - // Attendance reducers - attendanceCreate: attendanceCreateReducer, - attendanceList: attendanceListReducer, - attendanceDetails: attendanceDetailsReducer, - - // Chat reducers - chatMessages: chatFetchMessagesReducer, - chatSendMessage: chatSendMessageReducer, - chatActiveConversation: chatActiveConversationReducer, - chatEditDeleteMessage: chatEditDeleteMessageReducer, // Timetable reducers timetableList: timetableListReducer, @@ -213,12 +190,7 @@ const reducer = combineReducers({ submissionCreate: submissionCreateReducer, submissionList: submissionListReducer, submissionDetails: submissionDetailsReducer, - - // Reducers for conversation module - createConversation: createConversationReducer, - AllConversations: getAllConversationsReducer, - userConversationR: getUserConversationsReducer, // Accountant reducers createAccountant:accountantCreateReducer, From 2b1af767e84a34ce6467ffe6408f2945cdbb2887 Mon Sep 17 00:00:00 2001 From: ngecu Date: Wed, 27 Mar 2024 14:48:25 +0300 Subject: [PATCH 7/7] remove env variables --- .env | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.env b/.env index d9b5402..c8e712f 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -MONGO_URI=mongodb+srv://devngecu:vJqwB0P8gOLlBl7G@cluster0.krax7x4.mongodb.net/ +MONGO_URI= JWT_SECRET = "abc123" BASE_URL=http://localhost:5173/ @@ -8,21 +8,21 @@ HOST='smtp.gmail.com' SERVICE='gmail' EMAIL_PORT=587 SECURE=true -USER=devngecu@gmail.com -PASS=falvxbsapmgowzel +USER= +PASS= # SAFARICOM VARIABLES -BUSINESS_SHORT_CODE = 174379 -PASS_KEY = bfb279f9aa9bdbcf158e97dd71a467cd2e0c893059b10f78e6b72ada1ed2c919 -CONSUMER_KEY = X2Z6G1kKFjOQ8ttSGVhhrBH4viOdoQF4 -CONSUMER_SECRET = lvYbjEgi1Qco6E2h +BUSINESS_SHORT_CODE = +PASS_KEY = +CONSUMER_KEY = +CONSUMER_SECRET = SAFARICOM_PORT = 6000 PORT = 5000 -cliendID=451025251359-813olgkbnta7djitumcbd7m744ejjnf9.apps.googleusercontent.com -clientSecret=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 +cliendID= +clientSecret= NODE_ENV=production \ No newline at end of file