diff --git a/.gitignore b/.gitignore
index 333bc114..d98f086f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,4 +63,5 @@ src/js/_DS_Store
 
 #User uploaded produce_images images
 static/images/produce_images
+static/images/id_images
 
diff --git a/README.md b/README.md
index 8eb44b17..702ed8f9 100644
--- a/README.md
+++ b/README.md
@@ -122,6 +122,9 @@ DO_BUCKET_NAME=REPLACE_ME
 DO_KEY_ID=REPLACE_ME
 DO_SECRET=REPLACE_ME
 DO_ENDPOINT=REPLACE_ME
+TOKEN_SIGN=REPLACE_ME
+AUTH_STATEGY=REPLACE_ME
+CONFIRM_URL=REPLACE_ME
 TWILIO_ACCOUNT_SID=REPLACE_ME
 TWILIO_AUTH_TOKEN=REPLACE_ME
 ```
@@ -160,12 +163,15 @@ node sequelise_auto_export.js
 
 The generated models can be found in `./models`
 
-- Creating sequelize migration (which creates a js file in migrations folder and will need to be commited)
+- Creating sequelize migration (which creates a js file in migrations folder and will need to be
+  commited)
+
 ```bash
 npx sequelize migration:create --name name_of_new_db_column
 ```
 
 Run the migration
+
 ```bash
 npx sequelize db:migrate --url ‘mysql://username:password@localhost:3306/databasename'
 ```
@@ -262,6 +268,7 @@ $ heroku run npx sequelize-cli db:migrate --url 'mysql://root:password@mysql_hos
 ```
 
 Alternatively
+
 ```
 $ heroku run npm run build -a name-of-app
 ```
diff --git a/migrations/20220429215904-add_new_user_columns.js b/migrations/20220429215904-add_new_user_columns.js
new file mode 100644
index 00000000..1bccdded
--- /dev/null
+++ b/migrations/20220429215904-add_new_user_columns.js
@@ -0,0 +1,58 @@
+'use strict';
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    /**
+     * Add altering commands here.
+     *
+     * Example:
+     * await queryInterface.createTable('users', { id: Sequelize.INTEGER });
+     */
+    await queryInterface.addColumn('user', 'userId', {
+      type: Sequelize.STRING(255),
+    });
+    await queryInterface.addColumn('user', 'user_uuid', {
+      type: Sequelize.STRING(255),
+    });
+    await queryInterface.addColumn('user', 'farmName', {
+      type: Sequelize.STRING(255),
+    });
+    await queryInterface.addColumn('user', 'organisationName', {
+      type: Sequelize.STRING(255),
+    });
+    await queryInterface.addColumn('user', 'organisationType', {
+      type: Sequelize.STRING(255),
+    });
+    await queryInterface.addColumn('user', 'city', {
+      type: Sequelize.STRING(255),
+    });
+    await queryInterface.addColumn('user', 'emailVerificationToken', {
+      type: Sequelize.STRING(255),
+    });
+    await queryInterface.addColumn('user', 'isEmailVerified', {
+      type: Sequelize.BOOLEAN,
+    });
+    await queryInterface.addColumn('user', 'isAdminVerified', {
+      type: Sequelize.BOOLEAN,
+    });
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    /**
+     * Add reverting commands here.
+     *
+     * Example:
+     * await queryInterface.dropTable('users');
+     */
+
+    await queryInterface.removeColumn('user', 'userId');
+    await queryInterface.removeColumn('user', 'user_uuid');
+    await queryInterface.removeColumn('user', 'farmName');
+    await queryInterface.removeColumn('user', 'organisationName');
+    await queryInterface.removeColumn('user', 'organisationType');
+    await queryInterface.removeColumn('user', 'city');
+    await queryInterface.removeColumn('user', 'emailVerificationToken');
+    await queryInterface.removeColumn('user', 'isEmailVerified');
+    await queryInterface.removeColumn('user', 'isAdminVerified');
+  },
+};
diff --git a/migrations/20220604131504-remove-primary-index.js b/migrations/20220604131504-remove-primary-index.js
index e983b54d..a5359cbb 100644
--- a/migrations/20220604131504-remove-primary-index.js
+++ b/migrations/20220604131504-remove-primary-index.js
@@ -7,29 +7,31 @@ $npm run build-dev
 module.exports = {
   up: async (queryInterface, Sequelize) => {
     // logic for transforming into the new state
-    await queryInterface.removeIndex('foodprint_config', 'PRIMARY')
-        .then(queryInterface.removeIndex('foodprint_harvest', 'PRIMARY'))
-        .then(queryInterface.removeIndex('foodprint_produce', 'PRIMARY'))
-        .then(queryInterface.removeIndex('foodprint_produce_price', 'PRIMARY'))
-        .then(queryInterface.removeIndex('foodprint_qrcount', 'PRIMARY'))
-        .then(queryInterface.removeIndex('foodprint_storage', 'PRIMARY'))
-        .then(queryInterface.removeIndex('foodprint_subscription', 'PRIMARY'))
-        .then(queryInterface.removeIndex('foodprint_weeklyview', 'PRIMARY'))
-        .then(queryInterface.removeIndex('market_subscription', 'PRIMARY'))
-        .then(queryInterface.removeIndex('user', 'PRIMARY'));
+    await queryInterface
+      .removeIndex('foodprint_config', 'PRIMARY')
+      .then(queryInterface.removeIndex('foodprint_harvest', 'PRIMARY'))
+      .then(queryInterface.removeIndex('foodprint_produce', 'PRIMARY'))
+      .then(queryInterface.removeIndex('foodprint_produce_price', 'PRIMARY'))
+      .then(queryInterface.removeIndex('foodprint_qrcount', 'PRIMARY'))
+      .then(queryInterface.removeIndex('foodprint_storage', 'PRIMARY'))
+      .then(queryInterface.removeIndex('foodprint_subscription', 'PRIMARY'))
+      .then(queryInterface.removeIndex('foodprint_weeklyview', 'PRIMARY'))
+      .then(queryInterface.removeIndex('market_subscription', 'PRIMARY'))
+      .then(queryInterface.removeIndex('user', 'PRIMARY'));
   },
 
   down: async (queryInterface, Sequelize) => {
     // logic for reverting the changes
-    await queryInterface.addIndex('foodprint_config', 'PRIMARY')
-        .then(queryInterface.addIndex('foodprint_harvest', 'PRIMARY'))
-        .then(queryInterface.addIndex('foodprint_produce', 'PRIMARY'))
-        .then(queryInterface.addIndex('foodprint_produce_price', 'PRIMARY'))
-        .then(queryInterface.addIndex('foodprint_qrcount', 'PRIMARY'))
-        .then(queryInterface.addIndex('foodprint_storage', 'PRIMARY'))
-        .then(queryInterface.addIndex('foodprint_subscription', 'PRIMARY'))
-        .then(queryInterface.addIndex('foodprint_weeklyview', 'PRIMARY'))
-        .then(queryInterface.addIndex('market_subscription', 'PRIMARY'))
-        .then(queryInterface.addIndex('user', 'PRIMARY'));
-  }
+    await queryInterface
+      .addIndex('foodprint_config', 'PRIMARY')
+      .then(queryInterface.addIndex('foodprint_harvest', 'PRIMARY'))
+      .then(queryInterface.addIndex('foodprint_produce', 'PRIMARY'))
+      .then(queryInterface.addIndex('foodprint_produce_price', 'PRIMARY'))
+      .then(queryInterface.addIndex('foodprint_qrcount', 'PRIMARY'))
+      .then(queryInterface.addIndex('foodprint_storage', 'PRIMARY'))
+      .then(queryInterface.addIndex('foodprint_subscription', 'PRIMARY'))
+      .then(queryInterface.addIndex('foodprint_weeklyview', 'PRIMARY'))
+      .then(queryInterface.addIndex('market_subscription', 'PRIMARY'))
+      .then(queryInterface.addIndex('user', 'PRIMARY'));
+  },
 };
diff --git a/models/user.js b/models/user.js
index 12147dc3..bf9136f4 100644
--- a/models/user.js
+++ b/models/user.js
@@ -9,6 +9,14 @@ module.exports = function (sequelize, DataTypes) {
         allowNull: false,
         primaryKey: true,
       },
+      user_uuid: {
+        type: DataTypes.STRING(255),
+        allowNull: true,
+      },
+      userId: {
+        type: DataTypes.STRING(255),
+        allowNull: true,
+      },
       firstName: {
         type: DataTypes.STRING(255),
         allowNull: true,
@@ -39,10 +47,21 @@ module.exports = function (sequelize, DataTypes) {
         type: DataTypes.STRING(255),
         allowNull: true,
       },
-      createdAt: {
-        type: DataTypes.DATE,
+      farmName: {
+        type: DataTypes.STRING(255),
+        allowNull: true,
+      },
+      organisationName: {
+        type: DataTypes.STRING(255),
+        allowNull: true,
+      },
+      organisationType: {
+        type: DataTypes.STRING(255),
+        allowNull: true,
+      },
+      city: {
+        type: DataTypes.STRING(255),
         allowNull: true,
-        defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
       },
       registrationChannel: {
         type: DataTypes.STRING(255),
@@ -52,6 +71,23 @@ module.exports = function (sequelize, DataTypes) {
         type: DataTypes.BLOB,
         allowNull: true,
       },
+      emailVerificationToken: {
+        type: DataTypes.STRING(255),
+        allowNull: true,
+      },
+      isEmailVerified: {
+        type: DataTypes.BOOLEAN,
+        defaultValue: false,
+      },
+      isAdminVerified: {
+        type: DataTypes.BOOLEAN,
+        defaultValue: false,
+      },
+      createdAt: {
+        type: DataTypes.DATE,
+        allowNull: true,
+        defaultValue: Sequelize.Sequelize.literal('CURRENT_TIMESTAMP'),
+      },
       user_identifier_image_url: {
         type: DataTypes.STRING(255),
         allowNull: true,
diff --git a/package-lock.json b/package-lock.json
index 7e661a23..8402eab3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
         "algosdk": "^1.12.0",
         "aws-sdk": "^2.1167.0",
         "axios": "^0.26.1",
+        "bcrypt": "^5.0.1",
         "body-parser": "^1.19.0",
         "browserify": "^16.3.0",
         "connect-ensure-login": "^0.1.1",
@@ -28,6 +29,7 @@
         "fs": "0.0.1-security",
         "heroku-ssl-redirect": "0.0.4",
         "jimp": "^0.6.4",
+        "jsonwebtoken": "^8.5.1",
         "method-override": "^3.0.0",
         "moment": "^2.27.0",
         "morgan": "^1.9.1",
@@ -589,6 +591,66 @@
       "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz",
       "integrity": "sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="
     },
+    "node_modules/@mapbox/node-pre-gyp": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.9.tgz",
+      "integrity": "sha512-aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw==",
+      "dependencies": {
+        "detect-libc": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "make-dir": "^3.1.0",
+        "node-fetch": "^2.6.7",
+        "nopt": "^5.0.0",
+        "npmlog": "^5.0.1",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.11"
+      },
+      "bin": {
+        "node-pre-gyp": "bin/node-pre-gyp"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@socket.io/component-emitter": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
@@ -680,8 +742,7 @@
     "node_modules/abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
     "node_modules/accepts": {
       "version": "1.3.8",
@@ -768,6 +829,38 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/agent-base/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/agent-base/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
     "node_modules/algo-msgpack-with-bigint": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/algo-msgpack-with-bigint/-/algo-msgpack-with-bigint-2.1.1.tgz",
@@ -933,12 +1026,42 @@
       "resolved": "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz",
       "integrity": "sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw=="
     },
+    "node_modules/aproba": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
+      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
+    },
     "node_modules/archy": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
       "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
       "dev": true
     },
+    "node_modules/are-we-there-yet": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
+      "dependencies": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/are-we-there-yet/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -1440,6 +1563,19 @@
       "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
       "dev": true
     },
+    "node_modules/bcrypt": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.1.tgz",
+      "integrity": "sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "@mapbox/node-pre-gyp": "^1.0.0",
+        "node-addon-api": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
     "node_modules/beeper": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
@@ -2327,6 +2463,14 @@
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
+    "node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/ci-info": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
@@ -2621,7 +2765,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
       "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "dev": true,
       "bin": {
         "color-support": "bin.js"
       }
@@ -2768,6 +2911,11 @@
       "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
       "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="
     },
+    "node_modules/console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
+    },
     "node_modules/constants-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
@@ -3215,6 +3363,11 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="
+    },
     "node_modules/denque": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
@@ -3272,6 +3425,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
+      "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/detect-newline": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
@@ -4823,6 +4984,17 @@
         "universalify": "^0.1.0"
       }
     },
+    "node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/fs-mkdirp-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
@@ -4885,6 +5057,65 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/gauge": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
+      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
+      "dependencies": {
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.2",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.1",
+        "object-assign": "^4.1.1",
+        "signal-exit": "^3.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/gauge/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/gauge/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/gauge/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/gauge/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/generate-function": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
@@ -6171,6 +6402,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
+    },
     "node_modules/has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -6800,7 +7036,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
       "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -8513,6 +8748,29 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
       "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
+    "node_modules/minipass": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz",
+      "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "dependencies": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/mitt": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mitt/-/mitt-1.2.0.tgz",
@@ -8718,6 +8976,18 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
+    "node_modules/mocha/node_modules/nanoid": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
+      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
+      "dev": true,
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
     "node_modules/mocha/node_modules/string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -9015,18 +9285,6 @@
       "dev": true,
       "optional": true
     },
-    "node_modules/nanoid": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
-      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
-      "dev": true,
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "node_modules/nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -9072,6 +9330,11 @@
       "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
       "dev": true
     },
+    "node_modules/node-addon-api": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
+    },
     "node_modules/node-domexception": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
@@ -9482,7 +9745,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
       "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-      "dev": true,
       "dependencies": {
         "abbrev": "1"
       },
@@ -9556,6 +9818,17 @@
         "node": ">=4"
       }
     },
+    "node_modules/npmlog": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+      "dependencies": {
+        "are-we-there-yet": "^2.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^3.0.0",
+        "set-blocking": "^2.0.0"
+      }
+    },
     "node_modules/number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
@@ -11336,6 +11609,20 @@
       "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-5.0.0.tgz",
       "integrity": "sha512-6S+5LvtTl2ggBumk04hBo/4Uf6fRJUwIgunGZ7CYEBCeufGFW1Pu6ucUf/UskHeWOIsUcLOGLFXPig5tR5V1nA=="
     },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/ripemd160": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
@@ -12125,8 +12412,7 @@
     "node_modules/signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "node_modules/simple-concat": {
       "version": "1.0.1",
@@ -12766,7 +13052,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
       "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dev": true,
       "dependencies": {
         "is-fullwidth-code-point": "^2.0.0",
         "strip-ansi": "^4.0.0"
@@ -12779,7 +13064,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
       "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -12788,7 +13072,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
       "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-      "dev": true,
       "dependencies": {
         "ansi-regex": "^3.0.0"
       },
@@ -13074,6 +13357,33 @@
         "acorn-node": "^1.2.0"
       }
     },
+    "node_modules/tar": {
+      "version": "6.1.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^3.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/tar/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/term-size": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
@@ -13293,6 +13603,11 @@
         "node": "*"
       }
     },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
     "node_modules/tslib": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
@@ -14320,6 +14635,20 @@
         "node": ">= 8"
       }
     },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -14389,6 +14718,14 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/wide-align": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+      "dependencies": {
+        "string-width": "^1.0.2 || 2 || 3 || 4"
+      }
+    },
     "node_modules/widest-line": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz",
@@ -15164,6 +15501,47 @@
       "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz",
       "integrity": "sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="
     },
+    "@mapbox/node-pre-gyp": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.9.tgz",
+      "integrity": "sha512-aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw==",
+      "requires": {
+        "detect-libc": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "make-dir": "^3.1.0",
+        "node-fetch": "^2.6.7",
+        "nopt": "^5.0.0",
+        "npmlog": "^5.0.1",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.11"
+      },
+      "dependencies": {
+        "make-dir": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+          "requires": {
+            "semver": "^6.0.0"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "6.3.0",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+              "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+            }
+          }
+        },
+        "node-fetch": {
+          "version": "2.6.7",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+          "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+          "requires": {
+            "whatwg-url": "^5.0.0"
+          }
+        }
+      }
+    },
     "@socket.io/component-emitter": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
@@ -15255,8 +15633,7 @@
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
     "accepts": {
       "version": "1.3.8",
@@ -15447,12 +15824,38 @@
       "resolved": "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz",
       "integrity": "sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw=="
     },
+    "aproba": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
+      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
+    },
     "archy": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
       "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
       "dev": true
     },
+    "are-we-there-yet": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
+      "requires": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^3.6.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
     "argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -15839,6 +16242,15 @@
       "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
       "dev": true
     },
+    "bcrypt": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.1.tgz",
+      "integrity": "sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==",
+      "requires": {
+        "@mapbox/node-pre-gyp": "^1.0.0",
+        "node-addon-api": "^3.1.0"
+      }
+    },
     "beeper": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
@@ -16571,6 +16983,11 @@
         }
       }
     },
+    "chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
+    },
     "ci-info": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
@@ -16814,8 +17231,7 @@
     "color-support": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "dev": true
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="
     },
     "combine-source-map": {
       "version": "0.8.0",
@@ -16937,6 +17353,11 @@
       "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
       "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="
     },
+    "console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
+    },
     "constants-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
@@ -17315,6 +17736,11 @@
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
     },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="
+    },
     "denque": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
@@ -17356,6 +17782,11 @@
       "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==",
       "dev": true
     },
+    "detect-libc": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
+      "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="
+    },
     "detect-newline": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
@@ -18629,6 +19060,14 @@
         "universalify": "^0.1.0"
       }
     },
+    "fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "requires": {
+        "minipass": "^3.0.0"
+      }
+    },
     "fs-mkdirp-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
@@ -18671,6 +19110,52 @@
       "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
       "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
     },
+    "gauge": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
+      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
+      "requires": {
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.2",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.1",
+        "object-assign": "^4.1.1",
+        "signal-exit": "^3.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+        },
+        "string-width": {
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          }
+        }
+      }
+    },
     "generate-function": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
@@ -19719,6 +20204,11 @@
         "has-symbols": "^1.0.2"
       }
     },
+    "has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
+    },
     "has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -20205,8 +20695,7 @@
     "is-fullwidth-code-point": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true
+      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="
     },
     "is-function": {
       "version": "1.0.2",
@@ -21576,6 +22065,23 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
       "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
+    "minipass": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz",
+      "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
+      "requires": {
+        "yallist": "^4.0.0"
+      }
+    },
+    "minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "requires": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      }
+    },
     "mitt": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mitt/-/mitt-1.2.0.tgz",
@@ -21731,6 +22237,12 @@
           "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
           "dev": true
         },
+        "nanoid": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
+          "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
+          "dev": true
+        },
         "string-width": {
           "version": "4.2.3",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -21987,12 +22499,6 @@
       "dev": true,
       "optional": true
     },
-    "nanoid": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
-      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
-      "dev": true
-    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -22031,6 +22537,11 @@
       "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
       "dev": true
     },
+    "node-addon-api": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
+    },
     "node-domexception": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
@@ -22357,7 +22868,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
       "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-      "dev": true,
       "requires": {
         "abbrev": "1"
       }
@@ -22412,6 +22922,17 @@
         "path-key": "^2.0.0"
       }
     },
+    "npmlog": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+      "requires": {
+        "are-we-there-yet": "^2.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^3.0.0",
+        "set-blocking": "^2.0.0"
+      }
+    },
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
@@ -23783,6 +24304,14 @@
       "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-5.0.0.tgz",
       "integrity": "sha512-6S+5LvtTl2ggBumk04hBo/4Uf6fRJUwIgunGZ7CYEBCeufGFW1Pu6ucUf/UskHeWOIsUcLOGLFXPig5tR5V1nA=="
     },
+    "rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
     "ripemd160": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
@@ -24374,8 +24903,7 @@
     "signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "simple-concat": {
       "version": "1.0.1",
@@ -24890,7 +25418,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
       "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dev": true,
       "requires": {
         "is-fullwidth-code-point": "^2.0.0",
         "strip-ansi": "^4.0.0"
@@ -24899,14 +25426,12 @@
         "ansi-regex": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-          "dev": true
+          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="
         },
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
           "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-          "dev": true,
           "requires": {
             "ansi-regex": "^3.0.0"
           }
@@ -25114,6 +25639,26 @@
         "acorn-node": "^1.2.0"
       }
     },
+    "tar": {
+      "version": "6.1.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
+      "requires": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^3.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
+        }
+      }
+    },
     "term-size": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
@@ -25292,6 +25837,11 @@
         }
       }
     },
+    "tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
     "tslib": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
@@ -26122,6 +26672,20 @@
       "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz",
       "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q=="
     },
+    "webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "requires": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -26173,6 +26737,14 @@
         "is-typed-array": "^1.1.9"
       }
     },
+    "wide-align": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+      "requires": {
+        "string-width": "^1.0.2 || 2 || 3 || 4"
+      }
+    },
     "widest-line": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz",
diff --git a/package.json b/package.json
index 7aba7c45..6b58787b 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,7 @@
     "algosdk": "^1.12.0",
     "aws-sdk": "^2.1167.0",
     "axios": "^0.26.1",
+    "bcrypt": "^5.0.1",
     "body-parser": "^1.19.0",
     "browserify": "^16.3.0",
     "connect-ensure-login": "^0.1.1",
@@ -68,6 +69,7 @@
     "fs": "0.0.1-security",
     "heroku-ssl-redirect": "0.0.4",
     "jimp": "^0.6.4",
+    "jsonwebtoken": "^8.5.1",
     "method-override": "^3.0.0",
     "moment": "^2.27.0",
     "morgan": "^1.9.1",
diff --git a/routes/auth.js b/routes/auth.js
index 18ea0df9..4f40603e 100644
--- a/routes/auth.js
+++ b/routes/auth.js
@@ -3,26 +3,20 @@ var router = express.Router();
 var passport = require('passport');
 var ROLES = require('../utils/roles');
 const fetch = (...args) => import('node-fetch').then(({ default: fetch }) => fetch(...args));
+var fs = require('fs').promises;
+const multer = require('multer');
+const upload = multer({ dest: './static/images/id_images/' });
 
+const uuidv4 = require('uuid/v4');
 var initModels = require('../models/init-models');
 var sequelise = require('../config/db/db_sequelise');
+var ROLES = require('../utils/roles');
 
 var models = initModels(sequelise);
 
