Merge pull request #23 from AuroraHuang22/develop

Develop - 21.06.20

package.json

@@ -5,7 +5,6 @@
   "dependencies": {
     "@reduxjs/toolkit": "^1.5.1",
     "@testing-library/jest-dom": "^5.12.0",
-    "@testing-library/react": "^11.2.6",
     "@testing-library/user-event": "^12.8.3",
     "firebase": "^8.6.1",
     "leaflet": "^1.7.1",
@@ -31,7 +30,8 @@
     "start": "BROWSER='microsoft edge' react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test",
-    "eject": "react-scripts eject"
+    "eject": "react-scripts eject",
+    "lint": "eslint src"
   },
   "eslintConfig": {
     "extends": [
@@ -52,6 +52,7 @@
     ]
   },
   "devDependencies": {
+    "@testing-library/react": "^11.2.7",
     "redux-devtools": "^3.7.0"
   }
 }

src/App.js

@@ -4,12 +4,11 @@ import { BrowserRouter as Router, Switch, Route } from "react-router-dom";
 import Map from "./Pages/Map";
 import store from "./Redux/Store";
 import Header from "./Utils/Header";
-import Footer from "./Utils/Footer";
+// import Footer from "./Utils/Footer";
 import Member from "./Pages/Member";
-import All from "./Pages/All";
+import ShowAllAnimals from "./Pages/ShowAllAnimals";
 import Entrance from "./Pages/Entrance";
 import Landing from "./Pages/Landing";
-import { ToastContainer } from "react-toastify";
 
 function App() {
   return (
@@ -18,7 +17,7 @@ function App() {
         <Header />
         <Switch>
           <Route exact path="/" component={Landing} />
-          <Route exact path="/all" component={All} />
+          <Route exact path="/all" component={ShowAllAnimals} />
           <Route exact path="/map" component={Map} />
           <Route path="/member" component={Member} />
           <Route path="/entrance" component={Entrance} />