Skip to content

Commit 72b99a9

Browse files
author
gwenf
committed
code from livestream faraday-academy#8 as well as color variables in Sass and removed mock data from front-end
1 parent 4c2cbc0 commit 72b99a9

14 files changed

+272
-51
lines changed

curriculum-back/db/Curriculum.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const mongoose = require('mongoose')
2-
var timestamps = require('mongoose-timestamp')
32

43
const CurriculumSchema = new mongoose.Schema({
54
name: {
@@ -20,9 +19,8 @@ const CurriculumSchema = new mongoose.Schema({
2019
resources: [String],
2120
projects: [String]
2221
}]
23-
})
22+
}, { timestamps: true })
2423

25-
CurriculumSchema.plugin(timestamps);
2624
const Curriculum = mongoose.model('Curriculum', CurriculumSchema)
2725

2826
module.exports = Curriculum

curriculum-back/package-lock.json

+149
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

curriculum-back/package.json

+2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
"author": "Gwendolyn Faraday <[email protected]> (https://gwenfaraday.com/)",
1111
"license": "MIT",
1212
"dependencies": {
13+
"cors": "2.8.5",
1314
"express": "4.17.1",
15+
"helmet": "3.21.2",
1416
"module-alias": "2.2.2",
1517
"mongoose": "5.8.3",
1618
"mongoose-timestamp": "0.6.0",

curriculum-back/server/api/curricula.js

+9-6
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,17 @@ router.route('/')
2323
})
2424

2525
router.route('/:id')
26-
.get(function (req, res) {
27-
res.send(req.params)
26+
.get(async function (req, res) {
27+
const curriculum = await Curriculum.findById(req.params.id)
28+
res.send(curriculum)
2829
})
29-
.patch(function (req, res) {
30-
res.send('Got a POST request')
30+
.patch(async function (req, res) {
31+
await Curriculum.updateOne({ _id: req.params.id }, { ...req.body })
32+
res.send('Success')
3133
})
32-
.delete(function (req, res) {
33-
res.send('Got a DELETE request')
34+
.delete(async function (req, res) {
35+
await Curriculum.deleteOne({ _id: req.params.id })
36+
res.send('Success')
3437
})
3538

3639
module.exports = router

curriculum-back/server/index.js

+4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
const express = require('express')
2+
const helmet = require('helmet')
3+
var cors = require('cors')
24

35
const routes = require('./api')
46
require('../db')
@@ -8,6 +10,8 @@ const port = 5000
810

911
// middleware
1012
app.use(express.json())
13+
app.use(helmet())
14+
app.use(cors())
1115

1216
app.use('/api/v1', routes)
1317

curriculum-front/package-lock.json

+37
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

curriculum-front/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"test:e2e": "vue-cli-service test:e2e"
1111
},
1212
"dependencies": {
13+
"axios": "0.19.0",
1314
"core-js": "^2.6.5",
1415
"register-service-worker": "^1.6.2",
1516
"vue": "^2.6.10",

curriculum-front/src/data/curricula.js

-10
This file was deleted.

0 commit comments

Comments
 (0)