From b1ec762788915a855a815848efeb5b9de919a509 Mon Sep 17 00:00:00 2001
From: zevav <zev@averba.ch>
Date: Sun, 17 Sep 2017 10:16:11 -0400
Subject: [PATCH] made a lot more squares, removed the spaces between them,
 made save/ endpoint work.

---
 boards.db                 | Bin 8192 -> 8192 bytes
 models.py                 |   5 ++++-
 routes.py                 |  31 ++++++++++++++++++++++++++-----
 static/css/100_blocks.css |  15 ++++++---------
 templates/100_blocks.html |  12 +++++-------
 5 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/boards.db b/boards.db
index 2ba26d6091b9ec91bf0327664f277a9f4a568caa..8a6db1b262b0f4ed42b3c83ebb753eec9a2b61a8 100644
GIT binary patch
literal 8192
zcmeHKOK;Oa5MH+pA!$qDLKPvT<xr`SP~|+R(gRXM6_tw6f(b}Hu4Bi|)2U-Oj~i}*
zABM!QK;puWK;pvK&f4piq&9G&+F7r?JM-;${LOltym?)1nksJSMwghlfbJqeK)V<t
zgjS$0K&K+WV2MuP>ddc`6||MuT?Le|rXe`Ea0WO7oB_@NXMi)n8Q=_X1~>zp0nPwt
z;3hNh{=Sf0&twEUX%e}k$~rNWfp=cmlPcv}1=q^Ysuk?%@Mb#IRPe!Jt+HQ{@ZnJn
zAHJ<tALDeYL&myg;&)|f?|E6;e3CC^L-ro&s)1Du8(&EWFU!&~eo;Bbn@uH~&N~0i
zm(f>r=lklHm3wJ5RZM=n^*OP=_*3`+>i=5o%yI%<JlqhuxC{&oGBzyD&_<K-1xhE-
zr}l<eaNG2f<5P!^o6E*%sB4z0t6ehe+nE%9J($uU4=sIg*60t_PU}2-JApnv-4M59
zwwxHRG53!&+!5n7@AZy;&WrI{QH<9jJ>>NuSyc=|x*g3ldv+$t_c22mX*OE*(WKQ;
zTe>aXN}vyG{wHvU!IfYuIg)2|IXb4MZK@DqV~3G>cr|=+j8~^cYQJK3z(uFjdg3l-
z(4b|kVXzycYc0{`AuuSxFMT@dDZqk;F<!!6GWt-fexml2leVP|8unHKHr&2XDy+F8
z1)yuDOo?KX;b8L+*K7$qhSp6<E3xbcPTY+7EC+gL<gN6=47sE*h=xh&R0|&cJW=59
zu9LCSIPDts{)uItXP3Nc8n3pn+bw*Hcr`W`vu5s0zyHyzW;nWFR)UPiY4K`lq&x({
z%pNIqQ?@iRQj|V9&o4r*j$m^G{cZ+IK!?}e)Wfdu4+`-S4zlR>00d}?3tTxs#u0-F
z`6{^HBKUIO_y9+57;+XdFlT@JPx#k?Mey}!an(&?nG@2{P8*v2U;!%9qq!AnM*8QJ
ssTnKgsQ;<6Irq8VBoF%vX`6=99**pcz<(exlucxLaHgBRev|Zm0WKLk9RL6T

delta 80
zcmZp0XmFSy&B!!S#+i|6V?qKyv!Q{(<iq@qY>fOj82E2&Ed0hdvEhb>8Y2sXySM=e
a7#bJ@p{aopkOjg(o{0gF6_r}1U<d$pI245d

diff --git a/models.py b/models.py
index 215a893..19bcf65 100644
--- a/models.py
+++ b/models.py
@@ -14,5 +14,8 @@ class Board(Base):
     __tablename__ = 'boards'
 
     id = Column(Integer, primary_key=True)
-    layout = Column(String(100), nullable=False)
+    layout = Column(String(528), nullable=False)
     name = Column(String(50), nullable=False)
+
+    def __repr__(self):
+        return f'<Layout> name: {self.name} {self.layout}'
diff --git a/routes.py b/routes.py
index d305076..c65e322 100644
--- a/routes.py
+++ b/routes.py
@@ -1,5 +1,10 @@
+import random
+from string import ascii_lowercase
+
 from flask import Flask, render_template, request, jsonify
 
+from models import Board, session
+
 app = Flask(__name__)
 
 
@@ -8,11 +13,22 @@ def main():
     color_label_dict = {'red':'exercise',
                         'blue':'work',
                         'yellow':'admin',
-                        'green':'finance'}
+                        'green':'finance',
+                        '#2C2416':'',
+                        'black':'',
+                        '#F98D8D':'',
+                        'orange':'',
+                        'white': '',
+                        '#1a1b29': '',
+                        '#000080': '',
+                        '#333333':'',
+                        '#CF5300': '',
+                        '#8B0000': '',
+                       }
 
     colors = list(color_label_dict.keys())
     color_num_dict = {'': 0}
-    color_num_dict = {color: idx + 1 for idx, color in enumerate(colors)}
+    color_num_dict = {color: str(idx + 1).zfill(2) for idx, color in enumerate(colors)}
 
     return render_template('100_blocks.html',
                            colors=colors,
@@ -20,10 +36,15 @@ def main():
                            color_num_dict=color_num_dict)
 
 
-@app.route('/save/', methods=['POST'])
+@app.route('/save', methods=['POST'])
 def save():
-    print(vars(request.form))
-    return jsonify(vars(request.form))
+    name = ''
+    for i in range(12):
+        name += random.choice(ascii_lowercase)
+    layout = list(request.get_json().values())[0]
+    session.add(Board(layout=layout, name=name))
+    session.commit()
+    return jsonify(session.query(Board).first().layout)
 
 
 
diff --git a/static/css/100_blocks.css b/static/css/100_blocks.css
index 55119fc..6c2195f 100644
--- a/static/css/100_blocks.css
+++ b/static/css/100_blocks.css
@@ -6,28 +6,26 @@
 
 #gridcontainer
 {
-    width: 800px;
+    width: 1700px;
     line-height: 0;
     clear: both;
 }
 
-.griditem, .palette
+.griditem
 {
     display: inline-block;            
     width: 70px;
     height: 70px;
-    margin-left: 2px;
-    margin-bottom: 6px;
+    margin-left: -4px;
     background: #AAA;
-    border: 1px solid black;
 }
 
 .palette {
 
-    border-radius: 50%;
-    margin-left: 20px;
+    display: inline-block;            
     margin-top: 30px;
-    border: 2px solid black;
+    width: 70px;
+    height: 70px;
 
 }
 
@@ -37,7 +35,6 @@
     height: 90px;
     float: right;
     margin: 20px 60px 30px;
-    border: 2px solid black;
 
 }
 
diff --git a/templates/100_blocks.html b/templates/100_blocks.html
index 2435950..d24d9f8 100644
--- a/templates/100_blocks.html
+++ b/templates/100_blocks.html
@@ -41,18 +41,16 @@ function save() {
       layout += num
     } 
 
-    var data = new FormData();
-    data.append("json", JSON.stringify(layout));
-    console.log(data)
-
-    fetch("/save/", {
+    console.log(layout);
+    fetch("/save", {
 
         headers: {'Accept': 'application/json',
                   'Content-Type': 'application/json'},
         method: "POST", 
-        body: data});
+        body: JSON.stringify({layout: layout})
 
 
+})
 }
 
 
@@ -66,7 +64,7 @@ window.onload = function () {
   gridContainer = document.getElementById('gridcontainer');
   palettesDiv = document.getElementById('palettes');
 
-  for (i=0; i<100; i++) {
+  for (i=0; i<264; i++) {
   
     box = document.createElement('div');
     box.className = 'griditem';