From b3e9465610b59cb1987c64228eace5578ae5007a Mon Sep 17 00:00:00 2001 From: gautamc1106 Date: Mon, 24 Oct 2016 22:10:35 +0000 Subject: [PATCH 01/27] First Commit --- squawker/schema.sql | 3 +-- squawker/server.py | 16 +++++++++++++--- squawker/templates/index.html | 24 ++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 squawker/templates/index.html diff --git a/squawker/schema.sql b/squawker/schema.sql index 5e67ffb..e0e2e8b 100644 --- a/squawker/schema.sql +++ b/squawker/schema.sql @@ -1,3 +1,2 @@ --- TODO change this DROP TABLE IF EXISTS mytable; -CREATE TABLE mytable (id integer); +CREATE TABLE mytable (id INTEGER PRIMARY KEY AUTOINCREMENT, squawk VARCHAR(140) NOT NULL, createTime TIMESTAMP DEFAULT CURRENT_TIMESTAMP); diff --git a/squawker/server.py b/squawker/server.py index 6ff24ba..a994204 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -37,11 +37,21 @@ def close_connection(exception): # ------------------------------ -@app.route('/') +@app.route('/', methods=['GET','POST']) def root(): conn = get_db() - # TODO change this - return "Hello World!" + c = conn.cursor() + if request.method == "POST": + post = request.form.get("squawker_post") + if len(post) > 140: + return "Squacker should less than 140 characters!" + abort(400) + elif len(post)>0 and len(message)<=140: + c.execute("INSERT INTO squawks (post) VALUES(?);", [post]) + conn.commit() + c.execute("SELECT * FROM mytable ORDER BY createTime DESC") + squawks = c.fetchall() + return render_template("index.html", squawks=sqauwks) if __name__ == '__main__': diff --git a/squawker/templates/index.html b/squawker/templates/index.html new file mode 100644 index 0000000..17547d2 --- /dev/null +++ b/squawker/templates/index.html @@ -0,0 +1,24 @@ + + + + + My Squawker + + +
+
+ + +
+
+ +
+
+
    + {% for item in content %} +
  • {{item}}
    • + {% endfor %} +
      +
      + + From 3d45ed6e409799880cb4a90e3acca24bf22323ec Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 18:41:39 -0400 Subject: [PATCH 02/27] Update server.py --- squawker/server.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/squawker/server.py b/squawker/server.py index a994204..d7d610d 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -42,13 +42,12 @@ def root(): conn = get_db() c = conn.cursor() if request.method == "POST": - post = request.form.get("squawker_post") + post = request.form.get("squawker_post") if len(post) > 140: - return "Squacker should less than 140 characters!" - abort(400) - elif len(post)>0 and len(message)<=140: - c.execute("INSERT INTO squawks (post) VALUES(?);", [post]) - conn.commit() + abort(400) + elif len(post)>0 and len(message)<=140: + c.execute("INSERT INTO mytable (post) VALUES(?);", [post]) + conn.commit() c.execute("SELECT * FROM mytable ORDER BY createTime DESC") squawks = c.fetchall() return render_template("index.html", squawks=sqauwks) From fb06027199dd2e856dc5322f794c5662727d4fa5 Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 18:42:54 -0400 Subject: [PATCH 03/27] Update server.py --- squawker/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squawker/server.py b/squawker/server.py index d7d610d..e6ad1c8 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -46,7 +46,7 @@ def root(): if len(post) > 140: abort(400) elif len(post)>0 and len(message)<=140: - c.execute("INSERT INTO mytable (post) VALUES(?);", [post]) + c.execute("INSERT INTO mytable (squawk) VALUES(?);", [post]) conn.commit() c.execute("SELECT * FROM mytable ORDER BY createTime DESC") squawks = c.fetchall() From 161f0eb8d841068baa940ad108da207256b35354 Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 18:57:43 -0400 Subject: [PATCH 04/27] Update schema.sql --- squawker/schema.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squawker/schema.sql b/squawker/schema.sql index e0e2e8b..701e184 100644 --- a/squawker/schema.sql +++ b/squawker/schema.sql @@ -1,2 +1,2 @@ DROP TABLE IF EXISTS mytable; -CREATE TABLE mytable (id INTEGER PRIMARY KEY AUTOINCREMENT, squawk VARCHAR(140) NOT NULL, createTime TIMESTAMP DEFAULT CURRENT_TIMESTAMP); +CREATE TABLE mytable (id INTEGER PRIMARY KEY AUTOINCREMENT, squawk VARCHAR(140) NOT NULL); From e8478645ff5f661f85be7a4f43f5d7cd25975e43 Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 19:02:16 -0400 Subject: [PATCH 05/27] Update server.py --- squawker/server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/squawker/server.py b/squawker/server.py index e6ad1c8..cada90d 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -42,13 +42,13 @@ def root(): conn = get_db() c = conn.cursor() if request.method == "POST": - post = request.form.get("squawker_post") + post = request.form.get('squawker_post') if len(post) > 140: abort(400) elif len(post)>0 and len(message)<=140: c.execute("INSERT INTO mytable (squawk) VALUES(?);", [post]) conn.commit() - c.execute("SELECT * FROM mytable ORDER BY createTime DESC") + c.execute("SELECT * FROM mytable ORDER BY id DESC") squawks = c.fetchall() return render_template("index.html", squawks=sqauwks) From 08c6869921f59ff78579b432fd743657d4780b95 Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 19:03:39 -0400 Subject: [PATCH 06/27] Update index.html --- squawker/templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squawker/templates/index.html b/squawker/templates/index.html index 17547d2..58284c7 100644 --- a/squawker/templates/index.html +++ b/squawker/templates/index.html @@ -15,7 +15,7 @@
        - {% for item in content %} + {% for item in squawks %}
      • {{item}}
        • {% endfor %}
          From d214c80898dfa68297c821333543b4eeb0d49744 Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 19:04:09 -0400 Subject: [PATCH 07/27] Update server.py --- squawker/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squawker/server.py b/squawker/server.py index cada90d..4dc497f 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -46,7 +46,7 @@ def root(): if len(post) > 140: abort(400) elif len(post)>0 and len(message)<=140: - c.execute("INSERT INTO mytable (squawk) VALUES(?);", [post]) + c.execute("INSERT INTO mytable (post) VALUES(?);", [post]) conn.commit() c.execute("SELECT * FROM mytable ORDER BY id DESC") squawks = c.fetchall() From 54c6035ae5b27699046a2e8c9336ac2c944c5b4a Mon Sep 17 00:00:00 2001 From: gautamc1106 Date: Mon, 24 Oct 2016 23:11:01 +0000 Subject: [PATCH 08/27] Second commit --- squawker/server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/squawker/server.py b/squawker/server.py index 4dc497f..bbe7cd2 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -45,8 +45,8 @@ def root(): post = request.form.get('squawker_post') if len(post) > 140: abort(400) - elif len(post)>0 and len(message)<=140: - c.execute("INSERT INTO mytable (post) VALUES(?);", [post]) + elif len(post)>0 and len(post)<=140: + c.execute("INSERT INTO mytable (squawk) VALUES(?);", [post]) conn.commit() c.execute("SELECT * FROM mytable ORDER BY id DESC") squawks = c.fetchall() From 3240675f9d7523c7a220eba7b7efa9a6ff1f35b3 Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 19:30:35 -0400 Subject: [PATCH 09/27] Update server.py --- squawker/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squawker/server.py b/squawker/server.py index bbe7cd2..7923fe6 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -50,7 +50,7 @@ def root(): conn.commit() c.execute("SELECT * FROM mytable ORDER BY id DESC") squawks = c.fetchall() - return render_template("index.html", squawks=sqauwks) + return render_template("index.html", squawks=squawks) if __name__ == '__main__': From 1cc5f6820edff5575b28b208e2c35bd3ed1be792 Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 19:35:50 -0400 Subject: [PATCH 10/27] Update server.py --- squawker/server.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/squawker/server.py b/squawker/server.py index 7923fe6..4f6fef0 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -39,18 +39,18 @@ def close_connection(exception): @app.route('/', methods=['GET','POST']) def root(): - conn = get_db() - c = conn.cursor() - if request.method == "POST": + conn = get_db() + c = conn.cursor() + if request.method == "POST": post = request.form.get('squawker_post') - if len(post) > 140: - abort(400) - elif len(post)>0 and len(post)<=140: - c.execute("INSERT INTO mytable (squawk) VALUES(?);", [post]) - conn.commit() - c.execute("SELECT * FROM mytable ORDER BY id DESC") - squawks = c.fetchall() - return render_template("index.html", squawks=squawks) + if len(post) > 140: + abort(400) + elif len(post)>0 and len(post)<=140: + c.execute("INSERT INTO mytable (squawk) VALUES(?);", [post]) + conn.commit() + c.execute("SELECT * FROM mytable ORDER BY id DESC") + squawks = c.fetchall() + return render_template("index.html", squawks=squawks) if __name__ == '__main__': From 693fef18324e1d4f221c0f24730981589a721a9d Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 19:43:11 -0400 Subject: [PATCH 11/27] Update index.html --- squawker/templates/index.html | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/squawker/templates/index.html b/squawker/templates/index.html index 58284c7..ec706ef 100644 --- a/squawker/templates/index.html +++ b/squawker/templates/index.html @@ -8,17 +8,18 @@
          - -
          + +
          -
          +
            {% for item in squawks %}
          • {{item}}
            • {% endfor %} -
              -
              +
            +
          + From 0648e1a33c114be0bbd22e7bf3e8979c4e98587a Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 19:47:47 -0400 Subject: [PATCH 12/27] Update server.py --- squawker/server.py | 50 +++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/squawker/server.py b/squawker/server.py index 4f6fef0..496dedc 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -7,33 +7,33 @@ def get_db(): - if not hasattr(g, 'sqlite_db'): - db_name = app.config.get('DATABASE', 'squawker.db') - g.sqlite_db = sqlite3.connect(db_name) + if not hasattr(g, 'sqlite_db'): + db_name = app.config.get('DATABASE', 'squawker.db') + g.sqlite_db = sqlite3.connect(db_name) - return g.sqlite_db + return g.sqlite_db def init_db(): - with app.app_context(): - db = get_db() - with app.open_resource('schema.sql', mode='r') as f: - db.cursor().executescript(f.read()) - db.commit() + with app.app_context(): + db = get_db() + with app.open_resource('schema.sql', mode='r') as f: + db.cursor().executescript(f.read()) + db.commit() @app.cli.command('initdb') def initdb_command(): - """Creates the database tables.""" - init_db() - print('Initialized the database.') + """Creates the database tables.""" + init_db() + print('Initialized the database.') @app.teardown_appcontext def close_connection(exception): - db = getattr(g, 'sqlite_db', None) - if db is not None: - db.close() + db = getattr(g, 'sqlite_db', None) + if db is not None: + db.close() # ------------------------------ @@ -42,16 +42,16 @@ def root(): conn = get_db() c = conn.cursor() if request.method == "POST": - post = request.form.get('squawker_post') - if len(post) > 140: - abort(400) - elif len(post)>0 and len(post)<=140: - c.execute("INSERT INTO mytable (squawk) VALUES(?);", [post]) - conn.commit() - c.execute("SELECT * FROM mytable ORDER BY id DESC") - squawks = c.fetchall() - return render_template("index.html", squawks=squawks) + post = request.form.get('squawker_post') + if len(post) > 140: + abort(400) + elif len(post)>0 and len(post)<=140: + c.execute("INSERT INTO mytable (squawk) VALUES(?);", [post]) + conn.commit() + c.execute("SELECT * FROM mytable ORDER BY id DESC") + squawker = c.fetchall() + return render_template("index.html", squawks=squawker) if __name__ == '__main__': - app.run() + app.run() From 063e2048f76ca34f9608fb3ba5997eda77e41a6c Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 19:55:29 -0400 Subject: [PATCH 13/27] Update server.py --- squawker/server.py | 57 +++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/squawker/server.py b/squawker/server.py index 496dedc..1c15055 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -7,51 +7,52 @@ def get_db(): - if not hasattr(g, 'sqlite_db'): - db_name = app.config.get('DATABASE', 'squawker.db') - g.sqlite_db = sqlite3.connect(db_name) + if not hasattr(g, 'sqlite_db'): + db_name = app.config.get('DATABASE', 'squawker.db') + g.sqlite_db = sqlite3.connect(db_name) - return g.sqlite_db + return g.sqlite_db def init_db(): - with app.app_context(): - db = get_db() - with app.open_resource('schema.sql', mode='r') as f: - db.cursor().executescript(f.read()) - db.commit() + with app.app_context(): + db = get_db() + with app.open_resource('schema.sql', mode='r') as f: + db.cursor().executescript(f.read()) + db.commit() @app.cli.command('initdb') def initdb_command(): - """Creates the database tables.""" - init_db() - print('Initialized the database.') + """Creates the database tables.""" + init_db() + print('Initialized the database.') @app.teardown_appcontext def close_connection(exception): - db = getattr(g, 'sqlite_db', None) - if db is not None: - db.close() + db = getattr(g, 'sqlite_db', None) + if db is not None: + db.close() # ------------------------------ -@app.route('/', methods=['GET','POST']) +@app.route('/') def root(): - conn = get_db() + conn = get_db() c = conn.cursor() - if request.method == "POST": - post = request.form.get('squawker_post') - if len(post) > 140: - abort(400) - elif len(post)>0 and len(post)<=140: - c.execute("INSERT INTO mytable (squawk) VALUES(?);", [post]) - conn.commit() - c.execute("SELECT * FROM mytable ORDER BY id DESC") - squawker = c.fetchall() - return render_template("index.html", squawks=squawker) + if request.method == "POST": + post = request.form.get('squawker_post') + if len(post) > 140: + abort(400) + elif len(post)>0 and len(post)<=140: + c.execute("INSERT INTO mytable (squawk) VALUES(?);", [post]) + conn.commit() + c.execute("SELECT * FROM mytable ORDER BY id DESC") + squawker = c.fetchall() + return render_template("index.html", squawks=squawker) + if __name__ == '__main__': - app.run() + app.run() From da7119b21ccf140804b53a1884267de664c3100a Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 19:56:20 -0400 Subject: [PATCH 14/27] Update server.py --- squawker/server.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/squawker/server.py b/squawker/server.py index 1c15055..80c1cb6 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -39,18 +39,18 @@ def close_connection(exception): @app.route('/') def root(): - conn = get_db() + conn = get_db() c = conn.cursor() - if request.method == "POST": - post = request.form.get('squawker_post') - if len(post) > 140: - abort(400) + if request.method == "POST": + post = request.form.get('squawker_post') + if len(post) > 140: + abort(400) elif len(post)>0 and len(post)<=140: - c.execute("INSERT INTO mytable (squawk) VALUES(?);", [post]) + c.execute("INSERT INTO mytable (squawk) VALUES(?);", [post]) conn.commit() - c.execute("SELECT * FROM mytable ORDER BY id DESC") - squawker = c.fetchall() - return render_template("index.html", squawks=squawker) + c.execute("SELECT * FROM mytable ORDER BY id DESC") + squawker = c.fetchall() + return render_template("index.html", squawks=squawker) From 44b672c0dd0ecb0302d38b27c160047c886c6246 Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 20:00:26 -0400 Subject: [PATCH 15/27] Update server.py --- squawker/server.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/squawker/server.py b/squawker/server.py index 80c1cb6..0a2de39 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -37,20 +37,20 @@ def close_connection(exception): # ------------------------------ -@app.route('/') +@app.route('/', methods=["POST", "GET"]) def root(): - conn = get_db() - c = conn.cursor() - if request.method == "POST": - post = request.form.get('squawker_post') - if len(post) > 140: - abort(400) - elif len(post)>0 and len(post)<=140: - c.execute("INSERT INTO mytable (squawk) VALUES(?);", [post]) - conn.commit() - c.execute("SELECT * FROM mytable ORDER BY id DESC") - squawker = c.fetchall() - return render_template("index.html", squawks=squawker) + conn = get_db() + c = conn.cursor() + if request.method == "POST": + post = request.form["squawk_message"] + if len(post) > 140: + abort(400) + else: + c.execute("INSERT INTO mytable (squawk) VALUES (?)", [post]) + conn.commit() + c.execute("SELECT * FROM mytable ORDER BY id DESC") + squawkers = c.fetchall() + return render_template("index.html", squawks=squawkers) From c894d0abda0d5e88b198fcd0b199ae7556335b11 Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 20:01:37 -0400 Subject: [PATCH 16/27] Update index.html --- squawker/templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squawker/templates/index.html b/squawker/templates/index.html index ec706ef..73b91e6 100644 --- a/squawker/templates/index.html +++ b/squawker/templates/index.html @@ -8,7 +8,7 @@
          - +
          From 4ecb1a3a3d40669b335b59a9f12418ecae3f084c Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 20:02:04 -0400 Subject: [PATCH 17/27] Update server.py --- squawker/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squawker/server.py b/squawker/server.py index 0a2de39..ef5c6cb 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -42,7 +42,7 @@ def root(): conn = get_db() c = conn.cursor() if request.method == "POST": - post = request.form["squawk_message"] + post = request.form["squawk_post"] if len(post) > 140: abort(400) else: From 65d7753c29c1e93475134cf14aee230d65d32904 Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 20:08:43 -0400 Subject: [PATCH 18/27] Update index.html --- squawker/templates/index.html | 46 ++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/squawker/templates/index.html b/squawker/templates/index.html index 73b91e6..c8b9dc9 100644 --- a/squawker/templates/index.html +++ b/squawker/templates/index.html @@ -1,25 +1,31 @@ - - - My Squawker - - - -
          - - + + + My Squawker + + +
          + +
          + + +
          +
          + +
          +
          -
          - -
          -
          -
            - {% for item in squawks %} -
          • {{item}}
            • +
            +
            +
            + + {% for msg in squawks %} +
            +

            {{ msg[2] }}

            +

            {{ msg[1] }}

            +
            {% endfor %} -
          -
          - - +
          + From ffbceb98c1c8967893e98792e5d57ae115c5468e Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 20:11:54 -0400 Subject: [PATCH 19/27] Update server.py --- squawker/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squawker/server.py b/squawker/server.py index ef5c6cb..bf8b77b 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -42,7 +42,7 @@ def root(): conn = get_db() c = conn.cursor() if request.method == "POST": - post = request.form["squawk_post"] + post = request.form.get["squawk_post"] if len(post) > 140: abort(400) else: From 7ebb14bc82bdf006661e4c7df3745daac119a34f Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 20:19:43 -0400 Subject: [PATCH 20/27] Update index.html --- squawker/templates/index.html | 48 +++++++++++++++-------------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/squawker/templates/index.html b/squawker/templates/index.html index c8b9dc9..9feff73 100644 --- a/squawker/templates/index.html +++ b/squawker/templates/index.html @@ -1,31 +1,23 @@ - - - - My Squawker - - -
          -
          -
          - - -
          -
          - -
          -
          -
          -
          -
          -
          - - {% for msg in squawks %} -
          -

          {{ msg[2] }}

          -

          {{ msg[1] }}

          -
          + + + Squawker Homepage + + +
          +
          + + +
          +
          + +
          +
          +
            + {% for item in content %} +
          • {{item}}
            • {% endfor %} -
          - +
            +
            + From e03b280cba5ff44e8463744d75036526f15af7cf Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 20:23:41 -0400 Subject: [PATCH 21/27] Update index.html --- squawker/templates/index.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/squawker/templates/index.html b/squawker/templates/index.html index 9feff73..601528c 100644 --- a/squawker/templates/index.html +++ b/squawker/templates/index.html @@ -8,16 +8,18 @@
            -
            +
            -
            +
            +
              - {% for item in content %} + {% for item in squawks %}
            • {{item}}
              • {% endfor %} -
                -
                +
              +
            + From 137903db475fe92305c726c90a62dd3d9c8104b0 Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 20:24:27 -0400 Subject: [PATCH 22/27] Update index.html --- squawker/templates/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/squawker/templates/index.html b/squawker/templates/index.html index 601528c..0c07958 100644 --- a/squawker/templates/index.html +++ b/squawker/templates/index.html @@ -1,13 +1,13 @@ - Squawker Homepage + My Squawker
            - +
            From abfbc897f855cb797b65865e0708e44b38257b7a Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Mon, 24 Oct 2016 20:27:35 -0400 Subject: [PATCH 23/27] Update index.html --- squawker/templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squawker/templates/index.html b/squawker/templates/index.html index 0c07958..6fbe258 100644 --- a/squawker/templates/index.html +++ b/squawker/templates/index.html @@ -10,7 +10,7 @@
            - +
            From 9380f53a38d0cc76bf38dda899cd7ed31fec39df Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Tue, 1 Nov 2016 19:23:47 -0400 Subject: [PATCH 24/27] final --- squawker/schema.sql | 2 +- squawker/server.py | 6 +++--- squawker/templates/index.html | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/squawker/schema.sql b/squawker/schema.sql index 701e184..968329d 100644 --- a/squawker/schema.sql +++ b/squawker/schema.sql @@ -1,2 +1,2 @@ DROP TABLE IF EXISTS mytable; -CREATE TABLE mytable (id INTEGER PRIMARY KEY AUTOINCREMENT, squawk VARCHAR(140) NOT NULL); +CREATE TABLE mytable (id INTEGER PRIMARY KEY AUTOINCREMENT, squawk VARCHAR(140) DEFAULT NULL); diff --git a/squawker/server.py b/squawker/server.py index bf8b77b..5cbe157 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -40,7 +40,6 @@ def close_connection(exception): @app.route('/', methods=["POST", "GET"]) def root(): conn = get_db() - c = conn.cursor() if request.method == "POST": post = request.form.get["squawk_post"] if len(post) > 140: @@ -48,9 +47,10 @@ def root(): else: c.execute("INSERT INTO mytable (squawk) VALUES (?)", [post]) conn.commit() + c = conn.cursor() c.execute("SELECT * FROM mytable ORDER BY id DESC") - squawkers = c.fetchall() - return render_template("index.html", squawks=squawkers) + squawks = c.fetchall() + return render_template("index.html", squawks=squawks) diff --git a/squawker/templates/index.html b/squawker/templates/index.html index 6fbe258..cace0bc 100644 --- a/squawker/templates/index.html +++ b/squawker/templates/index.html @@ -4,7 +4,7 @@ My Squawker -
            +
            @@ -14,7 +14,7 @@
            -
              +
                {% for item in squawks %}
              • {{item}}
                • {% endfor %} From 99489ccc3d3744acf807c4b202145f2bc5a2bac2 Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Tue, 1 Nov 2016 19:33:29 -0400 Subject: [PATCH 25/27] final --- squawker/server.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/squawker/server.py b/squawker/server.py index 5cbe157..2577746 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 @@ -41,18 +41,17 @@ def close_connection(exception): def root(): conn = get_db() if request.method == "POST": - post = request.form.get["squawk_post"] + post = request.form["squawk_post"] if len(post) > 140: abort(400) else: - c.execute("INSERT INTO mytable (squawk) VALUES (?)", [post]) + conn.execute("INSERT INTO mytable (squawk) VALUES(?)", [post]) conn.commit() - c = conn.cursor() + c = conn.cursor() c.execute("SELECT * FROM mytable ORDER BY id DESC") squawks = c.fetchall() return render_template("index.html", squawks=squawks) - if __name__ == '__main__': - app.run() + app.run() From 02423d5fbc74ada5699d3f4a0571af4b93be13e0 Mon Sep 17 00:00:00 2001 From: Gautam Chheda Date: Tue, 1 Nov 2016 19:46:43 -0400 Subject: [PATCH 26/27] Update server.py --- squawker/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squawker/server.py b/squawker/server.py index 2577746..ee00fd8 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -54,4 +54,4 @@ def root(): if __name__ == '__main__': - app.run() + app.run() From 262bc1f3df45f3d6078e7bca3217748a41f62709 Mon Sep 17 00:00:00 2001 From: gautamc1106 Date: Tue, 1 Nov 2016 23:51:47 +0000 Subject: [PATCH 27/27] b --- squawker/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squawker/server.py b/squawker/server.py index 2577746..7c0badf 100644 --- a/squawker/server.py +++ b/squawker/server.py @@ -43,7 +43,7 @@ def root(): if request.method == "POST": post = request.form["squawk_post"] if len(post) > 140: - abort(400) + return "Message is too long", 400 else: conn.execute("INSERT INTO mytable (squawk) VALUES(?)", [post]) conn.commit()