adding picture display with cloudfront and working on ios take photo and post flow

api/bin/aws.js

@@ -30,7 +30,7 @@ class AWSUtil {
             console.log('Error', err)
         }
 
-        return `https://tattletires.s3.us-east-2.amazonaws.com/${params.Key}`
+        return `${params.Key}`
     }
 
     async deleteFile(Location) {

api/bin/www.js

@@ -4,99 +4,87 @@
  * Module dependencies.
  */
 
+import debugLib from 'debug'
+import dotenv from 'dotenv'
+import http from 'http'
+import mongoose from 'mongoose'
+import app from '../app.js'
+const debug = debugLib('api:server')
+dotenv.config({ path: '.env' })
 
-import debugLib from 'debug';
-import dotenv from 'dotenv';
-import http from 'http';
-import mongoose from 'mongoose';
-import app from '../app.js';
-const debug = debugLib('api:server');
-dotenv.config({path: '.env'});
-
-mongoose
-  .connect(process.env.DB_CONNECTION).then(() => console.log('DB connection successful!'));
+mongoose.connect(process.env.DB_CONNECTION).then(() => console.log('DB connection successful!'))
 
 /**
  * Get port from environment and store in Express.
  */
 
-
-const port = normalizePort(process.env.PORT || '3000');
-app.set('port', port);
+const port = normalizePort(process.env.PORT || '3000')
+app.set('port', port)
 
 /**
  * Create HTTP server.
  */
 
-
-const server = http.createServer(app);
+const server = http.createServer(app)
 
 /**
  * Listen on provided port, on all network interfaces.
  */
 
-
-server.listen(port);
-server.on('error', onError);
-server.on('listening', onListening);
+server.listen(port)
+server.on('error', onError)
+server.on('listening', onListening)
 
 /**
  * Normalize a port into a number, string, or false.
  */
 
-
 function normalizePort(val) {
-  const port = parseInt(val, 10);
+    const port = parseInt(val, 10)
 
-  if (isNaN(port)) {
-    // named pipe
-    return val;
-  }
+    if (isNaN(port)) {
+        // named pipe
+        return val
+    }
 
-  if (port >= 0) {
-    // port number
-    return port;
-  }
+    if (port >= 0) {
+        // port number
+        return port
+    }
 
-  return false;
+    return false
 }
 
 /**
  * Event listener for HTTP server "error" event.
  */
 
-
 function onError(error) {
-  if (error.syscall !== 'listen') {
-    throw error;
-  }
+    if (error.syscall !== 'listen') {
+        throw error
+    }
 
-  const bind = typeof port === 'string'
-    ? 'Pipe ' + port
-    : 'Port ' + port;
+    const bind = typeof port === 'string' ? 'Pipe ' + port : 'Port ' + port
 
-  // handle specific listen errors with friendly messages
-  switch (error.code) {
-    case 'EACCES':
-      console.error(bind + ' requires elevated privileges');
-      process.exit(1);
-    case 'EADDRINUSE':
-      console.error(bind + ' is already in use');
-      process.exit(1);
-    default:
-      throw error;
-  }
+    // handle specific listen errors with friendly messages
+    switch (error.code) {
+        case 'EACCES':
+            console.error(bind + ' requires elevated privileges')
+            process.exit(1)
+        case 'EADDRINUSE':
+            console.error(bind + ' is already in use')
+            process.exit(1)
+        default:
+            throw error
+    }
 }
 
 /**
  * Event listener for HTTP server "listening" event.
  */
 
-
 function onListening() {
-  const addr = server.address();
-  const bind = typeof addr === 'string'
-    ? 'pipe ' + addr
-    : 'port ' + addr.port;
-  debug('Listening on ' + bind);
+    const addr = server.address()
+    const bind = typeof addr === 'string' ? 'pipe ' + addr : 'port ' + addr.port
+    debug('Listening on ' + bind)
 }

api/controllers/postsController.js

@@ -3,6 +3,21 @@ import Post from '../models/postModel.js'
 
 export const getAllPosts = async (req, res, next) => {
     const allPosts = await Post.find({}).exec()
+    allPosts.map((el) => {
+        el.photo = process.env.CLOUDFRONT_URL + el.photo
+    })
+    res.status(200).json({
+        status: 'success',
+        data: allPosts
+    })
+}
+
+export const getAllPostsByStatus = async (req, res, next) => {
+    console.log(req.params.status)
+    const allPosts = await Post.find({ status: req.params.status }).exec()
+    allPosts.map((el) => {
+        el.photo = process.env.CLOUDFRONT_URL + el.photo
+    })
     res.status(200).json({
         status: 'success',
         data: allPosts
@@ -35,13 +50,14 @@ export const createPost = async (req, res, next) => {
     const aws = new AWSUtil()
 
     // Grab base64 photo from the req body
-    const location = await aws.uploadFile(req.body.photo)
-
+    const fileName = await aws.uploadFile(req.body.photo)
     const payload = {
         ...req.body,
-        photo: location
+        photo: fileName
     }
 
+    console.log(payload)
+
     Post.create(payload).then((result) => {
         res.status(200).json({
             status: 'success',

api/models/postModel.js

@@ -1,5 +1,4 @@
-
-import mongoose from 'mongoose';
+import mongoose from 'mongoose'
 
 const postSchema = new mongoose.Schema({
     userID: {
@@ -7,22 +6,25 @@ const postSchema = new mongoose.Schema({
         required: true
     },
     date: {
-        type: Date,
+        type: Date
     },
     photo: {
         type: String,
         required: true
     },
     notes: {
-        type: String,
+        type: String
+    },
+    address: {
+        type: String
     },
     status: {
         type: String,
-        enum: ['created', 'pending', 'denied', 'approved'],
+        enum: ['created', 'denied', 'approved'],
         default: 'created'
     }
-});
+})
 
-const Post = mongoose.model('Post', postSchema);
+const Post = mongoose.model('Post', postSchema)
 
-export default Post;
+export default Post

api/routes/posts.js

@@ -1,20 +1,21 @@
-import express from 'express';
-import { createPost, deletePost, getAllPosts, getAllPostsByUser, getPost, updatePost } from './../controllers/postsController.js';
-const router = express.Router();
+import express from 'express'
+import {
+    createPost,
+    deletePost,
+    getAllPosts,
+    getAllPostsByStatus,
+    getAllPostsByUser,
+    getPost,
+    updatePost
+} from './../controllers/postsController.js'
+const router = express.Router()
 
-router
-  .route('/')
-  .get(getAllPosts)
-  .post(createPost);
+router.route('/').get(getAllPosts).post(createPost)
 
-router
-    .route('/:id')
-    .get(getPost)
-    .patch(updatePost)
-    .delete(deletePost);
+router.route('/:id').get(getPost).patch(updatePost).delete(deletePost)
 
-router
-    .route('/:user')
-    .get(getAllPostsByUser)
+router.route('/user/:user').get(getAllPostsByUser)
 
-export default router;
+router.route('/status/:status').get(getAllPostsByStatus)
+
+export default router