From 86545acade1c4e2e5d174059be025c8a749697d1 Mon Sep 17 00:00:00 2001
From: Masa <120774862+Masahiro-jobson@users.noreply.github.com>
Date: Mon, 6 Apr 2026 15:42:01 +1000
Subject: [PATCH 01/34] =?UTF-8?q?=F0=9F=8E=A8=20move=20landing=20page=20la?=
=?UTF-8?q?yout=20w/=20placeholders=20#132?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/[lang]/page.tsx | 3 ++
src/components/Dashboard/Landing/Landing.tsx | 21 ++++++--
.../EventsSection/EventsSection.tsx | 3 ++
src/components/EventsSection/index.ts | 1 +
.../ProcessSteps/ProcessStepsSection.tsx | 3 ++
src/components/ProcessSteps/index.ts | 1 +
src/components/RacSection/RacSection.tsx | 3 ++
src/components/RacSection/index.ts | 1 +
.../VolunteeringOpportunities/Header.tsx | 10 ++++
.../VolunteeringOpportunitiesSection.tsx | 3 ++
.../VolunteeringOpportunities/index.ts | 1 +
.../VolunteeringOpportunities/types.ts | 48 +++++++++++++++++++
12 files changed, 94 insertions(+), 4 deletions(-)
create mode 100644 src/components/EventsSection/EventsSection.tsx
create mode 100644 src/components/EventsSection/index.ts
create mode 100644 src/components/ProcessSteps/ProcessStepsSection.tsx
create mode 100644 src/components/ProcessSteps/index.ts
create mode 100644 src/components/RacSection/RacSection.tsx
create mode 100644 src/components/RacSection/index.ts
create mode 100644 src/components/VolunteeringOpportunities/Header.tsx
create mode 100644 src/components/VolunteeringOpportunities/VolunteeringOpportunitiesSection.tsx
create mode 100644 src/components/VolunteeringOpportunities/index.ts
create mode 100644 src/components/VolunteeringOpportunities/types.ts
diff --git a/src/app/[lang]/page.tsx b/src/app/[lang]/page.tsx
index 393ce837..4772cefc 100644
--- a/src/app/[lang]/page.tsx
+++ b/src/app/[lang]/page.tsx
@@ -1,3 +1,4 @@
+import { Landing } from "@/components/Dashboard/Landing";
import Link from "next/link";
import styles from "./page.module.css";
@@ -19,6 +20,8 @@ export default function Home() {
Opportunity form
+ {/* Reders Landing Layout */}
+
diff --git a/src/components/Dashboard/Landing/Landing.tsx b/src/components/Dashboard/Landing/Landing.tsx
index 4647e467..0674472f 100644
--- a/src/components/Dashboard/Landing/Landing.tsx
+++ b/src/components/Dashboard/Landing/Landing.tsx
@@ -1,11 +1,17 @@
"use client";
-import { AppContainer } from "@/components/styled/container";
-import { Hero } from "./Hero";
-import { VolunteeringCategoriesSection } from "@/components/VolunteeringCategories";
+import { EventsSection } from "@/components/EventsSection";
+import { FooterPartnersSection } from "@/components/FooterPartners";
import { Header } from "@/components/Header";
import N4DLogo from "@/components/Layout/PageLayout/logos/N4DLogo";
-import { useScreenType } from "@/context/DeviceContext";
+import { ProcessStepsSection } from "@/components/ProcessSteps";
+import { RacSection } from "@/components/RacSection";
+import { AppContainer } from "@/components/styled/container";
+import { VolunteeringCategoriesSection } from "@/components/VolunteeringCategories";
+import { VolunteeringOpportunitiesSection } from "@/components/VolunteeringOpportunities";
import { ScreenTypes } from "@/config/constants";
+import { useScreenType } from "@/context/DeviceContext";
+import { Hero } from "./Hero";
+
export function Landing() {
const screenType = useScreenType();
const isBurgerMenu = screenType === ScreenTypes.MOBILE;
@@ -20,6 +26,13 @@ export function Landing() {
/>
+ {/* Transferred Components */}
+
+
+
+
+ {/* Render the existing component like the previous */}
+
);
}
diff --git a/src/components/EventsSection/EventsSection.tsx b/src/components/EventsSection/EventsSection.tsx
new file mode 100644
index 00000000..af491597
--- /dev/null
+++ b/src/components/EventsSection/EventsSection.tsx
@@ -0,0 +1,3 @@
+export function EventsSection() {
+ return Events Section (Coming in #137)
;
+}
diff --git a/src/components/EventsSection/index.ts b/src/components/EventsSection/index.ts
new file mode 100644
index 00000000..73bc4895
--- /dev/null
+++ b/src/components/EventsSection/index.ts
@@ -0,0 +1 @@
+export * from "./EventsSection";
diff --git a/src/components/ProcessSteps/ProcessStepsSection.tsx b/src/components/ProcessSteps/ProcessStepsSection.tsx
new file mode 100644
index 00000000..1d8a3674
--- /dev/null
+++ b/src/components/ProcessSteps/ProcessStepsSection.tsx
@@ -0,0 +1,3 @@
+export function ProcessStepsSection() {
+ return Process Steps (Coming Soon in #136)
;
+}
diff --git a/src/components/ProcessSteps/index.ts b/src/components/ProcessSteps/index.ts
new file mode 100644
index 00000000..fb12578f
--- /dev/null
+++ b/src/components/ProcessSteps/index.ts
@@ -0,0 +1 @@
+export * from "./ProcessStepsSection";
diff --git a/src/components/RacSection/RacSection.tsx b/src/components/RacSection/RacSection.tsx
new file mode 100644
index 00000000..fc8fa1e3
--- /dev/null
+++ b/src/components/RacSection/RacSection.tsx
@@ -0,0 +1,3 @@
+export function RacSection() {
+ return Rac Section (Coming Soon)
;
+}
diff --git a/src/components/RacSection/index.ts b/src/components/RacSection/index.ts
new file mode 100644
index 00000000..8aea6ae7
--- /dev/null
+++ b/src/components/RacSection/index.ts
@@ -0,0 +1 @@
+export * from "./RacSection";
diff --git a/src/components/VolunteeringOpportunities/Header.tsx b/src/components/VolunteeringOpportunities/Header.tsx
new file mode 100644
index 00000000..1107b3f2
--- /dev/null
+++ b/src/components/VolunteeringOpportunities/Header.tsx
@@ -0,0 +1,10 @@
+import { useTranslation } from "react-i18next";
+import { Heading2 } from "../styled/text";
+
+function Header() {
+ const { t } = useTranslation();
+
+ return {t(`homepage.volunteeringOpportunities.header`)};
+}
+
+export default Header;
diff --git a/src/components/VolunteeringOpportunities/VolunteeringOpportunitiesSection.tsx b/src/components/VolunteeringOpportunities/VolunteeringOpportunitiesSection.tsx
new file mode 100644
index 00000000..19889cd4
--- /dev/null
+++ b/src/components/VolunteeringOpportunities/VolunteeringOpportunitiesSection.tsx
@@ -0,0 +1,3 @@
+export function VolunteeringOpportunitiesSection() {
+ return Opportunities (Coming Soon in #135)
;
+}
diff --git a/src/components/VolunteeringOpportunities/index.ts b/src/components/VolunteeringOpportunities/index.ts
new file mode 100644
index 00000000..994e1e14
--- /dev/null
+++ b/src/components/VolunteeringOpportunities/index.ts
@@ -0,0 +1 @@
+export * from "./VolunteeringOpportunitiesSection";
diff --git a/src/components/VolunteeringOpportunities/types.ts b/src/components/VolunteeringOpportunities/types.ts
new file mode 100644
index 00000000..44f2c397
--- /dev/null
+++ b/src/components/VolunteeringOpportunities/types.ts
@@ -0,0 +1,48 @@
+import { OpportunityType, TranslatedIntoType } from "need4deed-sdk";
+
+export interface Opportunity {
+ accompanyingDate: Date | null;
+ accompanyingInfo: string | null;
+ accompanyingTranslation: string;
+ activities: string[];
+ createdAt: Date;
+ datetime: string | null;
+ id: string;
+ languages: string[];
+ locations: string[];
+ opportunityType: OpportunityType;
+ schedule: string | null;
+ skills: string[];
+ status: string;
+ timeslots: Record[];
+ title: string;
+ updatedAt: Date;
+ voInformation: string;
+ categoryId: number | null;
+ category: string;
+ lastEditedTimeNotion: Date;
+ defaultMainCommunication: string;
+}
+
+export interface OpportunityApi {
+ accomp_datetime: string | null;
+ accomp_information: string | null;
+ accomp_translation?: TranslatedIntoType;
+ activities: string[];
+ berlin_locations: string[];
+ created_at: string;
+ datetime_str: string | null;
+ id: string;
+ languages: string[];
+ opportunity_type: OpportunityType;
+ schedule_str: string | null;
+ skills: string[];
+ status: string;
+ timeslots: Record[];
+ title: string;
+ updated_at: string;
+ vo_information: string;
+ category_id: number | null;
+ category: string;
+ last_edited_time_notion: string;
+}
From 268af1f3281f7b5941686757e033f7c573326d35 Mon Sep 17 00:00:00 2001
From: Masa <120774862+Masahiro-jobson@users.noreply.github.com>
Date: Mon, 13 Apr 2026 11:24:41 +1000
Subject: [PATCH 02/34] =?UTF-8?q?=F0=9F=8E=A8=20feat:=20layout=20structure?=
=?UTF-8?q?=20#132?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/[lang]/dashboard/page.tsx | 2 +-
src/app/[lang]/page.tsx | 2 +-
.../VolunteeringOpportunities/Header.tsx | 10 ----
.../VolunteeringOpportunitiesSection.tsx | 3 --
.../VolunteeringOpportunities/index.ts | 1 -
.../VolunteeringOpportunities/types.ts | 48 -------------------
.../Landing/Hero/Content.tsx | 0
.../Landing/Hero/Hero.tsx | 0
.../Landing/Hero/index.ts | 0
.../Landing/Landing.tsx | 0
.../{Dashboard => Website}/Landing/index.ts | 0
11 files changed, 2 insertions(+), 64 deletions(-)
delete mode 100644 src/components/VolunteeringOpportunities/Header.tsx
delete mode 100644 src/components/VolunteeringOpportunities/VolunteeringOpportunitiesSection.tsx
delete mode 100644 src/components/VolunteeringOpportunities/index.ts
delete mode 100644 src/components/VolunteeringOpportunities/types.ts
rename src/components/{Dashboard => Website}/Landing/Hero/Content.tsx (100%)
rename src/components/{Dashboard => Website}/Landing/Hero/Hero.tsx (100%)
rename src/components/{Dashboard => Website}/Landing/Hero/index.ts (100%)
rename src/components/{Dashboard => Website}/Landing/Landing.tsx (100%)
rename src/components/{Dashboard => Website}/Landing/index.ts (100%)
diff --git a/src/app/[lang]/dashboard/page.tsx b/src/app/[lang]/dashboard/page.tsx
index 7bce77a0..61783edf 100644
--- a/src/app/[lang]/dashboard/page.tsx
+++ b/src/app/[lang]/dashboard/page.tsx
@@ -1,4 +1,4 @@
-import { Landing } from "@/components/Dashboard/Landing";
+import { Landing } from "@/components/Website/Landing";
export default function DashboardLandingPage() {
return ;
diff --git a/src/app/[lang]/page.tsx b/src/app/[lang]/page.tsx
index 4772cefc..393a42cc 100644
--- a/src/app/[lang]/page.tsx
+++ b/src/app/[lang]/page.tsx
@@ -1,4 +1,4 @@
-import { Landing } from "@/components/Dashboard/Landing";
+import { Landing } from "@/components/Website/Landing";
import Link from "next/link";
import styles from "./page.module.css";
diff --git a/src/components/VolunteeringOpportunities/Header.tsx b/src/components/VolunteeringOpportunities/Header.tsx
deleted file mode 100644
index 1107b3f2..00000000
--- a/src/components/VolunteeringOpportunities/Header.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { Heading2 } from "../styled/text";
-
-function Header() {
- const { t } = useTranslation();
-
- return {t(`homepage.volunteeringOpportunities.header`)};
-}
-
-export default Header;
diff --git a/src/components/VolunteeringOpportunities/VolunteeringOpportunitiesSection.tsx b/src/components/VolunteeringOpportunities/VolunteeringOpportunitiesSection.tsx
deleted file mode 100644
index 19889cd4..00000000
--- a/src/components/VolunteeringOpportunities/VolunteeringOpportunitiesSection.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export function VolunteeringOpportunitiesSection() {
- return Opportunities (Coming Soon in #135)
;
-}
diff --git a/src/components/VolunteeringOpportunities/index.ts b/src/components/VolunteeringOpportunities/index.ts
deleted file mode 100644
index 994e1e14..00000000
--- a/src/components/VolunteeringOpportunities/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./VolunteeringOpportunitiesSection";
diff --git a/src/components/VolunteeringOpportunities/types.ts b/src/components/VolunteeringOpportunities/types.ts
deleted file mode 100644
index 44f2c397..00000000
--- a/src/components/VolunteeringOpportunities/types.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { OpportunityType, TranslatedIntoType } from "need4deed-sdk";
-
-export interface Opportunity {
- accompanyingDate: Date | null;
- accompanyingInfo: string | null;
- accompanyingTranslation: string;
- activities: string[];
- createdAt: Date;
- datetime: string | null;
- id: string;
- languages: string[];
- locations: string[];
- opportunityType: OpportunityType;
- schedule: string | null;
- skills: string[];
- status: string;
- timeslots: Record[];
- title: string;
- updatedAt: Date;
- voInformation: string;
- categoryId: number | null;
- category: string;
- lastEditedTimeNotion: Date;
- defaultMainCommunication: string;
-}
-
-export interface OpportunityApi {
- accomp_datetime: string | null;
- accomp_information: string | null;
- accomp_translation?: TranslatedIntoType;
- activities: string[];
- berlin_locations: string[];
- created_at: string;
- datetime_str: string | null;
- id: string;
- languages: string[];
- opportunity_type: OpportunityType;
- schedule_str: string | null;
- skills: string[];
- status: string;
- timeslots: Record[];
- title: string;
- updated_at: string;
- vo_information: string;
- category_id: number | null;
- category: string;
- last_edited_time_notion: string;
-}
diff --git a/src/components/Dashboard/Landing/Hero/Content.tsx b/src/components/Website/Landing/Hero/Content.tsx
similarity index 100%
rename from src/components/Dashboard/Landing/Hero/Content.tsx
rename to src/components/Website/Landing/Hero/Content.tsx
diff --git a/src/components/Dashboard/Landing/Hero/Hero.tsx b/src/components/Website/Landing/Hero/Hero.tsx
similarity index 100%
rename from src/components/Dashboard/Landing/Hero/Hero.tsx
rename to src/components/Website/Landing/Hero/Hero.tsx
diff --git a/src/components/Dashboard/Landing/Hero/index.ts b/src/components/Website/Landing/Hero/index.ts
similarity index 100%
rename from src/components/Dashboard/Landing/Hero/index.ts
rename to src/components/Website/Landing/Hero/index.ts
diff --git a/src/components/Dashboard/Landing/Landing.tsx b/src/components/Website/Landing/Landing.tsx
similarity index 100%
rename from src/components/Dashboard/Landing/Landing.tsx
rename to src/components/Website/Landing/Landing.tsx
diff --git a/src/components/Dashboard/Landing/index.ts b/src/components/Website/Landing/index.ts
similarity index 100%
rename from src/components/Dashboard/Landing/index.ts
rename to src/components/Website/Landing/index.ts
From a9abe27e2c982c6c84ee3cd0729ffc3a14b61189 Mon Sep 17 00:00:00 2001
From: ivannissimrch
Date: Tue, 14 Apr 2026 07:32:46 -0400
Subject: [PATCH 03/34] =?UTF-8?q?=F0=9F=90=9B=20Add=20missing=20favicon.ic?=
=?UTF-8?q?o=20to=20fix=20i18next=20language=20log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/favicon.ico | Bin 0 -> 5023 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 public/favicon.ico
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..3b69795a9851a7b2bf0fee2b637113ba3031fce9
GIT binary patch
literal 5023
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
literal 0
HcmV?d00001
From 8ac4be1fdbed35dc1335f8afac8d70f6a7337dee Mon Sep 17 00:00:00 2001
From: Rodrigo Louro
Date: Tue, 14 Apr 2026 17:08:12 +0200
Subject: [PATCH 04/34] Fix Opportunity card: Schedule #259
Fix Opportunity card: Schedule #259
---
public/locales/de/translations.json | 2 +
public/locales/en/translations.json | 2 +
.../OpportunityDetailsDisplay.tsx | 29 +++++-
.../OpportunityDetailsEdit.tsx | 92 ++++++++++++++-----
.../opportunityDetailsSchema.ts | 58 ++++++------
.../sections/OpportunityDetails/styles.ts | 47 ++++++++++
.../common/DatePicker/DatePickerWithLabel.tsx | 10 +-
7 files changed, 184 insertions(+), 56 deletions(-)
diff --git a/public/locales/de/translations.json b/public/locales/de/translations.json
index fdb50979..f259cbf1 100644
--- a/public/locales/de/translations.json
+++ b/public/locales/de/translations.json
@@ -1064,6 +1064,8 @@
"mainCommunication": "Hauptkommunikation",
"residentsSpeak": "Bewohner sprechen",
"schedule": "Zeitplan",
+ "eventDate": "Veranstaltungsdatum",
+ "eventTime": "Veranstaltungszeit",
"numberOfVolunteers": "Anzahl der Freiwilligen",
"activities": "Aktivitäten",
"skills": "Fähigkeiten & Erfahrung",
diff --git a/public/locales/en/translations.json b/public/locales/en/translations.json
index d2c8212f..d7af1352 100644
--- a/public/locales/en/translations.json
+++ b/public/locales/en/translations.json
@@ -1063,6 +1063,8 @@
"mainCommunication": "Main communication",
"residentsSpeak": "Residents speak",
"schedule": "Schedule",
+ "eventDate": "Event date",
+ "eventTime": "Event time",
"numberOfVolunteers": "Number of volunteers",
"activities": "Activities",
"skills": "Skills & experience",
diff --git a/src/components/Dashboard/Profile/sections/OpportunityDetails/OpportunityDetailsDisplay.tsx b/src/components/Dashboard/Profile/sections/OpportunityDetails/OpportunityDetailsDisplay.tsx
index a04f44ea..ddc77ad9 100644
--- a/src/components/Dashboard/Profile/sections/OpportunityDetails/OpportunityDetailsDisplay.tsx
+++ b/src/components/Dashboard/Profile/sections/OpportunityDetails/OpportunityDetailsDisplay.tsx
@@ -2,11 +2,12 @@ import { EmptyPlaceholder } from "@/components/core/common/EmptyPlaceholder";
import { Tags } from "@/components/core/common/Tags";
import { formatAvailability } from "@/components/Dashboard/Profile/sections/VolunteerProfile/formatters";
import { EditableField } from "@/components/EditableField/EditableField";
-import { ApiOpportunityGet, Lang, LangPurpose } from "need4deed-sdk";
+import { EMPTY_PLACEHOLDER_VALUE } from "@/config/constants";
+import { ApiOpportunityGet, Lang, LangPurpose, VolunteerStateTypeType } from "need4deed-sdk";
import { useTranslation } from "react-i18next";
import { FormDetails } from "../shared/styles";
import { extractOptionTitles, formatLanguagesByPurpose } from "./formatters";
-import { FieldRow, TagsValue } from "./styles";
+import { DateFieldRow, FieldRow, TagsValue } from "./styles";
import { OpportunityWithDetails } from "./types";
type Props = {
@@ -19,6 +20,8 @@ export function OpportunityDetailsDisplay({ opportunity }: Props) {
const opp = opportunity as OpportunityWithDetails;
const prefix = "dashboard.opportunityProfile.opportunityDetails";
+ const isEventType = opp.volunteerType === VolunteerStateTypeType.EVENTS;
+
const mainCommunication = formatLanguagesByPurpose(opp.languages, LangPurpose.GENERAL, t);
const residentsSpeak = formatLanguagesByPurpose(opp.languages, LangPurpose.RECIPIENT, t);
const schedule = formatAvailability(opp.availability, t);
@@ -51,7 +54,27 @@ export function OpportunityDetailsDisplay({ opportunity }: Props) {
setValue={() => {}}
/>
- {}} />
+ {isEventType ? (
+ <>
+
+
+ {EMPTY_PLACEHOLDER_VALUE}
+
+
+
+
+ {EMPTY_PLACEHOLDER_VALUE}
+
+
+ ) : (
+ {}}
+ />
+ )}
String(a.id)),
skills: opp.skills.map((s) => String(s.id)),
},
@@ -136,24 +143,67 @@ export function OpportunityDetailsEdit({ opportunity, onCancel }: Props) {
)}
/>
- (
-
-
-
-
- {fieldState.error?.message &&
}
-
+
+ {fieldState.error?.message &&
}
+
Welcome to your Dashboard!
;
+import { DashboardHome } from "@/components/Dashboard";
+
+export default function DashboardPage() {
+ return ;
}
diff --git a/src/components/Login/LoginController.tsx b/src/components/Login/LoginController.tsx
index 2c14de1b..001e529a 100644
--- a/src/components/Login/LoginController.tsx
+++ b/src/components/Login/LoginController.tsx
@@ -14,7 +14,7 @@ export function LoginController() {
useEffect(() => {
if (!(user && "role" in user)) return;
const path =
- user.role !== UserRole.USER ? `/${language}/dashboard/home?role=${user.role}&userId=${user.id}` : `/${language}`;
+ user.role !== UserRole.USER ? `/${language}/dashboard?role=${user.role}&userId=${user.id}` : `/${language}`;
router.push(path);
}, [user, language, router]);
diff --git a/src/config/constants.ts b/src/config/constants.ts
index 77dfc648..ede93b61 100644
--- a/src/config/constants.ts
+++ b/src/config/constants.ts
@@ -52,7 +52,7 @@ export const defaultAvatarURL = "head-silhouette.webp";
export const defaultAvatarVolunteerProfile = "all_genders_avatar.png";
export enum DashboardRoutes {
- Home = "/dashboard/home",
+ Home = "/dashboard",
Volunteers = "/dashboard/volunteers",
Opportunities = "/dashboard/opportunities",
Agents = "/dashboard/agents",
From 57c32f8e1bf3be27129d1c0cf99b75c5aeeed106 Mon Sep 17 00:00:00 2001
From: ivannissimrch
Date: Sun, 12 Apr 2026 12:12:43 -0400
Subject: [PATCH 12/34] fix: save button and checkbox uncheck in opportunity
details (#289)
---
.../sections/OpportunityDetails/opportunityDetailsSchema.ts | 2 +-
src/components/EditableField/EditableField.tsx | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/components/Dashboard/Profile/sections/OpportunityDetails/opportunityDetailsSchema.ts b/src/components/Dashboard/Profile/sections/OpportunityDetails/opportunityDetailsSchema.ts
index b7b16cff..2c56fb2e 100644
--- a/src/components/Dashboard/Profile/sections/OpportunityDetails/opportunityDetailsSchema.ts
+++ b/src/components/Dashboard/Profile/sections/OpportunityDetails/opportunityDetailsSchema.ts
@@ -47,7 +47,7 @@ export const createOpportunityDetailsSchema = (t: (key: string) => string) =>
eventDate: z.date().nullable().optional(),
eventTime: z.string().optional(),
activities: z.array(z.string()).min(1, t(`${i18nPrefix}.activitiesRequired`)),
- skills: z.array(z.string()).min(1, t(`${i18nPrefix}.skillsRequired`)),
+ skills: z.array(z.string()),
});
export type OpportunityDetailsFormData = z.infer>;
diff --git a/src/components/EditableField/EditableField.tsx b/src/components/EditableField/EditableField.tsx
index d01310fd..85b531f7 100644
--- a/src/components/EditableField/EditableField.tsx
+++ b/src/components/EditableField/EditableField.tsx
@@ -535,7 +535,9 @@ export const EditableField = forwardRef(function EditableField {
- // Handled by parent OptionRow onClick
+ if (type === "checkbox-list") {
+ handleCheckboxChange(option);
+ }
}}
onClick={(e) => e.stopPropagation()}
/>
From 9104e275ebbd857bfb16e6202be1a84f7c28c582 Mon Sep 17 00:00:00 2001
From: need4deed
Date: Thu, 16 Apr 2026 17:35:05 +0200
Subject: [PATCH 13/34] fix: add missing page.module.css for tmp-home page
(broken by #292)
---
src/app/[lang]/tmp-home/page.module.css | 168 ++++++++++++++++++++++++
1 file changed, 168 insertions(+)
create mode 100644 src/app/[lang]/tmp-home/page.module.css
diff --git a/src/app/[lang]/tmp-home/page.module.css b/src/app/[lang]/tmp-home/page.module.css
new file mode 100644
index 00000000..a11c8f31
--- /dev/null
+++ b/src/app/[lang]/tmp-home/page.module.css
@@ -0,0 +1,168 @@
+.page {
+ --gray-rgb: 0, 0, 0;
+ --gray-alpha-200: rgba(var(--gray-rgb), 0.08);
+ --gray-alpha-100: rgba(var(--gray-rgb), 0.05);
+
+ --button-primary-hover: #383838;
+ --button-secondary-hover: #f2f2f2;
+
+ display: grid;
+ grid-template-rows: 20px 1fr 20px;
+ align-items: center;
+ justify-items: center;
+ min-height: 100svh;
+ padding: 80px;
+ gap: 64px;
+ font-family: var(--font-geist-sans);
+}
+
+@media (prefers-color-scheme: dark) {
+ .page {
+ --gray-rgb: 255, 255, 255;
+ --gray-alpha-200: rgba(var(--gray-rgb), 0.145);
+ --gray-alpha-100: rgba(var(--gray-rgb), 0.06);
+
+ --button-primary-hover: #ccc;
+ --button-secondary-hover: #1a1a1a;
+ }
+}
+
+.main {
+ display: flex;
+ flex-direction: column;
+ gap: 32px;
+ grid-row-start: 2;
+}
+
+.main ol {
+ font-family: var(--font-geist-mono);
+ padding-left: 0;
+ margin: 0;
+ font-size: 14px;
+ line-height: 24px;
+ letter-spacing: -0.01em;
+ list-style-position: inside;
+}
+
+.main li:not(:last-of-type) {
+ margin-bottom: 8px;
+}
+
+.main code {
+ font-family: inherit;
+ background: var(--gray-alpha-100);
+ padding: 2px 4px;
+ border-radius: 4px;
+ font-weight: 600;
+}
+
+.ctas {
+ display: flex;
+ gap: 16px;
+}
+
+.ctas a {
+ appearance: none;
+ border-radius: 128px;
+ height: 48px;
+ padding: 0 20px;
+ border: none;
+ border: 1px solid transparent;
+ transition:
+ background 0.2s,
+ color 0.2s,
+ border-color 0.2s;
+ cursor: pointer;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 16px;
+ line-height: 20px;
+ font-weight: 500;
+}
+
+a.primary {
+ background: var(--foreground);
+ color: var(--background);
+ gap: 8px;
+}
+
+a.secondary {
+ border-color: var(--gray-alpha-200);
+ min-width: 158px;
+}
+
+.footer {
+ grid-row-start: 3;
+ display: flex;
+ gap: 24px;
+}
+
+.footer a {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+}
+
+.footer img {
+ flex-shrink: 0;
+}
+
+/* Enable hover only on non-touch devices */
+@media (hover: hover) and (pointer: fine) {
+ a.primary:hover {
+ background: var(--button-primary-hover);
+ border-color: transparent;
+ }
+
+ a.secondary:hover {
+ background: var(--button-secondary-hover);
+ border-color: transparent;
+ }
+
+ .footer a:hover {
+ text-decoration: underline;
+ text-underline-offset: 4px;
+ }
+}
+
+@media (max-width: 600px) {
+ .page {
+ padding: 32px;
+ padding-bottom: 80px;
+ }
+
+ .main {
+ align-items: center;
+ }
+
+ .main ol {
+ text-align: center;
+ }
+
+ .ctas {
+ flex-direction: column;
+ }
+
+ .ctas a {
+ font-size: 14px;
+ height: 40px;
+ padding: 0 16px;
+ }
+
+ a.secondary {
+ min-width: auto;
+ }
+
+ .footer {
+ flex-wrap: wrap;
+ align-items: center;
+ justify-content: center;
+ }
+}
+
+@media (prefers-color-scheme: dark) {
+ .logo {
+ filter: invert();
+ }
+}
From 98a1a9e8c2a00a3be64dff2098b4dac1e0f2e702 Mon Sep 17 00:00:00 2001
From: ivannissimrch
Date: Thu, 16 Apr 2026 22:16:18 -0400
Subject: [PATCH 14/34] fix: prevent redirect to login on public pages
---
.gitignore | 1 +
src/app/[lang]/forms/volunteer/page.tsx | 2 +-
src/components/Header/Header.tsx | 4 +++-
src/components/Layout/DashboardLayout/DashboardLayout.tsx | 2 +-
src/components/Layout/PageLayout/PageLayout.tsx | 4 +++-
src/components/Login/Login.tsx | 2 +-
src/components/Static/About/index.tsx | 2 +-
src/components/Static/FAQs/index.tsx | 2 +-
src/components/Static/Legal/Agreement.tsx | 2 +-
src/components/Static/Legal/DataPrivacy.tsx | 2 +-
src/components/Static/Legal/LegalNotice.tsx | 2 +-
src/components/Static/RacGuidelines/index.tsx | 2 +-
src/components/Website/Landing/Landing.tsx | 1 +
13 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/.gitignore b/.gitignore
index df571b81..fb251c41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ next-env.d.ts
# dev
dev/
dev.*
+.env.local
diff --git a/src/app/[lang]/forms/volunteer/page.tsx b/src/app/[lang]/forms/volunteer/page.tsx
index 60b345c5..eedc82a2 100644
--- a/src/app/[lang]/forms/volunteer/page.tsx
+++ b/src/app/[lang]/forms/volunteer/page.tsx
@@ -4,7 +4,7 @@ import { PageLayout } from "@/components/Layout";
export default function VolunteerPage() {
return (
-
+
;
);
diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
index 49d94cf6..ac86f323 100644
--- a/src/components/Header/Header.tsx
+++ b/src/components/Header/Header.tsx
@@ -37,6 +37,7 @@ interface Props {
padding?: string;
menuItemColor: string;
burgerMenuItemColor?: string;
+ isPublicPage: boolean;
}
export function Header({
@@ -46,10 +47,11 @@ export function Header({
padding,
menuItemColor,
burgerMenuItemColor = "var(--color-midnight)",
+ isPublicPage,
}: Props) {
const { t } = useTranslation();
const [isBurgerMenuOpen, setIsBurgerMenuOpen] = useState(false);
- const user = useCurrentUser();
+ const user = useCurrentUser(!isPublicPage);
const menuItems: MenuItemType[] = [
[t("homepage.heroSection.menuItems.about"), `/${Subpage.ABOUT}`],
diff --git a/src/components/Layout/DashboardLayout/DashboardLayout.tsx b/src/components/Layout/DashboardLayout/DashboardLayout.tsx
index dfd5ac2f..62fe3a1d 100644
--- a/src/components/Layout/DashboardLayout/DashboardLayout.tsx
+++ b/src/components/Layout/DashboardLayout/DashboardLayout.tsx
@@ -8,7 +8,7 @@ interface Props {
}
export function DashboardLayout({ children, background }: Props) {
return (
-
+
{children}
diff --git a/src/components/Layout/PageLayout/PageLayout.tsx b/src/components/Layout/PageLayout/PageLayout.tsx
index 688d9d46..7cfe1a54 100644
--- a/src/components/Layout/PageLayout/PageLayout.tsx
+++ b/src/components/Layout/PageLayout/PageLayout.tsx
@@ -12,6 +12,7 @@ import { FooterPartnersSection } from "@/components/FooterPartners";
interface Props {
children: ReactNode;
background?: string;
+ isPublicPage: boolean;
}
interface PageContentHeaderContainerProps {
@@ -33,7 +34,7 @@ const PageContentHeaderContainer = styled.div`
padding-top: var(--layout-static-page-header-height);
`;
-export function PageLayout({ children, background }: Props) {
+export function PageLayout({ children, background, isPublicPage = false }: Props) {
const screenType = useScreenType();
const isBurgerMenu = screenType !== ScreenTypes.DESKTOP;
@@ -46,6 +47,7 @@ export function PageLayout({ children, background }: Props) {
height="var(--layout-static-page-header-height)"
padding="var(--layout-static-page-header-padding)"
menuItemColor="var(--color-midnight)"
+ isPublicPage={isPublicPage}
/>
{children}
diff --git a/src/components/Login/Login.tsx b/src/components/Login/Login.tsx
index 79a79e17..e5d52a62 100644
--- a/src/components/Login/Login.tsx
+++ b/src/components/Login/Login.tsx
@@ -43,7 +43,7 @@ export function Login() {
const { t } = useTranslation();
return (
-
+
diff --git a/src/components/Static/About/index.tsx b/src/components/Static/About/index.tsx
index 3494fc6f..2444db07 100644
--- a/src/components/Static/About/index.tsx
+++ b/src/components/Static/About/index.tsx
@@ -19,7 +19,7 @@ function AboutUs() {
`;
return (
-
+
{t("aboutus.aboutusHeading")}
{t("aboutus.aboutusSubheading")}
diff --git a/src/components/Static/FAQs/index.tsx b/src/components/Static/FAQs/index.tsx
index 8cc32e38..a528ae07 100644
--- a/src/components/Static/FAQs/index.tsx
+++ b/src/components/Static/FAQs/index.tsx
@@ -69,7 +69,7 @@ function FAQs() {
];
return (
-
+
{t("faqs.title")}
{faqs.map((faq) => (
diff --git a/src/components/Static/Legal/Agreement.tsx b/src/components/Static/Legal/Agreement.tsx
index 6d42d839..73eff461 100644
--- a/src/components/Static/Legal/Agreement.tsx
+++ b/src/components/Static/Legal/Agreement.tsx
@@ -33,7 +33,7 @@ export default function Agreement() {
`;
return (
-
+
{t("legal.agreement.header")}
{t("legal.agreement.para1")}
diff --git a/src/components/Static/Legal/DataPrivacy.tsx b/src/components/Static/Legal/DataPrivacy.tsx
index f0d4af5d..12bcbe24 100644
--- a/src/components/Static/Legal/DataPrivacy.tsx
+++ b/src/components/Static/Legal/DataPrivacy.tsx
@@ -27,7 +27,7 @@ function DataPrivacy() {
`;
return (
-
+
{t("legal.dataPrivacy.header")}
{t("legal.dataPrivacy.intro1")}
diff --git a/src/components/Static/Legal/LegalNotice.tsx b/src/components/Static/Legal/LegalNotice.tsx
index dcf56f05..6ee0277d 100644
--- a/src/components/Static/Legal/LegalNotice.tsx
+++ b/src/components/Static/Legal/LegalNotice.tsx
@@ -47,7 +47,7 @@ function LegalNotice() {
}
`;
return (
-
+
{t("legal.notice.header")}
diff --git a/src/components/Static/RacGuidelines/index.tsx b/src/components/Static/RacGuidelines/index.tsx
index 3bd7c1bf..dcd4005a 100644
--- a/src/components/Static/RacGuidelines/index.tsx
+++ b/src/components/Static/RacGuidelines/index.tsx
@@ -160,7 +160,7 @@ function RacGuidelines() {
const { t } = useTranslation();
return (
-
+
{t("racGuidelines.heading")}
diff --git a/src/components/Website/Landing/Landing.tsx b/src/components/Website/Landing/Landing.tsx
index 24b6f123..c724e66b 100644
--- a/src/components/Website/Landing/Landing.tsx
+++ b/src/components/Website/Landing/Landing.tsx
@@ -26,6 +26,7 @@ export function Landing({ lang }: { lang: Lang }) {
height="var(--layout-static-page-header-height)"
padding="var(--layout-static-page-header-padding)"
menuItemColor="var(--color-midnight)"
+ isPublicPage
/>
From 2c4bfccf446b9ecb9c3c07828d4a5710989bc2a4 Mon Sep 17 00:00:00 2001
From: DarrellRoberts
Date: Fri, 17 Apr 2026 13:17:56 +0200
Subject: [PATCH 15/34] adds islogin cookie state & replaces public page prop
---
src/app/[lang]/forms/volunteer/page.tsx | 2 +-
src/components/Header/Header.tsx | 4 +---
.../Layout/DashboardLayout/DashboardLayout.tsx | 2 +-
src/components/Layout/PageLayout/PageLayout.tsx | 4 +---
src/components/Login/Login.tsx | 2 +-
src/components/Login/LoginController.tsx | 10 +++++++++-
src/components/Static/About/index.tsx | 2 +-
src/components/Static/FAQs/index.tsx | 2 +-
src/components/Static/Legal/Agreement.tsx | 2 +-
src/components/Static/Legal/DataPrivacy.tsx | 2 +-
src/components/Static/Legal/LegalNotice.tsx | 2 +-
src/components/Static/RacGuidelines/index.tsx | 2 +-
src/components/Website/Landing/Landing.tsx | 1 -
src/config/constants.ts | 2 ++
src/hooks/useCurrentUser.ts | 6 +++++-
src/utils/helpers.ts | 8 ++++++++
16 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/src/app/[lang]/forms/volunteer/page.tsx b/src/app/[lang]/forms/volunteer/page.tsx
index eedc82a2..60b345c5 100644
--- a/src/app/[lang]/forms/volunteer/page.tsx
+++ b/src/app/[lang]/forms/volunteer/page.tsx
@@ -4,7 +4,7 @@ import { PageLayout } from "@/components/Layout";
export default function VolunteerPage() {
return (
-
+
;
);
diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
index ac86f323..49d94cf6 100644
--- a/src/components/Header/Header.tsx
+++ b/src/components/Header/Header.tsx
@@ -37,7 +37,6 @@ interface Props {
padding?: string;
menuItemColor: string;
burgerMenuItemColor?: string;
- isPublicPage: boolean;
}
export function Header({
@@ -47,11 +46,10 @@ export function Header({
padding,
menuItemColor,
burgerMenuItemColor = "var(--color-midnight)",
- isPublicPage,
}: Props) {
const { t } = useTranslation();
const [isBurgerMenuOpen, setIsBurgerMenuOpen] = useState(false);
- const user = useCurrentUser(!isPublicPage);
+ const user = useCurrentUser();
const menuItems: MenuItemType[] = [
[t("homepage.heroSection.menuItems.about"), `/${Subpage.ABOUT}`],
diff --git a/src/components/Layout/DashboardLayout/DashboardLayout.tsx b/src/components/Layout/DashboardLayout/DashboardLayout.tsx
index 62fe3a1d..dfd5ac2f 100644
--- a/src/components/Layout/DashboardLayout/DashboardLayout.tsx
+++ b/src/components/Layout/DashboardLayout/DashboardLayout.tsx
@@ -8,7 +8,7 @@ interface Props {
}
export function DashboardLayout({ children, background }: Props) {
return (
-
+
{children}
diff --git a/src/components/Layout/PageLayout/PageLayout.tsx b/src/components/Layout/PageLayout/PageLayout.tsx
index 7cfe1a54..688d9d46 100644
--- a/src/components/Layout/PageLayout/PageLayout.tsx
+++ b/src/components/Layout/PageLayout/PageLayout.tsx
@@ -12,7 +12,6 @@ import { FooterPartnersSection } from "@/components/FooterPartners";
interface Props {
children: ReactNode;
background?: string;
- isPublicPage: boolean;
}
interface PageContentHeaderContainerProps {
@@ -34,7 +33,7 @@ const PageContentHeaderContainer = styled.div`
padding-top: var(--layout-static-page-header-height);
`;
-export function PageLayout({ children, background, isPublicPage = false }: Props) {
+export function PageLayout({ children, background }: Props) {
const screenType = useScreenType();
const isBurgerMenu = screenType !== ScreenTypes.DESKTOP;
@@ -47,7 +46,6 @@ export function PageLayout({ children, background, isPublicPage = false }: Props
height="var(--layout-static-page-header-height)"
padding="var(--layout-static-page-header-padding)"
menuItemColor="var(--color-midnight)"
- isPublicPage={isPublicPage}
/>
{children}
diff --git a/src/components/Login/Login.tsx b/src/components/Login/Login.tsx
index e5d52a62..79a79e17 100644
--- a/src/components/Login/Login.tsx
+++ b/src/components/Login/Login.tsx
@@ -43,7 +43,7 @@ export function Login() {
const { t } = useTranslation();
return (
-
+
diff --git a/src/components/Login/LoginController.tsx b/src/components/Login/LoginController.tsx
index 2c14de1b..c84aa3cf 100644
--- a/src/components/Login/LoginController.tsx
+++ b/src/components/Login/LoginController.tsx
@@ -4,6 +4,7 @@ import { UserRole } from "need4deed-sdk";
import { useRouter } from "next/navigation";
import { useEffect, useState } from "react";
import { LoginForm } from "./LoginForm";
+import { LOGGED_IN_COOKIE } from "@/config/constants";
export function LoginController() {
const [isLoggedIn, setIsLoggedIn] = useState(false);
@@ -18,5 +19,12 @@ export function LoginController() {
router.push(path);
}, [user, language, router]);
- return setIsLoggedIn(true)} />;
+ return (
+ {
+ document.cookie = LOGGED_IN_COOKIE;
+ setIsLoggedIn(true);
+ }}
+ />
+ );
}
diff --git a/src/components/Static/About/index.tsx b/src/components/Static/About/index.tsx
index 2444db07..3494fc6f 100644
--- a/src/components/Static/About/index.tsx
+++ b/src/components/Static/About/index.tsx
@@ -19,7 +19,7 @@ function AboutUs() {
`;
return (
-
+
{t("aboutus.aboutusHeading")}
{t("aboutus.aboutusSubheading")}
diff --git a/src/components/Static/FAQs/index.tsx b/src/components/Static/FAQs/index.tsx
index a528ae07..8cc32e38 100644
--- a/src/components/Static/FAQs/index.tsx
+++ b/src/components/Static/FAQs/index.tsx
@@ -69,7 +69,7 @@ function FAQs() {
];
return (
-
+
{t("faqs.title")}
{faqs.map((faq) => (
diff --git a/src/components/Static/Legal/Agreement.tsx b/src/components/Static/Legal/Agreement.tsx
index 73eff461..6d42d839 100644
--- a/src/components/Static/Legal/Agreement.tsx
+++ b/src/components/Static/Legal/Agreement.tsx
@@ -33,7 +33,7 @@ export default function Agreement() {
`;
return (
-
+
{t("legal.agreement.header")}
{t("legal.agreement.para1")}
diff --git a/src/components/Static/Legal/DataPrivacy.tsx b/src/components/Static/Legal/DataPrivacy.tsx
index 12bcbe24..f0d4af5d 100644
--- a/src/components/Static/Legal/DataPrivacy.tsx
+++ b/src/components/Static/Legal/DataPrivacy.tsx
@@ -27,7 +27,7 @@ function DataPrivacy() {
`;
return (
-
+
{t("legal.dataPrivacy.header")}
{t("legal.dataPrivacy.intro1")}
diff --git a/src/components/Static/Legal/LegalNotice.tsx b/src/components/Static/Legal/LegalNotice.tsx
index 6ee0277d..dcf56f05 100644
--- a/src/components/Static/Legal/LegalNotice.tsx
+++ b/src/components/Static/Legal/LegalNotice.tsx
@@ -47,7 +47,7 @@ function LegalNotice() {
}
`;
return (
-
+
{t("legal.notice.header")}
diff --git a/src/components/Static/RacGuidelines/index.tsx b/src/components/Static/RacGuidelines/index.tsx
index dcd4005a..3bd7c1bf 100644
--- a/src/components/Static/RacGuidelines/index.tsx
+++ b/src/components/Static/RacGuidelines/index.tsx
@@ -160,7 +160,7 @@ function RacGuidelines() {
const { t } = useTranslation();
return (
-
+
{t("racGuidelines.heading")}
diff --git a/src/components/Website/Landing/Landing.tsx b/src/components/Website/Landing/Landing.tsx
index c724e66b..24b6f123 100644
--- a/src/components/Website/Landing/Landing.tsx
+++ b/src/components/Website/Landing/Landing.tsx
@@ -26,7 +26,6 @@ export function Landing({ lang }: { lang: Lang }) {
height="var(--layout-static-page-header-height)"
padding="var(--layout-static-page-header-padding)"
menuItemColor="var(--color-midnight)"
- isPublicPage
/>
diff --git a/src/config/constants.ts b/src/config/constants.ts
index 77dfc648..f6fbd775 100644
--- a/src/config/constants.ts
+++ b/src/config/constants.ts
@@ -71,3 +71,5 @@ export const EMPTY_PLACEHOLDER_VALUE = "–";
export const MAX_DESCRIPTION_LENGTH = 500;
export const PHONE_NUMBER_REGEX = /^\+[0-9\s]+$/;
+
+export const LOGGED_IN_COOKIE = "is_logged_in=true; path=/; max-age=6000; SameSite=Lax; Secure";
diff --git a/src/hooks/useCurrentUser.ts b/src/hooks/useCurrentUser.ts
index baac21a5..0b0e03c5 100644
--- a/src/hooks/useCurrentUser.ts
+++ b/src/hooks/useCurrentUser.ts
@@ -1,13 +1,17 @@
import { apiPathMe, cacheTTL } from "@/config/constants";
import { useGetQuery } from "@/hooks";
+import { getCookie } from "@/utils/helpers";
import { ApiUserGet } from "need4deed-sdk";
+import { useEffect } from "react";
export const useCurrentUser = (enabled?: boolean) => {
+ const hasAuthHint = getCookie("is_logged_in") === "true";
+
const { data } = useGetQuery({
queryKey: ["user"],
apiPath: apiPathMe,
staleTime: cacheTTL,
- enabled,
+ enabled: hasAuthHint && enabled,
});
return data;
diff --git a/src/utils/helpers.ts b/src/utils/helpers.ts
index 3fa27ea9..ff8e9bd1 100644
--- a/src/utils/helpers.ts
+++ b/src/utils/helpers.ts
@@ -20,3 +20,11 @@ export function capitalizeFirstLetter(str: string): string {
export const isValidLanguage = (language: string) => {
return supportedLangs.includes(language);
};
+
+export const getCookie = (name: string): string | undefined => {
+ if (typeof document === "undefined") return undefined;
+ const value = `; ${document.cookie}`;
+ const parts = value.split(`; ${name}=`);
+ if (parts.length === 2) return parts.pop()?.split(";").shift();
+ return undefined;
+};
From fcaaa0ee0bee554acc550cd518b7897758952012 Mon Sep 17 00:00:00 2001
From: DarrellRoberts
Date: Fri, 17 Apr 2026 13:26:13 +0200
Subject: [PATCH 16/34] removes unneeded useeffect
---
src/hooks/useCurrentUser.ts | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/hooks/useCurrentUser.ts b/src/hooks/useCurrentUser.ts
index 0b0e03c5..69b14753 100644
--- a/src/hooks/useCurrentUser.ts
+++ b/src/hooks/useCurrentUser.ts
@@ -2,7 +2,6 @@ import { apiPathMe, cacheTTL } from "@/config/constants";
import { useGetQuery } from "@/hooks";
import { getCookie } from "@/utils/helpers";
import { ApiUserGet } from "need4deed-sdk";
-import { useEffect } from "react";
export const useCurrentUser = (enabled?: boolean) => {
const hasAuthHint = getCookie("is_logged_in") === "true";
From d7db2a11e708cffb67cb3a600ff3c4bef99c0eef Mon Sep 17 00:00:00 2001
From: DarrellRoberts
Date: Fri, 17 Apr 2026 14:36:13 +0200
Subject: [PATCH 17/34] replaces server fetch w/ useQuery fetch (client)
---
src/components/Testimonials/Testimonials.tsx | 25 +++++++++++++-------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/components/Testimonials/Testimonials.tsx b/src/components/Testimonials/Testimonials.tsx
index fe9c11a2..ddf9d5b3 100644
--- a/src/components/Testimonials/Testimonials.tsx
+++ b/src/components/Testimonials/Testimonials.tsx
@@ -1,9 +1,9 @@
import { ScreenTypes } from "@/config/constants";
-import { tryCatch } from "@/utils";
-import { Lang, Testimonial } from "need4deed-sdk";
+import { Lang } from "need4deed-sdk";
import { PaginatedCards } from "../core/paginatedCards";
import TestimonialCard from "./TestimonialCard";
import fetchTestimonials from "./utils";
+import { useQuery } from "@tanstack/react-query";
const cardsPerPageMap = {
[ScreenTypes.MOBILE]: 1,
@@ -11,14 +11,21 @@ const cardsPerPageMap = {
[ScreenTypes.DESKTOP]: 3,
};
-export default async function Testimonials({ lang }: { lang: Lang }) {
- const [testimonials, error] = await tryCatch(fetchTestimonials(lang));
- if (error) {
- console.error(error);
- return null;
- }
+export default function Testimonials({ lang }: { lang: Lang }) {
+ const {
+ data: testimonials,
+ isLoading,
+ error,
+ } = useQuery({
+ queryKey: ["testimonials", lang],
+ queryFn: () => fetchTestimonials(lang),
+ staleTime: 1000 * 60 * 60,
+ });
- const cards = testimonials.map((t: Testimonial) => );
+ if (isLoading) return Loading...
;
+ if (error || !testimonials) return null;
+
+ const cards = testimonials.map((t) => );
return (
Date: Fri, 17 Apr 2026 15:05:02 +0200
Subject: [PATCH 18/34] updates sdk to 0.0.75
---
package.json | 2 +-
yarn.lock | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index e9d4879f..4745c3a7 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
"date-fns": "^4.1.0",
"email-validator": "^2.0.4",
"i18next": "^25.3.2",
- "need4deed-sdk": "^0.0.73",
+ "need4deed-sdk": "^0.0.75",
"next": "15.3.8",
"react": "^19.0.0",
"react-day-picker": "^9.13.0",
diff --git a/yarn.lock b/yarn.lock
index 522bcdd2..35ce295c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2407,10 +2407,10 @@ natural-compare@^1.4.0:
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
-need4deed-sdk@^0.0.73:
- version "0.0.73"
- resolved "https://registry.yarnpkg.com/need4deed-sdk/-/need4deed-sdk-0.0.73.tgz#6ba28047adcf0835099e8513c885f4b62672f14a"
- integrity sha512-wzoh2jG1O+4qOKlREgPi2o8ynmpNKNo+yeo/VbQhr+HjjUprAd7I9i+6WWJ4olF2AD2rLOP6iac7ZkpaofTwnA==
+need4deed-sdk@^0.0.75:
+ version "0.0.75"
+ resolved "https://registry.yarnpkg.com/need4deed-sdk/-/need4deed-sdk-0.0.75.tgz#0a566fe1aebfa867801c16d12928dfaa84e1b848"
+ integrity sha512-vvkkWYQCRquz37fY4Y9f/CTBpX23YEb/G6ruepZnhKzBHrwVTSMwvh0R4kt/nQW0yiTL28Nzz1RWkQHQJnb3jw==
next@15.3.8:
version "15.3.8"
From a4e24eca51d1d05b9183aafe9ba3b88498cc6ba4 Mon Sep 17 00:00:00 2001
From: DarrellRoberts
Date: Fri, 17 Apr 2026 17:36:52 +0200
Subject: [PATCH 19/34] adds twodays constant
---
src/components/Testimonials/Testimonials.tsx | 3 ++-
src/config/constants.ts | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/components/Testimonials/Testimonials.tsx b/src/components/Testimonials/Testimonials.tsx
index ddf9d5b3..1736c2f7 100644
--- a/src/components/Testimonials/Testimonials.tsx
+++ b/src/components/Testimonials/Testimonials.tsx
@@ -4,6 +4,7 @@ import { PaginatedCards } from "../core/paginatedCards";
import TestimonialCard from "./TestimonialCard";
import fetchTestimonials from "./utils";
import { useQuery } from "@tanstack/react-query";
+import { twoDays } from "../../config/constants";
const cardsPerPageMap = {
[ScreenTypes.MOBILE]: 1,
@@ -19,7 +20,7 @@ export default function Testimonials({ lang }: { lang: Lang }) {
} = useQuery({
queryKey: ["testimonials", lang],
queryFn: () => fetchTestimonials(lang),
- staleTime: 1000 * 60 * 60,
+ staleTime: twoDays,
});
if (isLoading) return Loading...
;
diff --git a/src/config/constants.ts b/src/config/constants.ts
index 77dfc648..60ab6197 100644
--- a/src/config/constants.ts
+++ b/src/config/constants.ts
@@ -33,6 +33,7 @@ export const screenSizeThresholds = {
};
export const eightDays = 1000 * 60 * 60 * 24 * 8;
+export const twoDays = 1000 * 60 * 60 * 24 * 2;
export const phoneRegEx = /^([+]?[\s0-9]+)?(\d{3}|[(]?[0-9]+[)])?([-]?[\s]?[0-9])+$/;
From 42d12fa896f1cc217734316a0a2769020ee166c0 Mon Sep 17 00:00:00 2001
From: Victor Hugo <141771667+Cy-fox@users.noreply.github.com>
Date: Wed, 15 Apr 2026 16:18:31 +0100
Subject: [PATCH 20/34] fix: prevent left nav bar from overlapping dashboard
content
Use CSS max() to clamp the left margin to the sidebar width on narrow
viewports, so the fixed navigation bar never hides the search bar or
list area. Closes #324.
---
src/components/styled/container.tsx | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/components/styled/container.tsx b/src/components/styled/container.tsx
index ebb66a9e..93a19534 100644
--- a/src/components/styled/container.tsx
+++ b/src/components/styled/container.tsx
@@ -51,8 +51,15 @@ export const IconDiv = styled.div`
`;
export const DashboardBaseContainer = styled.div`
- margin: 0 auto; // Center it horizontally
- width: var(--dashboard-base-container-width);
+ /* Ensure content is never hidden under the fixed left navigation bar.
+ On wide viewports the content stays centred; on narrower ones the left
+ margin is clamped to the sidebar width so the two never overlap. */
+ margin-left: max(
+ var(--dashboard-navigation-bar-container-width),
+ calc((100% - var(--dashboard-base-container-width)) / 2)
+ );
+ margin-right: auto;
+ max-width: var(--dashboard-base-container-width);
padding-top: var(--dashboard-base-container-padding-top);
padding-bottom: var(--dashboard-base-container-padding-bottom);
`;
From 7769747719a32657e33bf248a21a21653115db6a Mon Sep 17 00:00:00 2001
From: Cy-fox
Date: Thu, 16 Apr 2026 10:11:25 +0100
Subject: [PATCH 21/34] fix: add 16px breathing room to dashboard left margin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
After testing, the sidebar edge was still clipping the leftmost
character of list column headers. Add 16px to the clamped left
margin — matching the nav bar's own horizontal padding — to give
content a clear visual gap from the sidebar.
---
src/components/styled/container.tsx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/components/styled/container.tsx b/src/components/styled/container.tsx
index 93a19534..39b54961 100644
--- a/src/components/styled/container.tsx
+++ b/src/components/styled/container.tsx
@@ -53,9 +53,10 @@ export const IconDiv = styled.div`
export const DashboardBaseContainer = styled.div`
/* Ensure content is never hidden under the fixed left navigation bar.
On wide viewports the content stays centred; on narrower ones the left
- margin is clamped to the sidebar width so the two never overlap. */
+ margin is clamped to the sidebar width (+ 16px breathing room matching
+ the nav bar's own horizontal padding) so the two never overlap. */
margin-left: max(
- var(--dashboard-navigation-bar-container-width),
+ calc(var(--dashboard-navigation-bar-container-width) + 16px),
calc((100% - var(--dashboard-base-container-width)) / 2)
);
margin-right: auto;
From c930313255c66060ebc23a24882de01129c4dff6 Mon Sep 17 00:00:00 2001
From: Cy-fox
Date: Thu, 16 Apr 2026 10:35:42 +0100
Subject: [PATCH 22/34] hotfix: fix TypeScript errors introduced by SDK .73
bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Several types were renamed or restructured in the SDK bump that merged
with develop, leaving the codebase in a broken state where tsc --noEmit
fails on every branch:
- AgentCard: use extracted `volunteerSearch` (not agent.volunteerSearch
which doesn't exist on ApiAgentGetList)
- helpers (Agents): add fallback for volunteerSearch being undefined
- statusMaps: SDK enums (e.g. VolunteerStateEngagementType and
AgentEngagementStatusType) share the same string values, making
object-literal duplicate-key errors unavoidable; switch to
Object.fromEntries so last-write-wins logic is preserved without
compile errors
- AccompanyingDetails helpers: languageToTranslate is now number in SDK,
convert to string for the form
- AgentContactDetails: representative → representatives[0] (field
renamed to plural array in SDK)
- useUpdateAgentContact / useUpdateOrganizationDetails: ApiRepresentativePatch
removed from SDK; use ApiRepresentativeGet (same shape for patching)
---
src/components/Dashboard/Agents/AgentCard.tsx | 2 +-
src/components/Dashboard/Agents/helpers.ts | 2 +-
.../Dashboard/Profile/common/statusMaps.ts | 140 +++++++++---------
.../sections/AccompanyingDetails/helpers.ts | 2 +-
.../agent/AgentContactDetails.tsx | 4 +-
src/hooks/useUpdateAgentContact.ts | 4 +-
src/hooks/useUpdateOrganizationDetails.ts | 4 +-
7 files changed, 81 insertions(+), 77 deletions(-)
diff --git a/src/components/Dashboard/Agents/AgentCard.tsx b/src/components/Dashboard/Agents/AgentCard.tsx
index dea3b56b..7556a251 100644
--- a/src/components/Dashboard/Agents/AgentCard.tsx
+++ b/src/components/Dashboard/Agents/AgentCard.tsx
@@ -58,7 +58,7 @@ export const AgentCard = ({ agent }: Props) => {
{t("dashboard.agentProfile.volunteerSearch")}
-
+
e.stopPropagation()} onKeyDown={(e) => e.stopPropagation()} role="presentation">
{t("dashboard.agentProfile.trustLevel")}
diff --git a/src/components/Dashboard/Agents/helpers.ts b/src/components/Dashboard/Agents/helpers.ts
index 492cca26..6463beb1 100644
--- a/src/components/Dashboard/Agents/helpers.ts
+++ b/src/components/Dashboard/Agents/helpers.ts
@@ -29,7 +29,7 @@ export function getNormalizedAgent(agent: AgentListItem): Omit<
...agent,
type: agent.type,
district: agent.district,
- volunteerSearch: agent.volunteerSearch,
+ volunteerSearch: agent.volunteerSearch ?? AgentVolunteerSearchType.NOT_NEEDED,
trustLevel: agent.trustLevel ? agent.trustLevel : AgentTrustType.UNKNOWN,
serviceType: agent.serviceType,
};
diff --git a/src/components/Dashboard/Profile/common/statusMaps.ts b/src/components/Dashboard/Profile/common/statusMaps.ts
index 6a7b784d..ea9dcdda 100644
--- a/src/components/Dashboard/Profile/common/statusMaps.ts
+++ b/src/components/Dashboard/Profile/common/statusMaps.ts
@@ -37,74 +37,78 @@ export type StatusValue =
| AgentVolunteerSearch
| AgentTrustLevel;
-export const statusColorMap: Record = {
- [VolunteerStateEngagementType.ACTIVE]: "var(--color-green-100)",
- [VolunteerStateEngagementType.AVAILABLE]: "var(--color-violet-100)",
- [VolunteerStateEngagementType.TEMP_UNAVAILABLE]: "var( --color-red-50)",
- [VolunteerStateEngagementType.UNRESPONSIVE]: "var(--color-grey-50)",
- [VolunteerStateEngagementType.INACTIVE]: "var(--color-grey-50)",
- [VolunteerStateEngagementType.NEW]: "var(--color-green-100)",
- [OpportunityMatchStatus.UNMATCHED]: "var(--color-grey-50)",
- [OpportunityMatchStatus.PENDING_MATCH]: "var(--color-violet-100)",
- [OpportunityMatchStatus.MATCHED]: "var(--color-green-100)",
- [OpportunityMatchStatus.NEEDS_REMATCH]: "var(--color-red-50)",
- [VolunteerStateMatchType.NO_MATCHES]: "var(--color-grey-50)",
- [VolunteerStateMatchType.PENDING_MATCH]: "var(--color-violet-100)",
- [VolunteerStateMatchType.MATCHED]: "var(--color-green-100)",
- [VolunteerStateMatchType.NEEDS_REMATCH]: "var(--color-red-50)",
- [VolunteerStateTypeType.ACCOMPANYING]: "var(--color-blue-500)",
- [VolunteerStateTypeType.EVENTS]: "var(--color-blue-500)",
- [VolunteerStateTypeType.REGULAR]: "var(--color-blue-500)",
- [VolunteerStateTypeType.REGULAR_ACCOMPANYING]: "var(--color-blue-500)",
- [OpportunityStatusType.SEARCHING]: "var(--color-violet-100)",
- [OpportunityStatusType.NEW]: "var(--color-violet-100)",
- [OpportunityStatusType.ACTIVE]: "var(--color-green-50)",
- [OpportunityStatusType.PAST]: "var(--color-grey-50)",
- [AgentVolunteerSearch.NOT_NEEDED]: "var(--color-grey-50)",
- [AgentVolunteerSearch.VOLUNTEERS_FOUND]: "var(--color-green-100)",
- [AgentVolunteerSearch.SEARCHING]: "var(--color-red-50)",
- [AgentTrustLevel.UNKNOWN]: "var(--color-grey-50)",
- [AgentTrustLevel.LOW]: "var(--color-red-50)",
- [AgentTrustLevel.HIGH]: "var(--color-green-100)",
- [AgentEngagementStatusType.NEW]: "var(--color-violet-100)",
- [AgentEngagementStatusType.ACTIVE]: "var(--color-green-100)",
- [AgentEngagementStatusType.INACTIVE]: "var(--color-grey-50)",
- [AgentEngagementStatusType.UNRESPONSIVE]: "var(--color-grey-50)",
-};
+// Several SDK enums share the same underlying string values (e.g. "new", "active",
+// "pending-match"). Object literals with computed duplicate keys are a TS error, so
+// these maps are built with Object.fromEntries — arrays have no such restriction and
+// the last entry for a given key wins, matching the original intended behaviour.
+export const statusColorMap: Record = Object.fromEntries([
+ [VolunteerStateEngagementType.ACTIVE, "var(--color-green-100)"],
+ [VolunteerStateEngagementType.AVAILABLE, "var(--color-violet-100)"],
+ [VolunteerStateEngagementType.TEMP_UNAVAILABLE, "var( --color-red-50)"],
+ [VolunteerStateEngagementType.UNRESPONSIVE, "var(--color-grey-50)"],
+ [VolunteerStateEngagementType.INACTIVE, "var(--color-grey-50)"],
+ [VolunteerStateEngagementType.NEW, "var(--color-green-100)"],
+ [OpportunityMatchStatus.UNMATCHED, "var(--color-grey-50)"],
+ [OpportunityMatchStatus.PENDING_MATCH, "var(--color-violet-100)"],
+ [OpportunityMatchStatus.MATCHED, "var(--color-green-100)"],
+ [OpportunityMatchStatus.NEEDS_REMATCH, "var(--color-red-50)"],
+ [VolunteerStateMatchType.NO_MATCHES, "var(--color-grey-50)"],
+ [VolunteerStateMatchType.PENDING_MATCH, "var(--color-violet-100)"],
+ [VolunteerStateMatchType.MATCHED, "var(--color-green-100)"],
+ [VolunteerStateMatchType.NEEDS_REMATCH, "var(--color-red-50)"],
+ [VolunteerStateTypeType.ACCOMPANYING, "var(--color-blue-500)"],
+ [VolunteerStateTypeType.EVENTS, "var(--color-blue-500)"],
+ [VolunteerStateTypeType.REGULAR, "var(--color-blue-500)"],
+ [VolunteerStateTypeType.REGULAR_ACCOMPANYING, "var(--color-blue-500)"],
+ [OpportunityStatusType.SEARCHING, "var(--color-violet-100)"],
+ [OpportunityStatusType.NEW, "var(--color-violet-100)"],
+ [OpportunityStatusType.ACTIVE, "var(--color-green-50)"],
+ [OpportunityStatusType.PAST, "var(--color-grey-50)"],
+ [AgentVolunteerSearch.NOT_NEEDED, "var(--color-grey-50)"],
+ [AgentVolunteerSearch.VOLUNTEERS_FOUND, "var(--color-green-100)"],
+ [AgentVolunteerSearch.SEARCHING, "var(--color-red-50)"],
+ [AgentTrustLevel.UNKNOWN, "var(--color-grey-50)"],
+ [AgentTrustLevel.LOW, "var(--color-red-50)"],
+ [AgentTrustLevel.HIGH, "var(--color-green-100)"],
+ [AgentEngagementStatusType.NEW, "var(--color-violet-100)"],
+ [AgentEngagementStatusType.ACTIVE, "var(--color-green-100)"],
+ [AgentEngagementStatusType.INACTIVE, "var(--color-grey-50)"],
+ [AgentEngagementStatusType.UNRESPONSIVE, "var(--color-grey-50)"],
+]) as Record;
type IconComponent = React.ComponentType<{ size?: number; color?: string }>;
-export const statusIconMap: Record = {
- [VolunteerStateEngagementType.ACTIVE]: ChartLineIcon,
- [VolunteerStateEngagementType.AVAILABLE]: CalendarBlankIcon,
- [VolunteerStateEngagementType.TEMP_UNAVAILABLE]: CalendarXIcon,
- [VolunteerStateEngagementType.UNRESPONSIVE]: PhoneXIcon,
- [VolunteerStateEngagementType.INACTIVE]: StopCircleIcon,
- [VolunteerStateEngagementType.NEW]: SparkleIcon,
- [OpportunityMatchStatus.UNMATCHED]: ProhibitInsetIcon,
- [OpportunityMatchStatus.PENDING_MATCH]: HourglassIcon,
- [OpportunityMatchStatus.MATCHED]: CheckCircleIcon,
- [OpportunityMatchStatus.NEEDS_REMATCH]: ArrowsClockwiseIcon,
- [VolunteerStateMatchType.NO_MATCHES]: ProhibitInsetIcon,
- [VolunteerStateMatchType.PENDING_MATCH]: HourglassIcon,
- [VolunteerStateMatchType.MATCHED]: CheckCircleIcon,
- [VolunteerStateMatchType.NEEDS_REMATCH]: ArrowsClockwiseIcon,
- [VolunteerStateTypeType.ACCOMPANYING]: UsersIcon,
- [VolunteerStateTypeType.EVENTS]: UsersIcon,
- [VolunteerStateTypeType.REGULAR]: UsersIcon,
- [VolunteerStateTypeType.REGULAR_ACCOMPANYING]: UsersIcon,
- [OpportunityStatusType.NEW]: SparkleIcon,
- [OpportunityStatusType.ACTIVE]: ChartLineIcon,
- [OpportunityStatusType.SEARCHING]: HourglassIcon,
- [OpportunityStatusType.PAST]: StopCircleIcon,
- [AgentVolunteerSearch.NOT_NEEDED]: HandPalmIcon,
- [AgentVolunteerSearch.VOLUNTEERS_FOUND]: CheckCircleIcon,
- [AgentVolunteerSearch.SEARCHING]: BinocularsIcon,
- [AgentTrustLevel.UNKNOWN]: QuestionIcon,
- [AgentTrustLevel.LOW]: SmileySadIcon,
- [AgentTrustLevel.HIGH]: SmileyIcon,
- [AgentEngagementStatusType.NEW]: SparkleIcon,
- [AgentEngagementStatusType.ACTIVE]: ChartLineIcon,
- [AgentEngagementStatusType.INACTIVE]: StopCircleIcon,
- [AgentEngagementStatusType.UNRESPONSIVE]: PhoneXIcon,
-};
+export const statusIconMap: Record = Object.fromEntries([
+ [VolunteerStateEngagementType.ACTIVE, ChartLineIcon],
+ [VolunteerStateEngagementType.AVAILABLE, CalendarBlankIcon],
+ [VolunteerStateEngagementType.TEMP_UNAVAILABLE, CalendarXIcon],
+ [VolunteerStateEngagementType.UNRESPONSIVE, PhoneXIcon],
+ [VolunteerStateEngagementType.INACTIVE, StopCircleIcon],
+ [VolunteerStateEngagementType.NEW, SparkleIcon],
+ [OpportunityMatchStatus.UNMATCHED, ProhibitInsetIcon],
+ [OpportunityMatchStatus.PENDING_MATCH, HourglassIcon],
+ [OpportunityMatchStatus.MATCHED, CheckCircleIcon],
+ [OpportunityMatchStatus.NEEDS_REMATCH, ArrowsClockwiseIcon],
+ [VolunteerStateMatchType.NO_MATCHES, ProhibitInsetIcon],
+ [VolunteerStateMatchType.PENDING_MATCH, HourglassIcon],
+ [VolunteerStateMatchType.MATCHED, CheckCircleIcon],
+ [VolunteerStateMatchType.NEEDS_REMATCH, ArrowsClockwiseIcon],
+ [VolunteerStateTypeType.ACCOMPANYING, UsersIcon],
+ [VolunteerStateTypeType.EVENTS, UsersIcon],
+ [VolunteerStateTypeType.REGULAR, UsersIcon],
+ [VolunteerStateTypeType.REGULAR_ACCOMPANYING, UsersIcon],
+ [OpportunityStatusType.NEW, SparkleIcon],
+ [OpportunityStatusType.ACTIVE, ChartLineIcon],
+ [OpportunityStatusType.SEARCHING, HourglassIcon],
+ [OpportunityStatusType.PAST, StopCircleIcon],
+ [AgentVolunteerSearch.NOT_NEEDED, HandPalmIcon],
+ [AgentVolunteerSearch.VOLUNTEERS_FOUND, CheckCircleIcon],
+ [AgentVolunteerSearch.SEARCHING, BinocularsIcon],
+ [AgentTrustLevel.UNKNOWN, QuestionIcon],
+ [AgentTrustLevel.LOW, SmileySadIcon],
+ [AgentTrustLevel.HIGH, SmileyIcon],
+ [AgentEngagementStatusType.NEW, SparkleIcon],
+ [AgentEngagementStatusType.ACTIVE, ChartLineIcon],
+ [AgentEngagementStatusType.INACTIVE, StopCircleIcon],
+ [AgentEngagementStatusType.UNRESPONSIVE, PhoneXIcon],
+]) as unknown as Record;
diff --git a/src/components/Dashboard/Profile/sections/AccompanyingDetails/helpers.ts b/src/components/Dashboard/Profile/sections/AccompanyingDetails/helpers.ts
index 2a46e59e..26c76c85 100644
--- a/src/components/Dashboard/Profile/sections/AccompanyingDetails/helpers.ts
+++ b/src/components/Dashboard/Profile/sections/AccompanyingDetails/helpers.ts
@@ -42,5 +42,5 @@ export const getInitialFormValues = (
appointmentTime: parseTime(details?.appointmentTime),
refugeeNumber: details?.refugeeNumber || "",
refugeeName: details?.refugeeName || "",
- languageToTranslate: details?.languageToTranslate || "",
+ languageToTranslate: details?.languageToTranslate?.toString() ?? "",
});
diff --git a/src/components/Dashboard/Profile/sections/ContactDetails/agent/AgentContactDetails.tsx b/src/components/Dashboard/Profile/sections/ContactDetails/agent/AgentContactDetails.tsx
index 00a58ada..56fb36a3 100644
--- a/src/components/Dashboard/Profile/sections/ContactDetails/agent/AgentContactDetails.tsx
+++ b/src/components/Dashboard/Profile/sections/ContactDetails/agent/AgentContactDetails.tsx
@@ -30,7 +30,7 @@ export const AgentContactDetails = forwardRef(function
ref,
) {
const { t } = useTranslation();
- const { mutate: updateAgent, isPending } = useUpdateAgentContact(String(agent?.representative?.id));
+ const { mutate: updateAgent, isPending } = useUpdateAgentContact(String(agent?.representatives?.[0]?.id));
const [isEditing, setIsEditing] = useState(false);
useEditingChangeNotifier(isEditing, onEditingChange);
@@ -42,7 +42,7 @@ export const AgentContactDetails = forwardRef(function
const schema = createAgentContactDetailsSchema(t);
- const initialFormValues = agent?.representative;
+ const initialFormValues = agent?.representatives?.[0];
const methods = useForm({
resolver: zodResolver(schema),
diff --git a/src/hooks/useUpdateAgentContact.ts b/src/hooks/useUpdateAgentContact.ts
index 2d15bdfe..657932ab 100644
--- a/src/hooks/useUpdateAgentContact.ts
+++ b/src/hooks/useUpdateAgentContact.ts
@@ -1,11 +1,11 @@
import { ApiAgentProfileGet } from "@/components/Dashboard/Profile/types";
import { apiPathPerson } from "@/config/constants";
import { useMutationQuery } from "@/hooks";
-import { ApiRepresentativePatch } from "need4deed-sdk";
+import { ApiRepresentativeGet } from "need4deed-sdk";
import { DeepPartial } from "ts-type-safe";
export const useUpdateAgentContact = (personId: string) => {
- return useMutationQuery, ApiAgentProfileGet>({
+ return useMutationQuery, ApiAgentProfileGet>({
apiPath: `${apiPathPerson}${personId}`,
method: "patch",
successMessage: "dashboard.agentProfile.contactDetails.saveSuccess",
diff --git a/src/hooks/useUpdateOrganizationDetails.ts b/src/hooks/useUpdateOrganizationDetails.ts
index 96dfdcee..ca845c95 100644
--- a/src/hooks/useUpdateOrganizationDetails.ts
+++ b/src/hooks/useUpdateOrganizationDetails.ts
@@ -1,11 +1,11 @@
import { ApiAgentProfileGet } from "@/components/Dashboard/Profile/types";
import { apiPathOrganization } from "@/config/constants";
import { useMutationQuery } from "@/hooks";
-import { ApiRepresentativePatch } from "need4deed-sdk";
+import { ApiRepresentativeGet } from "need4deed-sdk";
import { DeepPartial } from "ts-type-safe";
export const useUpdateOrganization = (organizationId: string) => {
- return useMutationQuery, ApiAgentProfileGet>({
+ return useMutationQuery, ApiAgentProfileGet>({
apiPath: `${apiPathOrganization}${organizationId}`,
method: "patch",
successMessage: "__dashboard.agentProfile.contactDetails.saveSuccess",
From 4dfcc3aea088e5d92f36ae3255e2b087a050daf2 Mon Sep 17 00:00:00 2001
From: Rodrigo Louro
Date: Wed, 15 Apr 2026 17:05:16 +0200
Subject: [PATCH 23/34] Fix: dashboard button+direct buttons to forms+
testimonials #321
Fix: dashboard button+direct buttons to forms+ testimonials #321
---
public/locales/de/translations.json | 3 ++-
public/locales/en/translations.json | 3 ++-
src/components/Header/Header.tsx | 9 ++++++++-
src/components/Website/Landing/Hero/Content.tsx | 15 ++++++---------
4 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/public/locales/de/translations.json b/public/locales/de/translations.json
index a3f1a932..dd331d21 100644
--- a/public/locales/de/translations.json
+++ b/public/locales/de/translations.json
@@ -423,7 +423,8 @@
"header": {
"button": {
"login": "Anmelden",
- "joinVolunteer": "Jetzt sich engagieren"
+ "joinVolunteer": "Jetzt sich engagieren",
+ "dashboard": "Dashboard"
}
},
"login": {
diff --git a/public/locales/en/translations.json b/public/locales/en/translations.json
index 2b107865..c4d5abdf 100644
--- a/public/locales/en/translations.json
+++ b/public/locales/en/translations.json
@@ -423,7 +423,8 @@
"header": {
"button": {
"login": "Log in",
- "joinVolunteer": "Join as a volunteer"
+ "joinVolunteer": "Join as a volunteer",
+ "dashboard": "Dashboard"
}
},
"login": {
diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
index 49d94cf6..36e1853e 100644
--- a/src/components/Header/Header.tsx
+++ b/src/components/Header/Header.tsx
@@ -10,6 +10,8 @@ import BurgerMenuItems from "./BurgerMenuItems";
import LoginRegister from "./LoginRegister";
import MenuItems from "./MenuItems";
import UserProfile from "./UserProfile";
+import MenuItem from "./MenuItem";
+import Link from "next/link";
interface HeaderContainerProps {
height?: string;
@@ -47,7 +49,7 @@ export function Header({
menuItemColor,
burgerMenuItemColor = "var(--color-midnight)",
}: Props) {
- const { t } = useTranslation();
+ const { t, i18n } = useTranslation();
const [isBurgerMenuOpen, setIsBurgerMenuOpen] = useState(false);
const user = useCurrentUser();
@@ -77,6 +79,11 @@ export function Header({
)}
+ {user && (
+
+
+
+ )}
{user ? : }
);
diff --git a/src/components/Website/Landing/Hero/Content.tsx b/src/components/Website/Landing/Hero/Content.tsx
index 5bad4a4a..7fe73abc 100644
--- a/src/components/Website/Landing/Hero/Content.tsx
+++ b/src/components/Website/Landing/Hero/Content.tsx
@@ -4,9 +4,7 @@ import { useRouter } from "next/navigation";
import styled from "styled-components";
import { Button } from "../../../core/button";
-import { ATag } from "../../../styled/tags";
import { CustomHeading } from "../../../styled/text";
-import { Subpage } from "@/types";
const ContentDiv = styled.div`
display: flex;
@@ -35,7 +33,7 @@ const HeroButtonsContainer = styled.div`
`;
export default function HeroContent() {
- const { t } = useTranslation();
+ const { t, i18n } = useTranslation();
const router = useRouter();
return (
@@ -66,14 +64,13 @@ export default function HeroContent() {