0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-10 22:12:48 +00:00

Merge branch 'homebrewStandAlone'

This commit is contained in:
Scott
2015-12-19 23:17:05 -05:00
25 changed files with 52 additions and 11 deletions

View File

Before

Width:  |  Height:  |  Size: 337 KiB

After

Width:  |  Height:  |  Size: 337 KiB

View File

Before

Width:  |  Height:  |  Size: 5.4 MiB

After

Width:  |  Height:  |  Size: 5.4 MiB

View File

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

@@ -2,23 +2,39 @@ var React = require('react');
var _ = require('lodash'); var _ = require('lodash');
var cx = require('classnames'); var cx = require('classnames');
var CreateRouter = require('pico-router').createRouter;
var PHB = require('./phb/phb.jsx'); var PHB = require('./phb/phb.jsx');
var Editor = require('./editor/editor.jsx'); var Editor = require('./editor/editor.jsx');
var Snippets = require('./editor/snippets'); //var Snippets = require('./editor/snippets');
var KEY = 'naturalCrit-homebrew'; var KEY = 'naturalCrit-homebrew';
var Router = CreateRouter({
'/homebrew' : 'home',
'/homebrew/edit/:id' : function(args){
},
'/homebrew/share/:id' : function(args){
}
});
var Homebrew = React.createClass({ var Homebrew = React.createClass({
getDefaultProps: function() {
return {
text : ""
};
},
getInitialState: function() { getInitialState: function() {
return { return {
text : Snippets.intro text : "# Holla"
}; };
}, },

View File

@@ -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%;
}

View File

@@ -1,6 +0,0 @@
.homebrew{
background-color: @steel;
height : 100%;
}

View File

@@ -4,13 +4,12 @@ var cx = require('classnames');
var CreateRouter = require('pico-router').createRouter; var CreateRouter = require('pico-router').createRouter;
var CombatManager = require('./combatManager/combatManager.jsx'); var CombatManager = require('./combatManager/combatManager.jsx');
var Homebrew = require('./homebrew/homebrew.jsx'); //var Homebrew = require('./homebrew/homebrew.jsx');
var Router = CreateRouter({ var Router = CreateRouter({
'/' : <CombatManager />, '/' : <CombatManager />,
'/combat' : <CombatManager />, '/combat' : <CombatManager />,
'/homebrew' : <Homebrew />,
}); });

View File

@@ -5,7 +5,7 @@ var gulp = require("gulp");
var gulp = vitreumTasks(gulp, { var gulp = vitreumTasks(gulp, {
entryPoints: ["./client/naturalCrit"], entryPoints: ["./client/naturalCrit", "./client/homebrew"],
DEV: true, DEV: true,

View File

@@ -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) { app.get('*', function (req, res) {
vitreumRender({ vitreumRender({
page: './build/naturalCrit/bundle.dot', page: './build/naturalCrit/bundle.dot',