Develop

.gitignore

@@ -3,3 +3,4 @@ public/styles
 .env
 *.log
 *.sqlite3
+.DS_Store

db/schema/01_users.sql

@@ -3,5 +3,8 @@
 DROP TABLE IF EXISTS users CASCADE;
 CREATE TABLE users (
   id SERIAL PRIMARY KEY NOT NULL,
-  name VARCHAR(255) NOT NULL
+  name VARCHAR(255) NOT NULL,
+  email VARCHAR(255) NOT NULL,
+  password VARCHAR(255) NOT NULL,
+  image VARCHAR (255)
 );

db/schema/02_maps.sql

@@ -0,0 +1,13 @@
+-- Drop and recreate Maps table (Example)
+
+DROP TABLE IF EXISTS maps CASCADE;
+CREATE TABLE maps (
+  id SERIAL PRIMARY KEY NOT NULL,
+  user_id INT REFERENCES users(id) ON DELETE CASCADE,
+  title VARCHAR(255) NOT NULL,
+  description TEXT NOT NULL,
+  category VARCHAR(255) NOT NULL,
+  lat DECIMAL (8,6) NOT NULL,
+  lng DECIMAL (9,6) NOT NULL,
+  zoom INT DEFAULT 10
+);

db/schema/03_pins.sql

@@ -0,0 +1,15 @@
+-- Drop and recreate Pins table (Example)
+
+DROP TABLE IF EXISTS pins CASCADE;
+CREATE TABLE pins (
+  -- NOT NULL below might break things
+  id SERIAL PRIMARY KEY NOT NULL,
+  map_id INT REFERENCES maps(id) ON DELETE CASCADE,
+  user_id INT REFERENCES users(id) ON DELETE CASCADE,
+  title VARCHAR(255) NOT NULL,
+  description TEXT,
+  image_url VARCHAR(255),
+  lat DECIMAL (8,6),
+  lng DECIMAL (9,6),
+  address VARCHAR(255) NOT NULL
+);

db/schema/04_favourite_maps.sql

@@ -0,0 +1,8 @@
+-- Drop and recreate Favourite Maps table (Example)
+
+DROP TABLE IF EXISTS favourite_maps CASCADE;
+CREATE TABLE favourite_maps (
+  id SERIAL PRIMARY KEY NOT NULL,
+  user_id INT REFERENCES users(id) ON DELETE CASCADE,
+  map_id INT REFERENCES maps(id) ON DELETE CASCADE
+);

db/seeds/01_users.sql

@@ -1,3 +1,5 @@
--- Users table seeds here (Example)
-INSERT INTO users (name) VALUES ('Alice');
-INSERT INTO users (name) VALUES ('Kira');
+-- Test data below
+
+INSERT INTO users (id, name, email, password) VALUES
+  (1, 'Alice', '[email protected]', 'password'),
+  (2, 'Kira', '[email protected]', 'password');

db/seeds/02_maps.sql

@@ -0,0 +1,9 @@
+INSERT INTO maps (user_id, title, description, category, lat, lng, zoom) VALUES
+-- user 1 maps ALICE ~ grumpy cat 😾
+  (1, 'Vancouver Restaurants', 'Interesting restaurants around Vancouver', 'Restaurants', 49.2827, -123.1207, 12),
+
+  (2, 'Toronto Cafes', 'Hipster cafes around Toronto', 'Cafes', 43.6532, -79.3832, 12),
+-- user 2 maps KIRA
+  (2, 'Calgary Parks', 'Sweet parks to visit with friends', 'Parks', 51.0447, -114.0719, 11),
+
+  (2, 'BC Sightseeing', 'Popular spots and obscure gems', 'Sightseeing', 53.7267, -127.6476, 6);

db/seeds/03_pins.sql

