han: merged staging into current branch

.github/pull_request_template.md

@@ -0,0 +1,35 @@
+# Description
+
+What Changed ? e.g. Github Issues Title or Trello Card Title
+
+## Type of change
+
+Please delete options that are not relevant.
+
+- [ ] :art: CSS Styling fix
+- [ ] :ambulance: Bug fix (non-breaking change which fixes an issue)
+- [ ] :recycle: :wastebasket: Re-factor, cleanup, un-comment, docstring
+- [ ] :sparkles: New feature (non-breaking change which adds functionality)
+- [ ] :boom: Breaking change (fix or feature that would cause existing functionality to not work as expected)
+
+## Change Status
+
+- [ ] :checkered_flag: Complete, tested, ready to review and merge
+- [ ] :traffic_light: Complete, but not tested (may need new tests)
+- [ ] :construction: WIP work-in-progress, PR is for discussion/feedback
+
+# How Has This Been Tested?
+
+- [ ] Manually Functionality Testing
+- [ ] Unit Test
+
+# Checklist
+
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] I have added tests that prove my fix is effective or that my feature works
+- [ ] New and existing unit tests pass locally with my changes
+- [ ] There are no merge conflicts

components/column_stats.py

@@ -7,10 +7,6 @@
 import pandas as pd
 
 
-# DEPRECATED?
-# TODO: Remove logic from here and put it to AWS Lambda
-
-# worked when i moved this into the try/except in the states_confirmed_stats function
 try:
  URL = config.NCOV19_API + config.COUNTY
  response = requests.get(URL).json()

components/column_stats_mobile.py

@@ -6,7 +6,6 @@
 import pandas as pd
 
 
-# TODO: Remove logic from here and put it to AWS Lambda
 try:
  URL = config.NCOV19_API + config.COUNTY
  response = requests.get(URL).json()

components/new_infection_trajectory_chart.py

@@ -10,7 +10,7 @@
 
 
 
-# @cache.memoize(timeout=3600)
+@cache.memoize(timeout=3600)
 def new_infection_trajectory_chart(state="US") -> go.Figure:
  """Line chart data for the selected state.
 

run.py

@@ -19,7 +19,7 @@
 from pages import about_body
 from pages import mobile, mobile_navbar, mobile_footer
 from pages import mobile_about_body
-
+from utils import config
 
 # Set default layout so Flask can start
 app.layout = build_desktop_layout
@@ -37,8 +37,8 @@ def before_request_func():
 
  if is_mobile:
  app.layout = build_mobile_layout
- flask.session['mobile'] = True
- flask.session['zoom'] = 1.9#2.0
+ flask.session["mobile"] = True
+ flask.session["zoom"] = 1.9 # 2.0
  else: # Desktop request
  app.layout = build_desktop_layout
  flask.session['mobile'] = False
@@ -62,15 +62,15 @@ def sitemap():
  for rule in server.url_map.iter_rules():
  if not str(rule).startswith("/admin") and not str(rule).startswith("/user"):
  if "GET" in rule.methods and len(rule.arguments) == 0:
- url = {
- "loc": f"{host_base}{str(rule)}"
- }
+ url = {"loc": f"{host_base}{str(rule)}"}
  static_urls.append(url)
 
  static_urls.append({"loc": f"{host_base}/about"})
  static_urls.append({"loc": f"{host_base}/resources"})
 
- xml_sitemap = render_template("sitemap.xml", static_urls=static_urls, host_base=host_base) #, dynamic_urls=dynamic_urls, 
+ xml_sitemap = render_template(
+ "sitemap.xml", static_urls=static_urls, host_base=host_base
+ ) # , dynamic_urls=dynamic_urls,
  response = make_response(xml_sitemap)
  response.headers["Content-Type"] = "application/xml"
 
@@ -83,12 +83,16 @@ def static_from_root():
  """
  response = send_from_directory(server.static_folder, request.path[1:])
  return response
-
 
-@app.callback([Output("navbar-content", "children"),
- Output("page-content", "children"),
- Output("footer-content", "children")],
- [Input("url", "pathname")])
+
+@app.callback(
+ [
+ Output("navbar-content", "children"),
+ Output("page-content", "children"),
+ Output("footer-content", "children"),
+ ],
+ [Input("url", "pathname")],
+)
 def display_page(pathname):
  is_mobile = flask.session['mobile']
 
@@ -106,11 +110,12 @@ def display_page(pathname):
  error_page = [
  html.Div(
  html.Img(
- src='assets/images/404_image.png',
- style={"margin": "0 auto",
- "width": "100%",
- "display": "flex",
- "padding": "5vh 2vw",
+ src="assets/images/404_image.png",
+ style={
+ "margin": "0 auto",
+ "width": "100%",
+ "display": "flex",
+ "padding": "5vh 2vw",
  },
  ),
  ),
@@ -122,4 +127,4 @@ def display_page(pathname):
 
 
 if __name__ == "__main__":
- app.run_server(debug=True)
+ app.run_server(debug=config.DEBUG)

static/robots.txt

@@ -1,16 +1,23 @@
 Sitemap: https://ncov19.us/sitemap.xml
 
 User-agent: Googlebot
+Crawl-delay: 10
 Disallow:
 
 User-agent: Mediapartners-Google
+Crawl-delay: 10
 Disallow:
 
 User-agent: bingbot
-Crawl-delay: 5
+Crawl-delay: 10
 Disallow:
 
 User-agent: Twitterbot
+Crawl-delay: 10
+Disallow:
+
+User-agent: ia_archiver
+Crawl-delay: 10
 Disallow:
 
 User-agent: Bytespider

utils/__init__.py

@@ -1,4 +1,12 @@
 from utils.config import *
 from utils.settings import *
+import os
 
-config = ProductionConfig()
+STAGING = os.environ["STAGING"]
+
+if STAGING == "True":
+ config = StagingConfig()
+else:
+ config = ProductionConfig()
+
+# print(f"[DEBUG] Config being used is: {config.__class__.__name__}")

utils/config.py

@@ -1,11 +1,11 @@
 from decouple import config
 
 
-class Config(object):
+class StagingConfig(object):
  """Base config, uses staging API"""
 
- DEBUG = False
- TESTING = False
+ DEBUG = True
+ TESTING = True
 
  # Secret Key
  SECRET_KEY = config("SECRET_KEY")
@@ -31,7 +31,7 @@ class Config(object):
  DRIVE_THRU_URL = config("DRIVE_THRU_STAGING_URL")
 
 
-class ProductionConfig(Config):
+class ProductionConfig(StagingConfig):
  """Uses production database server."""
 
  DEBUG = False