Revert "Revert "update footer with links""

open-austin · Oct 29, 2017 · d9a27a7 · d9a27a7
1 parent f0a79e8
commit d9a27a7
Show file tree

Hide file tree

Showing 13 changed files with 70 additions and 10,202 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,11 +5,16 @@
   "main": "app.js",
   "private": true,
   "dependencies": {
-    "dotenv": "^4.0.0",
+    "bcrypt": "^1.0.3",
+    "body-parser": "^1.18.2",
+    "cookie-parser": "^1.4.3",
+    "cookie-sessions": "0.0.2",
     "ejs": "^2.5.7",
-    "react": "^16.0.0",
-    "react-dom": "^16.0.0",
-    "react-scripts": "1.0.14"
+    "express": "^4.16.2",
+    "knex": "^0.13.0",
+    "method-override": "^2.3.10",
+    "pg": "^7.3.0",
+    "dotenv": "^4.0.0"
   },
   "repository": {
     "type": "git",
@@ -21,10 +26,5 @@
     "url": "https://github.com/open-austin/GreenBelts/issues"
   },
   "homepage": "https://github.com/open-austin/GreenBelts#readme",
-  "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test --env=jsdom",
-    "eject": "react-scripts eject"
-  }
+  "scripts": {}
 }
diff --git a/public/style.css b/public/style.css
@@ -1,3 +1,15 @@
+
+html {
+  position: relative;
+  min-height: 100vh;
+}
+
+main {
+  margin: 30px auto 30px auto;
+  padding: 20px;
+  height: auto;
+}
+
 /* ========================= NAVBAR ========================== */
 .navBar {
   width: 100 vw;
@@ -26,8 +38,8 @@
 .card {
   background: #fff;
   border-radius: 2px;
-  height: auto;
   width: 80vw;
+  height: auto;
   margin: 20px auto 0 auto;
   padding: 10px;
   box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
@@ -37,3 +49,42 @@
 .card:hover {
   box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22);
 } */
+
+/* =============================== MAP ========================= */
+#map {
+  margin: auto;
+  height: 400px;
+  width: 90%;
+}
+
+/* =============================== FOOTER ========================= */
+
+footer {
+    width: 100 vw;
+    height: auto;
+    background-color: black;
+    color: white;
+    display: flex;
+    flex-flow: row wrap;
+    justify-content: center;
+    align-items: center;
+    padding: 0 20px 0 20px;
+    text-align: center;
+}
+
+footer #contact {
+  flex: 1 1 30%;
+}
+
+footer #contribute {
+  flex: 1 1 30%;
+}
+
+footer #openAustin {
+  flex: 1 1 30%;
+}
+
+footer a {
+  color: white;
+  text-decoration: none;
+}
diff --git a/src/App.css b/src/App.css
diff --git a/src/App.js b/src/App.js
diff --git a/src/App.test.js b/src/App.test.js
diff --git a/src/index.css b/src/index.css
diff --git a/src/index.js b/src/index.js
diff --git a/src/logo.svg b/src/logo.svg
diff --git a/src/registerServiceWorker.js b/src/registerServiceWorker.js
diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs
@@ -0,0 +1,5 @@
+<footer>
+  <h3 id='contact'><a href="mailto:[email protected]">Contact</a></h3>
+  <h3 id='contribute'><a href="https://github.com/open-austin/GreenBelts">Contribute</a></h3>
+  <h3 id='openAustin'><a href="https://www.open-austin.org/">An Open Austin Project</a></h3>
+</footer>
diff --git a/views/partials/nav.ejs b/views/partials/nav.ejs
@@ -1,4 +1,4 @@
-<div class ='navBar'>
+
+<nav class ='navBar'>
   <h1>ATX TrailMix</h1>
-  <nav><button>sample</button></nav>
-</div>
+</nav>