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

Egor Dyuzhev #264

Open
wants to merge 1 commit into
base: main
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
12 changes: 2 additions & 10 deletions config/config.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
{
"development": {
"username":"sequelize",
"password": "sequelize",
"database": "project_organizer_development",
"host": "127.0.0.1",
"dialect": "postgres"
},
"test": {
"database": "project_organizer_test",
"host": "127.0.0.1",
"dialect": "postgres"
},
"production": {
"database": "project_organizer_production",
"host": "127.0.0.1",
"dialect": "postgres"
}
}
152 changes: 133 additions & 19 deletions controllers/projects.js
Original file line number Diff line number Diff line change
@@ -1,40 +1,154 @@
let express = require('express')
let db = require('../models')
const category = require('../models/category')
let router = express.Router()
const methodOverride = require('method-override');




// set up method override middleware
router.use(methodOverride('_method'));

// DELETE /projects/:id - delete a project
router.delete('/:id', async (req, res) => {
try {
const deletedProject = await db.project.destroy({
where: { id: req.params.id }
})

if (!deletedProject) throw Error()

res.redirect('/')
} catch (error) {
res.status(400).render('main/404')
}
})

// DELETE /categories/:id - delete a category
router.delete('/categories/:id', async (req, res) => {
try {
const deletedCategory = await db.category.destroy({
where: { id: req.params.id }
})

if (!deletedCategory) throw Error()

res.redirect('/projects/categories')
} catch (error) {
res.status(400).render('main/404')
}
})

// 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) => {
// POST /projects - create a new 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 [createdCategory] = await db.category.findOrCreate({
where: { name: req.body.category },
})

await createdProject.addCategory(createdCategory)

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

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

// GET /projects/:id - display a specific project
router.get('/:id', (req, res) => {
db.project.findOne({
where: { id: req.params.id }
})
.then((project) => {

router.get('/category/:id', async (req, res) => {
try {
console.log("/categiries/ID:"+req.params.id);

const category = await db.category.findOne({
where: { id: req.params.id },
include: db.project
})

if (!category) {
// return res.status(404).render('main/404')
return;
}

res.render('projects/category', { category })
} catch (error) {
console.log(`Error in GET /category/${req.params.id}`, error)
res.status(400).render('main/404')
}
})

router.get('/categories', async (req, res) => {
console.log("/categories");
try {
const categories = await db.category.findAll()
res.render('projects/categories', { categories })
} catch (error) {
console.log('Error in GET /categories', error)
res.status(400).render('main/404')
}
})

// GET /projects/new - display form for creating a new project
router.get('/:id', async (req, res) => {
console.log("/:id");
try {
const project = await db.project.findOne({
where: { id: req.params.id },
include: [{ model: db.category }] // include the category associated with this project
})

if (!project) throw Error()
res.render('projects/show', { project: project })

res.render('projects/show', { project })
} catch (error) {
res.status(400).render('main/404')
}
})


router.post('/:id/category', async (req, res) => {
try {
const project = await db.project.findOne({
where: { id: req.params.id }
})

if (!project) throw Error()

const [category, created] = await db.category.findOrCreate({
where: { name: req.body.category },
})

await project.addCategory(category)

res.redirect(`/projects/${req.params.id}`)
} catch (error) {
res.status(400).render('main/404')
}
})
/*
router.get('/categories/:id', (req, res) => {
console.log("/categoriwa/:id");
db.category.findAll()
.then((projects) => {
res.render('projects/categories', { categories: categories })
})
.catch((error) => {
console.log('Error in GET /', error)
res.status(400).render('main/404')
})
})
*/

module.exports = router
Empty file added dbTest.js
Empty file.
3 changes: 3 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ app.get('*', (req, res) => {
res.render('main/404')
})



app.listen(PORT, function() {
rowdy.print()
console.log(`listening on port: ${PORT}`)
})

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/20230405223451-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;
};
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
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,13 @@
"ejs": "^2.4.2",
"express": "^4.16.4",
"express-ejs-layouts": "^2.1.0",
"method-override": "^3.0.0",
"morgan": "^1.7.0",
"pg": "^8.5.1",
"rowdy-logger": "0.0.2",
"sequelize": "^6.3.5"
}
},
"description": "To practice N:M associations, we'll be adding the ability to categorize projects in an existing project organizer.",
"keywords": [],
"author": ""
}
5 changes: 5 additions & 0 deletions scratch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
sequelize model:create --name category --attributes name:string



sequelize model:create --name categoriesProjects --attributes categoryId:integer,projectId:interger
5 changes: 5 additions & 0 deletions views/main/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,10 @@
<h2>
<a href="/projects/<%= project.id %>"><%= project.name %></a>
</h2>
<form action="/projects/<%= project.id %>?_method=DELETE" method="POST">
<button type="submit" class="btn btn-danger">Delete</button>
</form>
</div>
<% }); %>


3 changes: 3 additions & 0 deletions views/partials/navbar.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
<ul class="nav navbar-nav">
<li><a href="/projects/new">New Project</a></li>
</ul>
<ul class="nav navbar-nav">
<li><a href="/projects/categories">Categories</a></li>
</ul>
</div><!-- /.navbar-collapse -->
</div>
</nav>
10 changes: 10 additions & 0 deletions views/projects/categories.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<% categories.forEach(function(category) { %>
<div class="well">
<h2>
<a href="category/<%= category.id %>"><%= category.name %></a>
</h2>
<form action="/projects/categories/<%= category.id %>?_method=DELETE" method="POST">
<button type="submit" class="btn btn-danger">Delete</button>
</form>
</div>
<% }); %>
12 changes: 12 additions & 0 deletions views/projects/category.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@


<h1><%= category.name %></h1>
<h2>Projects with this tag:</h2>
<ul>
<% category.projects.forEach(function(project) { %>
<li>
<h2><a href="/projects/<%= project.id %>"><%= project.name %></a></h2>

</li>
<% }); %>
</ul>
Loading