From 3f0f58d969c4cf1a20c6a4f7100fde9e22c03041 Mon Sep 17 00:00:00 2001 From: ioay Date: Tue, 23 Jan 2024 21:57:24 +0100 Subject: [PATCH] Moving fonts & icons to assets --- dapp/src/{ => assets}/fonts/Segment-Black.otf | Bin dapp/src/{ => assets}/fonts/Segment-Bold.otf | Bin dapp/src/{ => assets}/fonts/Segment-Medium.otf | Bin dapp/src/{ => assets}/fonts/Segment-Regular.otf | Bin dapp/src/{ => assets}/fonts/Segment-SemiBold.otf | Bin dapp/src/{static => assets}/icons/AcreLogo.tsx | 0 dapp/src/{static => assets}/icons/AlertInfo.tsx | 0 dapp/src/{static => assets}/icons/ArrowLeft.tsx | 0 dapp/src/{static => assets}/icons/ArrowRight.tsx | 0 dapp/src/{static => assets}/icons/ArrowUpRight.tsx | 0 dapp/src/{static => assets}/icons/Bitcoin.tsx | 0 .../{static => assets}/icons/ConnectBTCAccount.tsx | 0 .../{static => assets}/icons/ConnectETHAccount.tsx | 0 dapp/src/{static => assets}/icons/Ethereum.tsx | 0 dapp/src/{static => assets}/icons/Info.tsx | 0 dapp/src/{static => assets}/icons/ShieldPlus.tsx | 0 dapp/src/{static => assets}/icons/index.ts | 0 dapp/src/components/GlobalStyles/index.tsx | 10 +++++----- dapp/src/components/Header/ConnectWallet.tsx | 2 +- dapp/src/components/Header/index.tsx | 2 +- dapp/src/components/Modals/Support/index.tsx | 2 +- dapp/src/components/Overview/PositionDetails.tsx | 2 +- dapp/src/components/Overview/index.tsx | 2 +- dapp/src/components/Sidebar/index.tsx | 2 +- .../TransactionHistory/Table/utils/pagination.tsx | 2 +- dapp/src/components/shared/Alert/index.tsx | 2 +- dapp/src/components/shared/ButtonLink/index.tsx | 2 +- .../components/shared/TokenBalanceInput/index.tsx | 2 +- 28 files changed, 15 insertions(+), 15 deletions(-) rename dapp/src/{ => assets}/fonts/Segment-Black.otf (100%) rename dapp/src/{ => assets}/fonts/Segment-Bold.otf (100%) rename dapp/src/{ => assets}/fonts/Segment-Medium.otf (100%) rename dapp/src/{ => assets}/fonts/Segment-Regular.otf (100%) rename dapp/src/{ => assets}/fonts/Segment-SemiBold.otf (100%) rename dapp/src/{static => assets}/icons/AcreLogo.tsx (100%) rename dapp/src/{static => assets}/icons/AlertInfo.tsx (100%) rename dapp/src/{static => assets}/icons/ArrowLeft.tsx (100%) rename dapp/src/{static => assets}/icons/ArrowRight.tsx (100%) rename dapp/src/{static => assets}/icons/ArrowUpRight.tsx (100%) rename dapp/src/{static => assets}/icons/Bitcoin.tsx (100%) rename dapp/src/{static => assets}/icons/ConnectBTCAccount.tsx (100%) rename dapp/src/{static => assets}/icons/ConnectETHAccount.tsx (100%) rename dapp/src/{static => assets}/icons/Ethereum.tsx (100%) rename dapp/src/{static => assets}/icons/Info.tsx (100%) rename dapp/src/{static => assets}/icons/ShieldPlus.tsx (100%) rename dapp/src/{static => assets}/icons/index.ts (100%) diff --git a/dapp/src/fonts/Segment-Black.otf b/dapp/src/assets/fonts/Segment-Black.otf similarity index 100% rename from dapp/src/fonts/Segment-Black.otf rename to dapp/src/assets/fonts/Segment-Black.otf diff --git a/dapp/src/fonts/Segment-Bold.otf b/dapp/src/assets/fonts/Segment-Bold.otf similarity index 100% rename from dapp/src/fonts/Segment-Bold.otf rename to dapp/src/assets/fonts/Segment-Bold.otf diff --git a/dapp/src/fonts/Segment-Medium.otf b/dapp/src/assets/fonts/Segment-Medium.otf similarity index 100% rename from dapp/src/fonts/Segment-Medium.otf rename to dapp/src/assets/fonts/Segment-Medium.otf diff --git a/dapp/src/fonts/Segment-Regular.otf b/dapp/src/assets/fonts/Segment-Regular.otf similarity index 100% rename from dapp/src/fonts/Segment-Regular.otf rename to dapp/src/assets/fonts/Segment-Regular.otf diff --git a/dapp/src/fonts/Segment-SemiBold.otf b/dapp/src/assets/fonts/Segment-SemiBold.otf similarity index 100% rename from dapp/src/fonts/Segment-SemiBold.otf rename to dapp/src/assets/fonts/Segment-SemiBold.otf diff --git a/dapp/src/static/icons/AcreLogo.tsx b/dapp/src/assets/icons/AcreLogo.tsx similarity index 100% rename from dapp/src/static/icons/AcreLogo.tsx rename to dapp/src/assets/icons/AcreLogo.tsx diff --git a/dapp/src/static/icons/AlertInfo.tsx b/dapp/src/assets/icons/AlertInfo.tsx similarity index 100% rename from dapp/src/static/icons/AlertInfo.tsx rename to dapp/src/assets/icons/AlertInfo.tsx diff --git a/dapp/src/static/icons/ArrowLeft.tsx b/dapp/src/assets/icons/ArrowLeft.tsx similarity index 100% rename from dapp/src/static/icons/ArrowLeft.tsx rename to dapp/src/assets/icons/ArrowLeft.tsx diff --git a/dapp/src/static/icons/ArrowRight.tsx b/dapp/src/assets/icons/ArrowRight.tsx similarity index 100% rename from dapp/src/static/icons/ArrowRight.tsx rename to dapp/src/assets/icons/ArrowRight.tsx diff --git a/dapp/src/static/icons/ArrowUpRight.tsx b/dapp/src/assets/icons/ArrowUpRight.tsx similarity index 100% rename from dapp/src/static/icons/ArrowUpRight.tsx rename to dapp/src/assets/icons/ArrowUpRight.tsx diff --git a/dapp/src/static/icons/Bitcoin.tsx b/dapp/src/assets/icons/Bitcoin.tsx similarity index 100% rename from dapp/src/static/icons/Bitcoin.tsx rename to dapp/src/assets/icons/Bitcoin.tsx diff --git a/dapp/src/static/icons/ConnectBTCAccount.tsx b/dapp/src/assets/icons/ConnectBTCAccount.tsx similarity index 100% rename from dapp/src/static/icons/ConnectBTCAccount.tsx rename to dapp/src/assets/icons/ConnectBTCAccount.tsx diff --git a/dapp/src/static/icons/ConnectETHAccount.tsx b/dapp/src/assets/icons/ConnectETHAccount.tsx similarity index 100% rename from dapp/src/static/icons/ConnectETHAccount.tsx rename to dapp/src/assets/icons/ConnectETHAccount.tsx diff --git a/dapp/src/static/icons/Ethereum.tsx b/dapp/src/assets/icons/Ethereum.tsx similarity index 100% rename from dapp/src/static/icons/Ethereum.tsx rename to dapp/src/assets/icons/Ethereum.tsx diff --git a/dapp/src/static/icons/Info.tsx b/dapp/src/assets/icons/Info.tsx similarity index 100% rename from dapp/src/static/icons/Info.tsx rename to dapp/src/assets/icons/Info.tsx diff --git a/dapp/src/static/icons/ShieldPlus.tsx b/dapp/src/assets/icons/ShieldPlus.tsx similarity index 100% rename from dapp/src/static/icons/ShieldPlus.tsx rename to dapp/src/assets/icons/ShieldPlus.tsx diff --git a/dapp/src/static/icons/index.ts b/dapp/src/assets/icons/index.ts similarity index 100% rename from dapp/src/static/icons/index.ts rename to dapp/src/assets/icons/index.ts diff --git a/dapp/src/components/GlobalStyles/index.tsx b/dapp/src/components/GlobalStyles/index.tsx index 352fe7af0..e8b11945a 100644 --- a/dapp/src/components/GlobalStyles/index.tsx +++ b/dapp/src/components/GlobalStyles/index.tsx @@ -1,11 +1,11 @@ import React from "react" import { Global } from "@emotion/react" -import SegmentRegular from "#/fonts/Segment-Regular.otf" -import SegmentMedium from "#/fonts/Segment-Medium.otf" -import SegmentSemiBold from "#/fonts/Segment-SemiBold.otf" -import SegmentBold from "#/fonts/Segment-Bold.otf" -import SegmentBlack from "#/fonts/Segment-Black.otf" +import SegmentRegular from "#/assets/fonts/Segment-Regular.otf" +import SegmentMedium from "#/assets/fonts/Segment-Medium.otf" +import SegmentSemiBold from "#/assets/fonts/Segment-SemiBold.otf" +import SegmentBold from "#/assets/fonts/Segment-Bold.otf" +import SegmentBlack from "#/assets/fonts/Segment-Black.otf" export default function GlobalStyles() { return ( diff --git a/dapp/src/components/Header/ConnectWallet.tsx b/dapp/src/components/Header/ConnectWallet.tsx index 767b68833..5e2445406 100644 --- a/dapp/src/components/Header/ConnectWallet.tsx +++ b/dapp/src/components/Header/ConnectWallet.tsx @@ -8,7 +8,7 @@ import { } from "#/hooks" import { CurrencyBalance } from "#/components/shared/CurrencyBalance" import { TextMd } from "#/components/shared/Typography" -import { Bitcoin, Ethereum } from "#/static/icons" +import { Bitcoin, Ethereum } from "#/assets/icons" import { truncateAddress, asyncWrapper } from "#/utils" export type ConnectButtonsProps = { diff --git a/dapp/src/components/Header/index.tsx b/dapp/src/components/Header/index.tsx index 480cb502e..df0a2eb53 100644 --- a/dapp/src/components/Header/index.tsx +++ b/dapp/src/components/Header/index.tsx @@ -1,6 +1,6 @@ import React from "react" import { Flex, HStack, Icon } from "@chakra-ui/react" -import { AcreLogo } from "#/static/icons" +import { AcreLogo } from "#/assets/icons" import ConnectWallet from "./ConnectWallet" export default function Header() { diff --git a/dapp/src/components/Modals/Support/index.tsx b/dapp/src/components/Modals/Support/index.tsx index ae5aa98eb..47689622a 100644 --- a/dapp/src/components/Modals/Support/index.tsx +++ b/dapp/src/components/Modals/Support/index.tsx @@ -4,7 +4,7 @@ import { useRequestEthereumAccount, useWalletContext, } from "#/hooks" -import { ConnectBTCAccount, ConnectETHAccount } from "#/static/icons" +import { ConnectBTCAccount, ConnectETHAccount } from "#/assets/icons" import MissingAccount from "./MissingAccount" export default function SupportWrapper({ diff --git a/dapp/src/components/Overview/PositionDetails.tsx b/dapp/src/components/Overview/PositionDetails.tsx index 0555c3ddf..290c7c52a 100644 --- a/dapp/src/components/Overview/PositionDetails.tsx +++ b/dapp/src/components/Overview/PositionDetails.tsx @@ -12,7 +12,7 @@ import { } from "@chakra-ui/react" import { CurrencyBalanceWithConversion } from "#/components/shared/CurrencyBalanceWithConversion" import { TextMd } from "#/components/shared/Typography" -import { Info } from "#/static/icons" +import { Info } from "#/assets/icons" import StakingModal from "../Modals/Staking" export default function PositionDetails(props: CardProps) { diff --git a/dapp/src/components/Overview/index.tsx b/dapp/src/components/Overview/index.tsx index 31764618f..c2c07064f 100644 --- a/dapp/src/components/Overview/index.tsx +++ b/dapp/src/components/Overview/index.tsx @@ -2,7 +2,7 @@ import React from "react" import { Button, Flex, Grid, HStack, Icon, Switch } from "@chakra-ui/react" import { useDocsDrawer } from "#/hooks" import { TextSm } from "#/components/shared/Typography" -import { ArrowUpRight } from "#/static/icons" +import { ArrowUpRight } from "#/assets/icons" import { USD } from "#/constants" import PositionDetails from "./PositionDetails" import Statistics from "./Statistics" diff --git a/dapp/src/components/Sidebar/index.tsx b/dapp/src/components/Sidebar/index.tsx index b0e46f3e5..0b485b142 100644 --- a/dapp/src/components/Sidebar/index.tsx +++ b/dapp/src/components/Sidebar/index.tsx @@ -13,7 +13,7 @@ import { } from "@chakra-ui/react" import RightSidebar from "#/assets/images/right-sidebar-bg.png" import { useSidebar, useDocsDrawer } from "#/hooks" -import { ShieldPlusIcon } from "#/static/icons" +import { ShieldPlusIcon } from "#/assets/icons" import { TextMd, TextSm } from "../shared/Typography" import ButtonLink from "../shared/ButtonLink" diff --git a/dapp/src/components/TransactionHistory/Table/utils/pagination.tsx b/dapp/src/components/TransactionHistory/Table/utils/pagination.tsx index 11dc7f697..b0bb99ef5 100644 --- a/dapp/src/components/TransactionHistory/Table/utils/pagination.tsx +++ b/dapp/src/components/TransactionHistory/Table/utils/pagination.tsx @@ -1,6 +1,6 @@ import React from "react" import { UseTransactionHistoryTableResult } from "#/types" -import { ArrowLeft, ArrowRight } from "#/static/icons" +import { ArrowLeft, ArrowRight } from "#/assets/icons" export const PAGINATION_BUTTONS = [ { diff --git a/dapp/src/components/shared/Alert/index.tsx b/dapp/src/components/shared/Alert/index.tsx index 687e0599b..c5a10f0eb 100644 --- a/dapp/src/components/shared/Alert/index.tsx +++ b/dapp/src/components/shared/Alert/index.tsx @@ -7,7 +7,7 @@ import { Icon, useMultiStyleConfig, } from "@chakra-ui/react" -import { AlertInfo, ArrowUpRight } from "#/static/icons" +import { AlertInfo, ArrowUpRight } from "#/assets/icons" const ICONS = { info: AlertInfo, diff --git a/dapp/src/components/shared/ButtonLink/index.tsx b/dapp/src/components/shared/ButtonLink/index.tsx index 32aa81907..88d44e3e1 100644 --- a/dapp/src/components/shared/ButtonLink/index.tsx +++ b/dapp/src/components/shared/ButtonLink/index.tsx @@ -1,6 +1,6 @@ import React from "react" import { Button, ButtonProps, Icon } from "@chakra-ui/react" -import { ArrowUpRight } from "#/static/icons" +import { ArrowUpRight } from "#/assets/icons" type ButtonLinkProps = ButtonProps & { icon?: typeof Icon diff --git a/dapp/src/components/shared/TokenBalanceInput/index.tsx b/dapp/src/components/shared/TokenBalanceInput/index.tsx index 68975da92..de55b64dd 100644 --- a/dapp/src/components/shared/TokenBalanceInput/index.tsx +++ b/dapp/src/components/shared/TokenBalanceInput/index.tsx @@ -17,7 +17,7 @@ import { getCurrencyByType, userAmountToBigInt, } from "#/utils" -import { AlertInfo } from "#/static/icons" +import { AlertInfo } from "#/assets/icons" import { CurrencyType } from "#/types" import NumberFormatInput, { NumberFormatInputValues,