Revert "Develop to main"

.env_sample

@@ -8,4 +8,9 @@ DB_DIALECT=mysql
 DB_POOL_MAX=5
 DB_POOL_MIN=0
 DB_POOL_ACQUIRE=30000
-DB_POOL_IDLE=10000
+DB_POOL_IDLE=10000
+NODE_ENV=development
+APP_PORT=80
+PHPMYADMIN_PORT=8081
+GIT_EMAIL=msrajawat298@gmail.com
+GIT_USERNAME=msrajawat298

.gitignore

@@ -80,7 +80,7 @@ web_modules/
 .env.test.local
 .env.production.local
 .env.local
-!.devcontainer/.env
+
 # parcel-bundler cache (https://parceljs.org/)
 .cache
 .parcel-cache

.husky/pre-commit

@@ -1,3 +1 @@
-npm run lint
-npx lint-staged
-npm run test:coverage
+npx lint-staged

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "dbaeumer.vscode-eslint"
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "cSpell.words": [
+        "Vitabletech"
+    ]
+}

coverage/lcov.info

@@ -11,7 +11,9 @@ DA:11,0
 DA:12,0
 LF:5
 LH:0
-BRF:0
+BRDA:10,0,0,0
+BRDA:10,0,1,0
+BRF:2
 BRH:0
 end_of_record
 TN:

.devcontainer/docker-compose.yml → docker-compose.yml

@@ -7,7 +7,7 @@ services:
     volumes:
       - .:/app
     working_dir: /app
-    command: bash -c "tail -f /dev/null"
+    command: bash -c "chmod +x ./setup.sh && ./setup.sh"
     ports:
       - "${APP_PORT}:${PORT}" # Use the port number defined in .env for the host
     env_file:

migrations/20240412074035-create-roles.cjs

@@ -0,0 +1,27 @@
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.createTable('roles', {
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER
+      },
+      name: {
+        type: Sequelize.STRING
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+
+  down: async (queryInterface) => {
+    await queryInterface.dropTable('roles');
+  }
+};

migrations/20240412074035-create-users.cjs

@@ -0,0 +1,33 @@
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.createTable('users', {
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER
+      },
+      username: {
+        type: Sequelize.STRING
+      },
+      email: {
+        type: Sequelize.STRING
+      },
+      password: {
+        type: Sequelize.STRING
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+
+  down: async (queryInterface) => {
+    await queryInterface.dropTable('users');
+  }
+};

migrations/20240412074305-create-user-roles.cjs

@@ -0,0 +1,44 @@
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.createTable('user_roles', {
+      id: {
+        type: Sequelize.INTEGER,
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true
+      },
+      roleId: {
+        type: Sequelize.INTEGER,
+        allowNull: false,
+        references: {
+          model: 'roles',
+          key: 'id'
+        },
+        onUpdate: 'CASCADE',
+        onDelete: 'CASCADE'
+      },
+      userId: {
+        type: Sequelize.INTEGER,
+        allowNull: false,
+        references: {
+          model: 'users',
+          key: 'id'
+        },
+        onUpdate: 'CASCADE',
+        onDelete: 'CASCADE'
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });    
+  },
+
+  down: async (queryInterface) => {
+    await queryInterface.dropTable('user_roles');
+  }
+};

models/index.cjs

@@ -0,0 +1,42 @@
+const fs = require('fs');
+const path = require('path');
+const Sequelize = require('sequelize');
+const process = require('process');
+
+const basename = path.basename(__filename);
+const env = process.env.NODE_ENV || 'development';
+// eslint-disable-next-line import/no-dynamic-require
+const config = require(`${__dirname  }/../config/config.json`)[env];
+const db = {};
+
+let sequelize;
+if (config.use_env_variable) {
+  sequelize = new Sequelize(process.env[config.use_env_variable], config);
+} else {
+  sequelize = new Sequelize(config.database, config.username, config.password, config);
+}
+
+fs
+  .readdirSync(__dirname)
+  .filter(file => (
+    file.indexOf('.') !== 0 &&
+      file !== basename &&
+      file.slice(-3) === '.js' &&
+      file.indexOf('.test.js') === -1
+  ))
+  .forEach(file => {
+    // eslint-disable-next-line import/no-dynamic-require, global-require
+    const model = require(path.join(__dirname, file))(sequelize, Sequelize.DataTypes);
+    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;

package.json

@@ -1,13 +1,17 @@
 {
-  "name": "node-express-api-bootstrap",
+  "name": "node-js-jwt-auth",
   "version": "1.0.0",
-  "description": "This repository provides a Node.js application for demonstrating JWT authentication and authorization. It includes features such as user registration, user login, and authorization process. The application is built using Express.js, JWT for authentication, Sequelize ORM for database interactions, and MySQL for database storage.",
+  "description": "Node.js Demo for JWT Authentication",
   "main": "app/server.js",
   "type": "module",
   "scripts": {
     "start": "node --env-file .env app/server.js ",
     "dev": "nodemon --env-file .env app/server.js",
     "sync-db": "node custom_migration/sync-db.js",
+    "create-table": "sequelize-cli migration:generate --name create_table",
+    "migrate": "sequelize-cli db:migrate",
+    "migrate:undo": "sequelize-cli db:migrate:undo",
+    "migrate:undo:all": "sequelize-cli db:migrate:undo:all",
     "seed": "sequelize-cli db:seed:all",
     "generate:seed": "sequelize-cli seed:generate --name demo-user",
     "lint:clear": "rm -rf ~/.eslintcache",
@@ -21,14 +25,6 @@
     "updateSnapshots": "jest -u --coverage=false"
   },
   "jest": {
-    "coverageThreshold": {
-      "global": {
-        "branches": 80,
-        "functions": 80,
-        "lines": 80,
-        "statements": 80
-      }
-    },
     "collectCoverage": true,
     "collectCoverageFrom": [
       "app/**/*.js",
@@ -39,6 +35,12 @@
       "!**/*.config.js"
     ]
   },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged",
+      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
+    }
+  },
   "lint-staged": {
     "*.js": [
       "eslint --fix",