bug fix

MohanVashist1 · Apr 12, 2020 · 45f154c · 45f154c
1 parent 6941b6f
commit 45f154c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/backend/lib/DataHandler.py b/backend/lib/DataHandler.py
@@ -146,10 +146,18 @@ def retrieveCryptoData(self, symbol, kline_size):
         return pd.read_csv(filename)
 
     def retrieveCryptoDataLive(self, symbol, kline_size, minDate, maxDate):
-        updatedMinDate = datetime.strptime(
-            minDate, '%Y-%m-%d %H:%M:%S').strftime('%d %b %Y %H:%M:%S')
-        updatedMaxDate = datetime.strptime(
-            maxDate, '%Y-%m-%d %H:%M:%S').strftime('%d %b %Y %H:%M:%S')
+        if(":" in minDate):
+            updatedMinDate = datetime.strptime(
+                minDate, '%Y-%m-%d %H:%M:%S').strftime('%d %b %Y %H:%M:%S')
+        else:
+            updatedMinDate = datetime.strptime(
+                minDate, '%Y-%m-%d').strftime('%d %b %Y') + " 00:00:00"
+        if(":" in minDate):
+            updatedMaxDate = datetime.strptime(
+                maxDate, '%Y-%m-%d %H:%M:%S').strftime('%d %b %Y') + " 00:00:00"
+        else:
+            updatedMinDate = datetime.strptime(
+                minDate, '%Y-%m-%d').strftime('%d %b %Y %H:%M:%S')
         klines = self.binance_client.get_historical_klines(
             symbol, kline_size, updatedMinDate, updatedMaxDate, limit=1000)
         data = pd.DataFrame(klines, columns=['timestamp', 'open', 'high', 'low', 'close',

diff --git a/backend/main.py b/backend/main.py
@@ -61,7 +61,7 @@ class CryptoRequest(BaseModel):
 
 
 app = FastAPI()
-app.add_middleware(HTTPSRedirectMiddleware)
+# app.add_middleware(HTTPSRedirectMiddleware)
 dataHandler = DataHandler.BinanceWrapper()
 tempCryptoList = dataHandler.getcryptoSymbols()
 cryptoList = []

diff --git a/frontend/cryptoviz/src/js/components/CryptoLanding.js b/frontend/cryptoviz/src/js/components/CryptoLanding.js
@@ -18,7 +18,7 @@ import { useHistory } from "react-router-dom";
 import Loader from "react-loader-spinner";
 import { AuthContext } from "./App";
 import { updateUser } from "../api";
-import Cookie from 'js-cookie';
+import Cookie from "js-cookie";
 import { UPDATE_USER_SUCCESS, UPDATE_USER_FAILURE } from "../constants/auth";
 
 const d = new Date();
@@ -203,8 +203,12 @@ function CryptoLanding({ match }) {
 
   return (
     <div>
-      {(Cookie.get('isLoggedIn') && Cookie.get('isLoggedIn').toLocaleLowerCase() === 'true' && authState.isAuthenticated) ||
-      ((!Cookie.get('isLoggedIn') || Cookie.get('isLoggedIn').toLocaleLowerCase() === 'false') && !authState.isAuthenticated) ? (
+      {(Cookie.get("isLoggedIn") &&
+        Cookie.get("isLoggedIn").toLocaleLowerCase() === "true" &&
+        authState.isAuthenticated) ||
+      ((!Cookie.get("isLoggedIn") ||
+        Cookie.get("isLoggedIn").toLocaleLowerCase() === "false") &&
+        !authState.isAuthenticated) ? (
         <div>
           <Navbar />
           <div style={{ textAlign: "center", marginTop: "4em" }}>
@@ -240,7 +244,11 @@ function CryptoLanding({ match }) {
                 role="group"
                 aria-label="Button group with nested dropdown"
               >
-                <button type="button" style={{cursor: "auto"}} className="btn btn-primary">
+                <button
+                  type="button"
+                  style={{ cursor: "auto" }}
+                  className="btn btn-primary"
+                >
                   Select Time Interval
                 </button>
                 <div className="btn-group" role="group">
@@ -357,7 +365,7 @@ function CryptoLanding({ match }) {
                     <a
                       className="dropdown-item"
                       onClick={() => {
-                        setminDate("2020-00-00");
+                        setminDate("2020-01-00");
                         setmaxDate(currDate + " " + currTime);
                         setTimeInterval("1w");
                       }}
@@ -367,7 +375,7 @@ function CryptoLanding({ match }) {
                     <a
                       className="dropdown-item"
                       onClick={() => {
-                        setminDate("2019-00-01");
+                        setminDate("2019-01-01");
                         setmaxDate(currDate + " " + currTime);
                         setTimeInterval("1M");
                       }}