Merge remote-tracking branch 'origin/mkue/website-updates' into mkue/…

…website-updates
socialincome-san · Nov 8, 2023 · 77f2169 · 77f2169
2 parents 818c7da + 8599aa7
commit 77f2169
Show file tree

Hide file tree

Showing 11 changed files with 1,195 additions and 651 deletions.
diff --git a/.github/workflows/execute-draw.yml b/.github/workflows/execute-draw.yml
@@ -33,14 +33,14 @@ jobs:
         working-directory: recipients_selection
         run: ./draw.sh
 
-      - name: Commit 🔐
+      - name: Configure some git params 🔧
         run: |
           git config --global user.name $BOT_NAME
           git config --global user.email $BOT_EMAIL
-          git add .
-          git commit -m "completed a recipient draw"
-      - name: Raise PR
+
+      - name: Commit and raise PR 🔐
         uses: peter-evans/create-pull-request@v5
         with:
           branch: draw/results
           branch-suffix: timestamp
+          commit-message: completed a recipient draw
diff --git a/lists/4-aurora-2023-11-08.txt b/lists/4-aurora-2023-11-08.txt
diff --git a/lists/testlist b/lists/testlist
diff --git a/recipients_selection/lists/10-aurora-2023-10-31.txt b/recipients_selection/lists/10-aurora-2023-10-31.txt
diff --git a/recipients_selection/lists/2-testlist b/recipients_selection/lists/2-testlist
@@ -1,2 +1,4 @@
 267bdf7cf143790e41f721799d7b32c55c986c80402bada7cbcfd8bf0886586c
 68d83e3231f56d9d66cd903775249bc0d7ded79c4de1c7f7d789a99e6232b4b9
+267bdf7cf143790e41f721799d7b32c55c986c80402bada7cbcfd8bf0886586c
+68d83e3231f56d9d66cd903775249bc0d7ded79c4de1c7f7d789a99e6232b4b9
diff --git a/lists/aurora-2023-10-31.txt → ...s_selection/lists/4-aurora-2023-11-08.txt b/lists/aurora-2023-10-31.txt → ...s_selection/lists/4-aurora-2023-11-08.txt
diff --git a/shared/src/utils/templates.ts b/shared/src/utils/templates.ts
@@ -28,12 +28,9 @@ const partials = [
 ];
 partials.forEach((partial) => Handlebars.registerPartial(partial.name, readHbs(partial.path)));
 
