Merge pull request #2961 from odota/subs

Subs

.env

@@ -3,5 +3,6 @@ BROWSER=none
 REACT_APP_ENABLE_GOSUAI=
 REACT_APP_ENABLE_BOTTOM_BANNER=true
 REACT_APP_IMAGE_CDN=https://cdn.cloudflare.steamstatic.com
-REACT_APP_ENABLE_ADSENSE=true
-REACT_APP_ENABLE_DOTA_COACH=true
+REACT_APP_ENABLE_ADSENSE=
+REACT_APP_ENABLE_DOTA_COACH=
+REACT_APP_STRIPE_PUBLIC_KEY=pk_live_zFUQR74N5mWV4yZpImL6ouH6

README.md

@@ -23,11 +23,6 @@ $ docker-compose up
 - `npm start`
 - Visit port 3000 on your development machine.
 
-### Component view and development
-
-- `npm run storybook`
-- Visit port 6006 on your development machine.
-
 ## Contributing
 
 - Make some changes.

package.json

@@ -16,9 +16,7 @@
     "analyze": "source-map-explorer build/static/js/main.* --html > analyze.html",
     "lintfix": "eslint . --ext .ts,.tsx,.js,.jsx --fix",
     "lint": "eslint . --ext .ts,.tsx,.js,.jsx",
-    "update:emoticons": "npm r dota2-emoticons && npm i dota2-emoticons && node dev/updateEmoticons.js",
-    "storybook": "start-storybook -p 6006 -s public",
-    "storybook:build": "build-storybook -s public"
+    "update:emoticons": "npm r dota2-emoticons && npm i dota2-emoticons && node dev/updateEmoticons.js"
   },
   "repository": {
     "type": "git",
@@ -28,6 +26,7 @@
     "@material-ui/core": "^4.5.0",
     "@material-ui/icons": "^4.5.1",
     "@material-ui/styles": "^4.5.0",
+    "@stripe/stripe-js": "^1.32.0",
     "abcolor": "^0.5.5",
     "ace-builds": "^1.4.7",
     "core-js": "^3.6.4",
@@ -47,7 +46,7 @@
     "react-dom": "^17.0.2",
     "react-ga": "^2.7.0",
     "react-helmet": "^5.2.1",
-    "react-markdown": "^4.2.2",
+    "react-markdown": "^4.0.3",
     "react-redux": "^7.1.3",
     "react-router-dom": "^5.1.2",
     "react-scripts": "^4.0.3",
@@ -66,12 +65,6 @@
   },
   "devDependencies": {
     "@babel/core": "^7.11.6",
-    "@storybook/addon-actions": "^6.1.21",
-    "@storybook/addon-essentials": "^6.1.21",
-    "@storybook/addon-links": "^6.1.21",
-    "@storybook/node-logger": "^6.1.21",
-    "@storybook/preset-create-react-app": "^3.2.0",
-    "@storybook/react": "^6.1.21",
     "@types/core-js": "^2.5.2",
     "@types/eslint": "^6.1.3",
     "@types/heatmap.js": "^2.0.36",
@@ -113,6 +106,9 @@
     "testcafe-react-selectors": "^3.3.0",
     "typescript": "^3.9.10"
   },
+  "overrides":{
+    "react-error-overlay": "6.0.9"
+  },
   "browserslist": [
     ">0.2%",
     "not dead",

src/components/App/App.jsx

@@ -9,6 +9,7 @@ import styled from 'styled-components';
 
 import Combos from './../Combos/Combos';
 import Api from '../Api';
+import Subscription from '../Subscription';
 import constants from '../constants';
 import Distributions from '../Distributions';
 import Explorer from '../Explorer';
@@ -186,6 +187,7 @@ const App = (props) => {
             <Route exact path="/scenarios/:info?" component={Scenarios} />
             <Route exact path="/predictions" component={Predictions} />
             <Route exact path="/api-keys" component={Api} />
+            <Route exact path="/subscribe" component={Subscription} />
             <Route component={FourOhFour} />
           </Switch>
         </StyledBodyDiv>

src/components/Footer/PageLinks.jsx

@@ -18,15 +18,9 @@ const PageLinks = ({ strings }) => {
   }, {
     name: strings.app_translate,
     path: '//translate.opendota.com/',
-  }, {
-    name: strings.app_donate,
-    path: '//carry.opendota.com/',
   }, {
     name: strings.app_netlify,
     path: '//www.netlify.com',
-  }, {
-    name: strings.app_openunderlords,
-    path: '//www.openunderlords.com',
   }, {
     name: strings.app_gravitech,
     path: '//www.gravitech.io',

src/components/Header/Header.jsx

@@ -271,6 +271,12 @@ const Header = ({ location, disableSearch }) => {
       to: '/api-keys',
       label: strings.header_api,
     },
+    // hide this for now until tested
+    // {
+    //   key: 'header_subscribe',
+    //   to: '/subscribe',
+    //   label: strings.header_subscribe,
+    // },
   ];
 
   const drawerPages = [

src/components/Icons/index.js

@@ -3,8 +3,6 @@ export { default as IconSteam } from './Steam';
 export { default as IconGithub } from './Github';
 export { default as IconTwitter } from './Twitter';
 export { default as IconDiscord } from './Discord';
-export { default as IconEye } from './Eye';
-export { default as IconEyeInactive } from './EyeInactive';
 export { default as IconTrophy } from './Trophy';
 export { default as IconLogout } from './Logout';
 export { default as IconOpenSource } from './OpenSource';