Skip to content

Commit

Permalink
update: hero section
Browse files Browse the repository at this point in the history
  • Loading branch information
DangTinh422003 committed Nov 1, 2024
1 parent f223c86 commit 13c4537
Show file tree
Hide file tree
Showing 32 changed files with 580 additions and 175 deletions.
4 changes: 3 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
"readable-tailwind"
],
"rules": {
"@typescript-eslint/no-unused-vars": "warn",
"@typescript-eslint/no-floating-promises": 0,
"tailwindcss/no-custom-classname": 0,
"simple-import-sort/imports": "error",
"simple-import-sort/exports": "error",
Expand Down Expand Up @@ -117,4 +119,4 @@
}
}
]
}
}
3 changes: 1 addition & 2 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@
"trailingComma": "all",
"printWidth": 80,
"bracketSameLine": false,
"experimentalTernaries": true,
"plugins": ["prettier-plugin-tailwindcss"]
"experimentalTernaries": true
}
80 changes: 76 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@
"@radix-ui/react-slot": "^1.1.0",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"framer-motion": "^11.11.11",
"lucide-react": "^0.451.0",
"next": "14.2.15",
"next-themes": "^0.3.0",
"react": "^18",
"react-dom": "^18",
"tailwind-merge": "^2.5.3",
"react-scroll-parallax": "^3.4.5",
"tailwind-merge": "^2.5.4",
"tailwindcss-animate": "^1.0.7"
},
"devDependencies": {
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added public/images/city.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/cloud.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/white_line.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
71 changes: 65 additions & 6 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,58 @@
import '@/styles/globals.css'

import clsx from 'clsx'
import type { Metadata } from 'next'
import { Poppins } from 'next/font/google'
import { Bebas_Neue } from 'next/font/google'
import localFont from 'next/font/local'

import { ThemeProvider } from '@/components/theme-provider'

export const metadata: Metadata = {
title: 'Create Next App',
description: 'Generated by create next app',
}

const poppins = Poppins({
const ppNeueMontreal = localFont({
src: [
{
path: '../../public/fonts/pp-neue-montreal-fonts/ppneuemontreal-book.otf',
weight: '400',
style: 'normal',
},
{
path: '../../public/fonts/pp-neue-montreal-fonts/ppneuemontreal-italic.otf',
weight: '400',
style: 'italic',
},
{
path: '../../public/fonts/pp-neue-montreal-fonts/ppneuemontreal-thin.otf',
weight: '100',
style: 'normal',
},
{
path: '../../public/fonts/pp-neue-montreal-fonts/ppneuemontreal-medium.otf',
weight: '500',
style: 'normal',
},
{
path: '../../public/fonts/pp-neue-montreal-fonts/ppneuemontreal-semibolditalic.otf',
weight: '600',
style: 'italic',
},
{
path: '../../public/fonts/pp-neue-montreal-fonts/ppneuemontreal-bold.otf',
weight: '700',
style: 'normal',
},
],
variable: '--font-pp-neue-montreal',
display: 'swap',
})

const bebasNeue = Bebas_Neue({
subsets: ['latin'],
weight: ["300","400","500","600","700","800","900"],
variable: "--font-poppins",
weight: ['400'],
variable: '--font-bebas-neue',
})

export default function RootLayout({
Expand All @@ -20,8 +61,26 @@ export default function RootLayout({
children: React.ReactNode
}>) {
return (
<html lang="en" className={poppins.className}>
<body>{children}</body>
<html
lang="en"
className={clsx(
bebasNeue.variable,
ppNeueMontreal.variable,
'font-pp-neue-montreal',
)}
suppressHydrationWarning
>
<body className="main-container">
<ThemeProvider
attribute="class"
defaultTheme="dark"
storageKey="dev-blog-theme"
enableSystem
disableTransitionOnChange
>
{children}
</ThemeProvider>
</body>
</html>
)
}
Loading

0 comments on commit 13c4537

Please sign in to comment.