Update app.R

app.R

@@ -1,5 +1,5 @@
 library(shiny)
-library(shinydashboard)
+library(bslib)
 library(shinyWidgets)
 library(ggplot2)
 library(MASS)  # For kde2d function
@@ -60,7 +60,7 @@ heatMap <- function(data, gtitle, concen) {
       panel.background = element_rect(fill = "#333333", color = NA),
       text = element_text(color = "white"),
       panel.grid = element_blank(),
-      plot.title = element_text(hjust = 0.5)  # Center the title
+      plot.title = element_text(hjust = 0.5)
     )
 }
 
@@ -68,133 +68,85 @@ mlb <- download_private_csv("TimStats/MiLBStatcast", paste0("MLB", "24T", ".csv"
 aaa <- download_private_csv("TimStats/MiLBStatcast", paste0("AAA", "24T", ".csv"))
 fsl <- download_private_csv("TimStats/MiLBStatcast", paste0("FSL", "24T", ".csv"))
 
-# ... (previous library imports and functions remain the same)
-
-ui <- dashboardPage(
-  skin = "black",  # Use the black skin for a darker theme
-  dashboardHeader(title = "Player Analysis Dashboard"),
-  dashboardSidebar(
-    sidebarMenu(
-      menuItem("Player Selection", tabName = "player", icon = icon("user"))
-    )
-  ),
-  dashboardBody(
-    tags$head(
-      tags$style(HTML("
-        .content-wrapper, .right-side {
-          background-color: #333333;
-        }
-        .box {
-          background-color: #444444;
-          border-top: none;
-          color: #ffffff;
-        }
-        .box-header {
-          color: #ffffff;
-        }
-        .form-control {
-          background-color: #e0e0e0;
-          color: #333333;
-          border: 1px solid #777777;
-        }
-        .selectize-input {
-          background-color: #e0e0e0;
-          color: #333333;
-        }
-        .selectize-dropdown {
-          background-color: #e0e0e0;
-          color: #333333;
-        }
-        .selectize-dropdown-content {
-          background-color: #e0e0e0;
-          color: #333333;
-        }
-        .selectize-dropdown .active {
-          background-color: #b0b0b0;
-          color: #333333;
-        }
-        label {
-          color: #ffffff;
-        }
-        .irs-min, .irs-max, .irs-from, .irs-to, .irs-single {
-          color: #333333;
-          background-color: #e0e0e0;
-        }
-        .irs-bar {
-          border-top: 1px solid #428bca;
-          border-bottom: 1px solid #428bca;
-          background: #428bca;
-        }
-        .irs-line {
-          background: #e0e0e0;
-          border: 1px solid #777777;
-        }
-        .daterangepicker {
-          background-color: #e0e0e0;
-          color: #333333;
-        }
-        .daterangepicker .calendar-table {
-          background-color: #e0e0e0;
-        }
-        .daterangepicker td.active, .daterangepicker td.active:hover {
-          background-color: #007bff;
-          color: #ffffff;
-        }
-        .daterangepicker td.available:hover, .daterangepicker th.available:hover {
-          background-color: #b0b0b0;
-        }
-        .daterangepicker .calendar-table .next span, .daterangepicker .calendar-table .prev span {
-          color: #333333;
-        }
-        .daterangepicker .drp-selected {
-          color: #333333;
-        }
-      "))
-    ),
-    tabItems(
-      tabItem(tabName = "player",
-              fluidRow(
-                column(width = 3,
-                       box(width = NULL, title = "Pick Player Here", status = "primary",
-                           selectInput("league", "Select League:", choices = c("MLB","AAA","FSL")),
-                           selectInput("player", "Select Player:", choices = c("")),
-                           sliderInput("concen", "Heatmap Bandwidth", value = 1, step = 0.05, min = .5, max = 1.5)
-                       )
-                ),
-                column(width = 4,
-                       box(width = NULL, title = "Filters for Graph 1", status = "info",
-                           selectInput("hand1", "Batter Handedness", choices = c("All Batters","LHH","RHH")),
-                           selectInput("pitch1", "Pitch:", choices = c("")),
-                           dateRangeInput("date1", "Date Range:", start = "2024-02-09", end = "2024-09-05")
-                       )
-                ),
-                column(width = 4,
-                       box(width = NULL, title = "Filters for Graph 2", status = "success",
-                           selectInput("hand2", "Batter Handedness", choices = c("All Batters","LHH","RHH")),
-                           selectInput("pitch2", "Pitch:", choices = c("")),
-                           dateRangeInput("date2", "Date Range:", start = "2024-02-09", end = "2024-09-05")
-                       )
-                )
-              ),
-              fluidRow(
-                column(width = 7,
-                       box(width = NULL, title = "Combined Heatmap", status = "warning",
-                           plotOutput("combined_graph", height = "600px")
-                       )
-                )
-              )
+ui <- page_fluid(
+  theme = bs_theme(bg = "#333333", fg = "#ffffff", primary = "#428bca"),
+  
+  card(
+    card_header("Player Selection"),
+    layout_sidebar(
+      sidebar = sidebar(
+        selectInput("league", "Select League:", choices = c("MLB","AAA","FSL")),
+        selectInput("player", "Select Player:", choices = c("")),
+        sliderInput("concen", "Heatmap Bandwidth", value = 1, step = 0.05, min = .5, max = 1.5)
+      ),
+      card(
+        layout_columns(
+          col_widths = c(6, 6),
+          card(
+            selectInput("hand1", "Batter Handedness", choices = c("All Batters","LHH","RHH")),
+            selectInput("pitch1", "Pitch:", choices = c("")),
+            dateRangeInput("date1", "Date Range:", start = "2024-02-09", end = "2024-09-05")
+          ),
+          card(
+            selectInput("hand2", "Batter Handedness", choices = c("All Batters","LHH","RHH")),
+            selectInput("pitch2", "Pitch:", choices = c("")),
+            dateRangeInput("date2", "Date Range:", start = "2024-02-09", end = "2024-09-05")
+          )
+        )
+      ),
+      card(
+        downloadButton("download", "Download Plot", class = "btn-primary mb-3"),
+        plotOutput("combined_graph", height = "600px")
       )
     )
   )
 )
 
-
 server <- function(input, output, session) {
-  
   pname <- reactiveVal()
   
+  plot_data <- reactive({
+    t <- pname()
+    
+    # Function to filter data based on inputs
+    filter_data <- function(hand, pitch, date_range) {
+      data <- if(hand == "All Batters") {
+        t %>% filter(`Pitcher.Name` == input$player)
+      } else if(hand == "LHH") {
+        t %>% filter(bhand == "L", `Pitcher.Name` == input$player)
+      } else {
+        t %>% filter(bhand == "R", `Pitcher.Name` == input$player)
+      }
+      
+      data %>%
+        filter(pitch_name == pitch) %>%
+        filter(between(as.Date(date), date_range[1], date_range[2]))
+    }
+    
+    graph1_data <- filter_data(input$hand1, input$pitch1, input$date1)
+    graph2_data <- filter_data(input$hand2, input$pitch2, input$date2)
+    
+    title1 <- paste0(input$player, " ", input$pitch1, " vs. ", input$hand1, "\n", input$date1[1], " to ", input$date1[2])
+    title2 <- paste0(input$player, " ", input$pitch2, " vs. ", input$hand2, "\n", input$date2[1], " to ", input$date2[2])
+    
+    plot1 <- heatMap(graph1_data, title1, input$concen)
+    plot2 <- heatMap(graph2_data, title2, input$concen)
+    
+    plot1 + plot2 + 
+      plot_layout(ncol = 2) +
+      plot_annotation(
+        title = paste0(input$player, " Pitch Comparison"),
+        theme = theme(
+          plot.title = element_text(hjust = 0.5, size = 20, color = "white"),
+          plot.background = element_rect(fill = "#333333", color = NA),
+          plot.margin = margin(0, 0, 0, 0)
+        )
+      ) &
+      theme(plot.margin = margin(0, 0, 0, 0))
+  })
+  
   observeEvent(input$league, {
-    req(input$league)  # Ensure league input is available
+    req(input$league)
     tryCatch({
       if(input$league == "MLB"){
         t <- mlb
@@ -242,47 +194,17 @@ server <- function(input, output, session) {
   })
   
   output$combined_graph <- renderPlot({
-    
-    t <- pname()
-    
-    # Function to filter data based on inputs
-    filter_data <- function(hand, pitch, date_range) {
-      data <- if(hand == "All Batters") {
-        t %>% filter(`Pitcher.Name` == input$player)
-      } else if(hand == "LHH") {
-        t %>% filter(bhand == "L", `Pitcher.Name` == input$player)
-      } else {
-        t %>% filter(bhand == "R", `Pitcher.Name` == input$player)
-      }
-      
-      data %>%
-        filter(pitch_name == pitch) %>%
-        filter(between(as.Date(date), date_range[1], date_range[2]))
-    }
-    
-    graph1_data <- filter_data(input$hand1, input$pitch1, input$date1)
-    graph2_data <- filter_data(input$hand2, input$pitch2, input$date2)
-    
-    title1 <- paste0(input$player, " ", input$pitch1, " vs. ", input$hand1, "\n", input$date1[1], " to ", input$date1[2])
-    title2 <- paste0(input$player, " ", input$pitch2, " vs. ", input$hand2, "\n", input$date2[1], " to ", input$date2[2])
-    
-    plot1 <- heatMap(graph1_data, title1, input$concen)
-    plot2 <- heatMap(graph2_data, title2, input$concen)
-    
-    combined_plot <- plot1 + plot2 + 
-      plot_layout(ncol = 2) +
-      plot_annotation(
-        title = paste0(input$player, " Pitch Comparison"),
-        theme = theme(
-          plot.title = element_text(hjust = 0.5, size = 20, color = "white"),
-          plot.background = element_rect(fill = "#333333", color = NA),
-          plot.margin = margin(0, 0, 0, 0)
-        )
-      ) &
-      theme(plot.margin = margin(0, 0, 0, 0))
-    
-    return(combined_plot)
+    plot_data()
   }, bg = "#333333", width = 800)
+  
+  output$download <- downloadHandler(
+    filename = function() {
+      paste0(input$player, "_pitch_comparison.png")
+    },
+    content = function(file) {
+      ggsave(file, plot = plot_data(), width = 12, height = 8, dpi = 300)
+    }
+  )
 }
 
 shinyApp(ui = ui, server = server)