diff --git a/drizzle.config.json b/drizzle.config.json
new file mode 100644
index 0000000..46d866a
--- /dev/null
+++ b/drizzle.config.json
@@ -0,0 +1,11 @@
+{
+ "dialect": "postgresql",
+ "schema": "./src/schema",
+ "breakpoints": false,
+ "url": "postgresql://postgres:postgres-aedf4b0c1d50@192.168.0.200:5432/immich",
+ "dbCredentials": {
+ "user": "postgres",
+ "password": "postgres-aedf4b0c1d50",
+ "host": "192.168.0.200"
+ }
+}
\ No newline at end of file
diff --git a/src/components/people/PeopleFilters.tsx b/src/components/people/PeopleFilters.tsx
new file mode 100644
index 0000000..c6f7ffe
--- /dev/null
+++ b/src/components/people/PeopleFilters.tsx
@@ -0,0 +1,113 @@
+import { useRouter } from "next/router";
+import { useMemo } from "react";
+import { Button } from "../ui/button";
+import { ArrowLeft, ArrowRight, SortAsc, SortDesc } from "lucide-react";
+import { usePeopleFilterContext } from "@/contexts/PeopleFilterContext";
+import { Switch } from "../ui/switch";
+import { Label } from "../ui/label";
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuSeparator,
+ DropdownMenuTrigger,
+} from "../ui/dropdown-menu";
+import { Input } from "../ui/input";
+
+export function PeopleFilters() {
+ const router = useRouter();
+ const { updateContext, page, maximumAssetCount } = usePeopleFilterContext();
+
+ const [nextPage, prevPage] = useMemo(() => {
+ const pageNum = parseInt(page.toString() || "1", 10);
+ return [pageNum + 1, pageNum - 1];
+ }, [page]);
+
+ return (
+
+
{
+ try {
+ const value = parseInt(e.target.value || "0", 10);
+ updateContext({ maximumAssetCount: value });
+ } catch (e) {
+ updateContext({ maximumAssetCount: 0 });
+ }
+ }}
+ />
+
+ {
+ updateContext({ nameLessOnly: checked, page: 1 });
+ }}
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+ updateContext({ sort: "assetCount", sortOrder: "asc" })
+ }
+ >
+
+ Asset Count - ASC
+
+
+
+ updateContext({ sort: "assetCount", sortOrder: "desc" })
+ }
+ >
+
+ Asset Count - DESC
+
+
+
+
+ updateContext({ sort: "updatedAt", sortOrder: "asc" })
+ }
+ >
+
+ Updated At - ASC
+
+
+
+ updateContext({ sort: "updatedAt", sortOrder: "desc" })
+ }
+ >
+
+ Updated At - DESC
+
+
+
+
+ );
+}
diff --git a/src/components/people/PeopleList.tsx b/src/components/people/PeopleList.tsx
index 582bd8f..8772c2e 100644
--- a/src/components/people/PeopleList.tsx
+++ b/src/components/people/PeopleList.tsx
@@ -1,31 +1,29 @@
-import { listPeople } from "@/handlers/api/people.handler";
+import { IPersonListFilters, listPeople } from "@/handlers/api/people.handler";
import { IPerson } from "@/types/person";
import React, { useEffect, useState } from "react";
import Loader from "../ui/loader";
import PersonItem from "./PersonItem";
-import { ColumnDef } from "@tanstack/react-table";
-import { Table } from "../ui/table";
-import PersonBirthdayCell from "./PersonBirthdayCell";
-import Link from "next/link";
-import { ENV } from "@/config/environment";
-import PersonHideCell from "./PersonHideCell";
-import { PeoplePagination } from "./PeoplePagination";
+import { PeopleFilters } from "./PeopleFilters";
import { useRouter } from "next/router";
-
+import PeopleFilterContext from "@/contexts/PeopleFilterContext";
+import PageLayout from "../layouts/PageLayout";
+import Header from "../shared/Header";
export default function PeopleList() {
- const router = useRouter()
- const { page = 1 } = router.query as { page: string }
+ const router = useRouter();
const [people, setPeople] = useState([]);
const [count, setCount] = useState(0);
const [loading, setLoading] = useState(false);
const [errorMessage, setErrorMessage] = useState(null);
+ const [filters, setFilters] = useState({
+ page: 1,
+ });
+
const fetchData = async () => {
setLoading(true);
- return listPeople({
- page
- })
+ setErrorMessage(null);
+ return listPeople(filters)
.then((response) => {
setPeople(response.people);
setCount(response.total);
@@ -38,20 +36,47 @@ export default function PeopleList() {
});
};
+ const handleRemove = (person: IPerson) => {
+ setPeople((prev) => prev.filter((p) => {
+ console.log(p.id, person.id, p.id !== person.id);
+ return p.id !== person.id
+ }));
+ }
+
useEffect(() => {
if (!router.isReady) return;
fetchData();
- }, [page]);
+ }, [filters]);
+ console.log(people.length);
+ const renderContent = () => {
+ if (loading) return ;
+ if (errorMessage) return {errorMessage}
;
- if (loading) return ;
- if (errorMessage) return {errorMessage}
;
+ return (
+
+ {people.map((person) => (
+
+ ))}
+
+ );
+ };
return (
-
- {people.map((person) => (
-
- ))}
-
- )
+
+ setFilters((prev) => ({ ...prev, ...newConfig })),
+ }}
+ >
+
+ }
+ />
+ {renderContent()}
+
+
+ );
}
diff --git a/src/components/people/PeoplePagination.tsx b/src/components/people/PeoplePagination.tsx
deleted file mode 100644
index caf264c..0000000
--- a/src/components/people/PeoplePagination.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-
-import { useRouter } from "next/router"
-import { useMemo } from "react"
-import { Button } from "../ui/button"
-import { ArrowLeft, ArrowRight } from "lucide-react"
-import Link from "next/link"
-
-export function PeoplePagination() {
- const router = useRouter()
- const { pathname } = router;
- const { page = 1 } = router.query as { page: string }
-
- const [nextPage, prevPage] = useMemo(() => {
- const pageNum = parseInt(page.toString() || "1", 10)
- return [pageNum + 1, pageNum - 1]
-
- }, [page])
-
- return (
-
-
-
-
-
-
-
-
-
- )
-}
diff --git a/src/components/people/PersonItem.tsx b/src/components/people/PersonItem.tsx
index facba78..39f0c0f 100644
--- a/src/components/people/PersonItem.tsx
+++ b/src/components/people/PersonItem.tsx
@@ -11,11 +11,13 @@ import { ENV } from "@/config/environment";
import { ArrowUpRight } from "lucide-react";
import { useConfig } from "@/contexts/ConfigContext";
import { useToast } from "../ui/use-toast";
+import { Badge } from "../ui/badge";
interface IProps {
person: IPerson;
+ onRemove: (person: IPerson) => void;
}
-export default function PersonItem({ person }: IProps) {
+export default function PersonItem({ person, onRemove }: IProps) {
const { immichURL } = useConfig();
const { toast } = useToast();
const [editMode, setEditMode] = useState(false);
@@ -90,6 +92,9 @@ export default function PersonItem({ person }: IProps) {
/>
+
+ {person.assetCount} Assets
+
{!editMode ? (
diff --git a/src/components/people/PersonMergeDropdown.tsx b/src/components/people/PersonMergeDropdown.tsx
index 00324ea..6273233 100644
--- a/src/components/people/PersonMergeDropdown.tsx
+++ b/src/components/people/PersonMergeDropdown.tsx
@@ -1,7 +1,5 @@
"use client";
-import * as React from "react";
-
import { Button } from "@/components/ui/button";
import {
Command,
@@ -11,56 +9,29 @@ import {
CommandItem,
CommandList,
} from "@/components/ui/command";
-import {
- Popover,
- PopoverContent,
- PopoverTrigger,
-} from "@/components/ui/popover";
+import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog";
import { Merge } from "lucide-react";
import { mergePerson, searchPeople } from "@/handlers/api/people.handler";
import { IPerson } from "@/types/person";
import { set } from "date-fns";
import { CommandLoading } from "cmdk";
import { Avatar } from "../ui/avatar";
-
-type Status = {
- value: string;
- label: string;
-};
-
-const statuses: Status[] = [
- {
- value: "backlog",
- label: "Backlog",
- },
- {
- value: "todo",
- label: "Todo",
- },
- {
- value: "in progress",
- label: "In Progress",
- },
- {
- value: "done",
- label: "Done",
- },
- {
- value: "canceled",
- label: "Canceled",
- },
-];
+import { useEffect, useRef, useState } from "react";
+import { useToast } from "../ui/use-toast";
interface PersonMergeDropdownProps {
person: IPerson;
+ onRemove?: (person: IPerson) => void;
}
-export function PersonMergeDropdown(
- { person }: PersonMergeDropdownProps
-) {
- const [searchedPeople, setSearchedPeople] = React.useState([]);
- const [open, setOpen] = React.useState(false);
- const [loading, setLoading] = React.useState(false);
- const searchTimer = React.useRef();
+export function PersonMergeDropdown({
+ person,
+ onRemove,
+}: PersonMergeDropdownProps) {
+ const [searchedPeople, setSearchedPeople] = useState([]);
+ const [open, setOpen] = useState(false);
+ const [loading, setLoading] = useState(false);
+ const searchTimer = useRef();
+ const { toast } = useToast();
const handleSearch = (value: string) => {
if (searchTimer.current) {
@@ -86,20 +57,30 @@ export function PersonMergeDropdown(
const handleSelect = (value: IPerson) => {
setOpen(false);
return mergePerson(person.id, value.id)
- .then(() => {
-
- })
+ .then(() => {
+ onRemove?.(person);
+ })
+ .then(() => {
+ toast({
+ title: "Success",
+ description: "Person merged successfully",
+ });
+ });
};
+ useEffect(() => {
+ if (open) handleSearch("");
+ }, [open]);
+
return (
-
-
+
-
+
+
-
-
+
+
);
}
diff --git a/src/components/shared/Header.tsx b/src/components/shared/Header.tsx
index 635ba4d..abc9dab 100644
--- a/src/components/shared/Header.tsx
+++ b/src/components/shared/Header.tsx
@@ -47,7 +47,7 @@ export default function Header({ leftComponent, rightComponent }: IProps) {
{leftComponent} - Immich Power Tools
)}
-
+