-
-const {
-  getUploadParams,
-  resolveFilenames,
-  uploadConnection,
-} = require('../config/digitalocean/file-upload');
-const { getMimeType } = require('../utils/image_mimetypes');
-const uuidv4 = require('uuid/v4');
-
-const BucketName = process.env.DO_BUCKET_NAME;
-
-const accountSid = process.env.TWILIO_ACCOUNT_SID;
-const authToken = process.env.TWILIO_AUTH_TOKEN;
-const tw_client = require('twilio')(accountSid, authToken);
+const bcrypt = require('bcrypt');
+var jwt = require('jsonwebtoken');
+const customSendEmail = require('../config/email/email');
 
 /* Render Login page. */
 router.get('/login', function (req, res) {
@@ -37,7 +31,7 @@ router.get('/login', function (req, res) {
 /* TODO add a user not found message */
 router.post(
   '/login',
-  passport.authenticate('file-local', {
+  passport.authenticate(process.env.AUTH_STATEGY ? process.env.AUTH_STATEGY : 'db-local', {
     successReturnToOrRedirect: '/',
     successFlash: 'You are now logged in.',
     failureRedirect: '/app/auth/login',
@@ -45,54 +39,203 @@ router.post(
   }) //instruct Passport to flash an error message using the message given by the strategy's verify callback, if any
 );
 
+/* Render DB Login page. */
+router.get('/dblogin', function (req, res) {
+  if (req.user) {
+    res.redirect('/');
+  } else {
+    res.render('dblogin', {
+      title: 'FoodPrint - User Login',
+      user: req.user,
+      page_name: 'login',
+    });
+  }
+});
+
 /* Process  Login form submission (DB Based Auth). */
 /* TODO add a user not found message */
 router.post(
   '/dblogin',
   passport.authenticate('db-local', {
     successReturnToOrRedirect: '/',
-    failureRedirect: '/app/auth/login',
+    failureRedirect: '/app/auth/dblogin',
     failureFlash: true,
   }) //instruct Passport to flash an error message using the message given by the strategy's verify callback, if any
 );
 
 /* Logout. */
 router.get('/logout', function (req, res) {
-    req.logout(function(err) {
-        if (err) {
-            return next(err);
-        }
-        req.flash('success', 'You are now logged out.');
-        res.redirect('/app/auth/login');
-    });
+  req.logout(function (err) {
+    if (err) {
+      return next(err);
+    }
+    req.flash('success', 'You are now logged out.');
+    res.redirect('/app/auth/login');
+  });
 });
 
 /* Render Register page. */
 router.get('/register/:message?', function (req, res) {
+  // choice
+  let choice = req.query.choice;
+  choice = typeof choice === 'undefined' ? '' : choice;
   req.params.message
     ? res.render('message', {
         title: 'FoodPrint - User Registration',
         user: req.user,
         page_name: 'message',
         message:
-          'Your registration has been submitted and is currently under review by the FoodPrint Team! You will be notified of status updates via the email you provided.',
+          'Your registration has been submitted. Please check you email to verify your email address.',
       })
     : res.render('register', {
         title: 'FoodPrint - User Registration',
         user: req.user,
         page_name: 'register',
+        choice: choice,
       });
+  // console.log(req.query)
+});
+
+/*Render register_options */
+router.get('/register_options', function (req, res) {
+  res.render('register_options', {
+    title: 'FoodPrint - User Registration',
+    user: req.user,
+    page_name: 'register',
+  });
 });
 
 /* Process register form submission . */
-router.post('/register', function (req, res) {
-  //TODO - Log registration to table and send email to FoodPrint Admin
-  res.redirect('/app/auth/register/message');
+router.post('/register', upload.single('registerIDPhoto'), async function (req, res) {
+  const salt = await bcrypt.genSalt(10);
+  const hashedPassword = await bcrypt.hash(req.body.password, salt);
+  const confirmationCode = jwt.sign({ email: req.body.registerEmail }, process.env.TOKEN_SIGN);
+  const latestUser = await models.User.findOne({
+    attributes: ['ID'],
+    order: [['ID', 'DESC']],
+  });
+  const user_uuid = uuidv4();
+
+  try {
+    let user = {
+      user_uuid: user_uuid,
+      userId: `${req.body.role.charAt(0).toUpperCase()}${user_uuid.substring(0, 6)}${
+        latestUser ? latestUser.ID + 1 : 0
+      }`,
+      firstName: req.body.registerName,
+      middleName: '',
+      lastName: req.body.registerSurname,
+      phoneNumber: req.body.registerPhoneNumber,
+      email: req.body.registerEmail,
+      role: req.body.role,
+      password: hashedPassword,
+      ...(req.body.role === ROLES.Farmer && { farmName: req.body.farmName, isAdminVerified: true }),
+      ...(req.body.role === ROLES.Intermediary && {
+        organisationName: req.body.registerOrgName,
+        organisationType: req.body.registerOrgType,
+        isAdminVerified: true,
+      }),
+      ...(req.body.role === ROLES.Agent && { city: req.body.city, isAdminVerified: false }),
+      registrationChannel: 'web',
+      emailVerificationToken: confirmationCode,
+      isEmailVerified: false,
+    };
+
+    const img = req.file;
+    if (user.role === ROLES.Agent || user.role === ROLES.Farmer) {
+      user['nationalIdPhotoHash'] = await fs
+        .readFile(img.path)
+        .catch(err => console.log('Failed to read file', err));
+    }
+
+    models.User.create(user)
+      .then(_ => {
+        models.User.findOne({
+          attributes: ['ID', 'firstName', 'lastName', 'email'],
+          where: {
+            user_uuid: user_uuid,
+            email: req.body.registerEmail,
+          },
+        })
+          .then(user => {
+            if (user) {
+              const mailOptions = {
+                to: req.body.registerEmail,
+                subject: 'Foodprint registration confirmation email',
+                html: `<p>Thank you for joining FoodPrint.</p>
+                        <p>Please confirm your email by clicking on the following link</p>
+                        <a href=${process.env.CONFIRM_URL}/${confirmationCode}> Click here</a>
+                        <p>Regards</p>
+                        <p>Foodprint Team</p>
+                        `,
+              };
+              try {
+                customSendEmail(mailOptions.to, mailOptions.subject, mailOptions.html);
+                res.redirect('/app/auth/register/message');
+                console.log('Email successfully sent');
+              } catch (e) {
+                console.log('Error sending email - ', e);
+              }
+            } else {
+              res.status(404).send({ message: 'user not found' });
+            }
+          })
+          .catch(err => {
+            console.log(err);
+            res.status(400).send({ message: err.message });
+          });
+      })
+      .catch(err => {
+        console.log(err);
+        res.status(400).send({ message: err.message });
+      });
+  } catch (e) {
+    console.log(e);
+    res.status(500).send({ error: e, message: 'Unexpected error occurred 😤' });
+  }
+});
+
+router.get('/confirm/:confirmationCode', async function (req, res) {
+  models.User.findOne({
+    where: {
+      emailVerificationToken: req.params.confirmationCode,
+    },
+  })
+    .then(user => {
+      if (user) {
+        models.User.update(
+          { isEmailVerified: true },
+          {
+            where: {
+              emailVerificationToken: req.params.confirmationCode,
+            },
+          }
+        );
+
+        res.render('message', {
+          title: 'FoodPrint - User Confirmation',
+          user: req.user,
+          page_name: 'message',
+          message: 'Verification successful',
+        });
+      } else {
+        res.render('message', {
+          title: 'FoodPrint - User Confirmation',
+          user: req.user,
+          page_name: 'message',
+          message: 'User not found',
+        });
+      }
+    })
+    .catch(err => {
+      console.log(err);
+      res.status(500).send({ error: err, message: 'Unexpected error occurred 😤' });
+    });
 });
 
 /* Process register for WhatsApp*/
 router.post('/register/whatsapp', async function (req, res) {
-  const createUser = function(user_entry){
+  const createUser = function (user_entry) {
     models.User.create(user_entry)
       .then(_ => {
         models.User.findAll({
@@ -127,7 +270,7 @@ router.post('/register/whatsapp', async function (req, res) {
         console.log(err);
         res.status(400).send({ message: err.message });
       });
-  }
+  };
 
   try {
     if (req.body.idURL) {
@@ -136,18 +279,19 @@ router.post('/register/whatsapp', async function (req, res) {
         const id_hash = await response.buffer();
         req.body.nationalIdPhotoHash = id_hash;
 
-        const twilio_url = req.body.idURL
+        const twilio_url = req.body.idURL;
         const [accountID, messageID, mediaID] = twilio_url
-          .split("/")
+          .split('/')
           .slice(4)
           .filter((_, index) => index % 2 === 1);
 
-        tw_client.messages(messageID)
+        tw_client
+          .messages(messageID)
           .media(mediaID)
           .fetch()
           .then(media => {
-            const contentType = media.contentType
-            const [fileType, ext] = contentType.split("/");
+            const contentType = media.contentType;
+            const [fileType, ext] = contentType.split('/');
             const image_name = uuidv4();
             const filenames = resolveFilenames(image_name, `.${ext}`);
             const uploadParams = getUploadParams(
@@ -164,7 +308,7 @@ router.post('/register/whatsapp', async function (req, res) {
               } else {
                 // console.log('File uploaded ' + filenames.fileUrl);
                 req.body.user_identifier_image_url = filenames.fileUrl;
-                createUser(req.body)
+                createUser(req.body);
               }
             });
           });
@@ -220,13 +364,10 @@ router.get('/register/status/:phoneNumber', function (req, res) {
   }
 });
 
-
 router.get(
   '/migratewhatsappusers',
-  require('connect-ensure-login')
-    .ensureLoggedIn({ redirectTo: '/app/auth/login' }),
+  require('connect-ensure-login').ensureLoggedIn({ redirectTo: '/app/auth/login' }),
   function (req, res, next) {
-
     if (req.user.role === ROLES.Admin || req.user.role === ROLES.Superuser) {
       models.User.findAll({
         order: [['ID', 'ASC']],
@@ -235,7 +376,9 @@ router.get(
           let message = 'completed successfully';
           for (let i = 0; i < rows.length; i++) {
             if (rows[i].nationalIdPhotoHash === null) {
-              console.log(`no image for user ${rows[i].ID} - ${rows[i].firstName} ${rows[i].lastName}`);
+              console.log(
+                `no image for user ${rows[i].ID} - ${rows[i].firstName} ${rows[i].lastName}`
+              );
             } else {
               try {
                 const imageBuffer = Buffer.from(rows[i].nationalIdPhotoHash, 'binary');
@@ -264,7 +407,9 @@ router.get(
                       },
                     })
                       .then(_ => {
-                        console.log(`updated image for ${rows[i].ID} - ${rows[i].firstName} ${rows[i].lastName}`);
+                        console.log(
+                          `updated image for ${rows[i].ID} - ${rows[i].firstName} ${rows[i].lastName}`
+                        );
                       })
                       .catch(err => {
                         //throw err;
@@ -276,7 +421,9 @@ router.get(
                 });
               } catch (e) {
                 console.log(e);
-                console.log(`error on user ${rows[i].ID} - ${rows[i].firstName} ${rows[i].lastName}`);
+                console.log(
+                  `error on user ${rows[i].ID} - ${rows[i].firstName} ${rows[i].lastName}`
+                );
                 message = 'completed with errors please check console';
               }
             }
diff --git a/routes/users.js b/routes/users.js
new file mode 100644
index 00000000..94dfe14f
--- /dev/null
+++ b/routes/users.js
@@ -0,0 +1,273 @@
+var express = require('express');
+const ROLES = require('../utils/roles');
+var router = express.Router();
+
+// const { Op, Sequelize } = require('sequelize');
+var initModels = require('../models/init-models');
+var sequelise = require('../config/db/db_sequelise');
+const { check, validationResult } = require('express-validator');
+const multer = require('multer');
+const bcrypt = require('bcrypt');
+const jwt = require('jsonwebtoken');
+const uuidv4 = require('uuid/v4');
+const upload = multer({ dest: './static/images/id_images/' });
+
+var models = initModels(sequelise);
+
+/*Render user_management */
+router.get(
+  '/management',
+  require('connect-ensure-login').ensureLoggedIn({ redirectTo: '/app/auth/login' }),
+  function (req, res) {
+    if (req.user.role === ROLES.Admin || req.user.role === ROLES.Superuser) {
+      models.User.findAll({
+        attributes: [
+          'user_uuid',
+          'firstName',
+          'lastName',
+          'email',
+          'phoneNumber',
+          'role',
+          'isEmailVerified',
+          'isAdminVerified',
+          'farmName',
+          'organisationName',
+          'organisationType',
+          'city',
+          'nationalIdPhotoHash'
+        ],
+        /*where: {
+          role: { [Op.notIn]: [ROLES.Admin, ROLES.Superuser] },
+        },*/
+      })
+        .then(user_rows => {
+          for (let i = 0; i < user_rows.length; i++) {
+            if (user_rows[i].nationalIdPhotoHash === null) {
+              user_rows[i].nationalIdPhotoHash = '';
+            } else {
+              user_rows[i].nationalIdPhotoHash =
+                'data:image/png;base64,' +
+                Buffer.from(user_rows[i].nationalIdPhotoHash, 'binary').toString('base64');
+            }
+          }
+          res.render('user_management', {
+            title: 'FoodPrint - User management',
+            user: req.user,
+            data: user_rows,
+            page_name: 'UMS',
+          });
+        })
+        .catch(err => {
+          console.log('All users err:' + err);
+          req.flash('error', err);
+          res.render('user_management', {
+            title: 'FoodPrint - User management',
+            user: req.user,
+            data: '',
+            page_name: 'UMS',
+          });
+        });
+    } else {
+      res.render('error', {
+        message: 'You are not authorised to view this resource.',
+        title: 'Error',
+        user: req.user,
+        page_name: 'error',
+      });
+    }
+  }
+);
+
+router.post(
+  '/update',
+  upload.none(),
+  [
+    check('viewmodal_user_firstName', 'User FirstName value is not valid')
+      .not()
+      .isEmpty()
+      .trim()
+      .escape(),
+    check('viewmodal_user_lastName', 'User Lastname value is not valid')
+      .not()
+      .isEmpty()
+      .trim()
+      .escape(),
+    check('viewmodal_user_email', 'User email value is not valid').not().isEmpty().trim().escape(),
+    check('viewmodal_user_phoneNumber', 'User phone number value is not valid')
+      .not()
+      .isEmpty()
+      .trim()
+      .escape(),
+    check('viewmodal_user_role', 'User role value is not valid').not().isEmpty().trim().escape(),
+  ],
+  function (req, res) {
+    const result = validationResult(req);
+    const errors = result.errors;
+    for (let key in errors) {
+      console.log('Validation error - ' + errors[key].msg);
+    }
+
+    if (!result.isEmpty()) {
+      req.flash('error', errors);
+      res.redirect('/app/user/management');
+    } else {
+      let data = {
+        firstName: req.body.viewmodal_user_firstName,
+        lastName: req.body.viewmodal_user_lastName,
+        email: req.body.viewmodal_user_email,
+        phoneNumber: req.body.viewmodal_user_phoneNumber,
+        role: req.body.viewmodal_user_role,
+        isAdminVerified: req.body.viewmodal_user_profile,
+        ...(req.body.viewmodal_user_role === ROLES.Farmer && {
+          farmName: req.body.viewmodal_user_farmname }),
+        ...(req.body.viewmodal_user_role === ROLES.Intermediary && {
+          organisationName: req.body.viewmodal_user_orgname,
+          organisationType: req.body.viewmodal_user_orgtype,
+        }),
+        ...(req.body.viewmodal_user_role === ROLES.Agent && {
+          city: req.body.viewmodal_user_city }),
+      };
+
+      try {
+        models.User.update(data, {
+          where: {
+            user_uuid: req.body.viewmodal_user_uuid,
+          },
+        })
+          .then(_ => {
+            req.flash(
+              'success',
+              'User entry updated successfully! User UUID = ' + req.body.viewmodal_user_uuid
+            );
+            res.redirect('/app/user/management');
+          })
+          .catch(err => {
+            console.log('Error - Update User failed');
+            console.log(err);
+            req.flash('error', err.message);
+            res.redirect('/app/user/management');
+          });
+      } catch (e) {
+        next(e);
+        res.redirect('/app/user/management');
+      }
+    }
+  }
+);
+
+router.post(
+  '/save',
+  upload.none(),
+  [
+    check('viewmodal_user_firstName', 'User FirstName value is not valid')
+      .not()
+      .isEmpty()
+      .trim()
+      .escape(),
+    check('viewmodal_user_lastName', 'User Lastname value is not valid')
+      .not()
+      .isEmpty()
+      .trim()
+      .escape(),
+    check('viewmodal_user_email', 'User email value is not valid').not().isEmpty().trim().escape(),
+    check('viewmodal_user_phoneNumber', 'User phone number value is not valid')
+      .not()
+      .isEmpty()
+      .trim()
+      .escape(),
+    check('viewmodal_user_password', 'User phone number value is not valid')
+      .not()
+      .isEmpty()
+      .trim()
+      .escape(),
+    check('viewmodal_user_role', 'User role value is not valid').not().isEmpty().trim().escape(),
+  ],
+  async function (req, res) {
+    const result = validationResult(req);
+    const errors = result.errors;
+    for (let key in errors) {
+      console.log('Validation error - ' + errors[key].msg);
+    }
+
+    if (!result.isEmpty()) {
+      req.flash('error', errors);
+      res.redirect('/app/user/management');
+    } else {
+      const salt = await bcrypt.genSalt(10);
+      const hashedPassword = await bcrypt.hash(req.body.viewmodal_user_password, salt);
+      const confirmationCode = jwt.sign(
+        { email: req.body.viewmodal_user_email },
+        process.env.TOKEN_SIGN
+      );
+      const latestUser = await models.User.findOne({
+        attributes: ['ID'],
+        order: [['ID', 'DESC']],
+      });
+      const user_uuid = uuidv4();
+      const data = {
+        user_uuid: user_uuid,
+        userId: `${req.body.viewmodal_user_role.charAt(0).toUpperCase()}${user_uuid.substring(
+          0,
+          6
+        )}${latestUser ? latestUser.ID + 1 : 0}`,
+        firstName: req.body.viewmodal_user_firstName,
+        lastName: req.body.viewmodal_user_lastName,
+        email: req.body.viewmodal_user_email,
+        phoneNumber: req.body.viewmodal_user_phoneNumber,
+        role: req.body.viewmodal_user_role,
+        isAdminVerified: req.body.viewmodal_user_profile,
+        isEmailVerified: true,
+        password: hashedPassword,
+        emailVerificationToken: confirmationCode,
+      };
+
+      try {
+        models.User.create(data)
+          .then(_ => {
+            req.flash('success', 'User entry added successfully');
+            res.redirect('/app/user/management');
+          })
+          .catch(err => {
+            console.log('Error - Add User failed');
+            console.log(err);
+            req.flash('error', err.message);
+            res.redirect('/app/user/management');
+          });
+      } catch (e) {
+        next(e);
+        res.redirect('/app/user/management');
+      }
+    }
+  }
+);
+
+router.post(
+  '/delete',
+  upload.none(),
+  [check('viewmodal_user_uuid', 'User ID value is not valid').not().isEmpty().trim().escape()],
+  function (req, res) {
+    if (req.user.role === ROLES.Admin || req.user.role === ROLES.Superuser) {
+      models.User.destroy({
+        where: {
+          user_uuid: req.body.viewmodal_user_uuid,
+        },
+      })
+        .then(_ => {
+          req.flash(
+            'success',
+            'User entry deleted successfully! User ID = ' + req.body.viewmodal_user_uuid
+          );
+          res.redirect('/app/user/management');
+        })
+        .catch(err => {
+          req.flash('error', err.message);
+          res.redirect('/app/user/management');
+        });
+    } else {
+      req.flash('error', 'Not authorised');
+      res.redirect('/app/user/management');
+    }
+  }
+);
+
+module.exports = router;
diff --git a/server.js b/server.js
index 11f7fd39..44f3328a 100644
--- a/server.js
+++ b/server.js
@@ -15,6 +15,9 @@ var sequelise = require('./config/db/db_sequelise');
 var ROLES = require('./utils/roles');
 
 const CUSTOM_ENUMS = require('./utils/enums');
+const bcrypt = require('bcrypt');
+var initModels = require('./models/init-models');
+var models = initModels(sequelise);
 const swaggerJSDoc = require('swagger-jsdoc');
 const swaggerUi = require('swagger-ui-express');
 
@@ -64,6 +67,7 @@ var authRouter = require('./routes/auth');
 var blockchainRouter = require('./routes/blockchain');
 var dashboardsRouter = require('./routes/dashboards');
 var qrCodeRouter = require('./routes/qrcode');
+var umsRouter = require('./routes/users');
 
 var testRouter = require('./routes/test');
 var searchRouter = require('./routes/search');
@@ -147,6 +151,7 @@ app.use('/', router);
 app.use('/', blockchainRouter);
 app.use('/app/config', configRouter);
 app.use('/app/auth', authRouter);
+app.use('/app/user', umsRouter);
 app.use('/app/harvest', harvestRouter);
 app.use('/app/storage', storageRouter);
 app.use('/app/produce', produceRouter);
@@ -188,7 +193,7 @@ passport.use(
         if (!user) {
           return cb(null, false, { message: 'Incorrect username.' });
         }
-        if (user.password != password) {
+        if (user.password !== password) {
           return cb(null, false, { message: 'Incorrect password.' });
         }
         // If the credentials are valid, the verify callback invokes done to supply
@@ -207,20 +212,56 @@ passport.use(
       passwordField: 'loginPassword', //useful for custom id's on your credentials fields
     },
     function (username, password, cb) {
-      db.users.findByUsername(username, function (err, user) {
-        if (err) {
+      models.User.findOne({
+        attributes: [
+          'ID',
+          'firstName',
+          'middleName',
+          'lastName',
+          'email',
+          'password',
+          'role',
+          'isEmailVerified',
+          'isAdminVerified',
+        ],
+        where: {
+          email: username,
+        },
+      })
+        .then(async data => {
+          let user = {
+            id: data.ID,
+            username: '',
+            password: data.password,
+            displayName: `${data.firstName} ${data.lastName}`,
+            prefs: [{ value: data.email }],
+            email: data.email,
+            role: data.role,
+          };
+          if (!data) {
+            return cb(null, false, { message: 'Incorrect login details.' });
+          }
+
+          const match = await bcrypt.compare(password, user.password);
+          if (!match) {
+            return cb(null, false, { message: 'Incorrect login details.' });
+          }
+
+          if (!data.isEmailVerified) {
+            return cb(null, false, { message: 'Please verify your email first.' });
+          }
+
+          if (!data.isAdminVerified) {
+            return cb(null, false, {
+              message: 'Your profile is being reviewed by the Foodprint team.',
+            });
+          }
+          // console.log(user);
+          return cb(null, user);
+        })
+        .catch(err => {
           return cb(err);
-        }
-        if (!user) {
-          return cb(null, false, { message: 'Incorrect username.' });
-        }
-        if (user.password != password) {
-          return cb(null, false, { message: 'Incorrect password.' });
-        }
-        // If the credentials are valid, the verify callback invokes done to
-        // supply Passport with the user that authenticated.
-        return cb(null, user);
-      });
+        });
     }
   )
 );
@@ -237,12 +278,41 @@ passport.serializeUser(function (user, cb) {
 });
 
 passport.deserializeUser(function (id, cb) {
-  db.users.findById(id, function (err, user) {
-    if (err) {
-      return cb(err);
-    }
-    cb(null, user);
-  });
+  const strategy = process.env.AUTH_STATEGY ? process.env.AUTH_STATEGY : CUSTOM_ENUMS.DB_STRATEGY;
+  if (strategy === CUSTOM_ENUMS.FILE_STRATEGY) {
+    db.users.findById(id, function (err, user) {
+      if (err) {
+        return cb(err);
+      }
+      cb(null, user);
+    });
+  } else {
+    models.User.findOne({
+      attributes: ['ID', 'firstName', 'lastName', 'email', 'password', 'role'],
+      where: {
+        ID: id,
+      },
+    })
+      .then(data => {
+        const user = {
+          id: data.ID,
+          username: data.email,
+          password: data.password,
+          displayName: `${data.firstName} ${data.lastName}`,
+          prefs: [{ value: data.email }],
+          email: data.email,
+          role: data.role,
+        };
+        if (!data) {
+          return cb(err);
+        }
+
+        return cb(null, user);
+      })
+      .catch(err => {
+        return cb(err);
+      });
+  }
 });
 
 // catch 404 and forward to error handler
diff --git a/src/css/custom.css b/src/css/custom.css
index 61cc71f3..0ccab03a 100644
--- a/src/css/custom.css
+++ b/src/css/custom.css
@@ -1,1676 +1,1655 @@
 /* Your custom css code goes here */
 
 .imgGrid {
-    width: 350px;
-    height: 250px;
-    overflow: hidden;
+  width: 350px;
+  height: 250px;
+  overflow: hidden;
 }
 
+.register-option {
+  padding: 10px;
+}
 
 /*  spinner CSS */
 
 @keyframes spinner-border {
-    to {
-        transform: rotate(360deg);
-    }
+  to {
+    transform: rotate(360deg);
+  }
 }
 
 .spinner-border {
-    display: inline-block;
-    width: 1rem;
-    height: 1rem;
-    vertical-align: text-bottom;
-    border: 0.25em solid currentColor;
-    border-right-color: transparent;
-    border-radius: 50%;
-    -webkit-animation: spinner-border 0.75s linear infinite;
-    animation: spinner-border 0.75s linear infinite;
+  display: inline-block;
+  width: 1rem;
+  height: 1rem;
+  vertical-align: text-bottom;
+  border: 0.25em solid currentColor;
+  border-right-color: transparent;
+  border-radius: 50%;
+  -webkit-animation: spinner-border 0.75s linear infinite;
+  animation: spinner-border 0.75s linear infinite;
 }
 
 .spinner-border-sm {
-    height: 1rem;
-    border-width: 0.2em;
+  height: 1rem;
+  border-width: 0.2em;
 }
 
-
 /*textare for bbuyer seller*/
 
 .descriptionTextAreaInput {
-    overflow: auto;
-    width: 100%;
+  overflow: auto;
+  width: 100%;
 }
 
-
 /* landing dash */
 
 .landing {
-    background-color: #fff;
-    color: #333;
-    padding-top: 10px;
-    padding-right: 10px;
-    padding-bottom: 10px;
-    padding-left: 10px;
+  background-color: #fff;
+  color: #333;
+  padding-top: 10px;
+  padding-right: 10px;
+  padding-bottom: 10px;
+  padding-left: 10px;
 }
 
-
 /* /bootstrap-3-equal-height-cards */
 
 .row.display-flex {
-    display: flex;
-    flex-wrap: wrap;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .thumbnail {
-    height: 100%;
+  height: 100%;
 }
 
-
 /* Login form */
 
 .login {
-    background-color: #fff;
-    color: #333;
-    padding-top: 10px;
-    padding-right: 10px;
-    padding-bottom: 10px;
-    padding-left: 10px;
+  background-color: #fff;
+  color: #333;
+  padding-top: 10px;
+  padding-right: 10px;
+  padding-bottom: 10px;
+  padding-left: 10px;
 }
 
-
 /* position footer at bottom of page https://stackoverflow.com/questions/10470241/how-to-position-a-footer-element-relative-to-the-bottom-of-the-page */
 
 .footer {
-    padding-top: 10px;
-    padding-left: 10px;
-    padding-bottom: 10px;
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-    background-color: rgb(246, 246, 246);
-    color: #333;
-    height: 50px;
-    /* same height as the margin to the bottom of the body */
+  padding-top: 10px;
+  padding-left: 10px;
+  padding-bottom: 10px;
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  background-color: rgb(246, 246, 246);
+  color: #333;
+  height: 50px;
+  /* same height as the margin to the bottom of the body */
 }
 
 html {
-    position: relative;
-    min-height: 100%;
+  position: relative;
+  min-height: 100%;
 }
 
 body {
-    margin-bottom: 50px;
-    background-color: #fff !important;
+  margin-bottom: 50px;
+  background-color: #fff !important;
 }
 
-
 /*Qrcode attribute timeline card*/
 
 .qrcodedetailscardtimeline {
-    border-radius: 5px;
-    margin: 10px;
-    box-shadow: 2px 2px 4px 5px #ccc;
-    margin: auto;
-    width: 30%;
+  border-radius: 5px;
+  margin: 10px;
+  box-shadow: 2px 2px 4px 5px #ccc;
+  margin: auto;
+  width: 30%;
 }
 
 @media only screen and (max-width: 600px) {
-    .qrcodedetailscardtimeline {
-        width: 80%;
-    }
+  .qrcodedetailscardtimeline {
+    width: 80%;
+  }
 }
 
 @media only screen and (max-width: 800px) and (min-width: 550px) {
-    .qrcodedetailscardtimeline {
-        width: 80%;
-    }
+  .qrcodedetailscardtimeline {
+    width: 80%;
+  }
 }
 
-
 /*Order Dashboard 2.0*/
 
 .order-card-title {
-    font-size: x-small;
-    letter-spacing: 1px;
-    padding-top: 0;
-    color: black;
+  font-size: x-small;
+  letter-spacing: 1px;
+  padding-top: 0;
+  color: black;
 }
 
 .order-card-data {
-    padding: 0;
-    margin: 0;
+  padding: 0;
+  margin: 0;
 }
 
 .acceptBid {
-    margin-bottom: 1rem;
-    padding-left: 4.9rem;
-    padding-right: 4.9rem;
-    box-shadow: 2px 1px 2px 2px #ccc;
+  margin-bottom: 1rem;
+  padding-left: 4.9rem;
+  padding-right: 4.9rem;
+  box-shadow: 2px 1px 2px 2px #ccc;
 }
 
 .acceptOffer {
-    margin-bottom: 1rem;
-    padding-left: 4.9rem;
-    padding-right: 4.9rem;
-    box-shadow: 2px 1px 2px 2px #ccc;
+  margin-bottom: 1rem;
+  padding-left: 4.9rem;
+  padding-right: 4.9rem;
+  box-shadow: 2px 1px 2px 2px #ccc;
 }
 
 .qrcode-card-title {
-    font-size: x-small;
-    letter-spacing: 1px;
-    padding-top: 0;
-    color: black;
+  font-size: x-small;
+  letter-spacing: 1px;
+  padding-top: 0;
+  color: black;
 }
 
 .qrcode-card-heading {
-    letter-spacing: 1px;
-    color: black;
+  letter-spacing: 1px;
+  color: black;
 }
 
-
 /* ------------ New UI Changes ------------------ Author: Nkululeko*/
 
-
 /* Header Start */
 
-
 /* Decrease Letter spacing */
 
 .probootstrap-main-nav li a {
-    letter-spacing: 1px;
+  letter-spacing: 1px;
 }
 
 .header-container {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 0 2vw;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 2vw;
 }
 
-
 /* Join Logo with logo name style*/
 
 .logo-wrapper {
-    display: flex;
-    align-items: center;
+  display: flex;
+  align-items: center;
 }
 
 .logo-wrapper h2 {
-    margin: 0;
+  margin: 0;
 }
 
-
 /* Dropdown menu add padding */
 
 .dropdown-menu {
-    padding: 15px 20px;
+  padding: 15px 20px;
 }
 
 .dropdown-menu .dropdown-divider {
-    margin: 0.4rem 0;
-    border-top: 1px solid #ddd;
+  margin: 0.4rem 0;
+  border-top: 1px solid #ddd;
 }
 
 .login-header {
-    border: 1px solid #b2d430;
-    border-bottom: 1px solid #b2d430 !important;
-    border-radius: 8px;
-    padding: 0.5rem 1.5rem !important;
-    color: #b2d430 !important;
-    font-weight: bold !important;
-    transition: all 0.5s ease-in-out !important;
+  border: 1px solid #b2d430;
+  border-bottom: 1px solid #b2d430 !important;
+  border-radius: 8px;
+  padding: 0.5rem 1.5rem !important;
+  color: #b2d430 !important;
+  font-weight: bold !important;
+  transition: all 0.5s ease-in-out !important;
 }
 
 .login-header:hover {
-    background-color: #b2d430;
-    color: #fff !important;
+  background-color: #b2d430;
+  color: #fff !important;
 }
 
-
 /* Medium size screen  */
 
 @media only screen and (max-width: 800px) and (min-width: 550px) {
-    .header-container {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 0 2vw;
-    }
-    /* Join Logo with logo name style*/
-    .logo-wrapper {
-        display: flex;
-        align-items: center;
-        margin-right: auto;
-    }
-    .logo-wrapper h2 {
-        margin: 0;
-    }
-    .probootstrap-burger-menu {
-        top: 35px;
-    }
+  .header-container {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 2vw;
+  }
+  /* Join Logo with logo name style*/
+  .logo-wrapper {
+    display: flex;
+    align-items: center;
+    margin-right: auto;
+  }
+  .logo-wrapper h2 {
+    margin: 0;
+  }
+  .probootstrap-burger-menu {
+    top: 35px;
+  }
 }
 
-
 /* Smaller size screen */
 
 @media only screen and (max-width: 550px) {
-    .header-container {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 0 2vw;
-    }
-    /* Join Logo with logo name style*/
-    .logo-wrapper {
-        display: flex;
-        align-items: center;
-        margin-right: auto;
-    }
-    .logo-wrapper h2 {
-        margin: 0;
-    }
-    .probootstrap-burger-menu {
-        top: 35px;
-    }
-    .nav-item.dropdown .dropdown-menu a {
-        color: #000000 !important;
-    }
-    .nav-item.dropdown .dropdown-menu a:hover {
-        color: #b2d430 !important;
-    }
+  .header-container {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 2vw;
+  }
+  /* Join Logo with logo name style*/
+  .logo-wrapper {
+    display: flex;
+    align-items: center;
+    margin-right: auto;
+  }
+  .logo-wrapper h2 {
+    margin: 0;
+  }
+  .probootstrap-burger-menu {
+    top: 35px;
+  }
+  .nav-item.dropdown .dropdown-menu a {
+    color: #000000 !important;
+  }
+  .nav-item.dropdown .dropdown-menu a:hover {
+    color: #b2d430 !important;
+  }
 }
 
-
 /* Header Changes End */
 
-
 /* Footer Changes Start */
 
 .footer div {
-    display: grid;
-    place-items: center;
+  display: grid;
+  place-items: center;
 }
 
 .footer p {
-    padding-top: 0.5em;
-    font-size: 12px;
+  padding-top: 0.5em;
+  font-size: 12px;
 }
 
-
 /* Medium size screen  */
 
 @media only screen and (max-width: 800px) and (min-width: 550px) {
-    .footer div {
-        display: grid;
-        place-items: center;
-    }
-    .footer p {
-        padding-top: 0.5em;
-        font-size: 12px;
-    }
+  .footer div {
+    display: grid;
+    place-items: center;
+  }
+  .footer p {
+    padding-top: 0.5em;
+    font-size: 12px;
+  }
 }
 
-
 /* Smaller size screen */
 
 @media only screen and (max-width: 550px) {
-    .footer div {
-        display: grid;
-        place-items: center;
-    }
-    .footer p {
-        padding-top: 0.7em;
-        font-size: 9px;
-        text-align: center;
-    }
+  .footer div {
+    display: grid;
+    place-items: center;
+  }
+  .footer p {
+    padding-top: 0.7em;
+    font-size: 9px;
+    text-align: center;
+  }
 }
 
-
 /* Footer Changes End */
 
-
 /* Login View Changes Start */
 
 .login {
-    /* padding: 1rem 3rem; */
-    border-radius: 15px;
-    margin: 5rem 0;
-    padding: 0;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
+  /* padding: 1rem 3rem; */
+  border-radius: 15px;
+  margin: 5rem 0;
+  padding: 0;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
 }
 
 .login-image {
-    padding: 0;
-    border-top-right-radius: 15px;
-    border-top-left-radius: 15px;
+  padding: 0;
+  border-top-right-radius: 15px;
+  border-top-left-radius: 15px;
 }
 
 .login .heading {
-    text-transform: uppercase;
-    text-align: center;
-    font-size: 25px;
-    font-weight: 700;
-    letter-spacing: 2px;
+  text-transform: uppercase;
+  text-align: center;
+  font-size: 25px;
+  font-weight: 700;
+  letter-spacing: 2px;
 }
 
 .login-form {
-    padding: 2rem 4rem;
+  padding: 2rem 4rem;
 }
 
 @media only screen and (max-width: 800px) and (min-width: 550px) {
-    .login-form {
-        padding: 2rem 2rem;
-    }
+  .login-form {
+    padding: 2rem 2rem;
+  }
 }
 
-
 /* Smaller size screen */
 
 @media only screen and (max-width: 550px) {
-    .login-form {
-        padding: 2rem 1rem;
-    }
+  .login-form {
+    padding: 2rem 1rem;
+  }
 }
 
-
 /* Login View Changes End */
 
-
 /* Registration View Changes Start */
 
 .register {
-    /* padding: 1rem 3rem; */
-    border-radius: 15px;
-    margin: 5rem 0;
-    padding: 0;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    background-color: #fff;
+  /* padding: 1rem 3rem; */
+  border-radius: 15px;
+  margin: 5rem 0;
+  padding: 0;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  background-color: #fff;
 }
 
 .register-image {
-    padding: 0;
-    border-top-right-radius: 15px;
-    border-top-left-radius: 15px;
+  padding: 0;
+  border-top-right-radius: 15px;
+  border-top-left-radius: 15px;
 }
 
 .register .heading {
-    text-transform: uppercase;
-    text-align: center;
-    font-size: 25px;
-    font-weight: 700;
-    letter-spacing: 2px;
+  text-transform: uppercase;
+  text-align: center;
+  font-size: 25px;
+  font-weight: 700;
+  letter-spacing: 2px;
 }
 
 .register-form {
-    padding: 1rem 4rem;
+  padding: 1rem 4rem;
 }
 
 @media only screen and (max-width: 800px) and (min-width: 550px) {
-    .register-form {
-        padding: 2rem 2rem;
-    }
+  .register-form {
+    padding: 2rem 2rem;
+  }
 }
 
-
 /* Smaller size screen */
 
 @media only screen and (max-width: 550px) {
-    .register-form {
-        padding: 2rem 1rem;
-    }
+  .register-form {
+    padding: 2rem 1rem;
+  }
 }
 
-
 /* Registration View Changes End */
 
-
 /* Home Dashboard View Changes Start */
 
 .home-dashboard {
-    padding: 0.5rem 8rem;
+  padding: 0.5rem 8rem;
 }
 
 .home-dashboard .title {
-    width: 100%;
-    display: grid;
-    place-items: center;
+  width: 100%;
+  display: grid;
+  place-items: center;
 }
 
 .home-dashboard .row h4 {
-    font-weight: 400;
-    text-transform: uppercase;
+  font-weight: 400;
+  text-transform: uppercase;
 }
 
 .home-dashboard .row .card .card-header .card-title a {
-    color: #454545;
-    margin-left: 5px;
+  color: #454545;
+  margin-left: 5px;
 }
 
 .home-dashboard .row .card .card-header .card-title i {
-    color: #b2d430;
+  color: #b2d430;
 }
 
 @media only screen and (max-width: 800px) and (min-width: 550px) {
-    .home-dashboard {
-        padding: 0.5rem 2.5rem;
-    }
+  .home-dashboard {
+    padding: 0.5rem 2.5rem;
+  }
 }
 
-
 /* Smaller size screen */
 
 @media only screen and (max-width: 550px) {
-    .home-dashboard {
-        padding: 0.5rem 1.5rem;
-    }
+  .home-dashboard {
+    padding: 0.5rem 1.5rem;
+  }
 }
 
-
 /* Home Dashboard View Changes End */
 
-
 /* Harvest Logbook View Changes Start */
 
 @media only screen and (max-width: 800px) and (min-width: 550px) {
-    .container.harvestlogbook .buttons {
-        display: grid;
-        grid-gap: 1rem;
-    }
-    .table-container {
-        width: 100%;
-        overflow: hidden;
-    }
-    .table {
-        overflow-x: auto;
-        display: block;
-    }
+  .container.harvestlogbook .buttons {
+    display: grid;
+    grid-gap: 1rem;
+  }
+  .table-container {
+    width: 100%;
+    overflow: hidden;
+  }
+  .table {
+    overflow-x: auto;
+    display: block;
+  }
 }
 
-
 /* Smaller size screen */
 
 @media only screen and (max-width: 550px) {
-    .container.harvestlogbook .buttons {
-        display: grid;
-        grid-gap: 0.5rem;
-    }
-    .table-container {
-        width: 100%;
-        overflow: hidden;
-    }
-    .table {
-        overflow-x: auto;
-        display: block;
-    }
+  .container.harvestlogbook .buttons {
+    display: grid;
+    grid-gap: 0.5rem;
+  }
+  .table-container {
+    width: 100%;
+    overflow: hidden;
+  }
+  .table {
+    overflow-x: auto;
+    display: block;
+  }
 }
 
-
 /* Harvest Logbook View Changes End */
 
-
 /* Storage/Handover Logbook View Changes Start */
 
 @media only screen and (max-width: 800px) and (min-width: 550px) {
-    .container.storagelogbook .buttons {
-        display: grid;
-        grid-gap: 1rem;
-    }
-    .table-container {
-        width: 100%;
-        overflow: hidden;
-    }
-    .table {
-        overflow-x: auto;
-        display: block;
-    }
+  .container.storagelogbook .buttons {
+    display: grid;
+    grid-gap: 1rem;
+  }
+  .table-container {
+    width: 100%;
+    overflow: hidden;
+  }
+  .table {
+    overflow-x: auto;
+    display: block;
+  }
 }
 
-
 /* Smaller size screen */
 
 @media only screen and (max-width: 550px) {
-    .container.storagelogbook .buttons {
-        display: grid;
-        grid-gap: 0.5rem;
-    }
-    .table-container {
-        width: 100%;
-        overflow: hidden;
-    }
-    .table {
-        overflow-x: auto;
-        display: block;
-    }
+  .container.storagelogbook .buttons {
+    display: grid;
+    grid-gap: 0.5rem;
+  }
+  .table-container {
+    width: 100%;
+    overflow: hidden;
+  }
+  .table {
+    overflow-x: auto;
+    display: block;
+  }
 }
 
-
 /* Storage/Handover Logbook View Changes End */
 
-
 /* Trace Produce View Changes Start */
 
 .container.traceproduce #search_result_title h5 {
-    font-weight: 600 !important;
-    font-size: 1.5rem !important;
+  font-weight: 600 !important;
+  font-size: 1.5rem !important;
 }
 
 .container.traceproduce #search_result_title_storage h6 {
-    font-weight: 500 !important;
-    font-size: 1.2rem !important;
-    margin-bottom: 0.5rem !important;
-    color: #1c1c1c;
+  font-weight: 500 !important;
+  font-size: 1.2rem !important;
+  margin-bottom: 0.5rem !important;
+  color: #1c1c1c;
 }
 
 .container.traceproduce #search_result_title_harvest h6 {
-    font-weight: 500 !important;
-    font-size: 1.2rem !important;
-    margin-bottom: 0.5rem !important;
-    color: #1c1c1c;
+  font-weight: 500 !important;
+  font-size: 1.2rem !important;
+  margin-bottom: 0.5rem !important;
+  color: #1c1c1c;
 }
 
 .container.traceproduce #search_result_harvest li {
-    display: flex !important;
-    flex-direction: column !important;
+  display: flex !important;
+  flex-direction: column !important;
 }
 
 .container.traceproduce #search_result_storage li {
-    display: flex !important;
-    flex-direction: column !important;
+  display: flex !important;
+  flex-direction: column !important;
 }
 
-@media only screen and (max-width: 800px) and (min-width: 550px) {}
-
+@media only screen and (max-width: 800px) and (min-width: 550px) {
+}
 
 /* Smaller size screen */
 
-@media only screen and (max-width: 550px) {}
-
+@media only screen and (max-width: 550px) {
+}
 
 /* Trace Produce View Changes End */
 
-
 /* Buyer Logbook View Changes Start */
 
 .container.buyerlogbook .buttons-top {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin: 1rem 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: 1rem 0;
 }
 
 .container.buyerlogbook .buttons-top .filter select {
-    padding: 0.4rem 0.3rem;
-    width: 100%;
-    border-radius: 5px;
+  padding: 0.4rem 0.3rem;
+  width: 100%;
+  border-radius: 5px;
 }
 
 .container.buyerlogbook .buttons-top .filter select:focus {
-    outline: none;
+  outline: none;
 }
 
-
 /* Add New Bid Modal */
 
 #buyerOfferModalForm .modal-dialog {
-    width: 100vw !important;
-    display: grid;
-    place-items: center;
+  width: 100vw !important;
+  display: grid;
+  place-items: center;
 }
 
 #buyerOfferModalForm .modal-content {
-    width: 75%;
+  width: 75%;
 }
 
 #buyerOfferModalForm .modal-content .modal-header .close {
-    margin-left: auto !important;
-    margin-right: 1rem;
+  margin-left: auto !important;
+  margin-right: 1rem;
 }
 
 #buyerOfferModalForm .modal-content .modal-header .modal-title {
-    margin-left: auto !important;
-    font-size: 1.3rem;
-    font-weight: 800;
-    color: #1c1c1c;
-    text-transform: uppercase;
+  margin-left: auto !important;
+  font-size: 1.3rem;
+  font-weight: 800;
+  color: #1c1c1c;
+  text-transform: uppercase;
 }
 
 #buyerOfferModalForm .modal-content .modal-header {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 1.5rem 0.8rem;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 1.5rem 0.8rem;
 }
 
 #buyerOfferModalForm .modal-content .modal-body {
-    display: flex;
-    flex-direction: column;
+  display: flex;
+  flex-direction: column;
 }
 
 #buyerOfferModalForm .modal-content .modal-body .modal-row {
-    display: flex;
+  display: flex;
 }
 
 #buyerOfferModalForm .modal-content .modal-body .modal-column {
-    width: 50%;
-    padding: 1rem 2rem;
+  width: 50%;
+  padding: 1rem 2rem;
 }
 
 #buyerOfferModalForm .modal-content .modal-body .modal-column.full-width {
-    width: 100%;
-    padding: 1rem 2rem;
+  width: 100%;
+  padding: 1rem 2rem;
 }
 
 @media only screen and (max-width: 850px) and (min-width: 550px) {
-    #buyerOfferModalForm .modal-content {
-        width: 85%;
-    }
-    #buyerOfferModalForm .modal-content .modal-header .close {
-        margin-left: auto !important;
-        margin-right: 1rem;
-    }
-    #buyerOfferModalForm .modal-content .modal-header .modal-title {
-        margin-left: auto !important;
-        font-size: 1.3rem;
-        font-weight: 800;
-        color: #1c1c1c;
-        text-transform: uppercase;
-    }
-    #buyerOfferModalForm .modal-content .modal-header {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        padding: 1.5rem 0.8rem;
-    }
-    #buyerOfferModalForm .modal-content .modal-body {
-        display: flex;
-    }
-    #buyerOfferModalForm .modal-content .modal-body .modal-row .modal-column {
-        width: 50%;
-        padding: 0.8rem 1.2rem;
-    }
+  #buyerOfferModalForm .modal-content {
+    width: 85%;
+  }
+  #buyerOfferModalForm .modal-content .modal-header .close {
+    margin-left: auto !important;
+    margin-right: 1rem;
+  }
+  #buyerOfferModalForm .modal-content .modal-header .modal-title {
+    margin-left: auto !important;
+    font-size: 1.3rem;
+    font-weight: 800;
+    color: #1c1c1c;
+    text-transform: uppercase;
+  }
+  #buyerOfferModalForm .modal-content .modal-header {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 1.5rem 0.8rem;
+  }
+  #buyerOfferModalForm .modal-content .modal-body {
+    display: flex;
+  }
+  #buyerOfferModalForm .modal-content .modal-body .modal-row .modal-column {
+    width: 50%;
+    padding: 0.8rem 1.2rem;
+  }
 }
 
