Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .vite/deps/_metadata.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"hash": "625b799d",
"configHash": "a9b0ffca",
"lockfileHash": "a6ff8f94",
"browserHash": "6b8947ac",
"hash": "14330173",
"configHash": "d7c1e009",
"lockfileHash": "e3b0c442",
"browserHash": "c6eb8ced",
"optimized": {},
"chunks": {}
}
8 changes: 5 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"prettier:write": "prettier --write ."
},
"dependencies": {
"@babel/runtime": "^7.27.0",
"@hello-pangea/dnd": "^18.0.1",
"@tailwindcss/vite": "^4.0.6",
"axios": "^1.7.9",
Expand Down
17 changes: 9 additions & 8 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function App() {
const reorder = <T,>(
list: T[],
startIndex: number,
endIndex: number
endIndex: number,
): T[] => {
const result = [...list];
const [removed] = result.splice(startIndex, 1);
Expand Down Expand Up @@ -70,7 +70,7 @@ function App() {

if (sInd === "toolbox" && dInd === "toolbox") {
setToolboxCourses((prev) =>
reorder(prev, source.index, destination.index)
reorder(prev, source.index, destination.index),
);
return;
}
Expand All @@ -94,11 +94,11 @@ function App() {
courseList: reorder(
semester.courseList,
source.index,
destination.index
destination.index,
),
}
: semester
)
: semester,
),
);
return;
}
Expand Down Expand Up @@ -179,15 +179,15 @@ function App() {
};
}
return semester;
})
}),
);

setToolboxCourses((prev) =>
prev
.map((c) =>
c.name === courseToClone.name ? { ...c, count: c.count - 1 } : c
c.name === courseToClone.name ? { ...c, count: c.count - 1 } : c,
)
.filter((c) => c.count > 0)
.filter((c) => c.count > 0),
);
}

Expand Down Expand Up @@ -302,6 +302,7 @@ function App() {
isDragging={isDragging}
plannerCourses={plannerCourses}
setPlannerCourses={setPlannerCourses}
setToolboxCourses={setToolboxCourses}
/>
}
/>
Expand Down
18 changes: 17 additions & 1 deletion src/components/DraggableItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,19 @@ import { Draggable } from "@hello-pangea/dnd";
import PlannerCourse from "./PlannerComponents/PlannerCourse";
import ToolboxCourse from "./Toolbox/ToolboxCourse";
import { CourseType } from "../types/interfaces/Course.interface";
import { Dispatch, SetStateAction } from "react";
import { SemesterType } from "../types/interfaces/Semester.interface";
import { CourseEntry } from "../types/interfaces/Course.interface";

interface DraggableItemProps {
name: string;
count: number;
index: number;
course: CourseType;
location: "toolbox" | "planner";
setPlannerCourses: Dispatch<SetStateAction<SemesterType[]>> | null;
setToolboxCourses: Dispatch<SetStateAction<CourseEntry[]>> | null;
semesterIndex: number | null;
}

