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

almost done #15

Open
wants to merge 1 commit 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
18 changes: 18 additions & 0 deletions app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
const express = require('express');
const Sequelize = require('sequelize');
const bodyParser = require('body-parser');
const models = require('./models');
const app = express();

app.set('view engine', 'ejs');
app.use(bodyParser.urlencoded({ extended: false }))
app.use(bodyParser.json())
app.locals.helper = require('./helper/')

const menu = require('./routes/menu.js');
const restaurant = require('./routes/restaurant.js')

app.use('/menus', menu);
app.use('/restaurants', restaurant);

app.listen(3000, console.log('AYE AYE CAPTAIN!'))
23 changes: 23 additions & 0 deletions config/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"development": {
"username": "devdots",
"password": "Semau6ue",
"database": "platinum_livecode4",
"host": "127.0.0.1",
"dialect": "postgres"
},
"test": {
"username": "root",
"password": null,
"database": "database_test",
"host": "127.0.0.1",
"dialect": "mysql"
},
"production": {
"username": "root",
"password": null,
"database": "database_production",
"host": "127.0.0.1",
"dialect": "mysql"
}
}
6 changes: 6 additions & 0 deletions helper/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
function ubahAgka(angka) {
angka = angka.toLocaleString()
return `Rp. ${angka}`
}

module.exports = {ubahAgka}
30 changes: 30 additions & 0 deletions migrations/20180301021445-create-restaurant.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
'use strict';
module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.createTable('Restaurants', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER
},
name: {
type: Sequelize.STRING
},
address: {
type: Sequelize.STRING
},
createdAt: {
allowNull: false,
type: Sequelize.DATE
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE
}
});
},
down: (queryInterface, Sequelize) => {
return queryInterface.dropTable('Restaurants');
}
};
39 changes: 39 additions & 0 deletions migrations/20180301021649-create-menu.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
'use strict';
module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.createTable('Menus', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER
},
name: {
type: Sequelize.STRING
},
menu_type: {
type: Sequelize.STRING
},
rating: {
type: Sequelize.INTEGER
},
price: {
type: Sequelize.INTEGER
},
id_restaurant: {
type: Sequelize.INTEGER
},
createdAt: {
allowNull: false,
type: Sequelize.DATE
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE
}
});
},
down: (queryInterface, Sequelize) => {
return queryInterface.dropTable('Menus');
}
};
36 changes: 36 additions & 0 deletions models/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
'use strict';

var fs = require('fs');
var path = require('path');
var Sequelize = require('sequelize');
var basename = path.basename(__filename);
var env = process.env.NODE_ENV || 'development';
var config = require(__dirname + '/../config/config.json')[env];
var db = {};

if (config.use_env_variable) {
var sequelize = new Sequelize(process.env[config.use_env_variable], config);
} else {
var sequelize = new Sequelize(config.database, config.username, config.password, config);
}

fs
.readdirSync(__dirname)
.filter(file => {
return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js');
})
.forEach(file => {
var model = sequelize['import'](path.join(__dirname, file));
db[model.name] = model;
});

Object.keys(db).forEach(modelName => {
if (db[modelName].associate) {
db[modelName].associate(db);
}
});

db.sequelize = sequelize;
db.Sequelize = Sequelize;

module.exports = db;
45 changes: 45 additions & 0 deletions models/menu.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
'use strict';
module.exports = (sequelize, DataTypes) => {
var Menu = sequelize.define('Menu', {
name: DataTypes.STRING,
menu_type: {
type: DataTypes.STRING,
validate: {
is: {
args: /(food|drink)/,
msg: 'Isi menu type dengan food / drink'
}
}
},
rating: DataTypes.INTEGER,
price: DataTypes.INTEGER,
id_restaurant: DataTypes.INTEGER
}, {
hooks: {
beforeCreate: (menu, options) => {
if (menu.menu_type == 'food' && menu.price == 0) {
menu.price = 15000
}
else if (menu.menu_type == 'drink' && menu.price == 0) {
menu.price = 10000
}
},
beforeUpdate: (instance, options) => {
if (instance.menu_type == 'food' && instance.price === '0') {
instance.price = 15000
}
else if (instance.menu_type == 'drink' && instance.price === '0') {
instance.price = 10000
}
}
}

});
Menu.associate = function(models) {
// associations can be defined here
Menu.belongsTo(models.Restaurant, {
foreignKey: 'id_restaurant'
})
};
return Menu;
};
14 changes: 14 additions & 0 deletions models/restaurant.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
'use strict';
module.exports = (sequelize, DataTypes) => {
var Restaurant = sequelize.define('Restaurant', {
name: DataTypes.STRING,
address: DataTypes.STRING
}, {});
Restaurant.associate = function(models) {
// associations can be defined here
Restaurant.hasMany(models.Menu, {
foreignKey: 'id_restaurant'
})
};
return Restaurant;
};
12 changes: 10 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "express-sequelize-final",
"version": "1.0.0",
"description": "",
"description": "## Challenge 1",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
Expand All @@ -14,5 +14,13 @@
"express": "^4.16.2",
"pg": "^7.4.1",
"sequelize": "^4.34.1"
}
},
"repository": {
"type": "git",
"url": "git+https://github.com/platinum-fox-2017/livecode4.git"
},
"bugs": {
"url": "https://github.com/platinum-fox-2017/livecode4/issues"
},
"homepage": "https://github.com/platinum-fox-2017/livecode4#readme"
}
78 changes: 78 additions & 0 deletions routes/menu.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
const express = require('express');
const router = express.Router()
const models = require('../models')

