diff --git a/src/components/forms/LanguageFields/LanguageFieldRow.tsx b/src/components/forms/LanguageFields/LanguageFieldRow.tsx
index bd138285..d3324916 100644
--- a/src/components/forms/LanguageFields/LanguageFieldRow.tsx
+++ b/src/components/forms/LanguageFields/LanguageFieldRow.tsx
@@ -58,16 +58,13 @@ export function LanguageFieldRow({
{t("form.becomeVolunteer.fields.languages.chooseLanguage")}
{availableLanguages.map((item) => (
diff --git a/src/components/forms/utils.ts b/src/components/forms/utils.ts
index 3ddefce8..7a08e1e3 100644
--- a/src/components/forms/utils.ts
+++ b/src/components/forms/utils.ts
@@ -156,7 +156,7 @@ export function parseFormStateDTOOpportunity(form: OpportunityData): Opportunity
// Accompanying-specific fields
const accomp_address = isAccompanying ? form.aaAddress || null : null;
const accomp_postcode = isAccompanying ? form.aaPostcode || null : null;
- const accomp_datetime = isAccompanying ? (form.dateTime ? new Date(form.dateTime).toISOString() : null) : null;
+ const accomp_datetime = isAccompanying ? (form.dateTime || null) : null;
const accomp_name = isAccompanying ? form.refugeeName || null : null;
const accomp_phone = isAccompanying ? form.refugeeNumber || null : null;
const accomp_information = isAccompanying ? form.aaInformation || null : null;
diff --git a/src/components/styled/container.tsx b/src/components/styled/container.tsx
index ebb66a9e..39b54961 100644
--- a/src/components/styled/container.tsx
+++ b/src/components/styled/container.tsx
@@ -51,8 +51,16 @@ 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 (+ 16px breathing room matching
+ the nav bar's own horizontal padding) so the two never overlap. */
+ margin-left: max(
+ calc(var(--dashboard-navigation-bar-container-width) + 16px),
+ 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);
`;
diff --git a/src/config/constants.ts b/src/config/constants.ts
index 77dfc648..3718d519 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])+$/;
@@ -52,7 +53,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",
@@ -71,3 +72,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/useAgentProfileSections.tsx b/src/hooks/useAgentProfileSections.tsx
index c89d4a55..94ce73ab 100644
--- a/src/hooks/useAgentProfileSections.tsx
+++ b/src/hooks/useAgentProfileSections.tsx
@@ -61,7 +61,7 @@ export const useAgentProfileSections = (agent: ApiAgentProfileGet | undefined) =
iconName: IconName.ShootingStar,
title: t("dashboard.volunteerProfile.opportunities"),
headerButtonName: t("dashboard.agentProfile.opportunitiesSec.postOpportunity"),
- subComponent: ,
+ subComponent: ,
},
{
iconName: IconName.ChatsTeardrop,
diff --git a/src/hooks/useCurrentUser.ts b/src/hooks/useCurrentUser.ts
index baac21a5..69b14753 100644
--- a/src/hooks/useCurrentUser.ts
+++ b/src/hooks/useCurrentUser.ts
@@ -1,13 +1,16 @@
import { apiPathMe, cacheTTL } from "@/config/constants";
import { useGetQuery } from "@/hooks";
+import { getCookie } from "@/utils/helpers";
import { ApiUserGet } from "need4deed-sdk";
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/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",
diff --git a/src/middleware.ts b/src/middleware.ts
index 6cd74a51..8c73e102 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -4,9 +4,10 @@ import { userAgent } from "next/server";
import { supportedLangs } from "./config/constants";
import { Lang } from "need4deed-sdk";
-const DEFAULT_LOCALE = Lang.DE;
+const DEFAULT_LOCALE = Lang.EN;
const DEFAULT_DEVICE_TYPE = "desktop";
const DEVICE_HEADER_NAME = "x-device-type";
+const LANG_COOKIE = "preferred-lang";
export function middleware(request: NextRequest) {
const { pathname } = request.nextUrl;
@@ -15,6 +16,10 @@ export function middleware(request: NextRequest) {
const match = pathname.match(localePrefixRegex);
const currentLocale = match ? match[1] : null;
+ // Use cookie-saved language preference, fall back to DEFAULT_LOCALE
+ const cookieLang = request.cookies.get(LANG_COOKIE)?.value;
+ const preferredLocale = cookieLang && supportedLangs.includes(cookieLang) ? cookieLang : DEFAULT_LOCALE;
+
let redirectNeeded = false;
let newPathname = pathname;
@@ -24,22 +29,32 @@ export function middleware(request: NextRequest) {
if (!isSupportedLocale) {
const pathWithoutLocalePrefix = pathname.substring(currentLocale.length + 1);
- newPathname = `/${DEFAULT_LOCALE}${pathWithoutLocalePrefix}`;
+ newPathname = `/${preferredLocale}${pathWithoutLocalePrefix}`;
redirectNeeded = true;
}
} else {
- newPathname = `/${DEFAULT_LOCALE}${pathname}`;
+ newPathname = `/${preferredLocale}${pathname}`;
redirectNeeded = true;
}
if (redirectNeeded) {
const url = request.nextUrl.clone();
url.pathname = newPathname;
- return NextResponse.redirect(url);
+ const redirectResponse = NextResponse.redirect(url);
+ return redirectResponse;
}
const response = NextResponse.next();
+ // Persist the current locale in a cookie so bare URLs respect the user's choice
+ if (currentLocale && supportedLangs.includes(currentLocale)) {
+ response.cookies.set(LANG_COOKIE, currentLocale, {
+ path: "/",
+ maxAge: 60 * 60 * 24 * 365, // 1 year
+ sameSite: "lax",
+ });
+ }
+
const { device } = userAgent({ headers: request.headers });
const deviceType = device.type || DEFAULT_DEVICE_TYPE;
diff --git a/src/types.ts b/src/types.ts
index 52e98db1..ed1588f7 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -50,6 +50,7 @@ export type LanguageObject = {
id: number;
language: string;
level: LanguageLevel | "";
+ purpose?: import("need4deed-sdk").LangPurpose;
};
export type FooterLink = [string, string];
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;
+};
diff --git a/yarn.lock b/yarn.lock
index 522bcdd2..e97c5d02 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.77:
+ version "0.0.77"
+ resolved "https://registry.yarnpkg.com/need4deed-sdk/-/need4deed-sdk-0.0.77.tgz#2d48d96472ca525b8d9c01d9d927f4774b6f4585"
+ integrity sha512-8kgLl8kZqFzy1kGpLLtiZrvCJbfu67kDtjMBtupI6wmqh/0bNGzGMt1Gas1zRXHv0B7pRsyJJQg3Nl6hAPeG6Q==
next@15.3.8:
version "15.3.8"