-
 /* Smaller size screen */
 
 @media only screen and (max-width: 650px) {
-    #buyerOfferModalForm .modal-content .modal-body {
-        display: flex;
-        flex-direction: column;
-    }
-    #buyerOfferModalForm .modal-content .modal-body .modal-row {
-        flex-direction: column;
-    }
-    #buyerOfferModalForm .modal-content .modal-body .modal-row .modal-column {
-        width: 100%;
-        padding: 0rem 0.5rem;
-    }
-    #buyerOfferModalForm .modal-content .modal-header .modal-title {
-        font-size: 1rem;
-    }
+  #buyerOfferModalForm .modal-content .modal-body {
+    display: flex;
+    flex-direction: column;
+  }
+  #buyerOfferModalForm .modal-content .modal-body .modal-row {
+    flex-direction: column;
+  }
+  #buyerOfferModalForm .modal-content .modal-body .modal-row .modal-column {
+    width: 100%;
+    padding: 0rem 0.5rem;
+  }
+  #buyerOfferModalForm .modal-content .modal-header .modal-title {
+    font-size: 1rem;
+  }
 }
 
-
 /* --- View Bid Modal --- */
 
 #viewBidModalForm .modal-dialog {
-    width: 100vw !important;
-    display: grid;
-    place-items: center;
+  width: 100vw !important;
+  display: grid;
+  place-items: center;
 }
 
 #viewBidModalForm .modal-content {
-    width: 75%;
+  width: 75%;
 }
 
 #viewBidModalForm .modal-content .modal-header .close {
-    margin-left: auto !important;
-    margin-right: 1rem;
+  margin-left: auto !important;
+  margin-right: 1rem;
 }
 
 #viewBidModalForm .modal-content .modal-header .modal-title {
-    margin-left: auto !important;
-    font-size: 1.3rem;
-    font-weight: 800;
-    color: #1c1c1c;
-    text-transform: uppercase;
+  margin-left: auto !important;
+  font-size: 1.3rem;
+  font-weight: 800;
+  color: #1c1c1c;
+  text-transform: uppercase;
 }
 
 #viewBidModalForm .modal-content .modal-header {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 1.5rem 0.8rem;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 1.5rem 0.8rem;
 }
 
 #viewBidModalForm .modal-content .modal-body {
-    display: flex;
-    flex-direction: column;
+  display: flex;
+  flex-direction: column;
 }
 
 #viewBidModalForm .modal-content .modal-body .modal-row {
-    display: flex;
+  display: flex;
 }
 
 #viewBidModalForm .modal-content .modal-body .modal-column {
-    width: 50%;
-    padding: 1rem 2rem;
+  width: 50%;
+  padding: 1rem 2rem;
 }
 
 #viewBidModalForm .modal-content .modal-body .modal-column.full-width {
-    width: 100%;
-    padding: 1rem 2rem;
+  width: 100%;
+  padding: 1rem 2rem;
 }
 
 @media only screen and (max-width: 850px) and (min-width: 550px) {
-    #viewBidModalForm .modal-content {
-        width: 85%;
-    }
-    #viewBidModalForm .modal-content .modal-header .close {
-        margin-left: auto !important;
-        margin-right: 1rem;
-    }
-    #viewBidModalForm .modal-content .modal-header .modal-title {
-        margin-left: auto !important;
-        font-size: 1.3rem;
-        font-weight: 800;
-        color: #1c1c1c;
-        text-transform: uppercase;
-    }
-    #viewBidModalForm .modal-content .modal-header {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        padding: 1.5rem 0.8rem;
-    }
-    #viewBidModalForm .modal-content .modal-body {
-        display: flex;
-    }
-    #viewBidModalForm .modal-content .modal-body .modal-row .modal-column {
-        width: 50%;
-        padding: 0.8rem 1.2rem;
-    }
+  #viewBidModalForm .modal-content {
+    width: 85%;
+  }
+  #viewBidModalForm .modal-content .modal-header .close {
+    margin-left: auto !important;
+    margin-right: 1rem;
+  }
+  #viewBidModalForm .modal-content .modal-header .modal-title {
+    margin-left: auto !important;
+    font-size: 1.3rem;
+    font-weight: 800;
+    color: #1c1c1c;
+    text-transform: uppercase;
+  }
+  #viewBidModalForm .modal-content .modal-header {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 1.5rem 0.8rem;
+  }
+  #viewBidModalForm .modal-content .modal-body {
+    display: flex;
+  }
+  #viewBidModalForm .modal-content .modal-body .modal-row .modal-column {
+    width: 50%;
+    padding: 0.8rem 1.2rem;
+  }
 }
 