@@ -0,0 +1,22 @@
+-- TEST DATA BELOW
+INSERT INTO pins (map_id, user_id, title, description, image_url, lat, lng, address) VALUES
+-- Map 1
+  (1, 1, 'Cardero Restaurant', 'Fine Dining Marina Restaurant', 'https://media-cdn.tripadvisor.com/media/photo-s/12/ab/ad/61/photo0jpg.jpg', 	49.291674, -123.127480, '1583 Coal Harbour Quay, Vancouver, BC V6G 3E7'),
+  (1, 1, 'Black Frog Eatery','Cozy and comfy eatery', 'https://ssmscdn.yp.ca/image/resize/e9814e29-da35-49cb-8a91-af766f7b0b7a/ypui-d-mp-pic-gal-lg/black-frog-eatery-2.jpg', 49.285227, -123.108532, '108 Cambie St, Vancouver, BC V6B 2M8'),
+  (1, 2, 'Dark Table', 'Blind servers dining experience', 'https://s3-media0.fl.yelpcdn.com/bphoto/6ngjBBEeA6V3qXX3BEusww/o.jpg', 49.268591, -123.164907, '2611 W 4th Ave, Vancouver, BC V6K 1P8'),
+  (1, 2, 'Gyu-Kaku Japanese BBQ', 'Japanese BBQ chain', 'https://d1ralsognjng37.cloudfront.net/d6a34492-0be9-4ffe-a5fd-32fc90428a43.jpeg', 49.263429, -123.125686, '950 W Broadway #201, Vancouver, BC V5Z 1K7'),
+-- Map 2 ~ pins from two users
+  (2, 2, 'LEspresso Bar Mercurio', 'Modern Italian Cafe', 'https://media-cdn.tripadvisor.com/media/photo-s/1a/35/64/93/main-dining-room.jpg', 43.667611, -79.399141, '321 Bloor St W, Toronto, ON M5S 1S5'),
+  (2, 2, 'Quantum Coffee', 'Hipster cafe for nerds','http://dailycoffeenews.com/wp-content/uploads/2015/12/Quantum-Espresso-Bar-620x415.jpg', 43.645620, -79.395342, '460 King St W, Toronto, ON M5V 1L7'),
+  (2, 2, 'JetFuel Coffee Shop', 'Indie espresso joint', 'https://torontoist.com/attachments/toronto_david/villain_jetfuel.jpg', 43.665482, -79.368235, '519 Parliament St, Toronto, ON M4X 1P3'),
+  (2, 2, 'Liberty Village Market & Cafe', 'Unfussy cafe outlet', 'https://s3-media0.fl.yelpcdn.com/bphoto/hMRTh3EiHHwOf1DtVScSPQ/o.jpg', 43.638169, -79.421348, '65 Jefferson Ave, Toronto, ON M6K 1Y3'),
+-- Map 3 ~ Favourited Map from other user
+  (3, 2, 'South Glenmore Park', 'Waterfront green space with biking and hiking', 'https://media.chatterblock.com/cache/4e/91/4e9161e01f730ff5dca466be2b77c570.jpg', 50.973261, -114.119102, '24 St SW, Calgary, AB T2V 3N8'),
+  (3, 2, 'Fish Creek Provincial Park', 'Expansive park','https://www.dalhousiecalgary.ca/wp-content/uploads/2020/07/fish-creek-park.jpg', 50.914949, -114.010757, 'Calgary, AB'),
+  (3, 2, 'Nose Hill Park', 'Tranquil, spacious park with abundant wildlife', 'https://i.redd.it/o4hj9azfud411.jpg', 51.110487, -114.108844, '5620 14 St NW, Calgary, AB T3K 2P6'),
+  (3, 2, 'Bowness Park', 'Serene spot with a lagoon and winter ice skating', 'https://upload.wikimedia.org/wikipedia/commons/3/37/Bowness_Park_lagoon.jpg', 51.097463, -114.217076, '8900 48 Ave NW, Calgary, AB T3B 2B2'),
+-- Map 4 ~ Collaborated Map from other user
+  (4, 2, 'Bergeron Falls', 'Hidden falls are a satisfying reward after the approach', 'https://s2.wklcdn.com/image_11/340586/20764032/12995222Master.jpg', 55.204234, -120.976821, 'Tumbler Ridge, BC V0C 2W0'),
+  (4, 2, 'Mount Tantalus', 'Beautiful mountain, part of an amazing surrounding range','https://peakvisor.com/img/news/Tantalus-Range.jpg', 49.819521, -123.329358, 'Sunshine Coast B, BC V0N 1H0'),
+  (4, 2, 'Mackenzie', 'Quaint town with plenty nature to explore just outside', 'https://upload.wikimedia.org/wikipedia/commons/d/dc/MackenziefromMorfeeMountain.jpg', 55.354453, -123.087940, 'Mackenzie, BC'),
+  (4, 1, 'Clearwater', 'Municipality featuring the Clearwater River-Thompson River tributary', 'https://dynamic-media-cdn.tripadvisor.com/media/photo-o/01/7d/95/6f/helmcken-falls.jpg?w=500&h=300&s=1', 51.652008, -120.037911, 'Clearwater, BC');

