Refactor Entrance & Landing page

AuroraHuang22 · Jun 19, 2021 · d14703b · d14703b
1 parent 4ac9374
commit d14703b
Show file tree

Hide file tree

Showing 68 changed files with 2,331 additions and 1,618 deletions.
diff --git a/.firebase/hosting.YnVpbGQ.cache b/.firebase/hosting.YnVpbGQ.cache
diff --git a/package.json b/package.json
@@ -31,7 +31,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": [

diff --git a/src/App.js b/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} />

diff --git a/src/App.test.js b/src/App.test.js
@@ -0,0 +1 @@
+import App from "./App";
diff --git a/src/Icons/Labels/列車站-02 2.svg b/src/Icons/Labels/列車站-02 2.svg
diff --git a/src/Icons/Labels/哺集乳室-02 2.svg b/src/Icons/Labels/哺集乳室-02 2.svg
diff --git a/src/Icons/Labels/商店-02 2.svg b/src/Icons/Labels/商店-02 2.svg
diff --git a/src/Icons/Labels/團餐服務-02 2.svg b/src/Icons/Labels/團餐服務-02 2.svg
diff --git a/src/Icons/Labels/娃娃車／輪椅租用-02 2.svg b/src/Icons/Labels/娃娃車／輪椅租用-02 2.svg
diff --git a/src/Icons/Labels/寄物櫃-02 2.svg b/src/Icons/Labels/寄物櫃-02 2.svg
diff --git a/src/Icons/Labels/廁所-02 2.svg b/src/Icons/Labels/廁所-02 2.svg
diff --git a/src/Icons/Labels/志工服務台-02 2.svg b/src/Icons/Labels/志工服務台-02 2.svg
diff --git a/src/Icons/Labels/提款機-02 2.svg b/src/Icons/Labels/提款機-02 2.svg
diff --git a/src/Icons/Labels/涼亭-02 2.svg b/src/Icons/Labels/涼亭-02 2.svg
diff --git a/src/Icons/Labels/護理站-02 2.svg b/src/Icons/Labels/護理站-02 2.svg
diff --git a/src/Icons/Labels/販賣機-02 2.svg b/src/Icons/Labels/販賣機-02 2.svg
diff --git a/src/Icons/Labels/遊客服務中心-02 2.svg b/src/Icons/Labels/遊客服務中心-02 2.svg
diff --git a/src/Icons/Labels/飲水機-02 2.svg b/src/Icons/Labels/飲水機-02 2.svg