diff --git a/merkl.config.ts b/merkl.config.ts index 8692a1c..afba16c 100644 --- a/merkl.config.ts +++ b/merkl.config.ts @@ -42,13 +42,14 @@ import { eip712WalletActions } from "viem/zksync"; import { coinbaseWallet, walletConnect } from "wagmi/connectors"; export default createConfig({ - appName: "Merkl", - modes: ["dark", "light"], - defaultTheme: "ignite", + appName: "Puffer", + modes: ["light"], + defaultTheme: "puffer", deposit: false, + tags: ["puffer"], themes: { ignite: { - base: createColoring(["#1755F4", "#FF7900", "#0D1530"], ["#1755F4", "#FF7900", "#FFFFFF"]), + base: createColoring(["#2A35BD", "#BFFF37", "#FFFFFF"], ["#2A35BD", "#BFFF37", "#FFFFFF"]), info: createColoring(["#2ABDFF", "#2ABDFF", "#131620"], ["#FFFFFF", "#40B66B", "white"]), good: createColoring(["#40B66B", "#40B66B", "#131620"], ["#FFFFFF", "#40B66B", "white"]), warn: createColoring(["#ff9600", "#ff9600", "#131620"], ["#FFFFFF", "#40B66B", "white"]), @@ -69,7 +70,7 @@ export default createConfig({ harm: createColoring(["#d22e14", "#d22e14", "#131620"], ["#FFFFFF", "#40B66B", "white"]), }, puffer: { - base: createColoring(["#2A35BD", "#BFFF38", "#FFFFFF"], ["#2A35BD", "#BFFF38", "#FFFFFF"]), + base: createColoring(["#2A35BD", "#BFFF37", "#FFFFFF"], ["#2A35BD", "#BFFF37", "#FFFFFF"]), info: createColoring(["#2ABDFF", "#2ABDFF", "#131620"], ["#FFFFFF", "#40B66B", "white"]), good: createColoring(["#40B66B", "#40B66B", "#131620"], ["#FFFFFF", "#40B66B", "white"]), warn: createColoring(["#ff9600", "#ff9600", "#131620"], ["#FFFFFF", "#40B66B", "white"]), @@ -128,13 +129,12 @@ export default createConfig({ // }, }, socials: { - discord: "", - telegram: "https://t.me/+2T0RNabX2ANkMzAx", - x: "https://x.com/zksyncignite", - github: "", + discord: "https://discord.com/invite/pufferfi", + telegram: "https://t.me/puffer_fi", + x: "https://x.com/puffer_finance", + github: "https://github.com/PufferFinance", }, links: { - docs: "https://docs.merkl.xyz/", merkl: "https://merkl.xyz/", merklTermsConditions: "https://app.merkl.xyz/merklTerms.pdf", merklPrivacy: "https://privacy.angle.money", @@ -192,8 +192,8 @@ export default createConfig({ customStoragePrefix: "wagmi", projectId: "26c912aadd2132cd869a5edc00aeea0f", metadata: { - name: "Merkl Lite", - description: "Merkl Lite", + name: "Puffer", + description: "Puffer", url: "https://app.merkl.xyz.com", icons: [], }, diff --git a/packages/dappkit b/packages/dappkit index f0ae6d4..826ff4b 160000 --- a/packages/dappkit +++ b/packages/dappkit @@ -1 +1 @@ -Subproject commit f0ae6d458929807631f6e02a44279f4cb6d8c515 +Subproject commit 826ff4b818716cb9af015adc06c1341a3638c58f diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100755 index 0000000..a188ab6 Binary files /dev/null and b/public/apple-touch-icon.png differ diff --git a/public/favicon-96x96.png b/public/favicon-96x96.png new file mode 100755 index 0000000..c1eebad Binary files /dev/null and b/public/favicon-96x96.png differ diff --git a/public/favicon.ico b/public/favicon.ico old mode 100644 new mode 100755 index 3938b7e..5780901 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/favicon.svg b/public/favicon.svg new file mode 100755 index 0000000..d89dde7 --- /dev/null +++ b/public/favicon.svg @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/public/site.webmanifest b/public/site.webmanifest new file mode 100755 index 0000000..0476804 --- /dev/null +++ b/public/site.webmanifest @@ -0,0 +1,21 @@ +{ + "name": "Puffer app", + "short_name": "Puffer", + "icons": [ + { + "src": "/web-app-manifest-192x192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "/web-app-manifest-512x512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ], + "theme_color": "#ffffff", + "background_color": "#ffffff", + "display": "standalone" +} \ No newline at end of file diff --git a/public/web-app-manifest-192x192.png b/public/web-app-manifest-192x192.png new file mode 100755 index 0000000..45cf244 Binary files /dev/null and b/public/web-app-manifest-192x192.png differ diff --git a/public/web-app-manifest-512x512.png b/public/web-app-manifest-512x512.png new file mode 100755 index 0000000..8f1449f Binary files /dev/null and b/public/web-app-manifest-512x512.png differ diff --git a/src/components/composite/Hero.tsx b/src/components/composite/Hero.tsx index 91b6a90..c9665e3 100644 --- a/src/components/composite/Hero.tsx +++ b/src/components/composite/Hero.tsx @@ -1,6 +1,18 @@ import { useLocation } from "@remix-run/react"; -import { Container, Divider, Group, Icon, type IconProps, Icons, Tabs, Text, Title, Value } from "dappkit"; -import { Button } from "dappkit"; +import { + Button, + Container, + Divider, + Group, + Icon, + type IconProps, + Icons, + OverrideTheme, + Tabs, + Text, + Title, + Value, +} from "dappkit"; import config from "merkl.config"; import type { PropsWithChildren, ReactNode } from "react"; @@ -35,90 +47,89 @@ export default function Hero({ const location = useLocation(); return ( <> - {/* TODO: Align lines & descriptions on all pages */} - {/* TODO: On sub-pages (all pages except Opportunities): Replace the banner by a color */} - - - - - - {breadcrumbs?.map(breadcrumb => { - if (breadcrumb.component) return <>{breadcrumb.component}; - return ( - - ); - })} - - - - - - {!!icons && ( - - {icons?.length > 1 - ? icons?.map(icon => ( - - )) - : icons?.map(icon => ( - - ))} - - )} - - {title} - + + + + + + + {breadcrumbs?.map(breadcrumb => { + if (breadcrumb.component) return <>{breadcrumb.component}; + return ( + + ); + })} + + + + + + {!!icons && ( + + {icons?.length > 1 + ? icons?.map(icon => ( + + )) + : icons?.map(icon => ( + + ))} + + )} + + {title} + + + + {!!description && ( + + {description} + + )} + {!!tags && {tags}} - - {!!description && ( - - {description} - + {!!sideDatas && ( + + {sideDatas.map(data => ( + + + {data.data} + + + + {data.label} + + + ))} + )} - {!!tags && {tags}} - {!!sideDatas && ( - - {sideDatas.map(data => ( - - - {data.data} - - - - {data.label} - - - ))} - - )} - - - - + + + {!!tabs && }
{children}
diff --git a/src/customer/assets/fonts/Obviously_Bold.otf b/src/customer/assets/fonts/Obviously_Bold.otf deleted file mode 100644 index 48eed31..0000000 Binary files a/src/customer/assets/fonts/Obviously_Bold.otf and /dev/null differ diff --git a/src/customer/assets/fonts/Obviously_Bold.woff b/src/customer/assets/fonts/Obviously_Bold.woff deleted file mode 100644 index 498e689..0000000 Binary files a/src/customer/assets/fonts/Obviously_Bold.woff and /dev/null differ diff --git a/src/customer/assets/fonts/Obviously_Bold.woff2 b/src/customer/assets/fonts/Obviously_Bold.woff2 deleted file mode 100644 index 11df9d0..0000000 Binary files a/src/customer/assets/fonts/Obviously_Bold.woff2 and /dev/null differ diff --git a/src/customer/assets/fonts/Obviously_Bold_Italic.otf b/src/customer/assets/fonts/Obviously_Bold_Italic.otf deleted file mode 100644 index f572080..0000000 Binary files a/src/customer/assets/fonts/Obviously_Bold_Italic.otf and /dev/null differ diff --git a/src/customer/assets/fonts/Obviously_Bold_Italic.woff b/src/customer/assets/fonts/Obviously_Bold_Italic.woff deleted file mode 100644 index b8a3585..0000000 Binary files a/src/customer/assets/fonts/Obviously_Bold_Italic.woff and /dev/null differ diff --git a/src/customer/assets/fonts/Obviously_Bold_Italic.woff2 b/src/customer/assets/fonts/Obviously_Bold_Italic.woff2 deleted file mode 100644 index 3eb280a..0000000 Binary files a/src/customer/assets/fonts/Obviously_Bold_Italic.woff2 and /dev/null differ diff --git a/src/customer/assets/fonts/Obviously_Semi.otf b/src/customer/assets/fonts/Obviously_Semi.otf deleted file mode 100644 index 033deca..0000000 Binary files a/src/customer/assets/fonts/Obviously_Semi.otf and /dev/null differ diff --git a/src/customer/assets/fonts/Obviously_Semi.woff b/src/customer/assets/fonts/Obviously_Semi.woff deleted file mode 100644 index 2d50862..0000000 Binary files a/src/customer/assets/fonts/Obviously_Semi.woff and /dev/null differ diff --git a/src/customer/assets/fonts/Obviously_Semi.woff2 b/src/customer/assets/fonts/Obviously_Semi.woff2 deleted file mode 100644 index 07e2f63..0000000 Binary files a/src/customer/assets/fonts/Obviously_Semi.woff2 and /dev/null differ diff --git a/src/customer/assets/fonts/Obviously_Semi_Italic.otf b/src/customer/assets/fonts/Obviously_Semi_Italic.otf deleted file mode 100644 index ac2651d..0000000 Binary files a/src/customer/assets/fonts/Obviously_Semi_Italic.otf and /dev/null differ diff --git a/src/customer/assets/fonts/Obviously_Semi_Italic.woff b/src/customer/assets/fonts/Obviously_Semi_Italic.woff deleted file mode 100644 index cb450e8..0000000 Binary files a/src/customer/assets/fonts/Obviously_Semi_Italic.woff and /dev/null differ diff --git a/src/customer/assets/fonts/Obviously_Semi_Italic.woff2 b/src/customer/assets/fonts/Obviously_Semi_Italic.woff2 deleted file mode 100644 index a39f954..0000000 Binary files a/src/customer/assets/fonts/Obviously_Semi_Italic.woff2 and /dev/null differ diff --git a/src/customer/assets/fonts/Recoleta-Bold.otf b/src/customer/assets/fonts/Recoleta-Bold.otf new file mode 100644 index 0000000..022a01a Binary files /dev/null and b/src/customer/assets/fonts/Recoleta-Bold.otf differ diff --git a/src/customer/assets/fonts/Recoleta-Bold.ttf b/src/customer/assets/fonts/Recoleta-Bold.ttf new file mode 100644 index 0000000..6a28fa6 Binary files /dev/null and b/src/customer/assets/fonts/Recoleta-Bold.ttf differ diff --git a/src/customer/assets/fonts/Recoleta-Bold.woff b/src/customer/assets/fonts/Recoleta-Bold.woff new file mode 100644 index 0000000..4a4759f Binary files /dev/null and b/src/customer/assets/fonts/Recoleta-Bold.woff differ diff --git a/src/customer/assets/fonts/Recoleta-Bold.woff2 b/src/customer/assets/fonts/Recoleta-Bold.woff2 new file mode 100644 index 0000000..d80c6a9 Binary files /dev/null and b/src/customer/assets/fonts/Recoleta-Bold.woff2 differ diff --git a/src/customer/assets/images/customer-dark-logo.svg b/src/customer/assets/images/customer-dark-logo.svg index e799c67..95f933e 100644 --- a/src/customer/assets/images/customer-dark-logo.svg +++ b/src/customer/assets/images/customer-dark-logo.svg @@ -1,18 +1,12 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/customer/assets/images/customer-logo.svg b/src/customer/assets/images/customer-logo.svg index 35e17e9..df5ce2a 100644 --- a/src/customer/assets/images/customer-logo.svg +++ b/src/customer/assets/images/customer-logo.svg @@ -1,18 +1,12 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/customer/assets/images/hero.jpg b/src/customer/assets/images/hero.jpg index 732c107..906e8ec 100644 Binary files a/src/customer/assets/images/hero.jpg and b/src/customer/assets/images/hero.jpg differ diff --git a/src/customer/assets/style/fonts.css b/src/customer/assets/style/fonts.css index 68d8ff9..851802a 100644 --- a/src/customer/assets/style/fonts.css +++ b/src/customer/assets/style/fonts.css @@ -1,43 +1,13 @@ @import url("https://fonts.googleapis.com/css2?family=Space+Mono:ital,wght@0,400;0,700;1,400;1,700&display=swap"); -@import url("https://fonts.googleapis.com/css2?family=Mulish:ital,wght@0,200..1000;1,200..1000&display=swap"); -/* @import url("https://fonts.googleapis.com/css2?family=Space+Grotesk:wght@300..700&display=swap"); */ +@import url("https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap"); @font-face { - font-family: "Obviously"; - src: url("../fonts/Obviously_Bold_Italic.woff2") format("woff2"); - src: url("../fonts/Obviously_Bold_Italic.woff") format("woff"); - src: url("../fonts/Obviously_Bold_Italic.otf") format("opentype"); + font-family: "Recoleta"; + src: url("../assets/fonts/Recoleta-Bold.woff2") format("woff2"); + src: url("../assets/fonts/Recoleta-Bold.woff") format("woff"); + src: url("../assets/fonts/Recoleta-Bold.otf") format("opentype"); + src: url("../assets/fonts/Recoleta-Bold.ttf") format("truetype"); font-weight: 700; - font-style: italic; - font-display: swap; -} - -@font-face { - font-family: "Obviously"; - src: url("../fonts/Obviously_Bold.woff2") format("woff2"); - src: url("../fonts/Obviously_Bold.woff") format("woff"); - src: url("../fonts/Obviously_Bold.otf") format("opentype"); - font-weight: 700; - font-style: normal; - font-display: swap; -} - -@font-face { - font-family: "Obviously"; - src: url("../fonts/Obviously_Semi_Italic.woff2") format("woff2"); - src: url("../fonts/Obviously_Semi_Italic.woff") format("woff"); - src: url("../fonts/Obviously_Semi_Italic.otf") format("opentype"); - font-weight: 600; - font-style: italic; - font-display: swap; -} - -@font-face { - font-family: "Obviously"; - src: url("../fonts/Obviously_Semi.woff2") format("woff2"); - src: url("../fonts/Obviously_Semi.woff") format("woff"); - src: url("../fonts/Obviously_Semi.otf") format("opentype"); - font-weight: 600; font-style: normal; font-display: swap; } diff --git a/src/routes/_merkl.(home).tsx b/src/routes/_merkl.(home).tsx index 93edf21..1a811b1 100644 --- a/src/routes/_merkl.(home).tsx +++ b/src/routes/_merkl.(home).tsx @@ -3,7 +3,7 @@ import { Outlet } from "@remix-run/react"; import Hero from "src/components/composite/Hero"; export const meta: MetaFunction = () => { - return [{ title: "Merkl" }]; + return [{ title: "Puffer" }]; }; export default function Index() { diff --git a/src/routes/_merkl.opportunities.$chain.$type.$id.tsx b/src/routes/_merkl.opportunities.$chain.$type.$id.tsx index 40d59fb..fd7389f 100644 --- a/src/routes/_merkl.opportunities.$chain.$type.$id.tsx +++ b/src/routes/_merkl.opportunities.$chain.$type.$id.tsx @@ -11,7 +11,7 @@ import Tag from "src/components/element/Tag"; import { ErrorHeading } from "src/components/layout/ErrorHeading"; import useOpportunity from "src/hooks/resources/useOpportunity"; -export async function loader({ params: { id, type, chain: chainId }, request }: LoaderFunctionArgs) { +export async function loader({ params: { id, type, chain: chainId } }: LoaderFunctionArgs) { if (!chainId || !id || !type) throw ""; const chain = await ChainService.get({ search: chainId }); diff --git a/tailwind.config.ts b/tailwind.config.ts index f0c989c..17d621a 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -6,6 +6,10 @@ export default { "./{src,packages}/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}", "!./packages/**/node_modules/**/*.{html,js,jsx,ts,tsx}", ], - theme: generateTailwindConfig(), + theme: generateTailwindConfig({ + title: ["Recoleta", "serif"], + text: ["Inter", "sans-serif"], + mono: ["Space Mono", "monospace"], + }), plugins: [], } satisfies Config;