diff --git a/package.json b/package.json index 19f18084..96823415 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/postcss.config.mjs b/postcss.config.mjs deleted file mode 100644 index d0c615b3..00000000 --- a/postcss.config.mjs +++ /dev/null @@ -1,9 +0,0 @@ -/** @type {import('postcss-load-config').Config} */ -const config = { - plugins: { - tailwindcss: {}, - autoprefixer: {}, - }, -} - -export default config diff --git a/src/app/dashboard/(hiiq)/layout.tsx b/src/app/dashboard/(hiiq)/layout.tsx index 8a37e468..a5e22390 100644 --- a/src/app/dashboard/(hiiq)/layout.tsx +++ b/src/app/dashboard/(hiiq)/layout.tsx @@ -37,7 +37,7 @@ export default function layout({ children }: { children: React.ReactNode }) { ))} -
+
{children}
) diff --git a/src/app/dashboard/layout.tsx b/src/app/dashboard/layout.tsx deleted file mode 100644 index 17d297c1..00000000 --- a/src/app/dashboard/layout.tsx +++ /dev/null @@ -1,76 +0,0 @@ -import React from 'react' -import { Metadata } from 'next' -import AppProviders from '@/components/client/AppProviders' -import ColorMode from '@/components/chakra/ColorMode' - -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 Layout = ({ children }: { children: React.ReactNode }) => { - return ( - - - - - - - - - - - - - - - - - - - - {children} - - - ) -} - -export default Layout diff --git a/styles/global.css b/src/app/global.css similarity index 100% rename from styles/global.css rename to src/app/global.css diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 7c073a7b..9449176f 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -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 ( + + + + + + + + + + + + + + + + + + + + {children} + + + ) +} + export default RootLayout diff --git a/src/components/dashboard/hiiq-table/data-table.tsx b/src/components/dashboard/hiiq-table/data-table.tsx index 8c03bbd4..6e6ad534 100644 --- a/src/components/dashboard/hiiq-table/data-table.tsx +++ b/src/components/dashboard/hiiq-table/data-table.tsx @@ -87,7 +87,7 @@ export function DataTable({
- + {table.getHeaderGroups().map((headerGroup) => ( {headerGroup.headers.map((header) => { diff --git a/src/components/dashboard/layout.tsx b/src/components/dashboard/layout.tsx index e56169f9..211a32ac 100644 --- a/src/components/dashboard/layout.tsx +++ b/src/components/dashboard/layout.tsx @@ -79,7 +79,7 @@ export const DashboardLayout = (props: DashboardLayoutProps) => { ({ + ...theme('colors'), + auto: 'auto', + }), extend: { colors: { brand: { @@ -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: [], } diff --git a/yarn.lock b/yarn.lock index e7fca8e4..c637ce4d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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"