Skip to content

Commit

Permalink
feat: a big commit
Browse files Browse the repository at this point in the history
  • Loading branch information
Garfield550 committed Aug 28, 2021
1 parent cd8ae10 commit 4c9670e
Show file tree
Hide file tree
Showing 48 changed files with 2,262 additions and 451 deletions.
1 change: 1 addition & 0 deletions .husky/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx lint-staged
21 changes: 18 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,16 @@
"@uniswap/token-lists": "^1.0.0-beta.24",
"@uniswap/v2-periphery": "^1.1.0-beta.0",
"@web3-react/core": "^6.1.1",
"@web3-react/fortmatic-connector": "^6.1.6",
"@web3-react/injected-connector": "^6.0.7",
"@web3-react/walletconnect-connector": "^6.2.0",
"axios": "^0.20.0",
"bignumber.js": "^9.0.0",
"cids": "^1.0.0",
"debounce": "^1.2.0",
"ethers": "^5.3.1",
"fortmatic": "^2.2.1",
"jazzicon": "^1.5.0",
"lodash.flatmap": "^4.5.0",
"multicodec": "^2.0.0",
"multihashes": "^3.0.1",
Expand Down Expand Up @@ -64,6 +67,7 @@
"@typescript-eslint/eslint-plugin": "^4.27.0",
"@typescript-eslint/parser": "^4.27.0",
"babel-plugin-macros": "^3.1.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-react-app": "^6.0.0",
"eslint-plugin-flowtype": "^5.7.2",
Expand All @@ -72,6 +76,9 @@
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-plugin-simple-import-sort": "^7.0.0",
"husky": "^7.0.2",
"lint-staged": "^11.1.2",
"prettier": "^2.3.1",
"typescript": "^3.9.7"
},
Expand All @@ -80,7 +87,8 @@
"build": "CI= GENERATE_SOURCEMAP=false react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject",
"lint": "eslint src/**/*.ts src/**/*.tsx"
"lint": "eslint src/**/*.ts src/**/*.tsx --cache --fix",
"prepare": "husky install"
},
"eslintConfig": {
"parser": "@typescript-eslint/parser",
Expand All @@ -99,12 +107,16 @@
"version": "detect"
}
},
"plugins": [
"@typescript-eslint/eslint-plugin",
"simple-import-sort"
],
"extends": [
"react-app",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"plugin:@typescript-eslint/recommended",
"prettier"
"plugin:prettier/recommended"
],
"rules": {
"react/prop-types": 0,
Expand All @@ -129,5 +141,8 @@
"semi": false,
"singleQuote": true,
"printWidth": 120
},
"lint-staged": {
"*.{ts,tsx}": "eslint src/**/*.ts src/**/*.tsx --cache --fix"
}
}
}
5 changes: 2 additions & 3 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { ListsUpdater } from './updaters/lists'
import { MulticallUpdater } from './updaters/multicall'
import { UserUpdater } from './updaters/user'

import Farms from './views/Farms'
// import Farms from './views/Farms'
import Home from './views/Home'
import NFTs from './views/NFTs'
import Swap from './views/Swap'
Expand All @@ -31,7 +31,6 @@ import FindPool from './views/FindPool'
import { RedirectDuplicateTokenIds } from './views/AddLiquidity/redirects'
import { RedirectPathToHome } from './views/Home/redirects'


const Web3ProviderNetwork = createWeb3ReactRoot(NetworkContextName)

const App: React.FC = () => {
Expand All @@ -55,7 +54,7 @@ const Routers: React.FC = () => {
<Route exact strict path="/swap" component={Swap} />
<Route exact strict path="/pool" component={Pool} />
<Route exact strict path="/find" component={FindPool} />
<Route exact strict path="/farm" component={Farms} />
{/* <Route exact strict path="/farm" component={Farms} /> */}
<Route exact strict path="/market" component={NFTs} />
<Route exact path="/add" component={AddLiquidity} />
<Route exact path="/add/:currencyIdA/:currencyIdB" component={RedirectDuplicateTokenIds} />
Expand Down
Binary file added src/assets/img/wallet/fortmaticIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/wallet/metamask.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/wallet/portisIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/wallet/trustWallet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/img/wallet/walletConnectIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4c9670e

Please sign in to comment.