From 6b98c91fadfc3930a6d6f00166da196d48ae7196 Mon Sep 17 00:00:00 2001
From: Adarsh Murthy <adarshmurthy@Adarshs-MacBook-Pro.local>
Date: Tue, 11 Apr 2017 11:17:59 -0400
Subject: [PATCH 1/6] Add Dockerfile, Dockerrun.aws.json, config files and
 .elasticbeanstalk files

---
 .elasticbeanstalk/config.yml | 12 ++++++
 Dockerfile                   | 78 ++++++++++++++++++++++++++++++++++++
 Dockerrun.aws.json           | 16 ++++++++
 config/nginx.conf            | 34 ++++++++++++++++
 config/supervisor.conf       |  5 +++
 config/uwsgi.ini             | 22 ++++++++++
 6 files changed, 167 insertions(+)
 create mode 100644 .elasticbeanstalk/config.yml
 create mode 100644 Dockerfile
 create mode 100644 Dockerrun.aws.json
 create mode 100644 config/nginx.conf
 create mode 100644 config/supervisor.conf
 create mode 100644 config/uwsgi.ini

diff --git a/.elasticbeanstalk/config.yml b/.elasticbeanstalk/config.yml
new file mode 100644
index 0000000..cd558c9
--- /dev/null
+++ b/.elasticbeanstalk/config.yml
@@ -0,0 +1,12 @@
+branch-defaults:
+  $GIT_BRANCH:
+    environment: $EB_ENV
+global:
+  application_name: $EB_APP
+  default_ec2_keyname: EastCoastBPKey
+  default_platform: 64bit Amazon Linux 2015.09 v2.0.8 running Docker 1.9.1
+  default_region: us-east-1
+  profile: null
+  sc: git
+deploy:
+  artifact: deployment.zip
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..d8d1b6b
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,78 @@
+# Dockerfile
+
+# FROM directive instructing base image to build upon
+FROM ubuntu:16.10
+
+ENV CODEROOT=/home/docker/code
+
+# Log enironment variables.
+ENV NGINXERR=/var/log/nginx.err.log
+ENV NGINXREQ=/var/log/nginx.req.log
+ENV UWSGIERR=/var/log/uwsgi.err.log
+ENV UWSGIREQ=/var/log/uwsgi.req.log
+
+# Custom environment variables.  These change from project to project.
+ARG DOMAIN
+ENV DOMAIN=${DOMAIN}
+ARG NUM_PROCESSES
+ENV NUM_PROCESSES=${NUM_PROCESSES}
+ARG NUM_THREADS
+ENV NUM_THREADS=${NUM_THREADS}
+
+# Add the nginx reposoitory.  We need 1.8 in order to support adding CORS headers to error responses.
+RUN apt-get update
+RUN apt-get install -y --no-install-recommends software-properties-common
+RUN add-apt-repository ppa:nginx/stable
+
+# Install dependencies.
+RUN apt-get update
+RUN apt-get install -y --no-install-recommends python3 python3-software-properties python3-dev python3-setuptools python3-pip
+RUN apt-get install -y --no-install-recommends nginx supervisor
+RUN apt-get install -y --no-install-recommends build-essential git
+RUN apt-get install -y --no-install-recommends libpq-dev
+RUN apt-get install -y libpcre3 libpcre3-dev
+RUN pip3 install uwsgi -I
+RUN rm -rf /var/lib/apt/lists/*
+
+COPY ./requirements.txt $CODEROOT/requirements.txt
+
+# Install application requirements.
+RUN pip3 install -r $CODEROOT/requirements.txt
+
+# Put the code somewhere.
+ADD . $CODEROOT/
+
+# Create the www user.
+RUN useradd -ms /bin/bash www
+
+# Create the log files.
+RUN \
+  touch $NGINXERR && touch $NGINXREQ && \
+  touch $UWSGIERR && touch $UWSGIREQ
+
+RUN \
+  replace_vars() { \
+    echo "Copying environment variables from $1 to $2."; \
+    sed -e "s/\$DOMAIN/$DOMAIN/g" \
+        -e "s@\$CODEROOT@$CODEROOT@g" \
+        -e "s@\$NUM_PROCESSES@$NUM_PROCESSES@g" \
+        -e "s@\$NUM_THREADS@$NUM_THREADS@g" \
+        -e "s@\$NGINXERR@$NGINXERR@g" \
+        -e "s@\$NGINXREQ@$NGINXREQ@g" \
+        -e "s@\$UWSGIERR@$UWSGIERR@g" \
+        -e "s@\$UWSGIREQ@$UWSGIREQ@g" $1 > $2; \
+  }; \
+  replace_vars $CODEROOT/config/nginx.conf /etc/nginx/nginx.conf && \
+  replace_vars $CODEROOT/config/supervisor.conf /etc/supervisor/conf.d/supervisor.conf && \
+  replace_vars $CODEROOT/config/uwsgi.ini $CODEROOT/uwsgi.ini
+
+# Make migrations
+RUN cd $CODEROOT && python3 manage.py migrate --noinput
+
+# Collect static files
+RUN cd $CODEROOT && python3 manage.py collectstatic --noinput
+
+# EXPOSE port 80 to allow communication to/from server
+EXPOSE 80
+
+CMD ["supervisord", "-n"]
diff --git a/Dockerrun.aws.json b/Dockerrun.aws.json
new file mode 100644
index 0000000..d334d79
--- /dev/null
+++ b/Dockerrun.aws.json
@@ -0,0 +1,16 @@
+{
+    "AWSEBDockerrunVersion": "1",
+    "Authentication": {
+        "Bucket": "dockerauth.blocpower.org",
+        "Key": "$DOCKER_REPO.json"
+    },
+    "Image": {
+        "Name": "blocp/$DOCKER_REPO"
+    },
+    "Ports": [
+        {
+            "HostPort": "80",
+            "ContainerPort": "80"
+        }
+    ]
+}
diff --git a/config/nginx.conf b/config/nginx.conf
new file mode 100644
index 0000000..cdf6e0e
--- /dev/null
+++ b/config/nginx.conf
@@ -0,0 +1,34 @@
+daemon off;
+user www;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    include mime.types;
+    default_type application/octet-stream;
+    sendfile on;
+    keepalive_timeout 65;
+    gzip on;
+    charset utf-8;
+    client_max_body_size 10M;
+
+    access_log $NGINXREQ;
+    error_log $NGINXERR;
+
+    server {
+        listen 80;
+        listen [::]:80;
+        server_name $DOMAIN;
+
+        location / {
+            include uwsgi_params;
+            uwsgi_pass unix:$CODEROOT/uwsgi.sock;
+        }
+        location /static/ {    
+            autoindex on;    
+            root $CODEROOT;    
+        } 
+    }
+}
diff --git a/config/supervisor.conf b/config/supervisor.conf
new file mode 100644
index 0000000..477f24b
--- /dev/null
+++ b/config/supervisor.conf
@@ -0,0 +1,5 @@
+[program:uwsgi]
+command = /usr/local/bin/uwsgi --ini $CODEROOT/uwsgi.ini -O 2
+
+[program:nginx]
+command = /usr/sbin/nginx
diff --git a/config/uwsgi.ini b/config/uwsgi.ini
new file mode 100644
index 0000000..b6300f5
--- /dev/null
+++ b/config/uwsgi.ini
@@ -0,0 +1,22 @@
+[uwsgi]
+# This is used if no configuration is specified.
+ini = :base
+
+socket = $CODEROOT/uwsgi.sock
+# Nginx should be able to find this socket.
+chmod-socket = 666
+
+master = true
+# Number of processes and workers should be determined at build time
+# Should be based on the type of instance that it is running on
+processes = $NUM_PROCESSES
+threads = $NUM_THREADS
+
+# Set loggers.
+req-logger = file:$UWSGIREQ
+logger = file:$UWSGIERR
+
+[base]
+# cd into the app directory
+chdir = $CODEROOT/
+module = blocnote.wsgi:application
-- 
GitLab


From dae5c094a62da5d01e5b27bb0d9ec82a9932f3ca Mon Sep 17 00:00:00 2001
From: Adarsh Murthy <adarshmurthy@Adarshs-MacBook-Pro.local>
Date: Tue, 11 Apr 2017 14:23:37 -0400
Subject: [PATCH 2/6] Update to change url to include building id. Update
 settings to include building database. Update view to display building
 address

---
 blocnote/apps/financialInputs/views.py | 12 ++++++++++--
 blocnote/settings.py                   |  9 +++++++++
 blocnote/urls.py                       |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/blocnote/apps/financialInputs/views.py b/blocnote/apps/financialInputs/views.py
index 5c1ddf7..086480d 100644
--- a/blocnote/apps/financialInputs/views.py
+++ b/blocnote/apps/financialInputs/views.py
@@ -1,6 +1,14 @@
 from django.shortcuts import render
 from django.http import HttpResponse
+from django.db import connections
 
 
-def index(request):
-    return HttpResponse("Hello, world. You're at the financial-inputs index.")
+def index(request, building_id):
+    cursor = connections['building_db'].cursor()
+    cursor.execute('SELECT * FROM public.get_building(in_building_id := {})'.format(building_id))
+
+    columns = [col[0] for col in cursor.description]
+    row = cursor.fetchone()
+    building = dict(zip(columns, row))
+    context = "The building address is: {0}".format(building['address'])
+    return HttpResponse(context)
diff --git a/blocnote/settings.py b/blocnote/settings.py
index 47b7329..4c7f5c4 100644
--- a/blocnote/settings.py
+++ b/blocnote/settings.py
@@ -41,6 +41,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'blocnote.apps.financialInputs',
 ]
 
 MIDDLEWARE = [
@@ -85,6 +86,14 @@ DATABASES = {
         'PASSWORD': config('DB_PASSWORD'),
         'HOST': config('DB_HOST'),
         'PORT': config('DB_PORT'),
+    },
+    'building_db': {
+        'ENGINE': 'django.db.backends.postgresql',
+        'NAME': config('BUILDING_DB_NAME'),
+        'USER': config('BUILDING_DB_USER'),
+        'PASSWORD': config('BUILDING_DB_PASSWORD'),
+        'HOST': config('BUILDING_DB_HOST'),
+        'PORT': config('BUILDING_DB_PORT'),
     }
 }
 
diff --git a/blocnote/urls.py b/blocnote/urls.py
index 81711c8..c4751c8 100644
--- a/blocnote/urls.py
+++ b/blocnote/urls.py
@@ -17,6 +17,6 @@ from django.conf.urls import include, url
 from django.contrib import admin
 
 urlpatterns = [
-    url(r'^financial-inputs/', include('blocnote.apps.financialInputs.urls')),
+    url(r'^building/(?P<building_id>[0-9]+)/', include('blocnote.apps.financialInputs.urls')),
     url(r'^admin/', admin.site.urls),
 ]
-- 
GitLab


From b3970506bccb4a0cf76f8931c9bb06f89c416d1c Mon Sep 17 00:00:00 2001
From: Adarsh Murthy <adarshmurthy@Adarshs-MacBook-Pro.local>
Date: Tue, 11 Apr 2017 14:55:01 -0400
Subject: [PATCH 3/6] Update .env.default to include building database

---
 .env.default | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.env.default b/.env.default
index c6fe427..c5ef14b 100644
--- a/.env.default
+++ b/.env.default
@@ -7,3 +7,9 @@ DB_USER=$DB_USER
 DB_PASSWORD=$DB_PASSWORD
 DB_HOST=$DB_HOST
 DB_PORT=$DB_PORT
+BUILDING_DB_NAME=$BUILDING_DB_NAME
+BUILDING_DB_USER=$BUILDING_DB_USER
+BUILDING_DB_PASSWORD=$BUILDING_DB_PASSWORD
+BUILDING_DB_HOST=$BUILDING_DB_HOST
+BUILDING_DB_PORT=$BUILDING_DB_PORT
+
-- 
GitLab


From b0bf24e4efce61c5af0b580f6b36ff998557d3bf Mon Sep 17 00:00:00 2001
From: Adarsh Murthy <adarshmurthy@Adarshs-MacBook-Pro.local>
Date: Tue, 11 Apr 2017 17:15:32 -0400
Subject: [PATCH 4/6] Fix url to include /financial-inputs. Include template
 and static files

---
 .../static/financialInputs/styles/styles.css  |  78 ++++++++++++++++++
 .../templates/financialInputs/index.html      |  25 ++++++
 blocnote/apps/financialInputs/views.py        |   4 +-
 blocnote/settings.py                          |   2 +-
 blocnote/static/favicon.ico                   | Bin 0 -> 32038 bytes
 blocnote/static/scripts/request.js            |  36 ++++++++
 blocnote/static/styles/header.css             |  13 +++
 blocnote/static/svg/logo.svg                  |  21 +++++
 blocnote/templates/base.html                  |  20 +++++
 blocnote/urls.py                              |   2 +-
 10 files changed, 197 insertions(+), 4 deletions(-)
 create mode 100644 blocnote/apps/financialInputs/static/financialInputs/styles/styles.css
 create mode 100644 blocnote/apps/financialInputs/templates/financialInputs/index.html
 create mode 100644 blocnote/static/favicon.ico
 create mode 100644 blocnote/static/scripts/request.js
 create mode 100644 blocnote/static/styles/header.css
 create mode 100644 blocnote/static/svg/logo.svg
 create mode 100644 blocnote/templates/base.html

diff --git a/blocnote/apps/financialInputs/static/financialInputs/styles/styles.css b/blocnote/apps/financialInputs/static/financialInputs/styles/styles.css
new file mode 100644
index 0000000..337fb15
--- /dev/null
+++ b/blocnote/apps/financialInputs/static/financialInputs/styles/styles.css
@@ -0,0 +1,78 @@
+body {
+  background-color: #fcfcfc;
+}
+
+#toolbar {
+  padding: 10px;
+  margin: 0;
+  border: 1px solid black;
+  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14),
+  0 1px 5px 0 rgba(0, 0, 0, 0.12),
+  0 3px 1px -2px rgba(0, 0, 0, 0.2);
+}
+
+#scenario-list {
+  display: inline;
+  width: 250px;
+  text-align-last: center;
+}
+
+#space-content {
+  margin: 0;
+}
+
+#space-scenario-detail {
+  margin: 0;
+}
+
+#space-sidebar {
+  height: 76vh;
+  overflow: scroll;
+  border-width: 1px 5px 1px 1px;
+  border-style: solid;
+  background-color: #fafafa;
+}
+
+#save-btn,
+#structure-component-btn {
+  padding: 10px;
+  margin-top: 10px;
+  border-radius: 0;
+  background: #f1f1f1;
+  width: 100%;
+}
+
+#space-playground {
+  height: 76vh;
+  padding: 0;
+  border: 1px solid black;
+  background-color: #fafafa;
+}
+
+.space-circle {
+  display: block;
+  height: 150px;
+  width: 150px;
+  border-radius: 50%;
+  border: 1px solid red;
+}
+
+form[name=space-info],
+form[name=structure-component] {
+  margin: 10px 0;
+  padding: 10px;
+  border: 1px solid black;
+  background-color: #f1f1f1;
+  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14),
+  0 1px 5px 0 rgba(0, 0, 0, 0.12),
+  0 3px 1px -2px rgba(0, 0, 0, 0.2);
+}
+
+form[name=space-info] {
+  display: none;
+}
+
+form[name=space-info] label,
+form[name=structure-component] label {
+  margin-bottom: 0;
+}
diff --git a/blocnote/apps/financialInputs/templates/financialInputs/index.html b/blocnote/apps/financialInputs/templates/financialInputs/index.html
new file mode 100644
index 0000000..bb05905
--- /dev/null
+++ b/blocnote/apps/financialInputs/templates/financialInputs/index.html
@@ -0,0 +1,25 @@
+{% extends 'base.html' %}
+{% load staticfiles %}
+
+{% block head %}
+  <link
+    rel="stylesheet"
+    href="{% static "financialInputs/styles/styles.css" %}"
+  />
+{% endblock %}
+
+{% block content %}
+    <h2>
+        This is finance inputs
+    </h2>
+    <div>
+        Building id: {{ id }} <br>
+        Address: {{ address }}
+    </div>
+{% endblock %}
+
+{% block scripts %}
+  <script src="{% static "scripts/request.js" %}"></script>
+  <script src="//cdnjs.cloudflare.com/ajax/libs/fabric.js/1.7.8/fabric.min.js"></script>
+  <script src="//cdnjs.cloudflare.com/ajax/libs/js-cookie/2.1.3/js.cookie.min.js"></script>
+{% endblock %}
diff --git a/blocnote/apps/financialInputs/views.py b/blocnote/apps/financialInputs/views.py
index 086480d..89bc0b7 100644
--- a/blocnote/apps/financialInputs/views.py
+++ b/blocnote/apps/financialInputs/views.py
@@ -10,5 +10,5 @@ def index(request, building_id):
     columns = [col[0] for col in cursor.description]
     row = cursor.fetchone()
     building = dict(zip(columns, row))
-    context = "The building address is: {0}".format(building['address'])
-    return HttpResponse(context)
+    context = {'address': building['address'], 'id': building['building_id']}
+    return render(request, 'financialInputs/index.html', context=context)
diff --git a/blocnote/settings.py b/blocnote/settings.py
index 4c7f5c4..eef190f 100644
--- a/blocnote/settings.py
+++ b/blocnote/settings.py
@@ -59,7 +59,7 @@ ROOT_URLCONF = 'blocnote.urls'
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        'DIRS': [(os.path.join(BASE_DIR, 'blocnote/templates')), ],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
diff --git a/blocnote/static/favicon.ico b/blocnote/static/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..4734fd6c1602259f6c542b50fff102ae6bdf22be
GIT binary patch
literal 32038
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
SiroXVu1o~8sEneDXZe3lB2`ZS

literal 0
HcmV?d00001

diff --git a/blocnote/static/scripts/request.js b/blocnote/static/scripts/request.js
new file mode 100644
index 0000000..2c9af26
--- /dev/null
+++ b/blocnote/static/scripts/request.js
@@ -0,0 +1,36 @@
+/**
+ * Checks if a network request came back fine, and throws an error if not
+ *
+ * @param  {object} response  A response from a network request
+ *
+ * @return {object|undefined} Returns either the response, or throws an error
+ */
+function checkStatus(response) {
+  if (response.ok) {
+    return response;
+  }
+
+
+
+
+  const error = new Error(response.statusText);
+  error.response = response;
+  error.responseBody = response.json();
+  throw error;
+}
+
+/**
+ * Requests a URL, returning a promise
+ *
+ * @param  {string} url       The URL we want to request
+ * @param  {object} [options] The options we want to pass to "fetch"
+ *
+ * @return {object}           An object containing either "payload" or "err"
+ */
+function request(url, options) {
+  return fetch(url, options)
+    .then(checkStatus)
+    .then(response => response.json())
+    .then(payload => ({ payload }))
+    .catch(err => ({ err }));
+}
diff --git a/blocnote/static/styles/header.css b/blocnote/static/styles/header.css
new file mode 100644
index 0000000..8be4750
--- /dev/null
+++ b/blocnote/static/styles/header.css
@@ -0,0 +1,13 @@
+.navbar {
+  height: 70px;
+  padding: 0;
+}
+
+.bg-inverse {
+  background-color: #343434 !important;
+}
+
+.navbar-brand {
+  border-right: 2px solid #343434;
+  padding: 0 20px;
+}
diff --git a/blocnote/static/svg/logo.svg b/blocnote/static/svg/logo.svg
new file mode 100644
index 0000000..e869e2b
--- /dev/null
+++ b/blocnote/static/svg/logo.svg
@@ -0,0 +1,21 @@
+<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink">
+  <g id="4-circles" stroke="none" stroke-width="1" fill-rule="evenodd" fill="#fbd13a">
+    <path
+      d="M21,27.5 C17.4102667,27.5 14.5,24.5897333 14.5,21 C14.5,17.4102667 17.4102667,14.5 21,14.5 C24.5897333,14.5 27.5,17.4102667 27.5,21 C27.5,24.5897333 24.5897333,27.5 21,27.5 Z"
+      id="4">
+    </path>
+    <path
+      d="M6.5,27.5 C2.91026667,27.5 0,24.5897333 0,21 C0,17.4102667 2.91026667,14.5 6.5,14.5 C10.0897333,14.5 13,17.4102667 13,21 C13,24.5897333 10.0897333,27.5 6.5,27.5 Z"
+      id="3">
+    </path>
+    <path
+      d="M21,13 C17.4102667,13 14.5,10.0897333 14.5,6.5 C14.5,2.91026667 17.4102667,0 21,0 C24.5897333,0 27.5,2.91026667 27.5,6.5 C27.5,10.0897333 24.5897333,13 21,13 Z"
+      id="2">
+    </path>
+    <path
+      d="M6.5,13 C2.91026667,13 0,10.0897333 0,6.5 C0,2.91026667 2.91026667,0 6.5,0 C10.0897333,0 13,2.91026667 13,6.5 C13,10.0897333 10.0897333,13 6.5,13 Z"
+      id="1">
+    </path>
+  </g>
+</svg>
diff --git a/blocnote/templates/base.html b/blocnote/templates/base.html
new file mode 100644
index 0000000..3e4727e
--- /dev/null
+++ b/blocnote/templates/base.html
@@ -0,0 +1,20 @@
+{% load staticfiles %}
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+
+  <title>{% block title %}BlocNote{% endblock %}</title>
+
+  <link rel="shortcut icon" type="image/png" href="{% static "favicon.ico" %}"/>
+  {% block head %}{% endblock %}
+</head>
+
+<body>
+  {% block content %}{% endblock %}
+
+</body>
+</html>
diff --git a/blocnote/urls.py b/blocnote/urls.py
index c4751c8..b55bc83 100644
--- a/blocnote/urls.py
+++ b/blocnote/urls.py
@@ -17,6 +17,6 @@ from django.conf.urls import include, url
 from django.contrib import admin
 
 urlpatterns = [
-    url(r'^building/(?P<building_id>[0-9]+)/', include('blocnote.apps.financialInputs.urls')),
+    url(r'^building/(?P<building_id>[0-9]+)/financial-inputs', include('blocnote.apps.financialInputs.urls')),
     url(r'^admin/', admin.site.urls),
 ]
