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


//GET /categories -- show all categories that exist
router.get('/', async (req,res) => {
try{
const allCategories = await db.category.findAll({attributes: ['name']})
res.render('categories/index', {allCategories: allCategories})

}catch(err){
console.log(err)
}
})

//router.get/:id -- show a specific project
router.get('/:id', async (req,res) => {
try{
const oneCategory = await db.category.findOne({
where: {id: req.params.id}
})
await oneCategory.count(db.project)
res.send(count)

}catch(err){
console.log(err)
}

})

module.exports = router

35 changes: 24 additions & 11 deletions controllers/projects.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,27 @@ 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 {
console.log(req.body)
const newProject = await db.project.create({
name: req.body.name,
githubLink: req.body.githubLink,
deployLink: req.body.deployedLink,
description: req.body.description
})

const [newCategory] = await db.category.findOrCreate({
where: {name: req.body.category}
})
await newProject.addCategory(newCategory)

res.redirect('/')
})
.catch((error) => {
}catch(err){
console.log(err)
res.status(400).render('main/404')
})
}
})

// GET /projects/new - display form for creating a new project
Expand All @@ -37,4 +45,9 @@ router.get('/:id', (req, res) => {
})
})




//GET /categories/:id -- show a specific category and all the projects with that category

module.exports = router
37 changes: 37 additions & 0 deletions dbTest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// 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/20230405222707-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/20230405223456-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');
}
};
25 changes: 25 additions & 0 deletions models/categoriesprojects.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
'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
15 changes: 15 additions & 0 deletions scratchpad.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
TODO 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


Step One:

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


Step :

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


<% allCategories.forEach(function(category) { %>
<div class="well">
<h2>
<a href="/categories/<%= category.id %>"><%= category.name %></a>
</h2>
</div>
<% }); %>
Empty file added views/categories/show.ejs
Empty file.
9 changes: 7 additions & 2 deletions 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>