π¨ The ultimate agentic social media scheduling tool π€
TypeScript nextjsopen-sourceopen-source-social-media-scheduling-toolosspostiz-cloudpostiz-hostedredisscheduling-toolsocial-media-scheduling-tooltypescript
fix(frontend): self-host Plus Jakarta Sans instead of next/font/google
Gilad Resisiea9c820160dc
diff --git a/apps/frontend/src/app/(app)/layout.tsx b/apps/frontend/src/app/(app)/layout.tsxindex 54efee58a..0b8addbee 100644--- a/apps/frontend/src/app/(app)/layout.tsx+++ b/apps/frontend/src/app/(app)/layout.tsx@@ -6,7 +6,7 @@ import 'react-tooltip/dist/react-tooltip.css';import '@copilotkit/react-ui/styles.css';import LayoutContext from '@gitroom/frontend/components/layout/layout.context';import { ReactNode } from 'react';-import { Plus_Jakarta_Sans } from 'next/font/google';+import { jakartaSans } from '@gitroom/frontend/fonts/plus-jakarta-sans/plus.jakarta.sans.font';import PlausibleProvider from 'next-plausible';import clsx from 'clsx';import { VariableContextComponent } from '@gitroom/react/helpers/variable.context';@@ -25,12 +25,6 @@ import { HtmlComponent } from '@gitroom/frontend/components/layout/html.componenimport Script from 'next/script';import { ChangeDirClient } from '@gitroom/frontend/components/new-layout/change.dir.client';-const jakartaSans = Plus_Jakarta_Sans({- weight: ['600', '500'],- style: ['normal', 'italic'],- subsets: ['latin'],-});-export default async function AppLayout({ children }: { children: ReactNode }) {const cookieStore = await cookies();const language = cookieStore.get(cookieName)?.value || fallbackLng;diff --git a/apps/frontend/src/app/(extension)/layout.tsx b/apps/frontend/src/app/(extension)/layout.tsxindex db1fe6d7e..5f3f944af 100644--- a/apps/frontend/src/app/(extension)/layout.tsx+++ b/apps/frontend/src/app/(extension)/layout.tsx@@ -4,17 +4,11 @@ import 'react-tooltip/dist/react-tooltip.css';import '@copilotkit/react-ui/styles.css';import LayoutContext from '@gitroom/frontend/components/layout/layout.context';import { ReactNode } from 'react';-import { Plus_Jakarta_Sans } from 'next/font/google';+import { jakartaSans } from '@gitroom/frontend/fonts/plus-jakarta-sans/plus.jakarta.sans.font';import clsx from 'clsx';import { VariableContextComponent } from '@gitroom/react/helpers/variable.context';import UtmSaver from '@gitroom/helpers/utils/utm.saver';-const jakartaSans = Plus_Jakarta_Sans({- weight: ['600', '500'],- style: ['normal', 'italic'],- subsets: ['latin'],-});-export default async function AppLayout({ children }: { children: ReactNode }) {return (<html>diff --git a/apps/frontend/src/app/(provider)/layout.tsx b/apps/frontend/src/app/(provider)/layout.tsxindex 149f45b28..2aabf8b64 100644--- a/apps/frontend/src/app/(provider)/layout.tsx+++ b/apps/frontend/src/app/(provider)/layout.tsx@@ -6,17 +6,11 @@ import 'react-tooltip/dist/react-tooltip.css';import '@copilotkit/react-ui/styles.css';import LayoutContext from '@gitroom/frontend/components/layout/layout.context';import { ReactNode } from 'react';-import { Plus_Jakarta_Sans } from 'next/font/google';+import { jakartaSans } from '@gitroom/frontend/fonts/plus-jakarta-sans/plus.jakarta.sans.font';import clsx from 'clsx';import { VariableContextComponent } from '@gitroom/react/helpers/variable.context';import UtmSaver from '@gitroom/helpers/utils/utm.saver';-const jakartaSans = Plus_Jakarta_Sans({- weight: ['600', '500'],- style: ['normal', 'italic'],- subsets: ['latin'],-});-export default async function AppLayout({ children }: { children: ReactNode }) {return (<html>diff --git a/apps/frontend/src/components/new-layout/layout.component.tsx b/apps/frontend/src/components/new-layout/layout.component.tsxindex d2502da64..413d0d97a 100644--- a/apps/frontend/src/components/new-layout/layout.component.tsx+++ b/apps/frontend/src/components/new-layout/layout.component.tsx@@ -2,7 +2,7 @@import React, { ReactNode, useCallback, useEffect, useState } from 'react';import { Logo } from '@gitroom/frontend/components/new-layout/logo';-import { Plus_Jakarta_Sans } from 'next/font/google';+import { jakartaSans } from '@gitroom/frontend/fonts/plus-jakarta-sans/plus.jakarta.sans.font';const ModeComponent = dynamic(() => import('@gitroom/frontend/components/layout/mode.component'),{@@ -44,12 +44,6 @@ import { FirstBillingComponent } from '@gitroom/frontend/components/billing/firsimport { TrialTracker } from '@gitroom/frontend/components/layout/gtm.component';import { setSentryUser } from '@gitroom/react/sentry/initialize.sentry.client';-const jakartaSans = Plus_Jakarta_Sans({- weight: ['600', '500', '700'],- style: ['normal', 'italic'],- subsets: ['latin'],-});-export const LayoutComponent = ({ children }: { children: ReactNode }) => {const fetch = useFetch();diff --git a/apps/frontend/src/fonts/plus-jakarta-sans/OFL.txt b/apps/frontend/src/fonts/plus-jakarta-sans/OFL.txtnew file mode 100644index 000000000..ea69b0ca1--- /dev/null+++ b/apps/frontend/src/fonts/plus-jakarta-sans/OFL.txt@@ -0,0 +1,93 @@+Copyright 2020 The Plus Jakarta Sans Project Authors (https://github.com/tokotype/PlusJakartaSans)++This Font Software is licensed under the SIL Open Font License, Version 1.1.+This license is copied below, and is also available with a FAQ at:+http://scripts.sil.org/OFL+++-----------------------------------------------------------+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007+-----------------------------------------------------------++PREAMBLE+The goals of the Open Font License (OFL) are to stimulate worldwide+development of collaborative font projects, to support the font creation+efforts of academic and linguistic communities, and to provide a free and+open framework in which fonts may be shared and improved in partnership+with others.++The OFL allows the licensed fonts to be used, studied, modified and+redistributed freely as long as they are not sold by themselves. The+fonts, including any derivative works, can be bundled, embedded,+redistributed and/or sold with any software provided that any reserved+names are not used by derivative works. The fonts and derivatives,+however, cannot be released under any other type of license. The+requirement for fonts to remain under this license does not apply+to any document created using the fonts or their derivatives.++DEFINITIONS+"Font Software" refers to the set of files released by the Copyright+Holder(s) under this license and clearly marked as such. This may+include source files, build scripts and documentation.++"Reserved Font Name" refers to any names specified as such after the+copyright statement(s).++"Original Version" refers to the collection of Font Software components as+distributed by the Copyright Holder(s).++"Modified Version" refers to any derivative made by adding to, deleting,+or substituting -- in part or in whole -- any of the components of the+Original Version, by changing formats or by porting the Font Software to a+new environment.++"Author" refers to any designer, engineer, programmer, technical+writer or other person who contributed to the Font Software.++PERMISSION & CONDITIONS+Permission is hereby granted, free of charge, to any person obtaining+a copy of the Font Software, to use, study, copy, merge, embed, modify,+redistribute, and sell modified and unmodified copies of the Font+Software, subject to the following conditions:++1) Neither the Font Software nor any of its individual components,+in Original or Modified Versions, may be sold by itself.++2) Original or Modified Versions of the Font Software may be bundled,+redistributed and/or sold with any software, provided that each copy+contains the above copyright notice and this license. These can be+included either as stand-alone text files, human-readable headers or+in the appropriate machine-readable metadata fields within text or+binary files as long as those fields can be easily viewed by the user.++3) No Modified Version of the Font Software may use the Reserved Font+Name(s) unless explicit written permission is granted by the corresponding+Copyright Holder. This restriction only applies to the primary font name as+presented to the users.++4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font+Software shall not be used to promote, endorse or advertise any+Modified Version, except to acknowledge the contribution(s) of the+Copyright Holder(s) and the Author(s) or with their explicit written+permission.++5) The Font Software, modified or unmodified, in part or in whole,+must be distributed entirely under this license, and must not be+distributed under any other license. The requirement for fonts to+remain under this license does not apply to any document created+using the Font Software.++TERMINATION+This license becomes null and void if any of the above conditions are+not met.++DISCLAIMER+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM+OTHER DEALINGS IN THE FONT SOFTWARE.diff --git a/apps/frontend/src/fonts/plus-jakarta-sans/PlusJakartaSans-Italic.woff2 b/apps/frontend/src/fonts/plus-jakarta-sans/PlusJakartaSans-Italic.woff2new file mode 100644index 000000000..87b8a3171Binary files /dev/null and b/apps/frontend/src/fonts/plus-jakarta-sans/PlusJakartaSans-Italic.woff2 differdiff --git a/apps/frontend/src/fonts/plus-jakarta-sans/PlusJakartaSans.woff2 b/apps/frontend/src/fonts/plus-jakarta-sans/PlusJakartaSans.woff2new file mode 100644index 000000000..aaa7f04d3Binary files /dev/null and b/apps/frontend/src/fonts/plus-jakarta-sans/PlusJakartaSans.woff2 differdiff --git a/apps/frontend/src/fonts/plus-jakarta-sans/plus.jakarta.sans.font.ts b/apps/frontend/src/fonts/plus-jakarta-sans/plus.jakarta.sans.font.tsnew file mode 100644index 000000000..1892d82f5--- /dev/null+++ b/apps/frontend/src/fonts/plus-jakarta-sans/plus.jakarta.sans.font.ts@@ -0,0 +1,12 @@+import localFont from 'next/font/local';++export const jakartaSans = localFont({+ src: [+ { path: './PlusJakartaSans.woff2', weight: '500 700', style: 'normal' },+ {+ path: './PlusJakartaSans-Italic.woff2',+ weight: '500 700',+ style: 'italic',+ },+ ],+});