mirror of
https://github.com/alexmickelson/canvasManagement.git
synced 2026-03-26 07:38:33 -06:00
updates to calendar
This commit is contained in:
@@ -10,7 +10,7 @@ import { useLocalCourseSettingsQuery } from "@/hooks/localCourse/localCoursesHoo
|
|||||||
import { getDayOfWeek } from "@/models/local/localCourse";
|
import { getDayOfWeek } from "@/models/local/localCourse";
|
||||||
import { getLectureUrl } from "@/services/urlUtils";
|
import { getLectureUrl } from "@/services/urlUtils";
|
||||||
import DropTargetStyling from "../../../../../components/DropTargetStyling";
|
import DropTargetStyling from "../../../../../components/DropTargetStyling";
|
||||||
import { DraggableListItem } from "./DraggableListItem";
|
import { ItemInDay } from "./ItemInDay";
|
||||||
import { useTodaysItems } from "./useTodaysItems";
|
import { useTodaysItems } from "./useTodaysItems";
|
||||||
|
|
||||||
export default function Day({ day, month }: { day: string; month: number }) {
|
export default function Day({ day, month }: { day: string; month: number }) {
|
||||||
@@ -49,7 +49,7 @@ export default function Day({ day, month }: { day: string; month: number }) {
|
|||||||
<div>
|
<div>
|
||||||
{todaysAssignments.map(
|
{todaysAssignments.map(
|
||||||
({ assignment, moduleName, status, message }) => (
|
({ assignment, moduleName, status, message }) => (
|
||||||
<DraggableListItem
|
<ItemInDay
|
||||||
key={assignment.name}
|
key={assignment.name}
|
||||||
type={"assignment"}
|
type={"assignment"}
|
||||||
moduleName={moduleName}
|
moduleName={moduleName}
|
||||||
@@ -60,7 +60,7 @@ export default function Day({ day, month }: { day: string; month: number }) {
|
|||||||
)
|
)
|
||||||
)}
|
)}
|
||||||
{todaysQuizzes.map(({ quiz, moduleName, status, message }) => (
|
{todaysQuizzes.map(({ quiz, moduleName, status, message }) => (
|
||||||
<DraggableListItem
|
<ItemInDay
|
||||||
key={quiz.name}
|
key={quiz.name}
|
||||||
type={"quiz"}
|
type={"quiz"}
|
||||||
moduleName={moduleName}
|
moduleName={moduleName}
|
||||||
@@ -70,7 +70,7 @@ export default function Day({ day, month }: { day: string; month: number }) {
|
|||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
{todaysPages.map(({ page, moduleName, status, message }) => (
|
{todaysPages.map(({ page, moduleName, status, message }) => (
|
||||||
<DraggableListItem
|
<ItemInDay
|
||||||
key={page.name}
|
key={page.name}
|
||||||
type={"page"}
|
type={"page"}
|
||||||
moduleName={moduleName}
|
moduleName={moduleName}
|
||||||
|
|||||||
@@ -3,9 +3,12 @@ import { getModuleItemUrl } from "@/services/urlUtils";
|
|||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import { ReactNode } from "react";
|
import { ReactNode } from "react";
|
||||||
import { useCourseContext } from "../../context/courseContext";
|
import { useCourseContext } from "../../context/courseContext";
|
||||||
import { useDraggingContext, DraggableItem } from "../../context/draggingContext";
|
import {
|
||||||
|
useDraggingContext,
|
||||||
|
DraggableItem,
|
||||||
|
} from "../../context/draggingContext";
|
||||||
|
|
||||||
export function DraggableListItem({
|
export function ItemInDay({
|
||||||
type,
|
type,
|
||||||
moduleName,
|
moduleName,
|
||||||
status,
|
status,
|
||||||
@@ -46,6 +46,7 @@ export default function DraggingContextProvider({
|
|||||||
(e: DragEvent<HTMLDivElement>, dropModuleName: string) => {
|
(e: DragEvent<HTMLDivElement>, dropModuleName: string) => {
|
||||||
console.log("dropping on module");
|
console.log("dropping on module");
|
||||||
const rawData = e.dataTransfer.getData("draggableItem");
|
const rawData = e.dataTransfer.getData("draggableItem");
|
||||||
|
if (!rawData) return;
|
||||||
const itemBeingDragged: DraggableItem = JSON.parse(rawData);
|
const itemBeingDragged: DraggableItem = JSON.parse(rawData);
|
||||||
|
|
||||||
if (itemBeingDragged) {
|
if (itemBeingDragged) {
|
||||||
@@ -97,6 +98,7 @@ export default function DraggingContextProvider({
|
|||||||
const itemDropOnDay = useCallback(
|
const itemDropOnDay = useCallback(
|
||||||
(e: DragEvent<HTMLDivElement>, day: string) => {
|
(e: DragEvent<HTMLDivElement>, day: string) => {
|
||||||
const rawData = e.dataTransfer.getData("draggableItem");
|
const rawData = e.dataTransfer.getData("draggableItem");
|
||||||
|
if (!rawData) return;
|
||||||
const itemBeingDragged: DraggableItem = JSON.parse(rawData);
|
const itemBeingDragged: DraggableItem = JSON.parse(rawData);
|
||||||
|
|
||||||
if (itemBeingDragged) {
|
if (itemBeingDragged) {
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ import NewItemForm from "./NewItemForm";
|
|||||||
import { ModuleCanvasStatus } from "./ModuleCanvasStatus";
|
import { ModuleCanvasStatus } from "./ModuleCanvasStatus";
|
||||||
import ClientOnly from "@/components/ClientOnly";
|
import ClientOnly from "@/components/ClientOnly";
|
||||||
import ExpandIcon from "../../../../components/icons/ExpandIcon";
|
import ExpandIcon from "../../../../components/icons/ExpandIcon";
|
||||||
import { useDraggingContext } from "../context/draggingContext";
|
import { DraggableItem, useDraggingContext } from "../context/draggingContext";
|
||||||
import DropTargetStyling from "../../../../components/DropTargetStyling";
|
import DropTargetStyling from "../../../../components/DropTargetStyling";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import { getModuleItemUrl } from "@/services/urlUtils";
|
import { getModuleItemUrl } from "@/services/urlUtils";
|
||||||
@@ -45,7 +45,6 @@ export default function ExpandableModule({
|
|||||||
);
|
);
|
||||||
const { data: quizzes } = useQuizzesQueries(moduleName, quizNames);
|
const { data: quizzes } = useQuizzesQueries(moduleName, quizNames);
|
||||||
const { data: pages } = usePagesQueries(moduleName, pageNames);
|
const { data: pages } = usePagesQueries(moduleName, pageNames);
|
||||||
const { courseName } = useCourseContext();
|
|
||||||
|
|
||||||
const [expanded, setExpanded] = useState(false);
|
const [expanded, setExpanded] = useState(false);
|
||||||
|
|
||||||
@@ -121,28 +120,13 @@ export default function ExpandableModule({
|
|||||||
)}
|
)}
|
||||||
</Modal>
|
</Modal>
|
||||||
<div className="grid grid-cols-[auto_1fr]">
|
<div className="grid grid-cols-[auto_1fr]">
|
||||||
{moduleItems.map(({ type, item }) => {
|
{moduleItems.map(({ type, item }) => (
|
||||||
const date = getDateFromString(item.dueAt);
|
<ExpandableModuleItem
|
||||||
|
type={type}
|
||||||
return (
|
item={item}
|
||||||
<Fragment key={item.name + type}>
|
moduleName={moduleName}
|
||||||
<div className="text-end text-slate-500 me-2">
|
/>
|
||||||
{date && getDateOnlyMarkdownString(date)}
|
))}
|
||||||
</div>
|
|
||||||
<Link
|
|
||||||
href={getModuleItemUrl(
|
|
||||||
courseName,
|
|
||||||
moduleName,
|
|
||||||
type,
|
|
||||||
item.name
|
|
||||||
)}
|
|
||||||
className="transition-all hover:text-slate-50 hover:scale-105"
|
|
||||||
>
|
|
||||||
{item.name}
|
|
||||||
</Link>
|
|
||||||
</Fragment>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -150,3 +134,44 @@ export default function ExpandableModule({
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function ExpandableModuleItem({
|
||||||
|
type,
|
||||||
|
item,
|
||||||
|
moduleName,
|
||||||
|
}: {
|
||||||
|
type: "assignment" | "quiz" | "page";
|
||||||
|
item: IModuleItem;
|
||||||
|
moduleName: string;
|
||||||
|
}) {
|
||||||
|
const { courseName } = useCourseContext();
|
||||||
|
const date = getDateFromString(item.dueAt);
|
||||||
|
const { dragStart } = useDraggingContext();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Fragment key={item.name + type}>
|
||||||
|
<div className="text-end text-slate-500 me-2">
|
||||||
|
{date && getDateOnlyMarkdownString(date)}
|
||||||
|
</div>
|
||||||
|
<Link
|
||||||
|
href={getModuleItemUrl(courseName, moduleName, type, item.name)}
|
||||||
|
className="transition-all hover:text-slate-50 hover:scale-105"
|
||||||
|
draggable="true"
|
||||||
|
onDragStart={(e) => {
|
||||||
|
const draggableItem: DraggableItem = {
|
||||||
|
type,
|
||||||
|
item,
|
||||||
|
sourceModuleName: moduleName,
|
||||||
|
};
|
||||||
|
e.dataTransfer.setData(
|
||||||
|
"draggableItem",
|
||||||
|
JSON.stringify(draggableItem)
|
||||||
|
);
|
||||||
|
dragStart();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{item.name}
|
||||||
|
</Link>
|
||||||
|
</Fragment>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user