microsoft · kraigb · Jul 11, 2018 · Jul 11, 2018 · Jul 11, 2018 · Jul 11, 2018
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_app/app.py"                
             },
             "args": [
                 "run",
@@ -122,4 +122,4 @@
             ]
         }
     ]
-}
+}
diff --git a/HelloFlask/app.py b/HelloFlask/app.py
diff --git a/HelloFlask/templates/about.html b/HelloFlask/templates/about.html
diff --git a/HelloFlask/templates/contact.html b/HelloFlask/templates/contact.html
diff --git a/HelloFlask/templates/hello_there.html b/HelloFlask/templates/hello_there.html
diff --git a/HelloFlask/templates/home.html b/HelloFlask/templates/home.html
diff --git a/HelloFlask/views.py b/HelloFlask/views.py
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
 

diff --git a/HelloFlask/__init__.py → hello_app/__init__.py b/HelloFlask/__init__.py → hello_app/__init__.py
@@ -1,2 +1,2 @@
 from flask import Flask
-app = Flask(__name__)
+app = Flask(__name__)
diff --git a/hello_app/app.py b/hello_app/app.py
@@ -0,0 +1,5 @@
+from hello_app import app
+from hello_app 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/HelloFlask/static/data.json → hello_app/static/data.json b/HelloFlask/static/data.json → hello_app/static/data.json
diff --git a/HelloFlask/static/site.css → hello_app/static/site.css b/HelloFlask/static/site.css → hello_app/static/site.css
diff --git a/hello_app/templates/about.html b/hello_app/templates/about.html
@@ -0,0 +1,7 @@
+{% extends "layout.html" %}
+{% block title %}
+About us
+{% endblock %}
+{% block content %}
+<p>About page for the Visual Studio Code Flask tutorial.</p>
+{% endblock %}
diff --git a/hello_app/templates/contact.html b/hello_app/templates/contact.html
@@ -0,0 +1,7 @@
+{% extends "layout.html" %}
+{% block title %}
+Contact us
+{% endblock %}
+{% block content %}
+<p>Contact page for the VIsual Studio Code Flask tutorial.</p>
+{% endblock %}
diff --git a/hello_app/templates/hello_there.html b/hello_app/templates/hello_there.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='site.css') }}" />
+        <title>Hello, Flask</title>
+    </head>
+    <body>
+        <span class="message">Hello there, {{ name }}!</span> It's {{ date.strftime("%A, %d %B, %Y at %X") }}.
+    </body>
+</html>
diff --git a/hello_app/templates/home.html b/hello_app/templates/home.html
@@ -0,0 +1,7 @@
+{% extends "layout.html" %}
+{% block title %}
+Home
+{% endblock %}
+{% block content %}
+<p>Home page for the Visual Studio Code Flask tutorial.</p>
+{% endblock %}
diff --git a/HelloFlask/templates/layout.html → hello_app/templates/layout.html b/HelloFlask/templates/layout.html → hello_app/templates/layout.html
@@ -2,8 +2,8 @@
 <html>
     <head>
         <meta charset="utf-8" />
-        <title>{{ title }}</title>
-        <link rel="stylesheet" type="text/css" href="/static/site.css" />
+        <title>{% block title %}{% endblock %}</title>
+        <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='site.css') }}"  />
     </head>
 
     <body>
@@ -22,4 +22,4 @@
             </footer>
         </div>
     </body>
-</html>
+</html>
diff --git a/hello_app/views.py b/hello_app/views.py
@@ -0,0 +1,27 @@
+from datetime import datetime
+from flask import Flask, render_template
+from hello_app import app
+
+@app.route('/')
+def home():
+    return render_template("home.html")
+
+@app.route('/about')
+def about():
+    return render_template("about.html")
+
+@app.route('/contact')
+def contact():
+    return render_template("contact.html")
+
+@app.route('/hello/<name>')
+def hello_there(name):
+    return render_template(
+        "hello_there.html",
+        name=name,
+        date=datetime.now()
+    )
+
+@app.route('/api/data')
+def get_data():
+    return app.send_static_file('data.json')