diff --git a/back-end/constants/dapp-categories.json b/back-end/constants/dapp-categories.json index fd23b5c..2d750b4 100644 --- a/back-end/constants/dapp-categories.json +++ b/back-end/constants/dapp-categories.json @@ -1,5 +1,6 @@ { "EXCHANGES": "EXCHANGES", + "DEFI": "DEFI", "MARKETPLACES": "MARKETPLACES", "COLLECTIBLES": "COLLECTIBLES", "GAMES": "GAMES", @@ -8,6 +9,7 @@ "OTHER": "OTHER", "ALL_CATEGORIES": [ "EXCHANGES", + "DEFI", "MARKETPLACES", "COLLECTIBLES", "GAMES", diff --git a/shared.testnet.chains.json b/shared.testnet.chains.json index a780692..27dd4fe 100644 --- a/shared.testnet.chains.json +++ b/shared.testnet.chains.json @@ -11,11 +11,11 @@ }, "0xa4375ab33cee855df7ced45caa843fb9f450adb7944cea8fd46710f06587686c": { "name": "Discover", - "address": "0x0b4f22f6cF73641905Fba49175E2A4F49F498D38" + "address": "0x9b4707BbAcD138c6cB048D0486D00b883cf0377D" }, "0x21389315d2b5cfa1d29b352c3c4cc6df2dc1002591c18150de310a8781ce1438": { "name": "DiscoverKyberSwap", - "address": "0x6748C3D07bB4544f6205eDC35706B77F2807AB26" + "address": "0x7e6d281FEe920Acc28b7166f28c7cE467C2bADa2" } } } diff --git a/src/common/assets/images/categories/defi.svg b/src/common/assets/images/categories/defi.svg new file mode 100644 index 0000000..3a2da9e --- /dev/null +++ b/src/common/assets/images/categories/defi.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/common/assets/images/featured/gitcoin_banner.png b/src/common/assets/images/featured/gitcoin_banner.png new file mode 100644 index 0000000..d2b3821 Binary files /dev/null and b/src/common/assets/images/featured/gitcoin_banner.png differ diff --git a/src/common/assets/images/featured/gitcoin_logo.png b/src/common/assets/images/featured/gitcoin_logo.png new file mode 100644 index 0000000..91d0ba7 Binary files /dev/null and b/src/common/assets/images/featured/gitcoin_logo.png differ diff --git a/src/common/assets/images/featured/zerion_logo.png b/src/common/assets/images/featured/zerion_logo.png index b3018e2..e22adf3 100644 Binary files a/src/common/assets/images/featured/zerion_logo.png and b/src/common/assets/images/featured/zerion_logo.png differ diff --git a/src/common/components/CategoryIcon/CategoryIcon.jsx b/src/common/components/CategoryIcon/CategoryIcon.jsx index 0dc6338..8348225 100644 --- a/src/common/components/CategoryIcon/CategoryIcon.jsx +++ b/src/common/components/CategoryIcon/CategoryIcon.jsx @@ -1,6 +1,7 @@ import React from 'react' import PropTypes from 'prop-types' import ExchangesIcon from './ExhangesIcon' +import DeFiIcon from './DeFiIcon' import MarketplacesIcon from './MarketplacesIcon' import GamesIcon from './GamesIcon' import UtilitiesIcon from './UtilitiesIcon' @@ -10,6 +11,7 @@ import SocialNetworksIcon from './SocialNetworksIcon' const icons = { EXCHANGES: ExchangesIcon, + DEFI: DeFiIcon, MARKETPLACES: MarketplacesIcon, GAMES: GamesIcon, UTILITIES: UtilitiesIcon, diff --git a/src/common/components/CategoryIcon/DeFiIcon/DeFiIcon.jsx b/src/common/components/CategoryIcon/DeFiIcon/DeFiIcon.jsx new file mode 100644 index 0000000..abecdc3 --- /dev/null +++ b/src/common/components/CategoryIcon/DeFiIcon/DeFiIcon.jsx @@ -0,0 +1,58 @@ +import React from 'react' + +const icon = () => ( + + + + + + + + + + + +) + +export default icon diff --git a/src/common/components/CategoryIcon/DeFiIcon/index.js b/src/common/components/CategoryIcon/DeFiIcon/index.js new file mode 100644 index 0000000..6e898d2 --- /dev/null +++ b/src/common/components/CategoryIcon/DeFiIcon/index.js @@ -0,0 +1,3 @@ +import DeFiIcon from './DeFiIcon' + +export default DeFiIcon diff --git a/src/common/data/categories.js b/src/common/data/categories.js index 26fc94e..fd9341f 100644 --- a/src/common/data/categories.js +++ b/src/common/data/categories.js @@ -1,4 +1,5 @@ export const EXCHANGES = 'EXCHANGES' +export const DEFI = 'DEFI' export const MARKETPLACES = 'MARKETPLACES' export const COLLECTIBLES = 'COLLECTIBLES' export const GAMES = 'GAMES' diff --git a/src/common/data/dapp.js b/src/common/data/dapp.js index 549f40a..fd677c7 100644 --- a/src/common/data/dapp.js +++ b/src/common/data/dapp.js @@ -43,6 +43,7 @@ export class DappState { this.dappsRecentlyAdded = null this.categoryMap = new Map() this.categoryMap.set(Categories.EXCHANGES, null) + this.categoryMap.set(Categories.DEFI, null) this.categoryMap.set(Categories.MARKETPLACES, null) this.categoryMap.set(Categories.COLLECTIBLES, null) this.categoryMap.set(Categories.GAMES, null) diff --git a/src/common/data/featured.js b/src/common/data/featured.js index 773eafc..8c58000 100644 --- a/src/common/data/featured.js +++ b/src/common/data/featured.js @@ -1,11 +1,19 @@ import inchBanner from '../assets/images/featured/inch_banner.jpg' import inchLogo from '../assets/images/featured/inch_logo.png' -import OasisBanner from '../assets/images/featured/oasis_banner.png' -import OasisLogo from '../assets/images/featured/oasis_logo.png' +import GitcoinBanner from '../assets/images/featured/gitcoin_banner.png' +import GitcoinLogo from '../assets/images/featured/gitcoin_logo.png' import ZerionBanner from '../assets/images/featured/zerion_banner.png' import ZerionLogo from '../assets/images/featured/zerion_logo.png' const featuredDapps = [ + { + name: 'Gitcoin Grants', + description: + 'Gitcoin Grants helps creators grow and sustain their open source projects.', + url: 'https://gitcoin.co/grants', + banner: GitcoinBanner, + icon: GitcoinLogo, + }, { name: '1inch.exchange', description: @@ -16,20 +24,11 @@ const featuredDapps = [ }, { name: 'Zerion', - description: - 'Zerion is the simplest way to invest in DeFi from anywhere in the world', - url: 'https://app.zerion.io', + description: 'Buy, sell and track DeFi assets', + url: 'https://app.zerion.io/?utm_source={dap.ps}', banner: ZerionBanner, icon: ZerionLogo, }, - { - name: 'Oasis', - description: - 'Trade tokens, borrow Dai, and earn savings — all in one place', - url: 'https://oasis.app', - banner: OasisBanner, - icon: OasisLogo, - }, ] export default featuredDapps diff --git a/src/common/styles/_colors.scss b/src/common/styles/_colors.scss index f2f7f5b..3453d14 100644 --- a/src/common/styles/_colors.scss +++ b/src/common/styles/_colors.scss @@ -1,6 +1,7 @@ $purple: #887af9; $orange: #fe8f59; $blue: #51d0f0; +$dark-blue: #26a69a; $pink: #d37ef4; $green: #7cda00; $red: #fa6565; @@ -31,6 +32,11 @@ $blue-bg: rgba( $alpha: 0.15, ); +$dark-blue-bg: rgba( + $color: $dark-blue, + $alpha: 0.15, +); + $green-bg: rgba( $color: $green, $alpha: 0.15, diff --git a/src/common/utils/categories.test.js b/src/common/utils/categories.test.js index 3b376b3..6dbc6f4 100644 --- a/src/common/utils/categories.test.js +++ b/src/common/utils/categories.test.js @@ -7,6 +7,10 @@ describe('categories', () => { key: 'EXCHANGES', value: 'Exchanges', }, + { + key: 'DEFI', + value: 'DeFi', + }, { key: 'MARKETPLACES', value: 'Marketplaces', diff --git a/src/modules/Categories/Categories.module.scss b/src/modules/Categories/Categories.module.scss index fd4f341..bdbc79f 100644 --- a/src/modules/Categories/Categories.module.scss +++ b/src/modules/Categories/Categories.module.scss @@ -51,6 +51,10 @@ background: $purple-bg; } +.DEFI { + background: $dark-blue-bg; +} + .MARKETPLACES { background: $orange-bg; } diff --git a/src/modules/Categories/Categories.utils.js b/src/modules/Categories/Categories.utils.js index 023b4cd..803db49 100644 --- a/src/modules/Categories/Categories.utils.js +++ b/src/modules/Categories/Categories.utils.js @@ -1,4 +1,5 @@ import exchanges from '../../common/assets/images/categories/exchanges.svg' +import defi from '../../common/assets/images/categories/defi.svg' import marketplaces from '../../common/assets/images/categories/marketplaces.svg' import other from '../../common/assets/images/categories/other.svg' import games from '../../common/assets/images/categories/games.svg' @@ -8,6 +9,7 @@ import utilities from '../../common/assets/images/categories/utilities.svg' const imageMap = { EXCHANGES: exchanges, + DEFI: defi, MARKETPLACES: marketplaces, OTHER: other, MEDIA: other, // TODO: fix with icon from design diff --git a/src/modules/CategorySelector/CategorySelector.module.scss b/src/modules/CategorySelector/CategorySelector.module.scss index 75cf7f0..883529f 100644 --- a/src/modules/CategorySelector/CategorySelector.module.scss +++ b/src/modules/CategorySelector/CategorySelector.module.scss @@ -106,6 +106,10 @@ background: $purple; } +.DEFI { + background: $dark-blue; +} + .MARKETPLACES { background: $orange; } diff --git a/src/modules/Profile/Profile.module.scss b/src/modules/Profile/Profile.module.scss index 4bdeef6..7bcedf8 100644 --- a/src/modules/Profile/Profile.module.scss +++ b/src/modules/Profile/Profile.module.scss @@ -196,6 +196,10 @@ a { background: $purple-bg; } +.DEFI { + background: $dark-blue-bg; +} + .MARKETPLACES { background: $orange-bg; }