-- 
GitLab


From 761c0e5cc84f186ae77cabeb6abf594852503de7 Mon Sep 17 00:00:00 2001
From: Adarsh Murthy <adarshmurthy@Adarshs-MacBook-Pro.local>
Date: Tue, 11 Apr 2017 17:18:44 -0400
Subject: [PATCH 5/6] Remove style.css since not used now

---
 .../static/financialInputs/styles/styles.css  | 78 -------------------
 1 file changed, 78 deletions(-)
 delete mode 100644 blocnote/apps/financialInputs/static/financialInputs/styles/styles.css

diff --git a/blocnote/apps/financialInputs/static/financialInputs/styles/styles.css b/blocnote/apps/financialInputs/static/financialInputs/styles/styles.css
deleted file mode 100644
index 337fb15..0000000
--- a/blocnote/apps/financialInputs/static/financialInputs/styles/styles.css
+++ /dev/null
@@ -1,78 +0,0 @@
-body {
-  background-color: #fcfcfc;
-}
-
-#toolbar {
-  padding: 10px;
-  margin: 0;
-  border: 1px solid black;
-  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14),
-  0 1px 5px 0 rgba(0, 0, 0, 0.12),
-  0 3px 1px -2px rgba(0, 0, 0, 0.2);
-}
-
-#scenario-list {
-  display: inline;
-  width: 250px;
-  text-align-last: center;
-}
-
-#space-content {
-  margin: 0;
-}
-
-#space-scenario-detail {
-  margin: 0;
-}
-
-#space-sidebar {
-  height: 76vh;
-  overflow: scroll;
-  border-width: 1px 5px 1px 1px;
-  border-style: solid;
-  background-color: #fafafa;
-}
-
-#save-btn,
-#structure-component-btn {
-  padding: 10px;
-  margin-top: 10px;
-  border-radius: 0;
-  background: #f1f1f1;
-  width: 100%;
-}
-
-#space-playground {
-  height: 76vh;
-  padding: 0;
-  border: 1px solid black;
-  background-color: #fafafa;
-}
-
-.space-circle {
-  display: block;
-  height: 150px;
-  width: 150px;
-  border-radius: 50%;
-  border: 1px solid red;
-}
-
-form[name=space-info],
-form[name=structure-component] {
-  margin: 10px 0;
-  padding: 10px;
-  border: 1px solid black;
-  background-color: #f1f1f1;
-  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14),
-  0 1px 5px 0 rgba(0, 0, 0, 0.12),
-  0 3px 1px -2px rgba(0, 0, 0, 0.2);
-}
-
-form[name=space-info] {
-  display: none;
-}
-
-form[name=space-info] label,
-form[name=structure-component] label {
-  margin-bottom: 0;
-}
-- 
GitLab


From dd3004594549d706fd39a72e6ca431cd26b3e8b6 Mon Sep 17 00:00:00 2001
From: Adarsh Murthy <adarshmurthy@Adarshs-MacBook-Pro.local>
Date: Tue, 11 Apr 2017 17:20:07 -0400
Subject: [PATCH 6/6] Fix for error in index.html

---
 .../financialInputs/templates/financialInputs/index.html   | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/blocnote/apps/financialInputs/templates/financialInputs/index.html b/blocnote/apps/financialInputs/templates/financialInputs/index.html
index bb05905..580a3fd 100644
--- a/blocnote/apps/financialInputs/templates/financialInputs/index.html
+++ b/blocnote/apps/financialInputs/templates/financialInputs/index.html
@@ -1,13 +1,6 @@
 {% extends 'base.html' %}
 {% load staticfiles %}
 
-{% block head %}
-  <link
-    rel="stylesheet"
-    href="{% static "financialInputs/styles/styles.css" %}"
-  />
-{% endblock %}
-
 {% block content %}
     <h2>
         This is finance inputs
-- 
GitLab