-export const renderTemplate = async ({
-	language,
-	translationNamespace = [],
-	hbsTemplatePath,
-	context,
-}: RenderTemplateProps) => {
+export const renderTemplate = async (
+	{ language, translationNamespace = [], hbsTemplatePath, context }: RenderTemplateProps,
+) => {
 	const i18n = i18next.createInstance();
 	await i18n
 		.use(

diff --git a/ui/src/globals.css b/ui/src/globals.css
@@ -3,82 +3,82 @@
 @tailwind utilities;
 
 @layer base {
-    :root,
-    .theme-default {
-        --si-yellow: hsl(48, 100%, 49%);
-        --background: hsl(219, 100%, 97%);
-        --foreground: hsl(20 14.3% 4.1%);
+	:root,
+	.theme-default {
+		--si-yellow: hsl(48, 100%, 49%);
+		--background: hsl(219, 100%, 97%);
+		--foreground: hsl(20 14.3% 4.1%);
 
-        --card: hsl(0 100% 100%);
-        --card-foreground: hsl(20 14.3% 4.1%);
+		--card: hsl(0 100% 100%);
+		--card-foreground: hsl(20 14.3% 4.1%);
 
-        --popover: hsl(0 100% 100%);
-        --popover-foreground: hsl(20 14.3% 4.1%);
+		--popover: hsl(0 100% 100%);
+		--popover-foreground: hsl(20 14.3% 4.1%);
 
-        --primary: hsl(216, 54%, 55%);
-        --primary-foreground: hsl(60 9.1% 97.8%);
+		--primary: hsl(216, 54%, 55%);
+		--primary-foreground: hsl(60 9.1% 97.8%);
 
-        --secondary: hsl(8, 89%, 62%);
-        --secondary-foreground: hsl(240, 2%, 21%);
+		--secondary: hsl(8, 89%, 62%);
+		--secondary-foreground: hsl(240, 2%, 21%);
 
-        --muted: hsl(60 4.8% 95.9%);
-        --muted-foreground: hsl(25 5.3% 44.7%);
+		--muted: hsl(60 4.8% 95.9%);
+		--muted-foreground: hsl(25 5.3% 44.7%);
 
-        --accent: hsl(219, 100%, 95%);
-        --accent-foreground: hsl(24 9.8% 10%);
+		--accent: hsl(219, 100%, 95%);
+		--accent-foreground: hsl(24 9.8% 10%);
 
-        --destructive: hsl(0, 75%, 42%);
-        --destructive-foreground: hsl(60 9.1% 97.8%);
+		--destructive: hsl(0, 75%, 42%);
+		--destructive-foreground: hsl(60 9.1% 97.8%);
 
-        --border: hsl(20 5.9% 80%);
-        --input: hsl(20 5.9% 90%);
-        --ring: hsl(216, 54%, 55%);
+		--border: hsl(20 5.9% 80%);
+		--input: hsl(20 5.9% 90%);
+		--ring: hsl(216, 54%, 55%);
 
-        --radius: 0.5rem;
-    }
+		--radius: 0.5rem;
+	}
 
-    .theme-light-blue {
-        --background: hsl(216, 54%, 95%);
-    }
+	.theme-light-blue {
+		--background: hsl(216, 54%, 95%);
+	}
 
-    .theme-dark-blue {
-        --si-yellow: hsl(48, 100%, 49%);
-        --background: hsl(216, 54%, 55%);
-        --foreground: hsl(60 9.1% 97.8%);
+	.theme-dark-blue {
+		--si-yellow: hsl(48, 100%, 49%);
+		--background: hsl(216, 54%, 55%);
+		--foreground: hsl(60 9.1% 97.8%);
 
-        --card: hsl(0 0% 100%);
-        --card-foreground: hsl(20 14.3% 4.1%);
+		--card: hsl(0 0% 100%);
+		--card-foreground: hsl(20 14.3% 4.1%);
 
-        --popover: hsl(216, 54%, 55%);
-        --popover-foreground: hsl(60 9.1% 97.8%);
+		--popover: hsl(216, 54%, 55%);
+		--popover-foreground: hsl(60 9.1% 97.8%);
 
-        --primary: hsl(60 9.1% 97.8%);
-        --primary-foreground: hsl(216, 54%, 55%);
+		--primary: hsl(60 9.1% 97.8%);
+		--primary-foreground: hsl(216, 54%, 55%);
 
-        --secondary: hsl(8, 89%, 62%);
-        --secondary-foreground: hsl(240, 2%, 21%);
+		--secondary: hsl(8, 89%, 62%);
+		--secondary-foreground: hsl(240, 2%, 21%);
 
-        --muted: hsl(60 4.8% 95.9%);
-        --muted-foreground: hsl(25 5.3% 44.7%);
+		--muted: hsl(60 4.8% 95.9%);
+		--muted-foreground: hsl(25 5.3% 44.7%);
 
-        --accent: hsl(216, 54%, 60%);
-        --accent-foreground: hsl(60 9.1% 97.8%);
+		--accent: hsl(216, 54%, 60%);
+		--accent-foreground: hsl(60 9.1% 97.8%);
 
-        --destructive: hsl(0, 75%, 42%);
-        --destructive-foreground: hsl(60 9.1% 97.8%);
+		--destructive: hsl(0, 75%, 42%);
+		--destructive-foreground: hsl(60 9.1% 97.8%);
 
-        --border: hsl(20 5.9% 90%);
-        --input: hsl(20 5.9% 90%);
-        --ring: hsl(216, 54%, 55%);
+		--border: hsl(20 5.9% 90%);
+		--input: hsl(20 5.9% 90%);
+		--ring: hsl(216, 54%, 55%);
 
-        --radius: 0.5rem;
-    }
+		--radius: 0.5rem;
+	}
 }
 
 @layer base {
-    body,
-    .theme-default,
-    .theme-dark-blue {
-        @apply bg-background text-foreground;
-    }
+	body,
+	.theme-default,
+	.theme-dark-blue {
+		@apply bg-background text-foreground;
+	}
 }
diff --git a/website/src/components/i18n-dialog.tsx b/website/src/components/i18n-dialog.tsx
@@ -44,13 +44,9 @@ type I18nDialogProps = {
 	};
 };
 
-export function I18nDialog({
-	languages,
-	regions,
-	currencies,
-	translations,
-	children,
-}: PropsWithChildren<I18nDialogProps>) {
+export function I18nDialog(
+	{ languages, regions, currencies, translations, children }: PropsWithChildren<I18nDialogProps>,
+) {
 	const [open, setOpen] = useState(false);
 	const { language, setLanguage, region, setRegion, currency, setCurrency } = useI18n();
 

diff --git a/website/src/components/navbar/navbar-client.tsx b/website/src/components/navbar/navbar-client.tsx
@@ -64,15 +64,9 @@ type NavbarProps = {
 	}[];
 } & DefaultParams;
 
-export function NavbarClient({
-	lang,
-	region,
-	translations,
-	languages,
-	regions,
-	currencies,
-	sections = [],
-}: NavbarProps) {
+export function NavbarClient(
+	{ lang, region, translations, languages, regions, currencies, sections = [] }: NavbarProps,
+) {
 	const [isOpen, setIsOpen] = useState(false);
 
 	const i18nDialog = (

diff --git a/website/src/components/navbar/navbar.tsx b/website/src/components/navbar/navbar.tsx
@@ -1,6 +1,6 @@
 import { CURRENCY_COOKIE, DefaultParams } from '@/app/[lang]/[region]';
 import { NavbarClient } from '@/components/navbar/navbar-client';
-import { websiteCurrencies, WebsiteLanguage, websiteRegions } from '@/i18n';
+import { WebsiteLanguage, websiteCurrencies, websiteRegions } from '@/i18n';
 import { Translator } from '@socialincome/shared/src/utils/i18n';
 import { cookies } from 'next/headers';