Skip to content

Commit

Permalink
Fix code style issues with ESLint
Browse files Browse the repository at this point in the history
  • Loading branch information
@lint-action
lint-action committed Oct 5, 2020
1 parent 7c8d123 commit 79a2fe5
Show file tree
Hide file tree
Showing 71 changed files with 6,399 additions and 4,757 deletions.
6 changes: 2 additions & 4 deletions .eslintrc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
"jsx": true
}
},
"ignorePatterns": [
"node_modules/**/*"
],
"ignorePatterns": ["node_modules/**/*"],
"settings": {
"react": {
"version": "detect"
Expand All @@ -28,4 +26,4 @@
"prettier/prettier": "error",
"@typescript-eslint/no-explicit-any": "off"
}
}
}
52 changes: 11 additions & 41 deletions cloudformation.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@
"DeploymentSecretAccessKey": {
"Description": "Secret access key for deploying to the S3 bucket",
"Value": {
"Fn::GetAtt": [
"DeploymentUserAccessKey",
"SecretAccessKey"
]
"Fn::GetAtt": ["DeploymentUserAccessKey", "SecretAccessKey"]
}
}
},
Expand All @@ -31,11 +28,7 @@
{
"Sid": "1",
"Effect": "Allow",
"Action": [
"s3:PutObject",
"s3:GetObject",
"s3:ListBucket"
],
"Action": ["s3:PutObject", "s3:GetObject", "s3:ListBucket"],
"Resource": [
{
"Fn::Join": [
Expand Down Expand Up @@ -151,30 +144,21 @@
]
}
},
"Action": [
"s3:GetObject",
"s3:ListBucket"
],
"Action": ["s3:GetObject", "s3:ListBucket"],
"Resource": [
{
"Fn::Join": [
"",
[
{
"Fn::GetAtt": [
"AssetsBucket",
"Arn"
]
"Fn::GetAtt": ["AssetsBucket", "Arn"]
},
"/*"
]
]
},
{
"Fn::GetAtt": [
"AssetsBucket",
"Arn"
]
"Fn::GetAtt": ["AssetsBucket", "Arn"]
}
]
},
Expand All @@ -183,10 +167,7 @@
"Effect": "Deny",
"NotPrincipal": {
"AWS": {
"Fn::GetAtt": [
"DeploymentUser",
"Arn"
]
"Fn::GetAtt": ["DeploymentUser", "Arn"]
}
},
"Action": "s3:PutObject",
Expand All @@ -195,10 +176,7 @@
"",
[
{
"Fn::GetAtt": [
"AssetsBucket",
"Arn"
]
"Fn::GetAtt": ["AssetsBucket", "Arn"]
},
"/*"
]
Expand Down Expand Up @@ -243,18 +221,13 @@
],
"Comment": "info.uniswap.org",
"Enabled": true,
"Aliases": [
"info.uniswap.org"
],
"Aliases": ["info.uniswap.org"],
"DefaultRootObject": "index.html",
"HttpVersion": "http2",
"Origins": [
{
"DomainName": {
"Fn::GetAtt": [
"AssetsBucket",
"DomainName"
]
"Fn::GetAtt": ["AssetsBucket", "DomainName"]
},
"Id": "assets-bucket",
"S3OriginConfig": {
Expand All @@ -281,10 +254,7 @@
},
"DefaultCacheBehavior": {
"Compress": true,
"AllowedMethods": [
"GET",
"HEAD"
],
"AllowedMethods": ["GET", "HEAD"],
"ForwardedValues": {
"QueryString": false
},
Expand All @@ -295,4 +265,4 @@
}
}
}
}
}
146 changes: 91 additions & 55 deletions src/App.js
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,32 @@
import React, { useState } from 'react'
import styled from 'styled-components'
import { ApolloProvider } from 'react-apollo'
import { client } from './apollo/client'
import { Route, Switch, BrowserRouter, Redirect } from 'react-router-dom'
import GlobalPage from './pages/GlobalPage'
import TokenPage from './pages/TokenPage'
import PairPage from './pages/PairPage'
import { useGlobalData, useGlobalChartData } from './contexts/GlobalData'
import { isAddress } from './utils'
import AccountPage from './pages/AccountPage'
import AllTokensPage from './pages/AllTokensPage'
import AllPairsPage from './pages/AllPairsPage'
import PinnedData from './components/PinnedData'

import SideNav from './components/SideNav'
import AccountLookup from './pages/AccountLookup'
import { OVERVIEW_TOKEN_BLACKLIST, PAIR_BLACKLIST } from './constants'
import LocalLoader from './components/LocalLoader'
import { useLatestBlock } from './contexts/Application'
import React, { useState } from "react";
import styled from "styled-components";
import { ApolloProvider } from "react-apollo";
import { client } from "./apollo/client";
import { Route, Switch, BrowserRouter, Redirect } from "react-router-dom";
import GlobalPage from "./pages/GlobalPage";
import TokenPage from "./pages/TokenPage";
import PairPage from "./pages/PairPage";
import { useGlobalData, useGlobalChartData } from "./contexts/GlobalData";
import { isAddress } from "./utils";
import AccountPage from "./pages/AccountPage";
import AllTokensPage from "./pages/AllTokensPage";
import AllPairsPage from "./pages/AllPairsPage";
import PinnedData from "./components/PinnedData";

import SideNav from "./components/SideNav";
import AccountLookup from "./pages/AccountLookup";
import { OVERVIEW_TOKEN_BLACKLIST, PAIR_BLACKLIST } from "./constants";
import LocalLoader from "./components/LocalLoader";
import { useLatestBlock } from "./contexts/Application";

