From 4a8ac522012fe5ea3b26b657cf9f489fe78096dd Mon Sep 17 00:00:00 2001
From: Raphael Maenle <raphael@maenle.net>
Date: Mon, 18 May 2020 23:52:18 +0200
Subject: [PATCH] backend now uses calendar_id and this is the frontend upgrade

- calendar_id is unique and therefore creates less problems
- changing id of DOM from item.name to calendar_id
---
 README.md                     |  13 ++++++++++++-
 app.db                        | Bin 45056 -> 49152 bytes
 backend                       |   2 +-
 server/googleHandler.py       |   7 ++++---
 server/models.py              |   6 +++---
 server/routes.py              |  12 +++++++-----
 server/template/calendar.html |   9 ++++-----
 7 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 8989126..5ab0ea2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,15 @@
 ### summary:
 
 this repository includes the webpage frontend for the calendar watch server
-it gets served via a python server 
\ No newline at end of file
+it gets served via a python server 
+
+### app description:
+
+Longitude is a 24h slow watch-face.
+The Sun moves around the watch over the course of the day, while the planet completes a rotation every hour. Add your Calendar via a web-platform, so that every glance at your watch shows a summary of your day.
+
+Version 0.1 (beta):
+- This version of the watchface includes the sun and the planet for time visualization
+
+Future (beta):
+- The next version will add support for connecting the device to the web platform 
diff --git a/app.db b/app.db
index b9794f2dcb97b6c11a3a870f183f0911221e5af6..c834ba8fe557b707439e5bd950ecccf13463b264 100644
GIT binary patch
delta 666
zcmZp8z|_#dJVBZ_je&uI2Z|XdYM3*oZA@6GugxjKAjH0jk$*0~4PPQ3BkuxU2cBy@
zxm*u9mAM_c7jczy@p7(Z-^8(s!)Ie-8#`yCxB$C(BXg<v<c$_$lZ`F&dE63nic^(c
z&CH$6jVJq9oRHwkXW$1~1OtuiTp%5x5FLxH<Doj7j4fSUoF=ceJS4!~!oUGip3VzW
zDGE{9Yh}+1G27DB%+k?~dor(0!emElXBHk_2DyojQXH8)Amx$}<zKBF1t7{@EDW8@
z41mTZOl*wVoNF_~n3Xw%fjMMi<1<cvA+WRfxhFb`Gx2@e*r>_K#Cv>Wqc|hqOie~^
zb4|lWQ{JW3U7nK-^F${<C_BxTmS$j(oIH7Bxx-|h%Jq{MRHz{dF<MS;s1ljXRuK(l
zl~rhM-d$PD$m5$>l$@HQ5SCe-Su$C_T9M7%*~!?%2x^Y#<ki)DlZ7k%fM$wLmaXBN
ze78n$^14c1HWyvTqRd3F4g+ILCs$LL4xk0>6;UAdjE0ltYP9)W5;Jou6@p6=^HLN-
z3$W<mH#E>uP|D5BD=kS?vQjXbys*l7^7<NXkQr!lCX)rLWpUe$rrH$QBql@S$>kNA
htRb0Isd-pjG5I{ucTk^hcC6iRv{_K#KL5lCiU2a(#FYR5

delta 394
zcmZo@U~YK8G(nozi-CcG8;HSRqJ}x6*T#f}`r1IQ5Qh%~|6G0>zC=Do-UYl4JlA+~
zd3d>7xE;B!bLDgKa<1hR;aJ7tv$0WuW3rFM364fF0e167=F-U<EW{^YG|%S_DJo4>
zb~Q71HaDKU*76X08ZSs*6f8g0%3cU8Z|Q1g>FAch1Co*iOC7LwglKiKFmy6AnCxin
z%+bik1yT?SR^VhA4^iM`Z0X|SH2I-b!sc9?8OE$^dl}gFZfq=PVd8Gw*l5MXGs%IG
z+g#JI(Uf<F=H!IpM{E|ZMkbDqlWnUU7|kbts1lhxw<H?M;w=q8NQVL?W^E2CD`sRY
zo~&4+IQe3k_2dmT++ek$ll>}qC!eVhocylF4yt=!1>fXXm2zAfdHD(<nI$=?nwZ)c
SO(!3ykcDd!-RxAm&j<h$Lw<Mw

diff --git a/backend b/backend
index 804ab33..ba912de 160000
--- a/backend
+++ b/backend
@@ -1 +1 @@
-Subproject commit 804ab33a6d07b34c2f0942a63c71f652dfb067f3
+Subproject commit ba912de7f312f130e6916f067c15585143dfd6c2
diff --git a/server/googleHandler.py b/server/googleHandler.py
index 62cbd36..b36b089 100644
--- a/server/googleHandler.py
+++ b/server/googleHandler.py
@@ -94,21 +94,22 @@ def get_google_provider_cfg():
     return requests.get(GOOGLE_DISCOVERY_URL).json()
 
 class Calendar:
-    def __init__(self, name, toggle='False', color="#000000"):
+    def __init__(self, name, calendarId, toggle='False', color="#000000"):
         self.name = name
         self.color = color
         self.toggle=toggle
+        self.calendarId = calendarId
 
 def calendarsFromDb():
     calendars = dbCalendar.getCalendars(dbCalendar, current_user.id)
     pyCalendars = []
     for calendar in calendars:
         name = calendar.name
-        # calId = calendar.calendar_id
+        calendarId = calendar.calendar_id
         toggle = calendar.toggle
         color = calendar.color
 
-        pyCalendars.append(Calendar(name, toggle, color))
+        pyCalendars.append(Calendar(name, calendarId, toggle, color))
 
     return pyCalendars
 
diff --git a/server/models.py b/server/models.py
index 245f1a5..b28cbce 100644
--- a/server/models.py
+++ b/server/models.py
@@ -68,12 +68,12 @@ class Calendar(db.Model):
         return calendar
     
     @staticmethod
-    def updateCalendar(user_id, calendar_name, toggle=None, color=None):
+    def updateCalendar(user_id, calendar_id, toggle=None, color=None):
 
-        calendar = Calendar.query.filter(Calendar.usr_id==user_id, Calendar.name==calendar_name).first()
+        calendar = Calendar.query.filter(Calendar.usr_id==user_id, Calendar.calendar_id==calendar_id).first()
 
 
-        print("updating")
+        print("updating", flush=True)
         if(toggle != None):
             print(toggle)
             calendar.toggle = toggle
diff --git a/server/routes.py b/server/routes.py
index 49d5d6a..7d7e2cb 100644
--- a/server/routes.py
+++ b/server/routes.py
@@ -148,15 +148,17 @@ def downloader(user):
 @login_required
 def user():
     if request.method == 'POST':
-        calName = request.json.get('calendar_id')
-        color = request.json.get('color')
-        toggle = request.json.get('toggle')
+        calId = request.json.get('calendar_id')
+        color = request.json.get('color', None)
+        toggle = request.json.get('toggle', None)
         
+        print(request.json, flush=True)
         if color != None:
-            Calendar.updateCalendar(current_user.id, calName, color=color)
+            Calendar.updateCalendar(current_user.id, calId, color=color)
         if toggle != None:
-            Calendar.updateCalendar(current_user.id, calName, toggle=toggle)
+            Calendar.updateCalendar(current_user.id, calId, toggle=toggle)
         # toggle specific calendar of user
+        
     elif request.method == 'DELETE':
         # do nothing
         return 'NONE'
diff --git a/server/template/calendar.html b/server/template/calendar.html
index 959e264..5bef014 100644
--- a/server/template/calendar.html
+++ b/server/template/calendar.html
@@ -17,14 +17,14 @@
         <div style="width: 30%; float: left">
             <!-- Rounded switch -->
             <label class="switch">
-                <input class="toggle" id={{item.name}} type="checkbox" toggled={{item.toggle}} onclick="toggleReaction(this)">
+                <input class="toggle" id={{item.calendarId}} type="checkbox" toggled={{item.toggle}} onclick="toggleReaction(this)">
                 <span class="slider round"></span>
             </label>
         </div>
 
         <!--Color Selector-->
         <div style="width: 30%; float: left">
-        <div class="colorPickSelector" id={{item.name}}  defaultColor={{item.color}}></div>
+        <div class="colorPickSelector" id={{item.calendarId}}  defaultColor={{item.color}}></div>
             <!--svg height="20" width="20">
                 <circle cx="10" cy="10" r="10" stroke="black" stroke-width="0" fill={{ item.color }} />
             </svg--> 
@@ -73,7 +73,6 @@
 
     ($(".colorPickSelector").each(function() {
         // console.log($( this )[0].attributes.getNamedItem("style"));
-
         var color = $( this )[0].attributes.getNamedItem("defaultcolor").nodeValue;
         var style = document.createAttribute("style");
         style.value = 'background-color: ' + color + '; color: ' + color + ';';
@@ -84,7 +83,7 @@
     }));
 
     function post(type, id, data) {
-        var url = "https://192.168.68.103.xip.io:1234/calendar";
+        var url = "calendar";
         var method = "POST";
         switch (type) {
             case "color":
@@ -125,4 +124,4 @@
     init = true;
 </script>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}