diff --git a/changelog.md b/changelog.md index 4544122..9351a64 100644 --- a/changelog.md +++ b/changelog.md @@ -1,25 +1,41 @@ -## changelog +# changelog -#### Tuesday, 16/02/2016, `v2.0.0` +## v1.3.0 + +### Friday, 19/02/2016 +* Improved the admin panel +* Added ability to clear away old empty brews +* Added delete butotn to the edit page +* Added a dynamically updating changelog page! Nifty! +* Added stlying for wide monster stat blocks and single column class tables +* Added snippets for wide monster stat blocks and single column class tables + +### Tuesday, 16/02/2016 * Paragraphs right after tables now indent (thanks LikeAJi6!) * Added a `@page` css rule to auto turn off margins when printing * Added a `page-break` property on each `.phb` page to properly page the pages up when exporting (thanks Jokefury!) -#### Sunday, 17/01/2016 +## v1.2.0 + +### Sunday, 17/01/2016 * Added a printer friendly snippet that injects some CSS to remove backbrounds and images * Adjusted the styling specific to spell blocks to give it tighter spacing * Added a changelog! How meta! -#### Thursday, 14/01/2016 +## v1.1.0 +### Thursday, 14/01/2016 * Added view source to see the markdown that made the page * Added print view * Fixed API issues that were causing the server to crash * Increased padding on table cells * Raw html now shows in view source -#### Wednesday, 3/01/2016 + +## v1.0.0 - Release + +### Wednesday, 3/01/2016 * Added `phb.standalone.css` plus a build system for creating it * Added page numbers and footer text diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx index 718dffc..94ebe55 100644 --- a/client/homebrew/homebrew.jsx +++ b/client/homebrew/homebrew.jsx @@ -14,6 +14,7 @@ var Homebrew = React.createClass({ return { url : "", welcomeText : "", + changelog : "", brew : { text : "", shareId : null, @@ -28,9 +29,13 @@ var Homebrew = React.createClass({ '/homebrew/edit/:id' : (args) => { return }, + '/homebrew/share/:id' : (args) => { return }, + '/homebrew/changelog' : (args) => { + return + }, '/homebrew*' : , }); }, diff --git a/client/homebrew/statusbar/statusbar.jsx b/client/homebrew/statusbar/statusbar.jsx index bd0c760..5ca5579 100644 --- a/client/homebrew/statusbar/statusbar.jsx +++ b/client/homebrew/statusbar/statusbar.jsx @@ -90,6 +90,14 @@ var Statusbar = React.createClass({ }, + renderChangelogButton : function(){ + if(this.props.editId || this.props.shareId) return null; + + return + Changelog + + }, + renderShare : function(){ if(!this.props.shareId) return null; @@ -138,6 +146,7 @@ var Statusbar = React.createClass({
+ {this.renderChangelogButton()} {this.renderStatus()} {this.renderInfo()} {this.renderSourceButton()} diff --git a/client/homebrew/statusbar/statusbar.less b/client/homebrew/statusbar/statusbar.less index b3c2bb4..f566acb 100644 --- a/client/homebrew/statusbar/statusbar.less +++ b/client/homebrew/statusbar/statusbar.less @@ -58,6 +58,14 @@ background-color : fade(@green, 70%); } } + .changelogButton{ + .animate(background-color); + color : white; + text-decoration : none; + &:hover{ + background-color : fade(@purple, 70%); + } + } .deleteButton{ .animate(background-color); color : white; diff --git a/client/naturalCrit/naturalCrit.jsx b/client/naturalCrit/naturalCrit.jsx index 1d4c44c..046d801 100644 --- a/client/naturalCrit/naturalCrit.jsx +++ b/client/naturalCrit/naturalCrit.jsx @@ -18,13 +18,14 @@ var Router = CreateRouter({ var NaturalCrit = React.createClass({ getDefaultProps: function() { return { - url : '/' + url : '/', + changelog : '' }; }, render : function(){ return
- +
}, }); diff --git a/package.json b/package.json index 29b6291..78f536a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "naturalCrit", "description": "A super rad project!", - "version": "0.0.0", + "version": "1.3.0", "scripts": { "postinstall": "gulp prod", "start": "node server.js" @@ -21,7 +21,7 @@ "moment": "^2.11.0", "mongoose": "^4.3.3", "pico-flux": "^1.1.0", - "pico-router": "^1.0.0", + "pico-router": "^1.1.0", "react": "^0.14.2", "react-dom": "^0.14.2", "shortid": "^2.2.4", diff --git a/server.js b/server.js index d385033..c0371f1 100644 --- a/server.js +++ b/server.js @@ -10,6 +10,8 @@ app.use(bodyParser.json()); + + //Mongoose var mongoose = require('mongoose'); var mongoUri = process.env.MONGOLAB_URI || process.env.MONGOHQ_URL || 'mongodb://localhost/naturalcrit'; diff --git a/server/homebrew.api.js b/server/homebrew.api.js index 16a0f52..001b4d8 100644 --- a/server/homebrew.api.js +++ b/server/homebrew.api.js @@ -3,6 +3,8 @@ var Moment = require('moment'); var vitreumRender = require('vitreum/render'); var HomebrewModel = require('./homebrew.model.js').model; +var changelogText = require('fs').readFileSync('./changelog.md', 'utf8'); + var getTopBrews = function(cb){ HomebrewModel.find().sort({views: -1}).limit(5).exec(function(err, brews) { @@ -166,7 +168,8 @@ module.exports = function(app){ prerenderWith : './client/homebrew/homebrew.jsx', initialProps: { url: req.originalUrl, - welcomeText : welcomeText + welcomeText : welcomeText, + changelog : changelogText }, clearRequireCache : true, }, function (err, page) {