sass->less, bcrypt->bcryptjs

lib/controllers/auth/login.js

@@ -1,6 +1,6 @@
 const _ = require('lodash')
 const config = require('../../../config')
-const bcrypt = require('bcrypt')
+const bcrypt = require('bcryptjs')
 const JWT = require('jsonwebtoken')
 const aguid = require('aguid')
 const { User, Session } = require('../../database')

lib/database/index.js

@@ -1,6 +1,6 @@
 const _ = require('lodash')
 const config = require('../../config')
-const bcrypt = require('bcrypt')
+const bcrypt = require('bcryptjs')
 const sequelize = require('./sequelize')
 const User = require('./user')
 const Session = require('./session')

lib/database/user.js

@@ -2,7 +2,7 @@ const _ = require('lodash')
 const Sequelize = require('sequelize')
 const sequelize = require('./sequelize')
 const config = require('../../config')
-const bcrypt = require('bcrypt')
+const bcrypt = require('bcryptjs')
 
 const User = sequelize.define('user', {
   id: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alancnet/material-framework",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -26,7 +26,7 @@
     "angular1-ui-bootstrap4": "^2.4.22",
     "as-table": "^1.0.32",
     "axios": "^0.18.0",
-    "bcrypt": "^2.0.1",
+    "bcryptjs": "^2.4.3",
     "body-parser": "^1.18.3",
     "chalk": "^2.4.1",
     "change-case": "^3.0.2",
@@ -38,7 +38,6 @@
     "jquery": "^3.3.1",
     "jsonwebtoken": "^8.2.2",
     "lodash": "^4.17.10",
-    "node-sass": "^4.9.0",
     "password-prompt": "^1.0.4",
     "plural": "^1.1.0",
     "sequelize": "^4.37.6",
@@ -59,7 +58,6 @@
     "mocha": "^5.1.1",
     "nyc": "^11.7.1",
     "raw-loader": "^0.5.1",
-    "sass-loader": "^7.0.1",
     "sqlite3": "^4.0.0",
     "style-loader": "^0.21.0",
     "webpack": "^4.6.0",

webpack.config.js

@@ -34,8 +34,8 @@ module.exports = {
       //   }
       // },
       {
-        test:/\.(s*)css$/,
-        use:['style-loader','css-loader', 'sass-loader']
+        test:/\.(less|css)$/,
+        use:['style-loader','css-loader', 'less-loader']
       },
       {
         test:/\.(?:svg|png|eot|woff2|woff|ttf)$/,