finish inital auth

2 files changed, 6 insertions, 6 deletions

diff --git a/app/javascript/components/Layout.jsx b/app/javascript/components/Layout.jsx
index 74568cd..6bf698a 100644
--- a/app/javascript/components/Layout.jsx
+++ b/app/javascript/components/Layout.jsx
@@ -3,14 +3,14 @@ import { Outlet, Link } from "react-router-dom";
 
 export default function Layout ({userData}) 
 {
-	//console.log(userData);
-	//const [userData, setUserData] = useState({ login: "" });
+	console.log(userData);
+	//const [userData, setUserData] = useState({ name: "" });
 	return (
 	<>
 		<div className="flex flex-row h-screen bg-slate-800 text-slate-100">
 		<nav className="flex flex-row h-full w-64 p-4 gap-4 items-center">
 			<div className="h-full flex flex-col">
-				<div>Logged in as: {userData.login}</div>
+		{ userData.name ? <div> Logged in as: {userData.name} </div> : <a href="https://github.com/login/oauth/authorize?client_id=74468ad0847e527262d9"> Login with Github </a> } 
 				<div className="text-4xl py-12">Adam Malczewski</div>
 				<div className="flex flex-row justify-center w-full block grow">
 				<div className="block grow">	
diff --git a/app/javascript/routes/index.jsx b/app/javascript/routes/index.jsx
index bc5d541..235f41b 100644
--- a/app/javascript/routes/index.jsx
+++ b/app/javascript/routes/index.jsx
@@ -1,12 +1,12 @@
 import React, { useState, useEffect } from "react";
-import { BrowserRouter as Router, Routes, Route, Link } from "react-router-dom";
+import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
 import Home from "../components/Home";
 import Blogs from "../components/Blogs";
 import Layout from "../components/Layout";
 
 export default function index()
 {
-	const [userData, setUserData] = useState({ login: "" });
+	const [userData, setUserData] = useState({});
 	const url = "/api/v1/auth/data";
 	useEffect(() => {
 		fetch(url).then((response) => {
@@ -14,7 +14,7 @@ export default function index()
 			return response.json();
 		}
 		throw new Error("Network response was not ok.");
-	}).then((response) => setUserData(response));}, []);
+	}).then((response) => setUserData(response.user_data));}, []);
 		// get user data here
 		// then pass it in as 'props' into the components
 	return (<>