DO NOT MERGE -- add feedback

data/create-tables.js

@@ -11,19 +11,50 @@ async function run() {
     await client.connect();
 
     // run a query to create tables
+    // Wow!! Look at this data model! So much complexity. My only concern: is it necessary to track the loggedinuser in its own table?
     await client.query(`
                 CREATE TABLE users (
                     id SERIAL PRIMARY KEY,
                     email VARCHAR(256) NOT NULL,
-                    hash VARCHAR(512) NOT NULL
-                );           
-                CREATE TABLE animals (
-                    id SERIAL PRIMARY KEY NOT NULL,
+                    hash VARCHAR(512) NOT NULL,
+                    user_ship VARCHAR(512)
+
+                );
+                  CREATE TABLE loggedinuser (
+                    id SERIAL PRIMARY KEY,
                     name VARCHAR(512) NOT NULL,
-                    cool_factor INTEGER NOT NULL,
+                    score INTEGER NOT NULL,
                     owner_id INTEGER NOT NULL REFERENCES users(id)
+                  );
+
+                CREATE TABLE locations (
+                    id SERIAL PRIMARY KEY NOT NULL,
+                    location_name VARCHAR(512) NOT NULL,
+                    location_type VARCHAR(512) NOT NULL,
+                    location_image VARCHAR(512) NOT NULL,
+                    location_description VARCHAR(512) NOT NULL,
+                    event_id INTEGER NOT NULL UNIQUE
+            );  
+                CREATE TABLE events (
+              id SERIAL PRIMARY KEY NOT NULL,
+              planet_id INTEGER REFERENCES locations(event_id),
+              event_name VARCHAR(512) NOT NULL,
+              event_image VARCHAR(1000) NOT NULL,
+              event_description VARCHAR(2000) NOT NULL,
+              event_choices VARCHAR(5000) ARRAY NOT NULL
+            );
+            CREATE TABLE shipchoices (
+              id SERIAL PRIMARY KEY NOT NULL,
+              ship_name VARCHAR(512) NOT NULL,
+              ship_fuel INTEGER NOT NULL,
+              ship_hull INTEGER NOT NULL,
+              base_combat INTEGER NOT NULL,
+              base_diplomacy INTEGER NOT NULL,
+              base_science INTEGER NOT NULL,
+              used_item_slots INTEGER NOT NULL,
+              max_item_slots INTEGER NOT NULL
             );
-        `);
+        `); // Generally, the SQL standard would have put ship_choices in snake case
 
     console.log('create tables complete', getEmoji(), getEmoji(), getEmoji());
   }

data/drop-tables.js

@@ -10,7 +10,10 @@ async function run() {
 
     await client.query(`
             DROP TABLE IF EXISTS users CASCADE;
-            DROP TABLE IF EXISTS animals;
+            DROP TABLE IF EXISTS locations CASCADE;
+            DROP TABLE IF EXISTS events;
+            DROP TABLE IF EXISTS shipchoices;
+            DROP TABLE IF EXISTS loggedinuser;
         `);
 
     console.log(' drop tables complete', getEmoji(), getEmoji(), getEmoji());

data/load-seed-data.js

@@ -1,7 +1,9 @@
 const client = require('../lib/client');
 // import our seed data:
-const animals = require('./animals.js');
+const locations = require('./locations.js');
 const usersData = require('./users.js');
+const events = require('./events.js');
+const shipChoices = require('./shipchoices.js');
 const { getEmoji } = require('../lib/emoji.js');
 
 run();
@@ -11,6 +13,8 @@ async function run() {
   try {
     await client.connect();
 
+
+
     const users = await Promise.all(
       usersData.map(user => {
         return client.query(`
@@ -21,16 +25,35 @@ async function run() {
         [user.email, user.hash]);
       })
     );
-
     const user = users[0].rows[0];
