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
354 changes: 228 additions & 126 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
"react-scripts": "*"
},
"dependencies": {
"body-parser": "^1.19.0",
"express": "^4.17.1",
"mongodb": "^3.3.0-beta2",
"mongoose": "^5.6.9",
"node-fetch": "^2.6.0",
"prop-types": "*",
"react": "*",
"react-dom": "*"
Expand Down
20 changes: 20 additions & 0 deletions server/controllers/comments.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
let Comments = require("../models/commentModel")

exports.list = function list(req, res) {
Comments.find((e,comment)=>{
return res.json(comment);
});
}
exports.show = function show(req, res) {
Comments.findById(req.params.id, (err,comment)=>{
return res.json(comment);
});
}
exports.create = function create(req, res) {
let newComments = new Comments ({
body: req.body
})
newComments.save(()=>{
return res.json(newComments);
});
}
22 changes: 22 additions & 0 deletions server/controllers/messages.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
let Message = require("../models/messageModel")

exports.list = function list(req, res) {
Message.find((e,message)=>{
return res.json(message);
});
}
exports.show = function show(req, res) {
Message.findById(req.params.id, (err,message)=>{
return res.json(message);
});
}
exports.create = function create(req, res) {
let newMessage = new Message ({
name: req.body.name,
message: req.body.message,
date: req.body.date
})
newMessage.save(()=>{
return res.json(newMessage);
});
}
22 changes: 22 additions & 0 deletions server/controllers/orders.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
let order = require("../models/orderModel")

exports.list = function list(req, res) {
order.find((e,order)=>{
return res.json(order);
});
}
exports.show = function show(req, res) {
order.findById(req.params.id, (err,order)=>{
return res.json(order);
});
}
exports.create = function create(req, res) {
let newOrder = new order ({
orderDate: req.body.orderDate,
orderTime: req.body.orderTime,
amount: req.body.amount,
})
newOrder.save(()=>{
return res.json(newOrder);
});
}
21 changes: 21 additions & 0 deletions server/controllers/tasks.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
let Task = require("../models/taskModel")

exports.list = function list(req, res) {
Task.find((e,task)=>{
return res.json(task);
});
}
exports.show = function show(req, res) {
Task.findById(req.params.id, (err,task)=>{
return res.json(task);
});
}
exports.create = function create(req, res) {
let newTask = new Task ({
task: req.body.task,
date: req.body.date,
})
newTask.save(()=>{
return res.json(newTask);
});
}
38 changes: 38 additions & 0 deletions server/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
let express = require("express");
let taskRoute = require("./routes/newTasks");
let orderRoute = require("./routes/newOrders");
let messageRoute = require("./routes/messages");
let commentRoute = require("./routes/newComments");
let data = require("./routes/data");
const foxRoute = require('./routes/foxes');


const bodyParser = require("body-parser");
const mongoose = require('mongoose');
const app = express();

app.use(bodyParser.json());
app.use(express.static("public"));
app.use(taskRoute);
app.use(orderRoute);
app.use(messageRoute);
app.use(commentRoute);
app.use(data);
app.use(foxRoute);


mongoose.connect('mongodb+srv://daniela-idara:iigyCLqGdCQOYwKA@cluster0-2gqfc.mongodb.net/checkpoint?retryWrites=true&w=majority', {useNewUrlParser: true});

let db = mongoose.connection;
db.on('error', console.error.bind(console, 'connection error:'));
db.once('open', function() {
console.log("Database Success!");
});

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);
});
8 changes: 8 additions & 0 deletions server/models/commentModel.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
const mongoose = require("mongoose");

var commentSchema = new mongoose.Schema({
comment: String
});
var Comment = mongoose.model('Comment', commentSchema);

module.exports = Comment
12 changes: 12 additions & 0 deletions server/models/messageModel.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
const mongoose = require("mongoose");

var messageSchema = new mongoose.Schema({
name: String,
date: String,
message: String,
});
var Message = mongoose.model('message', messageSchema);

module.exports = Message


10 changes: 10 additions & 0 deletions server/models/orderModel.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
const mongoose = require("mongoose");

var orderSchema = new mongoose.Schema({
orderDate: String,
orderTime: String,
amount: String
});
var Order = mongoose.model('Order', orderSchema);

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

var taskSchema = new mongoose.Schema({
task: String,
date: String
});
var Task = mongoose.model('Task', taskSchema);

module.exports = Task
40 changes: 40 additions & 0 deletions server/routes/data.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@

const express = require("express");
const router = express.Router();
const fs = require(`fs`);

let data = ("server/data.csv");
let info = [];

fs.readFile(data, "utf8", function (err,data) {
if (err) {
return console.log(err);
}
data = data.split("\n");
data = data[1].split(",");
info.push(data);
});

router.get('/dateTime', (req, res) => {
let today = new Date;
let currentTime = `${today.getHours()} : ${today.getMinutes()}`
res.send(currentTime);
});

router.get("/newComments", (req, res) => {
res.send(info[0][0])
})

router.get('/newTasks', (req, res) => {
res.send(info[0][1]);
});

router.get('/newOrders', (req, res) => {
res.send(info[0][2]);
});

router.get('/tickets', (req, res) => {
res.send(info[0][3]);
});

module.exports = router;
Empty file added server/routes/dateTime.js
Empty file.
16 changes: 16 additions & 0 deletions server/routes/foxes.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
const fetch = require('node-fetch');
const express = require('express');
const router = express.Router();

let fox;

fetch('https://randomfox.ca/floof/')
.then(res => res.json())
.then(data => fox = data)
.catch(err => console.log(`Error: ${err}`))

router.get('/foxes', (req, res) => {
res.json(fox.image);
});

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

// MESSAGES
router.get('/messages',list)
router.get('/messages/:id', show)
router.post('/messages', create)

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

// newComments
router.get('/comments',list)
router.get('/comments/:id', show)
router.post('/comments', create)

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

// MESSAGES
router.get('/orders',list)
router.get('/orders/:id', show)
router.post('/orders', create)

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

// TASKS
router.get('/tasks',list)
router.post('/tasks', create)

router.get('/taskItem',list)
router.get('/taskItem/:id', show)
router.post('/taskItem', create)

module.exports = router;