db/seeds/04_favourite_maps.sql

@@ -0,0 +1,2 @@
+INSERT INTO favourite_maps (user_id, map_id) VALUES
+  (1, 3), (2, 1), (2, 2);

package.json

@@ -20,7 +20,8 @@
     "morgan": "^1.10.0",
     "node-sass-middleware": "^0.11.0",
     "pg": "^6.4.2",
-    "pg-native": "^3.0.0"
+    "pg-native": "^3.0.0",
+    "request": "^2.88.2"
   },
   "devDependencies": {
     "nodemon": "^1.19.4"

public/scripts/app.js

@@ -1,10 +1,8 @@
 $(() => {
   $.ajax({
     method: "GET",
-    url: "/api/users"
-  }).done((users) => {
-    for(user of users) {
-      $("<div>").text(user.name).appendTo($("body"));
-    }
-  });;
+    url: `/pins/${mapId}`
+  }).done((res) => {
+    addMarkers(res);
+  })
 });

public/scripts/getUserMaps.js

@@ -0,0 +1,26 @@
+$(() => {
+  $.ajax({
+    method: "GET",
+    url: `/users/${currentUser.id}/contributed_maps`
+  }).done((res) => {
+    console.log(res);
+    for (let map of res) {
+      let mapLine = `<a href="/maps/${map.map_id}"><div>${map.title}</div></a>`;
+      $('#contributed-maps').append(mapLine);
+    }
+  })
+
+  $.ajax({
+    method: "GET",
+    url: `/users/${currentUser.id}/favourite_maps`
+  }).done((res) => {
+    console.log(res);
+    for (let map of res) {
+      let mapLine = `<a href="/maps/${map.map_id}"><div>${map.map_title}</div></a>`;
+      $('#favourite-maps').append(mapLine);
+    }
+  })
+
+});
+
+

public/scripts/helper.js

@@ -0,0 +1,17 @@
+// helper functions below
+module.exports = (db) => {
+
+  return getPins = function(map_id) {
+    const queryStr = `
+    SELECT pins.*
+    FROM maps
+    JOIN pins ON maps.id = map_id
+    WHERE map_id = $1;
+    `;
+    return db.query(queryStr, [map_id])
+      .then(res => res.rows)
+      .catch(err => (console.log(err.stack)));
+  };
+}
+
+

routes/favourite_maps.js

@@ -0,0 +1,43 @@
+// All routes for Favourite Maps are defined here
+
+const express = require('express');
+const router  = express.Router();
+
+// GETs below
+
+module.exports = (db) => {
+  router.get("/", (req, res) => {
+    console.log('inside get request');
+    let query = "SELECT * FROM favourite_maps;";
+    db.query(query)
+      .then(data => {
+        const favourite_maps = data.rows;
+        res.json({ favourite_maps });
+      })
+      .catch(err => {
+        res
+          .status(500)
+          .json({ error: err.message });
+      });
+  });
+
+  router.post("/", (req, res) => {
+
+    let query = `
+    INSERT INTO favourite_maps (user_id, map_id)
+    VALUES ($1, $2);
+    `;
+    return db.query(query, [parseInt(req.body.user_id), parseInt(req.body.map_id)])
+      .then(data => {
+        res.sendStatus(200);
+      })
+      .catch(err => {
+        res
+          .status(500)
+          .json({ error: err.message });
+      });
+  });
+  return router;
+};
+
+// POSTs below

routes/home.js

@@ -0,0 +1,30 @@
+const express = require('express');
+const router  = express.Router();
+
+// GETs below
+
+module.exports = (db) => {
+
+  const userAlice = {
+    id: 1,
+    name: 'Alice',
+    email: '[email protected]',
+    password: 'password',
+    image: 'https://images.unsplash.com/photo-1513245543132-31f507417b26?ixid=MXwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHw%3D&ixlib=rb-1.2.1&auto=format&fit=crop&w=675&q=80',
+  }
+
+  router.get("/", (req, res) => {
+
+    let query = `SELECT * FROM maps;`;
+    return db.query(query)
+    .then(response => {
+      const templateVars = {
+        user: userAlice,
+        mapData: response.rows
+      }
+      res.render("homepage", templateVars);
+    })
+  });
+  return router;
+};
+