refactor: attempt1

ncov19-us · Apr 17, 2020 · 798763a · 798763a
1 parent bafb7be
commit 798763a
Show file tree

Hide file tree

Showing 54 changed files with 329 additions and 280 deletions.
diff --git a/app.py b/app.py
diff --git a/ncov19_dash/__init__.py b/ncov19_dash/__init__.py
@@ -0,0 +1,5 @@
+from .dash_app import app
+from .flask_server import server
+# from ncov19_dash.app import create_app
+
+# app = create_app()
diff --git a/assets/css/common.css → ncov19_dash/assets/css/common.css b/assets/css/common.css → ncov19_dash/assets/css/common.css
diff --git a/assets/css/desktop.css → ncov19_dash/assets/css/desktop.css b/assets/css/desktop.css → ncov19_dash/assets/css/desktop.css
diff --git a/assets/css/mobile.css → ncov19_dash/assets/css/mobile.css b/assets/css/mobile.css → ncov19_dash/assets/css/mobile.css
diff --git a/assets/favicon.ico → ncov19_dash/assets/favicon.ico b/assets/favicon.ico → ncov19_dash/assets/favicon.ico
diff --git a/assets/images/404_image.png → ncov19_dash/assets/images/404_image.png b/assets/images/404_image.png → ncov19_dash/assets/images/404_image.png
diff --git a/assets/images/Github.svg → ncov19_dash/assets/images/Github.svg b/assets/images/Github.svg → ncov19_dash/assets/images/Github.svg
diff --git a/assets/images/LinkedIN.svg → ncov19_dash/assets/images/LinkedIN.svg b/assets/images/LinkedIN.svg → ncov19_dash/assets/images/LinkedIN.svg
diff --git a/assets/images/Twitter.svg → ncov19_dash/assets/images/Twitter.svg b/assets/images/Twitter.svg → ncov19_dash/assets/images/Twitter.svg
diff --git a/assets/images/covid19-logo.png → ncov19_dash/assets/images/covid19-logo.png b/assets/images/covid19-logo.png → ncov19_dash/assets/images/covid19-logo.png
diff --git a/assets/images/covid19-new-logo.png → ...9_dash/assets/images/covid19-new-logo.png b/assets/images/covid19-new-logo.png → ...9_dash/assets/images/covid19-new-logo.png
diff --git a/assets/images/drive-thru-icon.png → ...19_dash/assets/images/drive-thru-icon.png b/assets/images/drive-thru-icon.png → ...19_dash/assets/images/drive-thru-icon.png
diff --git a/assets/images/map_1.svg → ncov19_dash/assets/images/map_1.svg b/assets/images/map_1.svg → ncov19_dash/assets/images/map_1.svg
diff --git a/assets/images/ncov19_v2_mobile_thumbnail.png → ...ets/images/ncov19_v2_mobile_thumbnail.png b/assets/images/ncov19_v2_mobile_thumbnail.png → ...ets/images/ncov19_v2_mobile_thumbnail.png
diff --git a/assets/images/sjackson.jpg → ncov19_dash/assets/images/sjackson.jpg b/assets/images/sjackson.jpg → ncov19_dash/assets/images/sjackson.jpg
diff --git a/assets/images/virus.png → ncov19_dash/assets/images/virus.png b/assets/images/virus.png → ncov19_dash/assets/images/virus.png
diff --git a/assets/js/index.js → ncov19_dash/assets/js/index.js b/assets/js/index.js → ncov19_dash/assets/js/index.js
diff --git a/components/README.md → ncov19_dash/components/README.md b/components/README.md → ncov19_dash/components/README.md
diff --git a/components/__init__.py → ncov19_dash/components/__init__.py b/components/__init__.py → ncov19_dash/components/__init__.py
diff --git a/components/cases_chart.py → ncov19_dash/components/cases_chart.py b/components/cases_chart.py → ncov19_dash/components/cases_chart.py
@@ -3,9 +3,9 @@
 import requests
 import pandas as pd
 import plotly.graph_objects as go
-from app import cache
-from utils import REVERSE_STATES_MAP
-from utils import config
+from ncov19_dash.flask_server import cache
+from ncov19_dash.utils import REVERSE_STATES_MAP
+from ncov19_dash.utils import config
 
 
 def human_format(num):

diff --git a/components/column_stats.py → ncov19_dash/components/column_stats.py b/components/column_stats.py → ncov19_dash/components/column_stats.py
@@ -1,9 +1,8 @@
 import requests
 import dash_bootstrap_components as dbc
 import dash_html_components as html
-from utils import REVERSE_STATES_MAP
-from utils import config
-from app import cache
+from ncov19_dash.utils import REVERSE_STATES_MAP
+from ncov19_dash.utils import config
 import pandas as pd
 
 

diff --git a/components/column_stats_mobile.py → ...19_dash/components/column_stats_mobile.py b/components/column_stats_mobile.py → ...19_dash/components/column_stats_mobile.py
@@ -1,8 +1,8 @@
 import requests
 import dash_bootstrap_components as dbc
 import dash_html_components as html
