Merge remote-tracking branch 'merkl-app/main' (#4)

* Merge remote-tracking branch 'merkl-app/main' * update dappkit * lint
AngleProtocol · Jan 7, 2025 · 7722e31 · 7722e31
1 parent 71e36c1
commit 7722e31
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 20 deletions.
diff --git a/merkl.config.ts b/merkl.config.ts
@@ -3,6 +3,7 @@ import { createConfig } from "src/config/type";
 import hero from "src/customer/assets/images/hero.jpg?url";
 import { v4 as uuidv4 } from "uuid";
 import { http, createClient, custom } from "viem";
+
 import {
   arbitrum,
   astar,
@@ -143,12 +144,20 @@ export default createConfig({
     protocols: {
       icon: "RiVipCrown2Fill",
       route: "/protocols",
+<<<<<<< HEAD
       key: uuidv4(),
+=======
+      key: crypto.randomUUID(),
+>>>>>>> 85e15ff (Merge remote-tracking branch 'merkl-app/main' (#4))
     },
     bridge: {
       icon: "RiCompassesLine",
       route: "/bridge",
+<<<<<<< HEAD
       key: uuidv4(),
+=======
+      key: crypto.randomUUID(),
+>>>>>>> 85e15ff (Merge remote-tracking branch 'merkl-app/main' (#4))
     },
     docs: {
       icon: "RiFile4Fill",
@@ -193,13 +202,25 @@ export default createConfig({
     //   key: uuidv4(),
     // },
   },
+  header: {
+    searchbar: {
+      enabled: true,
+    },
+    opportunities: {
+      enabled: false,
+    },
+    bridge: {
+      enabled: true,
+    },
+  },
   socials: {
     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",

diff --git a/src/components/composite/Hero.tsx b/src/components/composite/Hero.tsx
@@ -1,18 +1,6 @@
 import { useLocation } from "@remix-run/react";
-import {
-  Button,
-  Container,
-  Divider,
-  Group,
-  Icon,
-  type IconProps,
-  Icons,
-  OverrideTheme,
-  Tabs,
-  Text,
-  Title,
-  Value,
-} from "dappkit";
+import { Container, Divider, Group, Icon, type IconProps, Icons, Tabs, Text, Title, Value } from "dappkit";
+import { Button } from "dappkit";
 import config from "merkl.config";
 import type { PropsWithChildren, ReactNode } from "react";
 import { v4 as uuidv4 } from "uuid";

diff --git a/src/components/layout/Header.tsx b/src/components/layout/Header.tsx
@@ -123,14 +123,14 @@ export default function Header() {
               <Group className="hidden lg:flex items-center" size="xl">
                 {Object.entries(routes)
                   .filter(([key]) => !["home", "faq", "docs"].includes(key))
-                  .map(([key, { route }]) => {
+                  .map(([key, route]) => {
                     return (
                       <Button
                         className={`${["faq"].includes(key) ? "uppercase" : "capitalize"}`}
                         look="soft"
                         size="lg"
                         key={`${key}-link`}
-                        to={route}>
+                        to={route?.route}>
                         {key}
                       </Button>
                     );

diff --git a/src/customer/assets/fonts/Obviously_Bold.otf b/src/customer/assets/fonts/Obviously_Bold.otf
diff --git a/src/customer/assets/fonts/Obviously_Bold.woff b/src/customer/assets/fonts/Obviously_Bold.woff
diff --git a/src/customer/assets/fonts/Obviously_Bold.woff2 b/src/customer/assets/fonts/Obviously_Bold.woff2
diff --git a/src/customer/assets/fonts/Obviously_Bold_Italic.otf b/src/customer/assets/fonts/Obviously_Bold_Italic.otf
diff --git a/src/customer/assets/fonts/Obviously_Bold_Italic.woff b/src/customer/assets/fonts/Obviously_Bold_Italic.woff
diff --git a/src/customer/assets/fonts/Obviously_Bold_Italic.woff2 b/src/customer/assets/fonts/Obviously_Bold_Italic.woff2
diff --git a/src/customer/assets/fonts/Obviously_Semi.otf b/src/customer/assets/fonts/Obviously_Semi.otf
diff --git a/src/customer/assets/fonts/Obviously_Semi.woff b/src/customer/assets/fonts/Obviously_Semi.woff
diff --git a/src/customer/assets/fonts/Obviously_Semi.woff2 b/src/customer/assets/fonts/Obviously_Semi.woff2
diff --git a/src/customer/assets/fonts/Obviously_Semi_Italic.otf b/src/customer/assets/fonts/Obviously_Semi_Italic.otf
diff --git a/src/customer/assets/fonts/Obviously_Semi_Italic.woff b/src/customer/assets/fonts/Obviously_Semi_Italic.woff
diff --git a/src/customer/assets/fonts/Obviously_Semi_Italic.woff2 b/src/customer/assets/fonts/Obviously_Semi_Italic.woff2
diff --git a/src/customer/assets/style/fonts.css b/src/customer/assets/style/fonts.css
@@ -3,10 +3,10 @@
 
 @font-face {
   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");
+  src: url("../fonts/Recoleta-Bold.woff2") format("woff2");
+  src: url("../fonts/Recoleta-Bold.woff") format("woff");
+  src: url("../fonts/Recoleta-Bold.otf") format("opentype");
+  src: url("../fonts/Recoleta-Bold.ttf") format("truetype");
   font-weight: 700;
   font-style: normal;
   font-display: swap;