will need to work with merge conflicts

Potluck-Planner-A · Nov 15, 2021 · 9dababf · 9dababf
1 parent b63643a
commit 9dababf
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 12 deletions.
diff --git a/public/logo192.png b/public/logo192.png
diff --git a/public/logo512.png b/public/logo512.png
diff --git a/public/manifest.json b/public/manifest.json
@@ -6,16 +6,6 @@
       "src": "favicon.ico",
       "sizes": "64x64 32x32 24x24 16x16",
       "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
     }
   ],
   "start_url": ".",

diff --git a/src/App.js b/src/App.js
@@ -1,8 +1,8 @@
 import logo from './logo.svg';
 import './App.css';
 import Header from './components/Header';
-import { Route } from "react-router-dom";
-import PrivateRoute from './components/PrivateRoute';
+// import { Route } from "react-router-dom";
+// import PrivateRoute from './components/PrivateRoute';
 
 
 function App() {

diff --git a/src/components/PrivateRoute.js b/src/components/PrivateRoute.js
@@ -1,5 +1,7 @@
 import React from 'react'
 
+//we need to change this from the  Redirect --
+// React router v6 is now different https://reactrouter.com/docs/en/v6/upgrading/v5
 import { Route, Redirect } from "react-router-dom";
 
 const PrivateRoute = ({component:Component, ...rest}) => {