Merge branch 'main' into sandino/survey-wip

socialincome-san · Jan 7, 2025 · e0eebe4 · e0eebe4
2 parents 8b96218 + 55b7607
commit e0eebe4
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 43 deletions.
diff --git a/seed/auth_export/accounts.json b/seed/auth_export/accounts.json
diff --git a/seed/auth_export/config.json b/seed/auth_export/config.json
@@ -1 +1 @@
-{"signIn":{"allowDuplicateEmails":false}}
+{"signIn":{"allowDuplicateEmails":false},"emailPrivacyConfig":{"enableImprovedEmailPrivacy":false}}
diff --git a/seed/firebase-export-metadata.json b/seed/firebase-export-metadata.json
@@ -1,16 +1,16 @@
 {
-  "version": "13.0.2",
+  "version": "13.29.1",
   "firestore": {
-    "version": "1.18.2",
+    "version": "1.19.8",
     "path": "firestore_export",
     "metadata_file": "firestore_export/firestore_export.overall_export_metadata"
   },
   "auth": {
-    "version": "13.0.2",
+    "version": "13.29.1",
     "path": "auth_export"
   },
   "storage": {
-    "version": "13.0.2",
+    "version": "13.29.1",
     "path": "storage_export"
   }
 }
diff --git a/seed/firestore_export/all_namespaces/all_kinds/all_namespaces_all_kinds.export_metadata b/seed/firestore_export/all_namespaces/all_kinds/all_namespaces_all_kinds.export_metadata
diff --git a/seed/firestore_export/all_namespaces/all_kinds/output-0 b/seed/firestore_export/all_namespaces/all_kinds/output-0
diff --git a/seed/firestore_export/firestore_export.overall_export_metadata b/seed/firestore_export/firestore_export.overall_export_metadata
diff --git a/shared/locales/fr/website-common.json b/shared/locales/fr/website-common.json
@@ -8,7 +8,7 @@
 		"twitter-image": "/assets/metadata/twitter/default.jpg"
 	},
 	"navigation": {
-		"our-promise": "Modèle à 100 %",
+		"our-promise": "Notre promesse",
 		"about-us": "Qui nous sommes",
 		"contact": "Contact",
 		"contributors": "Donateurs et donatrices",

diff --git a/website/.env.development b/website/.env.development
@@ -5,8 +5,8 @@ FIREBASE_AUTH_EMULATOR_HOST=127.0.0.1:9099
 
 # These environment variables are required so that the Firebase JS SDK (client side) connects to the local emulator.
 NEXT_PUBLIC_FIREBASE_API_KEY="demo-key"
-NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN="social-income-staging"
-NEXT_PUBLIC_FIREBASE_PROJECT_ID="social-income-staging"
+NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN="demo-social-income-local"
+NEXT_PUBLIC_FIREBASE_PROJECT_ID="demo-social-income-local"
 NEXT_PUBLIC_FIREBASE_AUTH_EMULATOR_URL="http://localhost:9099"
 NEXT_PUBLIC_FIREBASE_FIRESTORE_EMULATOR_HOST="localhost"
 NEXT_PUBLIC_FIREBASE_FIRESTORE_EMULATOR_PORT="8080"
@@ -18,4 +18,3 @@ BASE_URL="http://localhost:3001"
 SENDGRID_LIST_ID="2896ee4d-d1e0-4a4a-8565-7e592c377e36"
 SENDGRID_SUPPRESSION_LIST_ID=45634
 SENDGRID_API_KEY="SG.Q****"
-
diff --git a/website/src/app/[lang]/[region]/(website)/campaign/[campaign]/page.tsx b/website/src/app/[lang]/[region]/(website)/campaign/[campaign]/page.tsx
@@ -119,7 +119,7 @@ export default async function Page({ params }: CampaignPageProps) {
 							<div>
 								{!campaign.goal && (
 									<div className="mb-4 flex flex-col">
-										<Typography size="2xl" weight="medium" color="accent">
+										<Typography size="2xl" weight="medium" color="secondary">
 											{translator?.t('campaign.without-goal.collected', {
 												context: {
 													count: contributions,

diff --git a/website/src/components/navbar/navbar-client.tsx b/website/src/components/navbar/navbar-client.tsx
@@ -276,13 +276,18 @@ const DesktopNavigation = ({ lang, region, languages, regions, currencies, navig
 	const transparency = navigation![2];
 
 	return (
-		<div className="hidden h-20 flex-row items-baseline justify-between gap-x-4 overflow-hidden px-8 py-6 transition-[height] duration-500 ease-in group-hover/navbar:h-96 md:flex lg:group-hover/navbar:h-64">
-			<div className="flex h-full flex-1 shrink-0 basis-1/4 flex-col">
+		<div className="hidden h-20 flex-row items-baseline justify-between gap-x-4 overflow-hidden px-8 py-6 transition-[height] duration-500 ease-in group-hover/navbar:h-60 md:flex">
+			<div className="relative inline-flex shrink-0 flex-col text-left">
 				<Link href={`/${lang}/${region}`}>
-					<SIAnimatedLogo className="mr-auto hidden h-6 lg:block" />
-					<SIIcon className="-mb-2.5 block h-9 lg:hidden" />
+					<div
+						className="block h-6 w-[230px] items-center justify-center md:hidden lg:block"
+						style={{ minWidth: '230px', minHeight: '24px' }}
+					>
+						<SIAnimatedLogo className="h-[24px] w-[230px]" />
+					</div>
+					<SIIcon className="-mb-2.5 block h-9 pr-20 lg:hidden" />
 				</Link>
-				<div className="mt-6 hidden h-full flex-col justify-start group-hover/navbar:flex group-active/navbar:flex">
+				<div className="absolute left-0 mt-[50px] hidden flex-col justify-start overflow-visible whitespace-nowrap group-hover/navbar:flex group-active/navbar:flex">
 					<NavbarLink href={`/${lang}/${region}/me`}>{translations.myProfile}</NavbarLink>
 					<div className="flex-inline mt-auto flex items-center space-x-2">
 						<DonateIcon className="h-4 w-4" />
@@ -292,37 +297,36 @@ const DesktopNavigation = ({ lang, region, languages, regions, currencies, navig
 					</div>
 				</div>
 			</div>
-			<div
-				className={classNames('flex max-w-[36rem] flex-1 basis-1/2 flex-row gap-x-2 overflow-visible', {
-					// center the navbar links
-					'lg:pl-12': lang === 'en',
-					'lg:pl-4': lang === 'de',
-					'lg:pl-8': lang === 'it',
-				})}
-			>
-				<div className="group/our-work flex-1">
-					<NavbarLink href={ourWork.href}>{ourWork.title}</NavbarLink>
-					<div className="mt-6 hidden flex-col opacity-0 group-hover/navbar:flex group-hover/our-work:opacity-100">
+			<div className="flex flex-row items-center justify-evenly gap-x-10 overflow-visible">
+				<div className="group/our-work relative flex flex-1 justify-end">
+					<NavbarLink className="whitespace-nowrap px-2" href={ourWork.href}>
+						{ourWork.title}
+					</NavbarLink>
+					<div className="absolute left-2 top-full mt-0 hidden flex-col overflow-visible whitespace-nowrap pt-2 opacity-0 group-hover/our-work:flex group-hover/our-work:opacity-100">
 						{ourWork.links?.map((link: any, index: number) => (
 							<NavbarLink key={index} href={link.href}>
 								{link.title}
 							</NavbarLink>
 						))}
 					</div>
 				</div>
-				<div className="group/about-us flex-1">
-					<NavbarLink href={aboutUs.href}>{aboutUs.title}</NavbarLink>
-					<div className="mt-6 hidden flex-col opacity-0 group-hover/navbar:flex group-hover/about-us:opacity-100">
+				<div className="group/about-us relative flex flex-1 justify-center">
+					<NavbarLink className="whitespace-nowrap px-2" href={aboutUs.href}>
+						{aboutUs.title}
+					</NavbarLink>
+					<div className="absolute left-2 top-full mt-0 hidden flex-col overflow-visible whitespace-nowrap pt-2 opacity-0 group-hover/navbar:flex group-hover/about-us:opacity-100">
 						{aboutUs.links?.map((link, index) => (
 							<NavbarLink key={index} href={link.href}>
 								{link.title}
 							</NavbarLink>
 						))}
 					</div>
 				</div>
-				<div className="group/transparency flex-1">
-					<NavbarLink href={transparency.href}>{transparency.title}</NavbarLink>
-					<div className="mt-6 hidden flex-col opacity-0 group-hover/navbar:flex group-hover/transparency:opacity-100">
+				<div className="group/transparency relative flex flex-1 justify-start">
+					<NavbarLink className="whitespace-nowrap px-2" href={transparency.href}>
+						{transparency.title}
+					</NavbarLink>
+					<div className="absolute left-2 top-full mt-0 hidden flex-col overflow-visible whitespace-nowrap pt-2 opacity-0 group-hover/navbar:flex group-hover/transparency:opacity-100">
 						{transparency.links?.map((link: any, index: number) => (
 							<NavbarLink key={index} href={link.href}>
 								{link.title}
@@ -331,30 +335,30 @@ const DesktopNavigation = ({ lang, region, languages, regions, currencies, navig
 					</div>
 				</div>
 			</div>
-			<div className="group/i18n flex h-full flex-1 shrink-0 basis-1/4 flex-col">
+			<div className="group/i18n relative flex flex-col overflow-visible whitespace-nowrap pl-[80px] lg:pl-[200px]">
 				<div className="flex flex-row items-baseline justify-end">
 					{(!isIntRegion || (isIntRegion && country)) && (
 						<Image
 							className="m-auto mx-2 rounded-full"
 							src={getFlagImageURL(isIntRegion ? country! : region)}
-							width={24}
-							height={24}
+							width={20}
+							height={20}
 							alt="Country flag"
 							priority
 							unoptimized
 						/>
 					)}{' '}
 					<Typography size="lg">{languages.find((l) => l.code === lang)?.translation}</Typography>
 				</div>
-				<div className="ml-auto mt-6 hidden h-full grid-cols-1 justify-items-start gap-2 text-left opacity-0 group-hover/navbar:grid group-hover/i18n:opacity-100 lg:grid-cols-[repeat(3,auto)] lg:justify-items-end lg:gap-8">
-					<div className="flex w-full flex-col items-end">
+				<div className="absolute right-0 top-full mt-0 hidden min-w-[160px] max-w-[170px] grid-cols-3 gap-x-6 pt-4 text-left opacity-0 group-hover/navbar:grid group-hover/i18n:opacity-100">
+					<div className="flex flex-col items-end pr-0 lg:pr-4">
 						{regions
 							.sort((a, b) => a.translation.localeCompare(b.translation))
 							.map((reg, index) => (
 								<Link
 									key={index}
 									href={`/${lang}/${reg.code}`}
-									className={classNames('hover:active:text-accent text-left text-lg hover:cursor-pointer', {
+									className={classNames('hover:active:text-accent hover:text-accent cursor-pointer text-left text-lg', {
 										'text-accent': reg.code === region,
 									})}
 									onClick={() => setRegion(reg.code)}
@@ -363,13 +367,13 @@ const DesktopNavigation = ({ lang, region, languages, regions, currencies, navig
 								</Link>
 							))}
 					</div>
-					<div className="flex w-full flex-col items-end">
+					<div className="flex flex-col items-center">
 						{languages
 							.sort((a, b) => a.translation.localeCompare(b.translation))
 							.map((l, index) => (
 								<Typography
 									key={index}
-									className={classNames('hover:active:text-accent text-left text-lg hover:cursor-pointer', {
+									className={classNames('hover:active:text-accent hover:text-accent cursor-pointer text-left text-lg', {
 										'text-accent': l.code === lang,
 									})}
 									onClick={() => setLanguage(l.code)}
@@ -378,14 +382,14 @@ const DesktopNavigation = ({ lang, region, languages, regions, currencies, navig
 								</Typography>
 							))}
 					</div>
-					<div className="flex w-full flex-col items-end">
+					<div className="flex flex-col items-end">
 						{currencies
 							.sort((a, b) => a.code.localeCompare(b.code))
 							.map((curr, index) => (
 								<Typography
 									key={index}
 									size="lg"
-									className={classNames('hover:active:text-accent text-left text-lg hover:cursor-pointer', {
+									className={classNames('hover:active:text-accent hover:text-accent cursor-pointer text-left text-lg', {
 										'text-accent': curr.code === currency,
 									})}
 									onClick={() => setCurrency(curr.code)}

diff --git a/website/src/components/navbar/navbar.tsx b/website/src/components/navbar/navbar.tsx
@@ -86,6 +86,10 @@ async function Navbar({ lang, region }: DefaultParams) {
 							title: translator.t('navigation.reporting'),
 							href: `/${lang}/${region}/transparency/reporting`,
 						},
+						{
+							title: translator.t('navigation.faq'),
+							href: `/${lang}/${region}/faq`,
+						},
 					],
 				},
 			]}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"signIn":{"allowDuplicateEmails":false}}
		{"signIn":{"allowDuplicateEmails":false},"emailPrivacyConfig":{"enableImprovedEmailPrivacy":false}}