mirror of
https://github.com/documenso/documenso.git
synced 2025-11-16 01:32:06 +10:00
fixed next/font load on ALL pages and toast.
This commit is contained in:
@ -1,5 +1,4 @@
|
|||||||
import { useEffect } from "react";
|
import { useEffect } from "react";
|
||||||
import { Montserrat, Qwigley } from "next/font/google";
|
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
import { NEXT_PUBLIC_WEBAPP_URL } from "@documenso/lib/constants";
|
import { NEXT_PUBLIC_WEBAPP_URL } from "@documenso/lib/constants";
|
||||||
@ -10,20 +9,6 @@ import { PaperAirplaneIcon } from "@heroicons/react/24/outline";
|
|||||||
import { SubscriptionStatus } from "@prisma/client";
|
import { SubscriptionStatus } from "@prisma/client";
|
||||||
import { useSession } from "next-auth/react";
|
import { useSession } from "next-auth/react";
|
||||||
|
|
||||||
const montserrat = Montserrat({
|
|
||||||
subsets: ["latin"],
|
|
||||||
weight: ["400", "700"],
|
|
||||||
display: "swap",
|
|
||||||
variable: "--font-sans",
|
|
||||||
});
|
|
||||||
|
|
||||||
const qwigley = Qwigley({
|
|
||||||
subsets: ["latin"],
|
|
||||||
weight: ["400"],
|
|
||||||
display: "swap",
|
|
||||||
variable: "--font-qwigley",
|
|
||||||
});
|
|
||||||
|
|
||||||
function useRedirectToLoginIfUnauthenticated() {
|
function useRedirectToLoginIfUnauthenticated() {
|
||||||
const { data: session, status } = useSession();
|
const { data: session, status } = useSession();
|
||||||
const loading = status === "loading";
|
const loading = status === "loading";
|
||||||
@ -54,7 +39,7 @@ export default function Layout({ children }: any) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div className={`${montserrat.variable} min-h-full font-sans`}>
|
<div className="min-h-full">
|
||||||
<Navigation />
|
<Navigation />
|
||||||
|
|
||||||
<main>
|
<main>
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
import { ReactElement, ReactNode } from "react";
|
import { ReactElement, ReactNode } from "react";
|
||||||
import { NextPage } from "next";
|
import { NextPage } from "next";
|
||||||
import type { AppProps } from "next/app";
|
import type { AppProps } from "next/app";
|
||||||
|
import { Montserrat, Qwigley } from "next/font/google";
|
||||||
import { SubscriptionProvider } from "@documenso/lib/stripe/providers/subscription-provider";
|
import { SubscriptionProvider } from "@documenso/lib/stripe/providers/subscription-provider";
|
||||||
import "../../../node_modules/placeholder-loading/src/scss/placeholder-loading.scss";
|
import "../../../node_modules/placeholder-loading/src/scss/placeholder-loading.scss";
|
||||||
import "../../../node_modules/react-resizable/css/styles.css";
|
import "../../../node_modules/react-resizable/css/styles.css";
|
||||||
@ -11,6 +12,20 @@ import "react-tooltip/dist/react-tooltip.css";
|
|||||||
|
|
||||||
export { coloredConsole } from "@documenso/lib";
|
export { coloredConsole } from "@documenso/lib";
|
||||||
|
|
||||||
|
const montserrat = Montserrat({
|
||||||
|
subsets: ["latin"],
|
||||||
|
weight: ["400", "700"],
|
||||||
|
display: "swap",
|
||||||
|
variable: "--font-sans",
|
||||||
|
});
|
||||||
|
|
||||||
|
const qwigley = Qwigley({
|
||||||
|
subsets: ["latin"],
|
||||||
|
weight: ["400"],
|
||||||
|
display: "swap",
|
||||||
|
variable: "--font-qwigley",
|
||||||
|
});
|
||||||
|
|
||||||
export type NextPageWithLayout<P = {}, IP = P> = NextPage<P, IP> & {
|
export type NextPageWithLayout<P = {}, IP = P> = NextPage<P, IP> & {
|
||||||
getLayout?: (page: ReactElement) => ReactNode;
|
getLayout?: (page: ReactElement) => ReactNode;
|
||||||
};
|
};
|
||||||
@ -27,8 +42,10 @@ export default function App({
|
|||||||
return (
|
return (
|
||||||
<SessionProvider session={session}>
|
<SessionProvider session={session}>
|
||||||
<SubscriptionProvider initialSubscription={initialSubscription}>
|
<SubscriptionProvider initialSubscription={initialSubscription}>
|
||||||
|
<div className={`${montserrat.variable} font-sans`}>
|
||||||
<Toaster position="top-center" />
|
<Toaster position="top-center" />
|
||||||
{getLayout(<Component {...pageProps} />)}
|
{getLayout(<Component {...pageProps} />)}
|
||||||
|
</div>
|
||||||
</SubscriptionProvider>
|
</SubscriptionProvider>
|
||||||
</SessionProvider>
|
</SessionProvider>
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user