React Tutorial

From 82424fa6ce90f384e418c54bd9bdc61216e550d8 Mon Sep 17 00:00:00 2001 From: Andrew Abraham Date: Tue, 10 May 2016 15:53:38 -0700 Subject: [PATCH 01/12] Remove shadowing of file builtin in server.py. PEP8 formatting --- server.py | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/server.py b/server.py index 5cf598df..fad15a66 100644 --- a/server.py +++ b/server.py @@ -16,21 +16,29 @@ app = Flask(__name__, static_url_path='', static_folder='public') app.add_url_rule('/', 'root', lambda: app.send_static_file('index.html')) + @app.route('/api/comments', methods=['GET', 'POST']) def comments_handler(): - - with open('comments.json', 'r') as file: - comments = json.loads(file.read()) + with open('comments.json', 'r') as f: + comments = json.loads(f.read()) if request.method == 'POST': - newComment = request.form.to_dict() - newComment['id'] = int(time.time() * 1000) - comments.append(newComment) + new_comment = request.form.to_dict() + new_comment['id'] = int(time.time() * 1000) + comments.append(new_comment) + + with open('comments.json', 'w') as f: + f.write(json.dumps(comments, indent=4, separators=(',', ': '))) - with open('comments.json', 'w') as file: - file.write(json.dumps(comments, indent=4, separators=(',', ': '))) + return Response( + json.dumps(comments), + mimetype='application/json', + headers={ + 'Cache-Control': 'no-cache', + 'Access-Control-Allow-Origin': '*' + } + ) - return Response(json.dumps(comments), mimetype='application/json', headers={'Cache-Control': 'no-cache', 'Access-Control-Allow-Origin': '*'}) if __name__ == '__main__': - app.run(port=int(os.environ.get("PORT",3000))) + app.run(port=int(os.environ.get("PORT", 3000))) From 4fa16fde3795ff7047322f28320cffc3b2b385ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Fri, 20 May 2016 10:28:43 -0700 Subject: [PATCH 02/12] Add private & license fields to package.json --- package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package.json b/package.json index e7491981..bf3360a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,8 @@ { "name": "react-tutorial", "version": "0.0.0", + "private": true, + "license": "see LICENSE file", "description": "Code from the React tutorial.", "main": "server.js", "dependencies": { From 06b89a1b5d1abe74f58163efeed80959c993ee52 Mon Sep 17 00:00:00 2001 From: Ben Alpert Date: Fri, 3 Jun 2016 14:35:54 -0700 Subject: [PATCH 03/12] Use remarkable instead of marked (#140) Closes #139. --- public/index.html | 2 +- public/scripts/example.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/index.html b/public/index.html index 34ebddf4..a76aaada 100644 --- a/public/index.html +++ b/public/index.html @@ -9,7 +9,7 @@ - +

diff --git a/public/scripts/example.js b/public/scripts/example.js index c249427a..6493fea9 100644 --- a/public/scripts/example.js +++ b/public/scripts/example.js @@ -12,7 +12,8 @@ var Comment = React.createClass({ rawMarkup: function() { - var rawMarkup = marked(this.props.children.toString(), {sanitize: true}); + var md = new Remarkable(); + var rawMarkup = md.render(this.props.children.toString()); return { __html: rawMarkup }; }, From 64a6dfca72aca4d13ab4cbf23c50eba8b9fabe8a Mon Sep 17 00:00:00 2001 From: saiyam-gambhir Date: Wed, 8 Jun 2016 23:09:19 +0530 Subject: [PATCH 04/12] Removed duplicate CSS (#143) --- public/css/base.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/public/css/base.css b/public/css/base.css index 08de8f1b..c8cc35f7 100644 --- a/public/css/base.css +++ b/public/css/base.css @@ -35,9 +35,6 @@ h1, h2, h3, h4 { h1 { border-bottom: 1px solid #ddd; font-size: 2.5em; - font-weight: bold; - margin: 0 0 15px; - padding: 0; } h2 { From e5786f844bff18dfa3ff6330b67c9f856c5ebbf6 Mon Sep 17 00:00:00 2001 From: sthodup1 Date: Mon, 20 Jun 2016 15:13:45 -0500 Subject: [PATCH 05/12] Update React Dependency to 15.1.0 --- public/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/index.html b/public/index.html index a76aaada..ec158df2 100644 --- a/public/index.html +++ b/public/index.html @@ -5,8 +5,8 @@ React Tutorial - - + + From 2f565db733f7614d19012f029a52f65d294b7db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Fri, 1 Jul 2016 12:29:47 -0700 Subject: [PATCH 06/12] Update for 15.2.0 --- public/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/index.html b/public/index.html index ec158df2..1ce8900c 100644 --- a/public/index.html +++ b/public/index.html @@ -5,8 +5,8 @@ React Tutorial - - + + From 08115a6ec2df124bb03cc04974f2c5b9b290804e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Tue, 2 Aug 2016 13:50:54 -0700 Subject: [PATCH 07/12] Use npmcdn (#152) --- public/index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/index.html b/public/index.html index 1ce8900c..5af72a45 100644 --- a/public/index.html +++ b/public/index.html @@ -5,11 +5,11 @@ React Tutorial - - - - - + + + + +

From ddc30f08e010ca1401c7c9ef8f753c0749dbc499 Mon Sep 17 00:00:00 2001 From: Jonathan Herbert Date: Sat, 20 Aug 2016 20:00:30 -0400 Subject: [PATCH 08/12] Only Read Comments File On Comments Route (#154) --- server.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.php b/server.php index 75fae215..e510136b 100644 --- a/server.php +++ b/server.php @@ -27,11 +27,11 @@ function routeRequest() { - $comments = file_get_contents('comments.json'); $uri = $_SERVER['REQUEST_URI']; if ($uri == '/') { echo file_get_contents('./public/index.html'); } elseif (preg_match('/\/api\/comments(\?.*)?/', $uri)) { + $comments = file_get_contents('comments.json'); if($_SERVER['REQUEST_METHOD'] === 'POST') { $commentsDecoded = json_decode($comments, true); $commentsDecoded[] = [ From 7d0728e6d9011658420b7b30463edb2163577a15 Mon Sep 17 00:00:00 2001 From: Mike Sukmanowsky Date: Mon, 29 Aug 2016 20:08:11 -0400 Subject: [PATCH 09/12] Set debug=True flag for Flask server (#156) --- server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.py b/server.py index fad15a66..03c6213d 100644 --- a/server.py +++ b/server.py @@ -41,4 +41,4 @@ def comments_handler(): if __name__ == '__main__': - app.run(port=int(os.environ.get("PORT", 3000))) + app.run(port=int(os.environ.get("PORT", 3000)), debug=True) From 35b5c0c77c0c5e4b159f78a85a66110086aaddfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Dani=C4=87?= Date: Tue, 30 Aug 2016 19:31:59 +0200 Subject: [PATCH 10/12] Use unpkg instead of npmcdn (#157) npmcdn.com is moving to unpkg.com and these links will eventually switch to 301. Better to switch to unpkg right away. https://twitter.com/mjackson/status/770424625754939394 --- public/index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/index.html b/public/index.html index 5af72a45..ca5fb5fc 100644 --- a/public/index.html +++ b/public/index.html @@ -5,11 +5,11 @@ React Tutorial - - - - - + + + + +

From 70f7e15f3d4b048625a712713a494f7860695255 Mon Sep 17 00:00:00 2001 From: Jisu Park Date: Wed, 7 Sep 2016 02:25:07 +0900 Subject: [PATCH 11/12] feat(babel): Bump up the babel version 5.x to 6.x (#158) --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index ca5fb5fc..b88096b6 100644 --- a/public/index.html +++ b/public/index.html @@ -7,7 +7,7 @@ - + From ec8d845a8a361abf86c11af2d693150697ef858a Mon Sep 17 00:00:00 2001 From: Ben Alpert Date: Mon, 3 Oct 2016 11:06:17 -0700 Subject: [PATCH 12/12] remarkable 1.7.1 --- comments.json | 17 ++++++++++++++++- public/index.html | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/comments.json b/comments.json index 7bef77ad..28816136 100644 --- a/comments.json +++ b/comments.json @@ -8,5 +8,20 @@ "id": 1420070400000, "author": "Paul O’Shannessy", "text": "React is *great*!" + }, + { + "id": 1464988635157, + "author": "ben", + "text": "*abc*" + }, + { + "id": 1464988636500, + "author": "ben", + "text": "*abc*" + }, + { + "id": 1464988717637, + "author": "evil", + "text": "alert(1)" } -] +] \ No newline at end of file diff --git a/public/index.html b/public/index.html index b88096b6..eb201204 100644 --- a/public/index.html +++ b/public/index.html @@ -9,7 +9,7 @@ - +