Merge pull request #2 from PufferFinance/3022-merge-puffer-branding

3022 merge puffer branding

README.md

@@ -21,6 +21,7 @@ For detailed terms and conditions, refer to the [`LICENSE`](./LICENSE) file in t
 # Welcome to Merkl Lite !
 
 ## Prerequisites
+
 - [Bun](https://bun.sh/)
 - [Remix](https://remix.run/docs)
 

merkl.config.ts

@@ -1,70 +1,58 @@
 import { createColoring } from "dappkit";
 import { createConfig } from "src/config/type";
-import { createClient, custom, http } from "viem";
+import hero from "src/customer/assets/images/hero.jpg?url";
+import { http, createClient, custom } from "viem";
 import {
-  mainnet,
-  optimism,
-  rootstock,
-  bsc,
-  gnosis,
-  thunderCore,
-  fuse,
-  polygon,
-  manta,
-  xLayer,
-  fantom,
-  fraxtal,
-  filecoin,
-  zksync,
-  worldchain,
+  arbitrum,
   astar,
-  polygonZkEvm,
-  coreDao,
-  moonbeam,
-  sei,
   astarZkEVM,
-  mantle,
+  avalanche,
   base,
+  blast,
+  bob,
+  bsc,
+  coreDao,
+  etherlink,
+  fantom,
+  filecoin,
+  fraxtal,
+  fuse,
+  gnosis,
   immutableZkEvm,
-  mode,
-  arbitrum,
-  avalanche,
   linea,
-  bob,
-  blast,
-  taiko,
+  lisk,
+  mainnet,
+  manta,
+  mantle,
+  mode,
+  moonbeam,
+  optimism,
+  polygon,
+  polygonZkEvm,
+  rootstock,
   scroll,
+  sei,
+  taiko,
+  thunderCore,
+  worldchain,
+  xLayer,
+  zksync,
 } from "viem/chains";
-import { coinbaseWallet, walletConnect } from "wagmi/connectors";
-import hero from "src/customer/assets/images/hero.jpg?url";
 import { eip712WalletActions } from "viem/zksync";
+import { coinbaseWallet, walletConnect } from "wagmi/connectors";
 
 export default createConfig({
   appName: "Puffer",
-  defaultTheme: "puffer",
   modes: ["light"],
+  defaultTheme: "puffer",
+  deposit: false,
   themes: {
-    merkl: {
-      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"]
-      ),
-      harm: createColoring(
-        ["#d22e14", "#d22e14", "#131620"],
-        ["#FFFFFF", "#40B66B", "white"]
-      ),
+    puffer: {
+      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"]),
+      harm: createColoring(["#d22e14", "#d22e14", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
     },
   },
   sizing: {
@@ -76,7 +64,7 @@ export default createConfig({
     hero: hero,
   },
   routes: {
-    homepage: {
+    home: {
       icon: "RiHomeFill",
       route: "/",
       key: crypto.randomUUID(),
@@ -91,16 +79,32 @@ export default createConfig({
     //   route: "/protocols",
     //   key: crypto.randomUUID(),
     // },
-    terms: {
-      icon: "RiCompassesLine",
-      route: "/terms",
+    // bridge: {
+    //   icon: "RiCompassesLine",
+    //   route: "/bridge",
+    //   key: crypto.randomUUID(),
+    // },
+    docs: {
+      icon: "RiFile4Fill",
+      external: true,
+      route: "https://docs.merkl.xyz/",
       key: crypto.randomUUID(),
     },
-    privacy: {
-      icon: "RiInformationFill",
-      route: "/privacy",
+    faq: {
+      icon: "RiQuestionFill",
+      route: "/faq",
       key: crypto.randomUUID(),
     },
+    // terms: {
+    //   icon: "RiCompassesLine",
+    //   route: "/terms",
+    //   key: crypto.randomUUID(),
+    // },
+    // privacy: {
+    //   icon: "RiInformationFill",
+    //   route: "/privacy",
+    //   key: crypto.randomUUID(),
+    // },
   },
   socials: {
     discord: "https://discord.com/invite/pufferfi",
@@ -110,13 +114,17 @@ export default createConfig({
   },
   links: {
     merkl: "https://merkl.xyz/",
+    merklTermsConditions: "https://app.merkl.xyz/merklTerms.pdf",
+    merklPrivacy: "https://privacy.angle.money",
   },
+  footerLinks: [],
   wagmi: {
     chains: [
       mainnet,
       optimism,
       rootstock,
       bsc,
+      lisk,
       gnosis,
       thunderCore,
       fuse,
@@ -126,6 +134,7 @@ export default createConfig({
       fantom,
       fraxtal,
       filecoin,
+      etherlink,
       zksync,
       worldchain,
       astar,

package.json

@@ -7,8 +7,8 @@
     "start": "bun run scripts/start.ts",
     "build": "remix vite:build",
     "dev": "remix vite:dev --host",
-    "lint": "biome check --fix ./src",
-    "lint:ci": "biome check --diagnostic-level error ./src",
+    "lint": "biome check --fix ./src ./*.ts",
+    "lint:ci": "biome check --diagnostic-level error ./src ./*.ts",
     "serve": "remix-serve ./build/server/index.js",
     "typecheck": "tsc"
   },
@@ -17,10 +17,10 @@
   ],
   "dependencies": {
     "@acab/ecsstatic": "^0.8.0",
-    "@merkl/api": "0.10.78",
     "@ariakit/react": "^0.4.12",
     "@elysiajs/eden": "^1.1.3",
     "@emotion/css": "^11.13.4",
+    "@merkl/api": "0.10.156",
     "@radix-ui/react-accordion": "^1.2.1",
     "@radix-ui/react-scroll-area": "^1.2.0",
     "@remix-run/dev": "^2.11.2",
@@ -39,6 +39,7 @@
     "lucide-react": "^0.439.0",
     "match-sorter": "^6.3.4",
     "moment": "^2.30.1",
+    "node-cache": "^5.1.2",
     "qs": "^6.13.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -48,7 +49,7 @@
     "tailwindcss": "^3.4.12",
     "tailwindcss-animate": "^1.0.7",
     "typedoc": "^0.26.7",
-    "viem": "2.x",
+    "viem": "2.21.54",
     "vite-plugin-dts": "^4.2.1",
     "wagmi": "^2.12.29",
     "zustand": "^5.0.0-rc.2"

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"
+}