Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,158 changes: 747 additions & 411 deletions package-lock.json

Large diffs are not rendered by default.

20 changes: 19 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
"react-scripts": "*"
},
"dependencies": {
"body-parser": "^1.19.0",
"csvtojson": "^2.0.10",
"express": "^4.17.1",
"mongoose": "^5.6.9",
"node-fetch": "^2.6.0",
"nodemon": "^1.19.1",
"prop-types": "*",
"react": "*",
"react-dom": "*"
Expand All @@ -29,5 +35,17 @@
"last 1 firefox version",
"last 1 safari version"
]
}
},
"description": "Your company's front end team has completed a business dashboard requested by management. You need to build the data server that will provide the front end client with the data it needs to show.",
"main": "index.js",
"repository": {
"type": "git",
"url": "git+https://github.com/SelenaSolis/checkpoint-backend-1.git"
},
"author": "",
"license": "ISC",
"bugs": {
"url": "https://github.com/SelenaSolis/checkpoint-backend-1/issues"
},
"homepage": "https://github.com/SelenaSolis/checkpoint-backend-1#readme"
}
39 changes: 39 additions & 0 deletions server/controllers/dataController.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
const csv=require("csvtojson");
const csvFilePath = './server/data.csv'


exports.getDate = function(req, res){
res.send(new Date);
}
exports.getComments = function(req, res){
csv()
.fromFile(csvFilePath)
.then((jsonObj)=>{
comments = jsonObj[0].new_comments
res.send(comments)
})
}
exports.getTasks = function(req, res){
csv()
.fromFile(csvFilePath)
.then((jsonObj)=>{
tasks = jsonObj[0].new_tasks
res.send(tasks)
})
}
exports.getOrders = function(req, res){
csv()
.fromFile(csvFilePath)
.then((jsonObj)=>{
orders = jsonObj[0].new_orders
res.send(orders)
})
}
exports.getTickets = function(req, res){
csv()
.fromFile(csvFilePath)
.then((jsonObj)=>{
tickets = jsonObj[0].tickets
res.send(tickets)
})
}
7 changes: 7 additions & 0 deletions server/controllers/fox.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
const fetch = require('node-fetch');

exports.getFox = function getFox(req, res) {
fetch('https://randomfox.ca/floof/')
.then(res => res.json())
.then(data =>res.json(data.image))
}
23 changes: 23 additions & 0 deletions server/controllers/messages.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
let Message = require("../models/mesagesModel")

exports.list = function list(req, res) {
Message.find((err,m)=>{
return res.json(m);
});
}
// exports.show = function show(req, res) {
// Contact.findById(req.params.id, (err,c)=>{
// return res.json(c);
// });
// }
exports.create = function create(req, res) {
const newMessage = new Message({
id: req.body.id,
name: req.body.name,
date: req.body.date,
message: req.body.message
})
newMessage.save().then(savedMessage=>{
console.log(savedMessage)
})
}
23 changes: 23 additions & 0 deletions server/controllers/orders.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
let Order = require("../models/ordersModel")

exports.list = function list(req, res) {
Order.find((err,o)=>{
return res.json(o);
});
}
// exports.show = function show(req, res) {
// Contact.findById(req.params.id, (err,c)=>{
// return res.json(c);
// });
// }
exports.create = function create(req, res) {
const newOrder = new Order({
id: req.body.id,
orderDate: req.body.orderDate,
orderTime: req.body.orderTime,
amount: req.body.amount
})
newOrder.save().then(savedOrder=>{
console.log(savedOrder)
})
}
22 changes: 22 additions & 0 deletions server/controllers/tasks.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
let Task = require("../models/tasksModel")

exports.list = function list(req, res) {
Task.find((err,t)=>{
return res.json(t);
});
}
// exports.show = function show(req, res) {
// Contact.findById(req.params.id, (err,c)=>{
// return res.json(c);
// });
// }
exports.create = function create(req, res) {
const newTask = new Task({
id: req.body.id,
task: req.body.task,
date: req.body.date
})
newTask.save().then(savedTask=>{
console.log(savedTask)
})
}
30 changes: 30 additions & 0 deletions server/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
const express = require('express');
const bodyParser = require("body-parser");
let dataRoutes = require("./routes/dataRoutes")

var messageRoutes= require("./routes/messageRoutes")
var orderRoutes = require("./routes/orderRoutes")
var taskRoutes = require("./routes/taskRoutes")
var foxRoutes = require("./routes/foxRoutes")

const mongoose = require("mongoose");
mongoose.connect("mongodb+srv://selenasolis:Ss-419057@selena-practice-s1rzj.mongodb.net/checkpoint1", {useNewUrlParser: true});

const app = express();
app.use(bodyParser.json());
app.use(express.static("public"));
app.use(dataRoutes)
app.use("/tasks", taskRoutes)
app.use("/orders", orderRoutes)
app.use("/messages", messageRoutes)
app.use('/foxes', foxRoutes)



const thePort = 3001
app.listen(thePort, (err) => {
if (err) {
return console.log("Error", err);
}
console.log("Web server is now listening for messages on port",thePort);
});
15 changes: 15 additions & 0 deletions server/models/mesagesModel.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
const mongoose = require('mongoose');
const Schema = mongoose.Schema;


const messageSchema = new Schema ({
id: Number,
name: String,
date: String,
message: String
})


let Message = mongoose.model('Message', messageSchema);

module.exports = Message;
15 changes: 15 additions & 0 deletions server/models/ordersModel.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
const mongoose = require('mongoose');
const Schema = mongoose.Schema;


const orderSchema = new Schema ({
id: Number,
orderDate: String,
orderTime: String,
amount: String
})


let Order = mongoose.model('Order', orderSchema);

module.exports = Order;
14 changes: 14 additions & 0 deletions server/models/tasksModel.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
const mongoose = require('mongoose');
const Schema = mongoose.Schema;


const taskSchema = new Schema ({
id: Number,
task: String,
date: String
})


let Task = mongoose.model('Task', taskSchema);

module.exports = Task;
15 changes: 15 additions & 0 deletions server/routes/dataRoutes.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
const express = require("express");
const router = express.Router();
let {getDate, getComments, getTasks, getOrders, getTickets} = require('../controllers/dataController')

router.get('/dateTime', getDate)

router.get('/newComments', getComments)

router.get('/newTasks', getTasks)

router.get('/newOrders', getOrders)

router.get('/tickets', getTickets)

module.exports = router
7 changes: 7 additions & 0 deletions server/routes/foxRoutes.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
const express = require("express");
const router = express.Router();
let {getFox} = require('../controllers/fox.js')

router.get('/', getFox);

module.exports = router
9 changes: 9 additions & 0 deletions server/routes/messageRoutes.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const express = require("express");
const router = express.Router();
let {list, create} = require('../controllers/messages.js')

router.get('/', list)

router.post('/', create)

module.exports = router
9 changes: 9 additions & 0 deletions server/routes/orderRoutes.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const express = require("express");
const router = express.Router();
let {list, create} = require('../controllers/orders.js')

router.get('/', list)

router.post('/', create)

module.exports = router
9 changes: 9 additions & 0 deletions server/routes/taskRoutes.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const express = require("express");
const router = express.Router();
let {list, create} = require('../controllers/tasks.js')

router.get('/', list)

router.post('/', create)

module.exports = router