Skip to content
Merged
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,6 @@ next-env.d.ts

# prisma generated client
src/generated/

# ts build info output
tsconfig.tsbuildinfo
2 changes: 1 addition & 1 deletion src/app/[...puckPath]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Client } from "./client";
import { notFound } from "next/navigation";
import { Metadata } from "next";
import { getDocumentByPath } from "../../lib/get-document";
import { getDocumentByPath } from "../../lib/documents/queries";

export async function generateMetadata({
params,
Expand Down
4 changes: 2 additions & 2 deletions src/app/editor/DocumentList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import {
duplicateDocumentAction,
renameDocumentAction,
unarchiveDocumentAction,
} from "../../lib/actions";
} from "../../lib/documents/actions";
import { runAction } from "./runAction";
import { getDocumentName } from "../../lib/documents";
import { getDocumentName } from "../../lib/documents/utils";
import { ResourceCard, NewResourceCard, formatRelativeTime } from "./ResourceCard";
import { Button } from "@/components/ui/button";
import { useDialogs } from "@/components/ui/dialog-provider";
Expand Down
2 changes: 1 addition & 1 deletion src/app/editor/MediaLibrary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { useRef, useState, useTransition } from "react";
import { File as FileIcon, Trash2, Copy, Pencil } from "lucide-react";
import { toast } from "sonner";
import { uploadMediaAction, deleteMediaAction, renameMediaAction } from "../../lib/actions";
import { uploadMediaAction, deleteMediaAction, renameMediaAction } from "../../lib/media/actions";
import type { Media } from "../../generated/prisma/client";
import { runAction } from "./runAction";
import { ResourceCard, NewResourceCard, formatRelativeTime } from "./ResourceCard";
Expand Down Expand Up @@ -67,7 +67,7 @@
<ResourceCard
preview={
isImage ? (
<img

Check warning on line 70 in src/app/editor/MediaLibrary.tsx

View workflow job for this annotation

GitHub Actions / build

Do not use `<img>` element. Use `<Image />` from `next/image` instead. See: https://nextjs.org/docs/messages/no-img-element
src={file.url}
alt={file.name}
className="h-full w-full object-cover"
Expand Down
2 changes: 1 addition & 1 deletion src/app/editor/RouteTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
createRouteAction,
updateRouteAction,
deleteRouteAction,
} from "../../lib/actions";
} from "../../lib/routes/actions";
import { runAction } from "./runAction";
import { useDialogs } from "@/components/ui/dialog-provider";

Expand Down
2 changes: 1 addition & 1 deletion src/app/editor/[id]/SaveButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { createUsePuck } from "@puckeditor/core";
import { useTransition } from "react";
import { toast } from "sonner";
import { useDocumentContext } from "./client";
import { saveVersionAction } from "../../../lib/actions";
import { saveVersionAction } from "../../../lib/documents/actions";
import { runAction } from "../runAction";
import { useDialogs } from "@/components/ui/dialog-provider";

Expand Down
2 changes: 1 addition & 1 deletion src/app/editor/[id]/VersionPluginContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { useTransition } from "react";
import { useRouter } from "next/navigation";
import { useDocumentContext } from "./client";
import { publishVersionAction } from "../../../lib/actions";
import { publishVersionAction } from "../../../lib/documents/actions";
import { runAction } from "../runAction";
import { VersionListPanel } from "./VersionListPanel";
import { useDialogs } from "@/components/ui/dialog-provider";
Expand Down
2 changes: 1 addition & 1 deletion src/app/editor/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import "@puckeditor/core/puck.css";
import type { Data } from "@puckeditor/core";
import { Client } from "./client";
import { Metadata } from "next";
import { getDocumentById, getVersionById } from "../../../lib/get-document";
import { getDocumentById, getVersionById } from "../../../lib/documents/queries";

interface PageProps {
params: Promise<{ id: string }>;
Expand Down
32 changes: 8 additions & 24 deletions src/app/editor/page.tsx
Original file line number Diff line number Diff line change
@@ -1,34 +1,18 @@
import { prisma } from "../../lib/prisma";
import { getMediaUrl } from "../../lib/supabase";
import { getDocumentName } from "../../lib/documents";
import { getDocumentSummaries } from "../../lib/documents/queries";
import { getDocumentName } from "../../lib/documents/utils";
import { getMediaFiles } from "../../lib/media/queries";
import { getRoutesWithDocuments } from "../../lib/routes/queries";
import { DocumentList, ArchivedDocumentList } from "./DocumentList";
import { MediaLibrary } from "./MediaLibrary";
import { RouteTable } from "./RouteTable";

export default async function EditorIndexPage() {
const [routes, media, documents] = await Promise.all([
prisma.route.findMany({
include: { document: true },
orderBy: { path: "asc" },
}),
prisma.media.findMany({ orderBy: { createdAt: "desc" } }),
prisma.document.findMany({
include: {
versions: {
orderBy: { createdAt: "desc" },
take: 1,
select: { createdAt: true },
},
},
orderBy: { createdAt: "desc" },
}),
const [routes, mediaFiles, documents] = await Promise.all([
getRoutesWithDocuments(),
getMediaFiles(),
getDocumentSummaries(),
]);

const mediaFiles = media.map((m) => ({
...m,
url: getMediaUrl(m.storagePath),
}));

const toDocumentItem = (doc: (typeof documents)[number]) => ({
id: doc.id,
name: doc.name,
Expand Down
2 changes: 1 addition & 1 deletion src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Client } from "./[...puckPath]/client";
import { notFound } from "next/navigation";
import { getDocumentByPath } from "../lib/get-document";
import { getDocumentByPath } from "../lib/documents/queries";


export default async function Page() {
Expand Down
Loading
Loading