From 35551f7187587f187f59ab22c0223d0362970e2e Mon Sep 17 00:00:00 2001 From: Jason Warren Date: Tue, 17 Dec 2024 21:20:37 +0000 Subject: [PATCH 1/5] copy add action button to NextActionsDisplay --- .../needs/next-actions/components/NextActionsDisplay.tsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/app/needs/next-actions/components/NextActionsDisplay.tsx b/src/app/needs/next-actions/components/NextActionsDisplay.tsx index 031ac491..9386ab7b 100644 --- a/src/app/needs/next-actions/components/NextActionsDisplay.tsx +++ b/src/app/needs/next-actions/components/NextActionsDisplay.tsx @@ -254,6 +254,13 @@ export default function NextActionsDisplay() { No next actions available for this need.

) } + + ); })} From b0bd13e7a4e0cae4c9566123abf94b2e56eeb63d Mon Sep 17 00:00:00 2001 From: Jason Warren Date: Tue, 17 Dec 2024 21:22:08 +0000 Subject: [PATCH 2/5] remove button and import from NextActionsDisplay --- .../needs/next-actions/components/NextActionsSection.tsx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/app/needs/next-actions/components/NextActionsSection.tsx b/src/app/needs/next-actions/components/NextActionsSection.tsx index efaad9d4..9b63dea5 100644 --- a/src/app/needs/next-actions/components/NextActionsSection.tsx +++ b/src/app/needs/next-actions/components/NextActionsSection.tsx @@ -5,7 +5,6 @@ import Button from "@/ui/shared/Button"; import Modal from "@/ui/shared/Modal"; import { NeedDocument } from "./NextActionsDisplay"; import { NextActionDocument } from "./NextActionsDisplay"; -import { PlusCircleIcon } from "@heroicons/react/24/outline"; interface SectionProps { need: NeedDocument; @@ -58,13 +57,6 @@ export default function NextActionsSection({ /> ); })} - - Date: Tue, 17 Dec 2024 21:22:41 +0000 Subject: [PATCH 3/5] import icon --- src/app/needs/next-actions/components/NextActionsDisplay.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/needs/next-actions/components/NextActionsDisplay.tsx b/src/app/needs/next-actions/components/NextActionsDisplay.tsx index 9386ab7b..6cef506d 100644 --- a/src/app/needs/next-actions/components/NextActionsDisplay.tsx +++ b/src/app/needs/next-actions/components/NextActionsDisplay.tsx @@ -7,6 +7,7 @@ import changeCase from "@/lib/utils/changeCase"; import NextActionsSection from "./NextActionsSection"; import Button from "@/ui/shared/Button"; import Modal from "@/ui/shared/Modal"; +import { PlusCircleIcon } from "@heroicons/react/24/outline"; export interface NeedDocument { id: string; From 465821959b013605afba98a1a445b62103a82eec Mon Sep 17 00:00:00 2001 From: Jason Warren Date: Wed, 18 Dec 2024 10:38:18 +0000 Subject: [PATCH 4/5] chore: :rewind: --- .../needs/next-actions/components/NextActionsDisplay.tsx | 1 + .../needs/next-actions/components/NextActionsSection.tsx | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/app/needs/next-actions/components/NextActionsDisplay.tsx b/src/app/needs/next-actions/components/NextActionsDisplay.tsx index 9386ab7b..6cef506d 100644 --- a/src/app/needs/next-actions/components/NextActionsDisplay.tsx +++ b/src/app/needs/next-actions/components/NextActionsDisplay.tsx @@ -7,6 +7,7 @@ import changeCase from "@/lib/utils/changeCase"; import NextActionsSection from "./NextActionsSection"; import Button from "@/ui/shared/Button"; import Modal from "@/ui/shared/Modal"; +import { PlusCircleIcon } from "@heroicons/react/24/outline"; export interface NeedDocument { id: string; diff --git a/src/app/needs/next-actions/components/NextActionsSection.tsx b/src/app/needs/next-actions/components/NextActionsSection.tsx index efaad9d4..9b63dea5 100644 --- a/src/app/needs/next-actions/components/NextActionsSection.tsx +++ b/src/app/needs/next-actions/components/NextActionsSection.tsx @@ -5,7 +5,6 @@ import Button from "@/ui/shared/Button"; import Modal from "@/ui/shared/Modal"; import { NeedDocument } from "./NextActionsDisplay"; import { NextActionDocument } from "./NextActionsDisplay"; -import { PlusCircleIcon } from "@heroicons/react/24/outline"; interface SectionProps { need: NeedDocument; @@ -58,13 +57,6 @@ export default function NextActionsSection({ /> ); })} - - Date: Wed, 18 Dec 2024 11:02:17 +0000 Subject: [PATCH 5/5] fix: :recycle: styling & info pages --- .../components/NextActionsDisplay.tsx | 30 ++------ .../components/NextActionsSection.tsx | 77 ++++++++++++------- src/app/toolkit/info/categories-info/page.tsx | 2 +- src/app/toolkit/info/page.tsx | 2 +- 4 files changed, 60 insertions(+), 51 deletions(-) diff --git a/src/app/needs/next-actions/components/NextActionsDisplay.tsx b/src/app/needs/next-actions/components/NextActionsDisplay.tsx index 6cef506d..a33774bd 100644 --- a/src/app/needs/next-actions/components/NextActionsDisplay.tsx +++ b/src/app/needs/next-actions/components/NextActionsDisplay.tsx @@ -7,7 +7,6 @@ import changeCase from "@/lib/utils/changeCase"; import NextActionsSection from "./NextActionsSection"; import Button from "@/ui/shared/Button"; import Modal from "@/ui/shared/Modal"; -import { PlusCircleIcon } from "@heroicons/react/24/outline"; export interface NeedDocument { id: string; @@ -240,28 +239,13 @@ export default function NextActionsDisplay() { To meet a need for {changeCase(need.name, "lower")}, which actions can you take next? - { actions.length > 0 - ? ( - - ) - : (

- No next actions available for this need. -

) - } - - + ); })} diff --git a/src/app/needs/next-actions/components/NextActionsSection.tsx b/src/app/needs/next-actions/components/NextActionsSection.tsx index 9b63dea5..6746b69f 100644 --- a/src/app/needs/next-actions/components/NextActionsSection.tsx +++ b/src/app/needs/next-actions/components/NextActionsSection.tsx @@ -5,6 +5,7 @@ import Button from "@/ui/shared/Button"; import Modal from "@/ui/shared/Modal"; import { NeedDocument } from "./NextActionsDisplay"; import { NextActionDocument } from "./NextActionsDisplay"; +import { PlusCircleIcon } from "@heroicons/react/24/outline"; interface SectionProps { need: NeedDocument; @@ -37,36 +38,60 @@ export default function NextActionsSection({ return ( <> -
- {actions.map((action) => { - const highlighted = new Date(action.selectedExpiry) > new Date(); + { actions.length > 0 + ?
+ {actions.map((action) => { + const highlighted = new Date(action.selectedExpiry) > new Date(); - return ( -
+ return ( + +
+ : ( +
+

+ No next actions available for this need. +

+ + +
+ ) + } { setNewAction(""); setModalOpen(false); diff --git a/src/app/toolkit/info/categories-info/page.tsx b/src/app/toolkit/info/categories-info/page.tsx index ad5ca5a5..c4f463e3 100644 --- a/src/app/toolkit/info/categories-info/page.tsx +++ b/src/app/toolkit/info/categories-info/page.tsx @@ -26,7 +26,7 @@ export default function CategoriesInfoPage() { return ( <> {/* Header */} -
+
{/* Subheader */} diff --git a/src/app/toolkit/info/page.tsx b/src/app/toolkit/info/page.tsx index aab2f83c..bd5aa918 100644 --- a/src/app/toolkit/info/page.tsx +++ b/src/app/toolkit/info/page.tsx @@ -57,7 +57,7 @@ export default function ToolkitInfoPage() {
- Go to Tabs + Go to Tags