Updates per Adrian

kraigb · kraigb · commit afbe8c256bff · 2018-07-11T07:42:26.000-07:00
Address issue microsoft#1
diff --git a/HelloFlask/templates/hello_there.html b/HelloFlask/templates/hello_there.html
@@ -2,10 +2,10 @@
 <html>
     <head>
         <meta charset="utf-8" />
-        <link rel="stylesheet" type="text/css" href="/static/site.css" />
+        <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='site.css') }}" />
         <title>{{ title }}</title>
     </head>
     <body>
-        <span class="message">{{ message }}</span> It's {{ date }}.
+        <span class="message">Hello there, {{ name }}!</span> It's {{ date.strftime("%A, %d %B, %Y at %X") }}.
     </body>
 </html>
diff --git a/HelloFlask/templates/layout.html b/HelloFlask/templates/layout.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8" />
         <title>{{ title }}</title>
-        <link rel="stylesheet" type="text/css" href="/static/site.css" />
+        <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='site.css') }}"  />
     </head>
 
     <body>
diff --git a/HelloFlask/views.py b/HelloFlask/views.py
@@ -1,31 +1,44 @@
-from flask import Flask
-from flask import render_template
+from datetime import datetime
+from re import match
+
+from flask import Flask, render_template
+
 from HelloFlask import app
 
+
 @app.route('/')
 def home():
-    return render_template("home.html", title = "Home")
+    return render_template("home.html", title="Home")
 
 @app.route('/about')
 def about():
-    return render_template("about.html", title = "About us")
+    return render_template("about.html", title="About us")
 
 @app.route('/contact')
 def contact():
-    return render_template("contact.html", title = "Contact us")
+    return render_template("contact.html", title="Contact us")
 
 @app.route('/hello/<name>')
 def hello_there(name):
-    from datetime import datetime
-    now = datetime.now()
-
     return render_template(
         "hello_there.html",
         title ='Hello, Flask',
-        message = "Hello there, " + name + "!",
-        date = now.strftime("%A, %d %B, %Y at %X")
+        name = clean_name(name),
+        date = datetime.now()
     )
 
 @app.route('/api/data')
 def get_data():
-    return app.send_static_file('data.json')
+    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
diff --git a/README.md b/README.md
@@ -1,3 +1,7 @@
+This sample contains the completed program from the tutorial, [Using Flask in Visual Studio Code](https://code.visualstudio.com/docs/python/tutorial-flask). Intermediate steps are not included.
+
+Contributions to the sample are welcome. When submitting changes, also consider submitting matching changes to the tutorial, the source file for which is [tutorial-flask.md](https://github.com/Microsoft/vscode-docs/blob/master/docs/python/tutorial-flask.md).
+
 
 # Contributing
 

-Original file line number
+Diff line change
 <html>
     <head>
         <meta charset="utf-8" />
 -        <link rel="stylesheet" type="text/css" href="/static/site.css" />
 +        <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='site.css') }}" />
         <title>{{ title }}title>
     head>
     <body>
 -        <span class="message">{{ message }}span> It's {{ date }}.
 +        <span class="message">Hello there, {{ name }}!span> It's {{ date.strftime("%A, %d %B, %Y at %X") }}.
     body>
 html>