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
436 changes: 268 additions & 168 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions 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",
"dotenv": "^8.0.0",
"express": "^4.17.1",
"mongoose": "^5.6.9",
"node-fetch": "^2.6.0",
"prop-types": "*",
"react": "*",
"react-dom": "*"
Expand Down
18 changes: 18 additions & 0 deletions server/controllers/messages.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
let Message = require('../models/messages');

exports.list = function list(req, res) {
Message.find((err, mes) => {
err ? res.send(`Error: ${err}`) : res.json(mes);
})
}

exports.create = function create(req, res) {
const newMessage = new Message({
name: req.body.name,
date: req.body.date,
message: req.body.message
})
newMessage.save((err, mes) => {
err ? res.send(`Error: ${err}`) : res.json(mes);
})
}
18 changes: 18 additions & 0 deletions server/controllers/orders.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
let Order = require('../models/orders');

exports.list = function list(req, res) {
Order.find((err, ord) => {
err ? res.send(`Error: ${err}`) : res.json(ord);
})
}

exports.create = function create(req, res) {
const newOrder = new Order({
orderDate: req.body.orderDate,
orderTime: req.body.orderTime,
amount: req.body.amount
})
newOrder.save((err, ord) => {
err ? res.send(`Error: ${err}`) : res.json(ord);
})
}
17 changes: 17 additions & 0 deletions server/controllers/tasks.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
let Task = require('../models/tasks');

exports.list = function list(req, res) {
Task.find((err, task) => {
err ? res.send(`Error: ${err}`) : res.json(task);
})
}

exports.create = function create(req, res) {
const newTask = new Task({
task: req.body.task,
date: req.body.date
})
newTask.save((err, task) => {
err ? res.send(`Error: ${err}`) : res.json(task);
})
}
34 changes: 34 additions & 0 deletions server/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
const express = require('express');
const bodyParser = require('body-parser');
const mongoose = require('mongoose');
const dotenv = require('dotenv').config();

const messageRoutes = require('./routes/messages');
const orderRoutes = require('./routes/orders');
const tasksRoutes = require('./routes/tasks');
const dataRoutes = require('./routes/data')
const foxesRoutes = require('./routes/foxes');

mongoose.connect(`mongodb+srv://${process.env.DB_USER}:${process.env.DB_PASSWORD}@aca-practice-bx4sb.mongodb.net/test?retryWrites=true&w=majority`, {useNewUrlParser: true});


const db = mongoose.connection;
db.on('error', console.error.bind(console, 'connection error:'));
db.once('open', function() {
console.log(`We're connected`);
});

const app = express();
const port = 8080;

app.use(bodyParser.json());
app.use(express.static('public'));
app.use(messageRoutes);
app.use(orderRoutes);
app.use(tasksRoutes);
app.use(dataRoutes);
app.use(foxesRoutes);

app.get('/', (req, res) => res.send(`It's working`))

app.listen(port, () => console.log(`App listening on port ${port}`));
12 changes: 12 additions & 0 deletions server/models/messages.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
const mongoose = require('mongoose');
const Schema = mongoose.Schema;

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

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

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

let ordersSchema = new Schema ({
orderDate: String,
orderTime: String,
amount: String
})

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

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

const tasksSchema = new Schema ({
task: String,
date: String
})

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

module.exports = Task;
35 changes: 35 additions & 0 deletions server/routes/data.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
const express = require('express');
const router = express.Router();
const csv = require('csvtojson');

let data = [];

csv()
.fromFile('./server/data.csv')
.then((jsonObj)=>{
data = jsonObj[0];
});

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(data.new_comments);
});

router.get('/newTasks', (req, res) => {
res.send(data.new_tasks);
});

router.get('/newOrders', (req, res) => {
res.send(data.new_orders);
});

router.get('/tickets', (req, res) => {
res.send(data.tickets);
});

module.exports = router;
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;
8 changes: 8 additions & 0 deletions server/routes/messages.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
const express = require('express');
const router = express.Router();
const {list, create} = require('../controllers/messages');

router.get('/messages', list);
router.post('/messages', create);

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

router.get('/orders', list);
router.post('/orders', create);

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

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

module.exports = router;