diff --git a/src/components/GraphicsBayTracker.js b/src/components/GraphicsBayTracker.js index 33d63e6..578180b 100644 --- a/src/components/GraphicsBayTracker.js +++ b/src/components/GraphicsBayTracker.js @@ -5,10 +5,11 @@ import { NavBar } from "./nav/NavBar"; import { Login } from "./auth/Login"; import { Register } from "./auth/Register"; -export const GraphicsBayTracker = () => ( - <> - { + return ( <> + { + if (localStorage.getItem("graphicsbaytracker_customer")) { return ( <> @@ -17,10 +18,10 @@ export const GraphicsBayTracker = () => ( ); } else { - return ; - } - }} - /> + return( + ); + }}} + /> @@ -29,4 +30,4 @@ export const GraphicsBayTracker = () => ( -); +)}; diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index 4eb4724..49538a0 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js @@ -1,4 +1,4 @@ -import React, { useRef, useState } from "react" +import React, { useCallback, useRef, useState } from "react" import { Link } from "react-router-dom"; import { useHistory } from "react-router-dom" import "./Login.css" @@ -7,6 +7,10 @@ export const Login = () => { const [email, set] = useState("") const existDialog = useRef() const history = useHistory() + + + + const existingUserCheck = () => { return fetch(`http://localhost:8088/users?email=${email}`) @@ -17,7 +21,7 @@ export const Login = () => { const handleLogin = (e) => { e.preventDefault() existingUserCheck() - .then(exists => { + .then (exists => { if (exists) { localStorage.setItem("graphicsbaytracker_customer", exists.id) history.push("") @@ -27,7 +31,18 @@ export const Login = () => { }) } +const skipLogin = () => { + const setLocalStorageUser = () => localStorage.setItem("graphicsbaytracker_customer", 1) + const skipToHome = () => history.replace('./GraphicsBayTrackerHome') + return (setLocalStorageUser(), skipToHome()) +} + +const redirectToRegister = () => { + history.replace("./Register") +} + return ( +
User does not exist
@@ -54,11 +69,11 @@ export const Login = () => {
- Not a member yet? -
-
- Skip Login +
+ + +
) } diff --git a/src/components/home/GraphicsBayTrackerHome.js b/src/components/home/GraphicsBayTrackerHome.js index e2a5b05..9148378 100644 --- a/src/components/home/GraphicsBayTrackerHome.js +++ b/src/components/home/GraphicsBayTrackerHome.js @@ -1,10 +1,15 @@ import React from "react" -import { NavBar } from "../nav/NavBar" +import { useState, useEffect } from "react" +import { NewsStories } from "./NewsStories" -export const GraphicsBayTrackerHome =()=>{ - const displayNavBar = NavBar() - return
- {displayNavBar} +export const GraphicsBayTrackerHome = () => { + const [ keyprices, setkeyprices] = useState({}) + return ( + <> + +
+
+ ) } \ No newline at end of file diff --git a/src/components/home/NewsStories.js b/src/components/home/NewsStories.js index e0f4efe..18ee440 100644 --- a/src/components/home/NewsStories.js +++ b/src/components/home/NewsStories.js @@ -1,4 +1,4 @@ export const NewsStories = () => { - return
+ return

This is a news story

} \ No newline at end of file diff --git a/src/components/nav/NavBar.js b/src/components/nav/NavBar.js index e600cd3..3c1468c 100644 --- a/src/components/nav/NavBar.js +++ b/src/components/nav/NavBar.js @@ -29,7 +29,7 @@ export const NavBar = () => {
  • { - localStorage.graphicsbaytracker_customer >= 1 ? Logout : Login + localStorage.graphicsbaytracker_customer !== 1 ? Logout : Login }