Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jason Hemann #506

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
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
116 changes: 115 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,115 @@
.DS_Store
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage
*.lcov

# nyc test coverage
.nyc_output

# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# Snowpack dependency directory (https://snowpack.dev/)
web_modules/

# TypeScript cache
*.tsbuildinfo

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env
.env.test

# parcel-bundler cache (https://parceljs.org/)
.cache
.parcel-cache

# Next.js build output
.next

# Nuxt.js build / generate output
.nuxt
dist

# Gatsby files
.cache/
# Comment in the public line in if your project uses Gatsby and not Next.js
# https://nextjs.org/blog/next-9-1#public-directory-support
# public

# vuepress build output
.vuepress/dist

# Serverless directories
.serverless/

# FuseBox cache
.fusebox/

# DynamoDB Local files
.dynamodb/

# TernJS port file
.tern-port

# Stores VSCode versions used for testing VSCode extensions
.vscode-test

# yarn v2

.yarn/cache
.yarn/unplugged
.yarn/build-state.yml
.pnp.*
41 changes: 41 additions & 0 deletions API/server.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
const express = require("express");
const helmet = require("helmet");
const cors = require("cors");

const authRouter = require("../users/auth-router.js");
const categoriesRouter = require("../categories/categories-router.js");
const notesRouter = require("../notes/notes-router.js");
const usersRouter = require("../users/users-router.js");
const restricted = require("../middleware/restricted-middleware.js");

const server = express();

server.use(helmet());
server.use(express.json());
server.use(cors());

server.use("/api/auth", authRouter);
server.use("/api/users", restricted, usersRouter);
server.use("/api/categories", categoriesRouter);
server.use("/api/notes", notesRouter);

server.get("/", (req, res) => {
res.status(200).json({ api: "up" });
});

module.exports = server;

//Optional: if database has role, below is checkRole middleware, it could be added to userRouter after restricted
function checkRole(role) {
return (req, res, next) => {
if (
req.decodedToken &&
req.decodedToken.role &&
req.decodedToken.role.toLowerCase() === admin
) {
next();
} else {
res.status(403).json({ you: "Shall not pass!" });
}
};
}
31 changes: 31 additions & 0 deletions API/server.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
const request = require("supertest");

const server = require("./server.js");

describe("server.js", function() {
describe("GET /", function() {
it("should return 200 OK", function() {
return request(server) //return makes it async
.get("/")
.then(res => {
expect(res.status).toBe(200);
});
});

it("should return JSON", function() {
return request(server)
.get("/")
.then(res => {
expect(res.type).toMatch(/json/i);
});
});

it('should respond with {api: "up"}', function() {
return request(server)
.get("/")
.then(res => {
expect(res.body.api).toBe("up");
});
});
});
});
60 changes: 60 additions & 0 deletions categories/categories-model.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
const db = require('../data/dbConfig.js');

module.exports = {
find,
findBy,
findByID,
add,
update,
remove,
findFlashcardsByCategoryID
}

function find(){
return db('categories');
}

function findBy(filter) {
return db("categories").where(filter);
}

function findByID(id){
return db('categories')
.where({ id })
.first();
}

function add(category){
return db("categories")
.insert(category, "id")
.then(ids => {
const [id] = ids;
return findByID(id);
});
}

function update(id, changes){
return db('categories')
.where({ id })
.update(changes)
.then(() =>{
return findByID(id)
});
}

function remove(id){
return db("categories")
.where("id", id)
.del()
.then(() =>{
return id
});
}

// get all flashcards with the same category ID
function findFlashcardsByCategoryID(id){
return db("flashcards")
.select("flashcards.id", "categories.name", "flashcards.frontCard", "flashcards.backCard")
.join("categories", "flashcards.category_id", "categories.id")
.where("category_id", id);
}
63 changes: 63 additions & 0 deletions categories/categories-router.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
const express = require('express');
const db = require('./categories-model');
const router = express.Router();

// GET a list of categories
router.get('/', (req, res) => {
db
.find()
.then((categories) => res.status(200).json(categories))
.catch((error) => res.status(500).json({ message: 'Could not get categories from server.' }));
});

// GET a category by ID
router.get('/:id', (req, res) => {
db
.findByID(req.params.id)
.then((category) => res.status(200).json(category))
.catch((error) =>
res.status(500).json({ message: 'Could not get category #' + req.params.id + ' from server.' })
);
});

// GET flashcards in a category by ID
router.get('/:id/flashcards', (req, res) => {
db
.findFlashcardsByCategoryID(req.params.id)
.then((category) => res.status(200).json(category))
.catch((error) =>
res.status(500).json({ message: 'Could not get category #' + req.params.id + ' from server.' })
);
});

// POST a category to the database
router.post('/', (req, res) => {
db
.findBy({ name: req.body.name })
.then((foundCategory) => {
if (foundCategory.length === 0) {
db
.add(req.body)
.then((newCategory) => res.status(201).json(newCategory))
.catch((err) => res.status(500).json(err, 'hit this'));
} else {
res.status(400).json({
message: `The Category Name: ${req.body.name}, is already taken.`
});
}
})
.catch((err) => res.status(500).json(err));
});

router.put('/:id', (req, res) => {
db
.update(req.params.id, req.body)
.then((updatedCategory) => res.status(200).json(updatedCategory))
.catch((err) => res.status(500).json(err));
});

router.delete('/:id', (req, res) => {
db.remove(req.params.id).then((id) => res.status(200).json(id)).catch((err) => res.status(500).json(err));
});

module.exports = router;
3 changes: 3 additions & 0 deletions config/secrets.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
jwtSecret: process.env.JWT_SECRET || "the secret message is stay safe",
};
Binary file added data/database.db3
Binary file not shown.
6 changes: 6 additions & 0 deletions data/dbConfig.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
const knex = require("knex");
const config = require("../knexfile.js");

const environment = process.env.DB_ENV || "development";

module.exports = knex(config[environment]);
Loading