Skip to content

Commit

Permalink
(Feature) New design (#107)
Browse files Browse the repository at this point in the history 
* (Feature) New general layout (#100)

* (add) sanitize.css

* (fix) linting and general setup

* (add) common components

* (add) footer, header

* (fix) icon color

* (add) favicon

* (Add) header user not connected styles

* (fix) footer styles

* (add) header dropdown

* (add) user address

* (add) user dropdown changes

* (add) dropdown styles

* (add) connect modal

* (add) transactions modal

* (add) theme switch

* (remove) unused component

* (hide) theme toggle

* Fix some linter errors

* Update linter config

* Update yarn.lock

* Add engine

* Add test to clear cache

* Revert last commit

* Fix lint problems

* Fix more lint problems

* Fix typo

* Add getWalletName and disconnect

Co-authored-by: Mariano Aguero <mariano.aguero@gmail.com>

* Auction page should load, even if web3 wallet is not yet connected. (#108)

* Add support to use the application offline

* Remove unused vars

* tiny corrections

Co-authored-by: josojo <josojo@hotmail.de>

* Add improvements for typings (#111)

* Improve typings

* Add env CI: false to test deploy

* Add ignore comments for the moment

* Fix small typo (#112)

* fixes nasty error: tx arguments not correct (#117)

* Allow the api to fetch data, even when account is not loaded (#116)

* Fix import

* (Feature) Auction Details (#115)

* (add) sanitize.css

* (fix) linting and general setup

* (add) common components

* (add) footer, header

* (fix) icon color

* (add) favicon

* (Add) header user not connected styles

* (fix) footer styles

* (add) header dropdown

* (add) user address

* (add) user dropdown changes

* (add) dropdown styles

* (add) connect modal

* (add) transactions modal

* (add) theme switch

* (remove) unused component

* (remove) more unused components

* (hide) theme toggle

* Fix some linter errors

* Update linter config

* Update yarn.lock

* Add engine

* (fix) linting

* (remove) unused component

* (add) title, subtitle, copy button

* (add) auction details values

* (add) tooltip

* (add) external link button

* (remove) unused dependency

* (add) token icons

* (add) separation

* (add) base timer

* (refactor) timer code

* (add) text format

* (add) timer and grid styles

* (fix) auction progress

* (add) orders table

* (add) status icons

* (fix) crash

* (add) missing auction state

* (fix) linting

* (fix) make the auctions page less messy

* (fix) several layout issues

* (add) spinner

* (add) buttons

* (add) token text

* (add) amount input

* (add) price input

* (add) some checking

* (add) spinner for chart

* (add) approval text

* (fix) fuckup

* (fix) validations

* (fix) validations and folder placement

* (add) error display

* (add) better errors

* Fix modal warning

Co-authored-by: Mariano Aguero <mariano.aguero@gmail.com>

* Fix small problems in the console (#121)

* Fix problem with auction info card

* Fix division by zero (#123)

* Add continue when a buyAmount is zero

* Add console error

* [issues-98] Pulling in the tokenLogo (#127)

* pull logos from uniswap token list

* fetch all tokens at the same time

* Add new endpoint for auctions (#129)

* Add endpoint to fetch auction details

* Add hook to fetch auction details

* Fix bad use of useMemo

* Refactoring

* Update hook to use the new endpoint for auction details

* Apply update to use auctionStartDate and a setInterval instead of setTimeout

* (feature) Landing Page (#138)

* (add) sanitize.css

* (fix) linting and general setup

* (add) common components

* (add) footer, header

* (fix) icon color

* (add) favicon

* (Add) header user not connected styles

* (fix) footer styles

* (add) header dropdown

* (add) user address

* (add) user dropdown changes

* (add) dropdown styles

* (add) connect modal

* (add) transactions modal

* (add) theme switch

* (remove) unused component

* (remove) more unused components

* (hide) theme toggle

* Fix some linter errors

* Update linter config

* Update yarn.lock

* Add engine

* (fix) linting

* (remove) unused component

* (add) title, subtitle, copy button

* (add) auction details values

* (add) tooltip

* (add) external link button

* (remove) unused dependency

* (add) token icons

* (add) separation

* (add) base timer

* (refactor) timer code

* (add) text format

* (add) timer and grid styles

* (fix) auction progress

* (add) orders table

* (add) status icons

* (fix) crash

* (add) missing auction state

* (fix) linting

* (fix) make the auctions page less messy

* (fix) several layout issues

* (add) spinner

* (add) buttons

* (add) token text

* (add) amount input

* (add) price input

* (add) some checking

* (add) spinner for chart

* (add) approval text

* (fix) fuckup

* (fix) validations

* (fix) validations and folder placement

* (add) error display

* (add) better errors

* (add) some routes and placeholder sections

* (update) gitignore

* (fix) gitignore

* (add) featured auctions loading spinner

* (add) landing page contents

* (add) landing page contents

* (add) featured auctions card styles

* (update) yarn.lock

* (add) featured actions progress bar

* (fix) auction progress

* (fix) scroll

Co-authored-by: Mariano Aguero <mariano.aguero@gmail.com>

* Solution to several issues (#139)

* Update lock file

* Add check for undefined

* Add loading and claiming state

* Add symbol tokens

* Add new property

* Fix perfomance issue

* Add loading validation

* Add improvement to hook using auction details endpoint

* Revert config redux

* Fix validations

* Fix decimals (#145)

* Allow to fetch all highlighted auctions from all networks (#146)

* (Feature) Claiming (#149)

* (add) claiming section styles

* (fix) make paths windows compatible

* (fix) Invalid network error (#154)

* fix invalid netwrok error

* (remove) console statement

Co-authored-by: Gabriel Rodriguez Alsina <gabriel.rodriguez@altoros.com>

* Add improvement for order cancellation (#155)

* Add improvements to the chart (#153)

* Add improvements to the chart

* Add proper validation for tokens

* Remove unused component, add more grids

* (Feature) Several fixes (#156)

* (add) text gradient

* (add) token logo

* (add) token placeholder for missing token's images

* (fix) logo font

* (add) Auction's network to featured auctions cards.

* (fix) token symbol font size

* (add) network name to auction details

* (remove) text

* (add) better text description

Co-authored-by: Gabriel Rodríguez Alsina <gabitoesmiapodo@users.noreply.github.com>
Co-authored-by: josojo <josojo@hotmail.de>
Co-authored-by: Jose A. Ramirez C <jarcodallo@gmail.com>
Co-authored-by: Gabriel Rodriguez Alsina <gabriel.rodriguez@altoros.com>
  • Loading branch information
@mariano-aguero @gabitoesmiapodo
@josojo @0xslipk
5 people authored Mar 11, 2021
1 parent abc52bf commit 92e8e18
Show file tree
Hide file tree
Showing 280 changed files with 14,751 additions and 12,561 deletions.
17 changes: 10 additions & 7 deletions .env.example
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
REACT_APP_CHAIN_ID=4
REACT_APP_NETWORK_URL="PUT_YOUR_INFURA_URL"
REACT_APP_GOOGLE_ANALYTICS_ID="PUT_YOUR_GOOGLE_ANALYTICS_ID"
REACT_APP_GIT_COMMIT_HASH="PUT_YOUR_LAST_COMMIT_HASH"
REACT_APP_FORTMATIC_KEY="PUT_YOUR_FORTMATIC_KEY"
REACT_APP_PORTIS_ID="PUT_YOUR_PORTIS_ID"
PUBLIC_URL="."
REACT_APP_ADDITIONAL_SERVICES_API_URL_RINKEBY="PUT_YOUR_API_URL"
REACT_APP_ADDITIONAL_SERVICES_API_URL_PROD_RINKEBY="PUT_YOUR_API_URL"
REACT_APP_ADDITIONAL_SERVICES_API_URL_MAINNET="PUT_YOUR_API_URL"
REACT_APP_ADDITIONAL_SERVICES_API_URL_PROD_MAINNET="PUT_YOUR_API_URL"
REACT_APP_ADDITIONAL_SERVICES_API_URL_XDAI="PUT_YOUR_API_URL"
REACT_APP_ADDITIONAL_SERVICES_API_URL_PROD_XDAI="PUT_YOUR_API_URL"
REACT_APP_ADDITIONAL_SERVICES_API_URL_PROD_XDAI="PUT_YOUR_API_URL"
REACT_APP_CHAIN_ID=4
REACT_APP_NETWORK_URL_RINKEBY="PUT_YOUR_INFURA_URL"
REACT_APP_NETWORK_URL_MAINNET="PUT_YOUR_INFURA_URL"
REACT_APP_NETWORK_URL_XDAI="PUT_YOUR_INFURA_URL"
REACT_APP_FORTMATIC_KEY="PUT_YOUR_FORTMATIC_KEY"
REACT_APP_PORTIS_ID="PUT_YOUR_PORTIS_ID"
REACT_APP_GOOGLE_ANALYTICS_ID="PUT_YOUR_GOOGLE_ANALYTICS_ID"
REACT_APP_GIT_COMMIT_HASH="PUT_YOUR_LAST_COMMIT_HASH"
1 change: 1 addition & 0 deletions .eslintignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.d.ts
106 changes: 89 additions & 17 deletions .eslintrc.js
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,103 @@
module.exports = {
parser: "@typescript-eslint/parser",
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 2020,
sourceType: "module",
ecmaFeatures: {
// Allows for the parsing of JSX
jsx: true,
},
ecmaVersion: 2020,
sourceType: 'module',
},
ignorePatterns: ["node_modules/**/*"],
env: {
browser: true,
es6: true,
},
ignorePatterns: ['node_modules/**/*'],
settings: {
react: {
version: "detect",
pragma: 'React',
version: 'detect',
},
'import/extensions': ['.js', '.jsx', '.ts', '.tsx'],
},
plugins: [
'react',
'react-hooks',
'@typescript-eslint',
'import',
'sort-destructure-keys',
'prettier',
],
extends: [
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react-hooks/recommended",
"prettier/@typescript-eslint",
"plugin:prettier/recommended",
'eslint:recommended',
'plugin:react/recommended',
'plugin:react-hooks/recommended',
'plugin:@typescript-eslint/recommended',
'prettier/@typescript-eslint',
'prettier/react',
'plugin:prettier/recommended',
'plugin:import/errors',
'plugin:import/warnings',
'plugin:import/typescript',
],
rules: {
"@typescript-eslint/explicit-function-return-type": "off",
"prettier/prettier": "error",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/ban-types": "off",
"@typescript-eslint/explicit-module-boundary-types": "off",
'@typescript-eslint/explicit-function-return-type': 'off',
'prettier/prettier': 'error',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/ban-types': 'off',
'react/prop-types': 'off',
'no-console': [
'warn',
{
allow: ['warn', 'error'],
},
],
'sort-imports': [
'error',
{
ignoreDeclarationSort: true,
},
],
semi: ['error', 'never'],
'no-warning-comments': 0,
'import/extensions': 0,
'import/no-unresolved': 0,
'import/no-extraneous-dependencies': [
'error',
{ optionalDependencies: false, peerDependencies: false },
],
'import/order': [
'error',
{
alphabetize: { order: 'asc' },
groups: [
['builtin', 'external'],
['internal', 'parent', 'sibling', 'index'],
],
'newlines-between': 'always',
pathGroups: [
{ group: 'builtin', pattern: 'react', position: 'before' },
{
group: 'external',
pattern:
'{uniswap-xdai-sdk,rebass/styled-components,polished,react-feather,react-router,@walletconnect/web3-provider,@testing-library/dom,@testing-library/user-event,@testing-library/react,styled-components,ethers/utils,react-dom,react-router-dom,ethers,ethers/providers,web3-utils}',
position: 'before',
},
],
pathGroupsExcludedImportTypes: ['builtin'],
},
],
'import/prefer-default-export': 0,
'sort-destructure-keys/sort-destructure-keys': 2,
'react/jsx-label-has-associated-control': 0,
'react/jsx-sort-props': 2,
'react/jsx-filename-extension': [
1,
{
extensions: ['.js', '.jsx', '.ts', '.tsx'],
},
],
'react-hooks/rules-of-hooks': 'error',
'react-hooks/exhaustive-deps': 'error',
'@typescript-eslint/explicit-module-boundary-types': 'off',
},
};
}
1 change: 0 additions & 1 deletion .github/workflows/deploy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ jobs:
runs-on: ubuntu-latest
env:
REPO_NAME_SLUG: idoux

steps:
- name: Checkout code
uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,4 @@ package-lock.json
cypress/videos
cypress/screenshots
cypress/fixtures/example.json
.project
1 change: 1 addition & 0 deletions .prettierignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.d.ts
3 changes: 3 additions & 0 deletions .prettierrc.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
module.exports = {
printWidth: 100,
singleQuote: true,
semi: false,
bracketSpacing: true,
trailingComma: "all",
overrides: [
Expand Down
140 changes: 79 additions & 61 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,39 @@
"description": "Gnosis Auction",
"homepage": ".",
"private": true,
"engines": {
"node": ">=4.4.7 <=14.15.4"
},
"scripts": {
"start": "react-scripts start",
"build": "cross-env REACT_APP_GIT_COMMIT_HASH=$(git show -s --format=%H) react-scripts build",
"ipfs-build": "cross-env PUBLIC_URL=\".\" react-scripts build",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject",
"lint": "eslint \"src/**/*.{js,jsx,ts,tsx}\" --fix",
"lint:fix": "eslint \"src/**/*.{js,jsx,ts,tsx}\" --fix",
"prettier:fix": "prettier --write \"./src/**/*.{js,jsx,ts,tsx}\"",
"cy:run": "cypress run",
"serve:build": "serve -s build -l 3000",
"integration-test": "yarn build && start-server-and-test 'yarn run serve:build' http://localhost:3000 cy:run"
},
"eslintConfig": {
"extends": "react-app"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"license": "GPL-3.0-or-later",
"devDependencies": {
"uniswap-xdai-sdk": "^3.0.2-a3",
"@amcharts/amcharts4": "^4.10.13",
"@ethersproject/address": "^5.0.0-beta.134",
"@ethersproject/bignumber": "^5.0.0-beta.138",
"@ethersproject/constants": "^5.0.0-beta.133",
"@ethersproject/contracts": "^5.0.0-beta.151",
"@ethersproject/experimental": "^5.0.0-beta.141",
"@ethersproject/providers": "5.0.0-beta.162",
"@ethersproject/strings": "^5.0.0-beta.136",
"@ethersproject/units": "^5.0.0-beta.132",
"@ethersproject/wallet": "^5.0.0-beta.141",
"@fortawesome/fontawesome-svg-core": "^1.2.32",
"@fortawesome/free-solid-svg-icons": "^5.15.1",
"@fortawesome/react-fontawesome": "^0.1.14",
"@popperjs/core": "^2.4.0",
"@reach/dialog": "^0.10.3",
"@reach/portal": "^0.10.3",
"@reduxjs/toolkit": "^1.3.5",
"@types/jest": "^25.2.1",
"@types/lodash.flatmap": "^4.5.6",
"@types/node": "^13.13.5",
Expand All @@ -32,41 +46,71 @@
"@types/react-router-dom": "^5.0.0",
"@types/react-window": "^1.8.2",
"@types/rebass": "^4.0.5",
"@types/styled-components": "^4.2.0",
"@types/styled-components": "^5.1.7",
"@types/testing-library__cypress": "^5.0.5",
"@typescript-eslint/eslint-plugin": "^4.8.2",
"@typescript-eslint/parser": "^4.8.2",
"@web3-react/types": "^6.0.7",
"eslint": "^7.14.0",
"eslint-config-prettier": "^6.15.0",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "^7.19.0",
"eslint-plugin-react-hooks": "^4.0.0",
"eslint-plugin-sort-destructure-keys": "^1.3.5",
"husky": "^4.3.6",
"lint-staged": "^10.5.3",
"prettier": "^2.2.1"
},
"dependencies": {
"@amcharts/amcharts4": "^4.10.13",
"@babel/helper-define-map": "^7.12.13",
"@babel/helper-regex": "^7.10.5",
"@ethersproject/address": "^5.0.0-beta.134",
"@ethersproject/bignumber": "^5.0.0-beta.138",
"@ethersproject/constants": "^5.0.0-beta.133",
"@ethersproject/contracts": "^5.0.0-beta.151",
"@ethersproject/experimental": "^5.0.0-beta.191",
"@ethersproject/providers": "5.0.23",
"@ethersproject/strings": "^5.0.0-beta.136",
"@ethersproject/units": "^5.0.0-beta.191",
"@ethersproject/wallet": "^5.0.0-beta.191",
"@fortawesome/fontawesome-svg-core": "^1.2.32",
"@fortawesome/free-solid-svg-icons": "^5.15.1",
"@fortawesome/react-fontawesome": "^0.1.14",
"@popperjs/core": "^2.4.0",
"@reach/dialog": "^0.10.3",
"@reach/portal": "^0.10.3",
"@reduxjs/toolkit": "^1.3.5",
"@types/react-router-hash-link": "^1.2.1",
"@uniswap/sdk": "^2.0.5",
"@uniswap/token-lists": "^1.0.0-beta.19",
"@uniswap/v2-core": "1.0.0",
"@uniswap/v2-periphery": "1.0.0-beta.0",
"@web3-react/abstract-connector": "^6.0.7",
"@web3-react/core": "^6.1.9",
"@web3-react/fortmatic-connector": "^6.1.6",
"@web3-react/injected-connector": "^6.0.7",
"@web3-react/portis-connector": "^6.1.9",
"@web3-react/walletconnect-connector": "^6.1.9",
"@web3-react/walletlink-connector": "^6.1.9",
"ajv": "^6.12.3",
"copy-to-clipboard": "^3.2.0",
"cross-env": "^7.0.2",
"cypress": "^4.5.0",
"eslint": "^7.14.0",
"eslint-config-prettier": "^6.15.0",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "^7.19.0",
"eslint-plugin-react-hooks": "^4.0.0",
"husky": "^4.3.6",
"i18next": "^15.0.9",
"i18next-browser-languagedetector": "^3.0.1",
"i18next-xhr-backend": "^2.0.1",
"inter-ui": "^3.15.0",
"isexe": "^2.0.0",
"jazzicon": "^1.5.0",
"levenary": "^1.1.1",
"lint-staged": "^10.5.3",
"lodash.flatmap": "^4.5.0",
"modali": "^1.2.0",
"polished": "^3.3.2",
"prettier": "^2.2.1",
"qrcode.react": "^0.9.3",
"qs": "^6.9.4",
"react": "^16.13.1",
"react-copy-to-clipboard": "^5.0.3",
"react-device-detect": "^1.6.2",
"react-dom": "^16.13.1",
"react-feather": "^2.0.8",
Expand All @@ -75,51 +119,25 @@
"react-popper": "^2.2.3",
"react-redux": "^7.2.0",
"react-router-dom": "^5.0.0",
"react-router-hash-link": "^2.4.0",
"react-scripts": "^4.0.1",
"react-spring": "^8.0.27",
"react-table": "^7.6.3",
"react-tooltip": "^4.2.14",
"react-use-gesture": "^6.0.14",
"react-window": "^1.8.5",
"rebass": "^4.0.7",
"redux": "^4.0.5",
"redux-localstorage-simple": "^2.2.0",
"sanitize.css": "^12.0.1",
"serve": "^11.3.0",
"start-server-and-test": "^1.11.0",
"styled-components": "^4.2.0",
"styled-components": "^5.2.1",
"tiny-invariant": "^1.1.0",
"typescript": "^3.8.3",
"uniswap-xdai-sdk": "^3.0.2-a3",
"use-media": "^1.4.0"
},
"scripts": {
"start": "react-scripts start",
"build": "cross-env REACT_APP_GIT_COMMIT_HASH=$(git show -s --format=%H) react-scripts build",
"ipfs-build": "cross-env PUBLIC_URL=\".\" react-scripts build",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject",
"lint": "eslint 'src/**/*.{js,jsx,ts,tsx}' --fix",
"lint:fix": "eslint 'src/**/*.{js,jsx,ts,tsx}' --fix",
"prettier:fix": "prettier --write './src/**/*.{js,jsx,ts,tsx}'",
"cy:run": "cypress run",
"serve:build": "serve -s build -l 3000",
"integration-test": "yarn build && start-server-and-test 'yarn run serve:build' http://localhost:3000 cy:run"
},
"eslintConfig": {
"extends": "react-app"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"license": "GPL-3.0-or-later",
"dependencies": {
"inter-ui": "^3.15.0",
"react-table": "^7.6.3"
},
"lint-staged": {
"src/**/*.{js,jsx,ts,tsx}": [
"yarn run lint:fix",
Expand Down
9 changes: 9 additions & 0 deletions public/browserconfig.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="/favicon/mstile-150x150.png"/>
<TileColor>#da532c</TileColor>
</tile>
</msapplication>
</browserconfig>
Binary file added public/favicon/android-chrome-192x192.png
View file
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 public/favicon/android-chrome-512x512.png
View file
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 public/favicon/apple-touch-icon.png
View file
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 public/favicon/favicon-16x16.png
View file
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 public/favicon/favicon-32x32.png
View file
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 public/favicon/favicon.ico
View file
Binary file not shown.
Binary file added public/favicon/mstile-150x150.png
View file
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 92e8e18

Please sign in to comment.