-
 /* Smaller size screen */
 
 @media only screen and (max-width: 650px) {
-    #viewBidModalForm .modal-content .modal-body {
-        display: flex;
-        flex-direction: column;
-    }
-    #viewBidModalForm .modal-content .modal-body .modal-row {
-        flex-direction: column;
-    }
-    #viewBidModalForm .modal-content .modal-body .modal-row .modal-column {
-        width: 100%;
-        padding: 0rem 0.5rem;
-    }
-    #viewBidModalForm .modal-content .modal-header .modal-title {
-        font-size: 1rem;
-    }
+  #viewBidModalForm .modal-content .modal-body {
+    display: flex;
+    flex-direction: column;
+  }
+  #viewBidModalForm .modal-content .modal-body .modal-row {
+    flex-direction: column;
+  }
+  #viewBidModalForm .modal-content .modal-body .modal-row .modal-column {
+    width: 100%;
+    padding: 0rem 0.5rem;
+  }
+  #viewBidModalForm .modal-content .modal-header .modal-title {
+    font-size: 1rem;
+  }
 }
 
-
 /* Buyer Logbook View Changes End */
 
-
 /* Seller Logbook View Changes Start */
 
 .container.sellerlogbook .buttons-top {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin: 1rem 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: 1rem 0;
 }
 
 .container.sellerlogbook .buttons-top .filter select {
-    padding: 0.4rem 0.3rem;
-    width: 100%;
-    border-radius: 5px;
+  padding: 0.4rem 0.3rem;
+  width: 100%;
+  border-radius: 5px;
 }
 
 .container.sellerlogbook .buttons-top .filter select:focus {
-    outline: none;
+  outline: none;
 }
 
 #sellerOfferModalForm .modal-dialog {
-    width: 100vw !important;
-    display: grid;
-    place-items: center;
+  width: 100vw !important;
+  display: grid;
+  place-items: center;
 }
 
 #sellerOfferModalForm .modal-content {
-    width: 75%;
+  width: 75%;
 }
 
 #sellerOfferModalForm .modal-content .modal-header .close {
-    margin-left: auto !important;
-    margin-right: 1rem;
+  margin-left: auto !important;
+  margin-right: 1rem;
 }
 
 #sellerOfferModalForm .modal-content .modal-header .modal-title {
-    margin-left: auto !important;
-    font-size: 1.3rem;
-    font-weight: 800;
-    color: #1c1c1c;
-    text-transform: uppercase;
+  margin-left: auto !important;
+  font-size: 1.3rem;
+  font-weight: 800;
+  color: #1c1c1c;
+  text-transform: uppercase;
 }
 
 #sellerOfferModalForm .modal-content .modal-header {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 1.5rem 0.8rem;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 1.5rem 0.8rem;
 }
 
 #sellerOfferModalForm .modal-content .modal-body {
-    display: flex;
-    flex-direction: column;
+  display: flex;
+  flex-direction: column;
 }
 
 #sellerOfferModalForm .modal-content .modal-body .modal-row {
-    display: flex;
+  display: flex;
 }
 
 #sellerOfferModalForm .modal-content .modal-body .modal-column {
-    width: 50%;
-    padding: 1rem 2rem;
+  width: 50%;
+  padding: 1rem 2rem;
 }
 
 #sellerOfferModalForm .modal-content .modal-body .modal-column.full-width {
-    width: 100%;
-    padding: 1rem 2rem;
+  width: 100%;
+  padding: 1rem 2rem;
 }
 
 @media only screen and (max-width: 850px) and (min-width: 550px) {
-    #sellerOfferModalForm .modal-content {
-        width: 85%;
-    }
-    #sellerOfferModalForm .modal-content .modal-header .close {
-        margin-left: auto !important;
-        margin-right: 1rem;
-    }
-    #sellerOfferModalForm .modal-content .modal-header .modal-title {
-        margin-left: auto !important;
-        font-size: 1.3rem;
-        font-weight: 800;
-        color: #1c1c1c;
-        text-transform: uppercase;
-    }
-    #sellerOfferModalForm .modal-content .modal-header {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        padding: 1.5rem 0.8rem;
-    }
-    #sellerOfferModalForm .modal-content .modal-body {
-        display: flex;
-    }
-    #sellerOfferModalForm .modal-content .modal-body .modal-row .modal-column {
-        width: 50%;
-        padding: 0.8rem 1.2rem;
-    }
+  #sellerOfferModalForm .modal-content {
+    width: 85%;
+  }
+  #sellerOfferModalForm .modal-content .modal-header .close {
+    margin-left: auto !important;
+    margin-right: 1rem;
+  }
+  #sellerOfferModalForm .modal-content .modal-header .modal-title {
+    margin-left: auto !important;
+    font-size: 1.3rem;
+    font-weight: 800;
+    color: #1c1c1c;
+    text-transform: uppercase;
+  }
+  #sellerOfferModalForm .modal-content .modal-header {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 1.5rem 0.8rem;
+  }
+  #sellerOfferModalForm .modal-content .modal-body {
+    display: flex;
+  }
+  #sellerOfferModalForm .modal-content .modal-body .modal-row .modal-column {
+    width: 50%;
+    padding: 0.8rem 1.2rem;
+  }
 }
 
-
 /* --- View Offer Modal --- */
 
 #viewOfferModalForm .modal-dialog {
-    width: 100vw !important;
-    display: grid;
-    place-items: center;
+  width: 100vw !important;
+  display: grid;
+  place-items: center;
 }
 
 #viewOfferModalForm .modal-content {
-    width: 75%;
+  width: 75%;
 }
 
 #viewOfferModalForm .modal-content .modal-header .close {
-    margin-left: auto !important;
-    margin-right: 1rem;
+  margin-left: auto !important;
+  margin-right: 1rem;
 }
 
 #viewOfferModalForm .modal-content .modal-header .modal-title {
-    margin-left: auto !important;
-    font-size: 1.3rem;
-    font-weight: 800;
-    color: #1c1c1c;
-    text-transform: uppercase;
+  margin-left: auto !important;
+  font-size: 1.3rem;
+  font-weight: 800;
+  color: #1c1c1c;
+  text-transform: uppercase;
 }
 
 #viewOfferModalForm .modal-content .modal-header {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 1.5rem 0.8rem;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 1.5rem 0.8rem;
 }
 
 #viewOfferModalForm .modal-content .modal-body {
-    display: flex;
-    flex-direction: column;
+  display: flex;
+  flex-direction: column;
 }
 
 #viewOfferModalForm .modal-content .modal-body .modal-row {
-    display: flex;
+  display: flex;
 }
 
 #viewOfferModalForm .modal-content .modal-body .modal-column {
-    width: 50%;
-    padding: 1rem 2rem;
+  width: 50%;
+  padding: 1rem 2rem;
 }
 
 #viewOfferModalForm .modal-content .modal-body .modal-column.full-width {
-    width: 100%;
-    padding: 1rem 2rem;
+  width: 100%;
+  padding: 1rem 2rem;
 }
 
 @media only screen and (max-width: 850px) and (min-width: 550px) {
-    #viewOfferModalForm .modal-content {
-        width: 85%;
-    }
-    #viewOfferModalForm .modal-content .modal-header .close {
-        margin-left: auto !important;
-        margin-right: 1rem;
-    }
-    #viewOfferModalForm .modal-content .modal-header .modal-title {
-        margin-left: auto !important;
-        font-size: 1.3rem;
-        font-weight: 800;
-        color: #1c1c1c;
-        text-transform: uppercase;
-    }
-    #viewOfferModalForm .modal-content .modal-header {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        padding: 1.5rem 0.8rem;
-    }
-    #viewOfferModalForm .modal-content .modal-body {
-        display: flex;
-    }
-    #viewOfferModalForm .modal-content .modal-body .modal-row .modal-column {
-        width: 50%;
-        padding: 0.8rem 1.2rem;
-    }
-}
-
-
+  #viewOfferModalForm .modal-content {
+    width: 85%;
+  }
+  #viewOfferModalForm .modal-content .modal-header .close {
+    margin-left: auto !important;
+    margin-right: 1rem;
+  }
+  #viewOfferModalForm .modal-content .modal-header .modal-title {
+    margin-left: auto !important;
+    font-size: 1.3rem;
+    font-weight: 800;
+    color: #1c1c1c;
+    text-transform: uppercase;
+  }
+  #viewOfferModalForm .modal-content .modal-header {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 1.5rem 0.8rem;
+  }
+  #viewOfferModalForm .modal-content .modal-body {
+    display: flex;
+  }
+  #viewOfferModalForm .modal-content .modal-body .modal-row .modal-column {
+    width: 50%;
+    padding: 0.8rem 1.2rem;
+  }
+}
+
 /* Smaller size screen */
 
 @media only screen and (max-width: 650px) {
-    #viewOfferModalForm .modal-content .modal-body {
-        display: flex;
-        flex-direction: column;
-    }
-    #viewOfferModalForm .modal-content .modal-body .modal-row {
-        flex-direction: column;
-    }
-    #viewOfferModalForm .modal-content .modal-body .modal-row .modal-column {
-        width: 100%;
-        padding: 0rem 0.5rem;
-    }
-    #viewOfferModalForm .modal-content .modal-header .modal-title {
-        font-size: 1rem;
-    }
+  #viewOfferModalForm .modal-content .modal-body {
+    display: flex;
+    flex-direction: column;
+  }
+  #viewOfferModalForm .modal-content .modal-body .modal-row {
+    flex-direction: column;
+  }
+  #viewOfferModalForm .modal-content .modal-body .modal-row .modal-column {
+    width: 100%;
+    padding: 0rem 0.5rem;
+  }
+  #viewOfferModalForm .modal-content .modal-header .modal-title {
+    font-size: 1rem;
+  }
 }
 
-
 /* Seller Logbook View Changes End */
 
-
 /* Order Dashboard View Changes End */
 
 .container.order-dashboard h3 {
-    font-weight: bold;
-    padding: 0 !important;
+  font-weight: bold;
+  padding: 0 !important;
 }
 
 .container.order-dashboard .filter-section {
-    padding: 1.5rem 1rem !important;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    padding-bottom: 3rem !important;
-    box-shadow: 0px 2px 6px 1px rgba(0, 0, 0, 0.19);
-    -webkit-box-shadow: 0px 2px 6px 1px rgba(0, 0, 0, 0.19);
-    -moz-box-shadow: 0px 2px 6px 1px rgba(0, 0, 0, 0.19);
-    margin: 0 15px;
-    width: 100%;
-    background-color: #fff;
-    border-radius: 8px;
+  padding: 1.5rem 1rem !important;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  padding-bottom: 3rem !important;
+  box-shadow: 0px 2px 6px 1px rgba(0, 0, 0, 0.19);
+  -webkit-box-shadow: 0px 2px 6px 1px rgba(0, 0, 0, 0.19);
+  -moz-box-shadow: 0px 2px 6px 1px rgba(0, 0, 0, 0.19);
+  margin: 0 15px;
+  width: 100%;
+  background-color: #fff;
+  border-radius: 8px;
 }
 
 .container.order-dashboard .filter-section .filter-header h4 {
-    font-weight: medium;
+  font-weight: medium;
 }
 
 .container.order-dashboard .filter-section .filters-container {
-    display: flex;
-    gap: 1rem;
+  display: flex;
+  gap: 1rem;
 }
 
 .container.order-dashboard .filter-section .filter-item select:focus {
-    outline: none;
+  outline: none;
 }
 
 .container.order-dashboard .filter-section .filter-item {
-    width: 15rem;
+  width: 15rem;
 }
 
 .container.order-dashboard .filter-section .filter-item select {
-    padding: 0.4rem 0.3rem;
-    width: 100%;
-    border-radius: 5px;
-    background-color: rgba(248, 248, 248);
-    border: 1px solid rgba(0, 0, 0, 0.4);
-    box-shadow: 0px 2px 6px 1px rgba(0, 0, 0, 0.19);
-    -webkit-box-shadow: 0px 2px 6px 1px rgba(0, 0, 0, 0.19);
-    -moz-box-shadow: 0px 2px 6px 1px rgba(0, 0, 0, 0.19);
-    font-weight: 500;
+  padding: 0.4rem 0.3rem;
+  width: 100%;
+  border-radius: 5px;
+  background-color: rgba(248, 248, 248);
+  border: 1px solid rgba(0, 0, 0, 0.4);
+  box-shadow: 0px 2px 6px 1px rgba(0, 0, 0, 0.19);
+  -webkit-box-shadow: 0px 2px 6px 1px rgba(0, 0, 0, 0.19);
+  -moz-box-shadow: 0px 2px 6px 1px rgba(0, 0, 0, 0.19);
+  font-weight: 500;
 }
 
 .container.order-dashboard .offers-bids-section {
-    width: 100%;
-    background-color: #fff;
-    border-radius: 8px;
-    margin: 1rem 0;
-    display: flex !important;
+  width: 100%;
+  background-color: #fff;
+  border-radius: 8px;
+  margin: 1rem 0;
+  display: flex !important;
 }
 
 .container.order-dashboard .offers-bids-section .produce-item {
-    margin: 1rem 0;
-    width: 100%;
-    display: flex !important;
-    flex-direction: column !important;
-    align-items: center;
+  margin: 1rem 0;
+  width: 100%;
+  display: flex !important;
+  flex-direction: column !important;
+  align-items: center;
 }
 
 .container.order-dashboard .offers-bids-section .produce-item .offers-bids-container {
-    margin-right: auto;
-    padding: 2rem 2rem;
-    display: flex;
-    flex-direction: column;
-    gap: 0.8rem;
-}
-
-.container.order-dashboard .offers-bids-section .produce-item .offers-bids-container .bids-container {
-    margin: 1rem 0;
-}
-
-.container.order-dashboard .offers-bids-section .produce-item .offers-bids-container .bids-container .bids-list {
-    margin: 1rem 0;
-}
-
-.container.order-dashboard .offers-bids-section .produce-item .offers-bids-container .bids-container .bids-list .card {
-    width: 18rem;
-    background-color: #fff;
-    border-radius: 5px;
-    padding: 0.8rem 1rem;
-    box-shadow: 2px 3px 6px 2px rgba(86, 201, 31, 0.37);
-    -webkit-box-shadow: 2px 3px 6px 2px rgba(86, 201, 31, 0.37);
-    -moz-box-shadow: 2px 3px 6px 2px rgba(86, 201, 31, 0.37);
+  margin-right: auto;
+  padding: 2rem 2rem;
+  display: flex;
+  flex-direction: column;
+  gap: 0.8rem;
+}
+
+.container.order-dashboard
+  .offers-bids-section
+  .produce-item
+  .offers-bids-container
+  .bids-container {
+  margin: 1rem 0;
+}
+
+.container.order-dashboard
+  .offers-bids-section
+  .produce-item
+  .offers-bids-container
+  .bids-container
+  .bids-list {
+  margin: 1rem 0;
+}
+
+.container.order-dashboard
+  .offers-bids-section
+  .produce-item
+  .offers-bids-container
+  .bids-container
+  .bids-list
+  .card {
+  width: 18rem;
+  background-color: #fff;
+  border-radius: 5px;
+  padding: 0.8rem 1rem;
+  box-shadow: 2px 3px 6px 2px rgba(86, 201, 31, 0.37);
+  -webkit-box-shadow: 2px 3px 6px 2px rgba(86, 201, 31, 0.37);
+  -moz-box-shadow: 2px 3px 6px 2px rgba(86, 201, 31, 0.37);
 }
 
 .container.order-dashboard .offers-bids-section .produce-item .produce-heading h4 {
-    text-transform: uppercase;
+  text-transform: uppercase;
 }
 
-
 /* Medium Size Screens */
 
 @media only screen and (max-width: 800px) and (min-width: 550px) {
-    .container.order-dashboard .filter-section .filters-container {
-        display: flex;
-        flex-direction: row;
-        gap: 1rem;
-    }
+  .container.order-dashboard .filter-section .filters-container {
+    display: flex;
+    flex-direction: row;
+    gap: 1rem;
+  }
 }
 
-
 /* Smaller size screen */
 
 @media only screen and (max-width: 550px) {
-    .container.order-dashboard .filter-section .filters-container {
-        display: flex;
-        gap: 1rem;
-        flex-direction: column;
-    }
+  .container.order-dashboard .filter-section .filters-container {
+    display: flex;
+    gap: 1rem;
+    flex-direction: column;
+  }
 }
 
-
 /* Produce price page start */
 
 .container.produceprice .buttons-top {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin: 1rem 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: 1rem 0;
 }
 
 .container.produceprice .buttons-top .filter select {
-    padding: 0.4rem 0.3rem;
-    width: 100%;
-    border-radius: 5px;
+  padding: 0.4rem 0.3rem;
+  width: 100%;
+  border-radius: 5px;
 }
 
 .container.produceprice .buttons-top .filter select:focus {
-    outline: none;
+  outline: none;
 }
 
 #updateProducePriceModal .modal-content .modal-header .close,
 #addProduceModalForm .modal-content .modal-header .close {
-    margin-left: auto !important;
-    margin-right: 1rem;
+  margin-left: auto !important;
+  margin-right: 1rem;
 }
 
 #updateProducePriceModal .modal-content .modal-header .modal-title,
 #addProduceModalForm .modal-content .modal-header .modal-title {
+  margin-left: auto !important;
+  font-size: 1.3rem;
+  font-weight: 800;
+  color: #1c1c1c;
+  text-transform: uppercase;
+}
+
+#updateProducePriceModal .modal-content .modal-header,
+#addProduceModalForm .modal-content .modal-header {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 1.5rem 0.8rem;
+}
+
+@media only screen and (max-width: 850px) and (min-width: 550px) {
+  #updateProducePriceModal .modal-content .modal-header .close,
+  #addProduceModalForm .modal-content .modal-header .close {
+    margin-left: auto !important;
+    margin-right: 1rem;
+  }
+  #updateProducePriceModal .modal-content .modal-header .modal-title,
+  #addProduceModalForm .modal-content .modal-header .modal-title {
     margin-left: auto !important;
     font-size: 1.3rem;
     font-weight: 800;
     color: #1c1c1c;
     text-transform: uppercase;
-}
-
-#updateProducePriceModal .modal-content .modal-header,
-#addProduceModalForm .modal-content .modal-header {
+  }
+  #updateProducePriceModal .modal-content .modal-header,
+  #addProduceModalForm .modal-content .modal-header {
     display: flex;
     justify-content: center;
     align-items: center;
     padding: 1.5rem 0.8rem;
+  }
 }
 
-@media only screen and (max-width: 850px) and (min-width: 550px) {
-    #updateProducePriceModal .modal-content .modal-header .close,
-    #addProduceModalForm .modal-content .modal-header .close {
-        margin-left: auto !important;
-        margin-right: 1rem;
-    }
-    #updateProducePriceModal .modal-content .modal-header .modal-title,
-    #addProduceModalForm .modal-content .modal-header .modal-title {
-        margin-left: auto !important;
-        font-size: 1.3rem;
-        font-weight: 800;
-        color: #1c1c1c;
-        text-transform: uppercase;
-    }
-    #updateProducePriceModal .modal-content .modal-header,
-    #addProduceModalForm .modal-content .modal-header {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        padding: 1.5rem 0.8rem;
-    }
-}
-
-
 /* Smaller size screen */
 
 @media only screen and (max-width: 650px) {
-    #updateProducePriceModal .modal-content .modal-header .modal-title,
-    #addProduceModalForm .modal-content .modal-header .modal-title {
-        font-size: 1rem;
-    }
+  #updateProducePriceModal .modal-content .modal-header .modal-title,
+  #addProduceModalForm .modal-content .modal-header .modal-title {
+    font-size: 1rem;
+  }
 }
 
-
 /* Produce price page end */
 
-
 /* Produce List page Start */
 
 #updateProduceModal .modal-content .modal-header .close,
 #addNewProduceModal .modal-content .modal-header .close {
-    margin-left: auto !important;
-    margin-right: 1rem;
+  margin-left: auto !important;
+  margin-right: 1rem;
 }
 
 #updateProduceModal .modal-content .modal-header .modal-title,
 #addNewProduceModal .modal-content .modal-header .modal-title {
+  margin-left: auto !important;
+  font-size: 1.3rem;
+  font-weight: 800;
+  color: #1c1c1c;
+  text-transform: uppercase;
+}
+
+#updateProduceModal .modal-content .modal-header,
+#addNewProduceModal .modal-content .modal-header {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 1.5rem 0.8rem;
+}
+
+@media only screen and (max-width: 850px) and (min-width: 550px) {
+  #updateProduceModal .modal-content .modal-header .close,
+  #addNewProduceModal .modal-content .modal-header .close {
+    margin-left: auto !important;
+    margin-right: 1rem;
+  }
+  #updateProduceModal .modal-content .modal-header .modal-title,
+  #addNewProduceModal .modal-content .modal-header .modal-title {
     margin-left: auto !important;
     font-size: 1.3rem;
     font-weight: 800;
     color: #1c1c1c;
     text-transform: uppercase;
-}
-
-#updateProduceModal .modal-content .modal-header,
-#addNewProduceModal .modal-content .modal-header {
+  }
+  #updateProduceModal .modal-content .modal-header,
+  #addNewProduceModal .modal-content .modal-header {
     display: flex;
     justify-content: center;
     align-items: center;
     padding: 1.5rem 0.8rem;
+  }
 }
 
-@media only screen and (max-width: 850px) and (min-width: 550px) {
-    #updateProduceModal .modal-content .modal-header .close,
-    #addNewProduceModal .modal-content .modal-header .close {
-        margin-left: auto !important;
-        margin-right: 1rem;
-    }
-    #updateProduceModal .modal-content .modal-header .modal-title,
-    #addNewProduceModal .modal-content .modal-header .modal-title {
-        margin-left: auto !important;
-        font-size: 1.3rem;
-        font-weight: 800;
-        color: #1c1c1c;
-        text-transform: uppercase;
-    }
-    #updateProduceModal .modal-content .modal-header,
-    #addNewProduceModal .modal-content .modal-header {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        padding: 1.5rem 0.8rem;
-    }
-}
-
-
 /* Produce List page End */
 
-
 /* Harvest Entry Modal Style Start */
 
 #harvestModalForm .modal-dialog {
-    width: 100vw !important;
-    display: grid;
-    place-items: center;
+  width: 100vw !important;
+  display: grid;
+  place-items: center;
 }
 
 #harvestModalForm .modal-content {
-    width: 75%;
+  width: 75%;
 }
 
 #harvestModalForm .modal-content .modal-header .close {
-    margin-left: auto !important;
-    margin-right: 1rem;
+  margin-left: auto !important;
+  margin-right: 1rem;
 }
 
 #harvestModalForm .modal-content .modal-header .modal-title {
-    margin-left: auto !important;
-    font-size: 1.3rem;
-    font-weight: 800;
-    color: #1c1c1c;
-    text-transform: uppercase;
+  margin-left: auto !important;
+  font-size: 1.3rem;
+  font-weight: 800;
+  color: #1c1c1c;
+  text-transform: uppercase;
 }
 
 #harvestModalForm .modal-content .modal-header {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 1.5rem 0.8rem;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 1.5rem 0.8rem;
 }
 
 #harvestModalForm .modal-content .modal-body #modalBodyContainer {
-    display: flex;
+  display: flex;
 }
 
 #harvestModalForm .modal-content .modal-body #modalBodyContainer .modal-column {
-    width: 50%;
-    padding: 1rem 2rem;
+  width: 50%;
+  padding: 1rem 2rem;
 }
 
 @media only screen and (max-width: 850px) and (min-width: 550px) {
-    #harvestModalForm .modal-content {
-        width: 85%;
-    }
-    #harvestModalForm .modal-content .modal-header .close {
-        margin-left: auto !important;
-        margin-right: 1rem;
-    }
-    #harvestModalForm .modal-content .modal-header .modal-title {
-        margin-left: auto !important;
-        font-size: 1.3rem;
-        font-weight: 800;
-        color: #1c1c1c;
-        text-transform: uppercase;
-    }
-    #harvestModalForm .modal-content .modal-header {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        padding: 1.5rem 0.8rem;
-    }
-    #harvestModalForm .modal-content .modal-body #modalBodyContainer {
-        display: flex;
-    }
-    #harvestModalForm .modal-content .modal-body #modalBodyContainer .modal-column {
-        width: 50%;
-        padding: 0.8rem 1.2rem;
-    }
+  #harvestModalForm .modal-content {
+    width: 85%;
+  }
+  #harvestModalForm .modal-content .modal-header .close {
+    margin-left: auto !important;
+    margin-right: 1rem;
+  }
+  #harvestModalForm .modal-content .modal-header .modal-title {
+    margin-left: auto !important;
+    font-size: 1.3rem;
+    font-weight: 800;
+    color: #1c1c1c;
+    text-transform: uppercase;
+  }
+  #harvestModalForm .modal-content .modal-header {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 1.5rem 0.8rem;
+  }
+  #harvestModalForm .modal-content .modal-body #modalBodyContainer {
+    display: flex;
+  }
+  #harvestModalForm .modal-content .modal-body #modalBodyContainer .modal-column {
+    width: 50%;
+    padding: 0.8rem 1.2rem;
+  }
 }
 
