Skip to content

Navigate to last viewed#59 #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thepapisogram wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Navigate to last viewed#59 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e5ad06f
attempt #1
thepapisogram Aug 3, 2025
f5decbd
Task complete
thepapisogram Aug 3, 2025
ce9a9a6
Loader added
thepapisogram Aug 3, 2025
ad2fffb
removed testing state
thepapisogram Aug 3, 2025
c2729da
Task Completed
thepapisogram Aug 3, 2025
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
312 changes: 161 additions & 151 deletions app/components/project-button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,167 +5,177 @@ import type { ProjectWithTaskCount } from "~/lib/types";
import { useProjects } from "~/lib/use-projects";
import type { loader } from "~/routes/$project";
import {
Popover,
PopoverContent,
PopoverTrigger,
usePopoverContext,
Popover,
PopoverContent,
PopoverTrigger,
usePopoverContext,
} from "./popover";
import { ProjectDeleteForm } from "./project-delete-form";
import { ProjectForm } from "./project-form";

export function ProjectButton() {
const { project } = useLoaderData<typeof loader>();

return (
<Popover placement="bottom-end">
<PopoverTrigger className="text-start bg-transparent dark:bg-neutral-800/30 rounded-s-full">
<div className="min-w-10rem p-1 pl-2 gap-2 flex items-center font-mono">
<div className="i-solar-layers-minimalistic-line-duotone text-xl" />
<div className="flex-1">
<p>{project.name}</p>
</div>
<div className="i-solar-alt-arrow-down-linear size-5" />
</div>
</PopoverTrigger>

<PopoverContent className="z-100">
<Content />
</PopoverContent>
</Popover>
);
const { project } = useLoaderData<typeof loader>();

return (
<Popover placement="bottom-end">
<PopoverTrigger className="text-start bg-transparent dark:bg-neutral-800/30 rounded-s-full">
<div className="min-w-10rem p-1 pl-2 gap-2 flex items-center font-mono">
<div className="i-solar-layers-minimalistic-line-duotone text-xl" />
<div className="flex-1">
<p>{project.name}</p>
</div>
<div className="i-solar-alt-arrow-down-linear size-5" />
</div>
</PopoverTrigger>

<PopoverContent className="z-100">
<Content />
</PopoverContent>
</Popover>
);
}

type View =
| "list"
| "new-project-form"
| "edit-project-form"
| "delete-project-form";
| "list"
| "new-project-form"
| "edit-project-form"
| "delete-project-form";
function Content() {
const [view, setView] = React.useState<View>("list");

const { user, project: activeProject } = useLoaderData<typeof loader>();
const { query } = useProjects();
const { data: projects } = query;

const popover = usePopoverContext();

const edit = React.useRef<ProjectWithTaskCount>();

const isOnly = projects?.length === 1;

if (view === "new-project-form") {
return (
<Container className="!w-17rem">
<ProjectForm onClose={() => setView("list")} />
</Container>
);
}

if (view === "edit-project-form") {
return (
<Container className="!w-17rem">
<ProjectForm onClose={() => setView("list")} project={edit.current} />
</Container>
);
}

if (view === "delete-project-form") {
return (
<Container className="!w-17rem">
<ProjectDeleteForm
project={edit.current!}
onClose={() => setView("list")}
/>
</Container>
);
}

return (
<Container>
<div>
<ul className="p-1">
<li>
{projects?.map((project) => (
<div
className={clsx(
"group w-full flex gap-2 items-center py-1.5 px-2 hover:bg-neutral-200/50 dark:hover:bg-neutral-800/50 rounded-lg",
{
"bg-neutral-200/50 dark:bg-neutral-800/50":
project.id === activeProject.id,
},
)}
key={project.id}
>
<Link
className="flex-1 gap-2 items-center flex"
to={`/${project.slug}`}
onClick={() => popover.setOpen(false)}
>
<div className="i-solar-layers-minimalistic-line-duotone text-xl opacity-50" />
{project.name}
</Link>

{user.superUser && (
<div className="flex items-center gap-2">
<button
type="button"
className="i-solar-pen-2-line-duotone text-xl text-secondary opacity-0 group-hover:opacity-100 focus:opacity-100"
onClick={() => {
edit.current = project;
setView("edit-project-form");
}}
/>

<button
type="button"
className="i-solar-trash-bin-trash-linear text-xl text-secondary opacity-0 group-hover:opacity-100"
disabled={isOnly}
hidden={isOnly}
onClick={() => {
edit.current = project;
setView("delete-project-form");
}}
/>
</div>
)}

<div className="text-sm font-mono bg-stone-300/50 dark:bg-neutral-800 px-1 leading-tight rounded-full">
{project._count.Task}
</div>
</div>
))}
</li>
</ul>

{user.superUser && (
<div className="border-t border-neutral-300 dark:border-neutral-800 p-1">
<button
type="button"
className="bg-transparent w-full flex gap-2 items-center py-1.5 px-2 hover:bg-neutral-200 dark:hover:bg-neutral-800 rounded-lg font-medium"
onClick={() => setView("new-project-form")}
>
<div className="i-solar-arrow-to-top-right-bold-duotone text-xl" />
New project
</button>
</div>
)}
</div>
</Container>
);
const [view, setView] = React.useState<View>("list");

const { user, project: activeProject } = useLoaderData<typeof loader>();
const { query } = useProjects();
const { data: projects, isLoading } = query;

const popover = usePopoverContext();

const edit = React.useRef<ProjectWithTaskCount>();

const isOnly = projects?.length === 1;

if (view === "new-project-form") {
return (
<Container className="!w-17rem">
<ProjectForm onClose={() => setView("list")} />
</Container>
);
}

if (view === "edit-project-form") {
return (
<Container className="!w-17rem">
<ProjectForm onClose={() => setView("list")} project={edit.current} />
</Container>
);
}

if (view === "delete-project-form") {
return (
<Container className="!w-17rem">
<ProjectDeleteForm
project={edit.current!}
onClose={() => setView("list")}
/>
</Container>
);
}

return (
<Container>
<div>
<ul className="p-1">
<li>
{isLoading ? (
<div className="flex flex-col items-center justify-center py-4">
<div className="i-svg-spinners-90-ring-with-bg text-xl" />
<p>Loading projects...</p>
</div>
) : (
projects?.map((project) => (
<div
className={clsx(
"group w-full flex gap-2 items-center py-1.5 px-2 hover:bg-neutral-200/50 dark:hover:bg-neutral-800/50 rounded-lg",
{
"bg-neutral-200/50 dark:bg-neutral-800/50":
project.id === activeProject.id,
}
)}
key={project.id}
>
<Link
className="flex-1 gap-2 items-center flex"
to={`/${project.slug}`}
onClick={() => popover.setOpen(false)}
>
<div className="i-solar-layers-minimalistic-line-duotone text-xl opacity-50" />
{project.name}
</Link>

{user.superUser && (
<div className="flex items-center gap-2">
<button
type="button"
className="i-solar-pen-2-line-duotone text-xl text-secondary opacity-0 group-hover:opacity-100 focus:opacity-100"
onClick={() => {
edit.current = project;
setView("edit-project-form");
}}
/>

<button
type="button"
className="i-solar-trash-bin-trash-linear text-xl text-secondary opacity-0 group-hover:opacity-100"
disabled={isOnly}
hidden={isOnly}
onClick={() => {
edit.current = project;
setView("delete-project-form");
}}
/>
</div>
)}

<div className="text-sm font-mono bg-stone-300/50 dark:bg-neutral-800 px-1 leading-tight rounded-full">
{project._count.Task}
</div>
</div>
))
)}
</li>
</ul>

{user.superUser && (
<div className="border-t border-neutral-300 dark:border-neutral-800 p-1">
<button
type="button"
className="bg-transparent w-full flex gap-2 items-center py-1.5 px-2 hover:bg-neutral-200 dark:hover:bg-neutral-800 rounded-lg font-medium"
onClick={() => setView("new-project-form")}
>
<div className="i-solar-arrow-to-top-right-bold-duotone text-xl" />
New project
</button>
</div>
)}
</div>
</Container>
);
}

