Tweaks from Adrian's review

kraigb · kraigb · commit 9f4dd5708ec3 · 2018-07-11T10:07:31.000-07:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -64,7 +64,7 @@
             "request": "launch",
             "module": "flask",
             "env": {
-                "FLASK_APP": "HelloFlask/app.py"                
+                "FLASK_APP": "hello_flask/app.py"                
             },
             "args": [
                 "run",
@@ -122,4 +122,4 @@
             ]
         }
     ]
-}
+}
diff --git a/HelloFlask/app.py b/HelloFlask/app.py
diff --git a/hello_flask/__init__.py b/hello_flask/__init__.py
diff --git a/hello_flask/app.py b/hello_flask/app.py
@@ -0,0 +1,5 @@
+from hello_flask import app
+from hello_flask import views
+
+# Time-saver: output a URL to the VS Code terminal so you can easily Ctrl+click to open a browser
+# print('http://127.0.0.1:5000/hello/VSCode')
diff --git a/hello_flask/static/data.json b/hello_flask/static/data.json
diff --git a/hello_flask/static/site.css b/hello_flask/static/site.css
diff --git a/hello_flask/templates/about.html b/hello_flask/templates/about.html
@@ -1,4 +1,4 @@
 {% extends "layout.html" %}
 {% block content %}
 <p>About page for the Flask tutorial.</p>
-{% endblock %}
+{% endblock %}
diff --git a/hello_flask/templates/contact.html b/hello_flask/templates/contact.html
@@ -1,4 +1,4 @@
 {% extends "layout.html" %}
 {% block content %}
 <p>Contact page for the Flask tutorial.</p>
-{% endblock %}
+{% endblock %}
diff --git a/hello_flask/templates/hello_there.html b/hello_flask/templates/hello_there.html
@@ -8,4 +8,4 @@
     <body>
         <span class="message">Hello there, {{ name }}!</span> It's {{ date.strftime("%A, %d %B, %Y at %X") }}.
     </body>
-</html>
+</html>
diff --git a/hello_flask/templates/home.html b/hello_flask/templates/home.html
@@ -1,4 +1,4 @@
 {% extends "layout.html" %}
 {% block content %}
 <p>Home page for the Flask tutorial.</p>
-{% endblock %}
+{% endblock %}
diff --git a/hello_flask/templates/layout.html b/hello_flask/templates/layout.html
@@ -22,4 +22,4 @@
             </footer>
         </div>
     </body>
-</html>
+</html>
diff --git a/hello_flask/views.py b/hello_flask/views.py
@@ -1,10 +1,6 @@
 from datetime import datetime
-from re import match
-
 from flask import Flask, render_template
-
-from HelloFlask import app
-
+from hello_flask import app
 
 @app.route('/')
 def home():
@@ -22,23 +18,11 @@ def contact():
 def hello_there(name):
     return render_template(
         "hello_there.html",
-        title ='Hello, Flask',
-        name = clean_name(name),
-        date = datetime.now()
+        title='Hello, Flask',
+        name=name,
+        date=datetime.now()
     )
 
 @app.route('/api/data')
 def get_data():
     return app.send_static_file('data.json')
-
-def clean_name(name):
-    # Filter the name argument to letters only using regular expressions. URL arguments
-    # can contain arbitrary text, so we restrict to safe characters only.
-    match_object = match("[a-zA-Z]+", name)
-
-    if match_object:
-        clean_name = match_object.group(0)
-    else:
-        clean_name = "Friend"
-
-    return clean_name

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@`
`64`	`64`	`"request": "launch",`
`65`	`65`	`"module": "flask",`
`66`	`66`	`"env": {`
`67`		`- "FLASK_APP": "HelloFlask/app.py"`
	`67`	`+ "FLASK_APP": "hello_flask/app.py"`
`68`	`68`	`},`
`69`	`69`	`"args": [`
`70`	`70`	`"run",`
`@@ -122,4 +122,4 @@`
`122`	`122`	`]`
`123`	`123`	`}`
`124`	`124`	`]`
`125`		`-}`
	`125`	`+}`
-Original file line number
+Diff line change
     <body>
         <span class="message">Hello there, {{ name }}!</span> It's {{ date.strftime("%A, %d %B, %Y at %X") }}.
     </body>
 -</html>
 +</html>