Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

⚡️ Make landing page static (#2063)

Luke Vellab069f073214b
diff --git a/apps/landing/next.config.js b/apps/landing/next.config.js
index e43347fa3..56c83127a 100644
--- a/apps/landing/next.config.js
+++ b/apps/landing/next.config.js
@@ -9,9 +9,9 @@ function createAppUrl(subpath) {
return url.href;
}
+/** @type {import('next').NextConfig} */
const nextConfig = {
productionBrowserSourceMaps: true,
- output: "standalone",
transpilePackages: [
"@rallly/ui",
"@rallly/tailwind-config",
diff --git a/apps/landing/src/app/[locale]/(main)/(seo)/availability-poll/page.tsx b/apps/landing/src/app/[locale]/(main)/(seo)/availability-poll/page.tsx
index 9e7a1e546..00a23e420 100644
--- a/apps/landing/src/app/[locale]/(main)/(seo)/availability-poll/page.tsx
+++ b/apps/landing/src/app/[locale]/(main)/(seo)/availability-poll/page.tsx
@@ -5,8 +5,11 @@ import { MarketingHero } from "@/components/home/hero";
import { BigTestimonial, Marketing, MentionedBy } from "@/components/marketing";
import { getTranslation } from "@/i18n/server";
-export default async function Page() {
- const { t } = await getTranslation("home");
+export default async function Page(props: {
+ params: Promise<{ locale: string }>;
+}) {
+ const { locale } = await props.params;
+ const { t } = await getTranslation(locale, "home");
return (
<Marketing>
<MarketingHero
@@ -28,15 +31,18 @@ export default async function Page() {
/>
}
/>
- <Bonus />
+ <Bonus locale={locale} />
<BigTestimonial />
<MentionedBy />
</Marketing>
);
}
-export async function generateMetadata(): Promise<Metadata> {
- const { t } = await getTranslation("home");
+export async function generateMetadata(props: {
+ params: Promise<{ locale: string }>;
+}): Promise<Metadata> {
+ const { locale } = await props.params;
+ const { t } = await getTranslation(locale, "home");
return {
title: t("availabilityPollMetaTitle", {
ns: "home",
diff --git a/apps/landing/src/app/[locale]/(main)/(seo)/best-doodle-alternative/page.tsx b/apps/landing/src/app/[locale]/(main)/(seo)/best-doodle-alternative/page.tsx
index 82cfbd7b1..3f5710041 100644
--- a/apps/landing/src/app/[locale]/(main)/(seo)/best-doodle-alternative/page.tsx
+++ b/apps/landing/src/app/[locale]/(main)/(seo)/best-doodle-alternative/page.tsx
@@ -5,8 +5,11 @@ import { MarketingHero } from "@/components/home/hero";
import { BigTestimonial, Marketing, MentionedBy } from "@/components/marketing";
import { getTranslation } from "@/i18n/server";
-export default async function Page() {
- const { t } = await getTranslation(["home"]);
+export default async function Page(props: {
+ params: Promise<{ locale: string }>;
+}) {
+ const { locale } = await props.params;
+ const { t } = await getTranslation(locale, ["home"]);
return (
<Marketing>
<MarketingHero
@@ -18,15 +21,18 @@ export default async function Page() {
})}
callToAction={<Trans t={t} ns="home" i18nKey="createAPoll" />}
/>
- <Bonus />
+ <Bonus locale={locale} />
<BigTestimonial />
<MentionedBy />
</Marketing>
);
}
-export async function generateMetadata(): Promise<Metadata> {
- const { t } = await getTranslation("home");
+export async function generateMetadata(props: {
+ params: Promise<{ locale: string }>;
+}): Promise<Metadata> {
+ const { locale } = await props.params;
+ const { t } = await getTranslation(locale, "home");
return {
title: t("doodleAlternativeMetaTitle", {
ns: "home",
diff --git a/apps/landing/src/app/[locale]/(main)/(seo)/free-scheduling-poll/page.tsx b/apps/landing/src/app/[locale]/(main)/(seo)/free-scheduling-poll/page.tsx
index 91ae2bcec..e25ef0470 100644
--- a/apps/landing/src/app/[locale]/(main)/(seo)/free-scheduling-poll/page.tsx
+++ b/apps/landing/src/app/[locale]/(main)/(seo)/free-scheduling-poll/page.tsx
@@ -5,8 +5,11 @@ import { MarketingHero } from "@/components/home/hero";
import { BigTestimonial, Marketing, MentionedBy } from "@/components/marketing";
import { getTranslation } from "@/i18n/server";
-export default async function Page() {
- const { t } = await getTranslation(["home"]);
+export default async function Page(props: {
+ params: Promise<{ locale: string }>;
+}) {
+ const { locale } = await props.params;
+ const { t } = await getTranslation(locale, ["home"]);
return (
<Marketing>
<MarketingHero
@@ -18,15 +21,18 @@ export default async function Page() {
})}
callToAction={<Trans t={t} ns="home" i18nKey="createASchedulingPoll" />}
/>
- <Bonus />
+ <Bonus locale={locale} />
<BigTestimonial />
<MentionedBy />
</Marketing>
);
}
-export async function generateMetadata(): Promise<Metadata> {
- const { t } = await getTranslation("home");
+export async function generateMetadata(props: {
+ params: Promise<{ locale: string }>;
+}): Promise<Metadata> {
+ const { locale } = await props.params;
+ const { t } = await getTranslation(locale, "home");
return {
title: t("freeSchedulingPollMetaTitle", {
ns: "home",
diff --git a/apps/landing/src/app/[locale]/(main)/(seo)/meeting-poll/page.tsx b/apps/landing/src/app/[locale]/(main)/(seo)/meeting-poll/page.tsx
index 7f442783f..fd6a4d8cb 100644
--- a/apps/landing/src/app/[locale]/(main)/(seo)/meeting-poll/page.tsx
+++ b/apps/landing/src/app/[locale]/(main)/(seo)/meeting-poll/page.tsx
@@ -5,8 +5,11 @@ import { MarketingHero } from "@/components/home/hero";
import { BigTestimonial, Marketing, MentionedBy } from "@/components/marketing";
import { getTranslation } from "@/i18n/server";
-export default async function Page() {
- const { t } = await getTranslation(["home"]);
+export default async function Page(props: {
+ params: Promise<{ locale: string }>;
+}) {
+ const { locale } = await props.params;
+ const { t } = await getTranslation(locale, ["home"]);
return (
<Marketing>
<MarketingHero
@@ -21,15 +24,18 @@ export default async function Page() {
})}
callToAction={<Trans t={t} ns="home" i18nKey="createAPoll" />}
/>
- <Bonus />
+ <Bonus locale={locale} />
<BigTestimonial />
<MentionedBy />
</Marketing>
);
}
-export async function generateMetadata(): Promise<Metadata> {
- const { t } = await getTranslation("home");
+export async function generateMetadata(props: {
+ params: Promise<{ locale: string }>;
+}): Promise<Metadata> {
+ const { locale } = await props.params;
+ const { t } = await getTranslation(locale, "home");
return {
title: t("meetingPollMetaTitle", {
ns: "home",
diff --git a/apps/landing/src/app/[locale]/(main)/(seo)/when2meet-alternative/page.tsx b/apps/landing/src/app/[locale]/(main)/(seo)/when2meet-alternative/page.tsx
index 0f4294cdf..2de320ede 100644
--- a/apps/landing/src/app/[locale]/(main)/(seo)/when2meet-alternative/page.tsx
+++ b/apps/landing/src/app/[locale]/(main)/(seo)/when2meet-alternative/page.tsx
@@ -5,8 +5,11 @@ import { MarketingHero } from "@/components/home/hero";
import { BigTestimonial, Marketing, MentionedBy } from "@/components/marketing";
import { getTranslation } from "@/i18n/server";
-export default async function Page() {
- const { t } = await getTranslation(["home"]);
+export default async function Page(props: {
+ params: Promise<{ locale: string }>;
+}) {
+ const { locale } = await props.params;
+ const { t } = await getTranslation(locale, ["home"]);
return (
<Marketing>
<MarketingHero
@@ -18,15 +21,18 @@ export default async function Page() {
})}
callToAction={<Trans t={t} ns="home" i18nKey="createASchedulingPoll" />}
/>
- <Bonus />
+ <Bonus locale={locale} />
<BigTestimonial />
<MentionedBy />
</Marketing>
);
}
-export async function generateMetadata(): Promise<Metadata> {
- const { t } = await getTranslation("home");
+export async function generateMetadata(props: {
+ params: Promise<{ locale: string }>;
+}): Promise<Metadata> {
+ const { locale } = await props.params;
+ const { t } = await getTranslation(locale, "home");
return {
title: t("when2meetAlternativeMetaTitle", {
ns: "home",
diff --git a/apps/landing/src/app/[locale]/(main)/blog/[slug]/page.tsx b/apps/landing/src/app/[locale]/(main)/blog/[slug]/page.tsx
index 905f1fb88..acfd5ba4d 100644
--- a/apps/landing/src/app/[locale]/(main)/blog/[slug]/page.tsx
+++ b/apps/landing/src/app/[locale]/(main)/blog/[slug]/page.tsx
@@ -9,7 +9,7 @@ import PostHeader from "@/components/blog/post-header";
import { getAllPosts, getPostBySlug } from "@/lib/api";
export default async function Page(props: {
- params: Promise<{ slug: string }>;
+ params: Promise<{ locale: string; slug: string }>;
}) {
const params = await props.params;
const post = getPostBySlug(params.slug, [
@@ -71,7 +71,7 @@ export async function generateStaticParams() {
}
export async function generateMetadata(props: {
- params: Promise<{ slug: string }>;
+ params: Promise<{ locale: string; slug: string }>;
}): Promise<Metadata> {
const params = await props.params;
const post = getPostBySlug(params.slug, [
diff --git a/apps/landing/src/app/[locale]/(main)/blog/page.tsx b/apps/landing/src/app/[locale]/(main)/blog/page.tsx
index ed8486909..855c6a51a 100644
--- a/apps/landing/src/app/[locale]/(main)/blog/page.tsx
+++ b/apps/landing/src/app/[locale]/(main)/blog/page.tsx
@@ -4,8 +4,11 @@ import { getTranslation } from "@/i18n/server";
import { getAllPosts } from "@/lib/api";
import { PostPreview } from "./post-preview";
-export default async function Page() {
- const { t } = await getTranslation("blog");
+export default async function Page(props: {
+ params: Promise<{ locale: string }>;
+}) {
+ const { locale } = await props.params;
+ const { t } = await getTranslation(locale, "blog");
const allPosts = getAllPosts([
"title",
"date",
@@ -42,8 +45,11 @@ export default async function Page() {
);
}
-export async function generateMetadata(): Promise<Metadata> {
- const { t } = await getTranslation("blog");
+export async function generateMetadata(props: {
+ params: Promise<{ locale: string }>;
+}): Promise<Metadata> {
+ const { locale } = await props.params;
+ const { t } = await getTranslation(locale, "blog");
return {
title: t("blogTitle", {
ns: "blog",
diff --git a/apps/landing/src/app/[locale]/(main)/layout.tsx b/apps/landing/src/app/[locale]/(main)/layout.tsx
index e70008611..5914363af 100644
--- a/apps/landing/src/app/[locale]/(main)/layout.tsx
+++ b/apps/landing/src/app/[locale]/(main)/layout.tsx
@@ -32,10 +32,14 @@ export const viewport: Viewport = {
initialScale: 1,
};
-export default async function Root(props: { children: React.ReactNode }) {
- const { children } = props;
+export default async function Root(props: {
+ children: React.ReactNode;
+ params: Promise<{ locale: string }>;
+}) {
+ const { children, params } = props;
+ const { locale } = await params;
- const { t } = await getTranslation();
+ const { t } = await getTranslation(locale);
return (
<div className="relative z-10 mx-auto flex min-h-full w-full max-w-7xl flex-col space-y-8 p-4 sm:p-8">
<header className="flex w-full items-center">
diff --git a/apps/landing/src/app/[locale]/(main)/page.tsx b/apps/landing/src/app/[locale]/(main)/page.tsx
index a83bf3401..ccb897bf5 100644
--- a/apps/landing/src/app/[locale]/(main)/page.tsx
+++ b/apps/landing/src/app/[locale]/(main)/page.tsx
@@ -4,8 +4,11 @@ import { MarketingHero } from "@/components/home/hero";
import { BigTestimonial, Marketing, MentionedBy } from "@/components/marketing";
import { getTranslation } from "@/i18n/server";
-export default async function Page() {
- const { t } = await getTranslation(["home", "common"]);
+export default async function Page(props: {
+ params: Promise<{ locale: string }>;
+}) {
+ const { locale } = await props.params;
+ const { t } = await getTranslation(locale, ["home", "common"]);
return (
<Marketing>
<MarketingHero
@@ -22,15 +25,18 @@ export default async function Page() {
ns: "home",
})}
/>
- <Bonus />
+ <Bonus locale={locale} />
<BigTestimonial />
<MentionedBy />
</Marketing>
);
}
-export async function generateMetadata(): Promise<Metadata> {
- const { t } = await getTranslation("home");
+export async function generateMetadata(props: {
+ params: Promise<{ locale: string }>;
+}): Promise<Metadata> {
+ const { locale } = await props.params;
+ const { t } = await getTranslation(locale, "home");
return {
title: t("metaTitle", {
defaultValue: "Rallly: Group Scheduling Tool",
diff --git a/apps/landing/src/app/[locale]/(main)/pricing/page.tsx b/apps/landing/src/app/[locale]/(main)/pricing/page.tsx
index 6af08e3dc..0873e3657 100644
--- a/apps/landing/src/app/[locale]/(main)/pricing/page.tsx
+++ b/apps/landing/src/app/[locale]/(main)/pricing/page.tsx
@@ -7,8 +7,8 @@ import { linkToApp } from "@/lib/linkToApp";
import { PriceTables } from "./pricing-table";
-const FAQ = async () => {
- const { t } = await getTranslation("pricing");
+const FAQ = async (props: { locale: string }) => {
+ const { t } = await getTranslation(props.locale, "pricing");
return (
<section>
<h2 className="font-bold text-2xl">
@@ -122,8 +122,11 @@ const FAQ = async () => {
);
};
-export default async function Page() {
- const { t } = await getTranslation("pricing");
+export default async function Page(props: {
+ params: Promise<{ locale: string }>;
+}) {
+ const { locale } = await props.params;
+ const { t } = await getTranslation(locale, "pricing");
return (
<article className="mx-auto max-w-3xl space-y-6">
<header className="space-y-2 sm:p-6 sm:text-center">
@@ -173,13 +176,16 @@ export default async function Page() {
</div>
</section>
<hr className="border-transparent" />
- <FAQ />
+ <FAQ locale={locale} />
</article>
);
}
-export async function generateMetadata() {
- const { t } = await getTranslation(["common", "pricing"]);
+export async function generateMetadata(props: {
+ params: Promise<{ locale: string }>;
+}) {
+ const { locale } = await props.params;
+ const { t } = await getTranslation(locale, ["common", "pricing"]);
return {
title: t("pricing", { ns: "common", defaultValue: "Pricing" }),
description: t("pricingDescription", {
diff --git a/apps/landing/src/app/[locale]/layout.tsx b/apps/landing/src/app/[locale]/layout.tsx
index e33bf36ef..6ab23f6db 100644
--- a/apps/landing/src/app/[locale]/layout.tsx
+++ b/apps/landing/src/app/[locale]/layout.tsx
@@ -5,6 +5,7 @@ import { PostHogProvider } from "@rallly/posthog/client";
import { Analytics } from "@vercel/analytics/react";
import { domAnimation, LazyMotion } from "motion/react";
import type { Metadata, Viewport } from "next";
+import { Suspense } from "react";
import { PostHogPageView } from "@/components/posthog-page-view";
import { sans } from "@/fonts/sans";
import { I18nProvider } from "@/i18n/client/i18n-provider";
@@ -19,10 +20,14 @@ export const viewport: Viewport = {
initialScale: 1,
};
-export default async function Root(props: { children: React.ReactNode }) {
- const { children } = props;
+export default async function Root(props: {
+ children: React.ReactNode;
+ params: Promise<{ locale: string }>;
+}) {
+ const { children, params } = props;
+ const { locale } = await params;
- const { i18n } = await getTranslation();
+ const { i18n } = await getTranslation(locale);
const translations = i18n.store.data;
return (
@@ -30,7 +35,9 @@ export default async function Root(props: { children: React.ReactNode }) {
<body>
<LazyMotion features={domAnimation}>
<PostHogProvider>
- <PostHogPageView />
+ <Suspense fallback={null}>
+ <PostHogPageView />
+ </Suspense>
<I18nProvider
locale={i18n.resolvedLanguage}
resources={translations}
diff --git a/apps/landing/src/app/[locale]/licensing/thank-you/page.tsx b/apps/landing/src/app/[locale]/licensing/thank-you/page.tsx
index 5eb3016fe..e658bcaf1 100644
--- a/apps/landing/src/app/[locale]/licensing/thank-you/page.tsx
+++ b/apps/landing/src/app/[locale]/licensing/thank-you/page.tsx
@@ -3,8 +3,11 @@ import { Trans } from "react-i18next/TransWithoutContext";
import { LinkBase } from "@/i18n/client/link";
import { getTranslation } from "@/i18n/server";
-export default async function LicensingThankYouPage() {
- const { t } = await getTranslation();
+export default async function LicensingThankYouPage(props: {
+ params: Promise<{ locale: string }>;
+}) {
+ const { locale } = await props.params;
+ const { t } = await getTranslation(locale);
return (
<main className="relative flex h-dvh flex-col p-4 sm:justify-center sm:p-16">
<div className="relative z-10 mx-auto w-full max-w-2xl space-y-6">
diff --git a/apps/landing/src/app/[locale]/not-found.tsx b/apps/landing/src/app/[locale]/not-found.tsx
index 510d0ec0b..fa843295d 100644
--- a/apps/landing/src/app/[locale]/not-found.tsx
+++ b/apps/landing/src/app/[locale]/not-found.tsx
@@ -1,11 +1,10 @@
-import ErrorPage from "@/components/error-page";
-import { getTranslation } from "@/i18n/server";
+"use client";
-export default async function Page() {
- // TODO (Luke Vella) [2023-11-03]: not-found doesn't have access to params right now
- // See: https://github.com/vercel/next.js/discussions/43179
- const { t } = await getTranslation();
+import ErrorPage from "@/components/error-page";
+import { useTranslation } from "@/i18n/client/use-translation";
+export default function Page() {
+ const { t } = useTranslation("common");
return (
<ErrorPage
title={t("notFoundTitle")}
diff --git a/apps/landing/src/components/home/bonus.tsx b/apps/landing/src/components/home/bonus.tsx
index efb5225ae..c4a8f0af5 100644
--- a/apps/landing/src/components/home/bonus.tsx
+++ b/apps/landing/src/components/home/bonus.tsx
@@ -1,4 +1,3 @@
-import { prisma } from "@rallly/database";
import {
CalendarCheck2Icon,
LanguagesIcon,
@@ -6,19 +5,14 @@ import {
ZapIcon,
} from "lucide-react";
import { Trans } from "react-i18next/TransWithoutContext";
-
import { BonusItem } from "@/components/home/bonus-item";
import { getTranslation } from "@/i18n/server";
+import { getUserCount } from "@/lib/data";
+
+export async function Bonus(props: { locale: string }) {
+ const userCount = await getUserCount();
+ const { t } = await getTranslation(props.locale, ["home"]);
-export async function Bonus() {
- const { t } = await getTranslation();
- const userCount = await prisma.user.count({
- where: {
- isAnonymous: false,
- },
- });
- const roundedUserCount =
- userCount > 100000 ? Math.floor(userCount / 10000) * 10000 : userCount;
return (
<div className="mx-auto flex flex-wrap justify-center gap-2 whitespace-nowrap text-center sm:grid-cols-4 sm:gap-4 sm:gap-x-8">
<BonusItem
@@ -30,7 +24,7 @@ export async function Bonus() {
i18nKey="statsUsersRegistered"
ns="home"
defaults="{count, number, ::compact-short} registered users"
- values={{ count: roundedUserCount }}
+ values={{ count: userCount }}
/>
</BonusItem>
<BonusItem
diff --git a/apps/landing/src/i18n/client/link.tsx b/apps/landing/src/i18n/client/link.tsx
index 5093c757b..035b39b51 100644
--- a/apps/landing/src/i18n/client/link.tsx
+++ b/apps/landing/src/i18n/client/link.tsx
@@ -2,7 +2,7 @@
import { defaultLocale } from "@rallly/languages";
import Link from "next/link";
-import { useTranslation } from "react-i18next";
+import { useTranslation } from "@/i18n/client/use-translation";
export const LinkBase = ({
href,
diff --git a/apps/landing/src/i18n/server.ts b/apps/landing/src/i18n/server.ts
index b1ed8786a..955a83c0d 100644
--- a/apps/landing/src/i18n/server.ts
+++ b/apps/landing/src/i18n/server.ts
@@ -1,13 +1,12 @@
import type { Namespace } from "i18next";
-import { headers } from "next/headers";
-import { defaultNS, fallbackLng, headerName } from "@/i18n/settings";
+import { defaultNS, fallbackLng } from "@/i18n/settings";
import { i18next } from "./i18next";
export async function getTranslation<Ns extends Namespace>(
+ locale: string = fallbackLng,
ns: string | string[] = defaultNS,
) {
- const headerList = await headers();
- const lng = headerList.get(headerName);
+ const lng = locale;
if (lng && i18next.resolvedLanguage !== lng) {
await i18next.changeLanguage(lng);
}
@@ -16,7 +15,7 @@ export async function getTranslation<Ns extends Namespace>(
await i18next.loadNamespaces(ns);
}
return {
- t: i18next.getFixedT<Ns>(lng ?? fallbackLng),
+ t: i18next.getFixedT<Ns>(lng),
i18n: i18next,
};
}
diff --git a/apps/landing/src/lib/data.ts b/apps/landing/src/lib/data.ts
new file mode 100644
index 000000000..dcfde5bfc
--- /dev/null
+++ b/apps/landing/src/lib/data.ts
@@ -0,0 +1,19 @@
+import "server-only";
+
+import { prisma } from "@rallly/database";
+import { unstable_cache } from "next/cache";
+
+export const getUserCount = unstable_cache(
+ async () => {
+ const userCount = await prisma.user.count({
+ where: {
+ isAnonymous: false,
+ },
+ });
+ return userCount;
+ },
+ ["user-count"],
+ {
+ revalidate: false,
+ },
+);