are0h
/
Fipamo
1
2
Fork 0
Code Issues 19 Pull Requests 1 Packages Projects 1 Releases 22 Wiki Activity

removed all sequelize declarations... whew...

Browse Source
pull/20/head
Ro 5 years ago
parent 006c01f39e
commit dac1193a78
7 changed files with 130 additions and 226 deletions
Show Stats Download Patch File Download Diff File

100
brain/api/content/posts.js
Unescape Escape View File

@ -1,18 +1,17 @@
import DateUtils from '../../tools/utilities/DateUtils'; import DateUtils from '../../utils/tools/DateUtils';
import StringUtils from '../../tools/utilities/StringUtils'; import StringUtils from '../../utils/tools/StringUtils';
import * as DataEvent from '../../tools/events/DataEvent'; import * as DataEvent from '../../utils/events/DataEvent';
import sanitize from 'sanitize-html'; import sanitize from 'sanitize-html';
import RightsManager, { import RightsManager, {
TASK_CREATE, TASK_CREATE,
TASK_UPDATE, TASK_UPDATE,
OBJECT_POST OBJECT_POST
} from '../../tools/utilities/RightsManager'; } from '../../utils/tools/RightsManager';
const express = require('express'); const express = require('express');
const router = express.Router(); const router = express.Router();
const multer = require('multer'); const multer = require('multer');
const md = require('markdown-it')('commonmark'); const md = require('markdown-it')('commonmark');
const fs = require('fs-extra'); const fs = require('fs-extra');
const Models = require('../../models');
const dateUtils = new DateUtils(); const dateUtils = new DateUtils();
const rightsManager = new RightsManager(); const rightsManager = new RightsManager();
const uploadPath = const uploadPath =
@ -36,6 +35,7 @@ var storage = multer.diskStorage({
cb(null, splice[0]); cb(null, splice[0]);
} }
}); });
var feature_upload = multer({ var feature_upload = multer({
storage: storage storage: storage
}).array('feature_image'); }).array('feature_image');
@ -45,99 +45,9 @@ var post_upload = multer({
//** SYNC POSTS */ //** SYNC POSTS */
router.post('/sync', (req, res) => { router.post('/sync', (req, res) => {
let payload = req.body; let payload = req.body;
Models.User.findById(req.session.user.id).then(user => {
if (rightsManager.check(user.role, OBJECT_POST, TASK_UPDATE)) {
for (let index = 0; index < payload.length; index++) {
const item = payload[index];
Models.FreshPost.findOne({
where: {
post: {
[Op.contains]: {
uuid: item.post.uuid
}
}
}
})
.then(found => {
let buffed = sanitize(item.post.plaintext, {
allowedTags: ['del', 'a', 'iframe', 'img'],
allowedAttributes: {
a: ['href', 'name', 'target'],
img: ['src'],
iframe: [
'height',
'width',
'src',
'frameborder',
'allow',
'allowfullscreen'
]
}
});
buffed = new StringUtils().decodeHTML(buffed);
item.post.plaintext = buffed;
item.post.html = md.render(buffed, {
html: true,
xhtmlOut: true
});
if (!_.isEqual(item.post, found.post)) {
found
.update(item)
.then(() => {
//console.log('UPDATED', updated);
})
.catch(() => {
//console.log("***ERROR***", err);
});
} else {
//chilld
}
})
.catch(() => {
//console.log("***ERRRORZ****", err);
Models.FreshPost.create(item).then(() => {
//console.log(fresh)
});
});
}
res.json({
message: 'postsSynced'
});
} else {
res.json({
message: "Nah. You can't do that. Talk to the admin, sport."
});
}
});
}); });
router.get('/json/:filter?', function(req, res) { router.get('/json/:filter?', function(req, res) {
var filter = req.params.filter; var filter = req.params.filter;
Models.FreshPost.findAll({
order: [['id', 'DESC']]
})
.then(function(posts) {
let newlist = [];
for (let index = 0; index < posts.length; index++) {
let item = posts[index].post;
switch (filter) {
case 'not-deleted':
if (typeof item.deleted == 'undefined' || item.deleted == false) {
newlist.push(posts[index]);
} else {
continue;
}
break;
default:
newlist.push(posts[index]);
break;
}
}
res.json(newlist);
})
.catch(() => {
//next(err);
});
}); });
/*** /***
POST IMAGE POST IMAGE

235
brain/api/content/settings.js
Unescape Escape View File

@ -1,16 +1,15 @@
import DateUtils from '../../tools/utilities/DateUtils'; import DateUtils from '../../utils/tools/DateUtils';
import * as DataEvent from '../../tools/events/DataEvent'; import * as DataEvent from '../../utils/events/DataEvent';
import RightsManager, { import RightsManager, {
TASK_CREATE, TASK_CREATE,
TASK_UPDATE, TASK_UPDATE,
OBJECT_POST, OBJECT_POST,
OBJECT_SETTINGS OBJECT_SETTINGS
} from '../../tools/utilities/RightsManager'; } from '../../utils/tools/RightsManager';
const express = require('express'); const express = require('express');
const router = express.Router(); const router = express.Router();
const multer = require('multer'); const multer = require('multer');
const fs = require('fs-extra'); const fs = require('fs-extra');
const Models = require('../../models');
const dateUtils = new DateUtils(); const dateUtils = new DateUtils();
const rightsManager = new RightsManager(); const rightsManager = new RightsManager();
const uploadPath = const uploadPath =
@ -40,56 +39,54 @@ var background_upload = multer({
//** SYNC POSTS */ //** SYNC POSTS */
router.post('/sync', (req, res) => { router.post('/sync', (req, res) => {
let payload = req.body; let payload = req.body;
Models.User.findById(req.session.user.id).then(user => { if (rightsManager.check(user.role, OBJECT_SETTINGS, TASK_UPDATE)) {
if (rightsManager.check(user.role, OBJECT_SETTINGS, TASK_UPDATE)) { fs.readJson('config/site-settings.json')
fs.readJson('config/site-settings.json') .then(obj => {
.then(obj => { if (user.hande != payload.handle || user.email != payload.email) {
if (user.hande != payload.handle || user.email != payload.email) { user.update({
user.update({ handle: payload.handle,
handle: payload.handle, email: payload.email
email: payload.email })
})
.then(() => {
//console.log('UPDATED');
})
.catch(() => {
//console.log('ERR', err);
});
} else {
//console.log('USER NOT UPDATED');
}
obj.url = payload.url;
obj.title = payload.title;
obj.description = payload.descriptions;
obj.private = payload.private;
obj.theme = payload.theme;
obj.background = payload.background; //TODO: make this url relative
//mail stuff
obj.email.active = payload.mailSettings.activeProtocol;
obj.email.smtp.domain = payload.mailSettings.smtp.domain;
obj.email.smtp.email = payload.mailSettings.smtp.email;
obj.email.smtp.password = payload.mailSettings.smtp.password;
obj.email.mailgun.domain = payload.mailSettings.mailgun.domain;
obj.email.mailgun['api-key'] = payload.mailSettings.mailgun.key;
fs.writeJson('config/site-settings.json', obj)
.then(() => { .then(() => {
res.json({ //console.log('UPDATED');
message: DataEvent.SETTINGS_UPDATED
});
}) })
.catch(() => { .catch(() => {
//console.error(err); //console.log('ERR', err);
}); });
}) } else {
.catch(() => { //console.log('USER NOT UPDATED');
//console.error(err); }
}); obj.url = payload.url;
} else { obj.title = payload.title;
res.json({ obj.description = payload.descriptions;
message: "Nah. You can't do that. Talk to the admin, sport." obj.private = payload.private;
obj.theme = payload.theme;
obj.background = payload.background; //TODO: make this url relative
//mail stuff
obj.email.active = payload.mailSettings.activeProtocol;
obj.email.smtp.domain = payload.mailSettings.smtp.domain;
obj.email.smtp.email = payload.mailSettings.smtp.email;
obj.email.smtp.password = payload.mailSettings.smtp.password;
obj.email.mailgun.domain = payload.mailSettings.mailgun.domain;
obj.email.mailgun['api-key'] = payload.mailSettings.mailgun.key;
fs.writeJson('config/site-settings.json', obj)
.then(() => {
res.json({
message: DataEvent.SETTINGS_UPDATED
});
})
.catch(() => {
//console.error(err);
});
})
.catch(() => {
//console.error(err);
}); });
} } else {
}); res.json({
message: "Nah. You can't do that. Talk to the admin, sport."
});
}
}); });
router.get('/nav', function(req, res) { router.get('/nav', function(req, res) {
@ -110,30 +107,28 @@ router.get('/nav', function(req, res) {
router.post('/nav-sync', (req, res) => { router.post('/nav-sync', (req, res) => {
let payload = req.body; let payload = req.body;
Models.User.findById(req.session.user.id).then(user => { if (rightsManager.check(user.role, OBJECT_SETTINGS, TASK_UPDATE)) {
if (rightsManager.check(user.role, OBJECT_SETTINGS, TASK_UPDATE)) { fs.readJson('config/site-settings.json')
fs.readJson('config/site-settings.json') .then(obj => {
.then(obj => { obj.menu = payload;
obj.menu = payload; fs.writeJson('config/site-settings.json', obj)
fs.writeJson('config/site-settings.json', obj) .then(() => {
.then(() => { res.json({
res.json({ message: DataEvent.SETTINGS_UPDATED
message: DataEvent.SETTINGS_UPDATED
});
})
.catch(() => {
//console.error(err);
}); });
}) })
.catch(() => { .catch(() => {
//console.error(err); //console.error(err);
}); });
} else { })
res.json({ .catch(() => {
message: "Nah. You can't do that. Talk to the admin, sport." //console.error(err);
}); });
} } else {
}); res.json({
message: "Nah. You can't do that. Talk to the admin, sport."
});
}
}); });
/*** /***
@ -145,37 +140,35 @@ router.post('/add-avatar', function(req, res) {
return res.json({ return res.json({
message: 'You need to be logged in, champ.' message: 'You need to be logged in, champ.'
}); });
Models.User.findById(req.session.user.id).then(user => { if (rightsManager.check(user.role, OBJECT_POST, TASK_CREATE)) {
if (rightsManager.check(user.role, OBJECT_POST, TASK_CREATE)) { avatar_upload(req, res, function(err) {
avatar_upload(req, res, function(err) { if (err) {
if (err) { res.json({
res.json({ message: err
message: err });
}); throw err;
throw err; } else {
} else { var avatar = req.files[0].path;
var avatar = req.files[0].path; user.update({
user.update({ avatar: avatar.substr(7, avatar.length)
avatar: avatar.substr(7, avatar.length) })
.then(updated => {
req.session.user = updated;
}) })
.then(updated => { .catch(() => {
req.session.user = updated; //console.log('ERR', err);
})
.catch(() => {
//console.log('ERR', err);
});
return res.json({
message: DataEvent.AVATAR_UPLOADED,
url: avatar.substr(7, avatar.length)
}); });
} return res.json({
}); message: DataEvent.AVATAR_UPLOADED,
} else { url: avatar.substr(7, avatar.length)
res.json({ });
message: "Nah. You can't do that. Talk to the admin, sport." }
}); });
} } else {
}); res.json({
message: "Nah. You can't do that. Talk to the admin, sport."
});
}
}); });
/*** /***
UPLOAD FEATURE BACKGROUND UPLOAD FEATURE BACKGROUND
@ -186,27 +179,25 @@ router.post('/add-feature-background', function(req, res) {
return res.json({ return res.json({
message: 'You need to be logged in, champ.' message: 'You need to be logged in, champ.'
}); });
Models.User.findById(req.session.user.id).then(user => { if (rightsManager.check(user.role, OBJECT_POST, TASK_CREATE)) {
if (rightsManager.check(user.role, OBJECT_POST, TASK_CREATE)) { background_upload(req, res, function(err) {
background_upload(req, res, function(err) { if (err) {
if (err) { res.json({
res.json({ message: err
message: err });
}); throw err;
throw err; } else {
} else { var bgImage = req.files[0].path;
var bgImage = req.files[0].path; return res.json({
return res.json({ message: DataEvent.SITE_BACKGROUND_UPLOADED,
message: DataEvent.SITE_BACKGROUND_UPLOADED, url: bgImage.substr(7, bgImage.length)
url: bgImage.substr(7, bgImage.length) });
}); }
} });
}); } else {
} else { res.json({
res.json({ message: "Nah. You can't do that. Talk to the admin, sport."
message: "Nah. You can't do that. Talk to the admin, sport." });
}); }
}
});
}); });
module.exports = router; module.exports = router;

14
brain/app.js
Unescape Escape View File

@ -41,11 +41,11 @@ app.use(
); );
app.use(flash()); app.use(flash());
//sections //sections
var front = require('./routes/front/index')(session); //var front = require('./routes/front/index')(session);
var back = require('./routes/back/index'); var dash = require('./routes/dash/index');
var postDashboard = require('./routes/back/dash_posts'); var postDashboard = require('./routes/dash/posts');
var settingsDashboard = require('./routes/back/dash_settings'); var settingsDashboard = require('./routes/dash/settings');
var navDashboard = require('./routes/back/dash_nav'); var navDashboard = require('./routes/dash/nav');
//api //api
var postLibrary = require('./api/content/posts'); var postLibrary = require('./api/content/posts');
var settings = require('./api/content/settings'); var settings = require('./api/content/settings');
@ -58,8 +58,8 @@ var auth = require('./api/v1/auth');
app.use('/api/mail', mailer); app.use('/api/mail', mailer);
app.use('/api/v1/auth', auth); app.use('/api/v1/auth', auth);
// PAGES // PAGES
app.use('/', front); //app.use('/', front);
app.use('/@/dashboard', back); app.use('/@/dashboard', dash);
app.use('/@/dashboard/posts', postDashboard); app.use('/@/dashboard/posts', postDashboard);
app.use('/@/dashboard/settings', settingsDashboard); app.use('/@/dashboard/settings', settingsDashboard);
app.use('/@/dashboard/navigation', navDashboard); app.use('/@/dashboard/navigation', navDashboard);

0
brain/routes/back/index.js → brain/routes/dash/index.js
Unescape Escape View File

0
brain/routes/back/dash_nav.js → brain/routes/dash/nav.js
Unescape Escape View File

7
brain/routes/back/dash_posts.js → brain/routes/dash/posts.js
Unescape Escape View File

@ -1,4 +1,4 @@
import DateUtils from '../../tools/utilities/DateUtils'; import DateUtils from '../../utils/tools/DateUtils';
var express = require('express'); var express = require('express');
var router = express.Router(); var router = express.Router();
var hljs = require('highlight.js/lib/highlight'); var hljs = require('highlight.js/lib/highlight');
@ -12,8 +12,10 @@ const dateUtils = new DateUtils();
router.get('/list/:filter?/:page?', function(req, res) { router.get('/list/:filter?/:page?', function(req, res) {
var pageNum = req.params.page; var pageNum = req.params.page;
var filter = req.params.filter; var filter = req.params.filter;
if (pageNum == '' || pageNum == null) pageNum = 1; if (pageNum == '' || pageNum == null) pageNum = 1;
if (filter == '' || filter == null) filter = 'all'; if (filter == '' || filter == null) filter = 'all';
/*
if (req.session.user) { if (req.session.user) {
.then(() => { .then(() => {
@ -25,6 +27,7 @@ router.get('/list/:filter?/:page?', function(req, res) {
} else { } else {
res.redirect('/@/dashboard'); res.redirect('/@/dashboard');
} }
*/
}); });
//-------------------------- //--------------------------
// BLOG POST ADD DISPLAY // BLOG POST ADD DISPLAY
@ -54,7 +57,7 @@ router.get('/add/new', function(req, res) {
//-------------------------- //--------------------------
router.get('/edit/:id', function(req, res) { router.get('/edit/:id', function(req, res) {
if (req.session.user) { if (req.session.user) {
} else { } else {
res.redirect('/@/dashboard'); res.redirect('/@/dashboard');
} }
}); });

0
brain/routes/back/dash_settings.js → brain/routes/dash/settings.js
Unescape Escape View File

Write Preview
Loading…
Cancel
Save