forked from projects/fipamo
cleaned up/updated node modules, fixed page edit bug, updated bcrypt
This commit is contained in:
parent
a3a274ea61
commit
ee7af528cd
6 changed files with 1922 additions and 1776 deletions
|
@ -1,7 +1,7 @@
|
|||
import * as DataEvent from '../../../src/com/events/DataEvent';
|
||||
const express = require('express');
|
||||
const router = express.Router();
|
||||
const bCrypt = require('bcrypt-nodejs');
|
||||
const bcrypt = require('bcrypt');
|
||||
const jwt = require('jsonwebtoken');
|
||||
const fs = require('fs-extra');
|
||||
const _ = require('lodash');
|
||||
|
@ -79,9 +79,9 @@ router.post('/login', function (req, res) {
|
|||
module.exports = router;
|
||||
|
||||
function isValidPassword(user, password) {
|
||||
return bCrypt.compareSync(password, user.password);
|
||||
return bcrypt.compareSync(password, user.password);
|
||||
}
|
||||
|
||||
function hashToken(token) {
|
||||
return bCrypt.hashSync(token, bCrypt.genSaltSync(10), null);
|
||||
return bcrypt.hashSync(token, bcrypt.genSaltSync(10), null);
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import * as DataEvent from '../../src/com/events/DataEvent';
|
||||
const bCrypt = require('bcrypt-nodejs');
|
||||
const bCrypt = require('bcrypt');
|
||||
const jwt = require('jsonwebtoken');
|
||||
|
||||
export default class Auth {
|
||||
|
|
|
@ -27,7 +27,7 @@ block main-content
|
|||
|
||||
label CREATED
|
||||
br
|
||||
span= date
|
||||
span(id="post-date" type="text" value=date data-raw=rawDate)= date
|
||||
//#calendar-icon
|
||||
svg(viewBox="0 0 20 20" class="icons")
|
||||
use(xlink:href='/assets/images/global/sprite.svg#entypo-calendar')
|
||||
|
|
3631
package-lock.json
generated
3631
package-lock.json
generated
File diff suppressed because it is too large
Load diff
48
package.json
48
package.json
|
@ -18,50 +18,46 @@
|
|||
"node": ">=10.16.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"bcrypt-nodejs": "latest",
|
||||
"bluebird": "^3.5.5",
|
||||
"bcrypt": "^5.0.0",
|
||||
"bluebird": "^3.7.2",
|
||||
"body-parser": "latest",
|
||||
"caret-pos": "^1.2.1",
|
||||
"caret-pos": "^1.2.2",
|
||||
"connect-flash": "latest",
|
||||
"cookie-parser": "~1.3.3",
|
||||
"debug": "^4.1.1",
|
||||
"dexie": "^2.0.4",
|
||||
"esm": "^3.2.25",
|
||||
"express": "^4.17.1",
|
||||
"express-session": "^1.16.2",
|
||||
"filehound": "^1.17.3",
|
||||
"fs-extra": "latest",
|
||||
"highlight.js": "^9.15.10",
|
||||
"express-session": "^1.17.1",
|
||||
"filehound": "^1.17.4",
|
||||
"fs-extra": "^9.0.1",
|
||||
"highlight.js": "^9.18.1",
|
||||
"jsdom": "^12.2.0",
|
||||
"jsonwebtoken": "^8.5.1",
|
||||
"lodash": "^4.17.15",
|
||||
"mailgun-js": "^0.18.0",
|
||||
"markdown-it": "^8.4.1",
|
||||
"markdown-yaml-metadata-parser": "^2.0.3",
|
||||
"memorystore": "^1.6.1",
|
||||
"moment": "^2.24.0",
|
||||
"morgan": "latest",
|
||||
"markdown-yaml-metadata-parser": "^2.0.5",
|
||||
"memorystore": "^1.6.2",
|
||||
"moment": "^2.26.0",
|
||||
"morgan": "^1.10.0",
|
||||
"multer": "latest",
|
||||
"nodemailer": "latest",
|
||||
"nodemailer": "^6.4.8",
|
||||
"nodemailer-mailgun-transport": "^1.4.0",
|
||||
"pg": "^7.12.1",
|
||||
"pg-hstore": "^2.3.3",
|
||||
"prismjs": "^1.17.1",
|
||||
"pug": "latest",
|
||||
"reframe.js": "^2.2.5",
|
||||
"request": "^2.88.0",
|
||||
"sanitize-html": "^1.20.1",
|
||||
"pug": "^3.0.0",
|
||||
"reframe.js": "^2.2.8",
|
||||
"request": "^2.88.2",
|
||||
"sanitize-html": "^1.26.0",
|
||||
"serve-favicon": "latest",
|
||||
"sortable": "^2.0.0",
|
||||
"sortablejs": "^1.10.0",
|
||||
"sortablejs": "^1.10.2",
|
||||
"tiny-date-picker": "^3.2.8",
|
||||
"uuid": "^3.3.3"
|
||||
"uuid": "^3.4.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/cli": "^7.6.2",
|
||||
"@babel/core": "^7.6.2",
|
||||
"@babel/preset-env": "^7.6.2",
|
||||
"animejs": "^3.1.0",
|
||||
"@babel/cli": "^7.10.1",
|
||||
"@babel/core": "^7.10.2",
|
||||
"@babel/preset-env": "^7.10.2",
|
||||
"animejs": "^3.2.0",
|
||||
"babel-preset-env": "^1.7.0",
|
||||
"bulma.styl": "^0.6.11",
|
||||
"scramble-text": "0.0.8",
|
||||
|
|
|
@ -102,15 +102,6 @@
|
|||
padding 5px
|
||||
margin 0 0 5px 0
|
||||
|
||||
#post-date
|
||||
background $primary - 10%
|
||||
border-radius 0 3px 3px 0
|
||||
width 39.5%
|
||||
font-family $baseType
|
||||
color $highlight
|
||||
height 30px
|
||||
vertical-align top
|
||||
text-align center
|
||||
|
||||
#calendar-icon
|
||||
background $primary - 15%
|
||||
|
|
Loading…
Reference in a new issue