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

Fransiskus teddy #3

Open
wants to merge 3 commits 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/
16 changes: 16 additions & 0 deletions app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
"use strict"
const express = require('express')
const app = express()
const bodyParser = require('body-parser')
const routes = require('./routes/index.js')

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

app.use('/', routes)

app.listen(3000, ()=>{
console.log('Start listening on PORT 3000');
})
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": "werkbau",
"password": "pokemon",
"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"
}
}
13 changes: 13 additions & 0 deletions controller/ControllerC.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
'use strict'
const db = require('../models/index.js')
const express = require('express')

class ControllerA {

static homepage(req, res){

}

}

module.exports = ControllerA;
137 changes: 137 additions & 0 deletions controller/MenuController.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
'use strict'
const db = require('../models/index.js')
const express = require('express')

class MenuController {

static homepage(req, res){
db.Menu.findAll({
include: [
{model: db.Restaurant}
]
}).then(foundMenus => {
// res.send(foundMenus)
db.Restaurant.findAll({
}).then(foundRestaurants => {
res.render('./menu/menu.ejs', {
title: 'menu',
header: 'menus',
foundMenus:foundMenus,
foundRestaurants:foundRestaurants,
err: null
})
})

})
}

static menuAddPagePost(req,res){
// console.log(req.body);
db.Menu.create({
name: req.body.name,
menu_type: req.body.menu_type,
rating: parseInt(req.body.rating),
price: parseInt(req.body.price),
RestaurantId: req.body.RestaurantId,
createdAt: new Date(),
updatedAt: new Date()
}).then(newMenu => {
res.redirect('/menus')
}).catch(err=>{
db.Menu.findAll({
include: [
{model: db.Restaurant}
]
}).then(foundMenus => {
// res.send(foundMenu)
db.Restaurant.findAll({
}).then(foundRestaurants => {
res.render('./menu/menu.ejs', {
title: 'menu',
header: 'menus',
foundMenus:foundMenus,
foundRestaurants:foundRestaurants,
err: err
})
})
})
})
}

static menuEditPage(req,res){
let menuID = req.params.id
db.Menu.findById(menuID).then(foundMenu => {
// res.send('supplier edit')
db.Restaurant.findAll({
}).then(foundRestaurants => {
res.render('./menu/menuEditForm.ejs', {
title:'Editing Menu Data',
header:'Editing Menu',
menuID: menuID,
foundMenu: foundMenu,
foundRestaurants:foundRestaurants,
err: null
})
})

})
}
static menuEditPagePost(req,res){
let menuID = req.params.id
db.Menu.update(
{
name: req.body.name,
menu_type: req.body.menu_type,
rating: parseInt(req.body.rating),
price: parseInt(req.body.price),
RestaurantId: req.body.RestaurantId,
updatedAt: new Date()
},
{
where:{
id:req.params.id
}
}
).then(updatedMenu=>{
// res.send('supplier edit')
res.redirect('/menus')
}).catch(err=>{
db.Restaurant.findAll({
}).then(foundRestaurants => {
res.render('./menu/menuEditForm.ejs', {
title:'Editing Menu Data',
header:'Editing Menu',
menuID : menuID,
foundMenu: {
name: req.body.name,
menu_type: req.body.menu_type,
rating: parseInt(req.body.rating),
price: parseInt(req.body.price),
RestaurantId: req.body.RestaurantId,
},
foundRestaurants:foundRestaurants,
err: err
})
})

})
}

static menuDeletePage(req,res){
db.Menu.destroy(
{
where: {
id:req.params.id
},
individualHooks: true
}
).then(()=>{
res.redirect('/menus')
}).catch(err=>{
console.log('---delete---'+err);
})
}

}

module.exports = MenuController;
91 changes: 91 additions & 0 deletions controller/RestaurantController.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
'use strict'
const db = require('../models/index.js')
const express = require('express')
const Sequelize = require('sequelize');
const Op = Sequelize.Op;
const operatorsAliases = {
$eq: Op.eq,
$or: Op.or,
}

class RestaurantController {

static homepage(req, res){
db.Restaurant.findAll({

}).then(foundRestaurants => {
// res.send(foundMenus)
res.render('./restaurant/restaurant.ejs', {
title: 'menu',
header: 'menus',
foundRestaurants:foundRestaurants,
err: null
})
})
// res.send('')
}


static viewMenu(req, res){
// res.send(req.params.id)
let restaurantId = req.params.id;
db.Restaurant.findAll({
where : {
id: restaurantId
},
include : [
{
model: db.Menu
}
]
}).then(foundRestaurants => {
// res.send(foundRestaurants[0].Menus)
let restaurantMenus = foundRestaurants[0].Menus;
res.render('./restaurant/restaurantViewMenu.ejs', {
title: 'menu',
header: 'menus',
restaurantId: restaurantId,
restaurantMenus: restaurantMenus,
err: null
})
})
}

static search(req, res){
let restaurantId = req.params.id;

// res.send(req.body)
let key = req.body.SearchKey
let keyword = req.body.keyword



db.Restaurant.findAll({
where : {
id: restaurantId,
[key]: { [Op.like]: `%${keyword}$`}
},
include : [
{
model: db.Menu
}
]
}).then(foundRestaurants => {
let restaurantMenus = []
if (foundRestaurants.length > 1) {
restaurantMenus = foundRestaurants[0].Menus;
}

res.render('./restaurant/restaurantViewMenu.ejs', {
title: 'menu',
header: 'menus',
restaurantId: restaurantId,
restaurantMenus: restaurantMenus,
err: null
})
})
}

}

module.exports = RestaurantController;
23 changes: 23 additions & 0 deletions controller/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
"use strict"
const MenuController = require('./MenuController.js')
const RestaurantController = require('./RestaurantController.js')
// const ControllerC = require('./ControllerC.js')

class Controller {

static home(req, res){
// res.send('homepage')
res.render('home.ejs', {
title: 'Homepage',
header: 'Welcome livecode 4'
})
}

}

module.exports = {
Controller: Controller,
MenuController: MenuController,
RestaurantController: RestaurantController
// ControllerC:ControllerC
};
30 changes: 30 additions & 0 deletions migrations/20180301020819-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');
}
};
36 changes: 36 additions & 0 deletions migrations/20180301020952-create-menu.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
'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
},
createdAt: {
allowNull: false,
type: Sequelize.DATE
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE
}
});
},
down: (queryInterface, Sequelize) => {
return queryInterface.dropTable('Menus');
}
};
Loading