refactoring

Birck10 · Aug 18, 2023 · 946d0d3 · 946d0d3
1 parent 62051e1
commit 946d0d3
Show file tree

Hide file tree

Showing 7 changed files with 96 additions and 26 deletions.
diff --git a/website/src/App.tsx b/website/src/App.tsx
@@ -1,10 +1,11 @@
 import { BrowserRouter, Route, Routes } from "react-router-dom"
 import './App.css'
-import NavBar from './components/NavBar'
-import PaymentCards from './components/PaymentCards'
-import StrategyAnalyzer from './components/StrategyAnalyzer'
-import TableAnalyzer from './components/TableAnalyzer'
-import Home from "./components/Home"
+import NavBar from './routes/NavBar'
+import PaymentCards from './views/Purchase'
+import StrategyAnalyzer from './views/StrategyAnalyzer'
+import TableAnalyzer from './views/TableAnalyzer'
+import Home from "./views/Home"
+import Routing from "./routes/Routing"
 
 
 function App() {
@@ -13,12 +14,7 @@ function App() {
     <>
       <BrowserRouter>
       <NavBar />
-      <Routes>
-          <Route path="strategyanalyzer" element={<StrategyAnalyzer />} />
-          <Route path="tableanalyzer" element={<TableAnalyzer />} />
-          <Route path="/" element={<Home />} />
-          <Route path="/purchase" element={<PaymentCards />} />
-      </Routes>
+      <Routing/>
     </BrowserRouter>
     </>
   )

diff --git a/website/src/components/NavBar.tsx → website/src/routes/NavBar.tsx b/website/src/components/NavBar.tsx → website/src/routes/NavBar.tsx
diff --git a/website/src/routes/Routing.tsx b/website/src/routes/Routing.tsx
@@ -0,0 +1,21 @@
+
+import { Route, Routes } from "react-router-dom"
+import Home from "../views/Home"
+import PaymentCards from "../views/Purchase"
+import TableAnalyzer from "../views/TableAnalyzer"
+import StrategyAnalyzer from "../views/StrategyAnalyzer"
+
+function Routing() {
+    return (
+        <div>
+            <Routes>
+                <Route path="strategyanalyzer" element={<StrategyAnalyzer />} />
+                <Route path="tableanalyzer" element={<TableAnalyzer />} />
+                <Route path="/" element={<Home />} />
+                <Route path="/purchase" element={<PaymentCards />} />
+            </Routes>
+        </div>
+    )
+}
+
+export default Routing
diff --git a/website/src/components/Home.tsx → website/src/views/Home.tsx b/website/src/components/Home.tsx → website/src/views/Home.tsx
@@ -1,5 +1,5 @@
 import 'bootstrap/dist/css/bootstrap.css';
-import PaymentCards from './PaymentCards';
+import PaymentCards from './Purchase';
 
 function Home() {
 

diff --git a/website/src/components/PaymentCards.tsx → website/src/views/Purchase.tsx b/website/src/components/PaymentCards.tsx → website/src/views/Purchase.tsx
@@ -1,13 +1,23 @@
-import CloudDownloadOutlinedIcon from '@mui/icons-material/CloudDownloadOutlined';
-import 'bootstrap/dist/css/bootstrap.css';
 import Button from '@mui/material/Button';
+import ClickAwayListener from '@mui/material/ClickAwayListener';
+import Tooltip from '@mui/material/Tooltip';
+import 'bootstrap/dist/css/bootstrap.css';
+import { useState } from 'react';
 
 function PaymentCards() {
+    const [hover, setHover] = useState(false);
+    const [showBitcoin, setShowBitcoin] = useState(false);
+    const bitcoinAddress = "bc1q6r0l549jefv3rgs7e0jzsdkx9pq9trd2cqyw50"
     const dl_link = "https://onedrive.live.com/download?cid=A3B69BDCC03E82A9&resid=A3B69BDCC03E82A9%21111289&authkey=AEftpEpz8jxnBdI"
 
     const goToLink = (link: string) => {
         window.location.href = link;
     }
+    const handleCopy = () => {
+        if (!showBitcoin) setShowBitcoin(true);
+        else setShowBitcoin(false);
+    };
+
     return (
         <><br />
             <div className="container">
@@ -29,7 +39,7 @@ function PaymentCards() {
                                         <li>Map your own tables</li>
                                         <li>Analyze results</li>
                                         <li>Track payoff</li>
-                                        <br/>
+                                        <br />
                                         <li>Trial strategies</li>
 
                                     </ul>
@@ -54,7 +64,7 @@ function PaymentCards() {
                                         <li>Map your own tables</li>
                                         <li>Analyze results</li>
                                         <li>Track payoff</li>
-                                        <br/>
+                                        <br />
 
                                         <li>Support chat</li>
                                         <li>Access to all strategies</li>
@@ -69,21 +79,64 @@ function PaymentCards() {
                     <div className="col-sm">
                         <div className="card shadow-lg rounded custom-card-size">
                             <div className="card-body">
-                                <div> Yearly</div>
+                                <div> 1 year</div>
                                 <div> $49 / year </div>
                                 <div>
-                                    <Button onClick={() => goToLink('https://www.paypal.com/webapps/billing/plans/subscribe?plan_id=P-6LY92142E3713805RMTML6SA')}
-                                        variant="contained">Subscribe</Button>
+                                    <Button onClick={() => goToLink('https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YZUR8CYZB826S')}
+                                        variant="contained">Buy</Button>
                                 </div>
                                 <div className="items">
                                     <ul><br />
-                                    <li>Scrape Table and Analyze</li>
+                                        <li>Scrape Table and Analyze</li>
                                         <li>Auto Click on best action</li>
                                         <li>Select table templates</li>
                                         <li>Map your own tables</li>
                                         <li>Analyze results</li>
                                         <li>Track payoff</li>
-                                        <br/>
+                                        <br />
+
+                                        <li>Support chat</li>
+                                        <li>Access to all strategies</li>
+                                        <li>Edit strategies</li>
+                                        <li>Create custom strategies</li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div className="col-sm">
+                        <div className="card shadow-lg rounded custom-card-size">
+                            <div className="card-body">
+                                <div> 1 year</div>
+                                <div> $49 / year </div>
+                                <div>
+                                    <ClickAwayListener onClickAway={() => setHover(false)}>
+                                            <Button
+                                                onMouseEnter={() => setHover(true)}
+                                                onMouseLeave={() => setHover(false)}
+                                                onClick={handleCopy}
+                                                variant="contained"
+                                            >
+                                                Bitcoin
+                                            </Button>
+                                    </ClickAwayListener>
+                                    {showBitcoin &&
+                                        <div className="small">
+                                            Bitcoin address: {bitcoinAddress} <br />Please email me to confirm once you have made a payment: [email protected]
+                                        </div>
+                                    }
+
+                                </div>
+                                {/* <div className="small"><br/>Bitcoin: bc1q6r0l549jefv3rgs7e0jzsdkx9pq9trd2cqyw50</div> */}
+                                <div className="items">
+                                    <ul><br />
+                                        <li>Scrape Table and Analyze</li>
+                                        <li>Auto Click on best action</li>
+                                        <li>Select table templates</li>
+                                        <li>Map your own tables</li>
+                                        <li>Analyze results</li>
+                                        <li>Track payoff</li>
+                                        <br />
 
                                         <li>Support chat</li>
                                         <li>Access to all strategies</li>
@@ -105,13 +158,13 @@ function PaymentCards() {
                                 </div>
                                 <div className="items">
                                     <ul><br />
-                                    <li>Scrape Table and Analyze</li>
+                                        <li>Scrape Table and Analyze</li>
                                         <li>Auto Click on best action</li>
                                         <li>Select table templates</li>
                                         <li>Map your own tables</li>
                                         <li>Analyze results</li>
                                         <li>Track payoff</li>
-                                        <br/>
+                                        <br />
 
                                         <li>Support chat</li>
                                         <li>Access to all strategies</li>

diff --git a/website/src/components/StrategyAnalyzer.tsx → website/src/views/StrategyAnalyzer.tsx b/website/src/components/StrategyAnalyzer.tsx → website/src/views/StrategyAnalyzer.tsx
@@ -2,9 +2,9 @@ import { CircularProgress, FormControl, InputLabel, MenuItem, Select } from '@ma
 import axios from 'axios';
 import 'bootstrap/dist/css/bootstrap.min.css';
 import React, { useEffect, useState } from 'react';
-import GroupedStackedBarChart from './GroupedBarChart';
-import LeagueTablePlot from './LeagueTablePlot';
-import ScatterplotComponent from './ScatterPlot';
+import GroupedStackedBarChart from '../components/GroupedBarChart';
+import LeagueTablePlot from '../components/LeagueTablePlot';
+import ScatterplotComponent from '../components/ScatterPlot';
 import { pirate } from '../assets/Images';
 
 

diff --git a/website/src/components/TableAnalyzer.tsx → website/src/views/TableAnalyzer.tsx b/website/src/components/TableAnalyzer.tsx → website/src/views/TableAnalyzer.tsx