Merge pull request #11 from roqqetmedia/develop

Production v1.2.0
roqqetmedia · Aug 18, 2023 · ba97e15 · ba97e15 · vercel · Aug 18, 2023
2 parents 161d799 + 40b56ab
commit ba97e15
Show file tree

Hide file tree

Showing 7 changed files with 573 additions and 774 deletions.
diff --git a/package.json b/package.json
@@ -14,28 +14,29 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "framer-motion": "10.15.0",
-    "next": "13.4.12",
+    "framer-motion": "10.16.0",
+    "next": "13.4.18",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "sharp": "0.32.4"
+    "sharp": "0.32.5"
   },
   "devDependencies": {
     "@tailwindcss/typography": "0.5.9",
-    "@types/node": "20.4.5",
-    "@types/react": "18.2.18",
+    "@types/node": "20.5.0",
+    "@types/react": "18.2.20",
     "@types/react-dom": "18.2.7",
-    "@typescript-eslint/eslint-plugin": "6.2.1",
-    "@typescript-eslint/parser": "6.2.1",
-    "autoprefixer": "10.4.14",
-    "eslint": "8.46.0",
-    "eslint-config-next": "13.4.12",
-    "eslint-config-prettier": "8.9.0",
+    "@typescript-eslint/eslint-plugin": "6.4.0",
+    "@typescript-eslint/parser": "6.4.0",
+    "autoprefixer": "10.4.15",
+    "clsx": "2.0.0",
+    "eslint": "8.47.0",
+    "eslint-config-next": "13.4.18",
+    "eslint-config-prettier": "9.0.0",
     "husky": "8.0.3",
-    "lint-staged": "13.2.3",
-    "postcss": "8.4.27",
-    "prettier": "3.0.0",
-    "prettier-plugin-tailwindcss": "0.4.1",
+    "lint-staged": "14.0.0",
+    "postcss": "8.4.28",
+    "prettier": "2.8.8",
+    "prettier-plugin-tailwindcss": "0.3.0",
     "tailwind-merge": "1.14.0",
     "tailwindcss": "3.3.3",
     "typescript": "5.1.6"

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,8 +1,7 @@
 import { ReactNode } from "react";
-import { Montserrat } from "next/font/google";
-import { twMerge } from "tailwind-merge";
 import Header from "@/ui/header/header";
 import Footer from "@/ui/footer/footer";
+import { cn, montserratFont } from "@/utils";
 import { APP_ENV, SITE_URL } from "@/config";
 import "@/app/globals.css";
 
@@ -35,7 +34,7 @@ export const metadata = {
         alt: "Roqqet Media",
       },
     ],
-    locale: "en_UK",
+    locale: "en_GB",
     type: "website",
   },
   twitter: {
@@ -61,12 +60,6 @@ export const metadata = {
   },
 };
 
-const montserrat = Montserrat({
-  weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
-  subsets: ["latin"],
-  variable: "--font-montserrat",
-});
-
 interface RootLayoutProps {
   children: ReactNode;
 }
@@ -75,8 +68,8 @@ export default function RootLayout({ children }: RootLayoutProps) {
   return (
     <html lang="en">
       <body
-        className={twMerge(
-          montserrat.variable,
+        className={cn(
+          montserratFont.variable,
           "font-sans",
           "flex h-screen flex-col justify-between",
         )}

diff --git a/src/ui/header/header-content-container.tsx b/src/ui/header/header-content-container.tsx
@@ -2,8 +2,8 @@
 
 import Image from "next/image";
 import { motion } from "framer-motion";
-import { twMerge } from "tailwind-merge";
 import { useImageLoading } from "@/hooks";
+import { cn } from "@/utils";
 import { fadeUpAnimationVariants } from "@/consts";
 
 export default function HeaderContentContainer() {
@@ -21,7 +21,7 @@ export default function HeaderContentContainer() {
         variants={fadeUpAnimationVariants}
       >
         <Image
-          className={twMerge(
+          className={cn(
             "h-auto w-full",
             "duration-700 ease-in-out",
             loadingAnimation,

diff --git a/src/utils/cn.ts b/src/utils/cn.ts
@@ -0,0 +1,6 @@
+import { type ClassValue, clsx } from "clsx";
+import { twMerge } from "tailwind-merge";
+
+export function cn(...inputs: ClassValue[]) {
+  return twMerge(clsx(inputs));
+}
diff --git a/src/utils/fonts.ts b/src/utils/fonts.ts
@@ -0,0 +1,7 @@
+import { Montserrat } from "next/font/google";
+
+export const montserratFont = Montserrat({
+  weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
+  subsets: ["latin"],
+  variable: "--font-montserrat",
+});
diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -0,0 +1,2 @@
+export * from "./cn";
+export * from "./fonts";