Skip to content

Commit 24189a1

Browse files
committed
Fix formatting
1 parent c174e5d commit 24189a1

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

backend/internal/handlers/courses.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ func Courses(c *fiber.Ctx) error {
2121

2222
var courses []entity.Course
2323
// Get all courses that user is enrolled in
24-
if user.Role == "educator"{
24+
if user.Role == "educator" {
2525
if err := database.DB.Model(&entity.Course{}).Where("creator_id = ?", user_id).Find(&courses).Error; err != nil {
2626
return c.Status(fiber.StatusNotFound).JSON(fiber.Map{"error": "Error retrieving courses"})
2727
}
28-
}else{
28+
} else {
2929
if err := database.DB.Model(&entity.Course{}).Where("id IN (?)", database.DB.Table("enrollment").Select("course_id").Where("account_id = ?", user_id)).Find(&courses).Error; err != nil {
3030
return c.Status(fiber.StatusNotFound).JSON(fiber.Map{"error": "Error retrieving courses"})
3131
}

frontend/src/components/Modal.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const Modal = ({title, trigger, inputFields, changeHandler, confirmHandle
2525
fieldList.push(
2626
<div className="p-2">
2727
<label>{text+ ": "} </label>
28-
<input className="border-2 border-black rounded p-2 size-11/12"
28+
<input className="border-2 border-slate-300 rounded p-2 size-11/12"
2929
type="text"
3030
name={name}
3131
onChange={changeHandler}
@@ -40,17 +40,17 @@ export const Modal = ({title, trigger, inputFields, changeHandler, confirmHandle
4040
{showModal ?
4141
<div>
4242
<div className='opacity-50 bg-black fixed top-0 left-0 h-full w-full' onClick={close}/>
43-
<div className="flex-auto bg-white rounded-lg border-2 border-black absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 p-3">
43+
<div className="flex-auto bg-white rounded-lg border-2 border-slate-300 absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 p-3">
4444
<h3 className="font-semibold">
4545
{title}
4646
</h3>
4747
{fieldList}
4848
<div className="grid grid-rows-1 grid-cols-2 p-2">
49-
<button className="justify-self-start border-2 border-black p-1 rounded" onClick=
49+
<button className="justify-self-start border-2 border-slate-300 p-1 rounded" onClick=
5050
{() => close()}>
5151
Cancel
5252
</button>
53-
<button className="justify-self-end border-2 border-black p-1 rounded bg-green-400" onClick={confirmHandler}>
53+
<button className="justify-self-end border-2 border-slate-300 p-1 rounded bg-green-400" onClick={confirmHandler}>
5454
Confirm
5555
</button>
5656
</div>

frontend/src/components/pages/CourseDashboard.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,8 @@ export function CourseDashboard() {
8888
}, []);
8989

9090
if (error) return <p>Error: {error}</p>;
91-
if (!courseInfo) return <p>Loading...</p>;
92-
if (!userInfo) return <p>Loading...</p>;
93-
91+
if (!courseInfo || !userInfo) return <p>Loading...</p>;
92+
9493
let createButton = null;
9594
if (userInfo.role === "educator"){
9695
createButton = <Modal

0 commit comments

Comments
 (0)