fix running for prod locally, add description to create object,

README.md

@@ -112,9 +112,9 @@ If you wish to hack on Estate, you'll first need to understand its architecture.
 
 Estate is a single docker container that runs a [Django](https://www.djangoproject.com/) application with [Gunicorn](http://gunicorn.org/) workers.  The backend leverages [Django Rest Framework](http://www.django-rest-framework.org/) to design it REST API functionality.  The frontend is compiled by [Webpack](https://webpack.github.io/) using a standard single page app design that leverages [React](https://facebook.github.io/react/) + [Redux](http://redux.js.org/).
 
-Local development has been made a breeze, and long build/compile times have been reduced as much as possible. To get started use [Git](https://git-scm.com/) to clone this repository and run `docker-compose build` from the root of the repository.  Once the build has completed you only need to run this command again if you change the Dockerfile itself, from here on out any changes you make to the codebase will be detected and use hot-reloading techniques to update the running application.
+Local development has been made a breeze, and long build/compile times have been reduced as much as possible. To get started use [Git](https://git-scm.com/) to clone this repository and run `docker-compose build dev` from the root of the repository.  Once the build has completed you only need to run this command again if you change the Dockerfile itself, from here on out any changes you make to the codebase will be detected and use hot-reloading techniques to update the running application.
 
-To start up the application just use `docker-compose up` this will spin up a series of containers, as well as Estate itself, and then you can begin editing the code.
+To start up the application just use `docker-compose up dev` this will spin up a series of containers, as well as Estate itself, and then you can begin editing the code.
 
 Contributing
 ------------

docker-compose.yml

@@ -1,4 +1,4 @@
-service:
+dev:
   build: .
   dockerfile: Dockerfile
   command: local
@@ -19,6 +19,21 @@ service:
     - consul:consul
     - vault:vault
 
+prod:
+  build: .
+  dockerfile: Dockerfile
+  ports:
+    - 8000:8000
+  volumes:
+    - /var/run/docker.sock:/var/run/docker.sock
+  environment:
+    - "DATABASE_URL=postgres://postgres:estate@postgres:5432/estate"
+    - "GUNICORN_WORKER_COUNT=5"
+  links:
+    - postgres:postgres
+    - consul:consul
+    - vault:vault
+
 postgres:
   image: postgres:9.5
   environment:

estate/assets/js/components/DashboardListView.jsx

@@ -11,14 +11,19 @@ class CreateObjectModal extends React.Component {
         super(props, context)
         this.state = {
             title: false,
+            description: false,
         }
     }
     onTitleChange(value) {
         this.setState({ title: value.target.value})
     }
+    onDescriptionChange(value) {
+        this.setState({ description: value.target.value})
+    }
     getResult() {
         return {
             title: this.state.title || false,
+            description: this.state.description || false,
             dependencies: [],
             version_increment: "initial",
         }
@@ -33,6 +38,10 @@ class CreateObjectModal extends React.Component {
                     <label>Title</label>
                     <input type="text" className="form-control" onChange={this.onTitleChange.bind(this)} />
                 </div>
+                <div className="form-group">
+                    <label>Description</label>
+                    <input type="text" className="form-control" onChange={this.onDescriptionChange.bind(this)} />
+                </div>
             </Modal>
         )
     }

estate/assets/js/components/Nav.jsx

@@ -23,7 +23,7 @@ class Nav extends React.Component {
                         <li><a href="/api/"> API Docs </a></li>
                         <li><a href="/admin/"> Administration </a></li>
                     </ul>
-                    <div className="navbar-form navbar-right" style={{marginRight: "20px"}}>
+                    <div className="navbar-form navbar-right" style={{marginRight: "1%"}}>
                         <Search />
                         {this.props.token ? <div className="btn btn-default" style={{marginLeft: "10px"}} onClick={this.props.logout}>Logout</div> : null }
                     </div>

estate/settings/logging.py

@@ -66,6 +66,16 @@
             'level': 'INFO',
             'handlers': ['stdout'],
             'propagate': False,
-        }
+        },
+        'gunicorn.error': {
+            'level': 'INFO',
+            'handlers': ['stdout'],
+            'propagate': False,
+        },
+        'gunicorn.access': {
+            'level': 'INFO',
+            'handlers': ['stdout'],
+            'propagate': False,
+        },
     }
 }

estate/templates/index.html

@@ -1,5 +1,4 @@
 <!--{% load raven %}-->
-{% load staticfiles %}
 {% load render_bundle from webpack_loader %}
 
 <!DOCTYPE html>
@@ -26,13 +25,6 @@
     </head>
     <body>
         <div id="root"></div>
-        <script>
-            window.drf = {
-              csrfHeaderName: "X-CSRFToken",
-              csrfCookieName: 'csrftoken'
-            };
-        </script>
-        <script type="text/javascript" src="{% static 'rest_framework/js/csrf.js' %}"></script>
         {% render_bundle 'main' %}
     </body>
 </html>

webpack/webpack.base.config.js

@@ -19,8 +19,7 @@ module.exports = {
             $: 'jquery',
             jQuery: 'jquery',
             'window.jQuery': 'jquery'
-        }),
-        new webpack.optimize.UglifyJsPlugin()
+        })
     ], // add all common plugins here
 
     module: {