const DraggableItem: React.FC<DraggableItemProps> = ({
Expand All @@ -16,6 +23,9 @@ const DraggableItem: React.FC<DraggableItemProps> = ({
index,
course,
location,
setPlannerCourses,
setToolboxCourses,
semesterIndex,
}) => {
return (
<Draggable draggableId={`${name}`} index={index}>
Expand All @@ -30,11 +40,17 @@ const DraggableItem: React.FC<DraggableItemProps> = ({
}}
className="relative"
>
{location === "planner" ? (
{location === "planner" &&
setPlannerCourses &&
setToolboxCourses &&
semesterIndex ? (
<PlannerCourse
index={index}
isDragging={snapshot.isDragging}
course={course}
setPlannerCourses={setPlannerCourses}
setToolboxCourses={setToolboxCourses}
semesterIndex={semesterIndex}
/>
) : (
<ToolboxCourse
Expand Down
185 changes: 179 additions & 6 deletions src/components/PlannerComponents/PlannerCourse.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,31 @@
import React, { useState, useEffect, useRef } from "react";
import React, {
useState,
useEffect,
useRef,
Dispatch,
SetStateAction,
} from "react";
import { MdDragIndicator, MdOutlineMoreHoriz } from "react-icons/md";
import { CourseType } from "../../types/interfaces/Course.interface";
import { SemesterType } from "../../types/interfaces/Semester.interface";
import { CourseEntry } from "../../types/interfaces/Course.interface";

interface PlannerCourseProps {
course: CourseType;
isDragging: boolean;
index: number;
setPlannerCourses: Dispatch<SetStateAction<SemesterType[]>>;
setToolboxCourses: Dispatch<SetStateAction<CourseEntry[]>>;
semesterIndex: number;
}

const PlannerCourse: React.FC<PlannerCourseProps> = ({ course }) => {
const PlannerCourse: React.FC<PlannerCourseProps> = ({
course,
index,
setPlannerCourses,
setToolboxCourses,
semesterIndex,
}) => {
const [openPopup, setOpenPopup] = useState<boolean>(false);
const componentRef = useRef<HTMLDivElement>(null);

Expand All @@ -27,6 +44,150 @@ const PlannerCourse: React.FC<PlannerCourseProps> = ({ course }) => {
}
};

const handleDuplicate = () => {
setPlannerCourses((prev) =>
prev.map((semester, i) =>
i === semesterIndex - 1
? {
...semester,
creditsTotal:
semester.creditsTotal +
semester.courseList[index].data.credit_max,
courseList: [
...semester.courseList.slice(0, index + 1),
{
name: getNextName(semester.courseList[index].name),
count: semester.courseList[index].count,
data: semester.courseList[index].data,
},
...semester.courseList.slice(index + 1),
],
}
: semester,
),
);
};

const getNextName = (originalName: string): string => {
const [base, tag] = originalName.split("-");

if (!tag) {
return `${base}-A`;
}

const nextTag = incrementTag(tag);
return `${base}-${nextTag}`;
};

const incrementTag = (tag: string): string => {
const chars = tag.toUpperCase().split("");
let carry = true;

for (let i = chars.length - 1; i >= 0 && carry; i--) {
if (chars[i] === "Z") {
chars[i] = "A";
} else {
chars[i] = String.fromCharCode(chars[i].charCodeAt(0) + 1);
carry = false;
}
}

if (carry) {
chars.unshift("A");
}

return chars.join("");
};

const handleMoveNext = () => {
setPlannerCourses((prev) => {
const courseCopy = {
name: prev[semesterIndex - 1].courseList[index].name,
count: prev[semesterIndex - 1].courseList[index].count,
data: prev[semesterIndex - 1].courseList[index].data,
};

const updatedPlanner = prev.map((semester, i) =>
i === semesterIndex - 1
? {
...semester,
courseList: semester.courseList.filter((_, idx) => idx !== index),
creditsTotal:
semester.creditsTotal -
prev[semesterIndex - 1].courseList[index].data.credit_max,
}
: semester,
);

return updatedPlanner.map((semester, i) =>
i === semesterIndex
? {
...semester,
courseList: [...semester.courseList, courseCopy],
creditsTotal: semester.creditsTotal + courseCopy.data.credit_max,
}
: semester,
);
});
};

const handleMoveToolbox = () => {
setPlannerCourses((prev) => {
const courseToMove = prev[semesterIndex - 1].courseList[index];

const cleanedName = courseToMove.name.split("-")[0];

const cleanedCourse = {
...courseToMove,
name: cleanedName,
};

const updatedPlanner = prev.map((semester, i) =>
i === semesterIndex - 1
? {
...semester,
courseList: semester.courseList.filter((_, idx) => idx !== index),
creditsTotal:
semester.creditsTotal - courseToMove.data.credit_max,
}
: semester,
);

setToolboxCourses((toolboxPrev) => {
const existingIndex = toolboxPrev.findIndex(
(entry) => entry.name === cleanedName,
);

if (existingIndex !== -1) {
const updated = [...toolboxPrev];
updated[existingIndex].count += cleanedCourse.count;
return updated;
} else {
return [...toolboxPrev, cleanedCourse];
}
});

return updatedPlanner;
});
};

const handleDelete = () => {
console.log(semesterIndex);
setPlannerCourses((prev) =>
prev.map((semester, i) =>
i === semesterIndex - 1
? {
...semester,
courseList: semester.courseList.filter((_, idx) => idx !== index),
creditsTotal:
semester.creditsTotal -
semester.courseList[index].data.credit_max,
}
: semester,
),
);
};

useEffect(() => {
document.addEventListener("mousedown", handleClickOutside);
return () => {
Expand Down Expand Up @@ -79,17 +240,29 @@ const PlannerCourse: React.FC<PlannerCourseProps> = ({ course }) => {
className="absolute bg-[#F5CECE] rounded-xl border border-slate-500 text-[#283044] text-xs p-2 right-0 top-8 shadow-lg z-1"
>
<div className="flex flex-col items-start space-y-1">
<button className="hover:bg-gray-300 p-1 w-full text-left">
<button
className="hover:bg-gray-300 p-1 w-full text-left"
onClick={handleDuplicate}
>
Duplicate
</button>
<button className="hover:bg-gray-300 p-1 w-full text-left">
<button
className="hover:bg-gray-300 p-1 w-full text-left"
onClick={handleMoveNext}
>
Move to next sem
</button>
<hr className="w-full border-gray-400" />
<button className="hover:bg-gray-300 p-1 w-full text-left">
<button
className="hover:bg-gray-300 p-1 w-full text-left"
onClick={handleMoveToolbox}
>
Back to toolbox
</button>
<button className="hover:bg-red-300 p-1 w-full text-left">
<button
className="hover:bg-red-300 p-1 w-full text-left"
onClick={handleDelete}
>
Delete
</button>
</div>
Expand Down
Loading