const AppWrapper = styled.div`
position: relative;
width: 100%;
`
`;
const ContentWrapper = styled.div`
display: grid;
grid-template-columns: ${({ open }) => (open ? '220px 1fr 200px' : '220px 1fr 64px')};
grid-template-columns: ${({ open }) =>
open ? "220px 1fr 200px" : "220px 1fr 64px"};
@media screen and (max-width: 1400px) {
grid-template-columns: 220px 1fr;
Expand All @@ -37,28 +38,28 @@ const ContentWrapper = styled.div`
overflow: hidden;
grid-gap: 0;
}
`
`;

const Right = styled.div`
position: fixed;
right: 0;
bottom: 0rem;
z-index: 99;
width: ${({ open }) => (open ? '220px' : '64px')};
height: ${({ open }) => (open ? 'fit-content' : '64px')};
width: ${({ open }) => (open ? "220px" : "64px")};
height: ${({ open }) => (open ? "fit-content" : "64px")};
overflow: scroll;
background-color: ${({ theme }) => theme.bg1};
@media screen and (max-width: 1400px) {
display: none;
}
`
`;

const Center = styled.div`
height: 100%;
z-index: 9999;
transition: width 0.25s ease;
background-color: ${({ theme }) => theme.onlyLight};
`
`;

/**
* Wrap the component with the header and sidebar pinned tab
Expand All @@ -74,15 +75,15 @@ const LayoutWrapper = ({ children, savedOpen, setSavedOpen }) => {
</Right>
</ContentWrapper>
</>
)
}
);
};

function App() {
const [savedOpen, setSavedOpen] = useState(false)
const [savedOpen, setSavedOpen] = useState(false);

const globalData = useGlobalData()
const globalChartData = useGlobalChartData()
const latestBlock = useLatestBlock()
const globalData = useGlobalData();
const globalChartData = useGlobalChartData();
const latestBlock = useLatestBlock();

return (
<ApolloProvider client={client}>
Expand All @@ -99,17 +100,26 @@ function App() {
strict
path="/token/:tokenAddress"
render={({ match }) => {
if (OVERVIEW_TOKEN_BLACKLIST.includes(match.params.tokenAddress.toLowerCase())) {
return <Redirect to="/home" />
if (
OVERVIEW_TOKEN_BLACKLIST.includes(
match.params.tokenAddress.toLowerCase()
)
) {
return <Redirect to="/home" />;
}
if (isAddress(match.params.tokenAddress.toLowerCase())) {
return (
<LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
<TokenPage address={match.params.tokenAddress.toLowerCase()} />
<LayoutWrapper
savedOpen={savedOpen}
setSavedOpen={setSavedOpen}
>
<TokenPage
address={match.params.tokenAddress.toLowerCase()}
/>
</LayoutWrapper>
)
);
} else {
return <Redirect to="/home" />
return <Redirect to="/home" />;
}
}}
/>
Expand All @@ -118,17 +128,26 @@ function App() {
strict
path="/pair/:pairAddress"
render={({ match }) => {
if (PAIR_BLACKLIST.includes(match.params.pairAddress.toLowerCase())) {
return <Redirect to="/home" />
if (
PAIR_BLACKLIST.includes(
match.params.pairAddress.toLowerCase()
)
) {
return <Redirect to="/home" />;
}
if (isAddress(match.params.pairAddress.toLowerCase())) {
return (
<LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
<PairPage pairAddress={match.params.pairAddress.toLowerCase()} />
<LayoutWrapper
savedOpen={savedOpen}
setSavedOpen={setSavedOpen}
>
<PairPage
pairAddress={match.params.pairAddress.toLowerCase()}
/>
</LayoutWrapper>
)
);
} else {
return <Redirect to="/home" />
return <Redirect to="/home" />;
}
}}
/>
Expand All @@ -139,36 +158,53 @@ function App() {
render={({ match }) => {
if (isAddress(match.params.accountAddress.toLowerCase())) {
return (
<LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
<AccountPage account={match.params.accountAddress.toLowerCase()} />
<LayoutWrapper
savedOpen={savedOpen}
setSavedOpen={setSavedOpen}
>
<AccountPage
account={match.params.accountAddress.toLowerCase()}
/>
</LayoutWrapper>
)
);
} else {
return <Redirect to="/home" />
return <Redirect to="/home" />;
}
}}
/>

<Route path="/home">
<LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
<LayoutWrapper
savedOpen={savedOpen}
setSavedOpen={setSavedOpen}
>
<GlobalPage />
</LayoutWrapper>
</Route>

<Route path="/tokens">
<LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
<LayoutWrapper
savedOpen={savedOpen}
setSavedOpen={setSavedOpen}
>
<AllTokensPage />
</LayoutWrapper>
</Route>

<Route path="/pairs">
<LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
<LayoutWrapper
savedOpen={savedOpen}
setSavedOpen={setSavedOpen}
>
<AllPairsPage />
</LayoutWrapper>
</Route>

<Route path="/accounts">
<LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
<LayoutWrapper
savedOpen={savedOpen}
setSavedOpen={setSavedOpen}
>
<AccountLookup />
</LayoutWrapper>
</Route>
Expand All @@ -181,7 +217,7 @@ function App() {
)}
</AppWrapper>
</ApolloProvider>
)
);
}

export default App
export default App;
Loading

0 comments on commit 79a2fe5

Please sign in to comment.