+
From 638960898474093e50d89c1745039ab228546f7c Mon Sep 17 00:00:00 2001
From: Hanna Pitino <100425382+hpitino11@users.noreply.github.com>
Date: Tue, 23 Jul 2024 14:20:22 +0000
Subject: [PATCH 4/9] added cart and works. just needs delete (next update)
---
web/src/components/Dashboard.jsx | 93 ++++++++++++++++++++++++++++----
1 file changed, 82 insertions(+), 11 deletions(-)
diff --git a/web/src/components/Dashboard.jsx b/web/src/components/Dashboard.jsx
index aba25f44..7e0a500b 100644
--- a/web/src/components/Dashboard.jsx
+++ b/web/src/components/Dashboard.jsx
@@ -19,6 +19,8 @@ const Dashboard = () => {
const [headersVisible, setHeadersVisible] = useState(true);
const [showSuggestions, setShowSuggestions] = useState(true);
const [courseId, setCourseId] = useState('');
+ const [cartVisible, setCartVisible] = useState(false);
+ const [cartItems, setCartItems] = useState([]);
const preventClose = (e) => {
e.stopPropagation();
@@ -252,6 +254,39 @@ const Dashboard = () => {
}
};
+ const handleCartClick = async () => {
+ setCartVisible(!cartVisible);
+ if (!cartVisible) {
+ const userId = localStorage.getItem('user_id');
+ if (userId) {
+ try {
+ const response = await fetch(`${API_URL}/users/${userId}/cart`, {
+ headers: {
+ 'Authorization': `Bearer ${localStorage.getItem('token')}`,
+ 'Content-Type': 'application/json'
+ }
+ });
+
+ if (response.ok) {
+ const data = await response.json();
+ setCartItems(data.entries.map(entry => ({
+ firstName: entry.professor.first_name,
+ lastName: entry.professor.last_name,
+ code: entry.course.code,
+ courseName: entry.course.name,
+ })));
+ } else {
+ console.error('Failed to fetch cart data:', response.statusText);
+ }
+ } catch (error) {
+ console.error('Error fetching cart data:', error);
+ }
+ } else {
+ console.error('No user ID found');
+ }
+ }
+ };
+
return (
<>
@@ -259,7 +294,6 @@ const Dashboard = () => {
-
{headersVisible && (
@@ -293,9 +327,8 @@ const Dashboard = () => {
2024 {year === 2024 && }
handleDropdownClick('year', 2025)}>
- 2025 {year === 2025 && }
-
-
+ 2025 {year === 2025 && }
+
@@ -335,12 +368,25 @@ const Dashboard = () => {
- {!headersVisible && professorsData.length > 0 && (
+
+ Cart
+
+
+ {cartVisible && (
)}
+ {!headersVisible && professorsData.length > 0 && (
+
+ )}
@@ -385,22 +431,22 @@ const ProfessorTable = ({ professors, fetchProfessorRatings, fetchProfessorAnaly
}));
};
- const handleAddClick = async (event, professorId) => {
+ const handleAddClick = async (event, professor) => {
event.stopPropagation(); // Prevent the event from propagating to the row click
const token = localStorage.getItem('token');
const userId = localStorage.getItem('user_id');
- const courseId = localStorage.getItem('course_id')
+ const courseId = localStorage.getItem('course_id');
if (token && userId) {
try {
- console.log('Sending request with data:', { professorId, courseId }); // Debugging log
+ console.log('Sending request with data:', { professorId: professor.id, courseId }); // Debugging log
const response = await fetch(`${API_URL}/users/${userId}/cart`, {
method: 'POST',
headers: {
'Authorization': `Bearer ${token}`,
'Content-Type': 'application/json'
},
- body: JSON.stringify({ professor_id: professorId, course_id: courseId})
+ body: JSON.stringify({ professor_id: professor.id, course_id: courseId })
});
if (response.ok) {
@@ -452,7 +498,7 @@ const ProfessorTable = ({ professors, fetchProfessorRatings, fetchProfessorAnaly
{ratingsData[professor.id] ? roundToTenth(ratingsData[professor.id].totalQualityAverage) : '-'} |
{ratingsData[professor.id]?.ratingAmount || '-'} |
- handleAddClick(event, professor.id)}>Add
+ handleAddClick(event, professor)}>Add
|
{selectedProfessor === professor && (
@@ -489,6 +535,31 @@ const ProfessorTable = ({ professors, fetchProfessorRatings, fetchProfessorAnaly
);
};
+const CartTable = ({ cartItems }) => {
+ return (
+
+
+
+ | First Name |
+ Last Name |
+ Code |
+ Course Name |
+
+
+
+ {cartItems.map((item, index) => (
+
+ | {item.firstName} |
+ {item.lastName} |
+ {item.code} |
+ {item.courseName} |
+
+ ))}
+
+
+ );
+};
+
const ProfessorDetails = ({ professor, analysisData }) => {
const lineData = {
labels: analysisData ? analysisData.averageRatingValues.map(item => `${item.month} ${item.year}`) : [],
From 89606a7d7d6466bd964dc42f34a1b3462713e1bd Mon Sep 17 00:00:00 2001
From: Zachary Cary
Date: Tue, 23 Jul 2024 10:20:27 -0400
Subject: [PATCH 5/9] accessibility
---
web/src/components/EmailConfirmation.jsx | 4 ----
web/src/components/ForgotPassword.jsx | 4 ----
web/src/components/Home.jsx | 2 +-
web/src/components/Login.jsx | 20 ++++----------------
web/src/components/Register.jsx | 6 +-----
web/src/components/ResetPassword.jsx | 4 ----
web/src/components/VerifyEmail.jsx | 16 ----------------
7 files changed, 6 insertions(+), 50 deletions(-)
diff --git a/web/src/components/EmailConfirmation.jsx b/web/src/components/EmailConfirmation.jsx
index b5105738..707de3ef 100644
--- a/web/src/components/EmailConfirmation.jsx
+++ b/web/src/components/EmailConfirmation.jsx
@@ -59,10 +59,6 @@ const EmailConfirmation = () => {
Your email has been confirmed. Redirecting to login ...
-
diff --git a/web/src/components/ForgotPassword.jsx b/web/src/components/ForgotPassword.jsx
index 87a099c8..e5f2cfb0 100644
--- a/web/src/components/ForgotPassword.jsx
+++ b/web/src/components/ForgotPassword.jsx
@@ -97,10 +97,6 @@ const ForgotPassword = () => {
Send Reset Link
-