diff --git a/.Rbuildignore b/.Rbuildignore index eaef19a..a288e13 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -10,3 +10,5 @@ $run_dev.* ^README\.Rmd$ ^LICENSE\.md$ ^\.github$ +^app\.R$ +^rsconnect$ diff --git a/.github/workflows/shiny-deploy-main.yaml b/.github/workflows/shiny-deploy-main.yaml index 09ca859..dede20a 100644 --- a/.github/workflows/shiny-deploy-main.yaml +++ b/.github/workflows/shiny-deploy-main.yaml @@ -21,6 +21,9 @@ jobs: with: use-public-rspm: true + - name: Install libgit2-dev + run: sudo apt-get install -y libgit2-dev + - uses: r-lib/actions/setup-renv@v2 - name: Install rsconnect @@ -31,9 +34,9 @@ jobs: env: # Provide your app name, account name, and server to be deployed below APPNAME: ordinalsimr - # ACCOUNT: your-account-name + ACCOUNT: 6fcd1k-pat SERVER: shinyapps.io # server to deploy run: | rsconnect::setAccountInfo("${{ secrets.RSCONNECT_USER }}", "${{ secrets.RSCONNECT_TOKEN }}", "${{ secrets.RSCONNECT_SECRET }}") - rsconnect::deployApp(appName = "${{ env.APPNAME }}", account = "${{ env.ACCOUNT }}", server = "${{ env.SERVER }}") + rsconnect::deployApp(appName = "${{ env.APPNAME }}", account = "${{ env.ACCOUNT }}", server = "${{ env.SERVER }}", forceUpdate = TRUE) shell: Rscript {0} diff --git a/DESCRIPTION b/DESCRIPTION index ef410b9..d261404 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -19,6 +19,7 @@ Imports: glue, golem (>= 0.4.0), magrittr, + pkgload, purrr, rhandsontable, rlang, diff --git a/R/_disable_autoload.R b/R/_disable_autoload.R new file mode 100644 index 0000000..a8c9436 --- /dev/null +++ b/R/_disable_autoload.R @@ -0,0 +1,3 @@ +# Disabling shiny autoload + +# See ?shiny::loadSupport for more information diff --git a/R/mod_save_data.R b/R/mod_save_data.R index 7dd1d21..b4ef432 100644 --- a/R/mod_save_data.R +++ b/R/mod_save_data.R @@ -25,7 +25,6 @@ mod_save_data_server <- function(id, input_data, processed_data, input, output, # shinyFileSave(input, "save_results", roots = "home") data_to_save <- reactive({ - browser() list( comparison_data = format_simulation_data(input_data$comparison_results()) %>% append(list(distribution_statistics = processed_data$distribution_statistics(), diff --git a/app.R b/app.R new file mode 100644 index 0000000..1d98a44 --- /dev/null +++ b/app.R @@ -0,0 +1,7 @@ +# Launch the ShinyApp (Do not remove this comment) +# To deploy, run: rsconnect::deployApp() +# Or use the blue button on top of this file + +pkgload::load_all(export_all = FALSE,helpers = FALSE,attach_testthat = FALSE) +options( "golem.app.prod" = TRUE) +ordinalsimr::run_app() # add parameters here (if any) diff --git a/renv.lock b/renv.lock index 811def4..ce9df12 100644 --- a/renv.lock +++ b/renv.lock @@ -1644,14 +1644,14 @@ }, "rlang": { "Package": "rlang", - "Version": "1.1.1", + "Version": "1.1.3", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "utils" ], - "Hash": "a85c767b55f0bf9b7ad16c6d7baee5bb" + "Hash": "42548638fae05fd9a9b5f3f437fbbbe2" }, "rmarkdown": { "Package": "rmarkdown", @@ -1756,9 +1756,9 @@ }, "rsconnect": { "Package": "rsconnect", - "Version": "1.1.0", + "Version": "1.2.1", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "cli", @@ -1774,7 +1774,7 @@ "tools", "yaml" ], - "Hash": "ec53d658cf0abbd7cd7ce2d6b9d70337" + "Hash": "94bb3a2125b01b13dd2e4a784c2a9639" }, "rstudioapi": { "Package": "rstudioapi",