+
+    await Promise.all(
+      locations.map(location => {
+        return client.query(`
+                    INSERT INTO locations (location_name, location_type,location_image, location_description, event_id)
+                    VALUES ($1, $2, $3, $4, $5);
+                `,
+        [location.location_name, location.location_type, location.location_image, location.location_description, location.event_id]);
+      })
+    );
+
+    await Promise.all(
+      events.map(event => {
+        return client.query(`
+                    INSERT INTO events (planet_id, event_name, event_image, event_description, event_choices)
+                    VALUES ($1, $2, $3, $4, $5);
+                `,
+        [event.planet_id, event.event_name, event.event_image, event.event_description, event.event_choices]);
+      })
+    );
 
     await Promise.all(
-      animals.map(animal => {
+      shipChoices.map(ship => {
         return client.query(`
-                    INSERT INTO animals (name, cool_factor, owner_id)
-                    VALUES ($1, $2, $3);
+                    INSERT INTO shipchoices (ship_name, ship_fuel, ship_hull, base_combat, base_diplomacy, base_science, used_item_slots, max_item_slots)
+                    VALUES ($1, $2, $3, $4, $5, $6, $7, $8);
                 `,
-        [animal.name, animal.cool_factor, user.id]);
+        [ship.ship_name, ship.ship_fuel, ship.ship_hull, ship.base_combat, ship.base_diplomacy, ship.base_science, ship.used_item_slots, ship.max_item_slots]);
       })
     );
 

data/locations.js

@@ -0,0 +1,60 @@
+module.exports = [
+  {
+    location_name: 'Gilles C11Y',
+    location_type: 'Planet',
+    location_image: 'https://cdn.pixabay.com/photo/2018/08/08/20/23/planet-3593060_960_720.jpg',
+    location_description: 'Gilles C11Y is a desert of smooth rocks. Spires of sharp stone interrupt the otherwise flat terrain. There are groups of tall, dark orange stalks everywhere. There seems to be large burrows throughout the seemingly deserted planet.',
+    event_id: 1
+  },
+
+  {
+    location_name: 'Sulia V',
+    location_type: 'Planet',
+    location_image: 'https://cdn.pixabay.com/photo/2017/07/11/21/21/planet-2495089_960_720.jpg',
+    location_description: 'Dense forests of brown plants cover Sulia V. Large water-filled caves are present just beneath the surface. The geological record shows irregular periods where, for unknown reasons, all oxygen vanished from the atmosphere.',
+    event_id: 2
+  },
+  {
+    location_name: 'Ipelup VI',
+    location_type: 'Planet',
+    location_image: 'https://cdn.pixabay.com/photo/2020/05/04/14/55/sci-fi-5129504_960_720.jpg',
+    location_description: 'A planet-wide, deep ocean. The planet is home to extremely dangerous apex predators. The stone of the planetary crust is unusually dense and hard.',
+    event_id: 3
+  },
+
+  {
+    location_name: 'Selelup II',
+    location_type: 'Planet',
+    location_image: 'https://cdn.pixabay.com/photo/2018/08/12/00/48/planet-3599887_960_720.jpg',
+    location_description: 'Selelup II is a rocky desert type planet that is lit by a gentle sun. Spires of sharp stone interrupt the otherwise flat eterrain. There are signs of a once foreign colony, but now it seems abandoned. There is no water on this now deserted planet.',
+    event_id: 4
+  },
+  {
+    location_name: 'Laravim VI',
+    location_type: 'Planet',
+    location_image: 'https://cdn.pixabay.com/photo/2015/06/26/18/48/mercury-822825_960_720.png',
+    location_description: 'Laravim VI is an icy desert. Towering columns of hexagonal black stone. Some local plants hover in mid-air, held aloft by gas bags.',
+    event_id: 5
+  },
+  {
+    location_name: 'Xivon III',
+    location_type: 'Planet',
+    location_image: 'https://cdn.pixabay.com/photo/2016/04/13/06/40/mars-1326108_960_720.jpg',
+    location_description: 'Xivon III is covered in black mud and small rivulets. Deep canyons cut into the planets crust. The local plant life takes the shape of small blue bubbles.',
+    event_id: 6
+  },
+  {
+    location_name: 'Noxabas I',
+    location_type: 'Planet',
+    location_image: 'https://cdn.pixabay.com/photo/2017/11/16/09/32/planet-2953871_960_720.png',
+    location_description: 'Noxabas I is covered in grey mud and small rivulets. Noxious gases erupt from deep fissures. There are massive flowers in all kinds of colors, sitting atop thick dark green stems.',
+    event_id: 7
+  },
+  {
+    location_name: 'Yoraporr I',
+    location_type: 'Planet',
+    location_image: 'https://cdn.pixabay.com/photo/2018/02/12/21/03/planet-3149121_960_720.jpg',
+    location_description: 'Yoraporr I is covered in dense jungles of giant dark green geodesic domes cover Yoraporr I. The land is a maze of steep valleys.',
+    event_id: 8
+  },
+];   

data/shipchoices.js

@@ -0,0 +1,32 @@
+module.exports = [
+  {
+    ship_name: 'The Reach',
+    ship_fuel: 4,
+    ship_hull: 6,
+    base_combat: 1,
+    base_diplomacy: 3,
+    base_science: 2,
+    used_item_slots: 0,
+    max_item_slots: 3,
+  },
+  {
+    ship_name: 'The Avenger',
+    ship_fuel: 4,
+    ship_hull: 6,
+    base_combat: 3,
+    base_diplomacy: 2,
+    base_science: 1,
+    used_item_slots: 0,
+    max_item_slots: 3
+  },
+  {
+    ship_name: 'The Icarus',
+    ship_fuel: 4,
+    ship_hull: 6,
+    base_combat: 1,
+    base_diplomacy: 2,
+    base_science: 3,
+    used_item_slots: 0,
+    max_item_slots: 3
+  }
+];

data/users.js

@@ -1,6 +1,6 @@
 module.exports = [
   {
-    email: 'john@arbuckle.com',
-    hash: 1234
+    email: 'testemail@gmail.com',
+    hash: 1234,
   }
 ];

lib/app.js

@@ -1,18 +1,116 @@
+// I'm grading off the dev branch here. Is that right? Is dev the most updated code? The master branch didn't seem like it
 const express = require('express');
 const cors = require('cors');
 const client = require('./client.js');
 const app = express();
+const request = require('superagent');
 
 app.use(cors());
 app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
+const ensureAuth = require('./auth/ensure-auth');
+const createAuthRoutes = require('./auth/create-auth-routes');
 
-app.get('/animals', async(req, res) => {
-  const data = await client.query('SELECT * from animals');
+const authRoutes = createAuthRoutes({
+  selectUser(email) {
+    return client.query(`
+          SELECT id, email, hash
+          FROM users
+          WHERE email = $1;
+      `,
+    [email]
+    ).then(result => result.rows[0]);
+  },
+  insertUser(user, hash) {
+    return client.query(`
+          INSERT into users (email, hash)
+          VALUES ($1, $2)
+          RETURNING id, email;
+      `,
+    [user.email, hash]
+    ).then(result => result.rows[0]);
+  }
+});
+
+app.use('/auth', authRoutes);
+app.use('/api', ensureAuth);
+
+app.get('/color', async(req, res) => {
+  // nice work getting this endpoint together so quickly!
+  const data = await request.get('http://thecolorapi.com/scheme?hex=0047AB&rgb=0,71,171&hsl=215,100%,34%&cmyk=100,58,0,33&format=json&mode=analogic&count=6');
+
+  res.json(data.body);
+}); 
+app.get('/locations', async(req, res) => {
+  const data = await client.query('SELECT * from locations');
+
+  res.json(data.rows);
+});
+
+app.get('/events/:eventId', async(req, res) => {
+  const data = await client.query(`
+  select * from events where events.planet_id = $1
+  `, [req.params.eventId]);
+
+  res.json(data.rows);
+});
+
+app.get('/shipchoices', async(req, res) => {
+  const data = await client.query('SELECT * from shipchoices');
+
+  res.json(data.rows);
+});
+
+app.get('/usership/:id', async(req, res) => {
+  const data = await client.query(` 
+  SELECT shipchoices.id, shipchoices.ship_name, shipchoices.ship_fuel, shipchoices.ship_hull, shipchoices.base_combat, shipchoices.base_diplomacy, shipchoices.base_science, shipchoices.used_item_slots, shipchoices.max_item_slots
+  FROM shipchoices
+  WHERE shipchoices.id = $1
+`, [req.params.id]);
 
   res.json(data.rows);
 });
 
+app.get('/randomPlanet', async(req, res) => {
+  const data = await client.query(` 
+  SELECT locations.id, locations.location_name, locations.location_type, locations.location_image, locations.location_description, events
+  FROM locations
+  JOIN events 
+  on locations.event_id = events.planet_id
+`,);
+
+  res.json(data.rows);
+});
+
+
+app.post('/api/loggedinuser', async(req, res) => {
+  const data = await client.query(`
+  INSERT INTO loggedinuser (name, score, owner_id)
+  values ($1, $2, $3)
+  returning *
+  `, [req.body.name, req.body.score, req.userId]);
+  res.json(data.rows);
+});
+
+app.get('/api/loggedinuser', async(req, res) => {
+  const data = await client.query(`
+  SELECT * FROM loggedinuser
+  WHERE owner_id = $1
+  `, [req.userId]);
+  res.json(data.rows);
+});
+
+// seems like you could have managed this stuff with req.userId
+app.put('/api/loggedinuser', async(req, res) => {
+  const data = await client.query(`
+  UPDATE loggedinuser
+  SET score = score + 1
+  WHERE owner_id=$1
+  `, [req.userId]);
+  res.json(data.rows);
+});
+
+
 app.use(require('./middleware/error'));
 
 module.exports = app;

lib/auth/create-auth-routes.js

@@ -1,7 +1,7 @@
 const express = require('express');
 const bcrypt = require('bcryptjs');
 const jwt = require('./jwt');
-const client = require('../client').connect();
+const client = require('../client');
 const ensureAuth = require('./ensure-auth');
 
 function getProfileWithToken(user) {

server.js

@@ -1,3 +1,5 @@
+// Did you end up running postman tests and screenshots of your passing tests?
+
 require('dotenv').config();
 require('./lib/client').connect();