Skip to content

Commit

Permalink
Merge branch 'main' into dcrepublic-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
DCRepublic authored Nov 17, 2024
2 parents a714f38 + 8536f92 commit 36a17eb
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
3 changes: 1 addition & 2 deletions app/admin/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@ export default function AdminPage() {
return cellValue;
}
}, []);
console.log(status);
console.log(session?.user);

if (status === "authenticated") {
if (session.user?.role === "admin") {
return (
Expand Down
2 changes: 1 addition & 1 deletion app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ async function Home(props: any) {
</div>
</div>
</div>
<div className="col-span-10 lg:col-span-3 lg:ml-[5vw] ">
<div className="col-span-10 lg:col-span-3 lg:ml-[5vw]">
<CreatePlan />
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions components/Calendar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export default function Calendar(props: any) {
<div className="font-sans text-[10px] ml-1 mt-5 ">
{eventInfo.event.extendedProps.instructor.replace("&#39;", "'")}
</div>

</Card>
);
}
Expand Down
4 changes: 4 additions & 0 deletions components/CreatePlan.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,13 @@ export default function CreatePlan(props: any) {
/>

<CardHeader className="justify-between">

<div className="ml-2 lg:text-base truncate text-bold">
{course.subject} {""} {course.courseNumber}
<div className="text-tiny ">
{course.courseTitle.replace(/&amp;/g, "&")}
</div>

</div>

<Button
Expand Down Expand Up @@ -262,7 +264,9 @@ export default function CreatePlan(props: any) {
</div>

<div

className="flex flex-col h-[45vh] overflow-y-scroll gap-3 scrollbar-thin scrollbar-thumb-accent-500 scrollbar-track-transparent"

id="scrollMe"
>
<CoursesList />
Expand Down

0 comments on commit 36a17eb

Please sign in to comment.