-from utils import config
-from app import cache
+from ncov19_dash.utils import config
+from ncov19_dash.flask_server import cache
 import pandas as pd
 
 

diff --git a/components/confirmed_cases_chart.py → ..._dash/components/confirmed_cases_chart.py b/components/confirmed_cases_chart.py → ..._dash/components/confirmed_cases_chart.py
@@ -3,8 +3,8 @@
 import pandas as pd
 import plotly.express as px
 import plotly.graph_objects as go
-from app import cache
-from utils import config
+from ncov19_dash.flask_server import cache
+from ncov19_dash.utils import config
 
 
 @cache.memoize(timeout=3600)

diff --git a/components/daily_stats.py → ncov19_dash/components/daily_stats.py b/components/daily_stats.py → ncov19_dash/components/daily_stats.py
@@ -4,9 +4,9 @@
 from typing import List, Dict
 import dash_bootstrap_components as dbc
 import dash_html_components as html
-from app import cache
-from utils import STATES_COORD
-from utils import config
+from ncov19_dash.flask_server import cache
+from ncov19_dash.utils import STATES_COORD
+from ncov19_dash.utils import config
 
 
 def safe_div(x, y):

diff --git a/components/daily_stats_mobile.py → ncov19_dash/components/daily_stats_mobile.py b/components/daily_stats_mobile.py → ncov19_dash/components/daily_stats_mobile.py
@@ -4,9 +4,9 @@
 from typing import List, Dict
 import dash_bootstrap_components as dbc
 import dash_html_components as html
-from app import cache
-from utils import config
-from utils import STATES_COORD
+from ncov19_dash.flask_server import cache
+from ncov19_dash.utils import config
+from ncov19_dash.utils import STATES_COORD
 
 
 def safe_div(x, y):

diff --git a/components/deaths_chart.py → ncov19_dash/components/deaths_chart.py b/components/deaths_chart.py → ncov19_dash/components/deaths_chart.py
@@ -3,9 +3,9 @@
 import requests
 import pandas as pd
 import plotly.graph_objects as go
-from app import cache
-from utils import REVERSE_STATES_MAP
-from utils import config
+from ncov19_dash.flask_server import cache
+from ncov19_dash.utils import REVERSE_STATES_MAP
+from ncov19_dash.utils import config
 
 
 def human_format(num):

diff --git a/components/new_infection_trajectory_chart.py → ...ponents/new_infection_trajectory_chart.py b/components/new_infection_trajectory_chart.py → ...ponents/new_infection_trajectory_chart.py
@@ -4,9 +4,9 @@
 import pandas as pd
 import plotly.express as px
 import plotly.graph_objects as go
-from app import cache
-from utils import REVERSE_STATES_MAP
-from utils import config
+from ncov19_dash.flask_server import cache
+from ncov19_dash.utils import REVERSE_STATES_MAP
+from ncov19_dash.utils import config
 
 
 

diff --git a/components/news_feed.py → ncov19_dash/components/news_feed.py b/components/news_feed.py → ncov19_dash/components/news_feed.py
@@ -3,9 +3,9 @@
 import pandas as pd
 import dash_bootstrap_components as dbc
 import dash_html_components as html
-from app import cache
-from utils import STATES_COORD
-from utils import config
+from ncov19_dash.flask_server import cache
+from ncov19_dash.utils import STATES_COORD
+from ncov19_dash.utils import config
 import json
 
 

diff --git a/components/scatter_mapbox.py → ncov19_dash/components/scatter_mapbox.py b/components/scatter_mapbox.py → ncov19_dash/components/scatter_mapbox.py
@@ -7,9 +7,9 @@
 import plotly.express as px
 import plotly.graph_objects as go
 
-from app import cache
-from utils import STATES_COORD
-from utils import config
+from ncov19_dash.flask_server import cache
+from ncov19_dash.utils import STATES_COORD
+from ncov19_dash.utils import config
 import requests
 
 

diff --git a/components/state-population-est2019.csv → ...h/components/state-population-est2019.csv b/components/state-population-est2019.csv → ...h/components/state-population-est2019.csv
diff --git a/components/stats_table.py → ncov19_dash/components/stats_table.py b/components/stats_table.py → ncov19_dash/components/stats_table.py
@@ -4,10 +4,10 @@
 import dash_bootstrap_components as dbc
 import dash_html_components as html
 import dash_table
-from utils import REVERSE_STATES_MAP
-from utils import config
+from ncov19_dash.utils import REVERSE_STATES_MAP
+from ncov19_dash.utils import config
 
-from app import cache
+from ncov19_dash.flask_server import cache
 
 
 def stats_table(state="US"):

diff --git a/components/twitter_feed.py → ncov19_dash/components/twitter_feed.py b/components/twitter_feed.py → ncov19_dash/components/twitter_feed.py
@@ -6,9 +6,9 @@
 import requests
 import dash_bootstrap_components as dbc
 import dash_html_components as html
-from app import cache
-from utils import config
-from utils import STATES_COORD
+from ncov19_dash.flask_server import cache
+from ncov19_dash.utils import config
+from ncov19_dash.utils import STATES_COORD
 
 
 @cache.memoize(timeout=900)