-
 /* Smaller size screen */
 
 @media only screen and (max-width: 650px) {
-    #harvestModalForm .modal-content .modal-body #modalBodyContainer {
-        display: flex;
-        flex-direction: column;
-    }
-    #harvestModalForm .modal-content .modal-body #modalBodyContainer .modal-column {
-        width: 100%;
-        padding: 0.8rem 1rem;
-    }
-    #harvestModalForm .modal-content .modal-header .modal-title {
-        font-size: 1rem;
-    }
+  #harvestModalForm .modal-content .modal-body #modalBodyContainer {
+    display: flex;
+    flex-direction: column;
+  }
+  #harvestModalForm .modal-content .modal-body #modalBodyContainer .modal-column {
+    width: 100%;
+    padding: 0.8rem 1rem;
+  }
+  #harvestModalForm .modal-content .modal-header .modal-title {
+    font-size: 1rem;
+  }
 }
 
-
 /* Harvest Entry Modal Style End */
 
-
 /* Storage Entry Modal Style Start */
 
 #storageModalForm .modal-dialog {
-    width: 100vw !important;
-    display: grid;
-    place-items: center;
+  width: 100vw !important;
+  display: grid;
+  place-items: center;
 }
 
 #storageModalForm .modal-content {
-    width: 75%;
+  width: 75%;
 }
 
 #storageModalForm .modal-content .modal-header .close {
-    margin-left: auto !important;
-    margin-right: 1rem;
+  margin-left: auto !important;
+  margin-right: 1rem;
 }
 
 #storageModalForm .modal-content .modal-header .modal-title {
-    margin-left: auto !important;
-    font-size: 1.3rem;
-    font-weight: 800;
-    color: #1c1c1c;
-    text-transform: uppercase;
+  margin-left: auto !important;
+  font-size: 1.3rem;
+  font-weight: 800;
+  color: #1c1c1c;
+  text-transform: uppercase;
 }
 
 #storageModalForm .modal-content .modal-header {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 1.5rem 0.8rem;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 1.5rem 0.8rem;
 }
 
 #storageModalForm .modal-content .modal-body #modalBodyContainer {
-    display: flex;
+  display: flex;
 }
 
 #storageModalForm .modal-content .modal-body #modalBodyContainer .modal-column {
-    width: 50%;
-    padding: 1rem 2rem;
+  width: 50%;
+  padding: 1rem 2rem;
 }
 
 @media only screen and (max-width: 850px) and (min-width: 550px) {
-    #storageModalForm .modal-content {
-        width: 85%;
-    }
-    #storageModalForm .modal-content .modal-header .close {
-        margin-left: auto !important;
-        margin-right: 1rem;
-    }
-    #storageModalForm .modal-content .modal-header .modal-title {
-        margin-left: auto !important;
-        font-size: 1.3rem;
-        font-weight: 800;
-        color: #1c1c1c;
-        text-transform: uppercase;
-    }
-    #storageModalForm .modal-content .modal-header {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        padding: 1.5rem 0.8rem;
-    }
-    #storageModalForm .modal-content .modal-body #modalBodyContainer {
-        display: flex;
-    }
-    #storageModalForm .modal-content .modal-body #modalBodyContainer .modal-column {
-        width: 50%;
-        padding: 0.8rem 1.2rem;
-    }
+  #storageModalForm .modal-content {
+    width: 85%;
+  }
+  #storageModalForm .modal-content .modal-header .close {
+    margin-left: auto !important;
+    margin-right: 1rem;
+  }
+  #storageModalForm .modal-content .modal-header .modal-title {
+    margin-left: auto !important;
+    font-size: 1.3rem;
+    font-weight: 800;
+    color: #1c1c1c;
+    text-transform: uppercase;
+  }
+  #storageModalForm .modal-content .modal-header {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 1.5rem 0.8rem;
+  }
+  #storageModalForm .modal-content .modal-body #modalBodyContainer {
+    display: flex;
+  }
+  #storageModalForm .modal-content .modal-body #modalBodyContainer .modal-column {
+    width: 50%;
+    padding: 0.8rem 1.2rem;
+  }
 }
 
-
 /* Smaller size screen */
 
 @media only screen and (max-width: 650px) {
-    #storageModalForm .modal-content .modal-body #modalBodyContainer {
-        display: flex;
-        flex-direction: column;
-    }
-    #storageModalForm .modal-content .modal-body #modalBodyContainer .modal-column {
-        width: 100%;
-        padding: 0.8rem 1rem;
-    }
-    #storageModalForm .modal-content .modal-header .modal-title {
-        font-size: 1rem;
-    }
+  #storageModalForm .modal-content .modal-body #modalBodyContainer {
+    display: flex;
+    flex-direction: column;
+  }
+  #storageModalForm .modal-content .modal-body #modalBodyContainer .modal-column {
+    width: 100%;
+    padding: 0.8rem 1rem;
+  }
+  #storageModalForm .modal-content .modal-header .modal-title {
+    font-size: 1rem;
+  }
 }
 
-
 /* Storage Entry Modal Style End */
 
-
 /* QR CODE CONFIGURATION - STATIC start */
 
 .container.qrcode-static .card .card-body .qrcode-card-title {
-    font-size: 0.8rem !important;
-    color: #4e5d14;
+  font-size: 0.8rem !important;
+  color: #4e5d14;
 }
 
 .container.qrcode-static .card .card-body .content {
-    font-size: 14px;
+  font-size: 14px;
 }
 
 .container.qrcode-static .card .card-title {
-    text-transform: uppercase;
-    font-weight: 500;
-    font-size: 1.5rem;
+  text-transform: uppercase;
+  font-weight: 500;
+  font-size: 1.5rem;
 }
 
 .container.qrcode-static .card {
-    width: fit-content;
-    background-color: white;
-    border-radius: 5px;
-    box-shadow: 2px 2px 4px 5px #ccc;
-    margin: 10px;
-    padding: 1.2rem 2rem;
+  width: fit-content;
+  background-color: white;
+  border-radius: 5px;
+  box-shadow: 2px 2px 4px 5px #ccc;
+  margin: 10px;
+  padding: 1.2rem 2rem;
 }
 
 #viewQrCodeModalForm .modal-dialog,
 #updateQrCodeModalForm .modal-dialog,
 #qrCodeModalForm .modal-dialog {
-    width: 100vw !important;
-    display: grid;
-    place-items: center;
+  width: 100vw !important;
+  display: grid;
+  place-items: center;
 }
 
 #viewQrCodeModalForm .modal-content,
 #updateQrCodeModalForm .modal-content,
 #qrCodeModalForm .modal-content {
-    width: 75%;
+  width: 75%;
 }
 
 #addNewCodeAttribute .modal-content .modal-header .close,
 #viewQrCodeModalForm .modal-content .modal-header .close,
 #updateQrCodeModalForm .modal-content .modal-header .close,
 #qrCodeModalForm .modal-content .modal-header .close {
-    margin-left: auto !important;
-    margin-right: 1rem;
+  margin-left: auto !important;
+  margin-right: 1rem;
 }
 
 #addNewCodeAttribute .modal-content .modal-header .modal-title,
 #viewQrCodeModalForm .modal-content .modal-header .modal-title,
 #updateQrCodeModalForm .modal-content .modal-header .modal-title,
 #qrCodeModalForm .modal-content .modal-header .modal-title {
-    margin-left: auto !important;
-    font-size: 1.3rem;
-    font-weight: 800;
-    color: #1c1c1c;
-    text-transform: uppercase;
+  margin-left: auto !important;
+  font-size: 1.3rem;
+  font-weight: 800;
+  color: #1c1c1c;
+  text-transform: uppercase;
 }
 
 #addNewCodeAttribute .modal-content .modal-header,
 #viewQrCodeModalForm .modal-content .modal-header,
 #updateQrCodeModalForm .modal-content .modal-header,
 #qrCodeModalForm .modal-content .modal-header {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 1.5rem 0.8rem;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 1.5rem 0.8rem;
 }
 
 #viewQrCodeModalForm .modal-content .modal-body,
 #updateQrCodeModalForm .modal-content .modal-body,
 #qrCodeModalForm .modal-content .modal-body {
-    display: flex;
-    flex-direction: column;
+  display: flex;
+  flex-direction: column;
 }
 
 #viewQrCodeModalForm .modal-content .modal-body .modal-row,
 #updateQrCodeModalForm .modal-content .modal-body .modal-row,
 #qrCodeModalForm .modal-content .modal-body .modal-row {
-    display: flex;
+  display: flex;
 }
 
 #viewQrCodeModalForm .modal-content .modal-body .modal-column,
 #updateQrCodeModalForm .modal-content .modal-body .modal-column,
 #qrCodeModalForm .modal-content .modal-body .modal-column {
-    width: 50%;
-    padding: 1rem 2rem;
+  width: 50%;
+  padding: 1rem 2rem;
 }
 
 #viewQrCodeModalForm .modal-content .modal-body .modal-column.full-width,
 #updateQrCodeModalForm .modal-content .modal-body .modal-column.full-width,
 #qrCodeModalForm .modal-content .modal-body .modal-column.full-width {
-    width: 100%;
-    padding: 1rem 2rem;
+  width: 100%;
+  padding: 1rem 2rem;
 }
 
 @media only screen and (max-width: 850px) and (min-width: 550px) {
-    #viewQrCodeModalForm .modal-content,
-    #updateQrCodeModalForm .modal-content,
-    #qrCodeModalForm .modal-content {
-        width: 85%;
-    }
-    #addNewCodeAttribute .modal-content .modal-header .close,
-    #viewQrCodeModalForm .modal-content .modal-header .close,
-    #updateQrCodeModalForm .modal-content .modal-header .close,
-    #qrCodeModalForm .modal-content .modal-header .close {
-        margin-left: auto !important;
-        margin-right: 1rem;
-    }
-    #addNewCodeAttribute .modal-content .modal-header .modal-title,
-    #viewQrCodeModalForm .modal-content .modal-header .modal-title,
-    #updateQrCodeModalForm .modal-content .modal-header .modal-title,
-    #qrCodeModalForm .modal-content .modal-header .modal-title {
-        margin-left: auto !important;
-        font-size: 1.3rem;
-        font-weight: 800;
-        color: #1c1c1c;
-        text-transform: uppercase;
-    }
-    #addNewCodeAttribute .modal-content .modal-header,
-    #viewQrCodeModalForm .modal-content .modal-header,
-    #updateQrCodeModalForm .modal-content .modal-header,
-    #qrCodeModalForm .modal-content .modal-header {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        padding: 1.5rem 0.8rem;
-    }
-    #viewQrCodeModalForm .modal-content .modal-body,
-    #updateQrCodeModalForm .modal-content .modal-body,
-    #qrCodeModalForm .modal-content .modal-body {
-        display: flex;
-    }
-    #viewQrCodeModalForm .modal-content .modal-body .modal-row .modal-column,
-    #updateQrCodeModalForm .modal-content .modal-body .modal-row .modal-column,
-    #qrCodeModalForm .modal-content .modal-body .modal-row .modal-column {
-        width: 50%;
-        padding: 0.8rem 1.2rem;
-    }
+  #viewQrCodeModalForm .modal-content,
+  #updateQrCodeModalForm .modal-content,
+  #qrCodeModalForm .modal-content {
+    width: 85%;
+  }
+  #addNewCodeAttribute .modal-content .modal-header .close,
+  #viewQrCodeModalForm .modal-content .modal-header .close,
+  #updateQrCodeModalForm .modal-content .modal-header .close,
+  #qrCodeModalForm .modal-content .modal-header .close {
+    margin-left: auto !important;
+    margin-right: 1rem;
+  }
+  #addNewCodeAttribute .modal-content .modal-header .modal-title,
+  #viewQrCodeModalForm .modal-content .modal-header .modal-title,
+  #updateQrCodeModalForm .modal-content .modal-header .modal-title,
+  #qrCodeModalForm .modal-content .modal-header .modal-title {
+    margin-left: auto !important;
+    font-size: 1.3rem;
+    font-weight: 800;
+    color: #1c1c1c;
+    text-transform: uppercase;
+  }
+  #addNewCodeAttribute .modal-content .modal-header,
+  #viewQrCodeModalForm .modal-content .modal-header,
+  #updateQrCodeModalForm .modal-content .modal-header,
+  #qrCodeModalForm .modal-content .modal-header {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 1.5rem 0.8rem;
+  }
+  #viewQrCodeModalForm .modal-content .modal-body,
+  #updateQrCodeModalForm .modal-content .modal-body,
+  #qrCodeModalForm .modal-content .modal-body {
+    display: flex;
+  }
+  #viewQrCodeModalForm .modal-content .modal-body .modal-row .modal-column,
+  #updateQrCodeModalForm .modal-content .modal-body .modal-row .modal-column,
+  #qrCodeModalForm .modal-content .modal-body .modal-row .modal-column {
+    width: 50%;
+    padding: 0.8rem 1.2rem;
+  }
 }
 
-
 /* Smaller size screen */
 
 @media only screen and (max-width: 650px) {
-    #viewQrCodeModalForm .modal-content .modal-body,
-    #updateQrCodeModalForm .modal-content .modal-body,
-    #qrCodeModalForm .modal-content .modal-body {
-        display: flex;
-        flex-direction: column;
-    }
-    #viewQrCodeModalForm .modal-content .modal-body .modal-row,
-    #updateQrCodeModalForm .modal-content .modal-body .modal-row,
-    #qrCodeModalForm .modal-content .modal-body .modal-row {
-        flex-direction: column;
-    }
-    #viewQrCodeModalForm .modal-content .modal-body .modal-row .modal-column,
-    #updateQrCodeModalForm .modal-content .modal-body .modal-row .modal-column,
-    #qrCodeModalForm .modal-content .modal-body .modal-row .modal-column {
-        width: 100%;
-        padding: 0rem 0.5rem;
-    }
-    #viewQrCodeModalForm .modal-content .modal-header .modal-title,
-    #updateQrCodeModalForm .modal-content .modal-header .modal-title,
-    #qrCodeModalForm .modal-content .modal-header .modal-title {
-        font-size: 1rem;
-    }
+  #viewQrCodeModalForm .modal-content .modal-body,
+  #updateQrCodeModalForm .modal-content .modal-body,
+  #qrCodeModalForm .modal-content .modal-body {
+    display: flex;
+    flex-direction: column;
+  }
+  #viewQrCodeModalForm .modal-content .modal-body .modal-row,
+  #updateQrCodeModalForm .modal-content .modal-body .modal-row,
+  #qrCodeModalForm .modal-content .modal-body .modal-row {
+    flex-direction: column;
+  }
+  #viewQrCodeModalForm .modal-content .modal-body .modal-row .modal-column,
+  #updateQrCodeModalForm .modal-content .modal-body .modal-row .modal-column,
+  #qrCodeModalForm .modal-content .modal-body .modal-row .modal-column {
+    width: 100%;
+    padding: 0rem 0.5rem;
+  }
+  #viewQrCodeModalForm .modal-content .modal-header .modal-title,
+  #updateQrCodeModalForm .modal-content .modal-header .modal-title,
+  #qrCodeModalForm .modal-content .modal-header .modal-title {
+    font-size: 1rem;
+  }
 }
 
-
 /* QR CODE CONFIGURATION - STATIC End */
 
-
 /* QR CODE CONFIGURATION - Suppier start */
 
 .container.qrcode-supplier .card .card-body .qrcode-card-title {
-    font-size: 0.8rem !important;
-    color: #4e5d14;
+  font-size: 0.8rem !important;
+  color: #4e5d14;
 }
 
 .container.qrcode-supplier .card .card-body .content {
-    font-size: 14px;
+  font-size: 14px;
 }
 
 .container.qrcode-supplier .card .card-title {
-    text-transform: uppercase;
-    font-weight: 500;
-    font-size: 1.5rem;
+  text-transform: uppercase;
+  font-weight: 500;
+  font-size: 1.5rem;
 }
 
 .container.qrcode-supplier .card {
-    width: fit-content;
-    background-color: white;
-    border-radius: 5px;
-    box-shadow: 2px 2px 4px 5px #ccc;
-    margin: 10px;
-    padding: 1.2rem 2rem;
+  width: fit-content;
+  background-color: white;
+  border-radius: 5px;
+  box-shadow: 2px 2px 4px 5px #ccc;
+  margin: 10px;
+  padding: 1.2rem 2rem;
 }
 
-
 /* QR CODE CONFIGURATION - Suppier End */
 
-
 /* ---------------- Global Style ------------ */
 
 .title-global {
-    text-transform: uppercase;
-    font-weight: 600;
-    position: relative;
-    text-align: center;
+  text-transform: uppercase;
+  font-weight: 600;
+  position: relative;
+  text-align: center;
 }
 
 .title-global::after {
+  content: '';
+  width: 40%;
+  height: 3px;
+  position: absolute;
+  background-color: #b2d430;
+  left: 50%;
+  transform: translate(-50%);
+  bottom: -10px;
+}
+
+.title-global-container {
+  padding: 1.5rem 0;
+  width: 100%;
+  display: grid;
+  place-items: center;
+}
+
+/* Medium Size Screens */
+
+@media only screen and (max-width: 800px) and (min-width: 550px) {
+  .title-global {
+    text-transform: uppercase;
+    font-weight: 500;
+    position: relative;
+  }
+  .title-global::after {
     content: '';
     width: 40%;
     height: 3px;
@@ -1679,85 +1658,115 @@ body {
     left: 50%;
     transform: translate(-50%);
     bottom: -10px;
+  }
+  .title-global-container {
+    padding: 0.9rem 0;
+  }
 }
 
-.title-global-container {
-    padding: 1.5rem 0;
-    width: 100%;
-    display: grid;
-    place-items: center;
-}
+/* Smaller size screen */
 
+@media only screen and (max-width: 550px) {
+  .title-global {
+    text-transform: uppercase;
+    font-weight: 500;
+    position: relative;
+    font-size: 25px;
+  }
+  .title-global::after {
+    content: '';
+    width: 40%;
+    height: 2px;
+    position: absolute;
+    background-color: #b2d430;
+    left: 50%;
+    transform: translate(-50%);
+    bottom: -10px;
+  }
+  .title-global-container {
+    padding: 0.8rem 0;
+  }
+}
 
-/* Medium Size Screens */
+/* Extra Smaller size screen */
 
-@media only screen and (max-width: 800px) and (min-width: 550px) {
-    .title-global {
-        text-transform: uppercase;
-        font-weight: 500;
-        position: relative;
-    }
-    .title-global::after {
-        content: '';
-        width: 40%;
-        height: 3px;
-        position: absolute;
-        background-color: #b2d430;
-        left: 50%;
-        transform: translate(-50%);
-        bottom: -10px;
-    }
-    .title-global-container {
-        padding: 0.9rem 0;
-    }
+@media only screen and (max-width: 396px) {
+  .title-global {
+    text-transform: uppercase;
+    font-weight: 500;
+    position: relative;
+    font-size: 18px;
+  }
+  .title-global::after {
+    content: '';
+    width: 40%;
+    height: 2px;
+    position: absolute;
+    background-color: #b2d430;
+    left: 50%;
+    transform: translate(-50%);
+    bottom: -10px;
+  }
 }
 
+/* ---------------- Global Style ------------ */
 
-/* Smaller size screen */
+/* ----------------------- Test Config Styles -------------------- */
 
-@media only screen and (max-width: 550px) {
-    .title-global {
-        text-transform: uppercase;
-        font-weight: 500;
-        position: relative;
-        font-size: 25px;
-    }
-    .title-global::after {
-        content: '';
-        width: 40%;
-        height: 2px;
-        position: absolute;
-        background-color: #b2d430;
-        left: 50%;
-        transform: translate(-50%);
-        bottom: -10px;
-    }
-    .title-global-container {
-        padding: 0.8rem 0;
-    }
+#test-config-wrapper {
+  padding: 0 5vw;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  align-items: center;
+}
+#test-config-wrapper .test-btns-container {
+  display: flex;
+  flex-direction: column;
 }
 
+#test-config-wrapper .test-btns-container .btn {
+  width: 30vw;
+}
 
-/* Extra Smaller size screen */
+@media only screen and (min-width: 396px) and (max-width: 720px) {
+  #test-config-wrapper .table {
+    width: 80vw;
+  }
+  #test-config-wrapper {
+    padding: 0 2vw;
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+    align-items: center;
+  }
+  #test-config-wrapper .test-btns-container {
+    display: flex;
+    flex-direction: column;
+  }
+
+  #test-config-wrapper .test-btns-container .btn {
+    width: 70vw;
+  }
+}
 
 @media only screen and (max-width: 396px) {
-    .title-global {
-        text-transform: uppercase;
-        font-weight: 500;
-        position: relative;
-        font-size: 18px;
-    }
-    .title-global::after {
-        content: '';
-        width: 40%;
-        height: 2px;
-        position: absolute;
-        background-color: #b2d430;
-        left: 50%;
-        transform: translate(-50%);
-        bottom: -10px;
-    }
-}
-
-
-/* ---------------- Global Style ------------ */
\ No newline at end of file
+  #test-config-wrapper .table {
+    width: 80vw;
+  }
+  #test-config-wrapper {
+    padding: 0 2vw;
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+    align-items: center;
+  }
+  #test-config-wrapper .test-btns-container {
+    display: flex;
+    flex-direction: column;
+  }
+
+  #test-config-wrapper .test-btns-container .btn {
+    width: 90vw;
+  }
+}
diff --git a/utils/enums.js b/utils/enums.js
index 5d782796..80fb8b2d 100644
--- a/utils/enums.js
+++ b/utils/enums.js
@@ -6,5 +6,7 @@ const CUSTOM_ENUMS = {
   OTHER: 'other',
   DEVELOPMENT: 'development',
   OZCF: 'ozcf',
+  FILE_STRATEGY: 'file-local',
+  DB_STRATEGY: 'db-local',
 };
 module.exports = CUSTOM_ENUMS;
diff --git a/utils/roles.js b/utils/roles.js
index f1c7de01..402b67fa 100644
--- a/utils/roles.js
+++ b/utils/roles.js
@@ -6,6 +6,8 @@ const ROLES = {
   Superuser: 'Superuser',
   Buyer: 'Buyer',
   Seller: 'Seller',
+  Intermediary: 'Intermediary',
+  Agent: 'Agent',
 };
 
 module.exports = ROLES;
diff --git a/views/dblogin.ejs b/views/dblogin.ejs
new file mode 100644
index 00000000..192ab5b8
--- /dev/null
+++ b/views/dblogin.ejs
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <% include ./partials/head %>
+</head>
+<body>
+<!-- START: header -->
+
+<div class="probootstrap-loader"></div>
+
+<header role="banner" class="probootstrap-header">
+    <% include ./partials/header %>
+</header>
+<!-- END: header -->
+
+
+<div class="container" style="width: 100%;">
+    <div class="row align-items-center justify-content-center">
+        <!-- START DB LOGIN FORM-->
+        <div class="col-md-6 col-md-offset-3"> <!-- col-md-offset-3 class that will offset by 3 columns, given that Bootstrap has a 12-column grid this will put a col-md-6 element right in the center. -->
+            <h3 class="heading text-center">USER LOGIN</h3>
+            <% include ./partials/notificationbar %>
+            <div class="probootstrap-section-heading text-center mb50 probootstrap-animate fadeInUp probootstrap-animated" style="background-image: url(/img/farm1.jpg); height: 200px; background-size: 100%; background-repeat: no-repeat; ">
+            </div>
+            <h4 class="heading">Enter Your Details</h4>
+
+            <form class="probootstrap-form mb60 validate-form" method="post">
+                <div class="form-group">
+                    <label for="loginUsername">Email</label>
+                    <input type="text" style="color: black;" id="loginUsername" name="loginUsername"class="form-control" placeholder="Enter Email" required autofocus/>
+                </div>
+
+                <div class="form-group">
+                    <label for="loginPassword">Password</label>
+                    <input type="password" style="color: black;" id="loginPassword" name="loginPassword" class="form-control" placeholder="Enter Password" required>
+                </div>
+
+                <div class="form-group">
+                    <button class="btn btn-primary" type="submit" formaction="/app/auth/dblogin">Login</button> <!-- DB Auth -->
+                </div>
+
+                <div class="form-group">
+                    Don't have a FoodPrint account yet? <a href="/app/auth/register_options">Sign up now</a>.
+                </div>
+
+
+
+            </form>
+        </div>
+        <!-- END DB LOGIN FORM-->
+    </div>
+</div>
+
+<!-- start footer -->
+<% include ./partials/footer %>
+<!-- end footer -->
+
+<!--<script type="text/javascript" src="/js/bundle.js"></script>-->
+<script src="/js/scripts.min.js"></script>
+<script src="/js/main.min.js"></script>
+<script src="/js/custom.js"></script>
+</body>
+</html>
diff --git a/views/index.ejs b/views/index.ejs
index 22ecd17f..8c86f77d 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -2,190 +2,190 @@
 <html lang="en">
 
 <head>
-        <%- include('partials/head'); %>
+  <%- include('partials/head'); %>
 </head>
 
 <body>
-    <!-- START: header -->
+  <!-- START: header -->
 
-    <div class="probootstrap-loader"></div>
+  <div class="probootstrap-loader"></div>
 
-    <header role="banner" class="probootstrap-header">
-            <%- include('partials/header'); %>
-    </header>
-    <!-- END: header -->
+  <header role="banner" class="probootstrap-header">
+    <%- include('partials/header'); %>
+  </header>
+  <!-- END: header -->
 
