From 1949a5cca5186c01607841f46bcbd59c1ce6997a Mon Sep 17 00:00:00 2001 From: Scott Tolksdorf Date: Tue, 3 May 2016 21:00:51 -0400 Subject: [PATCH] updating react and lodash to newest versions --- client/homebrew/editPage/editPage.jsx | 5 +++ client/homebrew/homePage/homePage.jsx | 18 +++++++++ package.json | 6 +-- shared/naturalCrit/homebrewIcon.svg.jsx | 13 +++++++ shared/naturalCrit/nav/nav.jsx | 51 +++++++++++++++++++++++++ shared/naturalCrit/nav/nav.less | 5 +++ 6 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 shared/naturalCrit/homebrewIcon.svg.jsx create mode 100644 shared/naturalCrit/nav/nav.jsx create mode 100644 shared/naturalCrit/nav/nav.less diff --git a/client/homebrew/editPage/editPage.jsx b/client/homebrew/editPage/editPage.jsx index cf5cd3f..ad3188c 100644 --- a/client/homebrew/editPage/editPage.jsx +++ b/client/homebrew/editPage/editPage.jsx @@ -12,6 +12,8 @@ var request = require("superagent"); var SAVE_TIMEOUT = 3000; + + var EditPage = React.createClass({ getDefaultProps: function() { return { @@ -64,6 +66,9 @@ var EditPage = React.createClass({ render : function(){ return
+ + + + + + + Test + + + + + diff --git a/package.json b/package.json index d6168a1..5493baa 100644 --- a/package.json +++ b/package.json @@ -16,14 +16,14 @@ "express": "^4.13.3", "gulp": "^3.9.0", "jsoneditor": "^4.2.1", - "lodash": "^3.10.1", + "lodash": "^4.11.2", "marked": "^0.3.5", "moment": "^2.11.0", "mongoose": "^4.3.3", "pico-flux": "^1.1.0", "pico-router": "^1.1.0", - "react": "^0.14.2", - "react-dom": "^0.14.2", + "react": "^15.0.2", + "react-dom": "^15.0.2", "shortid": "^2.2.4", "superagent": "^1.6.1", "vitreum": "^3.1.1" diff --git a/shared/naturalCrit/homebrewIcon.svg.jsx b/shared/naturalCrit/homebrewIcon.svg.jsx new file mode 100644 index 0000000..3892018 --- /dev/null +++ b/shared/naturalCrit/homebrewIcon.svg.jsx @@ -0,0 +1,13 @@ +var React = require('react'); + +var Logo = React.createClass({ + render : function(){ + return + + + + + } +}); + +module.exports = Logo; diff --git a/shared/naturalCrit/nav/nav.jsx b/shared/naturalCrit/nav/nav.jsx new file mode 100644 index 0000000..0f1b81c --- /dev/null +++ b/shared/naturalCrit/nav/nav.jsx @@ -0,0 +1,51 @@ +var React = require('react'); +var _ = require('lodash'); +var cx = require('classnames'); + +var Nav = { + + base : React.createClass({ + render : function(){ + return + } + }), + + left : React.createClass({ + render : function(){ + return
+ COM Ready! +
+ } + }), + + right : React.createClass({ + render : function(){ + return
+ COM Ready! +
+ } + }), + + + logo : function(props){ + return + + }, + + + + + + + +}; + + +module.exports = Nav; \ No newline at end of file diff --git a/shared/naturalCrit/nav/nav.less b/shared/naturalCrit/nav/nav.less new file mode 100644 index 0000000..9b2de7f --- /dev/null +++ b/shared/naturalCrit/nav/nav.less @@ -0,0 +1,5 @@ +nav{ + background-color: #333; + min-height : 25px; +} +