diff --git a/client/admin/admin.jsx b/client/admin/admin.jsx
index 4fd8d5505..174cfafff 100644
--- a/client/admin/admin.jsx
+++ b/client/admin/admin.jsx
@@ -1,38 +1,42 @@
-var React = require('react');
-var _ = require('lodash');
-var cx = require('classnames');
+const React = require('react');
+const _ = require('lodash');
-var HomebrewAdmin = require('./homebrewAdmin/homebrewAdmin.jsx');
+const Nav = require('naturalcrit/nav/nav.jsx');
-var Admin = React.createClass({
+//const HomebrewAdmin = require('./homebrewAdmin/homebrewAdmin.jsx');
+
+
+const BrewLookup = require('./brewLookup/brewLookup.jsx');
+
+
+const Admin = React.createClass({
getDefaultProps: function() {
return {
- url : "",
- admin_key : "",
- homebrews : [],
+ admin_key : '',
};
},
+ renderNavbar : function(){
+ return
+
+
+ Homebrewery Admin
+
+
+
+ },
+
render : function(){
- var self = this;
- return(
-
+ return
+ {this.renderNavbar()}
+
+
-
-
-
- naturalcrit admin
-
-
-
-
-
-
-
+ Test
-
- );
+
+
}
});
diff --git a/client/admin/admin.less b/client/admin/admin.less
index c13063a01..e742b26bc 100644
--- a/client/admin/admin.less
+++ b/client/admin/admin.less
@@ -1,19 +1,11 @@
-@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';
+@import 'naturalcrit/styles/core.less';
-@import 'font-awesome/css/font-awesome.css';
-
-html,body, #reactContainer, .naturalCrit{
+html,body, #reactRoot{
min-height : 100%;
}
-@sidebarWidth : 250px;
-
body{
- background-color : #eee;
+ background-color : #ddd;
font-family : 'Open Sans', sans-serif;
color : #4b5055;
font-weight : 100;
@@ -23,17 +15,35 @@ body{
height : 100%;
}
-.admin{
-
- header{
- background-color : @red;
- font-size: 2em;
- padding : 20px 0px;
- color : white;
- margin-bottom: 30px;
- i{
- margin-right: 30px;
+.admin {
+ nav {
+ background-color: @red;
+ .navItem{
+ background-color: @red;
+ }
+ .homebreweryLogo{
+ font-family : CodeBold;
+ font-size : 12px;
+ color : white;
+ div{
+ margin-top : 2px;
+ margin-bottom : -2px;
+ }
}
}
-}
\ No newline at end of file
+ h1{
+ font-size: 2em;
+ font-weight: 800;
+ border-bottom: 1px solid #ddd;
+ margin-bottom: 10px;
+ }
+
+
+ main.content{
+ background-color: white;
+ padding: 50px 20px;
+ width : 1000px;
+ margin: 0 auto;
+ }
+}
diff --git a/client/admin/adminSearch/adminSearch.jsx b/client/admin/adminSearch/adminSearch.jsx
new file mode 100644
index 000000000..1f95153be
--- /dev/null
+++ b/client/admin/adminSearch/adminSearch.jsx
@@ -0,0 +1,19 @@
+
+const React = require('react');
+const _ = require('lodash');
+const cx = require('classnames');
+
+const AdminSearch = React.createClass({
+ getDefaultProps: function() {
+ return {
+
+ };
+ },
+ render: function(){
+ return
+ AdminSearch Component Ready.
+
+ }
+});
+
+module.exports = AdminSearch;
diff --git a/client/admin/adminSearch/adminSearch.less b/client/admin/adminSearch/adminSearch.less
new file mode 100644
index 000000000..dc1de6e64
--- /dev/null
+++ b/client/admin/adminSearch/adminSearch.less
@@ -0,0 +1,3 @@
+.adminSearch{
+
+}
\ No newline at end of file
diff --git a/client/admin/brewLookup/brewLookup.jsx b/client/admin/brewLookup/brewLookup.jsx
new file mode 100644
index 000000000..e6a0ff290
--- /dev/null
+++ b/client/admin/brewLookup/brewLookup.jsx
@@ -0,0 +1,45 @@
+const React = require('react');
+const _ = require('lodash');
+const cx = require('classnames');
+
+const request = require('superagent');
+
+const BrewLookup = React.createClass({
+ getDefaultProps: function() {
+ return {
+ adminKey : '',
+ };
+ },
+ getInitialState: function() {
+ return {
+ query:'',
+ resultBrew : null
+ };
+ },
+
+ handleChange : function(e){
+ this.setState({
+ query : e.target.value
+ })
+ },
+ lookup : function(){
+
+
+ },
+
+ renderFoundBrew : function(){
+ if(!this.state.resultBrew) return null;
+ },
+
+ render: function(){
+ return
+
Brew Lookup
+
+
+
+ {this.renderFoundBrew()}
+
+ }
+});
+
+module.exports = BrewLookup;
diff --git a/client/admin/brewLookup/brewLookup.less b/client/admin/brewLookup/brewLookup.less
new file mode 100644
index 000000000..31b0daea6
--- /dev/null
+++ b/client/admin/brewLookup/brewLookup.less
@@ -0,0 +1,8 @@
+
+.brewLookup{
+ height : 200px;
+ input{
+ height : 33px;
+ padding : 0px 10px;
+ }
+}
\ No newline at end of file
diff --git a/client/admin/invalidBrew/invalidBrew.jsx b/client/admin/invalidBrew/invalidBrew.jsx
new file mode 100644
index 000000000..a70c443ec
--- /dev/null
+++ b/client/admin/invalidBrew/invalidBrew.jsx
@@ -0,0 +1,19 @@
+
+const React = require('react');
+const _ = require('lodash');
+const cx = require('classnames');
+
+const InvalidBrew = React.createClass({
+ getDefaultProps: function() {
+ return {
+
+ };
+ },
+ render: function(){
+ return
+ InvalidBrew Component Ready.
+
+ }
+});
+
+module.exports = InvalidBrew;
diff --git a/client/admin/invalidBrew/invalidBrew.less b/client/admin/invalidBrew/invalidBrew.less
new file mode 100644
index 000000000..f9370957f
--- /dev/null
+++ b/client/admin/invalidBrew/invalidBrew.less
@@ -0,0 +1,3 @@
+.invalidBrew{
+
+}
\ No newline at end of file
diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx
index b6bdbeffc..6dd386d5a 100644
--- a/client/homebrew/pages/userPage/userPage.jsx
+++ b/client/homebrew/pages/userPage/userPage.jsx
@@ -52,6 +52,7 @@ const UserPage = React.createClass({
render : function(){
const brews = this.getSortedBrews();
+ console.log('user brews', brews);
return
diff --git a/server/admin.routes.js b/server/admin.routes.js
index a526e5e5e..6310d5eb1 100644
--- a/server/admin.routes.js
+++ b/server/admin.routes.js
@@ -8,6 +8,7 @@ const mw = require('./middleware.js');
const BrewData = require('./brew.data.js');
router.get('/admin', mw.adminLogin, (req, res, next) => {
+ console.log('yo');
return vitreumRender('admin', templateFn, {
url : req.originalUrl,
admin_key : config.get('admin:key')