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

router.get('/', (req,res) => {
db.category.findAll()
.then((categories) => {
res.render('categories/index', {categories: categories})
})
})

router.get('/:id', (req,res) => {
try{
db.category.findByPk(req.params.id, {
include: [{
model: db.project,
}]
})
.then((projects) => {
console.log(projects)
res.render('categories/show', {
projects: projects.projects
})
})
} catch(error) {
console.log(error)
}
})
module.exports = router
28 changes: 16 additions & 12 deletions controllers/projects.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,23 @@ 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) => {
router.post('/', async (req, res) => {
try{ const createdProject = await db.project.create({
name: req.body.name,
githubLink: req.body.githubLink,
deployLink: req.body.deployedLink,
description: req.body.description,
})
const [createCategory] = await (db.category.findOrCreate({
where: {
name: req.body.category
}}))
await createdProject.addCategory(createCategory.dataValues.id)
// await console.log(createCategory.dataValues)
res.redirect('/')
})
.catch((error) => {
res.status(400).render('main/404')
})
} catch(error) {
console.log(error)
}
})

// GET /projects/new - display form for creating a new project
Expand Down
38 changes: 38 additions & 0 deletions dbTest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// const db = require('./models')

// db.category.create({
// name: 'node'
// })
// .then(category => {
// console.log(category.id)
// })
// .catch(console.log)

// async function createCategory() {
// try {
// const newCategory = await db.category.create({ name: 'python' })
// console.log(newCategory)
// } catch (err) {
// console.log(err)
// }
// }

// createCategory()


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)
})
})
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/20230405222641-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/20230405223435-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;
};
26 changes: 26 additions & 0 deletions models/category.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
'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;
};
3 changes: 3 additions & 0 deletions models/project.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ module.exports = (sequelize, DataTypes) => {
*/
static associate(models) {
// define association here
models.project.belongsToMany(models.category, {
through: 'categoriesProjects'
})
}
}
project.init({
Expand Down
16 changes: 16 additions & 0 deletions scratch-pad.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
User Stories
As a user, I want to categorize projects using different names. For example, all of my Node projects will be under the category "Node".
As a user, I want to assign multiple categories to a single project.
As a user, I want to view a list of categories I've assigned.
As a user, I want to view projects associated with a category I've selected.


Requirements

Part 1: Create a Category model
In order to add categories, create a Sequelize model to store categories. It's recommended that you name this model category. It will store one attribute: the name of the category (a string).


sequelize model:create --name category --attributes name:string

sequelize model:create --name categoriesProjects --attributes categoryId:integer,projectId:integer
11 changes: 11 additions & 0 deletions views/categories/index.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<h1>Categories</h1>

<h2>Categories</h2>

<% categories.forEach(function(category) { %>
<div class="well">
<h2>
<a href="/categories/<%= category.id %>"><%= category.name %></a>
</h2>
</div>
<% }); %>
10 changes: 10 additions & 0 deletions views/categories/show.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<h1>Categories</h1>


<% projects.forEach(function(project) { %>
<div class="well">
<h2>
<a href="/projects/<%= project.id %>"><%= project.name %></a>
</h2>
</div>
<% }) %>
1 change: 1 addition & 0 deletions views/partials/navbar.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<div class="collapse navbar-collapse navbar-ex1-collapse">
<ul class="nav navbar-nav">
<li><a href="/projects/new">New Project</a></li>
<li><a href="/categories">All Categories</a></li>
</ul>
</div><!-- /.navbar-collapse -->
</div>
Expand Down
7 changes: 6 additions & 1 deletion views/projects/new.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,16 @@
<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>
<input type="text" class="form-control" id="category" name="category" required>
</div>

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