From dff0f83a5cf56c93cc60c4a38978f651cb6c718a Mon Sep 17 00:00:00 2001 From: Philipp Hoenisch Date: Sun, 26 Sep 2021 11:17:39 +1000 Subject: [PATCH] Fmt and removed unused file --- frontend/src/Maker.tsx | 1 - frontend/src/Taker.tsx | 33 +++---- frontend/src/components/CfdTile.tsx | 138 ---------------------------- 3 files changed, 17 insertions(+), 155 deletions(-) delete mode 100644 frontend/src/components/CfdTile.tsx diff --git a/frontend/src/Maker.tsx b/frontend/src/Maker.tsx index 5e602ab..37eb215 100644 --- a/frontend/src/Maker.tsx +++ b/frontend/src/Maker.tsx @@ -127,7 +127,6 @@ export default function App() { > {order ? "Update Sell Order" : "Create Sell Order"} - diff --git a/frontend/src/Taker.tsx b/frontend/src/Taker.tsx index 00cc02c..6f2f33a 100644 --- a/frontend/src/Taker.tsx +++ b/frontend/src/Taker.tsx @@ -1,7 +1,9 @@ import { Button, Container, - Flex, Grid, GridItem, + Flex, + Grid, + GridItem, HStack, Tab, TabList, @@ -12,13 +14,13 @@ import { useToast, VStack, } from "@chakra-ui/react"; -import React, {useState} from "react"; -import {useAsync} from "react-async"; -import {useEventSource} from "react-sse-hooks"; -import {CfdTable} from "./components/cfdtables/CfdTable"; +import React, { useState } from "react"; +import { useAsync } from "react-async"; +import { useEventSource } from "react-sse-hooks"; +import { CfdTable } from "./components/cfdtables/CfdTable"; import CurrencyInputField from "./components/CurrencyInputField"; import useLatestEvent from "./components/Hooks"; -import {Cfd, Order, WalletInfo} from "./components/Types"; +import { Cfd, Order, WalletInfo } from "./components/Types"; import Wallet from "./components/Wallet"; interface CfdOrderRequestPayload { @@ -37,7 +39,7 @@ interface MarginResponse { } async function postCfdOrderRequest(payload: CfdOrderRequestPayload) { - let res = await fetch(`/api/cfd`, {method: "POST", body: JSON.stringify(payload)}); + let res = await fetch(`/api/cfd`, { method: "POST", body: JSON.stringify(payload) }); if (!res.status.toString().startsWith("2")) { throw new Error("failed to create new CFD order request: " + res.status + ", " + res.statusText); @@ -45,7 +47,7 @@ async function postCfdOrderRequest(payload: CfdOrderRequestPayload) { } async function getMargin(payload: MarginRequestPayload): Promise { - let res = await fetch(`/api/calculate/margin`, {method: "POST", body: JSON.stringify(payload)}); + let res = await fetch(`/api/calculate/margin`, { method: "POST", body: JSON.stringify(payload) }); if (!res.status.toString().startsWith("2")) { throw new Error("failed to create new CFD order request: " + res.status + ", " + res.statusText); @@ -55,7 +57,7 @@ async function getMargin(payload: MarginRequestPayload): Promise } export default function App() { - let source = useEventSource({source: "/api/feed"}); + let source = useEventSource({ source: "/api/feed" }); const cfdsOrUndefined = useLatestEvent(source, "cfds"); let cfds = cfdsOrUndefined ? cfdsOrUndefined! : []; @@ -66,7 +68,7 @@ export default function App() { let [quantity, setQuantity] = useState("0"); let [margin, setMargin] = useState("0"); - let {run: calculateMargin} = useAsync({ + let { run: calculateMargin } = useAsync({ deferFn: async ([payload]: any[]) => { try { let res = await getMargin(payload as MarginRequestPayload); @@ -88,7 +90,7 @@ export default function App() { const format = (val: any) => `$` + val; const parse = (val: any) => val.replace(/^\$/, ""); - let {run: makeNewOrderRequest, isLoading: isCreatingNewOrderRequest} = useAsync({ + let { run: makeNewOrderRequest, isLoading: isCreatingNewOrderRequest } = useAsync({ deferFn: async ([payload]: any[]) => { try { await postCfdOrderRequest(payload as CfdOrderRequestPayload); @@ -120,7 +122,7 @@ export default function App() { - + {/*TODO: Do we need this? does it make sense to only display the price from the order?*/} @@ -176,7 +178,6 @@ export default function App() { BUY } - @@ -188,13 +189,13 @@ export default function App() { - + - + - + diff --git a/frontend/src/components/CfdTile.tsx b/frontend/src/components/CfdTile.tsx deleted file mode 100644 index 00873d5..0000000 --- a/frontend/src/components/CfdTile.tsx +++ /dev/null @@ -1,138 +0,0 @@ -import { Box, Button, HStack, SimpleGrid, Text, useToast, VStack } from "@chakra-ui/react"; -import React from "react"; -import { useAsync } from "react-async"; -import { postAcceptOrder, postRejectOrder } from "../MakerClient"; -import { Cfd, unixTimestampToDate } from "./Types"; - -interface CfdTileProps { - index: number; - cfd: Cfd; -} - -export default function CfdTile( - { - index, - cfd, - }: CfdTileProps, -) { - const toast = useToast(); - - let { run: acceptOrder, isLoading: isAccepting } = useAsync({ - deferFn: async ([args]: any[]) => { - try { - let payload = { - order_id: args.order_id, - }; - await postAcceptOrder(payload); - } catch (e) { - const description = typeof e === "string" ? e : JSON.stringify(e); - - toast({ - title: "Error", - description, - status: "error", - duration: 9000, - isClosable: true, - }); - } - }, - }); - - let { run: rejectOrder, isLoading: isRejecting } = useAsync({ - deferFn: async ([args]: any[]) => { - try { - let payload = { - order_id: args.order_id, - }; - await postRejectOrder(payload); - } catch (e) { - const description = typeof e === "string" ? e : JSON.stringify(e); - - toast({ - title: "Error", - description, - status: "error", - duration: 9000, - isClosable: true, - }); - } - }, - }); - - let actionButtons; - if (cfd.state === "Open") { - actionButtons = - - ; - } else if (cfd.state == "Requested") { - actionButtons = ( - - - - - - - - - ); - } - - return ( - - - - CFD #{index} - - - Trading Pair - {cfd.trading_pair} - Position - {cfd.position} - CFD Price - {cfd.initial_price} - Leverage - {cfd.leverage} - Quantity - {cfd.quantity_usd} - Margin - {cfd.margin} - Liquidation Price - - {cfd.liquidation_price} - - Profit - {cfd.profit_usd} - Open since - {/* TODO: Format date in a more compact way */} - - {unixTimestampToDate(cfd.state_transition_timestamp).toString()} - - Status - {cfd.state} - - {actionButtons} - - - ); -}