Renamed help to infobar, updated logo specification and version

app.py

@@ -1,6 +1,6 @@
 from dash import html, Dash
 import dash_bootstrap_components as dbc
-from obsidian.dash import setup_data, setup_config, setup_optimize, setup_plots, setup_predict, setup_help
+from obsidian.dash import setup_data, setup_config, setup_optimize, setup_plots, setup_predict, setup_infobar
 import pandas as pd
 from PIL import Image
 
@@ -15,7 +15,7 @@
 dbc_css = "https://cdn.jsdelivr.net/gh/AnnMarieW/dash-bootstrap-templates/dbc.min.css"  # For data tables
 app.config.external_stylesheets = [dbc.themes.SANDSTONE, dbc_css, dbc.icons.BOOTSTRAP]
 
-logo = Image.open('docs/figures/obsidian_logo.png')
+logo = Image.open('docs/_static/obsidian_logo.png')
 
 app_image = html.Div(html.Img(src=logo, style={'width': '5%', 'height': '5%'}), style={'textAlign': 'center'})
 app_title = html.Div([html.H1(children='obsidian'),
@@ -45,7 +45,7 @@
 default_data = pd.concat([X0, y0], axis=1)
 
 # Set up each tab
-setup_help(app, app_infobar)
+setup_infobar(app, app_infobar)
 setup_data(app, app_tabs, default_data)
 setup_config(app, app_tabs)
 setup_optimize(app, app_tabs)

obsidian/dash/__init__.py

@@ -5,4 +5,4 @@
 from .optimize import *
 from .plots import *
 from .predict import *
-from .help import *
+from .infobar import *

obsidian/dash/help.py → obsidian/dash/infobar.py

@@ -4,38 +4,43 @@
 
 import pandas as pd
 
+import obsidian
 from obsidian.experiment import ParamSpace
 from obsidian.optimizer import BayesianOptimizer
 from obsidian.plotting.plotly import parity_plot
 from .utils import load_optimizer, center
 
 
-def setup_help(app, app_infobar):
-
+def setup_infobar(app, app_infobar):
+    # Infobar = 3 columns [Help, version, Contact]
     app_infobar.children = dbc.Container([
+        html.Br(),
         dbc.Row([
             dbc.Col(dbc.Button('Help', outline='True', color='warning', className='me-1', id='button-help'),
                     style={'textAlign': 'left'}, width={'size': 2}),
-            dbc.Col(html.Div(dbc.Badge('v0.1.1', color='primary', className='me-1'), style={'textAlign': 'center'}),
+            dbc.Col(html.Div(dbc.Badge(f'v{obsidian.__version__}', color='primary', className='me-1'), style={'textAlign': 'center'}),
                     width={'size': 2}),
             dbc.Col(dbc.Button('Contact', outline='True', color='secondary', className='me-1', id='button-contact'),
                     style={'textAlign': 'right'}, width={'size': 2}),
             ], justify='center'),
+        # Pop-up for Contact Us
         dbc.Modal([
             dbc.ModalHeader(dbc.ModalTitle('Contact Us')),
             dbc.ModalBody([
-                dbc.Button('Email Support', href='', external_link=True,
+                dbc.Button('Email Developers', href='mailto:kevin.stone38@gmail.com', external_link=True,
                            color='primary', className='me-1'),
-                dbc.Button('Visit Our Site', href='', target='_blank', external_link=True,
+                dbc.Button('Visit Our Site', href='https://msdllcpapers.github.io/obsidian/', target='_blank', external_link=True,
                            color='primary', className='me-1')
                 ], style={'textAlign': 'center'}),
             dbc.ModalFooter([])
             ], id='modal-contact', is_open=False, size='xl', centered=True),
+        # Pop-up for Help
         dbc.Modal([
             dbc.ModalHeader(dbc.ModalTitle('Help: APO with the obsidian Web App')),
             dbc.ModalBody('Coming soon...'),
             dbc.ModalFooter([])
-            ], id='modal-help', is_open=False, size='xl', centered=True)
+            ], id='modal-help', is_open=False, size='xl', centered=True),
+        html.Br()
         ], fluid=True)
 
     setup_help_callbacks(app)