Update app.py

app.py

@@ -1,162 +1,120 @@
-import faicons as fa
-import plotly.express as px
-
-# Load data and compute static values
-from shared import app_dir, tips
-from shinywidgets import render_plotly
-
-from shiny import reactive, render
-from shiny.express import input, ui
-
-bill_rng = (min(tips.total_bill), max(tips.total_bill))
-
-# Add page title and sidebar
-ui.page_opts(title="Restaurant tipping", fillable=True)
-
-with ui.sidebar(open="desktop"):
-    ui.input_slider(
-        "total_bill",
-        "Bill amount",
-        min=bill_rng[0],
-        max=bill_rng[1],
-        value=bill_rng,
-        pre="$",
-    )
-    ui.input_checkbox_group(
-        "time",
-        "Food service",
-        ["Lunch", "Dinner"],
-        selected=["Lunch", "Dinner"],
-        inline=True,
-    )
-    ui.input_action_button("reset", "Reset filter")
-
-# Add main content
-ICONS = {
-    "user": fa.icon_svg("user", "regular"),
-    "wallet": fa.icon_svg("wallet"),
-    "currency-dollar": fa.icon_svg("dollar-sign"),
-    "ellipsis": fa.icon_svg("ellipsis"),
-}
-
-with ui.layout_columns(fill=False):
-    with ui.value_box(showcase=ICONS["user"]):
-        "Total tippers"
-
-        @render.express
-        def total_tippers():
-            tips_data().shape[0]
-
-    with ui.value_box(showcase=ICONS["wallet"]):
-        "Average tip"
-
-        @render.express
-        def average_tip():
-            d = tips_data()
-            if d.shape[0] > 0:
-                perc = d.tip / d.total_bill
-                f"{perc.mean():.1%}"
-
-    with ui.value_box(showcase=ICONS["currency-dollar"]):
-        "Average bill"
-
-        @render.express
-        def average_bill():
-            d = tips_data()
-            if d.shape[0] > 0:
-                bill = d.total_bill.mean()
-                f"${bill:.2f}"
-
-
-with ui.layout_columns(col_widths=[6, 6, 12]):
-    with ui.card(full_screen=True):
-        ui.card_header("Tips data")
-
-        @render.data_frame
-        def table():
-            return render.DataGrid(tips_data())
-
-    with ui.card(full_screen=True):
-        with ui.card_header(class_="d-flex justify-content-between align-items-center"):
-            "Total bill vs tip"
-            with ui.popover(title="Add a color variable", placement="top"):
-                ICONS["ellipsis"]
-                ui.input_radio_buttons(
-                    "scatter_color",
-                    None,
-                    ["none", "sex", "smoker", "day", "time"],
-                    inline=True,
-                )
-
-        @render_plotly
-        def scatterplot():
-            color = input.scatter_color()
-            return px.scatter(
-                tips_data(),
-                x="total_bill",
-                y="tip",
-                color=None if color == "none" else color,
-                trendline="lowess",
-            )
-
-    with ui.card(full_screen=True):
-        with ui.card_header(class_="d-flex justify-content-between align-items-center"):
-            "Tip percentages"
-            with ui.popover(title="Add a color variable"):
-                ICONS["ellipsis"]
-                ui.input_radio_buttons(
-                    "tip_perc_y",
-                    "Split by:",
-                    ["sex", "smoker", "day", "time"],
-                    selected="day",
-                    inline=True,
-                )
-
-        @render_plotly
-        def tip_perc():
-            from ridgeplot import ridgeplot
-
-            dat = tips_data()
-            dat["percent"] = dat.tip / dat.total_bill
-            yvar = input.tip_perc_y()
-            uvals = dat[yvar].unique()
-
-            samples = [[dat.percent[dat[yvar] == val]] for val in uvals]
-
-            plt = ridgeplot(
-                samples=samples,
-                labels=uvals,
-                bandwidth=0.01,
-                colorscale="viridis",
-                colormode="row-index",
-            )
-
-            plt.update_layout(
-                legend=dict(
-                    orientation="h", yanchor="bottom", y=1.02, xanchor="center", x=0.5
-                )
-            )
-
-            return plt
-
-
-ui.include_css(app_dir / "styles.css")
-
-# --------------------------------------------------------
-# Reactive calculations and effects
-# --------------------------------------------------------
-
-
-@reactive.calc
-def tips_data():
-    bill = input.total_bill()
-    idx1 = tips.total_bill.between(bill[0], bill[1])
-    idx2 = tips.time.isin(input.time())
-    return tips[idx1 & idx2]
-
-
-@reactive.effect
-@reactive.event(input.reset)
-def _():
-    ui.update_slider("total_bill", value=bill_rng)
-    ui.update_checkbox_group("time", selected=["Lunch", "Dinner"])
+from shared import app_dir
+from utils import create_nav_button
+from shiny import App, reactive, render, ui
+import shinyswatch
+from server import create_server
+
+
+app_ui = ui.page_fluid(
+    ui.tags.style("""
+        .big-table {
+            font-size: 22px;   /* Increase font size */
+            padding: 25px;     /* Add padding for spacing */
+            width: 100%;       /* Make the card take full width */
+            overflow-x: auto;  /* Enable horizontal scrolling if needed */
+        }
+        .big-table table {
+            width: 100%;       /* Make table take full width within card */
+        }
+        .title-logo-container {
+            display: flex;
+            align-items: center;
+            gap: 15px;          /* Add some space between the logo and title */
+        }
+        .title-logo-container img {
+            max-height: 50px;   /* Adjust logo size */
+            height: auto;
+        }
+        .title-logo-container h1 {
+            margin: 0;
+            font-size: 28px;    /* Adjust title font size */
+        }
+    """),
+
+    ui.page_fillable(
+        ui.page_sidebar(
+            ui.sidebar(
+                ui.div(
+                    ui.output_image("logo"),
+                    style="display: inline-block; overflow: hidden; max-height: 70px; width: 80%;"
+                ),
+                
+                ui.card(
+                    create_nav_button(
+                        button_icon = "house",
+                        button_label_text = "Homepage",
+                        button_link = "https://www.rsginc.com",
+                        button_cls = "btn btn-secondary"
+                    ),
+                    
+                    create_nav_button(
+                        button_icon = "route",
+                        button_label_text = "Origin-Destination",
+                        button_link = "https://www.rsginc.com"
+                    ),
+                    
+                    create_nav_button(
+                        button_icon = "car",
+                        button_label_text = "Auto Travel",
+                        button_link = "https://www.rsginc.com"
+                    ),
+                    
+                    create_nav_button(
+                        button_icon = "road",
+                        button_label_text = "VMT",
+                        button_link = "https://www.rsginc.com"
+                    ),
+                    
+                    create_nav_button(
+                        button_icon = "truck",
+                        button_label_text = "Truck",
+                        button_link = "https://www.rsginc.com"
+                    ),
+                    
+                    create_nav_button(
+                        button_icon = "plane",
+                        button_label_text = "Air Travels",
+                        button_link = "https://www.rsginc.com"
+                    ),
+                ),
+                
+                open="desktop",
+            ),
+
+            ui.include_css(app_dir / "styles.css"),
+            #title="NAPA Valley Travels",            
+            ui.div(
+                ui.tags.div(
+                    # ui.img(
+                    #     src="images/logo.jpg", 
+                    #     style="max-height: 50px; height: auto;"
+                    # ),
+                    ui.h1("NAPA Valley Travels", style="margin: 0; font-size: 28px; font-weight: bold;"),
+                    class_="title-logo-container"
+                ),
+                style="padding-bottom: 20px;"
+            ),
+            ui.div(
+            ui.h2("Bar Chart", style="text-align: center;"),
+            ui.output_plot("bar_chart"),  # Placeholder for bar chart
+            class_="chart-container",
+            ),
+            ui.div(
+                ui.h2("Trip Purposes", style="text-align: center;"),
+                ui.output_plot("pie_chart"),  # Placeholder for pie chart
+                class_="chart-container",
+            ),
+            fillable=True,
+        )
+    ), theme=shinyswatch.theme.spacelab,
+)
+
+# def server(input, output, session):
+#     @render.image
+#     def logo():
+#         img = {"src": app_dir / "images" / "logo.png", "style": "width: 80%; height: auto; max-height: 150px; margin-bottom: 0px;"}
+#         return img
+
+app = App(app_ui, create_server(app_dir))
+#app = App(app_ui, server)
+app.run()