Update server.py

server.py

@@ -1,75 +1,83 @@
-# server.py
-import matplotlib.pyplot as plt
-from shiny import render, ui
-import faicons as fa
-#from fontawesomefree import icons
-
-
-def create_server(app_dir):
-    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
-
-        @render.plot
-        def bar_chart():
-            # Sample data for bar chart
-            categories = ["Category A", "Category B", "Category C"]
-            values = [10, 20, 30]
-
-            fig, ax = plt.subplots()
-            ax.bar(categories, values, color=["#1f77b4", "#ff7f0e", "#2ca02c"])
-            ax.set_title("Bar Chart Example")
-            ax.set_ylabel("Values")
-            ax.set_xlabel("Categories")
-
-            return fig
-
-        @render.plot
-        def pie_chart():
-            # Data for pie chart
-            labels = ["Home-Based Work", "Home-Based Other", "Non-Home-Based"]
-            #labels = [f"{icons['fa-car']} Cars", f"{icons['fa-bicycle']} Bikes", f"{icons['fa-bus']} Buses"]
-            #labels = [f"{fa.icon_svg("briefcase")} Cars", f"{fa.icon_svg("briefcase")} Bikes", f"{fa.icon_svg("briefcase")} Buses"]
-            
-
-            sizes = [22, 41, 37]
-            colors = ["#00b3b3", "#70d281", "#ff7f0e"]
-            explode = (0.1, 0, 0)  # Explode the first slice for emphasis
-
-            fig, ax = plt.subplots()
-            wedges, texts, autotexts = ax.pie(
-                sizes,
-                explode=explode,
-                labels=labels,
-                autopct="%1.0f%%",
-                startangle=90,
-                colors=colors,
-                textprops=dict(color="black"),
-                wedgeprops=dict(width=0.4)  # Adjust width for the donut effect
-            )
-
-            # Customizing the labels
-            for text, label in zip(autotexts, labels):
-                text.set_color("black")
-                text.set_fontsize(12)
-
-            # Generate the SVG icons as strings
-            #briefcase_icon = fa.icon_svg("briefcase", fill="#00b3b3")
-            #shopping_cart_icon = fa.icon_svg("cart-shopping", fill="#70d281")
-            #map_marker_icon = fa.icon_svg("umbrella-beach", fill="#ff7f0e")
-
-            # Add the SVG icons to the plot
-            #ax.text(-1.5, 0.7, briefcase_icon, ha="center", va="center", fontsize=12)
-            #ax.text(1.5, 0.7, shopping_cart_icon, ha="center", va="center", fontsize=12)
-            #ax.text(0, -1.3, map_marker_icon, ha="center", va="center", fontsize=12)
-
-            # Title styling
-            #ax.set_title("Trip Purposes", fontsize=16, fontweight="bold")
-            return fig
-                
-    return server
+# server.py
+import matplotlib.pyplot as plt
+from shiny import render, ui
+import faicons as fa
+#from fontawesomefree import icons
+
+
+def create_server(app_dir):
+    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
+
+        @render.image
+        def logo2():
+            img = {
+                "src": app_dir / "images" / "logo2.png",
+                "style": "width: 80%; height: auto; max-height: 150px; margin-bottom: 0px;"
+            }
+            return img
+
+        @render.plot
+        def bar_chart():
+            # Sample data for bar chart
+            categories = ["Category A", "Category B", "Category C"]
+            values = [10, 20, 30]
+
+            fig, ax = plt.subplots()
+            ax.bar(categories, values, color=["#1f77b4", "#ff7f0e", "#2ca02c"])
+            ax.set_title("Bar Chart Example")
+            ax.set_ylabel("Values")
+            ax.set_xlabel("Categories")
+
+            return fig
+
+        @render.plot
+        def pie_chart():
+            # Data for pie chart
+            labels = ["Home-Based Work", "Home-Based Other", "Non-Home-Based"]
+            #labels = [f"{icons['fa-car']} Cars", f"{icons['fa-bicycle']} Bikes", f"{icons['fa-bus']} Buses"]
+            #labels = [f"{fa.icon_svg("briefcase")} Cars", f"{fa.icon_svg("briefcase")} Bikes", f"{fa.icon_svg("briefcase")} Buses"]
+            
+
+            sizes = [22, 41, 37]
+            colors = ["#00b3b3", "#70d281", "#ff7f0e"]
+            explode = (0.1, 0, 0)  # Explode the first slice for emphasis
+
+            fig, ax = plt.subplots()
+            wedges, texts, autotexts = ax.pie(
+                sizes,
+                explode=explode,
+                labels=labels,
+                autopct="%1.0f%%",
+                startangle=90,
+                colors=colors,
+                textprops=dict(color="black"),
+                wedgeprops=dict(width=0.4)  # Adjust width for the donut effect
+            )
+
+            # Customizing the labels
+            for text, label in zip(autotexts, labels):
+                text.set_color("black")
+                text.set_fontsize(12)
+
+            # Generate the SVG icons as strings
+            #briefcase_icon = fa.icon_svg("briefcase", fill="#00b3b3")
+            #shopping_cart_icon = fa.icon_svg("cart-shopping", fill="#70d281")
+            #map_marker_icon = fa.icon_svg("umbrella-beach", fill="#ff7f0e")
+
+            # Add the SVG icons to the plot
+            #ax.text(-1.5, 0.7, briefcase_icon, ha="center", va="center", fontsize=12)
+            #ax.text(1.5, 0.7, shopping_cart_icon, ha="center", va="center", fontsize=12)
+            #ax.text(0, -1.3, map_marker_icon, ha="center", va="center", fontsize=12)
+
+            # Title styling
+            ax.set_title("What Types of Trips are Occuring within Napa County on a Weekday?", fontsize=16, fontweight="bold")
+            return fig
+                
+    return server