fix merging conflicts

Eevee-Elites-Capstone · Feb 2, 2022 · 7a7be47 · 7a7be47
2 parents c672cfe + b24b745
commit 7a7be47
Show file tree

Hide file tree

Showing 13 changed files with 464 additions and 332 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "@tailwindcss/forms": "^0.4.0",
     "@testing-library/jest-dom": "^5.16.1",
     "@testing-library/react": "^12.1.2",
     "@testing-library/user-event": "^13.5.0",

diff --git a/src/App.css b/src/App.css
@@ -1,7 +1,6 @@
 .App {
   display: flex;
 }
-.App .container{
+.container{
   flex-grow: 1;
-  padding: 0 60px;
 }
diff --git a/src/App.js b/src/App.js
@@ -4,10 +4,10 @@ import SignIn from './components/Auth/SignIn';
 import SignUp from './components/Auth/SignUp';
 import Home from './components/Home';
 import LandingPage from './components/LandingPage';
-import HunterForm from './components/Auth/HunterForm';
 import Navbar from './components/UI/Navbar';
 import Footer from './components/UI/Footer';
 import { useAuthContext } from './hooks/useAuthContext';
+import EditProfile from './components/EditProfile';
 import Dashboard from './components/Dashboard/Dashboard';
 import OnlineUsers from './components/Users/OnlineUsers';
 import CreateProject from './components/Dashboard/CreateProject';
@@ -30,6 +30,9 @@ function App() {
               <Route exact path="/landing">
                 <LandingPage />
               </Route>
+              <Route exact path="/editprofile">
+                <EditProfile />
+              </Route>
               <Route exact path="/home">
                 {user ? <Home /> : <Redirect to="/signin" />}
               </Route>
@@ -53,7 +56,6 @@ function App() {
                 {/* {user && <AllProjects />} */}
               </Route>
             </Switch>
-
           </BrowserRouter>
         )}
       </div>