Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #211

Merged
merged 4 commits into from
Dec 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions frontend/next.config.mjs
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import { withSentryConfig } from '@sentry/nextjs';
/** @type {import('next').NextConfig} */
const nextConfig = {
webpack(config) {
config.devtool = 'hidden-source-map';
return config;
},
images: {
remotePatterns: [
{
Expand All @@ -15,7 +11,7 @@ const nextConfig = {
},
],
},
optimizeFonts: false,
optimizeFonts: true,
};

export default withSentryConfig(nextConfig, {
Expand Down
Binary file added frontend/src/app/fonts/MarckScript-Regular.ttf
Binary file not shown.
Binary file added frontend/src/app/fonts/Merriweather-Black.ttf
Binary file not shown.
Binary file not shown.
Binary file added frontend/src/app/fonts/Merriweather-Bold.ttf
Binary file not shown.
Binary file not shown.
Binary file added frontend/src/app/fonts/Merriweather-Italic.ttf
Binary file not shown.
Binary file added frontend/src/app/fonts/Merriweather-Light.ttf
Binary file not shown.
Binary file not shown.
Binary file added frontend/src/app/fonts/Merriweather-Regular.ttf
Binary file not shown.
Binary file added frontend/src/app/fonts/Montez-Regular.ttf
Binary file not shown.
Binary file added frontend/src/app/fonts/Montserrat-Black.ttf
Binary file not shown.
Binary file not shown.
Binary file added frontend/src/app/fonts/Montserrat-Bold.ttf
Binary file not shown.
Binary file added frontend/src/app/fonts/Montserrat-BoldItalic.ttf
Binary file not shown.
Binary file added frontend/src/app/fonts/Montserrat-ExtraBold.ttf
Binary file not shown.
Binary file not shown.
Binary file added frontend/src/app/fonts/Montserrat-ExtraLight.ttf
Binary file not shown.
Binary file not shown.
Binary file added frontend/src/app/fonts/Montserrat-Italic.ttf
Binary file not shown.
Binary file added frontend/src/app/fonts/Montserrat-Light.ttf
Binary file not shown.
Binary file not shown.
Binary file added frontend/src/app/fonts/Montserrat-Medium.ttf
Binary file not shown.
Binary file not shown.
Binary file added frontend/src/app/fonts/Montserrat-Regular.ttf
Binary file not shown.
Binary file added frontend/src/app/fonts/Montserrat-SemiBold.ttf
Binary file not shown.
Binary file not shown.
Binary file added frontend/src/app/fonts/Montserrat-Thin.ttf
Binary file not shown.
Binary file added frontend/src/app/fonts/Montserrat-ThinItalic.ttf
Binary file not shown.
Binary file added frontend/src/app/fonts/Outfit-Black.ttf
Binary file not shown.
Binary file added frontend/src/app/fonts/Outfit-Bold.ttf
Binary file not shown.
Binary file added frontend/src/app/fonts/Outfit-ExtraBold.ttf
Binary file not shown.
Binary file added frontend/src/app/fonts/Outfit-ExtraLight.ttf
Binary file not shown.
Binary file added frontend/src/app/fonts/Outfit-Light.ttf
Binary file not shown.
Binary file added frontend/src/app/fonts/Outfit-Medium.ttf
Binary file not shown.
Binary file added frontend/src/app/fonts/Outfit-Regular.ttf
Binary file not shown.
Binary file added frontend/src/app/fonts/Outfit-SemiBold.ttf
Binary file not shown.
Binary file added frontend/src/app/fonts/Outfit-Thin.ttf
Binary file not shown.
134 changes: 114 additions & 20 deletions frontend/src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Metadata } from "next";
import { AuthProvider as VisitorAuthProvider } from "@/contexts/VisitorAuthContext";
import ApolloWrapper from "@/apollo/ApolloWrapper";
import { Montserrat, Merriweather, Montez, Outfit, Marck_Script } from "next/font/google";
import localFont from "next/font/local";
import "./globals.css";
import PageTransition from "@/components/PageTransition";
import { VendorAuthProvider } from "@/contexts/VendorAuthContext";
Expand All @@ -14,37 +14,131 @@ export const metadata: Metadata = {
icon : "/favicon.ico"}
};

const montserrat = Montserrat({
subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],

const montserratFont = localFont({
src: [
{
path: "./fonts/Montserrat-Thin.ttf",
weight: "100",
style: "normal",
},
{
path: "./fonts/Montserrat-ExtraLight.ttf",
weight: "200",
style: "normal",
},
{
path: "./fonts/Montserrat-Light.ttf",
weight: "300",
style: "normal",
},
{
path: "./fonts/Montserrat-Regular.ttf",
weight: "400",
style: "normal",
},
{
path: "./fonts/Montserrat-Medium.ttf",
weight: "500",
style: "normal",
},
{
path: "./fonts/Montserrat-SemiBold.ttf",
weight: "600",
style: "normal",
},
{
path: "./fonts/Montserrat-Bold.ttf",
weight: "700",
style: "normal",
},
{
path: "./fonts/Montserrat-ExtraBold.ttf",
weight: "800",
style: "normal",
},
{
path: "./fonts/Montserrat-Black.ttf",
weight: "900",
style: "normal",
},
],
variable: "--font-montserrat",

});

const merriweather = Merriweather({
subsets: ["latin"],
weight: ["300", "400", "700", "900"],
const merriweatherFont = localFont({
src: [
{
path: "./fonts/Merriweather-Light.ttf",
weight: "300",
style: "normal",
},
{
path: "./fonts/Merriweather-Regular.ttf",
weight: "400",
style: "normal",
},
{
path: "./fonts/Merriweather-Bold.ttf",
weight: "700",
style: "normal",
},
{
path: "./fonts/Merriweather-Black.ttf",
weight: "900",
style: "normal",
},
],
variable: "--font-merriweather",

});

const montez = Montez({
subsets: ["latin"],
weight: ["400"],
const montezFont = localFont({
src: [
{
path: "./fonts/Montez-Regular.ttf",
weight: "400",
style: "normal",
},
],
variable: "--font-montez",

});

const outfit = Outfit({
subsets: ["latin"],
weight: ["100","400","700"],
const outfitFont = localFont({
src: [
{
path: "./fonts/Outfit-Thin.ttf",
weight: "100",
style: "normal",
},
{
path: "./fonts/Outfit-Regular.ttf",
weight: "400",
style: "normal",
},
{
path: "./fonts/Outfit-Bold.ttf",
weight: "700",
style: "normal",
},
],
variable: "--font-outfit",

});

const marck_Script = Marck_Script({
subsets: ["latin-ext"],
style:["normal"],
weight: ["400"],
variable: "--font-marck-script",
const marckScriptFont = localFont({
src: [
{
path: "./fonts/MarckScript-Regular.ttf",
weight: "400",
style: "normal",
},
],
variable: "--font-marck-script",
display: "swap",
})
});

export default function RootLayout({
children,
Expand All @@ -58,7 +152,7 @@ export default function RootLayout({
</head>

<body
className={`${montserrat.variable} ${merriweather.variable} ${montez.variable} ${outfit.variable} ${marck_Script.variable}`}
className={`${montserratFont.variable} ${merriweatherFont.variable} ${montezFont.variable} ${outfitFont.variable} ${marckScriptFont.variable}`}
>
<ApolloWrapper>
{/* Wrapping the application with VisitorProvider */}
Expand Down