#32-remove-dummy-data #37

Merged
juggy1233 merged 2 commits from #32-remove-dummy-data into master 2023-04-06 23:11:03 -04:00
2 changed files with 15 additions and 42 deletions
Showing only changes of commit 1dfa9c1421 - Show all commits

View File

@@ -2,54 +2,24 @@ import { useContext, useEffect, useState } from "react";
import { Card, Container } from "react-bootstrap";
import { Link } from "wouter";
import UserContext from "../contexts/UserContext";
import { makeRequest } from "../utils.ts";
const CoursesWidget = ({ className = "" }) => {
const [courseData, setCourseData] = useState({});
const [courseData, setCourseData] = useState([]);
const { currentUser } = useContext(UserContext);
const dummyData = [
{
course_id: 1,
course_title: "Advanced Website Design",
couse_code: "COMP 2707",
instructor: "Saja Al Mamoori",
},
{
course_id: 2,
course_title: "Introduction to Roman Civilization",
couse_code: "GRST 1200",
instructor: "Max Nelson",
},
{
course_id: 3,
course_title: "Software Verification and Testing",
couse_code: "COMP 4110",
instructor: "Serif Saad",
},
{
course_id: 4,
course_title: "Selected Topics in Software Engineering",
couse_code: "COMP 4800",
instructor: "Jessica Chen",
},
{
course_id: 5,
course_title: "Project Management: Techniques and Tools",
couse_code: "COMP 4990",
instructor: "Arunita Jaekel",
},
];
useEffect(() => {
fetch(`http://localhost:5000/user/${currentUser.id}/courses`)
makeRequest({ url: `http://localhost:5000/user/${currentUser.id}/courses` })
.then((resp) => resp.json())
.then((data) => {
setCourseData(data.courses);
});
}, []);
}, [setCourseData, currentUser]);
return (
<Container className={`${className} py-3 grid`}>
<div className="row justify-content-center">
{dummyData.map((course, i) => {
{courseData.map((course, i) => {
return (
<Link
is="a"
@@ -58,9 +28,9 @@ const CoursesWidget = ({ className = "" }) => {
className="col col-lg-2"
>
<Card role="button" className="m-2" style={{ width: "300px" }}>
<h2 className="text-center py-5 border">{course.couse_code}</h2>
<h2 className="text-center py-5 border">{course.course_code}</h2>
<Card.Body>
<Card.Title>{course.course_title}</Card.Title>
<Card.Title>{course.name}</Card.Title>
<Card.Text>{course.instructor}</Card.Text>
</Card.Body>
</Card>

View File

@@ -1,11 +1,14 @@
const makeRequest = ({ url, method, body = {} }): Promise<Response> => {
return fetch(url, {
const makeRequest = ({ url, method, body = null }): Promise<Response> => {
const req: RequestInit = {
method: method,
credentials: "include",
body: JSON.stringify(body),
headers: { "content-type": "application/json" },
mode: "cors",
});
};
if (body) {
req["body"] = JSON.stringify(body);
}
return fetch(url, req);
};
const sendLoginRequest = async (