From e4c4d0e3d7dc7be7ac233cd6c9b90ae92fb1a5b3 Mon Sep 17 00:00:00 2001 From: Jannik Schönartz Date: Tue, 17 Jul 2018 02:43:31 +0000 Subject: [server] Fixed eslint errors. (Standard ESLint is used) --- server/models/backend.js | 20 ++++++++++---------- server/models/role.js | 20 ++++++++++---------- server/models/user.js | 20 ++++++++++---------- server/models/user_x_role.js | 27 ++++++++++++--------------- 4 files changed, 42 insertions(+), 45 deletions(-) (limited to 'server/models') diff --git a/server/models/backend.js b/server/models/backend.js index b8b0313..4ed5fce 100644 --- a/server/models/backend.js +++ b/server/models/backend.js @@ -1,20 +1,20 @@ -'use strict'; +'use strict' module.exports = (sequelize, DataTypes) => { var backend = sequelize.define('backend', { id: { - allowNull: false, - autoIncrement: true, - primaryKey: true, - type: DataTypes.INTEGER + allowNull: false, + autoIncrement: true, + primaryKey: true, + type: DataTypes.INTEGER }, name: DataTypes.STRING, type: DataTypes.STRING, credentials: DataTypes.STRING(2048) }, { timestamps: false - }); - backend.associate = function(models) { + }) + backend.associate = function (models) { // associations can be defined here - }; - return backend; -}; \ No newline at end of file + } + return backend +} diff --git a/server/models/role.js b/server/models/role.js index 35ca139..60fba53 100644 --- a/server/models/role.js +++ b/server/models/role.js @@ -1,19 +1,19 @@ -'use strict'; +'use strict' module.exports = (sequelize, DataTypes) => { var role = sequelize.define('role', { id: { - allowNull: false, - autoIncrement: true, - primaryKey: true, - type: DataTypes.INTEGER + allowNull: false, + autoIncrement: true, + primaryKey: true, + type: DataTypes.INTEGER }, name: DataTypes.STRING, descr: DataTypes.STRING }, { timestamps: false - }); - role.associate = function(models) { + }) + role.associate = function (models) { // associations can be defined here - }; - return role; -}; \ No newline at end of file + } + return role +} diff --git a/server/models/user.js b/server/models/user.js index 167b5a5..63e87bd 100644 --- a/server/models/user.js +++ b/server/models/user.js @@ -1,11 +1,11 @@ -'use strict'; +'use strict' module.exports = (sequelize, DataTypes) => { var user = sequelize.define('user', { id: { - allowNull: false, - autoIncrement: true, - primaryKey: true, - type: DataTypes.INTEGER + allowNull: false, + autoIncrement: true, + primaryKey: true, + type: DataTypes.INTEGER }, username: DataTypes.STRING, password: DataTypes.STRING, @@ -13,9 +13,9 @@ module.exports = (sequelize, DataTypes) => { name: DataTypes.STRING }, { timestamps: false - }); - user.associate = function(models) { + }) + user.associate = function (models) { // associations can be defined here - }; - return user; -}; \ No newline at end of file + } + return user +} diff --git a/server/models/user_x_role.js b/server/models/user_x_role.js index 86068f0..96d5883 100644 --- a/server/models/user_x_role.js +++ b/server/models/user_x_role.js @@ -1,20 +1,17 @@ -'use strict'; +'use strict' module.exports = (sequelize, DataTypes) => { var user_x_role = sequelize.define('user_x_role', {}, - { - timestamps: false - }); - - user_x_role.associate = function(models) { + { + timestamps: false + }) + + user_x_role.associate = function (models) { // associations can be defined here - - //sequelize.role.belongsToMany(sequelize.user, {through: 'user_x_role', foreignKey: 'userid'}); - //sequelize.user.hasMany(sequelize.role, { + // sequelize.role.belongsToMany(sequelize.user, {through: 'user_x_role', foreignKey: 'userid'}); + // sequelize.user.hasMany(sequelize.role, { // through: 'user_x_role', // foreignKey: 'roleid' - //}); - - - }; - return user_x_role; -}; \ No newline at end of file + // }); + } + return user_x_role +} -- cgit v1.2.3-55-g7522