Skip to content

Commit

Permalink
fix: fixed scroll issue
Browse files Browse the repository at this point in the history
  • Loading branch information
invisiblemask committed Nov 22, 2024
1 parent 0a110fc commit 7295306
Show file tree
Hide file tree
Showing 10 changed files with 108 additions and 92 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
"short-number": "^1.0.7",
"slick-carousel": "^1.8.1",
"tailwind-merge": "^2.5.4",
"tailwindcss-animate": "^1.0.7",
"ual-anchor": "^1.3.0",
"ual-reactjs-renderer": "^0.3.1",
"universal-authenticator-library": "^0.3.0",
Expand Down
9 changes: 0 additions & 9 deletions postcss.config.mjs

This file was deleted.

2 changes: 1 addition & 1 deletion src/app/dashboard/(hiiq)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default function layout({ children }: { children: React.ReactNode }) {
</Link>
))}
</div>
<div className="absolute h-[0.5px] w-[calc(100vw)] -ml-[calc(50vw-50%)] bg-gray-500 top-9 -z-10" />
<div className="absolute h-[0.5px] w-[calc(100vw)] -ml-[calc(50vw-50%)] border-b top-9 -z-10" />
<div>{children}</div>
</div>
)
Expand Down
76 changes: 0 additions & 76 deletions src/app/dashboard/layout.tsx

This file was deleted.

File renamed without changes.
77 changes: 75 additions & 2 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,78 @@
import 'regenerator-runtime/runtime'
import React from 'react'
const RootLayout = ({ children }: { children: React.ReactNode }) => children
import '../../styles/global.css'
import { Metadata } from 'next'
import AppProviders from '@/components/client/AppProviders'
import ColorMode from '@/components/chakra/ColorMode'
import './global.css'

export const metadata: Metadata = {
title: {
default: 'BrainDAO | native DAO and treasury of the IQ Token',
template: '%s | BrainDAO',
},
metadataBase: new URL('https://iq.braindao.org/'),
description:
'BrainDAO is the native DAO and treasury of the IQ Token which powers IQ.wiki',
openGraph: {
title: 'BrainDAO | native DAO and treasury of the IQ Token',
description:
'BrainDAO is the native DAO and treasury of the IQ Token which powers IQ.wiki',
url: 'https://iq.braindao.org/dashboard',
siteName: 'IQ Dashboard',
type: 'website',
images: [
{
url: 'https://iq.braindao.org/og_image.png',
},
],
},
twitter: {
card: 'summary_large_image',
creator: '@IQWiki',
site: 'IQ GPT',
},
}

const RootLayout = ({ children }: { children: React.ReactNode }) => {
return (
<html lang="en">
<head>
<meta charSet="UTF-8" />
<meta httpEquiv="X-UA-Compatible" content="ie=edge" />
<link rel="icon" href="/favicon.ico" type="image/x-icon" />
<meta
property="og:image"
content="https://iq.braindao.org/og_image.png"
/>
<meta name="image:type" content="png" />
<meta
property="twitter:image"
content="https://iq.braindao.org/og_image.png"
/>
<meta name="twitter:image:type" content="png" />
<meta name="twitter:image:width" content="300px" />
<meta name="twitter:image:height" content="157px" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta
name="debank-cloud-site-verification"
content="bba105af03355b417ae9969b16131dea"
/>
<meta
name="apple-mobile-web-app-status-bar-style"
content="black-translucent"
/>
<link rel="manifest" href="/manifest.json" />
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css2?family=Jost:ital,wght@0,400;0,500;0,600;0,700;1,400;1,500;1,600;1,700&display=swap"
/>
</head>
<body>
<ColorMode />
<AppProviders>{children}</AppProviders>
</body>
</html>
)
}

export default RootLayout
2 changes: 1 addition & 1 deletion src/components/dashboard/hiiq-table/data-table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export function DataTable<TData, TValue>({
</Button>
</div>
<Table>
<TableHeader className="bg-gray-50/5">
<TableHeader className="bg-gray-50 dark:bg-gray-800 border-t">
{table.getHeaderGroups().map((headerGroup) => (
<TableRow key={headerGroup.id}>
{headerGroup.headers.map((header) => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/dashboard/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const DashboardLayout = (props: DashboardLayoutProps) => {
<chakra.div
w="full"
maxH="100vh"
overflow={{ base: 'auto', md: 'hidden' }}
overflowX={{ base: 'auto', md: 'hidden' }}
>
<chakra.div
w="full"
Expand Down
26 changes: 24 additions & 2 deletions tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
/** @type {import('tailwindcss').Config} */
module.exports = {
darkMode: ['class'],
content: ['./src/**/*.{js,ts,jsx,tsx,mdx}'],
content: [
'./app/**/*.{js,ts,jsx,tsx,mdx}',
'./pages/**/*.{js,ts,jsx,tsx,mdx}',
'./components/**/*.{js,ts,jsx,tsx,mdx}',
'./src/**/*.{js,ts,jsx,tsx,mdx}',
],
prefix: '',
theme: {
accentColor: ({ theme }) => ({
...theme('colors'),
auto: 'auto',
}),
extend: {
colors: {
brand: {
Expand Down Expand Up @@ -43,7 +52,20 @@ module.exports = {
gray900: '#101828',
blue0: '#F5F9FF',
},
keyframes: {
'accordion-down': {
from: { height: '0' },
to: { height: 'var(--radix-accordion-content-height)' },
},
'accordion-up': {
from: { height: 'var(--radix-accordion-content-height)' },
to: { height: '0' },
},
},
animation: {
'accordion-down': 'accordion-down 0.2s ease-out',
'accordion-up': 'accordion-up 0.2s ease-out',
},
},
},
plugins: [],
}
5 changes: 5 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8540,6 +8540,11 @@ tailwind-merge@^2.5.4:
resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.5.4.tgz#4bf574e81fa061adeceba099ae4df56edcee78d1"
integrity sha512-0q8cfZHMu9nuYP/b5Shb7Y7Sh1B7Nnl5GqNr1U+n2p6+mybvRtayrQ+0042Z5byvTA8ihjlP8Odo8/VnHbZu4Q==

tailwindcss-animate@^1.0.7:
version "1.0.7"
resolved "https://registry.yarnpkg.com/tailwindcss-animate/-/tailwindcss-animate-1.0.7.tgz#318b692c4c42676cc9e67b19b78775742388bef4"
integrity sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==

tailwindcss@^3.4.14:
version "3.4.14"
resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.14.tgz#6dd23a7f54ec197b19159e91e3bb1e55e7aa73ac"
Expand Down

0 comments on commit 7295306

Please sign in to comment.