From 2da9474aec2ab8f239c9fd321a1d8a3959d4f793 Mon Sep 17 00:00:00 2001 From: Karthik Pullela Date: Sun, 21 Jan 2018 03:54:04 -0800 Subject: [PATCH] Added dashboard page to app. --- flex/flex/db.sqlite3 | Bin 131072 -> 131072 bytes .../flex/__pycache__/settings.cpython-36.pyc | Bin 2317 -> 2317 bytes .../flex/home/__pycache__/urls.cpython-36.pyc | Bin 386 -> 386 bytes .../home/__pycache__/views.cpython-36.pyc | Bin 2248 -> 2253 bytes flex/flex/home/static/home/dash.css | 124 +++++++++++++++++ flex/flex/home/static/home/main.css | 3 + flex/flex/home/templates/home/dashboard.html | 126 ++++++++++++++++++ flex/flex/home/templates/home/home.html | 3 + flex/flex/home/views.py | 2 +- 9 files changed, 257 insertions(+), 1 deletion(-) create mode 100644 flex/flex/home/static/home/dash.css create mode 100644 flex/flex/home/templates/home/dashboard.html diff --git a/flex/flex/db.sqlite3 b/flex/flex/db.sqlite3 index 4675ae63278f4e92ad832b045e76c2f79a854640..8748f48d963d4cad313d4f510041880738d66981 100644 GIT binary patch delta 220 zcmZo@;Am*zm>|t)Gf~Ew(Pm@9v3WcuW>&@qdIlCICPo&Ujpko+;9%l&W#Dh-bKR_{ zV9BS^WX;6t+rsKtlwDSuR*-8@W^9^LkWx@oY-V9mRhE~UondZTQe0KIIrkkGqcF@g zGYfO$YDQMyMpnn^58g8>Y+m&~>H`N8|8@rcJN(->3nr}QS5aa1Wh7+k^xN+lHG%pL dGw?s+KMd5joqzh_|BOO#XM-%7{_sDeJOJ>ONKXI& delta 220 zcmZo@;Am*zm>|t)I#I@%(R5?Nv3Wd3rd9?PdPe5P=4R%bjpko+;9%r$X5eq;bKR_{ zV9BS^WX;6t+rsK-URq(AUs-IFkyLDGn4D=*oSj*iTAr6?nq8P)YEY5BIrkkGqcF@g zb5je`YDQMyMpnn^58g8>Y+m&~>I2Z^I}H4H__uEsOjymYqQdOUNXXRbx8E~r0`)y& c;D5w_7^rVM|MbKE8HM1^23a)y;eSSX0QW#hYXATM diff --git a/flex/flex/flex/__pycache__/settings.cpython-36.pyc b/flex/flex/flex/__pycache__/settings.cpython-36.pyc index 4f52e0eb06efa2dabc55d06b5f11e0523f5ee8ba..018fd4965e49cd4624cb609f758355aee69bffc4 100644 GIT binary patch delta 15 WcmeAb>J?%$=H=y5uH4AR&Ite-&I11c delta 15 WcmeAb>J?%$=H=y@p1hHbof7~Z7z14Z diff --git a/flex/flex/home/__pycache__/urls.cpython-36.pyc b/flex/flex/home/__pycache__/urls.cpython-36.pyc index 325b5411ad7ab5cdef4dcd8b14fcd0c40731e7dc..9ea7590be39a63c55fbc845b668142ed50c443f1 100644 GIT binary patch delta 15 WcmZo-ZenIL=H=y5uH490!w3Kv_5(No delta 15 WcmZo-ZenIL=H=xQF51Xe!w3Kva|0m& diff --git a/flex/flex/home/__pycache__/views.cpython-36.pyc b/flex/flex/home/__pycache__/views.cpython-36.pyc index bdd1ccbb971a3c082a1e3a6a0f99835414da71ef..aeebb6bc8a1789ec6fcbbee4997fe85ef604d8e7 100644 GIT binary patch delta 39 ucmX>hcvg_pn3tDpe{D*X{YFkpc7EZE{M=Oil*HnUr2NF9l+8ZuHH-l9sSI!c delta 34 ncmX>rctViVn3tDJzbGZjY9ps5I~QL@er~Ehh}ay+Uc(3grBMmY 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 + + + + + + + + + + + + + + + +
+
+
+ Reflex +
+
+
+ +
+ +
+
+
+
+
+ +
+
+
+
+
+ +

Steps

+

1000

+
+
+
+
+ +

Calories

+

250 Calories

+
+
+
+
+
+
+ +

Sleep

+

8.5 hours

+
+
+
+
+ +

Activity

+

1 hours

+
+
+
+
+
+ +
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/flex/flex/home/templates/home/home.html b/flex/flex/home/templates/home/home.html index 26dcab1..47fe505 100644 --- a/flex/flex/home/templates/home/home.html +++ b/flex/flex/home/templates/home/home.html @@ -51,8 +51,11 @@

+

{% 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,