Skip to content

Ft enpoints jwt secured 163843584 #42

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

Open
wants to merge 30 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
923f332
[ chore #164230236 ] setup sequelize server
Mar 4, 2019
ab4eedb
[ feature #163843146 ] authenticate user accounts
Mar 7, 2019
c5cf07a
[ feature #163843591 ] store resources in database
Mar 7, 2019
ef3e26b
[ feature #163843584 ] secure endpoints with jwt
Mar 7, 2019
93fa7de
[ feature #163843584 ] secure endpoints with jwt
Mar 7, 2019
e53b2f7
Install sequelize-cli locally
Mar 7, 2019
c9f8312
Update Package.json sequelize script
codeBlock-1984 Mar 8, 2019
af0bf9f
Update package.json
codeBlock-1984 Mar 8, 2019
9679768
Update .travis.yml
codeBlock-1984 Mar 8, 2019
86d33fe
Update .travis.yml
codeBlock-1984 Mar 8, 2019
5c46e9a
Update .travis.yml
codeBlock-1984 Mar 8, 2019
02df492
Update .travis.yml
codeBlock-1984 Mar 8, 2019
198ca58
Update package.json
Mar 8, 2019
aeaed15
Merge branch 'ft-enpoints-jwt-secured-163843584' of https://github.co…
Mar 8, 2019
ab2de0c
Update auth.js
Mar 8, 2019
28c4849
Update .travis.yml
codeBlock-1984 Mar 9, 2019
022e155
Update .travis.yml
codeBlock-1984 Mar 10, 2019
675560c
Update .travis.yml
codeBlock-1984 Mar 10, 2019
7c46939
Update .travis.yml
codeBlock-1984 Mar 10, 2019
6947950
Update .travis.yml
codeBlock-1984 Mar 10, 2019
e7fa950
Update package.json
codeBlock-1984 Mar 10, 2019
eaf8330
Update package.json
codeBlock-1984 Mar 10, 2019
9de9113
Update package.json
codeBlock-1984 Mar 10, 2019
dcbfe33
Update .travis.yml
codeBlock-1984 Mar 10, 2019
4ed6d89
Update package.json
codeBlock-1984 Mar 10, 2019
e0f3a6e
Update package.json
codeBlock-1984 Mar 10, 2019
66aad3f
Update mealsTest.js
Mar 10, 2019
4fa7fe5
update tokens in test
Mar 10, 2019
d2f725f
Update travis.yml
Mar 10, 2019
481ffa8
Update .travis.yml
Mar 10, 2019
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: 10 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
{
"presets": ["@babel/preset-env"]
}
"presets": [
[
"@babel/preset-env", {
"targets": {
"node": "current"
}
}
]
]
}
4 changes: 3 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ module.exports = {
rules:{
"linebreak-style":0,
"quotes": "off",
"no-console": 0
"no-console": 0,
"arrow-body-style": ["error", "always"],
"no-unused-vars": ["error", { "vars": "all", "args": "none", "ignoreRestSiblings": false }]
}
};
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ dist/
.nyc_output
coverage/
.coveralls.yml
.dotenv

# Logs
logs
Expand Down
8 changes: 8 additions & 0 deletions .sequelizerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
const path = require('path');

module.exports = {
"config": path.resolve('./database/config', 'config.js'),
"models-path": path.resolve('./database/models'),
"seeders-path": path.resolve('./database/seeders'),
"migrations-path": path.resolve('./database/migrations')
};
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,22 @@
language: node_js
services:
- postgresql
addons:
postgresql: "9.6"
apt:
packages:
- postgresql-9.6
- postgresql-client-9.6
env:
global:
- NODE_ENV=test
- SECRET_KEY=traeghiteslozae
node_js:
- "stable"
cache:
directories:
- "node_modules"
before_script:
- psql -c 'CREATE DATABASE imenu_tdb;' -U postgres
script: npm run test
after_success: 'npm run coverage'
27 changes: 27 additions & 0 deletions database/config/config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
require('dotenv').config();

module.exports = {
development: {
username: process.env.POSTGRES_USERNAME,
password: process.env.POSTGRES_PASSWORD,
database: process.env.POSTGRES_DATABASE,
host: process.env.POSTGRES_HOST,
port: 5400,
dialect: 'postgres',
},
test: {
username: 'postgres',
password: 'postgres',
database: 'imenu_test_db',
host: '127.0.0.1',
port: 5400,
dialect: 'postgres',
},
production: {
username: process.env.POSTGRES_USERNAME,
password: process.env.POSTGRES_PASSWORD,
database: process.env.POSTGRES_DATABASE,
host: process.env.POSTGRES_HOST,
dialect: 'postgres',
},
};
50 changes: 50 additions & 0 deletions database/migrations/20190304002655-create-user.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.createTable('Users', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER,
},
name: {
type: Sequelize.STRING,
allowNull: false,
},
email: {
type: Sequelize.STRING,
unique: true,
allowNull: false,
},
password: {
type: Sequelize.STRING,
allowNull: false,
},
phone: {
type: Sequelize.STRING,
allowNull: false,
},

/*
orderId: {
type: Sequelize.INTEGER,
references: {
model: 'Orders',
key: 'id',
},
},
*/
createdAt: {
allowNull: false,
type: Sequelize.DATE,
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE,
},
});
},
down: (queryInterface, Sequelize) => {
return queryInterface.dropTable('Users');
},
};
47 changes: 47 additions & 0 deletions database/migrations/20190304003930-create-meal.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.createTable('Meals', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER,
},
name: {
type: Sequelize.STRING,
allowNull: false,
unique: true,
},
price: {
type: Sequelize.INTEGER,
allowNull: false,
},
/* menuId: {
type: Sequelize.INTEGER,
references: {
model: 'Menus',
key: 'id',
},
},
orderId: {
type: Sequelize.INTEGER,
references: {
model: 'Orders',
key: 'id',
},
},
*/
createdAt: {
allowNull: false,
type: Sequelize.DATE,
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE,
},
});
},
down: (queryInterface, Sequelize) => {
return queryInterface.dropTable('Meals');
},
};
30 changes: 30 additions & 0 deletions database/migrations/20190304004028-create-menu.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.createTable('Menus', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER,
},
mealId: {
type: Sequelize.INTEGER,
references: {
model: 'Meals',
key: 'id',
},
},
createdAt: {
allowNull: false,
type: Sequelize.DATE,
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE,
},
});
},
down: (queryInterface, Sequelize) => {
return queryInterface.dropTable('Menus');
},
};
39 changes: 39 additions & 0 deletions database/migrations/20190304004115-create-order.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.createTable('Orders', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER,
},
/*
userId: {
type: Sequelize.INTEGER,
references: {
model: 'User',
key: 'id',
},
},
mealId: {
type: Sequelize.INTEGER,
references: {
model: 'Meals',
key: 'id',
},
},
*/
createdAt: {
allowNull: false,
type: Sequelize.DATE,
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE,
},
});
},
down: (queryInterface, Sequelize) => {
return queryInterface.dropTable('Orders');
},
};
9 changes: 9 additions & 0 deletions database/migrations/20190304160114-remove-mealId.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.removeColumn('Menus', 'mealId');
},