function Container({
children,
className,
}: { children: React.ReactNode; className?: string }) {
return (
<div
className={clsx(
"w-16rem divide-y divide-neutral-5/50 transition-[width,min-width] duration-300 ease-in-out will-change-width bg-stone-100 dark:bg-neutral-900 rounded-lg border border-neutral-300 dark:border-neutral-800 overflow-hidden shadow-lg mt-1.5 animate-fade-in animate-duration-200",
className,
)}
>
{children}
</div>
);
children,
className,
}: {
children: React.ReactNode;
className?: string;
}) {
return (
<div
className={clsx(
"w-16rem divide-y divide-neutral-5/50 transition-[width,min-width] duration-300 ease-in-out will-change-width bg-stone-100 dark:bg-neutral-900 rounded-lg border border-neutral-300 dark:border-neutral-800 overflow-hidden shadow-lg mt-1.5 animate-fade-in animate-duration-200",
className
)}
>
{children}
</div>
);
}
20 changes: 15 additions & 5 deletions app/routes/$project.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ import { tryit } from "radashi";
import {
type LoaderFunctionArgs,
type MetaFunction,
redirect
redirect,
data
} from "react-router";
import { BabyGlinConfetti } from "~/components/baby-glin-confetti";
import { Header } from "~/components/header";
import { StatusBar } from "~/components/status-bar";
import { Todos } from "~/components/todos";
import { checkAccess } from "~/lib/check-auth";
import { userPrefs } from "~/lib/cookies.server";
import { prisma } from "~/lib/prisma.server";
import { notFound } from "~/lib/responses";

Expand All @@ -24,9 +26,9 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
const [err, access] = await tryit(checkAccess)(request, params.project!);

if (err) {
if ("data" in err) throw err;
if (err instanceof Response) throw err;

return redirect("/auth");
throw redirect("/auth");
}

const users = await prisma.user.findMany({
Expand Down Expand Up @@ -56,14 +58,22 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
},
});

return {
const cookieHeader = request.headers.get("Cookie");
const currentPrefs = (await userPrefs.parse(cookieHeader)) || {};
const updatedPrefs = { ...currentPrefs, lastProject: params.project };

return data({
done: Number(done),
total: Number(total),
user: access.user,
users,
project: access.project!,
unreadNotifications,
};
}, {
headers: {
"Set-Cookie": await userPrefs.serialize(updatedPrefs),
},
});
};

export const meta: MetaFunction = () => {
Expand Down
Loading