diff --git a/client/naturalCrit/homebrew/assets/Bookinsanity Bold Italic.otf b/client/homebrew/assets/Bookinsanity Bold Italic.otf similarity index 100% rename from client/naturalCrit/homebrew/assets/Bookinsanity Bold Italic.otf rename to client/homebrew/assets/Bookinsanity Bold Italic.otf diff --git a/client/naturalCrit/homebrew/assets/Bookinsanity Bold.otf b/client/homebrew/assets/Bookinsanity Bold.otf similarity index 100% rename from client/naturalCrit/homebrew/assets/Bookinsanity Bold.otf rename to client/homebrew/assets/Bookinsanity Bold.otf diff --git a/client/naturalCrit/homebrew/assets/Bookinsanity Italic.otf b/client/homebrew/assets/Bookinsanity Italic.otf similarity index 100% rename from client/naturalCrit/homebrew/assets/Bookinsanity Italic.otf rename to client/homebrew/assets/Bookinsanity Italic.otf diff --git a/client/naturalCrit/homebrew/assets/Bookinsanity.otf b/client/homebrew/assets/Bookinsanity.otf similarity index 100% rename from client/naturalCrit/homebrew/assets/Bookinsanity.otf rename to client/homebrew/assets/Bookinsanity.otf diff --git a/client/naturalCrit/homebrew/assets/Mr Eaves Small Caps.otf b/client/homebrew/assets/Mr Eaves Small Caps.otf similarity index 100% rename from client/naturalCrit/homebrew/assets/Mr Eaves Small Caps.otf rename to client/homebrew/assets/Mr Eaves Small Caps.otf diff --git a/client/naturalCrit/homebrew/assets/MrsEavesSmallCaps_Regular.ttf b/client/homebrew/assets/MrsEavesSmallCaps_Regular.ttf similarity index 100% rename from client/naturalCrit/homebrew/assets/MrsEavesSmallCaps_Regular.ttf rename to client/homebrew/assets/MrsEavesSmallCaps_Regular.ttf diff --git a/client/naturalCrit/homebrew/assets/PHB fonts used.jpg b/client/homebrew/assets/PHB fonts used.jpg similarity index 100% rename from client/naturalCrit/homebrew/assets/PHB fonts used.jpg rename to client/homebrew/assets/PHB fonts used.jpg diff --git a/client/naturalCrit/homebrew/assets/PHB-background.png b/client/homebrew/assets/PHB-background.png similarity index 100% rename from client/naturalCrit/homebrew/assets/PHB-background.png rename to client/homebrew/assets/PHB-background.png diff --git a/client/naturalCrit/homebrew/assets/Scala Sans Bold.ttf b/client/homebrew/assets/Scala Sans Bold.ttf similarity index 100% rename from client/naturalCrit/homebrew/assets/Scala Sans Bold.ttf rename to client/homebrew/assets/Scala Sans Bold.ttf diff --git a/client/naturalCrit/homebrew/assets/Scala Sans SmallCaps.ttf b/client/homebrew/assets/Scala Sans SmallCaps.ttf similarity index 100% rename from client/naturalCrit/homebrew/assets/Scala Sans SmallCaps.ttf rename to client/homebrew/assets/Scala Sans SmallCaps.ttf diff --git a/client/naturalCrit/homebrew/assets/Scaly Sans.otf b/client/homebrew/assets/Scaly Sans.otf similarity index 100% rename from client/naturalCrit/homebrew/assets/Scaly Sans.otf rename to client/homebrew/assets/Scaly Sans.otf diff --git a/client/naturalCrit/homebrew/assets/Solbera Imitation.otf b/client/homebrew/assets/Solbera Imitation.otf similarity index 100% rename from client/naturalCrit/homebrew/assets/Solbera Imitation.otf rename to client/homebrew/assets/Solbera Imitation.otf diff --git a/client/naturalCrit/homebrew/assets/frame border corner filled.png b/client/homebrew/assets/frame border corner filled.png similarity index 100% rename from client/naturalCrit/homebrew/assets/frame border corner filled.png rename to client/homebrew/assets/frame border corner filled.png diff --git a/client/naturalCrit/homebrew/assets/frame border corner.png b/client/homebrew/assets/frame border corner.png similarity index 100% rename from client/naturalCrit/homebrew/assets/frame border corner.png rename to client/homebrew/assets/frame border corner.png diff --git a/client/naturalCrit/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx similarity index 100% rename from client/naturalCrit/homebrew/editor/editor.jsx rename to client/homebrew/editor/editor.jsx diff --git a/client/naturalCrit/homebrew/editor/editor.less b/client/homebrew/editor/editor.less similarity index 100% rename from client/naturalCrit/homebrew/editor/editor.less rename to client/homebrew/editor/editor.less diff --git a/client/naturalCrit/homebrew/editor/snippets.js b/client/homebrew/editor/snippets.js similarity index 100% rename from client/naturalCrit/homebrew/editor/snippets.js rename to client/homebrew/editor/snippets.js diff --git a/client/naturalCrit/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx similarity index 70% rename from client/naturalCrit/homebrew/homebrew.jsx rename to client/homebrew/homebrew.jsx index 5f1962ca0..8ecf2b77e 100644 --- a/client/naturalCrit/homebrew/homebrew.jsx +++ b/client/homebrew/homebrew.jsx @@ -2,23 +2,39 @@ var React = require('react'); var _ = require('lodash'); var cx = require('classnames'); +var CreateRouter = require('pico-router').createRouter; + var PHB = require('./phb/phb.jsx'); var Editor = require('./editor/editor.jsx'); -var Snippets = require('./editor/snippets'); +//var Snippets = require('./editor/snippets'); var KEY = 'naturalCrit-homebrew'; +var Router = CreateRouter({ + '/homebrew' : 'home', + '/homebrew/edit/:id' : function(args){ + + }, + '/homebrew/share/:id' : function(args){ + + } +}); var Homebrew = React.createClass({ + getDefaultProps: function() { + return { + text : "" + }; + }, getInitialState: function() { return { - text : Snippets.intro + text : "# Holla" }; }, diff --git a/client/homebrew/homebrew.less b/client/homebrew/homebrew.less new file mode 100644 index 000000000..a1dfb0f8d --- /dev/null +++ b/client/homebrew/homebrew.less @@ -0,0 +1,14 @@ +@import 'naturalCrit/styles/reset.less'; +//@import 'naturalCrit/styles/elements.less'; +@import 'naturalCrit/styles/animations.less'; +@import 'naturalCrit/styles/colors.less'; +@import 'naturalCrit/styles/tooltip.less'; + +html,body, #reactContainer{ + min-height: 100%; +} + +.homebrew{ + background-color: @steel; + height : 100%; +} \ No newline at end of file diff --git a/client/naturalCrit/homebrew/phb/phb.jsx b/client/homebrew/phb/phb.jsx similarity index 100% rename from client/naturalCrit/homebrew/phb/phb.jsx rename to client/homebrew/phb/phb.jsx diff --git a/client/naturalCrit/homebrew/phb/phb.less b/client/homebrew/phb/phb.less similarity index 100% rename from client/naturalCrit/homebrew/phb/phb.less rename to client/homebrew/phb/phb.less diff --git a/client/naturalCrit/homebrew/homebrew.less b/client/naturalCrit/homebrew/homebrew.less deleted file mode 100644 index 56cfa67ba..000000000 --- a/client/naturalCrit/homebrew/homebrew.less +++ /dev/null @@ -1,6 +0,0 @@ - - -.homebrew{ - background-color: @steel; - height : 100%; -} \ No newline at end of file diff --git a/client/naturalCrit/naturalCrit.jsx b/client/naturalCrit/naturalCrit.jsx index 15fc18d95..d46bd95d6 100644 --- a/client/naturalCrit/naturalCrit.jsx +++ b/client/naturalCrit/naturalCrit.jsx @@ -4,13 +4,12 @@ var cx = require('classnames'); var CreateRouter = require('pico-router').createRouter; var CombatManager = require('./combatManager/combatManager.jsx'); -var Homebrew = require('./homebrew/homebrew.jsx'); +//var Homebrew = require('./homebrew/homebrew.jsx'); var Router = CreateRouter({ '/' : , '/combat' : , - '/homebrew' : , }); diff --git a/gulpfile.js b/gulpfile.js index 4669905ce..4bbf7d574 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -5,7 +5,7 @@ var gulp = require("gulp"); var gulp = vitreumTasks(gulp, { - entryPoints: ["./client/naturalCrit"], + entryPoints: ["./client/naturalCrit", "./client/homebrew"], DEV: true, diff --git a/server.js b/server.js index 29179ba8d..05bf1a06d 100644 --- a/server.js +++ b/server.js @@ -8,6 +8,24 @@ app.use(express.static(__dirname + '/build')); +app.get('/homebrew*', function (req, res) { + vitreumRender({ + page: './build/homebrew/bundle.dot', + globals:{}, + prerenderWith : './client/homebrew/homebrew.jsx', + initialProps: { + url: req.originalUrl, + + text : "cool" + }, + clearRequireCache : true, + }, function (err, page) { + return res.send(page) + }); +}); + + + app.get('*', function (req, res) { vitreumRender({ page: './build/naturalCrit/bundle.dot',