From 91e5db2bb91aa61b9896f56d36cc315de8d691d5 Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Fri, 16 Sep 2022 09:24:14 -0700 Subject: [PATCH] Fix simplify buy/sell toggle buttons. Run prettier and lint. --- frontend/src/components/BookPage.js | 144 ++++----------- frontend/src/components/BottomBar.js | 44 ++--- .../components/Charts/DepthChart/index.tsx | 7 +- frontend/src/components/HomePage.js | 2 +- frontend/src/components/MakerPage.js | 172 ++++++------------ frontend/src/components/OrderPage.js | 38 ++-- frontend/src/components/TradeBox.js | 85 +++++---- frontend/src/components/UserGenPage.js | 80 ++++---- .../src/services/api/ApiWebClient/index.ts | 34 ++-- frontend/src/services/api/index.ts | 12 +- 10 files changed, 257 insertions(+), 361 deletions(-) diff --git a/frontend/src/components/BookPage.js b/frontend/src/components/BookPage.js index b06ca184..8cb7c36a 100644 --- a/frontend/src/components/BookPage.js +++ b/frontend/src/components/BookPage.js @@ -1,14 +1,12 @@ import React, { Component } from 'react'; import { withTranslation } from 'react-i18next'; import { - Badge, Tooltip, Stack, Paper, Button, - FormControlLabel, - Checkbox, - RadioGroup, + ToggleButtonGroup, + ToggleButton, ListItemButton, Typography, Grid, @@ -35,7 +33,6 @@ import { apiClient } from '../services/api/index'; // Icons import { BarChart, FormatListBulleted, Refresh } from '@mui/icons-material'; -import { BuySatsCheckedIcon, BuySatsIcon, SellSatsCheckedIcon, SellSatsIcon } from './Icons'; class BookPage extends Component { constructor(props) { @@ -52,14 +49,13 @@ class BookPage extends Component { getOrderDetails(type, currency) { this.props.setAppState({ bookLoading: true }); - apiClient.get('/api/book?currency=' + currency + '&type=' + type) - .then((data) => - this.props.setAppState({ - bookNotFound: data.not_found, - bookLoading: false, - bookOrders: data, - }), - ); + apiClient.get('/api/book/').then((data) => + this.props.setAppState({ + bookNotFound: data.not_found, + bookLoading: false, + bookOrders: data, + }), + ); } handleRowClick = (e) => { @@ -152,12 +148,12 @@ class BookPage extends Component { bookListTableDesktop = () => { const { t } = this.props; return ( -
+
- (order.type == this.props.type || this.props.type == 2) && + (order.type == this.props.type || this.props.type == null) && (order.currency == this.props.currency || this.props.currency == 0), )} loading={this.props.bookLoading} @@ -293,7 +289,7 @@ class BookPage extends Component { bookListTablePhone = () => { const { t } = this.props; return ( -
+
{ - this.props.setAppState({ buyChecked, sellChecked }); - - if (buyChecked & sellChecked || !buyChecked & !sellChecked) { - var type = 2; - } else if (buyChecked) { - var type = 1; - } else if (sellChecked) { - var type = 0; - } - this.props.setAppState({ type }); - }; - - handleClickBuy = (e) => { - const buyChecked = e.target.checked; - const sellChecked = this.props.sellChecked; - this.handleTypeChange(buyChecked, sellChecked); + handleTypeChange = (mouseEvent, val) => { + this.props.setAppState({ type: val }); }; handleClickView = () => { this.setState({ view: this.state.view == 'depth' ? 'list' : 'depth' }); }; - handleClickSell = (e) => { - const buyChecked = this.props.buyChecked; - const sellChecked = e.target.checked; - this.handleTypeChange(buyChecked, sellChecked); - }; - NoOrdersFound = () => { const { t } = this.props; @@ -529,14 +504,14 @@ class BookPage extends Component { <> {/* Desktop */} - -
{components[0]}
+ +
{components[0]}
 {/* Smartphone */} - -
{components[1]}
+ +
{components[1]}
 @@ -576,74 +551,25 @@ class BookPage extends Component { - + {t('I want to')} - -
- } - checkedIcon={ - - } - /> - } - label={ -
- {this.props.buyChecked ? ( - - {t('Buy')} - - ) : ( - - {t('Buy')} - - )} -
- } - labelPlacement='bottom' - checked={this.props.buyChecked} - onChange={this.handleClickBuy} - /> -
- } - checkedIcon={ - - } - /> - } - label={ -
- {this.props.sellChecked ? ( - - {t('Sell')} - - ) : ( - - {t('Sell')} - - )} -
- } - labelPlacement='bottom' - checked={this.props.sellChecked} - onChange={this.handleClickSell} - /> - +
+ + + {t('Buy')} + + + {t('Sell')} + + +
diff --git a/frontend/src/components/BottomBar.js b/frontend/src/components/BottomBar.js index b3948a70..614b52aa 100644 --- a/frontend/src/components/BottomBar.js +++ b/frontend/src/components/BottomBar.js @@ -72,23 +72,22 @@ class BottomBar extends Component { getInfo() { this.setState(null); - apiClient.get('/api/info/') - .then( - (data) => - this.setState(data) & - this.props.setAppState({ - nickname: data.nickname, - loading: false, - activeOrderId: data.active_order_id ? data.active_order_id : null, - lastOrderId: data.last_order_id ? data.last_order_id : null, - referralCode: data.referral_code, - tgEnabled: data.tg_enabled, - tgBotName: data.tg_bot_name, - tgToken: data.tg_token, - earnedRewards: data.earned_rewards, - lastDayPremium: data.last_day_nonkyc_btc_premium, - }), - ); + apiClient.get('/api/info/').then( + (data) => + this.setState(data) & + this.props.setAppState({ + nickname: data.nickname, + loading: false, + activeOrderId: data.active_order_id ? data.active_order_id : null, + lastOrderId: data.last_order_id ? data.last_order_id : null, + referralCode: data.referral_code, + tgEnabled: data.tg_enabled, + tgBotName: data.tg_bot_name, + tgToken: data.tg_token, + earnedRewards: data.earned_rewards, + lastDayPremium: data.last_day_nonkyc_btc_premium, + }), + ); } handleClickOpenStatsForNerds = () => { @@ -122,9 +121,11 @@ class BottomBar extends Component { showRewardsSpinner: true, }); - apiClient.post('/api/reward/', { - invoice: rewardInvoice, - }).then( + apiClient + .post('/api/reward/', { + invoice: rewardInvoice, + }) + .then( (data) => this.setState({ badInvoice: data.bad_invoice, @@ -140,7 +141,8 @@ class BottomBar extends Component { }; handleSetStealthInvoice = (wantsStealth) => { - apiClient.put('/api/stealth/', { wantsStealth }) + apiClient + .put('/api/stealth/', { wantsStealth }) .then((data) => this.props.setAppState({ stealthInvoices: data.wantsStealth })); }; diff --git a/frontend/src/components/Charts/DepthChart/index.tsx b/frontend/src/components/Charts/DepthChart/index.tsx index c50973dc..0f7875dc 100644 --- a/frontend/src/components/Charts/DepthChart/index.tsx +++ b/frontend/src/components/Charts/DepthChart/index.tsx @@ -63,10 +63,9 @@ const DepthChart: React.FC = ({ useEffect(() => { if (Object.keys(limits).length === 0) { - apiClient.get('/api/limits/') - .then((data) => { - setAppState({ limits: data }); - }); + apiClient.get('/api/limits/').then((data) => { + setAppState({ limits: data }); + }); } }, []); diff --git a/frontend/src/components/HomePage.js b/frontend/src/components/HomePage.js index e2d91704..7f11d72c 100644 --- a/frontend/src/components/HomePage.js +++ b/frontend/src/components/HomePage.js @@ -24,7 +24,7 @@ export default class HomePage extends Component { avatarLoaded: false, buyChecked: false, sellChecked: false, - type: 2, + type: null, currency: 0, bookCurrencyCode: 'ANY', bookOrders: new Array(), diff --git a/frontend/src/components/MakerPage.js b/frontend/src/components/MakerPage.js index 641321df..d60d4efe 100644 --- a/frontend/src/components/MakerPage.js +++ b/frontend/src/components/MakerPage.js @@ -3,12 +3,7 @@ import { withTranslation } from 'react-i18next'; import { InputAdornment, LinearProgress, - Dialog, - IconButton, - DialogActions, - DialogContent, - DialogContentText, - DialogTitle, + ButtonGroup, Accordion, AccordionDetails, AccordionSummary, @@ -47,7 +42,6 @@ import currencyDict from '../../static/assets/currencies.json'; import LockIcon from '@mui/icons-material/Lock'; import HourglassTopIcon from '@mui/icons-material/HourglassTop'; import ExpandMoreIcon from '@mui/icons-material/ExpandMore'; -import { BuySatsCheckedIcon, BuySatsIcon, SellSatsCheckedIcon, SellSatsIcon } from './Icons'; import { getCookie } from '../utils/cookies'; import { pn } from '../utils/prettyNumbers'; @@ -99,28 +93,26 @@ class MakerPage extends Component { // if currency or type have changed in HomePage state, change in MakerPage state too. this.setState({ currency: !this.props.currency === 0 ? this.props.currency : this.state.currency, - type: !this.props.type == 2 ? (this.props.type == 1 ? 0 : 1) : this.state.type, }); } getLimits() { this.setState({ loadingLimits: true }); - apiClient.get('/api/limits/') - .then((data) => - this.setState({ - limits: data, - loadingLimits: false, - minAmount: this.state.amount - ? parseFloat((this.state.amount / 2).toPrecision(2)) - : parseFloat(Number(data[this.state.currency].max_amount * 0.25).toPrecision(2)), - maxAmount: this.state.amount - ? this.state.amount - : parseFloat(Number(data[this.state.currency].max_amount * 0.75).toPrecision(2)), - minTradeSats: data['1000'].min_amount * 100000000, - maxTradeSats: data['1000'].max_amount * 100000000, - maxBondlessSats: data['1000'].max_bondless_amount * 100000000, - }), - ); + apiClient.get('/api/limits/').then((data) => + this.setState({ + limits: data, + loadingLimits: false, + minAmount: this.state.amount + ? parseFloat((this.state.amount / 2).toPrecision(2)) + : parseFloat(Number(data[this.state.currency].max_amount * 0.25).toPrecision(2)), + maxAmount: this.state.amount + ? this.state.amount + : parseFloat(Number(data[this.state.currency].max_amount * 0.75).toPrecision(2)), + minTradeSats: data['1000'].min_amount * 100000000, + maxTradeSats: data['1000'].max_amount * 100000000, + maxBondlessSats: data['1000'].max_bondless_amount * 100000000, + }), + ); } recalcBounds = () => { @@ -145,19 +137,6 @@ class MakerPage extends Component { }; } - handleTypeChange = (e) => { - this.setState({ - type: e.target.value, - }); - // Share state with HomePage and OrderPage - this.props.setAppState({ - // maker and book page type values 0:1 are reversed - type: e.target.value == 1 ? 0 : 1, - buyChecked: e.target.value == 0, - sellChecked: e.target.value == 1, - }); - }; - handleCurrencyChange = (e) => { const currencyCode = this.getCurrencyCode(e.target.value); this.setState({ @@ -304,7 +283,7 @@ class MakerPage extends Component { handleCreateOfferButtonPressed = () => { this.state.amount == null ? this.setState({ amount: 0 }) : null; const body = { - type: this.state.type, + type: this.props.type == 0 ? 1 : 0, currency: this.state.currency, amount: this.state.has_range ? null : this.state.amount, has_range: this.state.enableAmountRange, @@ -320,7 +299,8 @@ class MakerPage extends Component { bond_size: this.state.bondSize, bondless_taker: this.state.allowBondless, }; - apiClient.post('/api/make/', body) + apiClient + .post('/api/make/', body) .then( (data) => this.setState({ badRequest: data.bad_request }) & @@ -356,79 +336,46 @@ class MakerPage extends Component { return ( -
- - - {t('Buy or Sell Bitcoin?')} - - - - - } - checkedIcon={ - - } - /> + + + {t('Buy or Sell Bitcoin?')} + +
+ + +
+ disableElevation={this.props.type == 0} + color={this.props.type == 0 ? 'secondary' : 'inherit'} + > + {t('Sell')} + + +
+ +
-
+
+
- + {t('Choose a Pricing Method')} @@ -916,7 +864,7 @@ class MakerPage extends Component { control={ this.setState({ allowBondless: !this.state.allowBondless })} @@ -989,7 +937,7 @@ class MakerPage extends Component { {/* conditions to disable the make button */} - {this.state.type == null || + {this.props.type == null || (this.state.amount == null) & (this.state.enableAmountRange == false || this.state.loadingLimits) || this.state.enableAmountRange & (this.minAmountError() || this.maxAmountError()) || @@ -1028,9 +976,9 @@ class MakerPage extends Component { )}
- {this.state.type == null + {this.props.type == null ? t('Create an order for ') - : this.state.type == 0 + : this.props.type == 1 ? t('Create a BTC buy order for ') : t('Create a BTC sell order for ')} {this.state.enableAmountRange & (this.state.minAmount != null) diff --git a/frontend/src/components/OrderPage.js b/frontend/src/components/OrderPage.js index f40a9d2f..e785cfc8 100644 --- a/frontend/src/components/OrderPage.js +++ b/frontend/src/components/OrderPage.js @@ -123,8 +123,7 @@ class OrderPage extends Component { getOrderDetails = (id) => { this.setState({ orderId: id }); - apiClient.get('/api/order/?order_id=' + id) - .then(this.orderDetailsReceived); + apiClient.get('/api/order/?order_id=' + id).then(this.orderDetailsReceived); }; orderDetailsReceived = (data) => { @@ -185,10 +184,12 @@ class OrderPage extends Component { }; sendWeblnInvoice = (invoice) => { - apiClient.post('/api/order/?order_id=' + this.state.orderId, { - action: 'update_invoice', - invoice, - }).then((data) => this.completeSetState(data)); + apiClient + .post('/api/order/?order_id=' + this.state.orderId, { + action: 'update_invoice', + invoice, + }) + .then((data) => this.completeSetState(data)); }; // Countdown Renderer callback with condition @@ -422,10 +423,11 @@ class OrderPage extends Component { takeOrder = () => { this.setState({ loading: true }); - apiClient.post('/api/order/?order_id=' + this.state.orderId, { - action: 'take', - amount: this.state.takeAmount, - }) + apiClient + .post('/api/order/?order_id=' + this.state.orderId, { + action: 'take', + amount: this.state.takeAmount, + }) .then((data) => this.handleWebln(data) & this.completeSetState(data)); }; @@ -441,9 +443,11 @@ class OrderPage extends Component { handleClickConfirmCancelButton = () => { this.setState({ loading: true }); - apiClient.post('/api/order/?order_id=' + this.state.orderId, { - action: 'cancel', - }).then(() => this.getOrderDetails(this.state.orderId) & this.setState({ status: 4 })); + apiClient + .post('/api/order/?order_id=' + this.state.orderId, { + action: 'cancel', + }) + .then(() => this.getOrderDetails(this.state.orderId) & this.setState({ status: 4 })); this.handleClickCloseConfirmCancelDialog(); }; @@ -541,9 +545,11 @@ class OrderPage extends Component { }; handleClickConfirmCollaborativeCancelButton = () => { - apiClient.post('/api/order/?order_id=' + this.state.orderId, { - action: 'cancel', - }).then(() => this.getOrderDetails(this.state.orderId) & this.setState({ status: 4 })); + apiClient + .post('/api/order/?order_id=' + this.state.orderId, { + action: 'cancel', + }) + .then(() => this.getOrderDetails(this.state.orderId) & this.setState({ status: 4 })); this.handleClickCloseCollaborativeCancelDialog(); }; diff --git a/frontend/src/components/TradeBox.js b/frontend/src/components/TradeBox.js index 91fee744..7c91be18 100644 --- a/frontend/src/components/TradeBox.js +++ b/frontend/src/components/TradeBox.js @@ -133,9 +133,11 @@ class TradeBox extends Component { }; handleClickAgreeDisputeButton = () => { - apiClient.post('/api/order/?order_id=' + this.props.data.id, { - action: 'dispute', - }).then((data) => this.props.completeSetState(data)); + apiClient + .post('/api/order/?order_id=' + this.props.data.id, { + action: 'dispute', + }) + .then((data) => this.props.completeSetState(data)); this.handleClickCloseConfirmDispute(); }; @@ -480,9 +482,11 @@ class TradeBox extends Component { handleClickPauseOrder = () => { this.props.completeSetState({ pauseLoading: true }); - apiClient.post('/api/order/?order_id=' + this.props.data.id, { - action: 'pause', - }).then((data) => this.props.getOrderDetails(data.id)); + apiClient + .post('/api/order/?order_id=' + this.props.data.id, { + action: 'pause', + }) + .then((data) => this.props.getOrderDetails(data.id)); }; showMakerWait = () => { @@ -626,10 +630,12 @@ class TradeBox extends Component { handleClickSubmitInvoiceButton = () => { this.setState({ badInvoice: false }); - apiClient.post('/api/order/?order_id=' + this.props.data.id, { - action: 'update_invoice', - invoice: this.state.invoice, - }).then( + apiClient + .post('/api/order/?order_id=' + this.props.data.id, { + action: 'update_invoice', + invoice: this.state.invoice, + }) + .then( (data) => this.setState({ badInvoice: data.bad_invoice }) & this.props.completeSetState(data), ); @@ -656,11 +662,13 @@ class TradeBox extends Component { handleClickSubmitAddressButton = () => { this.setState({ badInvoice: false }); - apiClient.post('/api/order/?order_id=' + this.props.data.id, { - action: 'update_address', - address: this.state.address, - mining_fee_rate: Math.max(1, this.state.miningFee), - }).then( + apiClient + .post('/api/order/?order_id=' + this.props.data.id, { + action: 'update_address', + address: this.state.address, + mining_fee_rate: Math.max(1, this.state.miningFee), + }) + .then( (data) => this.setState({ badAddress: data.bad_address }) & this.props.completeSetState(data), ); @@ -676,13 +684,15 @@ class TradeBox extends Component { handleClickSubmitStatementButton = () => { this.setState({ badInvoice: false }); - apiClient.post('/api/order/?order_id=' + this.props.data.id, { - action: 'submit_statement', - statement: this.state.statement, - }).then( - (data) => - this.setState({ badStatement: data.bad_statement }) & this.props.completeSetState(data), - ); + apiClient + .post('/api/order/?order_id=' + this.props.data.id, { + action: 'submit_statement', + statement: this.state.statement, + }) + .then( + (data) => + this.setState({ badStatement: data.bad_statement }) & this.props.completeSetState(data), + ); }; handleScan = (data) => { @@ -1179,16 +1189,20 @@ class TradeBox extends Component { } handleClickConfirmButton = () => { - apiClient.post('/api/order/?order_id=' + this.props.data.id, { - action: 'confirm', - }).then((data) => this.props.completeSetState(data)); + apiClient + .post('/api/order/?order_id=' + this.props.data.id, { + action: 'confirm', + }) + .then((data) => this.props.completeSetState(data)); }; handleRatingUserChange = (e) => { - apiClient.post('/api/order/?order_id=' + this.props.data.id, { - action: 'rate_user', - rating: e.target.value, - }).then((data) => this.props.completeSetState(data)); + apiClient + .post('/api/order/?order_id=' + this.props.data.id, { + action: 'rate_user', + rating: e.target.value, + }) + .then((data) => this.props.completeSetState(data)); }; handleRatingRobosatsChange = (e) => { @@ -1197,10 +1211,12 @@ class TradeBox extends Component { } this.setState({ rating_platform: e.target.value }); - apiClient.post('/api/order/?order_id=' + this.props.data.id, { - action: 'rate_platform', - rating: e.target.value, - }).then((data) => this.props.completeSetState(data)); + apiClient + .post('/api/order/?order_id=' + this.props.data.id, { + action: 'rate_platform', + rating: e.target.value, + }) + .then((data) => this.props.completeSetState(data)); }; showFiatSentButton() { @@ -1316,7 +1332,8 @@ class TradeBox extends Component { bond_size: this.props.data.bond_size, bondless_taker: this.props.data.bondless_taker, }; - apiClient.post('/api/make/', body) + apiClient + .post('/api/make/', body) .then( (data) => this.setState({ badRequest: data.bad_request }) & diff --git a/frontend/src/components/UserGenPage.js b/frontend/src/components/UserGenPage.js index 96dffd20..3ac5626a 100644 --- a/frontend/src/components/UserGenPage.js +++ b/frontend/src/components/UserGenPage.js @@ -77,51 +77,49 @@ class UserGenPage extends Component { }); requestBody.then((body) => - apiClient.post('/api/user/', body) - .then((data) => { - console.log(data) & - this.setState({ - nickname: data.nickname, - bit_entropy: data.token_bits_entropy, - avatarUrl: '/static/assets/avatars/' + data.nickname + '.png', - shannon_entropy: data.token_shannon_entropy, - bad_request: data.bad_request, - found: data.found, - loadingRobot: false, - stealthInvoices: data.wants_stealth, - }) & - // Add nick and token to App state (token only if not a bad request) - (data.bad_request - ? this.props.setAppState({ - nickname: data.nickname, - avatarLoaded: false, - activeOrderId: data.active_order_id ? data.active_order_id : null, - referralCode: data.referral_code, - earnedRewards: data.earned_rewards, - lastOrderId: data.last_order_id ? data.last_order_id : null, - stealthInvoices: data.wants_stealth, - }) - : this.props.setAppState({ - nickname: data.nickname, - token, - avatarLoaded: false, - activeOrderId: data.active_order_id ? data.active_order_id : null, - lastOrderId: data.last_order_id ? data.last_order_id : null, - referralCode: data.referral_code, - earnedRewards: data.earned_rewards, - stealthInvoices: data.wants_stealth, - }) & - writeCookie('robot_token', token) & - writeCookie('pub_key', data.public_key.split('\n').join('\\')) & - writeCookie('enc_priv_key', data.encrypted_private_key.split('\n').join('\\'))) & - // If the robot has been found (recovered) we assume the token is backed up - (data.found ? this.props.setAppState({ copiedToken: true }) : null); - }), + apiClient.post('/api/user/', body).then((data) => { + this.setState({ + nickname: data.nickname, + bit_entropy: data.token_bits_entropy, + avatarUrl: '/static/assets/avatars/' + data.nickname + '.png', + shannon_entropy: data.token_shannon_entropy, + bad_request: data.bad_request, + found: data.found, + loadingRobot: false, + stealthInvoices: data.wants_stealth, + }) & + // Add nick and token to App state (token only if not a bad request) + (data.bad_request + ? this.props.setAppState({ + nickname: data.nickname, + avatarLoaded: false, + activeOrderId: data.active_order_id ? data.active_order_id : null, + referralCode: data.referral_code, + earnedRewards: data.earned_rewards, + lastOrderId: data.last_order_id ? data.last_order_id : null, + stealthInvoices: data.wants_stealth, + }) + : this.props.setAppState({ + nickname: data.nickname, + token, + avatarLoaded: false, + activeOrderId: data.active_order_id ? data.active_order_id : null, + lastOrderId: data.last_order_id ? data.last_order_id : null, + referralCode: data.referral_code, + earnedRewards: data.earned_rewards, + stealthInvoices: data.wants_stealth, + }) & + writeCookie('robot_token', token) & + writeCookie('pub_key', data.public_key.split('\n').join('\\')) & + writeCookie('enc_priv_key', data.encrypted_private_key.split('\n').join('\\'))) & + // If the robot has been found (recovered) we assume the token is backed up + (data.found ? this.props.setAppState({ copiedToken: true }) : null); + }), ); }; delGeneratedUser() { - apiClient.delete('/api/user') + apiClient.delete('/api/user'); deleteCookie('sessionid'); deleteCookie('robot_token'); diff --git a/frontend/src/services/api/ApiWebClient/index.ts b/frontend/src/services/api/ApiWebClient/index.ts index 70caabae..b8b0bd58 100644 --- a/frontend/src/services/api/ApiWebClient/index.ts +++ b/frontend/src/services/api/ApiWebClient/index.ts @@ -1,40 +1,40 @@ -import { ApiClient } from "../api" +import { ApiClient } from '../api'; import { getCookie } from '../../../utils/cookies'; class ApiWebClient implements ApiClient { - private getHeaders: () => HeadersInit = () => { - return { 'Content-Type': 'application/json', 'X-CSRFToken': getCookie('csrftoken') || "" } - } + private readonly getHeaders: () => HeadersInit = () => { + return { 'Content-Type': 'application/json', 'X-CSRFToken': getCookie('csrftoken') || '' }; + }; - public post: (path: string, body: object) => Promise = (path, body) => { + public post: (path: string, body: object) => Promise = async (path, body) => { const requestOptions = { method: 'POST', headers: this.getHeaders(), body: JSON.stringify(body), }; - return fetch(path, requestOptions).then((response) => response.json()) - } + return await fetch(path, requestOptions).then(async (response) => await response.json()); + }; - public put: (path: string, body: object) => Promise = (path, body) => { + public put: (path: string, body: object) => Promise = async (path, body) => { const requestOptions = { method: 'PUT', headers: this.getHeaders(), body: JSON.stringify(body), }; - return fetch(path, requestOptions).then((response) => response.json()) - } + return await fetch(path, requestOptions).then(async (response) => await response.json()); + }; - public delete: (path: string) => Promise = (path) => { + public delete: (path: string) => Promise = async (path) => { const requestOptions = { method: 'DELETE', headers: this.getHeaders(), }; - return fetch(path, requestOptions).then((response) => response.json()) - } + return await fetch(path, requestOptions).then(async (response) => await response.json()); + }; - public get: (path: string) => Promise = (path) => { - return fetch(path).then((response) => response.json()) - } + public get: (path: string) => Promise = async (path) => { + return await fetch(path).then(async (response) => await response.json()); + }; } -export default ApiWebClient +export default ApiWebClient; diff --git a/frontend/src/services/api/index.ts b/frontend/src/services/api/index.ts index c0d5cde3..7ea3627d 100644 --- a/frontend/src/services/api/index.ts +++ b/frontend/src/services/api/index.ts @@ -1,10 +1,10 @@ -import ApiWebClient from './ApiWebClient' +import ApiWebClient from './ApiWebClient'; export interface ApiClient { - post: (path: string, body: object) => Promise - put: (path: string, body: object) => Promise - get: (path: string) => Promise - delete: (path: string) => Promise + post: (path: string, body: object) => Promise; + put: (path: string, body: object) => Promise; + get: (path: string) => Promise; + delete: (path: string) => Promise; } -export const apiClient: ApiClient = new ApiWebClient() +export const apiClient: ApiClient = new ApiWebClient();