added dashboard + sorting functionality done partially

This commit is contained in:
Daniel
2023-05-14 19:11:08 +03:30
parent d5c9e7aaf3
commit 9010627997
14 changed files with 518 additions and 61 deletions
+3 -3
View File
@@ -22,7 +22,7 @@ import {
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { useRouter } from "next/router";
import { useEffect, useState } from "react";
import Dashboard from "@/layouts/Dashboard";
import MainLayout from "@/layouts/MainLayout";
export default function () {
const router = useRouter();
@@ -62,7 +62,7 @@ export default function () {
}, [links, router, collections]);
return (
<Dashboard>
<MainLayout>
<div className="p-5 flex flex-col gap-5 w-full">
<div className="flex gap-3 items-center">
<div className="flex gap-2 items-center">
@@ -146,6 +146,6 @@ export default function () {
return <LinkList key={i} link={e} count={i} />;
})}
</div>
</Dashboard>
</MainLayout>
);
}
+128 -35
View File
@@ -7,75 +7,162 @@ import useCollectionStore from "@/store/collections";
import {
faAdd,
faBox,
faCheck,
faEllipsis,
faPlus,
faSort,
} from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import CollectionCard from "@/components/CollectionCard";
import Dropdown from "@/components/Dropdown";
import { useState } from "react";
import { ChangeEvent, useState } from "react";
import Modal from "@/components/Modal";
import AddCollection from "@/components/Modal/AddCollection";
import Dashboard from "@/layouts/Dashboard";
import MainLayout from "@/layouts/MainLayout";
import ClickAwayHandler from "@/components/ClickAwayHandler";
export default function () {
const { collections } = useCollectionStore();
const [expandDropdown, setExpandDropdown] = useState(false);
const [sortDropdown, setSortDropdown] = useState(false);
const [linkModal, setLinkModal] = useState(false);
const [collectionModal, setCollectionModal] = useState(false);
const toggleCollectionModal = () => {
setLinkModal(!linkModal);
setCollectionModal(!collectionModal);
};
const [sortBy, setSortBy] = useState("");
const handleSortChange = (event: ChangeEvent<HTMLInputElement>) => {
setSortBy(event.target.value);
};
return (
// ml-80
<Dashboard>
<MainLayout>
<div className="p-5">
<div className="flex gap-3 items-center mb-5">
<div className="flex gap-2 items-center">
<FontAwesomeIcon icon={faBox} className="w-5 h-5 text-sky-300" />
<p className="text-lg text-sky-900">All Collections</p>
<div className="flex gap-3 items-center justify-between mb-5">
<div className="flex gap-3 items-center">
<div className="flex gap-2 items-center">
<FontAwesomeIcon icon={faBox} className="w-5 h-5 text-sky-300" />
<p className="text-lg text-sky-900">All Collections</p>
</div>
<div className="relative">
<div
onClick={() => setExpandDropdown(!expandDropdown)}
id="edit-dropdown"
className="inline-flex rounded-md cursor-pointer hover:bg-white hover:border-sky-500 border-sky-100 border duration-100 p-1"
>
<FontAwesomeIcon
icon={faEllipsis}
id="edit-dropdown"
className="w-5 h-5 text-gray-500"
/>
</div>
{expandDropdown ? (
<Dropdown
items={[
{
name: "New",
icon: <FontAwesomeIcon icon={faAdd} />,
onClick: () => {
toggleCollectionModal();
setExpandDropdown(false);
},
},
]}
onClickOutside={(e: Event) => {
const target = e.target as HTMLInputElement;
if (target.id !== "edit-dropdown") setExpandDropdown(false);
}}
className="absolute top-8 left-0 w-36"
/>
) : null}
</div>
</div>
<div className="relative">
<div
onClick={() => setExpandDropdown(!expandDropdown)}
id="edit-dropdown"
onClick={() => setSortDropdown(!sortDropdown)}
id="sort-dropdown"
className="inline-flex rounded-md cursor-pointer hover:bg-white hover:border-sky-500 border-sky-100 border duration-100 p-1"
>
<FontAwesomeIcon
icon={faEllipsis}
id="edit-dropdown"
icon={faSort}
id="sort-dropdown"
className="w-5 h-5 text-gray-500"
/>
</div>
{expandDropdown ? (
<Dropdown
items={[
{
name: "New",
icon: <FontAwesomeIcon icon={faAdd} />,
onClick: () => {
toggleCollectionModal();
setExpandDropdown(false);
},
},
]}
{sortDropdown ? (
<ClickAwayHandler
onClickOutside={(e: Event) => {
const target = e.target as HTMLInputElement;
if (target.id !== "edit-dropdown") setExpandDropdown(false);
if (target.id !== "sort-dropdown") setSortDropdown(false);
}}
className="absolute top-8 left-0 w-36"
/>
className="absolute top-8 right-0 shadow-md bg-gray-50 rounded-md p-2 z-10 border border-sky-100 w-36"
>
<p className="mb-2 text-sky-900 text-sm text-center">Sort by</p>
<div className="flex flex-col gap-2">
<label className="cursor-pointer flex items-center gap-2">
<input
type="radio"
name="Sort"
value="Name"
className="peer sr-only"
checked={sortBy === "Name"}
onChange={handleSortChange}
/>
<span className="text-sky-900 peer-checked:bg-sky-500 hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">
Name
</span>
<FontAwesomeIcon
icon={faCheck}
className="w-5 h-5 text-sky-500 peer-checked:block hidden"
/>
</label>
<label className="cursor-pointer flex items-center gap-2">
<input
type="radio"
name="Sort"
value="Description"
className="peer sr-only"
checked={sortBy === "Description"}
onChange={handleSortChange}
/>
<span className="text-sky-900 peer-checked:bg-sky-500 hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">
Description
</span>
<FontAwesomeIcon
icon={faCheck}
className="w-5 h-5 text-sky-500 peer-checked:block hidden"
/>
</label>
<label className="cursor-pointer flex items-center gap-2">
<input
type="radio"
name="Sort"
value="Date"
className="peer sr-only"
checked={sortBy === "Date"}
onChange={handleSortChange}
/>
<span className="text-sky-900 peer-checked:bg-sky-500 hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">
Date
</span>
<FontAwesomeIcon
icon={faCheck}
className="w-5 h-5 text-sky-500 peer-checked:block hidden"
/>
</label>
</div>
</ClickAwayHandler>
) : null}
</div>
{linkModal ? (
<Modal toggleModal={toggleCollectionModal}>
<AddCollection toggleCollectionModal={toggleCollectionModal} />
</Modal>
) : null}
</div>
<div className="flex flex-wrap gap-5">
{collections.map((e, i) => {
return <CollectionCard key={i} collection={e} />;
@@ -90,6 +177,12 @@ export default function () {
</div>
</div>
</div>
</Dashboard>
{collectionModal ? (
<Modal toggleModal={toggleCollectionModal}>
<AddCollection toggleCollectionModal={toggleCollectionModal} />
</Modal>
) : null}
</MainLayout>
);
}
+117
View File
@@ -0,0 +1,117 @@
// Copyright (C) 2022-present Daniel31x13 <daniel31x13@gmail.com>
// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 3.
// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
import useCollectionStore from "@/store/collections";
import { faArrowRight, faChartSimple } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import MainLayout from "@/layouts/MainLayout";
import useLinkStore from "@/store/links";
import useTagStore from "@/store/tags";
import LinkItem from "@/components/Dashboard/LinkItem";
import Link from "next/link";
import CollectionItem from "@/components/Dashboard/CollectionItem";
import { useEffect, useState } from "react";
export default function () {
const { collections } = useCollectionStore();
const { links } = useLinkStore();
const { tags } = useTagStore();
const [sortedCollections, setSortedCollections] = useState([]);
useEffect(() => {
const collectionsWithLinkCount = collections.map((collection) => {
const linkCount = links.filter(
(link) => link.collectionId === collection.id
).length;
return { ...collection, linkCount };
});
setSortedCollections(
collectionsWithLinkCount.sort((a, b) => b.linkCount - a.linkCount) as any
);
}, [collections]);
return (
// ml-80
<MainLayout>
<div className="p-5">
<div className="flex gap-3 items-center mb-5">
<div className="flex gap-2 items-center">
<FontAwesomeIcon
icon={faChartSimple}
className="w-5 h-5 text-sky-300"
/>
<p className="text-lg text-sky-900">Dashboard</p>
</div>
</div>
<div className="flex flex-col md:flex-row md:items-center justify-evenly gap-2 mb-10">
<div className="flex items-baseline gap-2">
<p className="text-sky-500 font-bold text-6xl">{links.length}</p>
<p className="text-sky-900 text-xl">Links</p>
</div>
<div className="flex items-baseline gap-2">
<p className="text-sky-500 font-bold text-6xl">
{collections.length}
</p>
<p className="text-sky-900 text-xl">Collections</p>
</div>
<div className="flex items-baseline gap-2">
<p className="text-sky-500 font-bold text-6xl">{tags.length}</p>
<p className="text-sky-900 text-xl">Tags</p>
</div>
</div>
<div className="flex flex-col md:flex-row items-start justify-evenly gap-5">
<div className="flex flex-col gap-2 p-2 bg-sky-50 rounded-md w-full">
<div className="flex justify-between gap-2 items-baseline">
<p className="text-sky-600 text-xl mb-2">Recently added Links</p>
<Link href="/links">
<div className="text-sky-600 flex items-center gap-1">
View All
<FontAwesomeIcon
icon={faArrowRight}
className="w-4 h-4 text-sky-300"
/>
</div>
</Link>
</div>
{links
.sort(
(a, b) =>
new Date(b.createdAt).getTime() -
new Date(a.createdAt).getTime()
)
.slice(0, 5)
.map((e, i) => (
<LinkItem key={i} link={e} count={i} />
))}
</div>
<div className="flex flex-col gap-2 p-2 bg-sky-50 rounded-md w-full">
<div className="flex justify-between gap-2 items-baseline">
<p className="text-sky-600 text-xl mb-2">Top Collections</p>
<Link href="/collections">
<div className="text-sky-600 flex items-center gap-1">
View All
<FontAwesomeIcon
icon={faArrowRight}
className="w-4 h-4 text-sky-300"
/>
</div>
</Link>
</div>
{sortedCollections.map((e, i) => (
<CollectionItem key={i} collection={e} />
))}
</div>
</div>
</div>
</MainLayout>
);
}
+1 -1
View File
@@ -10,6 +10,6 @@ export default function Home() {
const router = useRouter();
useEffect(() => {
router.push("/collections");
router.push("/MainLayout");
}, []);
}
+3 -3
View File
@@ -4,7 +4,7 @@
// You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
import LinkList from "@/components/LinkList";
import Dashboard from "@/layouts/Dashboard";
import MainLayout from "@/layouts/MainLayout";
import useLinkStore from "@/store/links";
import { faBookmark } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@@ -13,7 +13,7 @@ export default function Links() {
const { links } = useLinkStore();
return (
<Dashboard>
<MainLayout>
<div className="p-5 flex flex-col gap-5 w-full">
<div className="flex gap-3 items-center">
<div className="flex gap-2 items-center">
@@ -28,6 +28,6 @@ export default function Links() {
return <LinkList key={i} link={e} count={i} />;
})}
</div>
</Dashboard>
</MainLayout>
);
}
+15 -8
View File
@@ -4,7 +4,7 @@
// You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
import LinkList from "@/components/LinkList";
import Dashboard from "@/layouts/Dashboard";
import MainLayout from "@/layouts/MainLayout";
import useLinkStore from "@/store/links";
import useSearchSettingsStore from "@/store/search";
import { ExtendedLink } from "@/types/global";
@@ -40,7 +40,7 @@ export default function Links() {
}, [searchSettings, links]);
return (
<Dashboard>
<MainLayout>
<div className="p-5 flex flex-col gap-5 w-full">
<div className="flex gap-3 items-center">
<div className="flex gap-2 items-center">
@@ -48,12 +48,19 @@ export default function Links() {
<p className="text-lg text-sky-900">Search Results</p>
</div>
</div>
{filteredLinks[0]
? filteredLinks.map((e, i) => {
return <LinkList key={i} link={e} count={i} />;
})
: "No results..."}
{filteredLinks[0] ? (
filteredLinks.map((e, i) => {
return <LinkList key={i} link={e} count={i} />;
})
) : (
<p className="text-sky-900">
Nothing found.{" "}
<span className="text-sky-500 font-bold text-xl" title="Shruggie">
¯\_()_/¯
</span>
</p>
)}
</div>
</Dashboard>
</MainLayout>
);
}
+3 -3
View File
@@ -3,7 +3,7 @@
// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
import Dashboard from "@/layouts/Dashboard";
import MainLayout from "@/layouts/MainLayout";
import { useRouter } from "next/router";
export default function () {
@@ -12,8 +12,8 @@ export default function () {
const tagId = Number(router.query.id);
return (
<Dashboard>
<MainLayout>
<div>{"HI"}</div>
</Dashboard>
</MainLayout>
);
}