Update app.py

app.py

@@ -1,10 +1,9 @@
 from shared import app_dir
 from utils import create_nav_button
-from shiny import App, reactive, render, ui
+from shiny import App, ui
 import shinyswatch
 from server import create_server
 
-
 app_ui = ui.page_fluid(
     ui.tags.style("""
         .big-table {
@@ -28,29 +27,31 @@ app_ui = ui.page_fluid(
         .title-logo-container h1 {
             margin: 0;
             font-size: 28px;    /* Adjust title font size */
+            font-weight: bold;  /* Make it bold */
         }
     """),
-
     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.output_image("logo2"),
+                    style="display: inline-block; overflow: hidden; max-height: 75px; width: 90%;"
                 ),
-                
                 ui.card(
                     create_nav_button(
-                        button_icon = "house",
-                        button_label_text = "Homepage",
-                        button_link = "https://www.rsginc.com",
-                        button_cls = "btn btn-secondary"
+                        button_icon="house",
+                        button_label_text="Homepage",
+                        button_link="https://rsginc-nvtbs.hf.space",
+                        #button_cls="btn btn-secondary"
                     ),
                     
+                    
+                    
                     create_nav_button(
                         button_icon = "route",
                         button_label_text = "Origin-Destination",
-                        button_link = "https://www.rsginc.com"
+                        button_link = "https://rsginc-nvtbsod.hf.space",
+                        button_cls="btn btn-secondary"
                     ),
                     
                     create_nav_button(
@@ -62,62 +63,72 @@ app_ui = ui.page_fluid(
                     create_nav_button(
                         button_icon = "road",
                         button_label_text = "VMT",
-                        button_link = "https://www.rsginc.com"
+                        button_link = "https://rsginc-nvtbsvmt.hf.space"
                     ),
                     
                     create_nav_button(
                         button_icon = "truck",
                         button_label_text = "Truck",
-                        button_link = "https://www.rsginc.com"
+                        button_link = "https://rsginc-nvtbstruck.hf.space"
                     ),
                     
                     create_nav_button(
                         button_icon = "plane",
                         button_label_text = "Air Travels",
-                        button_link = "https://www.rsginc.com"
-                    ),
+                        button_link = "https://rsginc-nvtbsfly.hf.space"
+                    ),    
+                ),
+                ui.div(
+                    ui.output_image("logo"),
+                    style="display: inline-block; overflow: hidden; max-height: 40px; width: 50%;"
                 ),
-                
                 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",
+            # Tabs inside a card
+            ui.card(
+                ui.navset_card_underline(
+                    ui.nav_panel(
+                        "Bar Chart",
+                        ui.div(
+                            ui.h2("Bar Chart", style="text-align: center;"),
+                            ui.output_plot("bar_chart"),  # Output for bar chart
+                            class_="chart-container",
+                        ),
+                    ),
+                    ui.nav_panel(
+                        "Pie Chart",
+                        ui.div(
+                            ui.h2("Pie Chart", style="text-align: center;"),
+                            ui.output_plot("pie_chart"),  # Output for pie chart
+                            class_="chart-container",
+                        ),
+                    ),
+                    ui.nav_panel(
+                        "Blank Tab",
+                        ui.div(
+                            ui.h2("Coming Soon...", style="text-align: center;"),
+                            class_="chart-container",
+                        ),
+                    ),
+                ),
+                style="padding: 10px; margin-top: 20px;",
+                class_="tabbed-card",
             ),
-            fillable=True,
         )
-    ), theme=shinyswatch.theme.spacelab,
+    ),
+    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()
 
 if __name__ == "__main__":
     import asyncio