From 2f69ef3fe86b84bcd7f1f554291c312ae6872a14 Mon Sep 17 00:00:00 2001 From: Scott Tolksdorf Date: Thu, 23 Feb 2017 07:41:55 -0500 Subject: [PATCH] Removing the old server files --- scripts/phb.js | 6 ++ scripts/project.json | 2 +- server/homebrew.api.js | 146 --------------------------------------- server/homebrew.model.js | 81 ---------------------- 4 files changed, 7 insertions(+), 228 deletions(-) delete mode 100644 server/homebrew.api.js delete mode 100644 server/homebrew.model.js diff --git a/scripts/phb.js b/scripts/phb.js index 4ece660..945a20e 100644 --- a/scripts/phb.js +++ b/scripts/phb.js @@ -1,6 +1,12 @@ +//DEPRICATE + const less = require('less'); const fs = require('fs'); + +console.log('you should not b using this'); + + less.render(fs.readFileSync('./client/homebrew/phbStyle/phb.style.less', 'utf8'), {compress : true}) .then((output) => { fs.writeFileSync('./phb.standalone.css', output.css); diff --git a/scripts/project.json b/scripts/project.json index 2cbe2a0..03fec02 100644 --- a/scripts/project.json +++ b/scripts/project.json @@ -1,5 +1,5 @@ { - "assets": ["*.png","*.otf", "*.ico", "phb.old.css"], + "assets": ["*.png","*.otf", "*.ico"], "shared":[ ], "libs" : [ diff --git a/server/homebrew.api.js b/server/homebrew.api.js deleted file mode 100644 index 99c99dc..0000000 --- a/server/homebrew.api.js +++ /dev/null @@ -1,146 +0,0 @@ -const _ = require('lodash'); -const Moment = require('moment'); -const HomebrewModel = require('./homebrew.model.js').model; -const router = require('express').Router(); - - - -//TODO: Possiblity remove -let homebrewTotal = 0; -const refreshCount = ()=>{ - HomebrewModel.count({}, (err, total)=>{ - homebrewTotal = total; - }); -}; -refreshCount(); - - - -const getTopBrews = (cb)=>{ - HomebrewModel.find().sort({views: -1}).limit(5).exec(function(err, brews) { - cb(brews); - }); -} - -const getGoodBrewTitle = (text) => { - const titlePos = text.indexOf('# '); - if(titlePos !== -1){ - const ending = text.indexOf('\n', titlePos); - return text.substring(titlePos + 2, ending); - }else{ - return _.find(text.split('\n'), (line)=>{ - return line; - }); - } -}; - - - - - -router.post('/api', (req, res)=>{ - - let authors = []; - if(req.account) authors = [req.account.username]; - - const newHomebrew = new HomebrewModel(_.merge({}, - req.body, - {authors : authors} - )); - if(!newHomebrew.title){ - newHomebrew.title = getGoodBrewTitle(newHomebrew.text); - } - newHomebrew.save((err, obj)=>{ - if(err){ - console.error(err, err.toString(), err.stack); - return res.status(500).send(`Error while creating new brew, ${err.toString()}`); - } - return res.json(obj); - }) -}); - -router.put('/api/update/:id', (req, res)=>{ - HomebrewModel.get({editId : req.params.id}) - .then((brew)=>{ - brew = _.merge(brew, req.body); - brew.updatedAt = new Date(); - if(req.account) brew.authors = _.uniq(_.concat(brew.authors, req.account.username)); - - brew.markModified('authors'); - brew.markModified('systems'); - - brew.save((err, obj)=>{ - if(err) throw err; - return res.status(200).send(obj); - }) - }) - .catch((err)=>{ - console.log(err); - return res.status(500).send("Error while saving"); - }); -}); - -router.get('/api/remove/:id', (req, res)=>{ - HomebrewModel.find({editId : req.params.id}, (err, objs)=>{ - if(!objs.length || err) return res.status(404).send("Can not find homebrew with that id"); - var resEntry = objs[0]; - resEntry.remove((err)=>{ - if(err) return res.status(500).send("Error while removing"); - return res.status(200).send(); - }) - }); -}); - - -module.exports = router; - -/* - - - -module.exports = function(app){ - - app; - - - - - app.get('/api/search', mw.adminOnly, function(req, res){ - - var page = req.query.page || 0; - var count = req.query.count || 20; - - var query = {}; - if(req.query && req.query.id){ - query = { - "$or" : [{ - editId : req.query.id - },{ - shareId : req.query.id - }] - }; - } - - HomebrewModel.find(query, { - text : 0 //omit the text - }, { - skip: page*count, - limit: count*1 - }, function(err, objs){ - if(err) console.log(err); - return res.json({ - page : page, - count : count, - total : homebrewTotal, - brews : objs - }); - - }); - }) - - - - - return app; -} -*/ \ No newline at end of file diff --git a/server/homebrew.model.js b/server/homebrew.model.js deleted file mode 100644 index e98ad31..0000000 --- a/server/homebrew.model.js +++ /dev/null @@ -1,81 +0,0 @@ -var mongoose = require('mongoose'); -var shortid = require('shortid'); -var _ = require('lodash'); - -var HomebrewSchema = mongoose.Schema({ - shareId : {type : String, default: shortid.generate, index: { unique: true }}, - editId : {type : String, default: shortid.generate, index: { unique: true }}, - title : {type : String, default : ""}, - text : {type : String, default : ""}, - - description : {type : String, default : ""}, - tags : {type : String, default : ""}, - systems : [String], - authors : [String], - published : {type : Boolean, default : false}, - - createdAt : { type: Date, default: Date.now }, - updatedAt : { type: Date, default: Date.now}, - lastViewed : { type: Date, default: Date.now}, - views : {type:Number, default:0}, - version : {type: Number, default:1} -}, { versionKey: false }); - - - -HomebrewSchema.methods.sanatize = function(full=false){ - const brew = this.toJSON(); - delete brew._id; - delete brew.__v; - if(full){ - delete brew.editId; - } - return brew; -}; - - -HomebrewSchema.methods.increaseView = function(){ - return new Promise((resolve, reject) => { - this.lastViewed = new Date(); - this.views = this.views + 1; - this.save((err) => { - if(err) return reject(err); - return resolve(this); - }); - }); -}; - - - -HomebrewSchema.statics.get = function(query){ - return new Promise((resolve, reject) => { - Homebrew.find(query, (err, brews)=>{ - if(err || !brews.length) return reject('Can not find brew'); - return resolve(brews[0]); - }); - }); -}; - -HomebrewSchema.statics.getByUser = function(username, allowAccess=false){ - return new Promise((resolve, reject) => { - let query = {authors : username, published : true}; - if(allowAccess){ - delete query.published; - } - Homebrew.find(query, (err, brews)=>{ - if(err) return reject('Can not find brew'); - return resolve(_.map(brews, (brew)=>{ - return brew.sanatize(!allowAccess); - })); - }); - }); -}; - - - -var Homebrew = mongoose.model('Homebrew', HomebrewSchema); - -module.exports = { - schema : HomebrewSchema, - model : Homebrew, -} \ No newline at end of file