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
23 changes: 23 additions & 0 deletions controllers/categories.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
let express = require('express')
let db = require('../models')
let router = express.Router()

// GET /categories - show all the categories that exist
router.get('', (req, res) => {
db.category.findAll({
include: [db.project]
})
.then((categories) => {
if (!categories) throw Error()
res.render('categories/show', { categories: categories })
console.log('worked')
})
.catch((error) => {
console.log(error)
res.status(400).render('main/404')
})
})



module.exports = router
62 changes: 43 additions & 19 deletions controllers/projects.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,63 @@ let express = require('express')
let db = require('../models')
let router = express.Router()

// POST /projects - create a new project
router.post('/', (req, res) => {
db.project.create({
name: req.body.name,
githubLink: req.body.githubLink,
deployLink: req.body.deployedLink,
description: req.body.description
})
.then((project) => {
res.redirect('/')
})
.catch((error) => {
res.status(400).render('main/404')
})
})

// GET /projects/new - display form for creating a new project
// GET /projects/new - display form for creating a new project with a category field
router.get('/new', (req, res) => {
res.render('projects/new')
})

// GET /projects/:id - display a specific project
router.get('/:id', (req, res) => {
router.get('/', (req, res) => {
db.project.findOne({
where: { id: req.params.id }
where: { id: req.params.id },
include: [db.category]
})
.then((project) => {
if (!project) throw Error()
res.render('projects/show', { project: project })
})
.catch((error) => {
console.log(error)
res.status(400).render('main/404')
})
})

// POST /projects - create a new project with a category
router.post('/', async (req, res) => {
try {
// no db implied. I have category the variable and I need to use it in line 33
const [category] = await db.category.findOrCreate({
where: { name: req.body.category }
})
await category.createProject({
name: req.body.name,
githubLink: req.body.githubLink,
deployLink: req.body.deployedLink,
description: req.body.description,
})
res.redirect('../')
} catch (error) {
res.status(400).render('main/404')
console.log(error)
}
})

// router.post('/', async (req, res) => {
// try {
// const [category] = await db.category.findOrCreate({
// where: { name: req.body.category }
// })
// const project = await db.project.create({
// name: req.body.name,
// githubLink: req.body.githubLink,
// deployLink: req.body.deployedLink,
// description: req.body.description,
// })
// await project.addCategory(category)
// res.redirect('/')
// } catch (error) {
// res.status(400).render('main/404')
// }
// })
module.exports = router

25 changes: 25 additions & 0 deletions dbTest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
const db = require('./models')

// db.project.findOne({
// where: { id: 1 },
// include: [db.category]
// })
// .then(project => {
// // by using eager loading, the project model should have a categories key
// console.log(project.categories)

// // createCategory function should be available to this model - it will create the category then add it to the project
// project.createCategory({ name: 'express' })
// .then(category => {
// console.log(category.id)
// })
// })

db.category.findOne({
where: { id: 1 },
include: [db.project]
})
.then(category => {
console.log(category.Projects)
})

1 change: 1 addition & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ app.get('/', (req, res) => {
})

app.use('/projects', require('./controllers/projects'))
app.use('/categories', require('./controllers/categories'))

app.get('*', (req, res) => {
res.render('main/404')
Expand Down
28 changes: 28 additions & 0 deletions migrations/20230405223139-create-category.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
'use strict';
/** @type {import('sequelize-cli').Migration} */
module.exports = {
async up(queryInterface, Sequelize) {
await queryInterface.createTable('categories', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER
},
name: {
type: Sequelize.STRING
},
createdAt: {
allowNull: false,
type: Sequelize.DATE
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE
}
});
},
async down(queryInterface, Sequelize) {
await queryInterface.dropTable('categories');
}
};
31 changes: 31 additions & 0 deletions migrations/20230405224445-create-categories-projects.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
'use strict';
/** @type {import('sequelize-cli').Migration} */
module.exports = {
async up(queryInterface, Sequelize) {
await queryInterface.createTable('categoriesProjects', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER
},
categoryId: {
type: Sequelize.INTEGER
},
projectId: {
type: Sequelize.INTEGER
},
createdAt: {
allowNull: false,
type: Sequelize.DATE
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE
}
});
},
async down(queryInterface, Sequelize) {
await queryInterface.dropTable('categoriesProjects');
}
};
24 changes: 24 additions & 0 deletions models/categoriesprojects.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
'use strict';
const {
Model
} = require('sequelize');
module.exports = (sequelize, DataTypes) => {
class categoriesProjects extends Model {
/**
* Helper method for defining associations.
* This method is not a part of Sequelize lifecycle.
* The `models/index` file will call this method automatically.
*/
static associate(models) {
// define association here
}
}
categoriesProjects.init({
categoryId: DataTypes.INTEGER,
projectId: DataTypes.INTEGER
}, {
sequelize,
modelName: 'categoriesProjects',
});
return categoriesProjects;
};
24 changes: 24 additions & 0 deletions models/category.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
'use strict';
const {
Model
} = require('sequelize');
module.exports = (sequelize, DataTypes) => {
class category extends Model {
/**
* Helper method for defining associations.
* This method is not a part of Sequelize lifecycle.
* The `models/index` file will call this method automatically.
*/
static associate(models) {
// define association here
models.category.belongsToMany(models.project, { through: 'categoriesProjects' })
}
}
category.init({
name: DataTypes.STRING
}, {
sequelize,
modelName: 'category',
});
return category;
};
1 change: 1 addition & 0 deletions models/project.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ module.exports = (sequelize, DataTypes) => {
*/
static associate(models) {
// define association here
models.project.belongsToMany(models.category, { through: 'categoriesProjects' })
}
}
project.init({
Expand Down
13 changes: 13 additions & 0 deletions scratchpad.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
sequelize model:create --name category --attributes name:string

sequelize model:create --name categoriesProjects --attributes categoryId:integer,projectId:integer


db.category.findOne({
where: { id: categoryId },
include: [db.project]
})
.then(db.category => {
console.log(category.Projects)
})

31 changes: 31 additions & 0 deletions views/categories/new.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<h1>Create a new project</h1>

<form action="/projects" method="POST">
<div class="form-group">
<label for="name">Name</label>
<input type="text" class="form-control" id="name" name="name" required>
</div>

<div class="form-group">
<label for="githubLink">Github Link</label>
<input type="text" class="form-control" id="githubLink" name="githubLink" required>
</div>

<div class="form-group">
<label for="deployedLink">Deployed Link</label>
<input type="text" class="form-control" id="deployedLink" name="deployedLink" required>
</div>

<div class="form-group">
<label for="description">Description</label>
<textarea type="text" class="form-control" id="description" name="description" required></textarea>
</div>

<div class="form-group">
<label for="category">Category</label>
<textarea type="text" class="form-control" id="category" name="category" required></textarea>
</div>

<input type="submit" class="btn btn-primary">
</form>

10 changes: 10 additions & 0 deletions views/categories/show.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@


<% for(var i=0; i<categories.length; i++) {%>

<p><%= categories[i].name %></p>

<% } %>


<a href="/">&larr; Back Home</a>
6 changes: 6 additions & 0 deletions views/projects/new.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,11 @@
<textarea type="text" class="form-control" id="description" name="description" required></textarea>
</div>

<div class="form-group">
<label for="category">Category</label>
<textarea type="text" class="form-control" id="category" name="category" required></textarea>
</div>

<input type="submit" class="btn btn-primary">
</form>