diff --git a/bun.lockb b/bun.lockb
index b48ba0fe..2c18b23e 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/merkl.config.ts b/merkl.config.ts
index 8692a1c8..7de66e30 100644
--- a/merkl.config.ts
+++ b/merkl.config.ts
@@ -42,34 +42,13 @@ 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,
themes: {
- ignite: {
- base: createColoring(["#1755F4", "#FF7900", "#0D1530"], ["#1755F4", "#FF7900", "#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"]),
- harm: createColoring(["#d22e14", "#d22e14", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
- },
- merkl: {
- base: createColoring(["#1755F4", "#FF7900", "#0D1530"], ["#1755F4", "#FF7900", "#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"]),
- harm: createColoring(["#d22e14", "#d22e14", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
- },
- backoffice: {
- base: createColoring(["#8B8D98", "#9984D2", "#000000"], ["#8B8D98", "#9984D2", "#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"]),
- harm: createColoring(["#d22e14", "#d22e14", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
- },
puffer: {
- base: createColoring(["#2A35BD", "#BFFF38", "#FFFFFF"], ["#2A35BD", "#BFFF38", "#FFFFFF"]),
+ base: createColoring(["#2A35BD", "#F5F9FF", "#FFFFFF"], ["#2A35BD", "#F5F9FF", "#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 +107,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 +170,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 f0ae6d45..826ff4b8 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 00000000..a188ab66
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 00000000..c1eebadf
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 3938b7eb..5780901d
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 00000000..d89dde7b
--- /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 00000000..0476804b
--- /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 00000000..45cf244b
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 00000000..8f1449f2
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 91b6a908..c9665e3c 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/config/type.ts b/src/config/type.ts
index 4be7db95..0ce20e4e 100644
--- a/src/config/type.ts
+++ b/src/config/type.ts
@@ -18,6 +18,7 @@ export type MerklConfig = {
spacing: { [Size in (typeof sizeScale)[number]]: number };
radius: { [Size in (typeof sizeScale)[number]]: number };
};
+ fonts?: { title: string[]; text: string[]; mono: string[] };
tags?: string[];
defaultTheme: keyof T;
deposit?: boolean;
diff --git a/src/customer/assets/fonts/Recoleta-Bold.otf b/src/customer/assets/fonts/Recoleta-Bold.otf
new file mode 100644
index 00000000..022a01aa
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 00000000..6a28fa62
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 00000000..4a4759f9
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 00000000..d80c6a9f
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 e799c674..95f933e9 100644
--- a/src/customer/assets/images/customer-dark-logo.svg
+++ b/src/customer/assets/images/customer-dark-logo.svg
@@ -1,18 +1,12 @@
-