diff --git a/DESCRIPTION b/DESCRIPTION index 9249081..d1f8f0c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -21,7 +21,8 @@ Imports: pkgload, tidyr, stringr, - finalfit + finalfit, + pins Encoding: UTF-8 LazyData: true RoxygenNote: 7.1.0 diff --git a/R/app_server.R b/R/app_server.R index 2a0209b..7543d45 100644 --- a/R/app_server.R +++ b/R/app_server.R @@ -4,6 +4,21 @@ #' DO NOT REMOVE. #' @import shiny #' @noRd +#' +#' +library(dplyr) +library(pins) +library(magrittr) +board = board_connect() +appdata = pin_read(board, "rots/gecko_appdata") +updated_date = pin_meta(board, "rots/gecko_appdata")$created + +allvars = appdata %>% + finalfit::extract_labels() %>% + select(vname, vfill) %$% + setNames(as.list(vname), vfill) + + app_server <- function( input, output, session ) { # List the first level callModules here library(dplyr) @@ -11,7 +26,10 @@ app_server <- function( input, output, session ) { library(tidyr) library(ggplot2) library(magrittr) + r <- reactiveValues() + + #data_subset <- callModule(mod_subset_server, "subset_ui_1", r, alldata = appdata) #data_subset <- callModule(mod_subset_server, "subset_ui_1", r, alldata = cs_data_app) #summary_table <- callModule(mod_subset_server, "subset_ui_1", r, alldata = bmjdata) diff --git a/app.R b/app.R index d106817..f3deea8 100644 --- a/app.R +++ b/app.R @@ -5,3 +5,4 @@ pkgload::load_all(export_all = FALSE,helpers = FALSE,attach_testthat = FALSE) options( "golem.app.prod" = TRUE) gecko_shinyviz::run_app() # add parameters here (if any) + diff --git a/data-raw/appdata.R b/data-raw/appdata.R index 175eec4..09a1b96 100644 --- a/data-raw/appdata.R +++ b/data-raw/appdata.R @@ -1,4 +1,9 @@ ## code to prepare `appdata` dataset goes here + +# Now replaced with pins +if(FALSE){ + + library(tidyverse) library(finalfit) @@ -153,9 +158,9 @@ allvars = appdata %>% - updated_date = format(Sys.time(), format = "%d-%B %Y") usethis::use_data(appdata, overwrite = TRUE) usethis::use_data(allvars, overwrite = TRUE) usethis::use_data(updated_date, overwrite = TRUE) +} \ No newline at end of file diff --git a/rsconnect/argoshare.is.ed.ac.uk/rots/gecko_shinyviz.dcf b/rsconnect/argoshare.is.ed.ac.uk/rots/gecko_shinyviz.dcf index b76661e..5e245bb 100644 --- a/rsconnect/argoshare.is.ed.ac.uk/rots/gecko_shinyviz.dcf +++ b/rsconnect/argoshare.is.ed.ac.uk/rots/gecko_shinyviz.dcf @@ -5,9 +5,10 @@ account: rots server: argoshare.is.ed.ac.uk hostUrl: https://argoshare.is.ed.ac.uk/__api__ appId: 639 -bundleId: 3273 +bundleId: 3292 url: https://argoshare.is.ed.ac.uk/gecko_shinyviz/ -when: 1694790034.70899 -lastSyncTime: 1694790034.709 +when: 1695030009.3658 +lastSyncTime: 1695030009.36581 asMultiple: FALSE asStatic: FALSE +ignoredFiles: data-raw/appdata.R