got the app working again woooo

DESCRIPTION

@@ -33,7 +33,6 @@ Imports:
     leafgl (>= 0.1.1),
     leaflegend,
     leaflet (>= 2.1.2),
-    markdown,
     magrittr (>= 2.0.3),
     plyr (>= 1.8.8),
     purrr (>= 1.0.1),

NAMESPACE

@@ -50,7 +50,6 @@ importFrom(magrittr,"%>%")
 importFrom(shiny,HTML)
 importFrom(shiny,NS)
 importFrom(shiny,column)
-importFrom(shiny,markdown)
 importFrom(shiny,shinyApp)
 importFrom(shiny,tagAppendAttributes)
 importFrom(shiny,tagList)

R/app_server.R

@@ -576,6 +576,17 @@ app_server <- function(input, output, session) {
   # })
 
   ####### ►  Total abundance ----
+  # TODO see if this works
+  # observeEvent(input$fish.park.method.dropdown, {
+  #   output$fish.park.total.plot <- renderUI({
+  #     req(input$fish.park.dropdown, input$fish.park.method.dropdown)
+  #     park <- stringr::str_replace_all(tolower(input$fish.park.dropdown), c("marine park" = "", "island marine reserve" = "", " " = ""))
+  #     method <- input$fish.park.method.dropdown
+  #
+  #     img(src = paste0("www/plots/", park, "_", method, "_total_abundance.png"), align = "left", width = "100%")
+  #   })
+  # })
+
   # observeEvent(input$fish.park.method.dropdown, {
   output$fish.park.total.plot <- renderPlot({
     # Changed to summarized data
@@ -1882,44 +1893,44 @@ app_server <- function(input, output, session) {
 
   })
 
-  ####### ►  Info buttons ----
-  observeEvent(input$state.ta,
-               showModal(modalDialog(
-                 title = "How do we measure total abundance?",
-                 htmltools::includeMarkdown(paste0("inst/app/www/popups/total.abundance.md"))))
-  )
-
-  observeEvent(input$state.sr,
-               showModal(modalDialog(
-                 title = "How do we measure species richness?",
-                 htmltools::includeMarkdown(paste0("inst/app/www/popups/species.richness.md"))))
-  )
-
-
-  observeEvent(input$park.ta,
-               showModal(modalDialog(
-                 title = "How do we measure total abundance?",
-                 htmltools::includeMarkdown(paste0("inst/app/www/popups/total.abundance.md"))))
-  )
-
-  observeEvent(input$park.sr,
-               showModal(modalDialog(
-                 title = "How do we measure species richness?",
-                 htmltools::includeMarkdown(paste0("inst/app/www/popups/species.richness.md"))))
-  )
+  # ####### ►  Info buttons ----
+  # observeEvent(input$state.ta,
+  #              showModal(modalDialog(
+  #                title = "How do we measure total abundance?",
+  #                htmltools::includeMarkdown(paste0("inst/app/www/popups/total.abundance.md"))))
+  # )
+  #
+  # observeEvent(input$state.sr,
+  #              showModal(modalDialog(
+  #                title = "How do we measure species richness?",
+  #                htmltools::includeMarkdown(paste0("inst/app/www/popups/species.richness.md"))))
+  # )
+  #
+  #
+  # observeEvent(input$park.ta,
+  #              showModal(modalDialog(
+  #                title = "How do we measure total abundance?",
+  #                htmltools::includeMarkdown(paste0("inst/app/www/popups/total.abundance.md"))))
+  # )
+  #
+  # observeEvent(input$park.sr,
+  #              showModal(modalDialog(
+  #                title = "How do we measure species richness?",
+  #                htmltools::includeMarkdown(paste0("inst/app/www/popups/species.richness.md"))))
+  # )
 
   # MARINE PARK ----
   # FOR FISH
-  observeEvent(
-    input$alert.marinepark,
-
-    showModal(modalDialog(
-      title = input$fish.park.dropdown,
-      htmltools::includeMarkdown(paste0("inst/app/www/popups/fish_",
-                                        stringr::str_replace_all(tolower(input$fish.park.dropdown), c("marine park" = "", " " = "")), ".md"))
-    ))
-
-  )
+  # observeEvent(
+  #   input$alert.marinepark,
+  #
+  #   showModal(modalDialog(
+  #     title = input$fish.park.dropdown,
+  #     htmltools::includeMarkdown(paste0("inst/app/www/popups/fish_",
+  #                                       stringr::str_replace_all(tolower(input$fish.park.dropdown), c("marine park" = "", " " = "")), ".md"))
+  #   ))
+  #
+  # )
 
   # Interpretation of trends ----
   ####### ►  Total abundance ----

R/generate_plots.R

@@ -71,7 +71,9 @@ generate_plots <- function() {
       }
       p
 
-      png(paste0("inst/app/www/plots/", marinepark, "_", method, "_total_abundance.png"))
+      park.name <- stringr::str_replace_all(tolower(marinepark), c("marine park" = "", "island marine reserve" = "", " " = ""))
+
+      png(paste0("inst/app/www/plots/", park.name, "_", method, "_total_abundance.png"), width = 800, height = 400)
       print(p)
       dev.off()
 

R/run_app.R

@@ -5,7 +5,7 @@
 #' @inheritParams shiny::shinyApp
 #'
 #' @export
-#' @importFrom shiny shinyApp markdown
+#' @importFrom shiny shinyApp
 #' @importFrom golem with_golem_options
 run_app <- function(onStart = NULL,
                     options = list(),

app.R

@@ -9,8 +9,6 @@
 # googlesheets4::gs4_auth()
 # 2
 
-# library(markdown)
-
 # Step 1. Load all functions from package
 pkgload::load_all(export_all = FALSE, helpers = FALSE, attach_testthat = FALSE)