From 3abe1777934303cb8ff839a8e4434a9ebc75a9bc Mon Sep 17 00:00:00 2001 From: Thibault Le Ouay Date: Fri, 3 Nov 2023 09:19:58 +0100 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A4=A3=20fun=20geist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web/next-env.d.ts | 1 - apps/web/package.json | 3 ++- apps/web/src/app/layout.tsx | 6 ++++-- apps/web/src/app/page.tsx | 1 - apps/web/src/components/layout/marketing-layout.tsx | 2 +- apps/web/tailwind.config.ts | 3 ++- pnpm-lock.yaml | 13 +++++++++++++ 7 files changed, 22 insertions(+), 7 deletions(-) diff --git a/apps/web/next-env.d.ts b/apps/web/next-env.d.ts index fd36f9494e..4f11a03dc6 100644 --- a/apps/web/next-env.d.ts +++ b/apps/web/next-env.d.ts @@ -1,6 +1,5 @@ /// /// -/// // NOTE: This file should not be edited // see https://nextjs.org/docs/basic-features/typescript for more information. diff --git a/apps/web/package.json b/apps/web/package.json index ce5b5e44ef..187b8815e9 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -18,8 +18,8 @@ "@openstatus/api": "workspace:*", "@openstatus/db": "workspace:*", "@openstatus/emails": "workspace:*", - "@openstatus/notification-emails": "workspace:*", "@openstatus/notification-discord": "workspace:*", + "@openstatus/notification-emails": "workspace:*", "@openstatus/notification-slack": "workspace:*", "@openstatus/plans": "workspace:*", "@openstatus/react": "workspace:*", @@ -47,6 +47,7 @@ "cmdk": "0.2.0", "contentlayer": "0.3.4", "date-fns": "2.30.0", + "geist": "^1.0.0", "lucide-react": "0.279.0", "luxon": "3.3.0", "micro": "10.0.1", diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx index 9d9b003096..da6c49dbcf 100644 --- a/apps/web/src/app/layout.tsx +++ b/apps/web/src/app/layout.tsx @@ -3,7 +3,7 @@ import "@/styles/globals.css"; import type { Metadata } from "next"; import { Inter } from "next/font/google"; import LocalFont from "next/font/local"; -import { ClerkProvider } from "@clerk/nextjs"; +import { GeistMono, GeistSans } from "geist/font"; import PlausibleProvider from "next-plausible"; import { Toaster } from "@openstatus/ui"; @@ -43,7 +43,9 @@ export default function RootLayout({ {/* TODO: remove plausible from root layout (to avoid tracking subdomains) */} - + {children} diff --git a/apps/web/src/app/page.tsx b/apps/web/src/app/page.tsx index da708bd29a..9b5cf1eebf 100644 --- a/apps/web/src/app/page.tsx +++ b/apps/web/src/app/page.tsx @@ -1,5 +1,4 @@ import Link from "next/link"; -import { ClerkProvider } from "@clerk/nextjs"; import { ChevronRight } from "lucide-react"; import { Badge, Button } from "@openstatus/ui"; diff --git a/apps/web/src/components/layout/marketing-layout.tsx b/apps/web/src/components/layout/marketing-layout.tsx index 5d5ce61dc3..8c00d2dd5a 100644 --- a/apps/web/src/components/layout/marketing-layout.tsx +++ b/apps/web/src/components/layout/marketing-layout.tsx @@ -6,7 +6,7 @@ import { MarketingHeader } from "./marketing-header"; export function MarketingLayout({ children }: { children: React.ReactNode }) { return ( -
+
{children} diff --git a/apps/web/tailwind.config.ts b/apps/web/tailwind.config.ts index bea28c54b4..0a38541c16 100644 --- a/apps/web/tailwind.config.ts +++ b/apps/web/tailwind.config.ts @@ -163,8 +163,9 @@ module.exports = { }, /* */ fontFamily: { - sans: ["var(--font-sans)", ...fontFamily.sans], + sans: ["var(--font-geist-sans)"], cal: ["var(--font-calsans)"], + mono: ["var(--font-geist-mono)"], }, keyframes: { "accordion-down": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 982d2a8a66..b84ca3ea25 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -206,6 +206,9 @@ importers: date-fns: specifier: 2.30.0 version: 2.30.0 + geist: + specifier: ^1.0.0 + version: 1.0.0 lucide-react: specifier: 0.279.0 version: 0.279.0(react@18.2.0) @@ -2489,6 +2492,10 @@ packages: glob: 7.1.7 dev: false + /@next/font@13.5.6: + resolution: {integrity: sha512-urmUq05uCVJsBqAAJEV+xK5OTTodrSxdiG+351SOSjlWctywdBM6qX+K9pIe3K48RxjfnxlBbXjGyOJAji+pfw==} + dev: false + /@next/swc-darwin-arm64@13.5.3: resolution: {integrity: sha512-6hiYNJxJmyYvvKGrVThzo4nTcqvqUTA/JvKim7Auaj33NexDqSNwN5YrrQu+QhZJCIpv2tULSHt+lf+rUflLSw==} engines: {node: '>= 10'} @@ -7836,6 +7843,12 @@ packages: - supports-color dev: false + /geist@1.0.0: + resolution: {integrity: sha512-7hqXZqIdSiFbXjlMZ8Ag0fBAW8RzUjIXPkh160rT4m4ECMtsKdFX+06e0mK28oRCpU+lOB1C5Es8qxzvv7H2Hg==} + dependencies: + '@next/font': 13.5.6 + dev: false + /gensync@1.0.0-beta.2: resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==} engines: {node: '>=6.9.0'} From 380195fd06216895c617e7f39f14f4ca55dff376 Mon Sep 17 00:00:00 2001 From: mxkaske Date: Sat, 4 Nov 2023 13:06:05 +0100 Subject: [PATCH 2/2] chore: include fallback --- apps/web/src/app/layout.tsx | 6 +----- apps/web/src/components/layout/marketing-layout.tsx | 2 +- apps/web/tailwind.config.ts | 6 +++--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx index da6c49dbcf..20651ce9e1 100644 --- a/apps/web/src/app/layout.tsx +++ b/apps/web/src/app/layout.tsx @@ -1,7 +1,6 @@ import "@/styles/globals.css"; import type { Metadata } from "next"; -import { Inter } from "next/font/google"; import LocalFont from "next/font/local"; import { GeistMono, GeistSans } from "geist/font"; import PlausibleProvider from "next-plausible"; @@ -16,8 +15,6 @@ import { import { TailwindIndicator } from "@/components/tailwind-indicator"; import Background from "./_components/background"; -const inter = Inter({ subsets: ["latin"] }); - const calSans = LocalFont({ src: "../public/fonts/CalSans-SemiBold.ttf", variable: "--font-calsans", @@ -38,13 +35,12 @@ export default function RootLayout({ }: { children: React.ReactNode; }) { - // If you want to develop locally without Clerk, Comment the provider below return ( {/* TODO: remove plausible from root layout (to avoid tracking subdomains) */} {children} diff --git a/apps/web/src/components/layout/marketing-layout.tsx b/apps/web/src/components/layout/marketing-layout.tsx index 8c00d2dd5a..5d5ce61dc3 100644 --- a/apps/web/src/components/layout/marketing-layout.tsx +++ b/apps/web/src/components/layout/marketing-layout.tsx @@ -6,7 +6,7 @@ import { MarketingHeader } from "./marketing-header"; export function MarketingLayout({ children }: { children: React.ReactNode }) { return ( -
+
{children} diff --git a/apps/web/tailwind.config.ts b/apps/web/tailwind.config.ts index 0a38541c16..63b4019796 100644 --- a/apps/web/tailwind.config.ts +++ b/apps/web/tailwind.config.ts @@ -163,9 +163,9 @@ module.exports = { }, /* */ fontFamily: { - sans: ["var(--font-geist-sans)"], - cal: ["var(--font-calsans)"], - mono: ["var(--font-geist-mono)"], + sans: ["var(--font-geist-sans)", ...fontFamily.sans], + cal: ["var(--font-calsans)", ...fontFamily.sans], + mono: ["var(--font-geist-mono)", ...fontFamily.mono], }, keyframes: { "accordion-down": {