juggy1233/COMP-2707-final-project
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects 2 Releases Wiki Activity

#35-course-code #36

Merged
juggy1233 merged 5 commits from #35-course-code into master 2023-04-06 22:01:21 -04:00
Conversation 0 Commits 5 Files Changed 5 +9 -20
2 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a789c2eb83 - Show all commits

21
backend/app/routes.py
View File

@@ -108,7 +108,7 @@ def get_courses(id):
return resp return resp
@bp.route("/user/<int:uid>/enroll/<int:cid>", methods=["POST"]) @bp.route("/user/<int:uid>/enroll/<int:cid>", methods=["POST", "DELETE"])
@login_required @login_required
def enroll_student(uid, cid): def enroll_student(uid, cid):
u = User.query.get(uid) u = User.query.get(uid)
@@ -119,25 +119,14 @@ def enroll_student(uid, cid):
if not c: if not c:
return error_response(400, f"Course with id {cid} does not exist") return error_response(400, f"Course with id {cid} does not exist")
if request.method == "POST":
if not u.enroll(c): if not u.enroll(c):
return error_response(400, f"User {uid} is already enrolled in course {cid}") return error_response(400, f"User {uid} is already enrolled in course {cid}")
resp = {"user": u.to_dict(), "course": c.to_dict()} elif request.method == "DELETE":
return jsonify(resp)
@bp.route("/user/<int:uid>/enroll/<int:cid>", methods=["DELETE"])
@login_required
def unenroll_student(uid, cid):
u = User.query.get(uid)
if not u:
return error_response(400, f"User with id {uid} does not exist")
c = Course.query.get(cid)
if not c:
return error_response(400, f"Course with id {cid} does not exist")
if not u.unenroll(c): if not u.unenroll(c):
return error_response(400, f"User {uid} is not enrolled in course {cid}") return error_response(400, f"User {uid} is not enrolled in course {cid}")
resp = {"user": u.to_dict(), "course": c.to_dict()} resp = {"user": u.to_dict(), "course": c.to_dict()}
return jsonify(resp) return jsonify(resp)

2
frontend/public/index.html
View File

@@ -22,7 +22,7 @@
work correctly both with client-side routing and a non-root public URL. work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`. Learn how to configure a non-root public URL by running `npm run build`.
--> -->
<title>React App</title> <title>LearningTree</title>
</head> </head>
<body> <body>