diff --git a/packages/app/.env.example b/packages/app/.env.example new file mode 100644 index 000000000..e4dbc4235 --- /dev/null +++ b/packages/app/.env.example @@ -0,0 +1,2 @@ +FUEL_PROVIDER_URL=http://beta-4.fuel.network/graphql + diff --git a/packages/app/src/app/globals.css b/packages/app/src/app/globals.css index 23895a7c7..f13043b57 100644 --- a/packages/app/src/app/globals.css +++ b/packages/app/src/app/globals.css @@ -5,3 +5,18 @@ :root { --hero-bg: #000; } + +@layer base { + h1, + h2, + h3, + h4, + h5, + h6 { + font-weight: 600; + } + kbd { + font-size: 0.875rem; + font-family: var(--default-font-family); + } +} diff --git a/packages/app/src/systems/Core/components/Footer/Footer.tsx b/packages/app/src/systems/Core/components/Footer/Footer.tsx index 836f61ffb..959313bba 100644 --- a/packages/app/src/systems/Core/components/Footer/Footer.tsx +++ b/packages/app/src/systems/Core/components/Footer/Footer.tsx @@ -128,20 +128,22 @@ export function Footer({ className }: BaseProps<{}>) { const styles = tv({ slots: { - container: ['hero-bg border-t border-border px-8 md:px-10'], + container: ['hero-bg border-t border-border px-8 tablet:px-10'], root: [ 'py-14 grid gap-8 grid-cols-1 grid-rows-[auto,1fr]', - 'lg:py-16 lg:grid-cols-[1fr,2fr] lg:grid-rows-auto', + 'laptop:py-16 laptop:grid-cols-[1fr,2fr] laptop:grid-rows-auto', ], brand: [ 'items-center pb-8 border-b border-border', - 'lg:pb-0 lg:items-start lg:border-b-0', + 'laptop:pb-0 laptop:items-start laptop:border-b-0', ], socialIcon: ['text-white hover:text-brand transition-colors duration-200'], - navs: ['flex flex-col gap-8 justify-betwee md:flex-row md:text-center'], - nav: ['flex-1 md:items-center lg:text-left lg:items-start'], + navs: [ + 'flex flex-col gap-8 justify-between tablet:flex-row tablet:text-center', + ], + nav: ['flex-1 tablet:items-center laptop:text-left laptop:items-start'], navHeading: [ - 'justify-start md:justify-center lg:justify-start text-heading', + 'justify-start tablet:justify-center laptop:justify-start text-heading', ], navList: ['flex flex-col gap-0 fuel-[Icon]:hidden'], navLink: ['text-secondary hover:text-brand'], diff --git a/packages/app/src/systems/Transaction/actions/get-last-txs.ts b/packages/app/src/systems/Transaction/actions/get-last-txs.ts index 3e01aeca4..eeaeb79f4 100644 --- a/packages/app/src/systems/Transaction/actions/get-last-txs.ts +++ b/packages/app/src/systems/Transaction/actions/get-last-txs.ts @@ -9,7 +9,7 @@ const schema = z.object({ }); export const getLastTxs = act(schema, async ({ last = 12 }) => { - const client = new GraphQLClient('http://localhost:4444/graphql'); + const client = new GraphQLClient(process.env.FUEL_PROVIDER_URL as string); const sdk = getSdk(client); const { data } = await sdk.getLastTransactions({ last }); return data.transactions.nodes; diff --git a/packages/ui/src/theme/index.css b/packages/ui/src/theme/index.css index 8c8684d50..c4c385b42 100644 --- a/packages/ui/src/theme/index.css +++ b/packages/ui/src/theme/index.css @@ -1,23 +1,9 @@ -@import '@radix-ui/themes/styles.css'; +@layer tw-base, radix, tw-components, tw-utilities; -@tailwind base; -@layer base { - h1, - h2, - h3, - h4, - h5, - h6 { - font-weight: 600; - } - kbd { - font-size: 0.875rem; - font-family: var(--default-font-family); - } -} - -@tailwind components; -@tailwind utilities; +@import 'tailwindcss/base' layer(tw-base); +@import '@radix-ui/themes/styles.css' layer(radix); +@import 'tailwindcss/components' layer(tw-components); +@import 'tailwindcss/utilities' layer(tw-utilities); :root, .radix-themes { diff --git a/packages/ui/src/theme/tailwind-preset.ts b/packages/ui/src/theme/tailwind-preset.ts index c3057adcd..a6264c5af 100644 --- a/packages/ui/src/theme/tailwind-preset.ts +++ b/packages/ui/src/theme/tailwind-preset.ts @@ -71,17 +71,6 @@ const preset: Config = { theme: { keyframes, animation, - screens: { - sm: '640px', - md: '768px', - lg: '1024px', - xl: '1280px', - '2xl': '1536px', - mobile: '300px', - tablet: '640px', - laptop: '1024px', - desktop: '1280px', - }, space: tailwindDefaultTheme.space, spacing: tailwindDefaultTheme.spacing, extend: { @@ -97,6 +86,17 @@ const preset: Config = { colors: { ...refColorVariablesAsObj(), }, + screens: { + sm: '640px', + md: '768px', + lg: '1024px', + xl: '1280px', + '2xl': '1536px', + mobile: '300px', + tablet: '640px', + laptop: '1024px', + desktop: '1280px', + }, }, }, plugins: [ diff --git a/turbo.json b/turbo.json index 0ddbb1cd1..cb43cbbf0 100644 --- a/turbo.json +++ b/turbo.json @@ -9,24 +9,24 @@ }, "build:preview": { "outputs": ["dist/**", "build/**", ".next/**"], - "dependsOn": ["build"], + "dependsOn": ["^build"], "cache": true }, "build:storybook": { "outputs": ["storybook-static/**"], - "dependsOn": ["build"], + "dependsOn": ["^build"], "cache": true }, "test": { "outputs": ["**/**/report.json", "coverage/**"], - "dependsOn": ["build"], + "dependsOn": [], "outputMode": "full" }, "dev": { "cache": false }, "lint": { - "dependsOn": ["build"], + "dependsOn": [], "cache": true }, "start": {