Updated Readme to include links to Backend and Frontend

README.md

@@ -1,11 +1,14 @@
 # Full Stack Application Pair Project
 
 ## Helpful Links
-*You and your partner should include links or images of the following resources in this section:*
 
-- Trello Board
-- Wireframes
-- ERDs
+_You and your partner should include links or images of the following resources in this section:_
+
+- [Trello Board](https://trello.com/b/7gD0SD4z/snack-a-log)
+- [Wireframes](https://wireframe.cc/O22dps)
+- [ERDs](https://miro.com/app/board/uXjVPe1UJRw=/?share_link_id=275986048292)
+- [Backend] (https://fierce-badlands-55970.herokuapp.com/snacks)
+- [Frontend(Broken)] (https://iridescent-ganache-912b37.netlify.app/)
 
 ## Snack-a-log
 
@@ -24,7 +27,7 @@ For this project there are 40 features or functionality to build. To pass this p
 ## Expecatations
 
 - Each partner should commit and push their work at least once per day (for days we have class)
-- You should edit the *Helpful Links* section of this readme to include links for your relevant project planning resources
+- You should edit the _Helpful Links_ section of this readme to include links for your relevant project planning resources
 
 ## Submitting Your Work
 

back-end/app.js

@@ -1,13 +1,19 @@
-// DEPENDENCIES
+const express = require('express');
+const cors = require('cors');
 
-const express = require("express");
+const snacksController = require('./controllers/snackController');
 
-// CONFIGURATION
 const app = express();
+app.use(cors());
+app.use(express.json());
 
-// MIDDLEWARE
+app.use('/snacks', snacksController);
 
-// ROUTES
+app.get('/', (request, response) => {
+  response.status(200).send("Get Snack'n at Snack-a-log!");
+});
+app.get('*', (request, response) => {
+  response.status(404).send('Oops, something went wrong getting your snacks!');
+});
 
-// EXPORT
 module.exports = app;

back-end/confirmHealth.js

@@ -1,3 +1,18 @@
-const confirmHealth = (snack) => {};
+const confirmHealth = (snack) => {
+  const { fiber, added_sugar, protein } = snack;
+  if (protein === null || added_sugar === null || fiber === null) {
+    return null;
+  }
+
+  if (added_sugar <= 5) {
+    if (protein >= 5 || fiber >= 5) {
+      return true;
+    } else {
+      return false;
+    }
+  } else {
+    return false;
+  }
+};
 
 module.exports = confirmHealth;

back-end/controllers/snackController.js

@@ -0,0 +1,88 @@
+const express = require('express');
+const {
+  getAllSnacks,
+  getSnack,
+  updateSnack,
+  createSnack,
+  deleteSnack,
+} = require('../queries/snacks');
+const snackController = express.Router();
+
+snackController.get('/', async (request, response) => {
+  const allSnacks = await getAllSnacks();
+  if (allSnacks[0]) {
+    response.status(200).json({
+      success: true,
+      payload: allSnacks,
+    });
+  } else {
+    response.status(500).json();
+  }
+});
+
+snackController.get('/:id', async (request, response) => {
+  const { id } = request.params;
+  const snack = await getSnack(id);
+  if (snack.id) {
+    response.status(200).json({
+      success: true,
+      payload: snack,
+    });
+  } else {
+    response.status(404).json({
+      success: false,
+      id: id,
+      payload: `not found: no snack is listed at id${id}`,
+    });
+  }
+});
+
+snackController.delete('/:id', async (request, response) => {
+  const { id } = request.params;
+  const deletedSnack = await deleteSnack(id);
+  if (deletedSnack) {
+    if (deletedSnack.id) {
+      response.status(200).json({
+        success: true,
+        payload: deletedSnack,
+      });
+    } else {
+      response.status(404).json({
+        success: false,
+        payload: deletedSnack,
+      });
+    }
+  } else {
+    response.status(500).json({
+      success: false,
+      payload: deletedSnack,
+    });
+  }
+});
+
+snackController.post('/', async (request, response) => {
+  try {
+    const snack = await createSnack(request.body);
+    response.json({
+      success: true,
+      payload: snack,
+    });
+  } catch (error) {
+    return error;
+  }
+});
+
+snackController.put('/:id', async (request, response) => {
+  try {
+    const { id } = request.params;
+    const snacks = await updateSnack(id, request.body);
+    response.json({
+      success: true,
+      payload: snacks,
+    });
+  } catch (error) {
+    return error;
+  }
+});
+
+module.exports = snackController;

back-end/db/dbConfig.js

@@ -1,6 +1,6 @@
 // http://vitaly-t.github.io/pg-promise/module-pg-promise.html
-const pgp = require("pg-promise")();
-require("dotenv").config();
+const pgp = require('pg-promise')();
+require('dotenv').config();
 
 const { DATABASE_URL, PG_HOST, PG_PORT, PG_DATABASE, PG_USER } = process.env;
 // https://github.com/vitaly-t/pg-promise/wiki/Connection-Syntax#configuration-object

back-end/db/prod_schema.sql

@@ -0,0 +1,6 @@
+\c  d4i3qdruuhh30p; 
+
+DROP TABLE IF EXISTS snacks;
+
+CREATE TABLE snacks (id SERIAL PRIMARY KEY, name TEXT NOT NULL, fiber INT, 
+protein INT, added_sugar INT, is_healthy BOOLEAN, image TEXT );

back-end/db/prod_seed.sql

@@ -0,0 +1,9 @@
+\c  d4i3qdruuhh30p; 
+
+INSERT INTO snacks (name, fiber, protein, added_sugar, is_healthy, image) VALUES
+('Strawberries', 20, 10, 0, true, 'https://picsum.photos/id/1080/300/300'),
+('Raspberries', 16, 4, 0, true, 'https://picsum.photos/id/102/300/300'),
+('Honey Covered Granola',  30, 12, 22, false, 'https://picsum.photos/id/312/300/300'),
+('New Wave Nuts', 11, 55, 9, true, 'https://picsum.photos/id/139/300/300'),
+('Raw Onions & Turnips', 11, 9, 9, true, 'https://picsum.photos/id/292/300/300'),
+('Healthy Birthday Cake Square', 4, 8, 19, false, 'https://content.nutrisystem.com/images/products/alc/large/BirthdayCakeSquare_L.jpg');

back-end/db/schema.sql

@@ -1,6 +1,11 @@
+
 DROP DATABASE IF EXISTS snack_a_log;
-CREATE DATABASE snack_a_log; 
 
-\c snack_a_log; 
+CREATE DATABASE snack_a_log;
+
+\c snack_a_log;
 
+DROP TABLE IF EXISTS snacks;
 
+CREATE TABLE snacks (id SERIAL PRIMARY KEY, name TEXT NOT NULL, fiber INT, 
+protein INT, added_sugar INT, is_healthy BOOLEAN, image TEXT ); 

back-end/db/seed.sql

@@ -1,12 +1,9 @@
-\c snack_a_log; 
+\c snack_a_log;
 
 INSERT INTO snacks (name, fiber, protein, added_sugar, is_healthy, image) VALUES
 ('Strawberries', 20, 10, 0, true, 'https://picsum.photos/id/1080/300/300'),
 ('Raspberries', 16, 4, 0, true, 'https://picsum.photos/id/102/300/300'),
 ('Honey Covered Granola',  30, 12, 22, false, 'https://picsum.photos/id/312/300/300'),
 ('New Wave Nuts', 11, 55, 9, true, 'https://picsum.photos/id/139/300/300'),
 ('Raw Onions & Turnips', 11, 9, 9, true, 'https://picsum.photos/id/292/300/300'),
-('Healthy Birthday Cake Square', 4, 8, 19, false, 'https://content.nutrisystem.com/images/products/alc/large/BirthdayCakeSquare_L.jpg');
-
--- use advanced image search to choose images that are square (aspect ratio)
--- https://www.google.com/advanced_image_search
+('Healthy Birthday Cake Square', 4, 8, 19, false, 'https://content.nutrisystem.com/images/products/alc/large/BirthdayCakeSquare_L.jpg');

back-end/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "bookmarks",
+  "name": "snack-a-log",
   "version": "1.0.0",
   "description": "",
   "main": "server.js",

back-end/queries/snacks.js

@@ -1,3 +1,79 @@
-const db = require("../db/dbConfig.js");
+const db = require('../db/dbConfig.js');
+const nameFormatter = require('../validation/valid');
 
-module.exports = {};
+//GET all
+const getAllSnacks = async () => {
+  try {
+    const allSnacks = await db.any('SELECT * FROM snacks');
+    return allSnacks;
+  } catch (error) {
+    return error;
+  }
+};
+
+//GET /:id
+const getSnack = async (id) => {
+  try {
+    const snack = await db.one('SELECT * FROM snacks WHERE id=$1', id);
+    return snack;
+  } catch (error) {
+    return error;
+  }
+};
+
+//CREATE
+const createSnack = async (snack) => {
+  try {
+    let { name, fiber, protein, added_sugar, is_healthy, image } = snack;
+    name = nameFormatter(name);
+    if (!image) {
+      image = `https://dummyimage.com/400x400/6e6c6e/e9e9f5.png&text=No+Image`;
+    }
+    if (isNaN(fiber)) {
+      fiber = 0;
+    }
+    if (isNaN(protein)) {
+      protein = 0;
+    }
+    if (isNaN(added_sugar)) {
+      added_sugar = 0;
+    }
+    return await db.one(
+      'INSERT INTO snacks (name, fiber, protein, added_sugar, is_healthy, image) VALUES($1, $2, $3, $4, $5, $6) RETURNING *',
+      [name, fiber, protein, added_sugar, is_healthy, image],
+    );
+  } catch (error) {
+    return error;
+  }
+};
+
+//DELETE
+const deleteSnack = async (id) => {
+  try {
+    return await db.one('DELETE FROM snacks WHERE id=$1 RETURNING *', id);
+  } catch (error) {
+    return error;
+  }
+};
+
+//UPDATE
+const updateSnack = async (
+  id,
+  { name, fiber, protein, added_sugar, is_healthy, image },
+) => {
+  try {
+    return await db.one(
+      'UPDATE snacks SET name=$1, fiber=$2, protein=$3, added_sugar=$4, is_healthy=$5, image=$6 WHERE id=$7 RETURNING *',
+      [name, fiber, protein, added_sugar, is_healthy, image, id],
+    );
+  } catch (error) {
+    return error;
+  }
+};
+module.exports = {
+  getAllSnacks,
+  getSnack,
+  createSnack,
+  deleteSnack,
+  updateSnack,
+};

back-end/server.js

@@ -1,12 +1,15 @@
 // DEPENDENCIES
-const app = require("./app.js");
 
+const app = require('./app.js');
+const express = require('express');
+const cors = require('cors');
 // CONFIGURATION
-require("dotenv").config();
+require('dotenv').config();
 
-const PORT = process.env.PORT;
+const PORT = process.env.PORT || 3333;
 
 // LISTEN
+app.use(cors());
 app.listen(PORT, () => {
   console.log(`🥤 🍿 Snackin' on port ${PORT} 🥨 🌰 `);
 });

back-end/validation/valid.js

@@ -0,0 +1,22 @@
+const nameFormatter = (name) => {
+  name = name.split(' ');
+  for (let i = 0; i < name.length; i++) {
+    if (name[i].length > 2) {
+      name[i] = capitalizeWord(name[i]);
+    }
+  }
+  name = name.join(' ');
+  return name;
+};
+
+const capitalizeWord = (word) => {
+  word = word.split('');
+  word[0] = word[0].toUpperCase();
+  for (let i = 1; i < word.length; i++) {
+    word[i] = word[i].toLowerCase();
+  }
+  word = word.join('');
+  return word;
+};
+
+module.exports = nameFormatter;