Merge pull request #5 from Azure-Samples/cruft/update

chore: accept new Cruft update

Author: kjaymiller

.cruft.json

@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/kjaymiller/cookiecutter-relecloud",
-  "commit": "972993b589b44e87780a333d6081776eea23af2c",
+  "commit": "a3794bddf382c4c6fa4add5bf935ca14bca40a71",
   "checkout": null,
   "context": {
     "cookiecutter": {

.vscode/launch.json

@@ -15,7 +15,7 @@
             },
             "args": [
                 "run",
-                "--port=50505",
+                "--port=8000",
                 "--no-debugger",
                 "--reload"
             ],

README.md

@@ -6,7 +6,17 @@ This project deploys a web application for a space travel agency using Flask. Th
 
 This project has [Dev Container support](https://code.visualstudio.com/docs/devcontainers/containers), so it will be setup automatically if you open it in Github Codespaces or in local VS Code with the [Dev Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers).
 
-If you're not using one of those options for opening the project, then you'll need to:
+If you're *not* using one of those options for opening the project, then you'll need to:
+
+1. Start up a local PostgreSQL server, create a database for the app, and set the following environment variables according to your database configuration.
+
+```shell
+export POSTGRES_HOST=localhost
+export POSTGRES_PORT=5432
+export POSTGRES_DATABASE=<YOUR DATABASE>
+export POSTGRES_USERNAME=<YOUR USERNAME>
+export POSTGRES_PASSWORD=<YOUR PASSWORD>
+```
 
 1. Create a [Python virtual environment](https://docs.python.org/3/tutorial/venv.html#creating-virtual-environments) and activate it.
 
@@ -33,10 +43,10 @@ If you're not using one of those options for opening the project, then you'll ne
 
 ## Running locally
 
-Run gunicorn on the app:
+If you're running the app inside VS Code or GitHub Codespaces, you can use the "Run and Debug" button to start the app.
 
 ```sh
-python3 -m gunicorn 'src.flaskapp:create_app()' --reload
+python3 -m flask --app src.flaskapp run --reload --port=8000
 ```
 
 

src/flaskapp/__init__.py

@@ -49,7 +49,7 @@ def create_app(test_config=None):
 
     @app.cli.command("seed")
     @click.option("--filename", default="seed_data.json")
-    def seed_data(filename, drop):
+    def seed_data(filename):
         from . import seeder
 
         seeder.seed_data(db, filename)

src/flaskapp/config/development.py

@@ -10,6 +10,7 @@
 dbpass = os.environ["POSTGRES_PASSWORD"]
 dbhost = os.environ["POSTGRES_HOST"]
 dbname = os.environ["POSTGRES_DATABASE"]
-DATABASE_URI = f"postgresql+psycopg2://{dbuser}:{dbpass}@{dbhost}/{dbname}"
+dbport = os.environ.get("POSTGRES_POST", 5432)
+DATABASE_URI = f"postgresql+psycopg2://{dbuser}:{dbpass}@{dbhost}:{dbport}/{dbname}"
 
 TIME_ZONE = "UTC"

src/templates/base.html

@@ -4,7 +4,10 @@
     {% if prod %}
     <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
     {% endif %}
-                
+    
+    <!--main CSS theme file  -->
+    <link rel="stylesheet" href="{{ url_for('static', filename='res/css/theme.css') }}" />
+
      <!-- For new browsers - multisize ico  -->
      <link rel="icon" type="image/x-icon" sizes="16x16 32x32" href="{{ url_for('static', filename='res/img/favicon.ico') }}">
 

src/tests/conftest.py

@@ -12,9 +12,8 @@ def app():
     """Session-wide test `Flask` application."""
     config_override = {
         "TESTING": True,
-        "SQLALCHEMY_DATABASE_URI": os.environ.get(
-            "TEST_DATABASE_URL", "postgresql://postgres:postgres@localhost:5432/postgres"
-        ),
+        # Allows for override of database to separate test from dev environments
+        "SQLALCHEMY_DATABASE_URI": os.environ.get("TEST_DATABASE_URL", os.environ.get("DATABASE_URI")),
     }
     app = create_app(config_override)