From 6d03519d6f1af8ac7eb34529cbd53cd679f39141 Mon Sep 17 00:00:00 2001 From: Greg Bowne Date: Sun, 27 Aug 2023 16:26:31 -0700 Subject: [PATCH] Fixing .variable-env and Home.jsx component --- src/pages/Home/Home.jsx | 16 +++++++--------- src/server/.variable.env | 8 ++------ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/pages/Home/Home.jsx b/src/pages/Home/Home.jsx index 267e4a7..8eeaf69 100644 --- a/src/pages/Home/Home.jsx +++ b/src/pages/Home/Home.jsx @@ -52,16 +52,14 @@ function Home() { const notify = (username) => toast.success('Welcome! ' + username); useEffect(() => { -<<<<<<< HEAD if (location?.state?.loggin || localStorage.getItem('user')) { -======= - if ( - location.state && - location.state.loggin && - localStorage.getItem('user') - ) { ->>>>>>> origin/master - notify(JSON.parse(localStorage.getItem('user')).username); + if ( + location.state && + location.state.loggin && + localStorage.getItem('user') + ) { + notify(JSON.parse(localStorage.getItem('user')).username); + } } }, []); diff --git a/src/server/.variable.env b/src/server/.variable.env index 0dcb97e..0acd8ad 100644 --- a/src/server/.variable.env +++ b/src/server/.variable.env @@ -1,6 +1,2 @@ -MONGO_DB= -<<<<<<< HEAD -PORT= -======= -PORT= ->>>>>>> origin/master +MONGO_DB=mongodb://username:password@localhost:27017/codebooker +PORT=3001