From 3aab8c6262cb52d2ef353dff923712e91742a43d Mon Sep 17 00:00:00 2001 From: sheykei Date: Thu, 7 Nov 2024 12:14:12 +0100 Subject: [PATCH] remove: zksync --- app/routes/_merkl.(home).(opportunities).tsx | 5 +- app/routes/_merkl.(home).tsx | 9 --- .../_merkl.action.$action.(opportunities).tsx | 2 + src/assets/images/zksync-ignite-merkl.svg | 6 -- src/assets/images/zksync-ignite.svg | 4 -- src/assets/images/zksync-logo-mob.svg | 11 --- src/assets/images/zksync-logo.svg | 17 ----- src/components/composite/Heading.tsx | 25 +------ src/constants/faq.tsx | 65 ----------------- src/constants/link.ts | 7 -- src/zksync/components/layout/Footer.tsx | 47 ------------- src/zksync/components/layout/Header.tsx | 44 ------------ src/zksync/components/layout/themes.ts | 70 ------------------- src/zksync/layout/Footer.tsx | 27 ------- src/zksync/layout/Header.tsx | 14 ---- 15 files changed, 6 insertions(+), 347 deletions(-) delete mode 100644 src/assets/images/zksync-ignite-merkl.svg delete mode 100644 src/assets/images/zksync-ignite.svg delete mode 100644 src/assets/images/zksync-logo-mob.svg delete mode 100644 src/assets/images/zksync-logo.svg delete mode 100644 src/constants/faq.tsx delete mode 100644 src/constants/link.ts delete mode 100644 src/zksync/components/layout/Footer.tsx delete mode 100644 src/zksync/components/layout/Header.tsx delete mode 100644 src/zksync/components/layout/themes.ts delete mode 100644 src/zksync/layout/Footer.tsx delete mode 100644 src/zksync/layout/Header.tsx diff --git a/app/routes/_merkl.(home).(opportunities).tsx b/app/routes/_merkl.(home).(opportunities).tsx index d06f56f1..ed362204 100644 --- a/app/routes/_merkl.(home).(opportunities).tsx +++ b/app/routes/_merkl.(home).(opportunities).tsx @@ -1,3 +1,4 @@ +import type { Opportunity } from "@angleprotocol/merkl-api"; import { type LoaderFunctionArgs, json } from "@remix-run/node"; import { useLoaderData } from "@remix-run/react"; import { Space } from "dappkit"; @@ -5,7 +6,7 @@ import { fetchOpportunities } from "src/api/opportunity/opportunity"; import OpportunityLibrary from "src/components/element/opportunity/OpportunityLibrary"; export async function loader({ request }: LoaderFunctionArgs) { - const { data: opportunities, ...res } = await fetchOpportunities(request); + const { data: opportunities } = await fetchOpportunities(request); return json({ opportunities }); } @@ -16,7 +17,7 @@ export default function Index() { return ( <> - + ); } diff --git a/app/routes/_merkl.(home).tsx b/app/routes/_merkl.(home).tsx index 588da83f..03c2d4cb 100644 --- a/app/routes/_merkl.(home).tsx +++ b/app/routes/_merkl.(home).tsx @@ -31,15 +31,6 @@ export const config = createConfig({ }, }); -const testThemes: { [name: string]: Coloring } = { - uniswap: createColoring(["#131313", "#FC72FF", "#131313"], ["#FFFFFF", "#FC72FF", "white"]), - "1inch": createColoring(["#131823", "#172A45", "#131823"], ["#FFFFFF", "#DDECFE", "white"]), - kiln: createColoring(["#000000", "#FF6521", "black"], ["#FFFFFF", "#FF6521", "white"]), - avocado: createColoring(["#0E121C", "#07A65D", "#0E121C"], ["#FFFFFF", "#07A65D", "white"]), - pancakeswap: createColoring(["#27262C", "#1FC7D4", "#27262C"], ["#FFFFFF", "#1FC7D4", "white"]), - optimism: createColoring(["#000000", "#FF0420", "black"], ["#FBFCFE", "#FF0420", "white"]), -}; - export default function Index() { return ( diff --git a/app/routes/_merkl.action.$action.(opportunities).tsx b/app/routes/_merkl.action.$action.(opportunities).tsx index a5e72744..0ee77c25 100644 --- a/app/routes/_merkl.action.$action.(opportunities).tsx +++ b/app/routes/_merkl.action.$action.(opportunities).tsx @@ -12,6 +12,8 @@ export async function loader({ params: { action: _action }, request }: LoaderFun const { data: opportunities, ...res } = await fetchOpportunities(request, { action }); + if (!opportunities) throw new Error("Unknown opportunity"); + return json({ opportunities }); } diff --git a/src/assets/images/zksync-ignite-merkl.svg b/src/assets/images/zksync-ignite-merkl.svg deleted file mode 100644 index 4d32c292..00000000 --- a/src/assets/images/zksync-ignite-merkl.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/images/zksync-ignite.svg b/src/assets/images/zksync-ignite.svg deleted file mode 100644 index 57946200..00000000 --- a/src/assets/images/zksync-ignite.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/images/zksync-logo-mob.svg b/src/assets/images/zksync-logo-mob.svg deleted file mode 100644 index c95dd3d7..00000000 --- a/src/assets/images/zksync-logo-mob.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/assets/images/zksync-logo.svg b/src/assets/images/zksync-logo.svg deleted file mode 100644 index c8c21c7d..00000000 --- a/src/assets/images/zksync-logo.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/components/composite/Heading.tsx b/src/components/composite/Heading.tsx index 7143b646..85f9e3f4 100644 --- a/src/components/composite/Heading.tsx +++ b/src/components/composite/Heading.tsx @@ -8,7 +8,7 @@ export type HeadingProps = PropsWithChildren<{ title: ReactNode; navigation?: { label: ReactNode; link: string }; description: ReactNode; - tags: ReactNode[]; + tags?: ReactNode[]; tabs: { label: ReactNode; link: string }[]; }>; @@ -49,29 +49,6 @@ export default function Heading({ navigation, icons, title, description, tags, t ))} - {/* - - - APR - 129% - - graph - - - - TVL - 129$ - - graph - - - - APR - 129% - - graph - - */}
{children}
diff --git a/src/constants/faq.tsx b/src/constants/faq.tsx deleted file mode 100644 index c51753f7..00000000 --- a/src/constants/faq.tsx +++ /dev/null @@ -1,65 +0,0 @@ -import { link } from "src/constants/link"; - -export const faqList = [ - { - question: "What's zkSync Ignite?", - answer: ( - <> - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim - veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea - commodo consequat.
-
- Duis aute irure dolor in reprehenderit in voluptate velit esse cillum - dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non - proident, sunt in culpa qui officia deserunt mollit anim id est laborum. - ipsum - - ), - key: crypto.randomUUID(), - }, - { - question: "Why join the program?", - answer: ( - <> - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim - veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea - commodo consequat.
-
- Duis aute irure dolor in reprehenderit in voluptate velit esse cillum - dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non - proident, sunt in culpa qui officia deserunt mollit anim id est laborum. - ipsum - - ), - key: crypto.randomUUID(), - }, - { - question: "How to participate?", - answer: ( - <> - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim - veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea - commodo consequat.
-
{" "} - - Discord invitation - {" "} - Duis aute irure dolor in reprehenderit in voluptate velit esse cillum - dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non - proident, sunt in culpa qui officia deserunt mollit anim id est laborum. - ipsum - - ), - key: crypto.randomUUID(), - }, -] as const; - -export type FaqListType = typeof faqList; diff --git a/src/constants/link.ts b/src/constants/link.ts deleted file mode 100644 index 5e1766dc..00000000 --- a/src/constants/link.ts +++ /dev/null @@ -1,7 +0,0 @@ -export const link = { - merkl: "https://merkl.xyz/", - discord: "https://join.zksync.dev/", - telegram: "https://t.me/+2T0RNabX2ANkMzAx", - x: "https://x.com/zksyncignite", - github: "https://github.com/matter-labs", -}; diff --git a/src/zksync/components/layout/Footer.tsx b/src/zksync/components/layout/Footer.tsx deleted file mode 100644 index a4df4f93..00000000 --- a/src/zksync/components/layout/Footer.tsx +++ /dev/null @@ -1,47 +0,0 @@ -import { Group, Icon, Button, Container } from "dappkit"; -import Image from "../../../../packages/dappkit/src/components/primitives/Image"; -import zksyncLogo from "../../../assets/images/zksync-logo.svg"; -import merklFooter from "../../../assets/images/merkl-footer.svg"; -import { link } from "src/constants/link"; - -export default function Footer() { - return ( -
- - - - - - - - - - - - - - - -
- ); -} diff --git a/src/zksync/components/layout/Header.tsx b/src/zksync/components/layout/Header.tsx deleted file mode 100644 index 047f5223..00000000 --- a/src/zksync/components/layout/Header.tsx +++ /dev/null @@ -1,44 +0,0 @@ -import { Group, Button, Text, Container } from "dappkit"; -import zksyncLogoMob from "../../../assets/images/zksync-logo-mob.svg"; -import zksyncLogo from "../../../assets/images/zksync-logo.svg"; -import Image from "../../../../packages/dappkit/src/components/primitives/Image"; -import SCREENS from "../../../../packages/dappkit/src/constants/SCREENS.json"; -import { useMediaQuery } from "react-responsive"; - -export default function Header() { - const isScreenSmall = useMediaQuery({ maxWidth: SCREENS.lg }); - - return ( -
- - - - - - - - - - -
- ); -} diff --git a/src/zksync/components/layout/themes.ts b/src/zksync/components/layout/themes.ts deleted file mode 100644 index fb2936d8..00000000 --- a/src/zksync/components/layout/themes.ts +++ /dev/null @@ -1,70 +0,0 @@ -import { createColoring } from "packages/dappkit/src/theming/coloring"; - -export const zkSyncThemes = { - ignite: { - base: createColoring( - ["#7F89F2", "#FFA200", "#111111"], - ["#7F89F2", "#FFA200", "#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"] - ), - }, - igniteWarm: { - base: createColoring( - ["#F39700", "#FFA200", "#111111"], - ["#F89B00", "#3A3D90", "#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"] - ), - }, - zksync: { - base: createColoring( - ["#000000", "#1755F4", "#000000"], - ["#6e4c18", "#FB9901", "#FCF8F5"] - ), - 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"] - ), - }, -} as const; diff --git a/src/zksync/layout/Footer.tsx b/src/zksync/layout/Footer.tsx deleted file mode 100644 index 9be0df3f..00000000 --- a/src/zksync/layout/Footer.tsx +++ /dev/null @@ -1,27 +0,0 @@ -import { Button, Divider, Group, Icon, Text } from "dappkit"; -import Page from "../../components/composite/layout/Page"; - -export default function Footer() { - return ( - - -
- - ZKSync - - - - - - Powered by Merkl - -
- - ); -} diff --git a/src/zksync/layout/Header.tsx b/src/zksync/layout/Header.tsx deleted file mode 100644 index 9a15d440..00000000 --- a/src/zksync/layout/Header.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import { Button, Group, Title } from "dappkit"; - -export default function Header() { - return ( -
- - ZKSync - - - - -
- ); -}