xarvh/fipamo
1
0
Fork 0
forked from projects/fipamo
Code Pull requests Activity

cleaned up/updated node modules, fixed page edit bug, updated bcrypt

Browse source
This commit is contained in:
Ro 2020-06-09 16:55:24 -07:00
parent a3a274ea61
commit ee7af528cd
6 changed files with 1922 additions and 1776 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
brain/api/v1/auth.js
View file

@ -1,7 +1,7 @@
import * as DataEvent from '../../../src/com/events/DataEvent'; import * as DataEvent from '../../../src/com/events/DataEvent';
const express = require('express'); const express = require('express');
const router = express.Router(); const router = express.Router();
const bCrypt = require('bcrypt-nodejs'); const bcrypt = require('bcrypt');
const jwt = require('jsonwebtoken'); const jwt = require('jsonwebtoken');
const fs = require('fs-extra'); const fs = require('fs-extra');
const _ = require('lodash'); const _ = require('lodash');
@ -79,9 +79,9 @@ router.post('/login', function (req, res) {
module.exports = router; module.exports = router;
function isValidPassword(user, password) { function isValidPassword(user, password) {
return bCrypt.compareSync(password, user.password); return bcrypt.compareSync(password, user.password);
} }
function hashToken(token) { function hashToken(token) {
return bCrypt.hashSync(token, bCrypt.genSaltSync(10), null); return bcrypt.hashSync(token, bcrypt.genSaltSync(10), null);
} }

2
brain/data/Auth.js
View file

@ -1,5 +1,5 @@
import * as DataEvent from '../../src/com/events/DataEvent'; import * as DataEvent from '../../src/com/events/DataEvent';
const bCrypt = require('bcrypt-nodejs'); const bCrypt = require('bcrypt');
const jwt = require('jsonwebtoken'); const jwt = require('jsonwebtoken');
export default class Auth { export default class Auth {

2
brain/views/page-edit.pug
View file

@ -27,7 +27,7 @@ block main-content
label CREATED label CREATED
br br
span= date span(id="post-date" type="text" value=date data-raw=rawDate)= date
//#calendar-icon //#calendar-icon
svg(viewBox="0 0 20 20" class="icons") svg(viewBox="0 0 20 20" class="icons")
use(xlink:href='/assets/images/global/sprite.svg#entypo-calendar') use(xlink:href='/assets/images/global/sprite.svg#entypo-calendar')

3631
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

48
package.json
View file

@ -18,50 +18,46 @@
"node": ">=10.16.0" "node": ">=10.16.0"
}, },
"dependencies": { "dependencies": {
"bcrypt-nodejs": "latest", "bcrypt": "^5.0.0",
"bluebird": "^3.5.5", "bluebird": "^3.7.2",
"body-parser": "latest", "body-parser": "latest",
"caret-pos": "^1.2.1", "caret-pos": "^1.2.2",
"connect-flash": "latest", "connect-flash": "latest",
"cookie-parser": "~1.3.3", "cookie-parser": "~1.3.3",
"debug": "^4.1.1", "debug": "^4.1.1",
"dexie": "^2.0.4",
"esm": "^3.2.25", "esm": "^3.2.25",
"express": "^4.17.1", "express": "^4.17.1",
"express-session": "^1.16.2", "express-session": "^1.17.1",
"filehound": "^1.17.3", "filehound": "^1.17.4",
"fs-extra": "latest", "fs-extra": "^9.0.1",
"highlight.js": "^9.15.10", "highlight.js": "^9.18.1",
"jsdom": "^12.2.0", "jsdom": "^12.2.0",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^8.5.1",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"mailgun-js": "^0.18.0", "mailgun-js": "^0.18.0",
"markdown-it": "^8.4.1", "markdown-it": "^8.4.1",
"markdown-yaml-metadata-parser": "^2.0.3", "markdown-yaml-metadata-parser": "^2.0.5",
"memorystore": "^1.6.1", "memorystore": "^1.6.2",
"moment": "^2.24.0", "moment": "^2.26.0",
"morgan": "latest", "morgan": "^1.10.0",
"multer": "latest", "multer": "latest",
"nodemailer": "latest", "nodemailer": "^6.4.8",
"nodemailer-mailgun-transport": "^1.4.0", "nodemailer-mailgun-transport": "^1.4.0",
"pg": "^7.12.1", "pug": "^3.0.0",
"pg-hstore": "^2.3.3", "reframe.js": "^2.2.8",
"prismjs": "^1.17.1", "request": "^2.88.2",
"pug": "latest", "sanitize-html": "^1.26.0",
"reframe.js": "^2.2.5",
"request": "^2.88.0",
"sanitize-html": "^1.20.1",
"serve-favicon": "latest", "serve-favicon": "latest",
"sortable": "^2.0.0", "sortable": "^2.0.0",
"sortablejs": "^1.10.0", "sortablejs": "^1.10.2",
"tiny-date-picker": "^3.2.8", "tiny-date-picker": "^3.2.8",
"uuid": "^3.3.3" "uuid": "^3.4.0"
}, },
"devDependencies": { "devDependencies": {
"@babel/cli": "^7.6.2", "@babel/cli": "^7.10.1",
"@babel/core": "^7.6.2", "@babel/core": "^7.10.2",
"@babel/preset-env": "^7.6.2", "@babel/preset-env": "^7.10.2",
"animejs": "^3.1.0", "animejs": "^3.2.0",
"babel-preset-env": "^1.7.0", "babel-preset-env": "^1.7.0",
"bulma.styl": "^0.6.11", "bulma.styl": "^0.6.11",
"scramble-text": "0.0.8", "scramble-text": "0.0.8",

9
src/styles/main/_posts.styl
View file

@ -102,15 +102,6 @@
padding 5px padding 5px
margin 0 0 5px 0 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 #calendar-icon
background $primary - 15% background $primary - 15%