From 5c25d366d14d6fdecd0c122b18e872f7ba789f07 Mon Sep 17 00:00:00 2001 From: Charles Suo Date: Mon, 24 Oct 2016 17:24:34 -0400 Subject: [PATCH 1/6] first try --- .DS_Store | Bin 0 -> 6148 bytes squawker/.DS_Store | Bin 0 -> 6148 bytes squawker/schema.sql | 6 ++++-- squawker/server.py | 18 ++++++++++++++---- squawker/templates/index.html | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 .DS_Store create mode 100644 squawker/.DS_Store create mode 100644 squawker/templates/index.html diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..cbbf0c086032b412b3729c268e0bc5fafbc7c89f GIT binary patch literal 6148 zcmeHK!A{#i5SQNPRzl*k*Gf5rv?*7U(j!tNSD*?|uw|=R)v{CD!K$K2KK0Pg z09yDD)c!+1rMJ%PZV)JNMWvcq&A!>$nO*y>wd(}{(Vs+{04@MHsDzCcR(A;XlP*ZZ zdI*Icqk>NmLmpPecp;h{{~`mlb`BKq872_Gjr9wYEX2M);W$x6+3EZijiu(3<)=<- zWtEEiY~{!wWtCqB<)r8b`GIb!C=RVX2+GmiexGH@wH<_eDz1j^^S4=A1}cs78>xr; zDvh$LpH0%JIP}eU`zk6&L-)lXk54dl5Tx;*DpaTvReo_=REF;QblUCp+Opf}&f0Ri zwbg0M*RS5pX6{$V*?8I8-u*D1eLFon|Ni6R^6IBq4S^r7mNkoW_=Uy-F(-bWCRzFs z`{sG`ct&P`8DIt;5d(G$b51Z}!Y z5K4=l#o8eDpa_$SXi|l}VhEFtere-8i?u}uIzL%st9fnv zy4Tv-)sKH;=VdsS^H4=DD5Ch17J|DQlz+q+4935Dh6acY_W+SNUTtdfkhk?V&BKDv#8;WQ{ znM*O44M#h7eu2Zvq74V;k`Lx)W-dcvW_BE(8+TxVMXHGbV&F0ZTej)z`~S(G^Z(01 z)FK9mf&YpD)*OU`J}$}Kt!sA3X2x)S6RFWLB(9f=&P^dJuF7h&b5LVIIJw9 Q1%-YD3=LEf1Amo)-?fc}4gdfE literal 0 HcmV?d00001 diff --git a/squawker/schema.sql b/squawker/schema.sql index 5e67ffb..2d76a3a 100644 --- a/squawker/schema.sql +++ b/squawker/schema.sql @@ -1,3 +1,5 @@ -- TODO change this -DROP TABLE IF EXISTS mytable; -CREATE TABLE mytable (id integer); +DROP TABLE IF EXISTS squawktable; +CREATE TABLE squawktable (id INTEGER PRIMARY KEY AUTOINCREMENT, + message VARCHAR(140) DEFAULT NULL, + createTime TIMESTAMP DEFAULT CURRENT_TIMESTAMP); diff --git a/squawker/server.py b/squawker/server.py index 6ff24ba..b12c910 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -1,4 +1,4 @@ -from flask import Flask, g +from flask import Flask, g, request, render_template import sqlite3 @@ -37,11 +37,21 @@ def close_connection(exception): # ------------------------------ -@app.route('/') +@app.route('/', methods=["POST", "GET"]) def root(): conn = get_db() - # TODO change this - return "Hello World!" + # To change this + if request.mode == "POST": + newmsg = request.form["user_post"] + if len(newmsg) > 140: + return "Post length error", 400 + else: + conn.execute("INSERT INTO squawktable (message) VALUE (?)", [new_post]) + conn.commit() + c = conn.cursor() + c.execute("SELECT * FROM squawktable ORDER BY createTime DESC") + msgPool = c.fetchall() + return render_template("squawk.html", msgPool=msgPool) if __name__ == '__main__': diff --git a/squawker/templates/index.html b/squawker/templates/index.html new file mode 100644 index 0000000..bf1dfea --- /dev/null +++ b/squawker/templates/index.html @@ -0,0 +1,33 @@ + + + + + Squawker + + +
+
+ + +
+
+ +
+
+
    + {% for item in content %} +
  • {{item}}
    • + {% endfor %} +
      +
      +
      + + {% for msg in allMsg %} +
      +

      {{ msg[2] }}

      +

      {{ msg[1] }}

      +
      + {% endfor %} +
      + + From f9c84ace16506fd288899ccd127f3fea42d7b33b Mon Sep 17 00:00:00 2001 From: Charles Suo Date: Mon, 24 Oct 2016 17:29:21 -0400 Subject: [PATCH 2/6] Still trying, not ready --- .DS_Store | Bin 6148 -> 6148 bytes squawker/.DS_Store | Bin 6148 -> 6148 bytes squawker/templates/index.html | 12 ++++++------ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.DS_Store b/.DS_Store index cbbf0c086032b412b3729c268e0bc5fafbc7c89f..9537cdcf37aa08938aeda760b9b680121d777bca 100644 GIT binary patch delta 20 bcmZoMXffDui;3O9Qb)naz+&@5CS_3oMaTvj delta 20 bcmZoMXffDui;3OTR7b(cz-aSBCS_3oMYIMK diff --git a/squawker/.DS_Store b/squawker/.DS_Store index 1ffdaf26649e28f3502b38732acb6d58b6a29caa..338d736b04c8fb876a34b0d2eede9b61b70d0643 100644 GIT binary patch delta 20 bcmZoMXffDuhl$<5Qb)naz+&@bCPh&IMd}6{ delta 20 bcmZoMXffDuhl$
        - {% for item in content %} -
      • {{item}}
        • + {% for post in msgPool %} +
      • {{post}}
        • {% endfor %}
          -
          - - {% for msg in allMsg %} -
          +
          + + {% for msg in msgPool %} +

          {{ msg[2] }}

          {{ msg[1] }}

          From d0025d0a1a3f293c88dea22158cb62d61c09e5ca Mon Sep 17 00:00:00 2001 From: Charles Suo Date: Mon, 24 Oct 2016 19:03:01 -0400 Subject: [PATCH 3/6] try again --- squawker/server.py | 4 ++-- squawker/templates/index.html | 33 -------------------------------- squawker/templates/squawker.html | 25 ++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 35 deletions(-) delete mode 100644 squawker/templates/index.html create mode 100644 squawker/templates/squawker.html diff --git a/squawker/server.py b/squawker/server.py index b12c910..1fac2c1 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -46,12 +46,12 @@ def root(): if len(newmsg) > 140: return "Post length error", 400 else: - conn.execute("INSERT INTO squawktable (message) VALUE (?)", [new_post]) + conn.execute("INSERT INTO squawktable (message) VALUE (?);", [newmsg]) conn.commit() c = conn.cursor() c.execute("SELECT * FROM squawktable ORDER BY createTime DESC") msgPool = c.fetchall() - return render_template("squawk.html", msgPool=msgPool) + return render_template("squawker.html", msgPool=msgPool) if __name__ == '__main__': diff --git a/squawker/templates/index.html b/squawker/templates/index.html deleted file mode 100644 index fca3958..0000000 --- a/squawker/templates/index.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - Squawker - - - -
          - - -
          -
          - -
          -
          -
            - {% for post in msgPool %} -
          • {{post}}
            • - {% endfor %} -
              -
              -
              - - {% for msg in msgPool %} -
              -

              {{ msg[2] }}

              -

              {{ msg[1] }}

              -
              - {% endfor %} -
              - - diff --git a/squawker/templates/squawker.html b/squawker/templates/squawker.html new file mode 100644 index 0000000..26713c4 --- /dev/null +++ b/squawker/templates/squawker.html @@ -0,0 +1,25 @@ + + + + + Squawker + + + +
              + + +
              +
              + +
              + +
              +
                + {% for msg in msgPool %} +
              • {{msg}}
                • + {% endfor %} +
              +
              + + From 1e43e8309fa78d1b8b90520f9a9a31ec348ebfa9 Mon Sep 17 00:00:00 2001 From: Charles Suo Date: Mon, 24 Oct 2016 20:23:20 -0400 Subject: [PATCH 4/6] trying --- .DS_Store | Bin 6148 -> 6148 bytes __init__.py | 0 schema.sql | 5 ++++ server.py | 58 ++++++++++++++++++++++++++++++++++++++++ templates/squawker.html | 25 +++++++++++++++++ 5 files changed, 88 insertions(+) create mode 100644 __init__.py create mode 100644 schema.sql create mode 100644 server.py create mode 100644 templates/squawker.html diff --git a/.DS_Store b/.DS_Store index 9537cdcf37aa08938aeda760b9b680121d777bca..54cc0b18b2ce002b9c563bbdd8a9130d4e7c6b13 100644 GIT binary patch delta 266 zcmZoMXfc=|#>B!ku~2NHo+2a1#(>?7ixZfcChDF^W_AvK4xmpr2Qq(Wp3E=e$ic|Kzyz{>bA-qmW&jNHH?sf$ delta 70 zcmZoMXfc=|#>B)qu~2NHo+2aD#(>?7lMO^zHuJMsGESCdf3;bG<0|uJb`E|HpsLM+ Y9N(EI^NTogFaQA~0|U$E2$40+0EGz 140: + return "Post length error", 400 + else: + conn.execute("INSERT INTO squawktable (message) VALUE (?);", [newmsg]) + conn.commit() + c = conn.cursor() + c.execute("SELECT * FROM squawktable ORDER BY createTime DESC") + msgPool = c.fetchall() + return render_template("squawker.html", msgPool=msgPool) + + +if __name__ == '__main__': + app.run() diff --git a/templates/squawker.html b/templates/squawker.html new file mode 100644 index 0000000..26713c4 --- /dev/null +++ b/templates/squawker.html @@ -0,0 +1,25 @@ + + + + + Squawker + + +
              +
              + + +
              +
              + +
              +
              +
              +
                + {% for msg in msgPool %} +
              • {{msg}}
                • + {% endfor %} +
              +
              + + From 0025deecec287895a66d752a0b2a930235e91c92 Mon Sep 17 00:00:00 2001 From: Charles Suo Date: Mon, 24 Oct 2016 20:27:39 -0400 Subject: [PATCH 5/6] try --- .DS_Store | Bin 6148 -> 6148 bytes __init__.py | 0 schema.sql | 5 ---- server.py | 58 ---------------------------------------- templates/squawker.html | 25 ----------------- 5 files changed, 88 deletions(-) delete mode 100644 __init__.py delete mode 100644 schema.sql delete mode 100644 server.py delete mode 100644 templates/squawker.html diff --git a/.DS_Store b/.DS_Store index 54cc0b18b2ce002b9c563bbdd8a9130d4e7c6b13..cd66ff39f35a386b0c4254d116338c434c1a8619 100644 GIT binary patch delta 82 zcmZoMXfc=|#>B)qu~2NHo+2aD#(>?7lMO^zCiAnL;xI8W*HJJuGoSpBC4I6i`>V|g l99Nk)vvcrs0Cj8@K_85meLM~JLp1^|@b6kz}W delta 290 zcmZoMXfc=|#>B!ku~2NHo+2a1#(>?7ixZfcChD 140: - return "Post length error", 400 - else: - conn.execute("INSERT INTO squawktable (message) VALUE (?);", [newmsg]) - conn.commit() - c = conn.cursor() - c.execute("SELECT * FROM squawktable ORDER BY createTime DESC") - msgPool = c.fetchall() - return render_template("squawker.html", msgPool=msgPool) - - -if __name__ == '__main__': - app.run() diff --git a/templates/squawker.html b/templates/squawker.html deleted file mode 100644 index 26713c4..0000000 --- a/templates/squawker.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - Squawker - - -
              -
              - - -
              -
              - -
              -
              -
              -
                - {% for msg in msgPool %} -
              • {{msg}}
                • - {% endfor %} -
              -
              - - From cfb04d0064944af4e35b1f04014ef35053cc20a6 Mon Sep 17 00:00:00 2001 From: Charles Suo Date: Mon, 24 Oct 2016 20:51:10 -0400 Subject: [PATCH 6/6] submit --- .DS_Store | Bin 6148 -> 6148 bytes squawker/server.py | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.DS_Store b/.DS_Store index cd66ff39f35a386b0c4254d116338c434c1a8619..d7cc19256ba2757924905ac370a6a3e516afdcdb 100644 GIT binary patch delta 21 ccmZoMXffDulZnH~$Wlka(86N#LndWW085kxQ~&?~ delta 21 ccmZoMXffDulZnH`#9T+g(9C@ELndWW085+(Qvd(} diff --git a/squawker/server.py b/squawker/server.py index 1fac2c1..70407a3 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -40,13 +40,12 @@ def close_connection(exception): @app.route('/', methods=["POST", "GET"]) def root(): conn = get_db() - # To change this - if request.mode == "POST": + if request.method == "POST": newmsg = request.form["user_post"] if len(newmsg) > 140: return "Post length error", 400 else: - conn.execute("INSERT INTO squawktable (message) VALUE (?);", [newmsg]) + conn.execute("INSERT INTO squawktable (message) VALUES(?)", [newmsg]) conn.commit() c = conn.cursor() c.execute("SELECT * FROM squawktable ORDER BY createTime DESC")