Merge remote-tracking branch 'origin/redesign/landing-page' into rede…

…sign/sport-filters # Conflicts: # package-lock.json # src/components/PositionSymbol/PositionSymbol.tsx # src/constants/tags.ts # src/i18n/cn.json # src/i18n/de.json # src/i18n/en.json # src/i18n/es.json # src/i18n/fr.json # src/i18n/it.json # src/i18n/ru.json # src/i18n/th.json # src/pages/Markets/Home/Home.tsx # src/pages/Markets/Home/MarketListCard/MarketListCard.tsx # src/pages/Markets/Home/MarketsGrid/MarketsGrid.tsx # src/queries/markets/useAvailablePerSideQuery.ts # src/utils/markets.ts
zulumarkets · Oct 21, 2022 · af42f6d · af42f6d
2 parents 7e6a86c + e148735
commit af42f6d
Show file tree

Hide file tree

Showing 80 changed files with 26,272 additions and 352 deletions.
diff --git a/package.json b/package.json
@@ -33,6 +33,7 @@
         "react-outside-click-handler": "^1.3.0",
         "react-query": "^3.34.16",
         "react-redux": "^7.2.6",
+        "react-responsive-carousel": "^3.2.23",
         "react-router-dom": "^5.2.0",
         "react-scripts": "4.0.3",
         "react-select": "^5.4.0",

diff --git a/.../logos/NCAA Football/texas-a_m-aggies.png → .../logos/NCAA Football/texas-a&m-aggies.png b/.../logos/NCAA Football/texas-a_m-aggies.png → .../logos/NCAA Football/texas-a&m-aggies.png
diff --git a/public/logos/UFC/aljamain-sterling.png b/public/logos/UFC/aljamain-sterling.png
diff --git a/public/logos/UFC/beneil-dariush.png b/public/logos/UFC/beneil-dariush.png
diff --git a/public/logos/UFC/charles-oliveira.png b/public/logos/UFC/charles-oliveira.png
diff --git a/public/logos/UFC/islam-makhachev.png b/public/logos/UFC/islam-makhachev.png
diff --git a/public/logos/UFC/katlyn-chookagian.png b/public/logos/UFC/katlyn-chookagian.png
diff --git a/public/logos/UFC/manon-fiorot.png b/public/logos/UFC/manon-fiorot.png
diff --git a/public/logos/UFC/mateusz-gamrot.png b/public/logos/UFC/mateusz-gamrot.png
diff --git a/public/logos/UFC/petr-yan.png b/public/logos/UFC/petr-yan.png
diff --git a/public/logos/UFC/sean-o'malley.png b/public/logos/UFC/sean-o'malley.png
diff --git a/public/logos/UFC/tj-dillashaw.png b/public/logos/UFC/tj-dillashaw.png
diff --git a/src/assets/fonts/Jost/Jost-ExtraBold.ttf b/src/assets/fonts/Jost/Jost-ExtraBold.ttf
diff --git a/src/assets/fonts/Jost/Jost.ttf b/src/assets/fonts/Jost/Jost.ttf
diff --git a/src/assets/fonts/LeagueIcons/LeagueIcons.ttf b/src/assets/fonts/LeagueIcons/LeagueIcons.ttf
diff --git a/src/assets/fonts/Nunito/Nunito-ExtraBold.ttf b/src/assets/fonts/Nunito/Nunito-ExtraBold.ttf
diff --git a/src/assets/fonts/Nunito/Nunito.ttf b/src/assets/fonts/Nunito/Nunito.ttf
diff --git a/src/assets/images/banner-image.jpg b/src/assets/images/banner-image.jpg
diff --git a/src/assets/images/banner/1/image.jpg b/src/assets/images/banner/1/image.jpg
diff --git a/src/assets/images/banner/1/json.json b/src/assets/images/banner/1/json.json
@@ -0,0 +1 @@
+{}
diff --git a/src/assets/images/banner/2/image.jpg b/src/assets/images/banner/2/image.jpg
diff --git a/src/assets/images/banner/2/json.json b/src/assets/images/banner/2/json.json
@@ -0,0 +1 @@
+{}
diff --git a/src/assets/images/banner/3/image.jpg b/src/assets/images/banner/3/image.jpg
diff --git a/src/assets/images/banner/3/json.json b/src/assets/images/banner/3/json.json
@@ -0,0 +1 @@
+{}
diff --git a/src/assets/images/banner/4/image.jpg b/src/assets/images/banner/4/image.jpg
diff --git a/src/assets/images/landing-page/chainlink.svg b/src/assets/images/landing-page/chainlink.svg
diff --git a/src/assets/images/landing-page/discord.svg b/src/assets/images/landing-page/discord.svg
diff --git a/src/assets/images/landing-page/optimism.svg b/src/assets/images/landing-page/optimism.svg