Update app.R

app.R

@@ -1,6 +1,5 @@
 # app.R
 library(shiny)
-#library(tidyverse)
 library(ggplot2)
 library(dplyr)
 library(patchwork)
@@ -14,72 +13,18 @@ library(bslib)
 library(jsonlite)
 library(arrow)
 
-check_patreon_access <- function(email) {
-  campaign_id <- Sys.getenv("PATREON_CAMPAIGN_ID")
-  access_token <- Sys.getenv("PATREON_ACCESS_TOKEN")
-  
-  base_url <- paste0("https://www.patreon.com/api/oauth2/v2/campaigns/", campaign_id, "/members")
-  
-  params <- list(
-    `include` = "currently_entitled_tiers",
-    `fields[member]` = "patron_status,email",
-    `fields[tier]` = "title"
-  )
-  
-  response <- GET(
-    base_url,
-    query = params,
-    add_headers(
-      `Authorization` = paste("Bearer", access_token),
-      `User-Agent` = "R/httr"
-    )
-  )
-  
-  content <- fromJSON(rawToChar(response$content))
-  
-  # Check in data$attributes for matching email
-  matching_row <- which(content$data$attributes$email == email)
-  
-  if (length(matching_row) > 0) {
-    # Get patron status
-    patron_status <- content$data$attributes$patron_status[matching_row]
-    
-    if (patron_status == "active_patron") {
-      # Get tier info
-      tier_data <- content$data$relationships$currently_entitled_tiers$data[[matching_row]]
-
-      tier_id <- tier_data$id
-      
-      result <- tier_id %in% c("25062087", "25062090")
-      
-      return(result)
-    }
-  }
-  
-  return(FALSE)
-}
-
 download_private_parquet <- function(repo_id, filename) {
-  library(httr)
-  library(arrow)
-  
-  # Create the direct download URL based on your example
   url <- paste0("https://huggingface.co/datasets/", repo_id, "/resolve/main/", filename, "?download=true")
-  
-  # Create a temporary file
   temp_file <- tempfile(fileext = ".parquet")
   
-  # Download directly to file
   response <- GET(
     url,
     add_headers(Authorization = paste("Bearer", Sys.getenv("GETCSV"))),
     write_disk(temp_file, overwrite = TRUE)
   )
   
-  # Check if download was successful
   if (status_code(response) == 200) {
     tryCatch({
-      # Read the parquet file
       data <- read_parquet(temp_file)
       file.remove(temp_file)
       return(data)
@@ -96,27 +41,22 @@ download_private_parquet <- function(repo_id, filename) {
 font_add_google("Roboto Condensed")
 
 is_barrel <- function(df) {
-    df$barrel <- with(df, ifelse(hit_angle <= 50 & hit_speed >= 97 & hit_speed * 1.5 - 
-                                     hit_angle >= 117 & hit_speed + hit_angle >= 123, 1, 0))
-    return(df)
+  df$barrel <- with(df, ifelse(hit_angle <= 50 & hit_speed >= 97 & hit_speed * 1.5 -
+                                 hit_angle >= 117 & hit_speed + hit_angle >= 123, 1, 0))
+  return(df)
 }
 
 apply_percentile_calcs <- function(data) {
-  # List of columns to apply percent_rank
   percent_rank_cols <- c("Z-Con%", "Z-Swing%", "O-Con%", "Avg EV", "Max EV", "EV90", "Barrel%", "Swing%", "wOBA",
-                         "wOBACON","xwOBA","xDamage")
-  
-  # List of columns to apply inverse percent_rank
+                         "wOBACON", "xwOBA", "xDamage")
   inverse_percent_rank_cols <- c("Chase%", "Whiff%", "stdev(LA)", "SwStr%")
   
-  # Create an empty list to store results
   percentile_list <- list()
   
-  # Calculate regular percentiles
-  for(col in percent_rank_cols) {
+  for (col in percent_rank_cols) {
     percentile_list[[col]] <- data.frame(
-      `Batter Name` = data[["Batter Name"]],  # Using [[ ]] to preserve exact column name
-      `Batter ID` = data[["Batter ID"]],      # Using [[ ]] to preserve exact column name
+      `Batter Name` = data[["Batter Name"]],
+      `Batter ID` = data[["Batter ID"]],
       metric = col,
       percentile = round(percent_rank(data[[col]]) * 100),
       value = data[[col]],
@@ -124,11 +64,10 @@ apply_percentile_calcs <- function(data) {
     )
   }
   
-  # Calculate inverse percentiles
-  for(col in inverse_percent_rank_cols) {
+  for (col in inverse_percent_rank_cols) {
     percentile_list[[col]] <- data.frame(
-      `Batter Name` = data[["Batter Name"]],  # Using [[ ]] to preserve exact column name
-      `Batter ID` = data[["Batter ID"]],      # Using [[ ]] to preserve exact column name
+      `Batter Name` = data[["Batter Name"]],
+      `Batter ID` = data[["Batter ID"]],
       metric = col,
       percentile = round((1 - percent_rank(data[[col]])) * 100),
       value = data[[col]],
@@ -136,80 +75,60 @@ apply_percentile_calcs <- function(data) {
     )
   }
   
-  # Combine all results into one data frame
   result <- do.call(rbind, percentile_list)
-  
-  # Reset row names
   rownames(result) <- NULL
-  
   return(result)
 }
 
 get_player_image <- function(player_id) {
-  # Try MLB silo image first
   silo_url <- sprintf("https://img.mlbstatic.com/mlb-photos/image/upload/w_200,q_auto:best/v1/people/%s/headshot/silo/current", player_id)
   
-  # Check if silo works
   silo_result <- tryCatch({
     response <- httr::HEAD(silo_url)
     httr::status_code(response) == 200
   }, error = function(e) FALSE)
   
-  # If silo fails, use MiLB with correct formatting
   if (!silo_result) {
     return(sprintf("https://img.mlbstatic.com/mlb-photos/image/upload/c_fill,g_auto,b_white,ar_1:1/w_180/v1/people/%s/headshot/milb/current", player_id))
   }
   
-  # Return silo if it worked
   return(silo_url)
 }
 
 get_player_info <- function(player_id, season, level = "MLB") {
-  # Initialize return values
   team <- "MLB"
   position <- NA
   
-  # If MLB level, use original endpoint
-  if(level == "MLB") {
-    url <- paste0("https://statsapi.mlb.com/api/v1/people/", player_id, 
+  if (level == "MLB") {
+    url <- paste0("https://statsapi.mlb.com/api/v1/people/", player_id,
                   "/stats?stats=season&season=", season, "&group=hitting")
-    
     response <- httr::GET(url)
     data <- httr::content(response, "parsed")
     
-    if(length(data$stats) > 0 && length(data$stats[[1]]$splits) > 0) {
+    if (length(data$stats) > 0 && length(data$stats[[1]]$splits) > 0) {
       team <- data$stats[[1]]$splits[[length(data$stats[[1]]$splits)]]$team$name
     }
   } else {
-    # For minor leagues, get player info from sports endpoint
-    sport_code <- if(level == "AAA") "11" else "14"  # 11 for AAA, 14 for FSL
+    sport_code <- if (level == "AAA") "11" else "14"
     url <- paste0("https://statsapi.mlb.com/api/v1/sports/", sport_code, "/players?season=", season)
-    
     response <- httr::GET(url)
-    # Convert response to data frame
     players_df <- jsonlite::fromJSON(rawToChar(response$content), flatten = TRUE)$people
-    
-    # Find player directly
     found_player <- players_df[players_df$id == player_id, ]
     
-    if(nrow(found_player) > 0) {
+    if (nrow(found_player) > 0) {
       team_id <- found_player$currentTeam.id
-      
-      # Get parent org using team id
       team_url <- paste0("https://statsapi.mlb.com/api/v1/teams/", team_id, "?season=", season)
       team_response <- httr::GET(team_url)
       team_data <- jsonlite::fromJSON(rawToChar(team_response$content))
-      
       team <- team_data$teams$parentOrgName
     }
   }
   
-  # Get position info (same for all levels)
   url2 <- paste0("https://statsapi.mlb.com/api/v1/people/", player_id)
   response2 <- httr::GET(url2)
   data2 <- httr::content(response2, "parsed")
   
-  if(length(data2$people) > 0) {
+  if (length(data2$people) > 0) {
     full_position <- data2$people[[1]]$primaryPosition$name
     position <- case_when(
       full_position == "First Base" ~ "1B",
@@ -229,10 +148,7 @@ get_player_info <- function(player_id, season, level = "MLB") {
     )
   }
   
-  return(list(
-    team = team,
-    position = position
-  ))
+  return(list(team = team, position = position))
 }
 
 download_private_csv <- function(repo_id, filename) {
@@ -242,13 +158,7 @@ download_private_csv <- function(repo_id, filename) {
   if (status_code(response) == 200) {
     content <- content(response, "text")
     con <- textConnection(content)
-    
-    # Try different read options
-    data <- read.csv(con, 
-                     header = TRUE,
-                     check.names = FALSE,  # This prevents R from modifying column names
-                     fileEncoding = "UTF-8",
-                     stringsAsFactors = FALSE)
+    data <- read.csv(con, header = TRUE, check.names = FALSE, fileEncoding = "UTF-8", stringsAsFactors = FALSE)
     close(con)
     return(data)
   } else {
@@ -256,49 +166,46 @@ download_private_csv <- function(repo_id, filename) {
   }
 }
 
+# ---- Data Loading ----
 MLB25 <- download_private_parquet("TimStats/StatcastDataAll", "MLB25.parquet")
 MLB25$level <- "MLB"
 AAA25 <- download_private_parquet("TimStats/StatcastDataAll", "AAA25.parquet")
 AAA25$level <- "AAA"
 FSL25 <- download_private_parquet("TimStats/StatcastDataAll", "FSL25.parquet")
 FSL25$level <- "FSL"
-#ST <- read.csv("SpringT25.csv", header = TRUE, check.names = FALSE, fileEncoding = "UTF-8")
 
 MLB26 <- download_private_parquet("TimStats/StatcastDataAll", "MLB26.parquet")
 MLB26$level <- "MLB"
 AAA26 <- download_private_parquet("TimStats/StatcastDataAll", "AAA26.parquet")
 AAA26$level <- "AAA"
-#FSL26 <- download_private_parquet("TimStats/StatcastDataAll", "FSL26.parquet")
-#FSL26$level <- "FSL"
 
-                          
-#names(ST)
 MLB <- download_private_parquet("TimStats/StatcastDataAll", "MLB.parquet")
 MLB$level <- "MLB"
 AAA <- download_private_parquet("TimStats/StatcastDataAll", "AAA.parquet")
 AAA$level <- "AAA"
 FSLAll <- download_private_parquet("TimStats/StatcastDataAll", "FSL.parquet")
 FSLAll$level <- "FSL"
-MLB <- rbind(MLB,MLB25,MLB26)
+
+MLB <- rbind(MLB, MLB25, MLB26)
 print("aaa")
-AAA <- rbind(AAA,AAA25,AAA26)
+AAA <- rbind(AAA, AAA25, AAA26)
 print("fsl")
-FSL <- rbind(FSLAll,FSL25)
+FSL <- rbind(FSLAll, FSL25)
 
-                          
 temp_players <- MLB %>% filter(season == 2026)
-MLBC <- rbind(MLB,AAA,FSLAll)
+MLBC <- rbind(MLB, AAA, FSLAll)
+
 data <- is_barrel(MLBC) %>%
   mutate(
-    BBE = case_when(description %in% c('In play, run(s)','In play, out(s)','In play, no out') ~ TRUE, TRUE ~ FALSE),
-    Swing = case_when(description %in% c('Foul','Foul Bunt','Foul Pitchout','Foul Tip',
-                                         'In play, run(s)','In play, out(s)','In play, no out',
-                                         'Swinging Strike','Swinging Strike (Blocked)',
+    BBE = case_when(description %in% c('In play, run(s)', 'In play, out(s)', 'In play, no out') ~ TRUE, TRUE ~ FALSE),
+    Swing = case_when(description %in% c('Foul', 'Foul Bunt', 'Foul Pitchout', 'Foul Tip',
+                                         'In play, run(s)', 'In play, out(s)', 'In play, no out',
+                                         'Swinging Strike', 'Swinging Strike (Blocked)',
                                          'Missed Bunt') ~ TRUE, TRUE ~ FALSE),
-    Contact = case_when(description %in% c('In play, run(s)','In play, out(s)','In play, no out',
-                                           'Foul','Foul Bunt','Foul Pitchout') ~ TRUE, TRUE ~ FALSE),
-    Whiff = case_when(description %in% c('Swinging Strike','Swinging Strike (Blocked)',
-                                         'Missed Bunt','Foul Tip') ~ TRUE, TRUE ~ FALSE),
+    Contact = case_when(description %in% c('In play, run(s)', 'In play, out(s)', 'In play, no out',
+                                           'Foul', 'Foul Bunt', 'Foul Pitchout') ~ TRUE, TRUE ~ FALSE),
+    Whiff = case_when(description %in% c('Swinging Strike', 'Swinging Strike (Blocked)',
+                                         'Missed Bunt', 'Foul Tip') ~ TRUE, TRUE ~ FALSE),
     IZ = ifelse(zone <= 9, TRUE, FALSE),
     Single = case_when(result == "Single" & BBE == TRUE ~ TRUE, TRUE ~ FALSE),
     Double = case_when(result == "Double" & BBE == TRUE ~ TRUE, TRUE ~ FALSE),
@@ -306,208 +213,131 @@ data <- is_barrel(MLBC) %>%
     `Home Run` = case_when(result == "Home Run" & BBE == TRUE ~ TRUE, TRUE ~ FALSE),
     Walk = case_when(balls >= 4 & result == "Walk" ~ TRUE, TRUE ~ FALSE),
     HBP = case_when(description == "Hit By Pitch" & result == "Hit By Pitch" ~ TRUE, TRUE ~ FALSE),
-    Strikeout = case_when(strikes >= 3 & result %in% c("Strikeout",'Stikeout Double Play') ~ TRUE, TRUE ~ FALSE),
-    Sac = case_when(BBE == TRUE & result %in% c('Sac Fly','Sac Bunt',
-                                                'Sac Fly Double Play','Sac Bunt Double Play') ~ TRUE, TRUE ~ FALSE),
+    Strikeout = case_when(strikes >= 3 & result %in% c("Strikeout", 'Stikeout Double Play') ~ TRUE, TRUE ~ FALSE),
+    Sac = case_when(BBE == TRUE & result %in% c('Sac Fly', 'Sac Bunt',
+                                                 'Sac Fly Double Play', 'Sac Bunt Double Play') ~ TRUE, TRUE ~ FALSE),
     IBB = case_when(pitchNum == 1 & result == "Intent Walk" ~ TRUE, TRUE ~ FALSE),
     AB = Strikeout + BBE - Sac,
     PA = AB + Walk + HBP + IBB
   ) %>%
-  group_by(`Batter Name`,`Batter ID`,season,level) %>%
+  group_by(`Batter Name`, `Batter ID`, season, level) %>%
   summarise(
-    BIP = sum(BBE,na.rm = TRUE),
-    wOBA = round((sum(Single,na.rm = TRUE) * .882 + sum(Double, na.rm = TRUE) * 1.254 + 
-                    sum(Triple,na.rm = TRUE) * 1.59 + sum(`Home Run`,na.rm = TRUE) * 2.05 +
-                    sum(Walk,na.rm = TRUE) * .689 + sum(HBP,na.rm = TRUE) * .720) / 
-                   (sum(PA,na.rm = TRUE) - sum(IBB,na.rm = TRUE)), 3),
-    wOBACON = round((sum(Single,na.rm = TRUE) * .882 + sum(Double, na.rm = TRUE) * 1.254 + 
-                       sum(Triple,na.rm = TRUE) * 1.59 + sum(`Home Run`,na.rm = TRUE) * 2.05 )/ 
-                      sum(BBE,na.rm = TRUE), 3),
-    xwOBA = round(mean(expected_woba,na.rm = TRUE), 3),
-    xDamage = round(mean(expected_woba[BBE == TRUE],na.rm = TRUE), 3),
-    `Avg EV` = round(mean(hit_speed,na.rm = TRUE), 1),
-    EV90 = round(quantile(hit_speed,0.9,na.rm = TRUE), 1),
-    `Max EV` = round(max(hit_speed,na.rm = TRUE), 1),
-    'stdev(LA)' = round(sd(hit_angle,na.rm = TRUE), 1),
-    'Barrel%' = round(100 * mean(barrel[Swing == TRUE],na.rm = TRUE), 1),
-    "Z-Con%" = round(100 * mean(Contact[IZ == TRUE & Swing == TRUE],na.rm = TRUE), 1),
-    "Z-Swing%" = round(100 * mean(Swing[IZ == TRUE],na.rm = TRUE), 1),
-    "O-Con%" = round(100 * mean(Contact[IZ == FALSE & Swing == TRUE],na.rm = TRUE), 1),
-    "Chase%" = round(100 * mean(Swing[IZ == FALSE],na.rm = TRUE), 1),
-    "Whiff%" = round(100 * mean(Whiff[Swing == TRUE],na.rm = TRUE), 1),
-    "Swing%" = round(100 * mean(Swing,na.rm = TRUE), 1),
-    "SwStr%" = round(100 * mean(Whiff,na.rm = TRUE), 1)
+    BIP = sum(BBE, na.rm = TRUE),
+    wOBA = round((sum(Single, na.rm = TRUE) * .882 + sum(Double, na.rm = TRUE) * 1.254 +
+                    sum(Triple, na.rm = TRUE) * 1.59 + sum(`Home Run`, na.rm = TRUE) * 2.05 +
+                    sum(Walk, na.rm = TRUE) * .689 + sum(HBP, na.rm = TRUE) * .720) /
+                   (sum(PA, na.rm = TRUE) - sum(IBB, na.rm = TRUE)), 3),
+    wOBACON = round((sum(Single, na.rm = TRUE) * .882 + sum(Double, na.rm = TRUE) * 1.254 +
+                       sum(Triple, na.rm = TRUE) * 1.59 + sum(`Home Run`, na.rm = TRUE) * 2.05) /
+                      sum(BBE, na.rm = TRUE), 3),
+    xwOBA = round(mean(expected_woba, na.rm = TRUE), 3),
+    xDamage = round(mean(expected_woba[BBE == TRUE], na.rm = TRUE), 3),
+    `Avg EV` = round(mean(hit_speed, na.rm = TRUE), 1),
+    EV90 = round(quantile(hit_speed, 0.9, na.rm = TRUE), 1),
+    `Max EV` = round(max(hit_speed, na.rm = TRUE), 1),
+    'stdev(LA)' = round(sd(hit_angle, na.rm = TRUE), 1),
+    'Barrel%' = round(100 * mean(barrel[Swing == TRUE], na.rm = TRUE), 1),
+    "Z-Con%" = round(100 * mean(Contact[IZ == TRUE & Swing == TRUE], na.rm = TRUE), 1),
+    "Z-Swing%" = round(100 * mean(Swing[IZ == TRUE], na.rm = TRUE), 1),
+    "O-Con%" = round(100 * mean(Contact[IZ == FALSE & Swing == TRUE], na.rm = TRUE), 1),
+    "Chase%" = round(100 * mean(Swing[IZ == FALSE], na.rm = TRUE), 1),
+    "Whiff%" = round(100 * mean(Whiff[Swing == TRUE], na.rm = TRUE), 1),
+    "Swing%" = round(100 * mean(Swing, na.rm = TRUE), 1),
+    "SwStr%" = round(100 * mean(Whiff, na.rm = TRUE), 1)
   )
 
-# UI definition
+# ---- UI ----
 ui <- fluidPage(
   theme = bs_theme(bg = "#ffffff", fg = "#333333", primary = "#428bca"),
-    tagList(
-    tags$head(
-      tags$link(href = "https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;700&display=swap", 
-                rel = "stylesheet"),
-      tags$style(HTML("
-        * { font-family: 'Roboto Condensed', sans-serif !important; }
-        .login-screen {
-          max-width: 400px;
-          margin: 100px auto;
-          padding: 20px;
-          border: 1px solid #ddd;
-          border-radius: 5px;
-          box-shadow: 0 0 10px rgba(0,0,0,0.1);
-        }
-        .login-header {
-          text-align: center;
-          margin-bottom: 20px;
-        }
-      "))
+  tags$head(
+    tags$link(href = "https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;700&display=swap",
+              rel = "stylesheet"),
+    tags$style(HTML("
+      * { font-family: 'Roboto Condensed', sans-serif !important; }
+    "))
+  ),
+  titlePanel(NULL, windowTitle = "Baseball Stats Visualization"),
+  sidebarLayout(
+    sidebarPanel(
+      selectInput("szn", "Season:", c(2026, 2025, 2024, 2023, 2022, 2021)),
+      selectInput("level", "Level:", c("MLB", "AAA", "FSL")),
+      selectInput("type", "Player Type:", c("Batter", "Pitcher")),
+      selectInput("player", "Player:", choices = unique(temp_players$`Batter Name`)),
+      checkboxInput("use_custom_team", "Use Custom Team", FALSE),
+      conditionalPanel(
+        condition = "input.use_custom_team == true",
+        selectInput(
+          inputId = "team",
+          label = "Select Team",
+          choices = c(
+            "MLB" = "MLB",
+            "Angels" = "LAA",
+            "Astros" = "HOU",
+            "Athletics" = "OAK",
+            "Blue Jays" = "TOR",
+            "Braves" = "ATL",
+            "Brewers" = "MIL",
+            "Cardinals" = "STL",
+            "Cubs" = "CHC",
+            "D-backs" = "ARI",
+            "Dodgers" = "LAD",
+            "Giants" = "SF",
+            "Guardians" = "CLE",
+            "Mariners" = "SEA",
+            "Marlins" = "MIA",
+            "Mets" = "NYM",
+            "Nationals" = "WSH",
+            "Orioles" = "BAL",
+            "Padres" = "SD",
+            "Phillies" = "PHI",
+            "Pirates" = "PIT",
+            "Rangers" = "TEX",
+            "Rays" = "TB",
+            "Red Sox" = "BOS",
+            "Reds" = "CIN",
+            "Rockies" = "COL",
+            "Royals" = "KC",
+            "Tigers" = "DET",
+            "Twins" = "MIN",
+            "White Sox" = "CHW",
+            "Yankees" = "NYY"
+          ),
+          selected = "MLB"
+        )
+      )
     ),
-    
-    # Use uiOutput to conditionally render either login or main page
-    uiOutput("page")
+    mainPanel(
+      div(class = "plot-container",
+          plotOutput("statsPlot")
+      )
+    )
   )
 )
 
-# Server logic
-server <- function(input, output,session) {
+# ---- Server ----
+server <- function(input, output, session) {
 
-    # Reactive value to track authentication status
-  credentials <- reactiveValues(logged_in = FALSE)
-  
-  # Render login page or main content based on auth status
-  output$page <- renderUI({
-   # if (!credentials$logged_in) {
-    if (FALSE) {
-    # Login page
-      div(class = "login-screen",
-          div(class = "login-header",
-              h2("Baseball Stats Visualization"),
-              p("Please log in with your Patreon email")
-          ),
-          textInput("email", "Email:"),
-          actionButton("login", "Login", class = "btn-primary"),
-          p(style = "margin-top: 20px; text-align: center;",
-            "Access requires Veteran or Hall of Fame tier on Patreon")
-      )
-    } else {
-      # Main application UI (your existing UI)
-      fluidPage(
-        titlePanel(NULL, windowTitle = "Baseball Stats Visualization"),
-        sidebarLayout(
-          sidebarPanel(
-            selectInput("szn", "Season:", c(2026,2025, 2024, 2023, 2022, 2021, 2021)),
-            selectInput("level", "Level:", c("MLB", "AAA", "FSL")),
-            selectInput("type", "Player Type:", c("Batter", "Pitcher")),
-            selectInput("player", "Player:", choices = unique(temp_players$`Batter Name`)),
-            checkboxInput("use_custom_team", "Use Custom Team", FALSE),
-            conditionalPanel(
-              condition = "input.use_custom_team == true",
-              selectInput(
-                inputId = "team",
-                label = "Select Team",
-                choices = c(
-                  "MLB" = "MLB",
-                  "Angels" = "LAA",
-                  "Angels" = "LAA",
-                  "Astros" = "HOU", 
-                  "Athletics" = "OAK",
-                  "Blue Jays" = "TOR",
-                  "Braves" = "ATL",
-                  "Brewers" = "MIL",
-                  "Cardinals" = "STL",
-                  "Cubs" = "CHC",
-                  "D-backs" = "ARI",
-                  "Dodgers" = "LAD",
-                  "Giants" = "SF",
-                  "Guardians" = "CLE",
-                  "Mariners" = "SEA",
-                  "Marlins" = "MIA",
-                  "Mets" = "NYM",
-                  "Nationals" = "WSH",
-                  "Orioles" = "BAL",
-                  "Padres" = "SD",
-                  "Phillies" = "PHI",
-                  "Pirates" = "PIT",
-                  "Rangers" = "TEX",
-                  "Rays" = "TB",
-                  "Red Sox" = "BOS",
-                  "Reds" = "CIN",
-                  "Rockies" = "COL",
-                  "Royals" = "KC",
-                  "Tigers" = "DET",
-                  "Twins" = "MIN",
-                  "White Sox" = "CHW",
-                  "Yankees" = "NYY",
-                  # MLB option at the top
-                  "MLB" = "MLB"
-                ),
-                selected = "MLB"
-              )
-            )
-          ),
-          mainPanel(
-            div(class = "plot-container",
-                plotOutput("statsPlot")
-            )
-          )
-        )
-      )
-    }
-  })
-  
-  # Handle login button click
-  observeEvent(input$login, {
-    # Show loading message
-   # showModal(modalDialog(
-   #   "Checking credentials...",
-  #    footer = NULL
-  #  ))
-    
-    # Check Patreon access
-    #has_access <- check_patreon_access(input$email)
-    has_access <- TRUE
-    # Remove loading message
-  #  removeModal()
-    
-    if (has_access) {
-      credentials$logged_in <- TRUE
-    } else {
-      showModal(modalDialog(
-        title = "Access Denied",
-        "This email does not have access. Please make sure you're using the email associated with your Patreon account and you have an active Veteran or Hall of Fame tier subscription.",
-        easyClose = TRUE
-      ))
-    }
-  })
-  observe({
-    req(credentials$logged_in) 
-  
-  observeEvent(c(input$szn,input$level), {
-    # Filter data based on selected season
-    filtered_data <- MLBC[MLBC$season == input$szn & MLBC$level == input$level,]
-    
+  observeEvent(c(input$szn, input$level), {
+    filtered_data <- MLBC[MLBC$season == as.numeric(input$szn) & MLBC$level == input$level, ]
     updateSelectInput(session,
                       inputId = "player",
                       choices = unique(filtered_data$`Batter Name`))
   })
 
-    })
-  # Create reactive value to store team
   team_value <- reactiveVal("MLB")
   position_value <- reactiveVal("")
-  # Watch for player or season changes to update team
+
   observeEvent(c(input$player, input$szn), {
-    if (!input$use_custom_team && !is.null(input$player)) {
-      
+    if (!input$use_custom_team && !is.null(input$player) && input$player != "") {
       player_id <- MLBC %>%
         filter(`Batter Name` == input$player) %>%
         pull(`Batter ID`) %>%
         unique() %>%
         first()
-      
+
       if (!is.null(player_id)) {
-        player_info <- get_player_info(player_id, input$szn, input$level)
-        
+        player_info <- get_player_info(player_id, as.numeric(input$szn), input$level)
+
         team_abb <- switch(player_info$team,
                            "Los Angeles Angels" = "LAA",
                            "Houston Astros" = "HOU",
@@ -539,8 +369,8 @@ server <- function(input, output,session) {
                            "Minnesota Twins" = "MIN",
                            "Chicago White Sox" = "CHW",
                            "New York Yankees" = "NYY",
-                           "MLB") 
-        if(is.na(team_abb)){
+                           "MLB")
+        if (is.na(team_abb) || is.null(team_abb)) {
           team_abb <- "MLB"
         }
         team_value(team_abb)
@@ -548,7 +378,7 @@ server <- function(input, output,session) {
       }
     }
   })
-  
+
   current_team <- reactive({
     if (input$use_custom_team) {
       return(input$team)
@@ -556,57 +386,49 @@ server <- function(input, output,session) {
       return(team_value())
     }
   })
-  
+
   output$statsPlot <- renderPlot({
     req(position_value())
-    req(credentials$logged_in)
-    #  showtext::showtext_begin()
-    #  on.exit(showtext::showtext_end())
-    
-    data <- data %>% filter(season == input$szn,level == input$level)
-    
+    req(input$player)
+
+    szn_num <- as.numeric(input$szn)
+
+    plot_data <- data %>% filter(season == szn_num, level == input$level)
+
     BBE <- MLBC %>%
-      filter(season == input$szn) %>%
+      filter(season == szn_num) %>%
       filter(level == input$level) %>%
       filter(`Batter Name` == input$player) %>%
       mutate(
-        BBE = case_when(description %in% c('In play, run(s)','In play, out(s)','In play, no out') ~ TRUE, TRUE ~ FALSE)
+        BBE = case_when(description %in% c('In play, run(s)', 'In play, out(s)', 'In play, no out') ~ TRUE, TRUE ~ FALSE)
       )
-    
-    
-    indv <- data %>% filter(`Batter Name` == input$player,level == input$level)
-    #if(indv[1,5] >= 149){
-    if(input$szn == 2026){
-    qual <- data %>% filter(BIP > 10)
-    } 
-    else{
-    qual <- data %>% filter(BIP > 249)
+
+    indv <- plot_data %>% filter(`Batter Name` == input$player, level == input$level)
+
+    if (szn_num == 2026) {
+      qual <- plot_data %>% filter(BIP > 10)
+    } else {
+      qual <- plot_data %>% filter(BIP > 249)
     }
-    data <- rbind(indv,qual)
-    data <- unique(data)
-    #}
-    current_data <- apply_percentile_calcs(data %>% select(-BIP)) %>% 
+
+    plot_data <- unique(rbind(indv, qual))
+
+    current_data <- apply_percentile_calcs(plot_data %>% select(-BIP)) %>%
       filter(`Batter.Name` == input$player) %>%
       mutate(metric = factor(metric, levels = c(
         "wOBA", "wOBACON", "xwOBA", "xDamage",
-        "Avg EV", "EV90", "Max EV", 
+        "Avg EV", "EV90", "Max EV",
         "stdev(LA)", "Barrel%",
-        "Z-Con%", "Z-Swing%", "O-Con%", 
+        "Z-Con%", "Z-Swing%", "O-Con%",
         "Chase%", "Whiff%", "Swing%", "SwStr%"
       ))) %>%
       arrange(metric)
-    #current_data <- data
+
     pos <- position_value()
-    
-    BBE <- sum(BBE$BBE,na.rm = TRUE)
-    
-    # Add Roboto Condensed Condensed font
-    #font_add_google("Roboto Condensed Condensed", "Roboto Condensed")
-    #showtext_auto()
-    
-    # Color function
-    current_data$color <- scales::gradient_n_pal(c("#325aa1","#90A4AE", "#D82129"))(current_data$percentile/100)
-    
+    BBE_count <- sum(BBE$BBE, na.rm = TRUE)
+
+    current_data$color <- scales::gradient_n_pal(c("#325aa1", "#90A4AE", "#D82129"))(current_data$percentile / 100)
+
     # Labels plot
     labels_plot <- ggplot() +
       annotate("text", x = c(10, 50, 90), y = 1.2,
@@ -614,17 +436,17 @@ server <- function(input, output,session) {
                color = c("#3661ad", "#90A4AE", "#DC3545"),
                family = "Roboto Condensed", size = 6) +
       annotate("text", x = c(10, 50, 90), y = .5,
-               label = "▲",
+               label = "\u25B2",
                color = c("#3661ad", "#90A4AE", "#DC3545"), size = 12) +
       scale_x_continuous(limits = c(-16, 113), expand = c(0, 0)) +
       scale_y_continuous(limits = c(0.5, 1.5)) +
       theme_void()
-    
+
     # Main plot
     main_plot <- ggplot(current_data, aes(y = factor(metric, levels = rev(metric)))) +
       geom_tile(aes(x = 50, width = 100),
                 fill = "#c7dcdc", alpha = 0.3, height = 0.25) +
-      geom_tile(aes(x = percentile/2, width = percentile, fill = color),
+      geom_tile(aes(x = percentile / 2, width = percentile, fill = color),
                 height = 0.7) +
       annotate("segment", x = c(10, 50, 90), xend = c(10, 50, 90),
                y = 0, yend = 16.35,
@@ -654,12 +476,12 @@ server <- function(input, output,session) {
         axis.text = element_blank(),
         axis.title = element_blank(),
         panel.grid = element_blank(),
-        plot.margin = margin(t = 0, r = 0, b = -20, l = 0),  # Reduced bottom margin
+        plot.margin = margin(t = 0, r = 0, b = -20, l = 0),
         text = element_text(family = "Roboto Condensed")
       )
-    
-    # Load and process team logo
-    if(current_team() == "MLB"){
+
+    # Logo
+    if (current_team() == "MLB") {
       logo_url <- "https://a.espncdn.com/combiner/i?img=/i/teamlogos/leagues/500/mlb.png?w=400&h=400&transparent=true"
     } else {
       logo_url <- sprintf("https://a.espncdn.com/combiner/i?img=/i/teamlogos/mlb/500/%s.png&h=200&w=200",
@@ -667,26 +489,27 @@ server <- function(input, output,session) {
     }
     logo_img <- image_read(logo_url)
     logo_raster <- as.raster(logo_img)
-    
-    
-    #player_url <- sprintf(paste0("https://img.mlbstatic.com/mlb-photos/image/upload/d_headshot_silo_generic.png,ar_1:1,b_auto:border,c_pad,q_auto:best/w_60/v1/people/427012/headshot/milb/current"))
-    player_url <- get_player_image(current_data[1,2])
+
+    # Player headshot
+    player_url <- get_player_image(current_data[1, 2])
     player_img <- image_read(player_url)
     player_raster <- as.raster(player_img)
-    # Create title with logo
+
+    # Title grobs
     title_grob <- textGrob(paste0(input$player, " - ", pos,
-                                  "\n BBE - ", BBE, "\n",input$level,
-                                  " Percentile Rankings - ",input$szn),
+                                  "\n BBE - ", BBE_count, "\n", input$level,
+                                  " Percentile Rankings - ", input$szn),
                            gp = gpar(fontsize = 25, fontface = "bold",
                                      fontfamily = "Roboto Condensed"))
-    logo_grob <- rasterGrob(logo_raster, x = 0, width = unit(.5, "npc"),hjust = 0)
-    player_grob <- rasterGrob(player_raster, x = 0.5, width = unit(.5, "npc"),hjust = 0)
-    title_with_logo <- arrangeGrob(logo_grob, title_grob,player_grob, ncol = 3,
-                                   widths = c(.25,.5,.25))
-    caption_grob <- textGrob("Viz by: @TimStats | tim-stats.com | Data: MLB",gp = gpar(fontsize = 15, fontface = "bold",
-                                                                                       fontfamily = "Roboto Condensed"))
-    
-    # Final arrangement with logo in title
+    logo_grob <- rasterGrob(logo_raster, x = 0, width = unit(.5, "npc"), hjust = 0)
+    player_grob <- rasterGrob(player_raster, x = 0.5, width = unit(.5, "npc"), hjust = 0)
+    title_with_logo <- arrangeGrob(logo_grob, title_grob, player_grob, ncol = 3,
+                                   widths = c(.25, .5, .25))
+    caption_grob <- textGrob("Viz by: @TimStats | tim-stats.com | Data: MLB",
+                             gp = gpar(fontsize = 15, fontface = "bold",
+                                       fontfamily = "Roboto Condensed"))
+
+    # Final arrangement
     final_plot <- grid.arrange(
       title_with_logo,
       labels_plot,
@@ -694,15 +517,14 @@ server <- function(input, output,session) {
       caption_grob,
       heights = c(0.15, 0.05, 0.75, 0.05)
     )
-    
+
     grid.arrange(
       gtable_add_padding(
         final_plot,
-        padding = unit(c(20, 20, 20, 20), "points")  # top, right, bottom, left margins
+        padding = unit(c(20, 20, 20, 20), "points")
       )
     )
-  }, height = 1000, width = 1000, res = 97,pointsize = 12)
+  }, height = 1000, width = 1000, res = 97, pointsize = 12)
 }
 
-# Run the app
 shinyApp(ui = ui, server = server)