From c583eb9a6d4026c372a4133849c1d60ce4c60098 Mon Sep 17 00:00:00 2001 From: zmeyer44 Date: Fri, 27 Oct 2023 13:10:07 -0400 Subject: [PATCH] updated event feed --- app/(app)/_layout/Sidebar.tsx | 19 ++-- app/(app)/_layout/index.tsx | 5 +- .../explore/_components/CalendarSection.tsx | 99 +++++++++++++++++++ app/(app)/explore/page.tsx | 58 +++++++++++ .../Cards/CalendarEvent/LargeFeedCard.tsx | 89 +++++++++++++++++ components/Cards/CalendarEvent/index.tsx | 2 +- components/ProfileContainers/AvatarStack.tsx | 57 +++++++++++ containers/Article/index.tsx | 6 +- lib/utils/dates.ts | 44 ++++----- 9 files changed, 341 insertions(+), 38 deletions(-) create mode 100644 app/(app)/explore/_components/CalendarSection.tsx create mode 100644 app/(app)/explore/page.tsx create mode 100644 components/Cards/CalendarEvent/LargeFeedCard.tsx create mode 100644 components/ProfileContainers/AvatarStack.tsx diff --git a/app/(app)/_layout/Sidebar.tsx b/app/(app)/_layout/Sidebar.tsx index 8f31f05..c230e3d 100644 --- a/app/(app)/_layout/Sidebar.tsx +++ b/app/(app)/_layout/Sidebar.tsx @@ -22,6 +22,7 @@ import { import dynamic from "next/dynamic"; import { useModal } from "@/app/_providers/modal/provider"; import { IconType } from "react-icons"; +import { usePathname } from "next/navigation"; const ZapPickerModal = dynamic(() => import("@/components/Modals/ZapPicker"), { ssr: false, @@ -42,7 +43,6 @@ type NavigationElement = { name: string; label: string; icon: IconType; - current: boolean; active: boolean; } & (NavigationLink | NavigationButton); const flockstrEvent = { @@ -61,6 +61,7 @@ const flockstrEvent = { export default function Sidebar() { const modal = useModal(); + const pathname = usePathname(); const navigation: NavigationElement[] = [ { @@ -69,16 +70,14 @@ export default function Sidebar() { label: "Home", icon: RiHome6Fill, type: "link", - current: true, active: true, }, { - href: "", + href: "/explore", name: "explore", label: "Explore", icon: RiCompassLine, type: "link", - current: false, active: false, }, { @@ -87,7 +86,6 @@ export default function Sidebar() { label: "Messages", icon: RiQuestionAnswerLine, type: "link", - current: false, active: false, }, { @@ -96,13 +94,12 @@ export default function Sidebar() { label: "Zap Flockstr", icon: HiOutlineLightningBolt, type: "button", - current: false, active: true, }, ]; return (