-    <div class="container" style="width: 100%;">
-        <div class="home-dashboard row align-items-center justify-content-center">
-            <!-- START  LANDING PAGE-->
-            <!-- col-md-offset-3 class that will offset by 3 columns, given that Bootstrap has a 12-column grid this will put a col-md-6 element right in the center. -->
-            <div class="title col-12 title-global-container">
-                <h3 class="title-global">Welcome to FoodPrint</h3>
+  <div class="container" style="width: 100%;">
+    <div class="home-dashboard row align-items-center justify-content-center">
+      <!-- START  LANDING PAGE-->
+      <!-- col-md-offset-3 class that will offset by 3 columns, given that Bootstrap has a 12-column grid this will put a col-md-6 element right in the center. -->
+      <div class="title col-12 title-global-container">
+        <h3 class="title-global">Welcome to FoodPrint</h3>
+      </div>
+      <%- include('partials/notificationbar'); %>
+      <div class="row">
+        <h4 style="margin-left: 30px;">Track and Trace</h4>
+        <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
+          <div class="card" style="margin: 30px;">
+            <div class="card-header">
+              <p class="card-title h4"><i class="fa fa-list-alt"></i> <a href="/app/harvest">Harvest Logbook</a></p>
+            </div>
+          </div>
+        </div>
+        <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
+          <div class="card" style="margin: 30px;">
+            <div class="card-header">
+              <p class="card-title h4"><i class="fa fa-list-alt"></i> <a href="/app/storage">Handover Logbook</a></p>
+            </div>
+          </div>
+        </div>
+        <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
+          <div class="card" style="margin: 30px;">
+            <div class="card-header">
+              <p class="card-title h4"><i class="fa fa-search"></i> <a href="/app/trace_produce">Trace Produce</a></p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <h4 style="margin-left: 30px;">Wholesale Marketplace</h4>
+        <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
+          <div class="card" style="margin: 30px;">
+            <div class="card-header">
+              <p class="card-title h4"><i class="fa fa-book"></i> <a href="/app/buyer">Buyer Logbook</a></p>
+            </div>
+          </div>
+        </div>
+        <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
+          <div class="card" style="margin: 30px;">
+            <div class="card-header">
+              <p class="card-title h4"><i class="fa fa-book"></i> <a href="/app/seller">Seller Logbook</a></p>
+            </div>
+          </div>
+        </div>
+        <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
+          <div class="card" style="margin: 30px;">
+            <div class="card-header">
+              <p class="card-title h4"><i class="fa fa-archive"></i> <a href="/app/order">Order Dashboard</a></p>
+            </div>
+          </div>
+        </div>
+        <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
+          <div class="card" style="margin: 30px;">
+            <div class="card-header">
+              <p class="card-title h4"><i class="fa fa-briefcase"></i> <a href="/app/order/myorders">My Orders</a></p>
+            </div>
+          </div>
+        </div>
+        <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
+          <div class="card" style="margin: 30px;">
+            <div class="card-header">
+              <p class="card-title h4"><i class="fa fa-list"></i> <a href="/app/produce">Produce List</a></p>
             </div>
