Many improvements.

This commit is contained in:
Daniel
2023-03-06 00:33:20 +03:30
parent f3e104aafe
commit cff10fa9b6
19 changed files with 314 additions and 79 deletions
+10 -15
View File
@@ -1,26 +1,21 @@
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { Collection } from "@prisma/client";
import { IconProp } from "@fortawesome/fontawesome-svg-core";
import { MouseEventHandler } from "react";
interface TextObject {
name: string;
}
import Link from "next/link";
interface SidebarItemProps {
item: Collection | TextObject;
text: string;
icon: IconProp;
onClick?: MouseEventHandler;
path: string;
}
export default function ({ item, icon, onClick }: SidebarItemProps) {
export default function ({ text, icon, path }: SidebarItemProps) {
return (
<div
onClick={onClick}
className="hover:bg-gray-50 duration-100 text-sky-900 rounded my-1 p-3 cursor-pointer flex items-center gap-2"
>
<FontAwesomeIcon icon={icon} className="w-4 text-sky-300" />
<p>{item.name}</p>
</div>
<Link href={path}>
<div className="hover:bg-gray-50 duration-100 text-sky-900 rounded my-1 p-3 cursor-pointer flex items-center gap-2">
<FontAwesomeIcon icon={icon} className="w-4 text-sky-300" />
<p>{text}</p>
</div>
</Link>
);
}
+32 -7
View File
@@ -1,19 +1,20 @@
import { useSession } from "next-auth/react";
import ClickAwayHandler from "@/components/ClickAwayHandler";
import { useState } from "react";
import useCollectionSlice from "@/store/collection";
import useCollectionSlice from "@/store/collections";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faUserCircle } from "@fortawesome/free-regular-svg-icons";
import {
faPlus,
faChevronDown,
faFolder,
faBoxesStacked,
faHashtag,
faBox,
faTag,
faBookmark,
} from "@fortawesome/free-solid-svg-icons";
import SidebarItem from "./SidebarItem";
import useTagSlice from "@/store/tags";
import Link from "next/link";
export default function () {
const { data: session } = useSession();
@@ -51,9 +52,19 @@ export default function () {
</div>
</div>
<SidebarItem item={{ name: "All Links" }} icon={faBookmark} />
<Link href="links">
<div className="hover:bg-gray-50 duration-100 text-sky-900 rounded my-1 p-3 cursor-pointer flex items-center gap-2">
<FontAwesomeIcon icon={faBookmark} className="w-4 text-sky-300" />
<p>All Links</p>
</div>
</Link>
<SidebarItem item={{ name: "All Collections" }} icon={faBoxesStacked} />
<Link href="/collections">
<div className="hover:bg-gray-50 duration-100 text-sky-900 rounded my-1 p-3 cursor-pointer flex items-center gap-2">
<FontAwesomeIcon icon={faBox} className="w-4 text-sky-300" />
<p>All Collections</p>
</div>
</Link>
<div className="text-gray-500 flex items-center justify-between mt-5">
<p className="text-sm p-3">Collections</p>
@@ -80,7 +91,14 @@ export default function () {
</div>
<div>
{collections.map((e, i) => {
return <SidebarItem key={i} item={e} icon={faFolder} />;
return (
<SidebarItem
key={i}
text={e.name}
icon={faFolder}
path={`/collections/${e.id}`}
/>
);
})}
</div>
<div className="text-gray-500 flex items-center justify-between mt-5">
@@ -88,7 +106,14 @@ export default function () {
</div>
<div>
{tags.map((e, i) => {
return <SidebarItem key={i} item={e} icon={faHashtag} />;
return (
<SidebarItem
key={i}
text={e.name}
icon={faTag}
path={`/tags/${e.id}`}
/>
);
})}
</div>
</div>