diff --git a/flex/flex/db.sqlite3 b/flex/flex/db.sqlite3
index 4675ae6..8748f48 100644
Binary files a/flex/flex/db.sqlite3 and b/flex/flex/db.sqlite3 differ
diff --git a/flex/flex/flex/__pycache__/settings.cpython-36.pyc b/flex/flex/flex/__pycache__/settings.cpython-36.pyc
index 4f52e0e..018fd49 100644
Binary files a/flex/flex/flex/__pycache__/settings.cpython-36.pyc and b/flex/flex/flex/__pycache__/settings.cpython-36.pyc differ
diff --git a/flex/flex/home/__pycache__/urls.cpython-36.pyc b/flex/flex/home/__pycache__/urls.cpython-36.pyc
index 325b541..9ea7590 100644
Binary files a/flex/flex/home/__pycache__/urls.cpython-36.pyc and b/flex/flex/home/__pycache__/urls.cpython-36.pyc differ
diff --git a/flex/flex/home/__pycache__/views.cpython-36.pyc b/flex/flex/home/__pycache__/views.cpython-36.pyc
index bdd1ccb..aeebb6b 100644
Binary files a/flex/flex/home/__pycache__/views.cpython-36.pyc and b/flex/flex/home/__pycache__/views.cpython-36.pyc differ
diff --git a/flex/flex/home/static/home/dash.css b/flex/flex/home/static/home/dash.css
new file mode 100644
index 0000000..0986a8d
--- /dev/null
+++ b/flex/flex/home/static/home/dash.css
@@ -0,0 +1,124 @@
+body {
+ height: 100%;
+ width: 100%;
+ margin: 0;
+ padding: 0;
+ position: relative;
+}
+
+html {
+ background-color: #d7dae0;
+}
+
+.nav {
+ width: 100%;
+ height: 40px;
+ background-color: black;
+}
+
+.cardsCont {
+ background-color: #d7dae0;
+}
+.container {
+ margin: 0 !important;
+ padding: 0 !important;
+}
+.container-fluid {
+ margin: 0 !important;
+ padding: 0 !important;
+}
+.row {
+ margin: 0 !important;
+ padding: 0 !important;
+}
+
+.goalRow {
+ margin: 0;
+ padding: 0;
+ height: 400px;
+}
+.cardCont {
+ height: 100%;
+}
+.card {
+ margin: 5px;
+ padding: 5px;
+ height: 100%;
+ background-color: white;
+ border-radius: 5px;
+ box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+ overflow: hidden;
+}
+
+.circleGraph {
+ padding: 0;
+ height: 400px;
+ color: black !important;
+}
+
+
+.twoCardRow {
+ height: 195px;
+ margin-bottom: 10px !important;
+}
+
+.fa {
+ color: green;
+}
+
+.cardInfo {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ margin-right: -50%;
+ transform: translate(-50%, -50%);
+ color: #727375;
+ font-size: 23px;
+ font-family: 'Open Sans Condensed', sans-serif;
+}
+
+.cardData {
+ position: absolute;
+ left: 50%;
+ margin-right: -50%;
+ transform: translate(-50%, -50%);
+ bottom: 0;
+ color: #565759;
+ font-size: 13px;
+ text-align: center;
+ font-style: italic;
+}
+
+.stepsC {
+ background-color: rgb(232, 245, 233);
+}
+.sleepC {
+ background-color: rgb(243, 229, 245);
+}
+.calC {
+ background-color: rgb(255, 243, 224);
+}
+.activityC {
+ background-color: rgb(225, 245, 254);
+}
+
+.mainGCont {
+ top: 30px;
+ padding: 10px;
+ height: 500px;
+ width: 100%;
+ position: relative;
+}
+.mainG {
+ height: 100%;
+ width: 100%;
+}
+.mainGraph {
+ height: 100%;
+ width: 100%;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ margin-right: -50%;
+ transform: translate(-50%, -50%);
+}
\ No newline at end of file
diff --git a/flex/flex/home/static/home/main.css b/flex/flex/home/static/home/main.css
index 422945c..ca58751 100644
--- a/flex/flex/home/static/home/main.css
+++ b/flex/flex/home/static/home/main.css
@@ -141,6 +141,9 @@ button {
padding: 0px 5px 10px 3px;
border: none;
box-shadow: 3px 3px 2px #888888;
+ position:relative;
+ left: 45%;
+ top:90%;
}
button:hover {
diff --git a/flex/flex/home/templates/home/dashboard.html b/flex/flex/home/templates/home/dashboard.html
new file mode 100644
index 0000000..c4798db
--- /dev/null
+++ b/flex/flex/home/templates/home/dashboard.html
@@ -0,0 +1,126 @@
+
+
+
+
+ {% load static %}
+
+ Reflex
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Calories
+
250 Calories
+
+
+
+
+
+
+
+
+
+
{% else %}
+
+
diff --git a/flex/flex/home/views.py b/flex/flex/home/views.py
index 9fb6402..d0a436a 100644
--- a/flex/flex/home/views.py
+++ b/flex/flex/home/views.py
@@ -77,7 +77,7 @@ def dash(request):
calories_data.append(my_data['bucket'][i]['dataset'][0]['point'][0]['value'][0]['fpVal'])
i = i+1
- return render(request, 'home/home.html',
+ return render(request, 'home/dashboard.html',
{
'calories_data':calories_data,
'walk_data':walk_data,