down: (queryInterface, Sequelize) => {
return queryInterface.addColumn('Menus', 'mealId', { type: Sequelize.INTEGER });
},
};
9 changes: 9 additions & 0 deletions database/migrations/20190305013835-add-menuDate-field.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.addColumn('Menus', 'menuDate', { type: Sequelize.DATE });
},

down: (queryInterface, Sequelize) => {
return queryInterface.removeColumn('Menus', 'menuDate');
},
};
37 changes: 37 additions & 0 deletions database/migrations/20190305041604-create-menu-detail.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.createTable('MenuDetails', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER,
},
mealId: {
type: Sequelize.INTEGER,
references: {
model: 'Meals',
key: 'id',
},
},
menuId: {
type: Sequelize.INTEGER,
references: {
model: 'Menus',
key: 'id',
},
},
createdAt: {
allowNull: false,
type: Sequelize.DATE,
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE,
},
});
},
down: (queryInterface, Sequelize) => {
return queryInterface.dropTable('MenuDetails');
},
};
37 changes: 37 additions & 0 deletions database/migrations/20190305043320-create-order-detail.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.createTable('orderDetails', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER,
},
mealId: {
type: Sequelize.INTEGER,
references: {
model: 'Meals',
key: 'id',
},
},
orderId: {
type: Sequelize.INTEGER,
references: {
model: 'Orders',
key: 'id',
},
},
createdAt: {
allowNull: false,
type: Sequelize.DATE,
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE,
},
});
},
down: (queryInterface, Sequelize) => {
return queryInterface.dropTable('orderDetails');
},
};
17 changes: 17 additions & 0 deletions database/migrations/20190305053249-add-meal-order-asso.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.addColumn('Orders', 'userId', {
type: Sequelize.INTEGER,
onDelete: 'CASCADE',
references: {
model: 'Users',
key: 'id',
as: 'userId',
},
});
},

down: (queryInterface, Sequelize) => {
return queryInterface.removeColumn('Orders', 'userId');
},
};
11 changes: 11 additions & 0 deletions database/migrations/20190305092831-add-bill-order.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.addColumn('Orders', 'bill', {
type: Sequelize.INTEGER,
});
},

down: (queryInterface, Sequelize) => {
return queryInterface.removeColumn('Orders', 'bill');
},
};
Loading