Merge pull request #36 from andela/ft_160484109_add_admin_role

#160484109 Add admin role
andela · Sep 18, 2018 · 531f8d8 · 531f8d8
2 parents 292fd24 + fb6f921
commit 531f8d8
Show file tree

Hide file tree

Showing 7 changed files with 2,441 additions and 2,402 deletions.
diff --git a/.env.sample b/.env.sample
@@ -50,3 +50,6 @@ SECRETE_KEY=
 VERIFYTOKEN_EXPIRY=
 URL_HOST=
 NO_REPLY_MAIL=
+emailAdd=
+emailPassword=
+fromEmailAdd=
diff --git a/config/config.js b/config/config.js
@@ -1,4 +1,4 @@
-import { } from 'dotenv/config';
+require('dotenv').config();
 
 module.exports = {
   development: {

diff --git a/migrations/20180913160635-User.js b/migrations/20180913160635-User.js
@@ -0,0 +1,16 @@
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    queryInterface.addColumn(
+      'Users',
+      'isAdmin',
+      Sequelize.BOOLEAN
+    );
+  },
+
+  down: (queryInterface) => {
+    queryInterface.removeColumn(
+      'Users',
+      'isAdmin'
+    );
+  }
+};
diff --git a/models/User.js b/models/User.js
@@ -1,43 +1,42 @@
+
 module.exports = (sequelize, DataTypes) => {
-  const User = sequelize.define(
-    'User',
-    {
-      username: {
-        type: DataTypes.STRING,
-        allowNull: false,
-        unique: true
-      },
-      lastname: {
-        type: DataTypes.STRING
-      },
-      firstname: {
-        type: DataTypes.STRING
-      },
-      email: {
-        type: DataTypes.STRING,
-        allowNull: false,
-        unique: true
-      },
-      hashedPassword: {
-        type: DataTypes.STRING
-      },
-      bio: {
-        type: DataTypes.STRING
-      },
-      isverified: {
-        type: DataTypes.BOOLEAN,
-        defaultValue: false
-      },
-      image: {
-        type: DataTypes.STRING
-      },
-      favorites: {
-        type: DataTypes.STRING
-      }
+  const User = sequelize.define('User', {
+    username: {
+      type: DataTypes.STRING,
+      allowNull: false,
+      unique: true
     },
-    {}
-  );
-
+    lastname: {
+      type: DataTypes.STRING
+    },
+    firstname: {
+      type: DataTypes.STRING
+    },
+    email: {
+      type: DataTypes.STRING,
+      allowNull: false,
+      unique: true
+    },
+    hashedPassword: {
+      type: DataTypes.STRING
+    },
+    bio: {
+      type: DataTypes.STRING
+    },
+    isverified: {
+      type: DataTypes.BOOLEAN,
+      defaultValue: false
+    },
+    image: {
+      type: DataTypes.STRING
+    },
+    favorites: {
+      type: DataTypes.STRING
+    },
+    isAdmin: {
+      type: DataTypes.BOOLEAN
+    }
+  }, {});
   User.associate = (models) => {
     User.hasMany(models.Article, {
       foreignKey: 'userId',