diff --git a/client/spellsort/navbar/navbar.jsx b/client/spellsort/navbar/navbar.jsx new file mode 100644 index 000000000..c532be1ca --- /dev/null +++ b/client/spellsort/navbar/navbar.jsx @@ -0,0 +1,21 @@ +var React = require('react'); +var _ = require('lodash'); + +var Nav = require('naturalcrit/nav/nav.jsx'); + +var Navbar = React.createClass({ + render : function(){ + return + + + +
Spellsort
+
+ v0.0.0 +
+ {this.props.children} +
+ } +}); + +module.exports = Navbar; diff --git a/client/spellsort/navbar/navbar.less b/client/spellsort/navbar/navbar.less new file mode 100644 index 000000000..1777d4198 --- /dev/null +++ b/client/spellsort/navbar/navbar.less @@ -0,0 +1,16 @@ + +.spellsort nav{ + .spellsortLogo{ + .animate(color); + font-family : CodeBold; + font-size : 12px; + color : white; + div{ + margin-top : 2px; + margin-bottom : -2px; + } + &:hover{ + color : @teal; + } + } +} \ No newline at end of file diff --git a/client/spellsort/spellsort.jsx b/client/spellsort/spellsort.jsx new file mode 100644 index 000000000..516a2fd1f --- /dev/null +++ b/client/spellsort/spellsort.jsx @@ -0,0 +1,33 @@ +var React = require('react'); +var _ = require('lodash'); +var cx = require('classnames'); + +var Nav = require('naturalcrit/nav/nav.jsx'); +var Navbar = require('./navbar/navbar.jsx'); + +var SplitPane = require('naturalcrit/splitPane/splitPane.jsx'); + +var SpellSort = React.createClass({ + + handleSplitMove : function(){ + + }, + + render : function(){ + return
+ + + +
+ + +
pane 1
+
pane 2
+ +
+
+
+ } +}); + +module.exports = SpellSort; diff --git a/client/spellsort/spellsort.less b/client/spellsort/spellsort.less new file mode 100644 index 000000000..a63ea7996 --- /dev/null +++ b/client/spellsort/spellsort.less @@ -0,0 +1,4 @@ +@import 'naturalcrit/styles/core.less'; +.spellsort{ + +} \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index a06b07b87..dbbf8ca1c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -8,6 +8,7 @@ var gulp = vitreumTasks(gulp, { entryPoints: [ './client/main', './client/homebrew', + './client/spellsort', './client/admin' ], diff --git a/server.js b/server.js index ebd6f4ae5..6f274e3e4 100644 --- a/server.js +++ b/server.js @@ -46,6 +46,9 @@ app = require('./server/homebrew.api.js')(app); app = require('./server/homebrew.server.js')(app); +//Populate Spellsort routes +app = require('./server/spellsort.server.js')(app); + app.get('*', function (req, res) { vitreumRender({ diff --git a/server/homebrew.server.js b/server/homebrew.server.js index 7ea9099da..85c010252 100644 --- a/server/homebrew.server.js +++ b/server/homebrew.server.js @@ -7,15 +7,6 @@ var HomebrewModel = require('./homebrew.model.js').model; module.exports = function(app){ - /* - app.get('/homebrew/new', function(req, res){ - var newHomebrew = new HomebrewModel(); - newHomebrew.save(function(err, obj){ - return res.redirect('/homebrew/edit/' + obj.editId); - }) - }) - */ - //Edit Page app.get('/homebrew/edit/:id', function(req, res){ diff --git a/server/spellsort.server.js b/server/spellsort.server.js new file mode 100644 index 000000000..de93a43c1 --- /dev/null +++ b/server/spellsort.server.js @@ -0,0 +1,21 @@ +var _ = require('lodash'); +var vitreumRender = require('vitreum/render'); + + +module.exports = function(app){ + app.get('/spellsort*', (req, res)=>{ + vitreumRender({ + page: './build/spellsort/bundle.dot', + globals:{}, + prerenderWith : './client/spellsort/spellsort.jsx', + initialProps: { + url: req.originalUrl, + }, + clearRequireCache : !process.env.PRODUCTION, + }, function (err, page) { + return res.send(page) + }); + }); + + return app; +}; \ No newline at end of file