-                <%- include('partials/notificationbar'); %>
-                <div class="row">
-                    <h4 style="margin-left: 30px;">Track and Trace</h4>
-                    <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
-                        <div class="card" style="margin: 30px;">
-                            <div class="card-header">
-                                <p class="card-title h4"><i class="fa fa-list-alt"></i> <a href="/app/harvest">Harvest Logbook</a></p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
-                        <div class="card" style="margin: 30px;">
-                            <div class="card-header">
-                                <p class="card-title h4"><i class="fa fa-list-alt"></i> <a href="/app/storage">Handover Logbook</a></p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
-                        <div class="card" style="margin: 30px;">
-                            <div class="card-header">
-                                <p class="card-title h4"><i class="fa fa-search"></i> <a href="/app/trace_produce">Trace Produce</a></p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="row">
-                    <h4 style="margin-left: 30px;">Wholesale Marketplace</h4>
-                    <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
-                        <div class="card" style="margin: 30px;">
-                            <div class="card-header">
-                                <p class="card-title h4"><i class="fa fa-book"></i> <a href="/app/buyer">Buyer Logbook</a></p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
-                        <div class="card" style="margin: 30px;">
-                            <div class="card-header">
-                                <p class="card-title h4"><i class="fa fa-book"></i> <a href="/app/seller">Seller Logbook</a></p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
-                        <div class="card" style="margin: 30px;">
-                            <div class="card-header">
-                                <p class="card-title h4"><i class="fa fa-archive"></i> <a href="/app/order">Order Dashboard</a></p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
-                        <div class="card" style="margin: 30px;">
-                            <div class="card-header">
-                                <p class="card-title h4"><i class="fa fa-briefcase"></i> <a href="/app/order/myorders">My Orders</a></p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
-                        <div class="card" style="margin: 30px;">
-                            <div class="card-header">
-                                <p class="card-title h4"><i class="fa fa-list"></i> <a href="/app/produce">Produce List</a></p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
-                        <div class="card" style="margin: 30px;">
-                            <div class="card-header">
-                                <p class="card-title h4"><i class="fa fa-tags"></i> <a href="/app/produce/pricepage">Produce Pricing</a></p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
-                        <div class="card" style="margin: 30px;">
-                            <div class="card-header">
-                                <p class="card-title h4"><i class="fa fa-download"></i> <a href="/app/produce/pricepage/pdf">Download Produce Price PDF</a></p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="row">
-                    <h4 style="margin-left: 30px;">Reporting and Dashboards</h4>
-                    <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
-                        <div class="card" style="margin: 30px;">
-                            <div class="card-header">
-                                <p class="card-title h4"><i class="fa fa-qrcode"></i> <a href="/app/qrcode">QR Code Analytics</a></p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
-                        <div class="card" style="margin: 30px;">
-                            <div class="card-header">
-                                <p class="card-title h4"><i class="fa fa-archive"></i> <a href="/app/order">Order Dashboard</a></p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
-                        <div class="card" style="margin: 30px;">
-                            <div class="card-header">
-                                <p class="card-title h4"><i class="fa fa-table"></i> <a href="/app/dashboards/admin">Admin Dashboard</a></p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
-                        <div class="card" style="margin: 30px;">
-                            <div class="card-header">
-                                <p class="card-title h4"><i class="fa fa-table"></i> <a href="/app/dashboard/farmer">Farmer Dashboard</a></p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <% if(admin_status){ %>
-                    <div class="row">
-                        <h4 style="margin-left: 30px;">Configuration</h4>
-                        <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
-                            <div class="card" style="margin: 30px;" ">
-          <div class="card-header ">
-            <p class="card-title h4 "><i class="fa fa-qrcode "></i> <a href="/app/qrcode ">QR Codes - Static</a></p>
+          </div>
+        </div>
+        <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
+          <div class="card" style="margin: 30px;">
+            <div class="card-header">
+              <p class="card-title h4"><i class="fa fa-tags"></i> <a href="/app/produce/pricepage">Produce Pricing</a></p>
+            </div>
+          </div>
+        </div>
+        <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
+          <div class="card" style="margin: 30px;">
+            <div class="card-header">
+              <p class="card-title h4"><i class="fa fa-download"></i> <a href="/app/produce/pricepage/pdf">Download Produce Price PDF</a></p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <h4 style="margin-left: 30px;">Reporting and Dashboards</h4>
+        <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
+          <div class="card" style="margin: 30px;">
+            <div class="card-header">
+              <p class="card-title h4"><i class="fa fa-qrcode"></i> <a href="/app/qrcode">QR Code Analytics</a></p>
+            </div>
+          </div>
+        </div>
+        <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
+          <div class="card" style="margin: 30px;">
+            <div class="card-header">
+              <p class="card-title h4"><i class="fa fa-archive"></i> <a href="/app/order">Order Dashboard</a></p>
+            </div>
+          </div>
+        </div>
+        <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
+          <div class="card" style="margin: 30px;">
+            <div class="card-header">
+              <p class="card-title h4"><i class="fa fa-table"></i> <a href="/app/dashboards/admin">Admin Dashboard</a></p>
+            </div>
+          </div>
+        </div>
+        <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
+          <div class="card" style="margin: 30px;">
+            <div class="card-header">
+              <p class="card-title h4"><i class="fa fa-table"></i> <a href="/app/dashboard/farmer">Farmer Dashboard</a></p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <% if(admin_status){ %>
+      <div class="row">
+        <h4 style="margin-left: 30px;">Configuration</h4>
+        <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4">
+          <div class="card" style="margin: 30px;" ">
+          <div class=" card-header ">
+            <p class=" card-title h4 "><i class=" fa fa-qrcode "></i> <a href=" /app/qrcode ">QR Codes - Static</a></p>
           </div>
       </div>
     </div>
-    <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
-      <div class="card " style="margin: 30px; ">
-        <div class="card-header ">
-          <p class="card-title h4 "><i class="fa fa-qrcode "></i> <a href="/app/qrcode/supplierproduce ">QR Codes - Supplier</a></p>
+    <div class=" col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
+      <div class=" card " style=" margin: 30px; ">
+        <div class=" card-header ">
+          <p class=" card-title h4 "><i class=" fa fa-qrcode "></i> <a href=" /app/qrcode/supplierproduce ">QR Codes - Supplier</a></p>
         </div>
     </div>
   </div>
-  <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
-    <div class="card " style="margin: 30px; ">
-      <div class="card-header ">
-        <p class="card-title h4 "><i class="fa fa-play "></i> <a href="https://www.foodprintapp.com/img/demo_qrcode.png " target="_blank ">Demo FoodPrint Farm - Beetroot QR Code</a></p>
+  <div class=" col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
+    <div class=" card " style=" margin: 30px; ">
+      <div class=" card-header ">
+        <p class=" card-title h4 "><i class=" fa fa-play "></i> <a href=" https://www.foodprintapp.com/img/demo_qrcode.png " target=" _blank ">Demo FoodPrint Farm - Beetroot QR Code</a></p>
       </div>
   </div>
 </div>
-<div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
-  <div class="card " style="margin: 30px; ">
-    <div class="card-header ">
-      <p class="card-title h4 "><i class="fa fa-users "></i> <a href="/app/blockchain_explorer ">Users</a></p>
+<div class=" col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
+  <div class=" card " style=" margin: 30px; ">
+    <div class=" card-header ">
+      <p class=" card-title h4 "><i class=" fa fa-users "></i> <a href=" /app/blockchain_explorer ">Users</a></p>
     </div>
 </div>
 </div>
-<div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
-  <div class="card " style="margin: 30px; ">
-    <div class="card-header ">
-      <p class="card-title h4 "><i class="fa fa-check "></i> <a href="/app/test_config ">Testing UI</a></p>
+<div class=" col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
+  <div class=" card " style=" margin: 30px; ">
+    <div class=" card-header ">
+      <p class=" card-title h4 "><i class=" fa fa-check "></i> <a href=" /app/test_config ">Testing UI</a></p>
     </div>
 </div>
 </div>
-<div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
-  <div class="card " style="margin: 30px; ">
-    <div class="card-header ">
-      <p class="card-title h4 "><i class="fa fa-list "></i> <a href="/app/produce ">Produce List</a></p>
+<div class=" col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
+  <div class=" card " style=" margin: 30px; ">
+    <div class=" card-header ">
+      <p class=" card-title h4 "><i class=" fa fa-list "></i> <a href=" /app/produce ">Produce List</a></p>
     </div>
 </div>
 </div>
-<div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
-  <div class="card " style="margin: 30px; ">
-    <div class="card-header ">
-      <p class="card-title h4 "><i class="fa fa-tags "></i> <a href="/app/produce/pricepage ">Produce Pricing</a></p>
+<div class=" col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
+  <div class=" card " style=" margin: 30px; ">
+    <div class=" card-header ">
+      <p class=" card-title h4 "><i class=" fa fa-tags "></i> <a href=" /app/produce/pricepage ">Produce Pricing</a></p>
     </div>
 </div>
 </div>
-<div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
-  <div class="card " style="margin: 30px; ">
-    <div class="card-header ">
-      <p class="card-title h4 "><i class="fa fa-envelope "></i> <a href="/app/email ">Email Logs</a></p>
+<div class=" col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
+  <div class=" card " style=" margin: 30px; ">
+    <div class=" card-header ">
+      <p class=" card-title h4 "><i class=" fa fa-envelope "></i> <a href=" /app/email ">Email Logs</a></p>
     </div>
 </div>
 </div>
@@ -193,36 +193,36 @@
   <%} else {%>
               
     <% } %>
-  <div class="row ">
-    <h4 style="margin-left: 30px; ">Support</h4>
-    <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
-      <div class="card " style="margin: 30px ">
-        <div class="card-header ">
-          <p class="card-title h4 "><i class="fa fa-newspaper "></i> <a href="https://knowledge.foodprintlabs.com " target="_blank " >Knowledge Base</a></p>
+  <div class=" row ">
+    <h4 style=" margin-left: 30px; ">Support</h4>
+    <div class=" col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
+      <div class=" card " style=" margin: 30px ">
+        <div class=" card-header ">
+          <p class=" card-title h4 "><i class=" fa fa-newspaper "></i> <a href=" https://knowledge.foodprintlabs.com " target=" _blank " >Knowledge Base</a></p>
         </div>
     </div>
   </div>
-  <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
-    <div class="card " style="margin: 30px; ">
-      <div class="card-header ">
-        <p class="card-title h4 "><i class="fa fa-info-circle "></i> <a href="mailto:support@foodprintlabs.com ">FoodPrint Support</a></p>
+  <div class=" col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
+    <div class=" card " style=" margin: 30px; ">
+      <div class=" card-header ">
+        <p class=" card-title h4 "><i class=" fa fa-info-circle "></i> <a href=" mailto:support@foodprintlabs.com ">FoodPrint Support</a></p>
       </div>
   </div>
 </div>
-<div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
-  <div class="card " style="margin: 30px; ">
-    <div class="card-header ">
-      <p class="card-title h4 "><i class="fa fa-share "></i> <a target="_blank " href="http://foodprintlabs.com/ ">FoodPrint Labs Website</a></p>
+<div class=" col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
+  <div class=" card " style=" margin: 30px; ">
+    <div class=" card-header ">
+      <p class=" card-title h4 "><i class=" fa fa-share "></i> <a target=" _blank " href=" http://foodprintlabs.com/ ">FoodPrint Labs Website</a></p>
     </div>
 </div>
 </div>
 </div>
-<div class="row ">
-  <h4 style="margin-left: 30px; ">Other</h4>
-  <div class="col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
-    <div class="card " style="margin: 30px ">
-      <div class="card-header ">
-        <p class="card-title h4 "><i class="fa fa-user "></i> <a href="/app/harvest ">My Account</a></p>
+<div class=" row ">
+  <h4 style=" margin-left: 30px; ">Other</h4>
+  <div class=" col-4 col-sm-4 col-md-4 col-lg-4 col-xl-4 ">
+    <div class=" card " style=" margin: 30px ">
+      <div class=" card-header ">
+        <p class=" card-title h4 "><i class=" fa fa-user "></i> <a href=" /app/harvest ">My Account</a></p>
       </div>
   </div>
 </div>
@@ -237,13 +237,13 @@
       <%- include('partials/footer'); %>
   <!-- end footer -->
 
-  <div class="gototop js-top ">
-    <a href="# " class="js-gotop "><i class="icon-chevron-thin-up "></i></a>
+  <div class=" gototop js-top ">
+    <a href=" # " class=" js-gotop "><i class=" icon-chevron-thin-up "></i></a>
   </div>
 
-  <script src="js/scripts.min.js "></script>
-  <script src="js/main.min.js "></script>
-  <script src="js/custom.js "></script>
+  <script src=" js/scripts.min.js "></script>
+  <script src=" js/main.min.js "></script>
+  <script src=" js/custom.js "></script>
 
   </body>
 </html>
\ No newline at end of file
diff --git a/views/login.ejs b/views/login.ejs
index cf4909d0..2e8ad1bd 100644
--- a/views/login.ejs
+++ b/views/login.ejs
@@ -2,64 +2,64 @@
 <html lang="en">
 
 <head>
-        <%- include('partials/head'); %>
+  <%- include('partials/head'); %>
 </head>
 
 <body>
-    <!-- START: header -->
+  <!-- START: header -->
 
-    <div class="probootstrap-loader"></div>
+  <div class="probootstrap-loader"></div>
 
-    <header role="banner" class="probootstrap-header">
-            <%- include('partials/header'); %>
-    </header>
-    <!-- END: header -->
+  <header role="banner" class="probootstrap-header">
+    <%- include('partials/header'); %>
+  </header>
+  <!-- END: header -->
 
 
-    <div class="container" style="width: 100%;">
-        <div class="row align-items-center justify-content-center">
-            <!-- START LOGIN FORM-->
-            <div class="col-md-6 col-md-offset-3">
-                <!-- col-md-offset-3 class that will offset by 3 columns, given that Bootstrap has a 12-column grid this will put a col-md-6 element right in the center. -->
-                <!-- <h3 class="heading text-center">User Login</h3> -->
-                    <%- include('partials/notificationbar'); %>
-                    <div class="login">
-                        <div class="login-image probootstrap-section-heading text-center probootstrap-animate fadeInUp probootstrap-animated" style="background-image: url(/img/farm1.jpg); height: 200px; background-size: 100%; background-repeat: no-repeat; "></div>
-                        <h4 class="heading">Login</h4>
-                        <form class="login-form probootstrap-form mb60 validate-form" method="post">
-                            <div class="form-group">
-                                <label for="loginUsername">Username</label>
-                                <input type="text" style="color: black;" id="loginUsername" name="loginUsername" class="form-control" placeholder="Enter Username" required autofocus/>
-                            </div>
+  <div class="container" style="width: 100%;">
+    <div class="row align-items-center justify-content-center">
+      <!-- START LOGIN FORM-->
+      <div class="col-md-6 col-md-offset-3">
+        <!-- col-md-offset-3 class that will offset by 3 columns, given that Bootstrap has a 12-column grid this will put a col-md-6 element right in the center. -->
+        <!-- <h3 class="heading text-center">User Login</h3> -->
+        <%- include('partials/notificationbar'); %>
+        <div class="login">
+          <div class="login-image probootstrap-section-heading text-center probootstrap-animate fadeInUp probootstrap-animated" style="background-image: url(/img/farm1.jpg); height: 200px; background-size: 100%; background-repeat: no-repeat; "></div>
+          <h4 class="heading">Login</h4>
+          <form class="login-form probootstrap-form mb60 validate-form" method="post">
+            <div class="form-group">
+              <label for="loginUsername">Username</label>
+              <input type="text" style="color: black;" id="loginUsername" name="loginUsername" class="form-control" placeholder="Enter Username" required autofocus />
+            </div>
 
-                            <div class="form-group">
-                                <label for="loginPassword">Password</label>
-                                <input type="password" style="color: black;" id="loginPassword" name="loginPassword" class="form-control" placeholder="Enter Password" required>
-                            </div>
+            <div class="form-group">
+              <label for="loginPassword">Password</label>
+              <input type="password" style="color: black;" id="loginPassword" name="loginPassword" class="form-control" placeholder="Enter Password" required>
+            </div>
 
-                            <div class="form-group">
-                                <button class="btn btn-primary" type="submit" formaction="/app/auth/login">Login</button>
-                                <!-- Local Auth -->
-                            </div>
+            <div class="form-group">
+              <button class="btn btn-primary" type="submit" formaction="/app/auth/login">Login</button>
+              <!-- Local Auth -->
+            </div>
 
-                            <div class="form-group">
-                                Don't have a FoodPrint account yet? <a href="/app/auth/register">Register now</a>.
-                            </div>
-                        </form>
-                    </div>
+            <div class="form-group">
+              Don't have a FoodPrint account yet? <a href="/app/auth/register">Register now</a>.
             </div>
+          </form>
         </div>
-        <!-- END LOGIN FORM-->
+      </div>
     </div>
-    <div><br/></div>
-    <!-- start footer -->
-    <%- include('partials/footer'); %>
-        <!-- end footer -->
+    <!-- END LOGIN FORM-->
+  </div>
+  <div><br /></div>
+  <!-- start footer -->
+  <%- include('partials/footer'); %>
+  <!-- end footer -->
 
-        <!--<script type="text/javascript" src="/js/bundle.js"></script>-->
-        <script src="/js/scripts.min.js"></script>
-        <script src="/js/main.min.js"></script>
-        <script src="/js/custom.js"></script>
+  <!--<script type="text/javascript" src="/js/bundle.js"></script>-->
+  <script src="/js/scripts.min.js"></script>
+  <script src="/js/main.min.js"></script>
+  <script src="/js/custom.js"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
index 3eddedab..677b5124 100644
--- a/views/partials/header.ejs
+++ b/views/partials/header.ejs
@@ -2,114 +2,112 @@
 <!-- START: header -->
 <!-- add immediately after body tag-->
 <div class="container-fluid header-container">
-    <a href="/" class="logo-wrapper">
-        <img class="logo" src="/img/FoodPrintLogo.png" height="40px" align="left" vertical-align="middle" alt="logo">
-        <h2 class="probootstrap-logo">FoodPrint<span>.</span></h2>
-    </a>
+  <a href="/" class="logo-wrapper">
+    <img class="logo" src="/img/FoodPrintLogo.png" height="40px" align="left" vertical-align="middle" alt="logo">
+    <h2 class="probootstrap-logo">FoodPrint<span>.</span></h2>
+  </a>
 
-    <a href="#" class="probootstrap-burger-menu visible-xs"><i>Menu</i></a>
-    <div class="mobile-menu-overlay"></div>
+  <a href="#" class="probootstrap-burger-menu visible-xs"><i>Menu</i></a>
+  <div class="mobile-menu-overlay"></div>
 
-    <nav role="navigation" class="probootstrap-nav hidden-xs">
-        <ul class="probootstrap-main-nav">
-            <li <% if (page_name==='home' ) { %>class="active"
-                <% } %> ><a href="/">Home</a></li>
+  <nav role="navigation" class="probootstrap-nav hidden-xs">
+    <ul class="probootstrap-main-nav">
+      <li <% if (page_name==='home' ) { %>class="active" <% } %>><a href="/">Home</a></li>
 
 
-            <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Track & Trace
-            </a>
-                <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-                    <a class="dropdown-item" href="/app/harvest">Harvest Logbook</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="/app/storage">Storage/Handover Logbook</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="/app/trace_produce">Trace Produce</a>
-                </div>
-            </li>
-
-            <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Wholesale Marketplace
-            </a>
-                <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-                    <a class="dropdown-item" href="/app/buyer">Buyer Logbook</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="/app/seller">Seller Logbook</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="/app/order">Order Dashboard</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="/app/order/myorders">My Orders</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="/app/produce">Produce List</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="/app/produce/pricepage">Produce Pricing</a>
-                </div>
-            </li>
+      <li class="nav-item dropdown">
+        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          Track & Trace
+        </a>
+        <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+          <a class="dropdown-item" href="/app/harvest">Harvest Logbook</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/app/storage">Storage/Handover Logbook</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/app/trace_produce">Trace Produce</a>
+        </div>
+      </li>
 
-            <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            Reporting & Dashboards
+      <li class="nav-item dropdown">
+        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          Wholesale Marketplace
         </a>
-                <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-                    <a class="dropdown-item" href="/app/buyer">QR Code Analytics</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="/app/seller">Seller Logbook</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="/app/order">Order Dashboard</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="/app/dashboards/admin">Admin Dashboard</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="/app/dashboards/farmer">Farmer Dashboard</a>
-                </div>
-            </li>
+        <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+          <a class="dropdown-item" href="/app/buyer">Buyer Logbook</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/app/seller">Seller Logbook</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/app/order">Order Dashboard</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/app/order/myorders">My Orders</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/app/produce">Produce List</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/app/produce/pricepage">Produce Pricing</a>
+        </div>
+      </li>
 
-            <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Configuration
-            </a>
-                <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="/app/qrcode">QR Codes - Static</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="/app/qrcode/supplierproduce">QR Codes - Supplier Produce</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="https://www.foodprintapp.com/img/demo_qrcode.png" target="_blank">Demo QR Code</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="/app/blockchain_explorer">Users</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="/test_config">Testing UI</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="/app/produce">Produce List</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="/app/produce/pricepage">Produce Pricing</a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="/app/email">Email Logs</a>
+      <li class="nav-item dropdown">
+        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          Reporting & Dashboards
+        </a>
+        <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+          <a class="dropdown-item" href="/app/buyer">QR Code Analytics</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/app/seller">Seller Logbook</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/app/order">Order Dashboard</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/app/dashboards/admin">Admin Dashboard</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/app/dashboards/farmer">Farmer Dashboard</a>
+        </div>
+      </li>
 
-                </div>
-            </li>
+      <li class="nav-item dropdown">
+        <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          Configuration
+        </a>
+        <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/app/qrcode">QR Codes - Static</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/app/qrcode/supplierproduce">QR Codes - Supplier Produce</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="https://www.foodprintapp.com/img/demo_qrcode.png" target="_blank">Demo QR Code</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/app/blockchain_explorer">Users</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/test_config">Testing UI</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/app/produce">Produce List</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/app/produce/pricepage">Produce Pricing</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/app/email">Email Logs</a>
 
-            <!-- <li <% if (page_name === 'supplychain') { %>class="active" <% } %> ><a href="/app/supplychain">Supply Chain</a></li> This was from very first pilot with harvest and storage on one page July 2019 -->
-            <!--<li <% if (page_name === 'config') { %>class="active" <% } %> ><a href="/config">Config</a></li> -->
-            <li <% if (page_name==='login' ) { %>class=""
-                <% } %> >
-                    <% if (user) { %>
-                        <a href="/app/auth/logout">Log out (<%=user.username%>)</a>
-                        <% } else { %>
-                            <a class="login-header" href="/app/auth/login">Login</a>
-                            <% } %>
-            </li>
-        </ul>
-        <div class="extra-text visible-xs">
-            <a href="#" class="probootstrap-burger-menu"><i>Menu</i></a>
-            <h5>Connect</h5>
-            <ul class="social-buttons">
-                <li><a href="https://twitter.com/foodprintlabs"><i class="icon-twitter"></i></a></li>
-                <li><a href="https://www.facebook.com/foodprintlabs"><i class="icon-facebook"></i></a></li>
-                <li><a href="https://www.linkedin.com/company/foodprintlabs"><i class="icon-linkedin"></i></a></li>
-            </ul>
         </div>
-    </nav>
+      </li>
+
+      <!-- <li <% if (page_name === 'supplychain') { %>class="active" <% } %> ><a href="/app/supplychain">Supply Chain</a></li> This was from very first pilot with harvest and storage on one page July 2019 -->
+      <!--<li <% if (page_name === 'config') { %>class="active" <% } %> ><a href="/config">Config</a></li> -->
+      <li <% if (page_name==='login' ) { %>class="" <% } %>>
+        <% if (user) { %>
+        <a href="/app/auth/logout">Log out (<%=user.username%>)</a>
+        <% } else { %>
+        <a class="login-header" href="/app/auth/login">Login</a>
+        <% } %>
+      </li>
+    </ul>
+    <div class="extra-text visible-xs">
+      <a href="#" class="probootstrap-burger-menu"><i>Menu</i></a>
+      <h5>Connect</h5>
+      <ul class="social-buttons">
+        <li><a href="https://twitter.com/foodprintlabs"><i class="icon-twitter"></i></a></li>
+        <li><a href="https://www.facebook.com/foodprintlabs"><i class="icon-facebook"></i></a></li>
+        <li><a href="https://www.linkedin.com/company/foodprintlabs"><i class="icon-linkedin"></i></a></li>
+      </ul>
+    </div>
+  </nav>
 </div>
 <!-- END: header -->
\ No newline at end of file
diff --git a/views/register.ejs b/views/register.ejs
index 56ccc3a3..b1c8a45f 100644
--- a/views/register.ejs
+++ b/views/register.ejs
@@ -2,86 +2,138 @@
 <html lang="en">
 
 <head>
-        <%- include('partials/head'); %>
+  <%- include('partials/head'); %>
 </head>
 
 <body>
-    <!-- START: header -->
-
-    <div class="probootstrap-loader"></div>
-
-    <header role="banner" class="probootstrap-header">
-            <%- include('partials/header'); %>
-    </header>
-    <!-- END: header -->
-
-
-    <div class="container" style="width: 100%;">
-        <div class="row align-items-center justify-content-center">
-            <!-- START LOGIN FORM-->
-            <div class="col-md-6 col-md-offset-3">
-                <!-- col-md-offset-3 class that will offset by 3 columns, given that Bootstrap has a 12-column grid this will put a col-md-6 element right in the center. -->
-                    <%- include('partials/notificationbar'); %>
-                    <div class="register">
-                        <div class="register-image probootstrap-section-heading text-center probootstrap-animate fadeInUp probootstrap-animated" style="background-image: url(/img/farm1.jpg); height: 200px; background-size: 100%; background-repeat: no-repeat; "></div>
-                        <h4 class="heading">REGISTER</h4>
-
-                        <form class="register-form probootstrap-form validate-form" method="post">
-                            <div class="form-group">
-                                <label for="registerName">Name</label>
-                                <input type="text" style="color: black;" id="registerName" name="registerName" class="form-control" placeholder="Enter Name" required autofocus/>
-                            </div>
-
-                            <div class="form-group">
-                                <label for="registerSurname">Surname</label>
-                                <input type="text" style="color: black;" id="registerSurname" name="registerSurname" class="form-control" placeholder="Enter Surname" required autofocus/>
-                            </div>
-
-                            <div class="form-group">
-                                <label for="registerEmail">Email Address</label>
-                                <input type="email" style="color: black;" id="registerEmail" name="registerEmail" class="form-control" placeholder="Enter Email Address" required autofocus/>
-                            </div>
-
-                            <div class="form-group">
-                                <label for="registerConfirmEmail">Confirm Email Address</label>
-                                <input type="email" style="color: black;" id="registerConfirmEmail" name="registerConfirmEmail" class="form-control" placeholder="Re-Enter Email Address" required autofocus/>
-                            </div>
-
-                            <div class="form-group">
-                                <label for="registerUserType">User Type</label>
-                                <select class="custom-select d-block w-100" name="registerUserType" id="registerUserType" required>
-                                  <option value="" selected disabled >Select User Type...</option>
-                                  <option>Farmer</option>
-                                  <option>Agri-Hub</option>
-                                  <option>Food Market</option>
-                                  <option>Restaurant</option>
-                                  <option>Retailer</option>
-                                  <option>Consumer</option>
-                                </select>
-                            </div>
-
-                            <div class="form-group">
-                                <label for="registerOrgName">Organisation Name</label>
-                                <input type="text" style="color: black;" id="registerOrgName" name="registerOrgName" class="form-control" placeholder="Enter Organisation Name" required>
-                            </div>
-
-                            <div class="form-group">
-                                <button class="btn btn-primary" type="submit" formaction="/app/auth/register">Register</button>
-                            </div>
-
-                            <div class="form-group">
-                                By signing up, you are indicating that you have read and agree to the <a href="/terms" target="_blank">Terms of Use</a> and <a href="/privacy" target="_blank">Privacy Policy</a>.
-                            </div>
-
-                            <div class="form-group">
-                                Already have a FoodPrint account? <a href="/app/auth/login/">Login now</a>.
-                            </div>
+  <!-- START: header -->
+
+  <div class="probootstrap-loader"></div>
+
+  <header role="banner" class="probootstrap-header">
+    <%- include('partials/header'); %>
+  </header>
+  <!-- END: header -->
+
+
+  <div class="container" style="width: 100%;">
+    <div class="row align-items-center justify-content-center">
+      <!-- START LOGIN FORM-->
+      <div class="col-md-6 col-md-offset-3">
+        <!-- col-md-offset-3 class that will offset by 3 columns, given that Bootstrap has a 12-column grid this will put a col-md-6 element right in the center. -->
+        <%- include('partials/notificationbar'); %>
+        <div class="register">
+          <div class="register-image probootstrap-section-heading text-center probootstrap-animate fadeInUp probootstrap-animated" style="background-image: url(/img/farm1.jpg); height: 200px; background-size: 100%; background-repeat: no-repeat; "></div>
+          <h4 class="heading">REGISTER</h4>
+
+          <form class="register-form probootstrap-form validate-form" method="post">
+            <div class="form-group">
+              <label for="registerName">Name</label>
+              <input type="text" style="color: black;" id="registerName" name="registerName" class="form-control" placeholder="Enter Name" required autofocus />
+            </div>
+            <div class="form-group">
+              <label for="registerSurname">Surname</label>
+              <input type="text" style="color: black;" id="registerSurname" name="registerSurname" class="form-control" placeholder="Enter Surname" required autofocus />
+            </div>
+
+            <div class="form-group">
+              <label for="registerEmail">Email Address</label>
+              <input type="email" style="color: black;" id="registerEmail" name="registerEmail" class="form-control" placeholder="Enter Email Address" required autofocus />
+            </div>
+            <div class="form-group">
+              <label for="registerConfirmEmail">Confirm Email Address</label>
+              <input type="email" style="color: black;" id="registerConfirmEmail" name="registerConfirmEmail" class="form-control" placeholder="Re-Enter Email Address" required autofocus />
+            </div>
+            <div class="form-group">
+              <label for="registerPhoneNumber">Phone Number</label>
+              <input type="tel" style="color: black;" id="registerPhoneNumber" name="registerPhoneNumber" class="form-control" placeholder="Enter Phone Number" pattern="[0]{1}[0-9]{9}" required autofocus />
+            </div>
+            <div class="form-group">
+              <label for="registerUserType">User Type</label>
+              <select class="custom-select d-block w-100" name="registerUserType" id="registerUserType" required>
+                <option value="" selected disabled>Select User Type...</option>
+                <option>Farmer</option>
+                <option>Agri-Hub</option>
+                <option>Food Market</option>
+                <option>Restaurant</option>
+                <option>Retailer</option>
+                <option>Consumer</option>
+              </select>
+            </div>
+
+            <div class="form-group">
+              <label for="password">Password</label>
+              <input type="password" style="color: black;" id="password" name="password" class="form-control" placeholder="Password" required>
+            </div>
+
+
+            <input name='role' type='text' value='<%= choice %>' hidden>
+
+            <%if(choice && choice.length > 0 && (choice === 'Agent' || choice === 'Farmer' )){%>
+            <div class="form-group">
+              <label for="registerIDPhoto">ID Photo</label>
+              <input type="file" style="color: black;" id="registerIDPhoto" name="registerIDPhoto" class="form-control" required>
+            </div>
+
+            <%}%>
+
+
+                  <!--IF agent SELECTED display and required-->
+                <%if(choice && choice.length > 0 && choice === 'Agent'){%>
+            <div class="form-group">
+              <label for="city">City</label>
+              <input type="text" style="color: black;" id="city" name="city" class="form-control" placeholder="Enter City" required>
+            </div>
+            <%}%>
+
+
+                <!--IF intermediary SELECTED display and required-->
+                <%if(choice && choice.length > 0 && choice === 'Intermediary'){%>
+            <div class="form-group">
+              <label for="registerOrgName">Organisation Name</label>
+              <input type="text" style="color: black;" id="registerOrgName" name="registerOrgName" class="form-control" placeholder="Enter Organisation Name" required>
+            </div>
+
+
+            <div class="form-group">
+              <label for="registerOrgType">Organisation Type</label>
+              <select class="custom-select d-block w-100" name="registerOrgType" id="registerOrgType">
+                <option value="" selected disabled>Choose Organisation Type...</option>
+                <option>Retailer</option>
+                <option>Restaurant</option>
+                <option>Market</option>
+                <option>AgriHub</option>
+              </select>
+            </div>
+            <%}%>
+
+
+                <!--IF farmer display SELECTED and required-->
+                <%if(choice && choice.length > 0 && choice === 'Farmer'){%>
+            <div class="form-group">
+              <label for="farmName">Farm Name</label>
+              <input type="text" style="color: black;" id="farmName" name="farmName" class="form-control" placeholder="Enter Farm Name" required>
+            </div>
+            <%}%>
+
+
+                <div class="form-group">
+                  <button class="btn btn-primary" type="submit" formaction="/app/auth/register">Register</button>
+                </div>
+
+                <div class="form-group">
+                    By signing up, you are indicating that you have read and agree to the <a href="/terms" target="_blank">Terms of Use</a> and <a href="/privacy" target="_blank">Privacy Policy</a>.
+                  </div>
+
+                <div class="form-group">
+                  Already have a FoodPrint account? <a href="/app/auth/login/">Sign in now</a>.
+                </div>
 
 
 
                         </form>
                     </div>
-                    <!-- END LOGIN FORM-->
+                    <!-- END REGISTER FORM-->
             </div>
         </div>
 
diff --git a/views/register_options.ejs b/views/register_options.ejs
new file mode 100644
index 00000000..882b181c
--- /dev/null
+++ b/views/register_options.ejs
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <% include ./partials/head %>
+</head>
+<body>
+<!-- START: header -->
+
+<div class="probootstrap-loader"></div>
+
+<header role="banner" class="probootstrap-header">
+    <% include ./partials/header %>
+</header>
+<!-- END: header -->
+
+
+<div class="container" style="width: 100%;">
+    <div class="row align-items-center justify-content-center">
+        <!-- START PRE-REGISTER FORM-->
+        <div class="col-md-6 col-md-offset-3">
+            <!-- col-md-offset-3 class that will offset by 3 columns, given that Bootstrap has a 12-column grid this will put a col-md-6 element right in the center. -->
+            <h3 class="heading text-center">USER REGISTRATION</h3>
+            <% include ./partials/notificationbar %>
+            <div class="probootstrap-section-heading text-center mb50 probootstrap-animate fadeInUp probootstrap-animated"
+                 style="background-image: url(/img/farm1.jpg); height: 200px; background-size: 100%; background-repeat: no-repeat; ">
+            </div>
+            <h4 class="heading">What interests you about joining the FoodPrint initiative</h4>
+
+            <form class="probootstrap-form mb60 validate-form" method="get">
+
+                <!--Descriptions for each members will be added to label-->
+                <div class="register-option">
+                    <input type="radio" id="farmer" name="choice" value="Farmer" checked>
+                    <label for="farmer" class="choice_description">I am a Farmer</label>
+                </div>
+
+                <div class="register-option">
+                    <input type="radio" id="intermediary" name="choice" value="Intermediary">
+                    <label for="intermediary" class="choice_description">I am an intermediary</label>
+                </div>
+
+                <div class="register-option">
+                    <input type="radio" id="agent" name="choice" value="Agent">
+                    <label for="agent" class="choice_description">I am an Agent</label>
+                </div>
+
+
+                <div class="form-group">
+                    <button class="btn btn-primary" type="submit" formaction="/app/auth/register">Continue</button>
+                </div>
+
+                <div class="form-group">
+                    Already have a FoodPrint account? <a href="/app/auth/login/">Sign in now</a>.
+                </div>
+
+
+            </form>
+        </div>
+        <!-- END PRE-REGISTER FORM-->
+    </div>
+</div>
+
+<!-- start footer -->
+<% include ./partials/footer %>
+<!-- end footer -->
+
+<!--<script type="text/javascript" src="/js/bundle.js"></script>-->
+<script src="/js/scripts.min.js"></script>
+<script src="/js/main.min.js"></script>
+<script src="/js/custom.js"></script>
+</body>
+</html>
diff --git a/views/test_config.ejs b/views/test_config.ejs
index a12784ba..69cc1e51 100644
--- a/views/test_config.ejs
+++ b/views/test_config.ejs
@@ -1,176 +1,203 @@
 <!DOCTYPE html>
 <html>
+
 <head>
   <title>Farmers</title>
   <!--<link rel='stylesheet' href='/stylesheets/style.css' />-->
-  <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
-<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
-<link href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
+  <%- include('partials/head'); %>
 </head>
+
 <body>
+
+  <div class="probootstrap-loader"></div>
+
+  <header role="banner" class="probootstrap-header">
+    <%- include('partials/header'); %>
+  </header>
   <div>
-    <a href="/" class="btn btn-primary ml-3">Home</a>
+    <!-- <a href="/" class="btn btn-primary ml-3">Home</a>
     <a href="#" class="btn btn-secondary ml-3">New Customer</a>
-    <a href="#" class="btn btn-info ml-3">Customer List</a>
-</div>
-<!--   <% if (messages.error) { %>
+    <a href="#" class="btn btn-info ml-3">Customer List</a> -->
+  </div>
+  <!--   <% if (messages.error) { %>
   <p style="color:red"><%- messages.error %></p>
 <% } %> -->
 
-<% if (messages.success) { %>
-    <p class="alert alert-success mt-4"><%- messages.success %></p>
-<% } %>
-<br>
-  <table class="table">
-<thead>
-  <tr>
-    <th scope="col">#</th>
-    <th scope="col">ID</th>
-    <th scope="col">Farmer Name</th>
-    <th width="200px">Produce Name</th>
-
-  </tr>
-</thead>
-<tbody>
-  <% if(data.length){
+  <% if (messages.success) { %>
+  <p class="alert alert-success mt-4"><%- messages.success %></p>
+  <% } %>
+  <br>
+
+  <div id="test-config-wrapper">
+    <div class="title col-12 title-global-container">
+      <h3 class="title-global">Testing</h3>
+    </div>
+
+    <%# Data %>
+    <table class="table">
+      <thead>
+        <tr>
+          <th scope="col">#</th>
+          <th scope="col">ID</th>
+          <th scope="col">Farmer Name</th>
+          <th scope="col">Produce Name</th>
+
+        </tr>
+      </thead>
+      <tbody>
+        <% if(data.length){
 
   for(var i = 0; i< data.length; i++) {%>
-  <tr>
-    <th scope="row"><%= (i+1) %></th>
-    <td><%= data[i].harvest_logid%></td>
-    <td><%= data[i].harvest_farmerName%></td>
-    <td><%= data[i].harvest_produceName%></td>
-    <!--<td>
+        <tr>
+          <th scope="row"><%= (i+1) %></th>
+          <td><%= data[i].harvest_logid%></td>
+          <td><%= data[i].harvest_farmerName%></td>
+          <td><%= data[i].harvest_produceName%></td>
+          <!--<td>
     &lt;!&ndash;<a class="btn btn-success edit" href="../customers/edit/<%=data[i].id%>">Edit</a>                       &ndash;&gt;
     &lt;!&ndash;<a class="btn btn-danger delete" onclick="return alert('Are You sure?')" href="../customers/delete/<%=data[i].id%>">Delete</a>                       &ndash;&gt;
    <a class="btn btn-success edit" href="#">Edit</a>
     <a class="btn btn-danger delete" onclick="return alert('Are You sure?')" href="#">Delete</a>
    </td>-->
-  </tr>
-  <% }
+        </tr>
+        <% }
 
    }else{ %>
-       <tr>
+        <tr>
           <td colspan="3">No data</td>
-       </tr>
-    <% } %>
-</tbody>
-</table>
-
-<div class="row">
-  <p><a class="btn btn-success" id="test_whatsapp_pdf" href="/app/produce/pricepage/pdf/whatsapp" target="_blank">Test WhatsApp Produce Price PDF</a></p>
-  <p><text id="test_whatsapp_pdf_result"></text></p>
-  <div class="alert-danger" id = "test_whatsapp_pdf_error_group" style="display: none"></div>
-  <ul id="test_whatsapp_pdf_errors"></ul>
-</div>
-<div class="row">
-  <p><a class="btn btn-success" id="test_email">Test Email</a></p>
-  <p><text id="test_email_result"></text></p>
-  <div class="alert-danger" id = "test_email_error_group" style="display: none"></div>
-  <ul id="test_email_errors"></ul>
-</div>
-<div class="row">
-  <p><a class="btn btn-success" id="test_qrcode">Test QR Code</a></p>
-  <p><text id="test_qrcode_result"></text></p>
-  <p><div id="test_qrcode_image"></div></p>
-  <div class="alert-danger" id = "test_qrcode_error_group" style="display: none"></div>
-  <ul id="test_qrcode_errors"></ul>
-</div>
-<div class="row">
-  <p><a class="btn btn-success" id="test_rest_producescan">Test REST API (app/api/v1/scan/WMNP_Fennel)</a></p>
-  <p><text id="test_rest_producescan_result"></text></p>
-  <p><div id="test_rest_producescan_image"></div></p>
-  <div class="alert-danger" id = "test_rest_producescan_error_group" style="display: none"></div>
-  <ul id="test_rest_producescan_errors"></ul>
-</div>
-
-<script>
-  $(document).ready(function () {
-           $('#test_email').click(function (event) {
-                        event.preventDefault();
-                        //collect the form data using Id Selector what ever data you need to send to server
-                        //var data = {};
-                        //data.checkin_email=$('#checkin_email').val();
-                        //data.checkin_market_id=$('#checkin_market_id').val();
-                        $('#test_email_result').html('Processing.');
-                        $.ajax({
-                            url: '/app/testemail',
-                            //data: JSON.stringify(data),
-                            processData: false,
-                            type: 'POST',
-                            contentType: 'application/json'
-                        }).done(function(res) {
-                            if (res.success) {
-                                $('#test_email_error_group').hide();
-                                $('#test_email_result').html('Email sent!');
-                            } else {
-                                $('#test_email_result').html('Email not sent!');
-                                $('#test_email_error_group').css('display', 'block');
-                                  var errors = JSON.parse(JSON.stringify(res.errors));
-                                  var errorsContainer = $('#test_email_errors');
-                                  errorsContainer.innerHTML = '';
-                                  var errorsList = '';
-
-                                  for (var i = 0; i < errors.length; i++) {
-                                    errorsList += '<li>' + errors[i].msg + '</li>';
-                                  }
-                                  errorsContainer.html(errorsList);
-                                }
-                          });
-                    });
-
-          $('#test_rest_producescan').click(function (event) {
-                        event.preventDefault();
-                        $.ajax({
-                            url: '/app/api/v1/scan/WMNP_Fennel',
-                            processData: false,
-                            type: 'GET',
-                            contentType: 'application/json'
-                        }).done(function(res) {
-                            $('#test_rest_producescan_image').html(res);
-                            console.log('Test API call (/app/api/v1/scan/WMNP_Fennel) successful!');
-                            $('#test_rest_producescan_result').html('Test API call (/app/api/v1/scan/WMNP_Fennel) successful!');
-                          });
-                    });
-
-          $('#test_qrcode').click(function (event) {
-                        event.preventDefault();
-                        //collect the form data using Id Selector what ever data you need to send to server
-                        $('#test_qrcode_result').html('Processing.');
-                        $.ajax({
-                            url: '/test_qrcode',
-                            processData: false,
-                            type: 'POST',
-                            contentType: 'application/json'
-                        }).done(function(res) {
-                          var divQRCodeHtml = '<img src='+ res + '>';
-                          $('#test_qrcode_image').html(divQRCodeHtml);
-                          console.log('Test QRCode created!');
-                          $('#test_qrcode_result').html('Test QRCode created!');
-
-
-                            // if (res.success) {
-                            //     //$("#subscribe_form").get(0).reset() // or $('form')[0].reset()
-                            //     $("#checkin_calltoaction").hide();
-                            //     $("#checkin_form").hide();
-                            //     $('#checkin_error_group').hide();
-                            //     $('#test_qrcode_result').html('Thanks for checking in (' + res.email + ') and enjoy your visit!');
-                            // } else {
-                            //     $('#test_qrcode_error_group').css('display', 'block');
-                            //       var errors = JSON.parse(JSON.stringify(res.errors));
-                            //       var errorsContainer = $('#test_qrcode_errors');
-                            //       errorsContainer.innerHTML = '';
-                            //       var errorsList = '';
-
-                            //       for (var i = 0; i < errors.length; i++) {
-                            //         errorsList += '<li>' + errors[i].msg + '</li>';
-                            //       }
-                            //       errorsContainer.html(errorsList);
-                            //     }
-                          });
-                    });
-
-                });
+        </tr>
+        <% } %>
+      </tbody>
+    </table>
+    <div class="test-btns-container">
+      <div class="row">
+        <p><a class="btn btn-success" id="test_whatsapp_pdf" href="/app/produce/pricepage/pdf/whatsapp" target="_blank">Test WhatsApp Produce Price PDF</a></p>
+        <p><text id="test_whatsapp_pdf_result"></text></p>
+        <div class="alert-danger" id="test_whatsapp_pdf_error_group" style="display: none"></div>
+        <ul id="test_whatsapp_pdf_errors"></ul>
+      </div>
+      <div class="row">
+        <p><a class="btn btn-success" id="test_email">Test Email</a></p>
+        <p><text id="test_email_result"></text></p>
+        <div class="alert-danger" id="test_email_error_group" style="display: none"></div>
+        <ul id="test_email_errors"></ul>
+      </div>
+      <div class="row">
+        <p><a class="btn btn-success" id="test_qrcode">Test QR Code</a></p>
+        <p><text id="test_qrcode_result"></text></p>
+        <p>
+        <div id="test_qrcode_image"></div>
+        </p>
+        <div class="alert-danger" id="test_qrcode_error_group" style="display: none"></div>
+        <ul id="test_qrcode_errors"></ul>
+      </div>
+      <div class="row">
+        <p><a class="btn btn-success" id="test_rest_producescan">Test REST API (app/api/v1/scan/WMNP_Fennel)</a></p>
+        <p><text id="test_rest_producescan_result"></text></p>
+        <p>
+        <div id="test_rest_producescan_image"></div>
+        </p>
+        <div class="alert-danger" id="test_rest_producescan_error_group" style="display: none"></div>
+        <ul id="test_rest_producescan_errors"></ul>
+      </div>
+    </div>
+  </div>
+  <%- include('partials/footer'); %>
+  <!-- end footer -->
+
+  <!--<script type="text/javascript" src="/js/bundle.js"></script>-->
+  <script src="/js/scripts.min.js"></script>
+  <script src="/js/main.min.js"></script>
+  <script src="/js/custom.js"></script>
+
+  <script>
+    $(document).ready(function() {
+      $('#test_email').click(function(event) {
+        event.preventDefault();
+        //collect the form data using Id Selector what ever data you need to send to server
+        //var data = {};
+        //data.checkin_email=$('#checkin_email').val();
+        //data.checkin_market_id=$('#checkin_market_id').val();
+        $('#test_email_result').html('Processing.');
+        $.ajax({
+          url: '/app/testemail',
+          //data: JSON.stringify(data),
+          processData: false,
+          type: 'POST',
+          contentType: 'application/json'
+        }).done(function(res) {
+          if (res.success) {
+            $('#test_email_error_group').hide();
+            $('#test_email_result').html('Email sent!');
+          } else {
+            $('#test_email_result').html('Email not sent!');
+            $('#test_email_error_group').css('display', 'block');
+            var errors = JSON.parse(JSON.stringify(res.errors));
+            var errorsContainer = $('#test_email_errors');
+            errorsContainer.innerHTML = '';
+            var errorsList = '';
+
+            for (var i = 0; i < errors.length; i++) {
+              errorsList += '<li>' + errors[i].msg + '</li>';
+            }
+            errorsContainer.html(errorsList);
+          }
+        });
+      });
+
+      $('#test_rest_producescan').click(function(event) {
+        event.preventDefault();
+        $.ajax({
+          url: '/app/api/v1/scan/WMNP_Fennel',
+          processData: false,
+          type: 'GET',
+          contentType: 'application/json'
+        }).done(function(res) {
+          $('#test_rest_producescan_image').html(res);
+          console.log('Test API call (/app/api/v1/scan/WMNP_Fennel) successful!');
+          $('#test_rest_producescan_result').html('Test API call (/app/api/v1/scan/WMNP_Fennel) successful!');
+        });
+      });
+
+      $('#test_qrcode').click(function(event) {
+        event.preventDefault();
+        //collect the form data using Id Selector what ever data you need to send to server
+        $('#test_qrcode_result').html('Processing.');
+        $.ajax({
+          url: '/test_qrcode',
+          processData: false,
+          type: 'POST',
+          contentType: 'application/json'
+        }).done(function(res) {
+          var divQRCodeHtml = '<img src=' + res + '>';
+          $('#test_qrcode_image').html(divQRCodeHtml);
+          console.log('Test QRCode created!');
+          $('#test_qrcode_result').html('Test QRCode created!');
+
+
+          // if (res.success) {
+          //     //$("#subscribe_form").get(0).reset() // or $('form')[0].reset()
+          //     $("#checkin_calltoaction").hide();
+          //     $("#checkin_form").hide();
+          //     $('#checkin_error_group').hide();
+          //     $('#test_qrcode_result').html('Thanks for checking in (' + res.email + ') and enjoy your visit!');
+          // } else {
+          //     $('#test_qrcode_error_group').css('display', 'block');
+          //       var errors = JSON.parse(JSON.stringify(res.errors));
+          //       var errorsContainer = $('#test_qrcode_errors');
+          //       errorsContainer.innerHTML = '';
+          //       var errorsList = '';
+
+          //       for (var i = 0; i < errors.length; i++) {
+          //         errorsList += '<li>' + errors[i].msg + '</li>';
+          //       }
+          //       errorsContainer.html(errorsList);
+          //     }
+        });
+      });
+
+    });
   </script>
 </body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/views/user_management.ejs b/views/user_management.ejs
new file mode 100644
index 00000000..d0e85f46
--- /dev/null
+++ b/views/user_management.ejs
@@ -0,0 +1,561 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <% include ./partials/head %>
+</head>
+<body>
+<!-- START: header -->
+
+<div class="probootstrap-loader"></div>
+
+<header role="banner" class="probootstrap-header">
+    <% include ./partials/header %>
+</header>
+<!-- END: header -->
+
+
+<div class="container" style="width: 100%;">
+    <h4>Users</h4>
+
+    <div>
+        <a class="btn btn-primary btn-sm" onclick="showModal(this, 'add', 'Add User Entry','addCSS')">Add New User</a>
+    </div>
+
+    <% include ./partials/notificationbar %>
+
+    <br>
+    <table class="table table-hover table-condensed table-responsive" id="storagetable">
+        <thead>
+        <tr>
+            <th scope="col">#</th>
+            <th scope="col">Name</th>
+            <th scope="col">Email</th>
+            <th scope="col">Phone Number</th>
+            <th scope="col">Role</th>
+            <th scope="col">Email Verified</th>
+            <th scope="col">Profile Active</th>
+            <th scope="col">Action</th>
+        </tr>
+        </thead>
+        <tbody>
+        <% if(data.length){
+        for(var i = 0; i < data.length; i++) { %>
+            <tr>
+                <td scope="row" style="width: 2%;"><%= (i + 1) ;%></td>
+                <td style="width: 20%;"><%= data[i].firstName ;%> <%= data[i].lastName ;%></td>
+                <td style="width: 15%;"> <%= data[i].email ;%></td>
+                <td style="width: 15%;"> <%= data[i].phoneNumber ;%></td>
+                <td style="width: 10%;"> <%= data[i].role ;%></td>
+                <td style="width: 10%;"> <%= data[i].isEmailVerified ;%></td>
+                <td style="width: 10%;"> <%= data[i].isAdminVerified ;%></td>
+
+                <td style="width: 20%;">
+                    <div class="btn-group btn-group-sm" role="group" aria-label="...">
+                        <a onclick="showModal(this, 'view', 'View User Entry','viewCSS')" class="btn btn-xs btn-info view"
+                           id="<%= ("user_view_" + (i + 1) ) %>"
+                           data-user_uuid="<%= data[i].user_uuid%>"
+                           data-firstname="<%= data[i].firstName%>"
+                           data-lastname="<%=data[i].lastName%>"
+                           data-email="<%=data[i].email%>"
+                           data-phonenumber="<%=data[i].phoneNumber%>"
+                           data-role="<%=data[i].role%>"
+                           data-profilestatus="<%=data[i].isAdminVerified%>"
+                           data-farmname="<%=data[i].farmName%>"
+                           data-organisationname="<%=data[i].organisationName%>"
+                           data-organisationtype="<%=data[i].organisationType%>"
+                           data-city="<%=data[i].city%>"
+                           data-nationalidphotohash="<%=data[i].nationalIdPhotoHash%>"
+                        >View</a>
+
+                        <a onclick="showModal(this, 'update', 'Edit User Entry','editCSS')" class="btn btn-xs btn-info edit" style="background-color: rgb(0, 160, 246);"
+                           id="<%= ("user_edit_" + (i + 1) ) %>"
+                           data-user_uuid="<%= data[i].user_uuid%>"
+                           data-firstname="<%= data[i].firstName%>"
+                           data-lastname="<%=data[i].lastName%>"
+                           data-email="<%=data[i].email%>"
+                           data-phonenumber="<%=data[i].phoneNumber%>"
+                           data-role="<%=data[i].role%>"
+                           data-profilestatus="<%=data[i].isAdminVerified%>"
+                           data-farmname="<%=data[i].farmName%>"
+                           data-organisationname="<%=data[i].organisationName%>"
+                           data-organisationtype="<%=data[i].organisationType%>"
+                           data-city="<%=data[i].city%>"
+                           data-nationalidphotohash="<%=data[i].nationalIdPhotoHash%>"
+                        >Edit</a>
+
+                        <a onclick="showModal(this, 'delete', 'Delete User Entry','editCSS')" class="btn btn-xs btn-danger delete"
+                           id="<%= ("user_edit_" + (i + 1) ) %>"
+                           data-user_uuid="<%= data[i].user_uuid%>"
+                           data-firstname="<%= data[i].firstName%>"
+                           data-lastname="<%=data[i].lastName%>"
+                           data-email="<%=data[i].email%>"
+                           data-phonenumber="<%=data[i].phoneNumber%>"
+                           data-role="<%=data[i].role%>"
+                           data-profilestatus="<%=data[i].isAdminVerified%>"
+                           data-farmname="<%=data[i].farmName%>"
+                           data-organisationname="<%=data[i].organisationName%>"
+                           data-organisationtype="<%=data[i].organisationType%>"
+                           data-city="<%=data[i].city%>"
+                           data-nationalidphotohash="<%=data[i].nationalIdPhotoHash%>"
+                        >Delete</a>
+
+                    </div>
+                </td>
+            </tr>
+        <% }
+        }else{ %>
+            <tr>
+                <td colspan="5">No Data</td>
+            </tr>
+        <% } %>
+        </tbody>
+    </table>
+
+</div>
+
+<form id="userModalForm" enctype="multipart/form-data" action="/app/user/save" method="post">
+    <div class="modal fade" id="userViewModal" tabindex="-1" role="dialog" aria-labelledby="userModalLabel" aria-hidden="true">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title" id="harvestModalLabel">User</h4>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+
+                <div class="modal-body">
+                    <div id="modalBodyContainer" class="classIDThatContainstheContentsforModal">
+
+                        <div class="form-group">
+                            <label for="viewmodal_user_firstName">FirstName</label>
+                            <input type="text"
+                                   name="viewmodal_user_firstName"
+                                   class="form-control"
+                                   id="viewmodal_user_firstName"
+                                   placeholder="Firstname"
+                                   required>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="viewmodal_user_lastName">LastName</label>
+                            <input type="text"
+                                   name="viewmodal_user_lastName"
+                                   class="form-control"
+                                   id="viewmodal_user_lastName"
+                                   placeholder="Lastname"
+                                   required>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="viewmodal_user_email">Email</label>
+                            <input type="email"
+                                   name="viewmodal_user_email"
+                                   class="form-control"
+                                   id="viewmodal_user_email"
+                                   placeholder="Email"
+                                   required>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="viewmodal_user_phoneNumber">Phone Number</label>
+                            <input type="text"
+                                   name="viewmodal_user_phoneNumber"
+                                   class="form-control"
+                                   id="viewmodal_user_phoneNumber"
+                                   placeholder="Phone Number">
+                        </div>
+
+                        <div class="form-group" id="password_div">
+                            <label for="password">Password</label>
+                            <input type="password"
+                                   id="viewmodal_user_password"
+                                   name="viewmodal_user_password"
+                                   class="form-control"
+                                   placeholder="Password"
+                                   required>
+                        </div>
+
+
+                        <div class="form-group">
+                            <label for="viewmodal_user_role">Role</label>
+                            <select class="custom-select d-block w-100" id="viewmodal_user_role" name="viewmodal_user_role">
+                                <option value="" selected disabled >Choose Role ...</option>
+                                <option value="Farmer">Farmer</option>
+                                <option value="Agent">Agent</option>
+                                <option value="Intermediary">Intermediary</option>
+                                <option value='Admin'>Admin</option>
+                                <option value='Superuser'>Superuser</option>
+                            </select>
+                        </div>
+
+
+                        <div class="form-group">
+                            <label for="viewmodal_user_profile">Profile Active</label>
+                            <select class="custom-select d-block w-100" id="viewmodal_user_profile" name="viewmodal_user_profile">
+                                <option value="" selected disabled >Choose Profile status ...</option>
+                                <option value="true">Active</option>
+                                <option value="false">Disabled</option>
+                            </select>
+                        </div>
+
+                        <div class="form-group" id="farmname_div">
+                            <label for="viewmodal_user_farmname">Farm Name</label>
+                            <input type="text"
+                                   name="viewmodal_user_farmname"
+                                   class="form-control"
+                                   id="viewmodal_user_farmname"
+                                   placeholder="Farm Name"
+                                   required>
+                        </div>
+
+                        <div class="form-group" id="orgname_div">
+                            <label for="viewmodal_user_orgname">Organisation Name</label>
+                            <input type="text"
+                                   id="viewmodal_user_orgname"
+                                   name="viewmodal_user_orgname"
+                                   class="form-control"
+                                   placeholder="Organisation Name"
+                                   required>
+                        </div>
+
+
+                        <div class="form-group" id="orgtype_div">
+                            <label for="viewmodal_user_orgtype">Organisation Type</label>
+                            <select class="custom-select d-block w-100" name="viewmodal_user_orgtype" id="viewmodal_user_orgtype">
+                                <option value="" selected disabled >Organisation Type...</option>
+                                <option value='Retailer'>Retailer</option>
+                                <option value='Restaurant'>Restaurant</option>
+                                <option value='Market'>Market</option>
+                                <option value='AgriHub'>AgriHub</option>
+                            </select>
+                        </div>
+
+                        <div class="form-group" id="city_div">
+                            <label for="viewmodal_user_city">City</label>
+                            <input type="text"
+                                   name="viewmodal_user_city"
+                                   class="form-control"
+                                   id="viewmodal_user_city"
+                                   placeholder="City"
+                                   required>
+                        </div>
+
+                        <div class="form-group" id="idphoto_div">
+                            <label for="viewmodal_user_idphotohash">ID</label>
+
+                            <div id="viewmodal_user_photoimageDiv">
+                                <img id="viewmodal_user_idimage"
+                                     width='100%'
+                                     alt="User ID" />
+                            </div>
+                        </div>
+
+
+                        <div class="form-check" id="userCheckDiv">
+                            <input type="checkbox" class="form-check-input" id="userCheck" required>
+                            <label class="form-check-label" for="userCheck">I confirm the above user entry is correct</label>
+                        </div>
+                    </div>
+                    <div class="form-check" id="userDeleteDiv">
+                        <input type="checkbox" class="form-check-input" id="userDelete" required>
+                        <label class="form-check-label" for="userDelete">I confirm I wish to delete this user entry</label>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer" id="modalFooter">
+                <input type="hidden" name="viewmodal_user_uuid" class="" id="viewmodal_user_uuid">
+            </div>
+        </div>
+    </div>
+</form>
+
+
+<!-- start footer -->
+<% include ./partials/footer %>
+<!-- end footer -->
+
+<!--<script type="text/javascript" src="/js/bundle.js"></script>-->
+<script src="/js/scripts.min.js"></script>
+<script src="/js/main.min.js"></script>
+<script src="/js/custom.js"></script>
+
+<script type="text/javascript">
+  function showModal(obj_identifier, action, header, contentClassID) {
+    const addButton=$('<input/>').attr({
+      type: "submit",
+      id: "userModalAdd",
+      value: 'Add',
+      class:"btn btn-primary"
+    });
+
+    const updateButton = $('<input/>').attr({
+      type: 'submit',
+      id: 'userModalUpdate',
+      value: 'Update',
+      class: 'btn btn-primary',
+    });
+
+    const deleteButton=$('<input/>').attr({
+      type: "submit",
+      id: "userModalDelete",
+      value: 'Delete',
+      class:"btn btn-danger"
+    });
+
+    const closeButton = $('<input/>').attr({
+      type: 'submit',
+      id: 'userModalClose',
+      value: 'Close',
+      class: 'btn btn-secondary',
+      'data-dismiss': 'modal',
+    });
+
+    const user_uuid = $(obj_identifier).data('user_uuid');
+    const user_firstName = $(obj_identifier).data('firstname');
+    const user_lastName = $(obj_identifier).data('lastname');
+    const user_email = $(obj_identifier).data('email');
+    const user_phoneNumber = $(obj_identifier).data('phonenumber');
+    const user_role = $(obj_identifier).data('role');
+    const user_profilestatus = $(obj_identifier).data('profilestatus');
+    const user_farmname = $(obj_identifier).data('farmname');
+    const user_organisationname = $(obj_identifier).data('organisationname');
+    const user_organisationtype = $(obj_identifier).data('organisationtype');
+    const user_city = $(obj_identifier).data('city');
+    const user_idphoto = $(obj_identifier).data('nationalidphotohash');
+
+    // console.log(obj_identifier);
+
+    //remove modal buttons, then re-add
+    $('#userModalUpdate').remove();
+    $('#userModalClose').remove();
+    $('#userModalAdd').remove();
+    $('#userModalDelete').remove();
+    $(`#viewmodal_user_role option[value='Farmer']`).remove();
+    $(`#viewmodal_user_role option[value='Agent']`).remove();
+    $(`#viewmodal_user_role option[value='Intermediary']`).remove();
+    $(`#viewmodal_user_role option[value='Admin']`).remove();
+    $(`#viewmodal_user_role option[value='Superuser']`).remove();
+
+    $('#viewmodal_user_uuid').val(user_uuid);
+    $('#viewmodal_user_firstName').val(user_firstName);
+    $('#viewmodal_user_lastName').val(user_lastName);
+    $('#viewmodal_user_email').val(user_email);
+    $('#viewmodal_user_phoneNumber').val(user_phoneNumber);
+    $('#viewmodal_user_farmname').val(user_farmname);
+    $('#viewmodal_user_orgname').val(user_organisationname);
+    $(`#viewmodal_user_orgtype option[value='${user_organisationtype}']`).prop('selected', true);
+    $('#viewmodal_user_city').val(user_city);
+    $('#viewmodal_user_idimage').attr("src", user_idphoto);
+
+    $('#password_div').hide();
+    $('#farmname_div').hide();
+    $('#orgname_div').hide();
+    $('#orgtype_div').hide();
+    $('#city_div').hide();
+    $('#idphoto_div').hide();
+
+    $(`#viewmodal_user_profile option[value='${user_profilestatus}']`).prop('selected', true);
+
+    if (action==='view') {
+      $("#modalBodyContainer :input").attr("disabled", true);
+
+      $('#viewmodal_user_firstName').show();
+      $('#viewmodal_user_lastName').show();
+      $('#viewmodal_user_email').show();
+      $('#viewmodal_user_phoneNumber').show();
+      $('#viewmodal_user_role').show();
+      $('#viewmodal_user_profile').show();
+
+      $("#viewmodal_user_role").append("<option value='Farmer'>Farmer</option>");
+      $("#viewmodal_user_role").append("<option value='Agent'>Agent</option>");
+      $("#viewmodal_user_role").append("<option value='Intermediary'>Intermediary</option>");
+      $("#viewmodal_user_role").append("<option value='Admin'>Admin</option>");
+      $("#viewmodal_user_role").append("<option value='Superuser'>Superuser</option>");
+
+      $(`#viewmodal_user_role option[value='${user_role}']`).prop('selected', true);
+
+      if(user_role ===  'Farmer'){
+        $('#farmname_div').show();
+        $('#orgname_div').hide();
+        $('#orgtype_div').hide();
+        $('#city_div').hide();
+        $('#idphoto_div').show();
+      } else if (user_role === 'Agent') {
+        $('#farmname_div').hide();
+        $('#orgname_div').hide();
+        $('#orgtype_div').hide();
+        $('#city_div').show();
+        $('#idphoto_div').show();
+      } else if (user_role === 'Intermediary') {
+        $('#farmname_div').hide();
+        $('#orgname_div').show();
+        $('#orgtype_div').show();
+        $('#city_div').hide();
+        $('#idphoto_div').hide();
+      }
+
+      $("#userCheckDiv").hide();
+      $("#userDeleteDiv").hide();
+      $("#modalFooter").append(closeButton);
+    }
+    else if (action === 'update'){
+      $("#modalBodyContainer :input").attr("disabled", false);
+
+      $('#viewmodal_user_firstName').show();
+      $('#viewmodal_user_lastName').show();
+      $('#viewmodal_user_email').show();
+      $('#viewmodal_user_phoneNumber').show();
+      $('#viewmodal_user_role').show();
+      $('#viewmodal_user_profile').show();
+
+      $("#viewmodal_user_role").append("<option value='Farmer'>Farmer</option>");
+      $("#viewmodal_user_role").append("<option value='Agent'>Agent</option>");
+      $("#viewmodal_user_role").append("<option value='Intermediary'>Intermediary</option>");
+      $("#viewmodal_user_role").append("<option value='Admin'>Admin</option>");
+      $("#viewmodal_user_role").append("<option value='Superuser'>Superuser</option>");
+
+      $(`#viewmodal_user_role option[value='${user_role}']`).prop('selected', true);
+
+      if(user_role ===  'Farmer'){
+        $('#farmname_div').show();
+        $('#orgname_div').hide();
+        $('#orgtype_div').hide();
+        $('#city_div').hide();
+        $('#idphoto_div').show();
+        $("#viewmodal_user_orgname").attr("required", false);
+        $("#viewmodal_user_orgtype").attr("required", false);
+        $("#viewmodal_user_city").attr("required", false);
+      } else if (user_role === 'Agent') {
+        $('#farmname_div').hide();
+        $('#orgname_div').hide();
+        $('#orgtype_div').hide();
+        $('#city_div').show();
+        $('#idphoto_div').show();
+        $("#viewmodal_user_orgname").attr("required", false);
+        $("#viewmodal_user_orgtype").attr("required", false);
+        $("#viewmodal_user_farmname").attr("required", false);
+      } else if (user_role === 'Intermediary') {
+        $('#farmname_div').hide();
+        $('#orgname_div').show();
+        $('#orgtype_div').show();
+        $('#city_div').hide();
+        $('#idphoto_div').hide();
+        $("#viewmodal_user_city").attr("required", false);
+        $("#viewmodal_user_farmname").attr("required", false);
+      }
+
+      $("#viewmodal_user_uuid").attr('readonly', true);
+      $("#viewmodal_user_password").attr("required", false);
+
+      $("#userCheckDiv").show();
+      $("#userDeleteDiv").hide();
+      $("#userDelete").attr("required", false);
+
+
+      $("#modalFooter").append(updateButton);
+      $("#modalFooter").append(closeButton);
+
+      $('#userModalForm').attr('action', '/app/user/update');
+    }
+    else if (action === 'add'){
+      $("#modalBodyContainer :input").attr("disabled", false);
+      $("#modalBodyContainer :input").attr("required", true);
+
+      $(`#viewmodal_user_role option[value='Farmer']`).remove();
+      $(`#viewmodal_user_role option[value='Agent']`).remove();
+      $(`#viewmodal_user_role option[value='Intermediary']`).remove();
+      $("#viewmodal_user_role").append("<option value='Admin'>Admin</option>");
+      $("#viewmodal_user_role").append("<option value='Superuser'>Superuser</option>");
+
+      $('#viewmodal_user_firstName').show();
+      $('#viewmodal_user_lastName').show();
+      $('#viewmodal_user_email').show();
+      $('#viewmodal_user_phoneNumber').show();
+      $('#viewmodal_user_role').show();
+      $('#viewmodal_user_profile').show();
+      $('#password_div').show();
+
+      $('#farmname_div').hide();
+      $('#orgname_div').hide();
+      $('#orgtype_div').hide();
+      $('#city_div').hide();
+      $('#idphoto_div').hide();
+      $("#viewmodal_user_orgname").attr("required", false);
+      $("#viewmodal_user_orgtype").attr("required", false);
+      $("#viewmodal_user_city").attr("required", false);
+      $("#viewmodal_user_farmname").attr("required", false);
+
+
+      $("#userCheckDiv").show();
+      $("#userDeleteDiv").hide();
+      $("#userDelete").attr("required", false);
+
+
+      $("#modalFooter").append(addButton);
+      $("#modalFooter").append(closeButton);
+
+      $('#userModalForm').attr('action', '/app/user/save');
+    }
+    else if (action==='delete'){
+      $("#modalBodyContainer :input").attr("disabled", true);
+      $("#userCheckDiv").hide();
+      $("#userCheck").attr("required", false);
+
+      $("#viewmodal_user_role").append("<option value='Farmer'>Farmer</option>");
+      $("#viewmodal_user_role").append("<option value='Agent'>Agent</option>");
+      $("#viewmodal_user_role").append("<option value='Intermediary'>Intermediary</option>");
+      $("#viewmodal_user_role").append("<option value='Admin'>Admin</option>");
+      $("#viewmodal_user_role").append("<option value='Superuser'>Superuser</option>");
+
+      $(`#viewmodal_user_role option[value='${user_role}']`).prop('selected', true);
+
+      if(user_role ===  'Farmer'){
+        $('#farmname_div').show();
+        $('#orgname_div').hide();
+        $('#orgtype_div').hide();
+        $('#city_div').hide();
+        $('#idphoto_div').show();
+        $("#viewmodal_user_orgname").attr("required", false);
+        $("#viewmodal_user_orgtype").attr("required", false);
+        $("#viewmodal_user_city").attr("required", false);
+      } else if (user_role === 'Agent') {
+        $('#farmname_div').hide();
+        $('#orgname_div').hide();
+        $('#orgtype_div').hide();
+        $('#city_div').show();
+        $('#idphoto_div').show();
+        $("#viewmodal_user_orgname").attr("required", false);
+        $("#viewmodal_user_orgtype").attr("required", false);
+        $("#viewmodal_user_farmname").attr("required", false);
+      } else if (user_role === 'Intermediary') {
+        $('#farmname_div').hide();
+        $('#orgname_div').show();
+        $('#orgtype_div').show();
+        $('#city_div').hide();
+        $('#idphoto_div').hide();
+        $("#viewmodal_user_city").attr("required", false);
+        $("#viewmodal_user_farmname").attr("required", false);
+      }
+
+      $("#userDeleteDiv").show();
+      $("#userDelete").attr("required", true);
+
+      $("#viewmodal_user_uuid").attr('readonly', true);
+
+      $("#modalFooter").append(deleteButton);
+      $("#modalFooter").append(closeButton);
+      $('#userModalForm').attr('action', '/app/user/delete');
+    }
+
+
+    $('#userModalLabel').html(header);
+    $('#modalBodyContainer').removeAttr('class'); //if already exists remove it
+    $('#modalBodyContainer').addClass(contentClassID);
+    $('#userViewModal').modal('show');
+  }
+
+
+</script>
+</body>
+</html>