Merge pull request #3 from BrianThomasRoss/dash-app

Push to remote devel

Author: BrianThomasRoss

src/chime_dash/README.md

@@ -5,7 +5,7 @@ This directory should provide the interface for a dash app.
 E.g., it contains the actual app which pieces together individual parts which could potentially live on their own.
 This makes it easier to modularize and reuse parts.
 
-![Current interface](interface.png)
+![Current interface](docs/assets/interface.png)
 
 ## Todo
 Plots & callbacks

src/penn_chime_dash/app/components/__init__.py renamed to src/chime_dash/app/__init__.py

@@ -1,6 +1,6 @@
 """Combines all components
 
-The `sidbar` component cobines all the inputs while other components potentially
+The `sidebar` component combines all the inputs while other components potentially
 have callbacks.
 
 To add or remove components, adjust the `setup`.
@@ -14,13 +14,14 @@
 
 from penn_chime.defaults import Constants
 
-from chime_dash.layout import sidebar
-from chime_dash.layout import header
-from chime_dash.layout import intro
-from chime_dash.layout import additions
-from chime_dash.layout import visualizations
-from chime_dash.layout import definitions
-from chime_dash.layout import footer
+from chime_dash.app.components import sidebar
+from chime_dash.app.components import header
+from chime_dash.app.components import intro
+from chime_dash.app.components import additions
+from chime_dash.app.components import visualizations
+from chime_dash.app.components import definitions
+from chime_dash.app.components import footer
+from chime_dash.app.components import navbar
 
 
 EXTERNAL_STYLESHEETS = [

src/chime_dash/layout/__init__.py renamed to src/chime_dash/app/components/__init__.py

@@ -13,8 +13,8 @@
 from penn_chime.utils import add_date_column
 from penn_chime.parameters import Parameters
 
-from chime_dash.utils import read_localization_yaml, df_to_html_table
-from chime_dash.plotting import plot_dataframe
+from chime_dash.app.utils.templates import read_localization_yaml, df_to_html_table
+from chime_dash.app.services.plotting import plot_dataframe
 
 
 LOCALIZATION_FILE = "additions.yml"

src/chime_dash/layout/additions.py renamed to src/chime_dash/app/components/additions.py

@@ -0,0 +1,41 @@
+"""Initializes dropdown menu
+"""
+import dash_bootstrap_components as dbc
+
+
+def setup ():
+    menu = dbc.DropdownMenu(
+        children=[
+            dbc.DropdownMenuItem(
+                "Penn Medicine",
+                header=True),
+            dbc.DropdownMenuItem(
+                "Predictive Healthcare",
+                href='http://predictivehealthcare.pennmedicine.org/',
+                external_link=True
+            ),
+            dbc.DropdownMenuItem(
+                "Contact Us",
+                href='http://predictivehealthcare.pennmedicine.org/contact/',
+                external_link=True
+            ),
+            dbc.DropdownMenuItem(
+                "User Docs",
+                href="https://code-for-philly.gitbook.io/chime/",
+                external_link=True
+            ),
+            dbc.DropdownMenuItem(
+                "GitHub",
+                href="https://github.com/CodeForPhilly/chime",
+                external_link=True
+            ),
+            dbc.DropdownMenuItem(
+                "Slack",
+                href="https://codeforphilly.org/chat?channel=covid19-chime-penn"
+            )
+        ],
+        in_navbar=True,
+        label="Learn More",
+        color="light"
+    )
+    return menu

src/chime_dash/app/components/menu.py

@@ -0,0 +1,35 @@
+"""Navigation bar view
+"""
+from typing import List
+from chime_dash.app.static import header
+from chime_dash.app.components import menu
+
+import dash_html_components as html
+import dash_bootstrap_components as dbc
+from dash.development.base_component import ComponentMeta
+
+
+def setup (language: str) -> List[ComponentMeta]:
+    """Initialize the navigation bar
+    """
+    nav = dbc.Navbar(
+        dbc.Container(
+            [
+                html.A(
+                    dbc.Row(
+                        children=[
+                            dbc.Col(header.setup(language)),
+                            dbc.Col(
+                                dbc.NavbarBrand(
+                                    children='Penn Medicine CHIME',
+                                    href='/')
+                            )
+                        ],
+                        align="center",
+                        no_gutters=True,
+                    ),
+                    href='https://www.pennmedicine.org/'),
+                menu.setup()
+            ]
+        ))
+    return nav

src/chime_dash/app/components/navbar.py

@@ -10,7 +10,7 @@
 from penn_chime.defaults import RateLos, Constants
 from penn_chime.parameters import Parameters
 
-from chime_dash.utils import read_localization_yaml
+from chime_dash.app.utils.templates import read_localization_yaml
 
 LOCALIZATION_FILE = "sidebar.yml"
 

src/chime_dash/layout/sidebar.py renamed to src/chime_dash/app/components/sidebar.py

@@ -13,8 +13,8 @@
 from penn_chime.parameters import Parameters
 
 
-from chime_dash.utils import read_localization_yaml, df_to_html_table
-from chime_dash.plotting import plot_dataframe
+from chime_dash.app.utils.templates import read_localization_yaml, df_to_html_table
+from chime_dash.app.services.plotting import plot_dataframe
 
 LOCALIZATION_FILE = "visualizations.yml"
 

src/chime_dash/layout/visualizations.py renamed to src/chime_dash/app/components/visualizations.py

@@ -0,0 +1,28 @@
+"""pages/index
+Homepage
+"""
+from typing import List
+
+import dash_html_components as html
+import dash_bootstrap_components as dbc
+from dash.development.base_component import ComponentMeta
+
+from chime_dash.app.components import navbar
+from chime_dash.app.static.homepage import introducing_chime, latest_updates
+
+
+def render (language: str) -> List[ComponentMeta]:
+    """Initializes page
+    """
+    layout = html.Div(
+        [
+            dbc.Row(navbar.setup(language)),
+            dbc.Col(
+                children=introducing_chime('en')
+            ),
+            dbc.Col(
+                children=latest_updates('en')
+            )
+        ]
+    )
+    return layout