router.get('/', function (req, res) {
models.Menu.findAll({
order: ['id'],
include:[{
model: models.Restaurant
}]
}).then(data => {
models.Restaurant.findAll().then(data1 => {
let test = JSON.parse(JSON.stringify(data))
console.log(test);
res.render('menu', {data_menu: data, data_rest: data1})
})
})
})

router.post('/add', function (req, res) {
let obj = {
name: req.body.name,
menu_type: req.body.menu_type,
rating: req.body.rating,
price: req.body.price,
id_restaurant: req.body.id_restaurant
}
// console.log(obj);
models.Menu.create(obj).then(data => {
res.redirect('/menus')
})
})

router.get('/edit/:id', function (req, res) {
// console.log(typeof req.params.id);
let numMenu = +req.params.id
models.Menu.findById(numMenu).then(data => {
models.Restaurant.findAll().then(data1 => {
let test = JSON.parse(JSON.stringify(data))

console.log(test);
res.render('edit-menu', {data_menu: data, data_rest: data1})
})
})
})

router.post('/edit/:id', function (req, res) {
let obj = {
name: req.body.name,
menu_type: req.body.menu_type,
rating: req.body.rating,
price: req.body.price,
id_restaurant: req.body.id_restaurant
}
models.Menu.update(obj, {
where: {
id: req.params.id
}
}).then(data => {
res.redirect('/menus')
})
})

router.get('/delete/:id', function (req, res) {
models.Menu.destroy({
where: {
id: req.params.id
}
}).then(data => {
res.redirect('/menus')
})
})





module.exports = router
32 changes: 32 additions & 0 deletions routes/restaurant.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
const express = require('express');
const router = express.Router()
const models = require('../models')

router.get('/', function (req, res) {
models.Restaurant.findAll({
include: {
model: models.Menu
}
}).then(data => {
let test = JSON.parse(JSON.stringify(data))
console.log(test);
res.render('restaurant', {data_rest: data})
})
})

router.get('/:id/view_menu', function (req, res) {
models.Restaurant.findById(req.params.id,{
include: {
model: models.Menu
}
}).then(data => {
let test = JSON.parse(JSON.stringify(data))
console.log(test);
console.log(Object.keys(test.Menus[0]));
res.render('menu-restaurant', {data_rest: data})
})
})



module.exports = router
40 changes: 40 additions & 0 deletions seeders/20180301021804-add-restaurant.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
'use strict';

module.exports = {
up: (queryInterface, Sequelize) => {
/*
Add altering commands here.
Return a promise to correctly handle asynchronicity.

Example:
*/
return queryInterface.bulkInsert('Restaurants', [
{
name: 'Hanamasa',
address: 'suatu jalan di jakarta',
createdAt: new Date(),
updatedAt: new Date()
},{
name: 'KFC',
address: 'suatu jalan di bogor',
createdAt: new Date(),
updatedAt: new Date()
},{
name: 'MCD',
address: 'suatu jalan di bandung',
createdAt: new Date(),
updatedAt: new Date()
}
], {});
},

down: (queryInterface, Sequelize) => {
/*
Add reverting commands here.
Return a promise to correctly handle asynchronicity.

Example:
*/
return queryInterface.bulkDelete('Restaurants', null, {});
}
};
Loading