From 736d198d7d0d2034c64cd0d90feb6079a7a6c653 Mon Sep 17 00:00:00 2001 From: Dominik Koch Date: Tue, 7 Jan 2025 19:11:28 +0100 Subject: [PATCH 1/3] sync(staff): prod -> main --- data/staffs.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/data/staffs.json b/data/staffs.json index 8221fdae..a991dea5 100644 --- a/data/staffs.json +++ b/data/staffs.json @@ -4,7 +4,7 @@ "categories": ["Developers", "Translators"], "description": "Founder, Lead Developer, German Translator", "imageUrl": "https://cdn.wouldyoubot.gg/staff/developer/Dominik.webp", - "websiteUrl": "https://dominikko.ch/" + "websiteUrl": "https://brickver.com/@dominik" }, { "name": "ForGetFulSkyBro", @@ -20,6 +20,20 @@ "imageUrl": "https://cdn.wouldyoubot.gg/staff/developer/Skeleton.webp", "websiteUrl": "https://github.com/nidrux" }, + { + "name": "Taqib", + "categories": ["Developers"], + "description": "Developer", + "imageUrl": "https://cdn.wouldyoubot.gg/staff/developer/Taqib.webp", + "websiteUrl": "https://taqib.dev/" + }, + { + "name": "Woofer21", + "categories": ["Developers"], + "description": "Developer", + "imageUrl": "https://cdn.wouldyoubot.gg/staff/developer/Woofer.webp", + "websiteUrl": "https://woofer21.com/" + }, { "name": "Noam", "categories": ["Translators", "Beta Testers"], @@ -55,13 +69,6 @@ "imageUrl": "https://cdn.wouldyoubot.gg/staff/special/Finn.webp", "websiteUrl": "https://github.com/finnkoetting" }, - { - "name": "Sean", - "categories": ["Contributors"], - "description": "EX-Developer", - "imageUrl": "https://cdn.wouldyoubot.gg/staff/special/Sean.webp", - "websiteUrl": "https://sattler.dev/" - }, { "name": "NightKiller", "categories": ["Contributors", "Beta Testers"], @@ -129,16 +136,9 @@ "name": "Paulos", "categories": ["Developers"], "description": "Frontend Guy", - "imageUrl": "https://cdn.wouldyoubot.gg/staff/special/Paulos.webp", + "imageUrl": "https://cdn.wouldyoubot.gg/staff/developer/Paulos.webp", "websiteUrl": "https://dpaulos6.com?utm_source=wouldyoubot.gg" }, - { - "name": "Paul", - "categories": ["Developers"], - "description": "Full-stack Developer", - "imageUrl": "https://cdn.wouldyoubot.gg/staff/developer/Paul.webp", - "websiteUrl": "https://github.com/Jester0027" - }, { "name": "Dan", "categories": ["Contributors"], From 4a5d8affc83fec1027c3381329dff1f2e35f8922 Mon Sep 17 00:00:00 2001 From: Dominik Koch Date: Tue, 7 Jan 2025 19:36:10 +0100 Subject: [PATCH 2/3] sync: full prod to staging sync --- .vscode/settings.json | 5 +- app/layout.tsx | 52 ++-- app/page.tsx | 3 +- app/premium/page.tsx | 353 ++----------------------- components/Embeds/MainDiscordEmbed.tsx | 283 ++++++++++---------- components/FeatureItem.tsx | 16 +- components/Footer.tsx | 18 +- components/Homepage/Content.tsx | 216 +++++++-------- components/Premium/Content.tsx | 305 +++++++++++++++++++++ components/cookies/cookie-banner.tsx | 78 ++++++ components/cookies/cookie-dialog.tsx | 118 +++++++++ components/cookies/cookie-provider.tsx | 131 +++++++++ components/cookies/index.ts | 5 + components/plausible-script.tsx | 19 ++ helpers/hooks/useCookies.ts | 64 ++++- package.json | 2 +- pnpm-lock.yaml | 68 +++-- 17 files changed, 1083 insertions(+), 653 deletions(-) create mode 100644 components/Premium/Content.tsx create mode 100644 components/cookies/cookie-banner.tsx create mode 100644 components/cookies/cookie-dialog.tsx create mode 100644 components/cookies/cookie-provider.tsx create mode 100644 components/cookies/index.ts create mode 100644 components/plausible-script.tsx diff --git a/.vscode/settings.json b/.vscode/settings.json index b0c11a73..b654e82e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,5 +2,8 @@ "css.customData": [ ".vscode/tailwind.json" ], - "editor.defaultFormatter": "esbenp.prettier-vscode" + "editor.defaultFormatter": "esbenp.prettier-vscode", + "[typescriptreact]": { + "editor.defaultFormatter": "vscode.typescript-language-features" + } } diff --git a/app/layout.tsx b/app/layout.tsx index f0aca701..6fb89762 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,11 +1,15 @@ +import { PlausibleScript } from '@/components/plausible-script' +import { CookieProvider } from '@/components/cookies' +import { IdTokenJWT } from '@/helpers/oauth/types' import { getIdToken } from '@/helpers/oauth' +import { ThemeProvider } from 'next-themes' import Footer from '@/components/Footer' import Navbar from '@/components/Navbar' import { Inter } from 'next/font/google' import Alert from '@/components/Alert' -import Providers from './providers' import React from 'react' import './globals.css' + const inter = Inter({ subsets: ['latin'] }) export default function RootLayout({ @@ -16,30 +20,30 @@ export default function RootLayout({ const idToken = getIdToken() return ( - + -