diff --git a/.Rbuildignore b/.Rbuildignore index 9eddb9d..d5e036f 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -4,4 +4,6 @@ ^\.Rproj\.user$ ^LICENSE\.md$ ^dev$ -.github +^\.github$ +^inst/shiny-examples/casting/functions\.R$ +^functions\.R$ diff --git a/.gitignore b/.gitignore index 60684db..1bb73e9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ dev/ .DS_Store .quarto app/rsconnect +inst/shiny-examples/casting/functions.R +functions.R diff --git a/DESCRIPTION b/DESCRIPTION index b8bf135..0c36264 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -31,7 +31,5 @@ Suggests: styler, devtools, rhub -Remotes: - agdamsbo/webResearch URL: https://github.com/agdamsbo/webResearch BugReports: https://github.com/agdamsbo/webResearch/issues diff --git a/inst/apps/data_analysis/rsconnect/shinyapps.io/agdamsbo/webResearch.dcf b/inst/apps/data_analysis/rsconnect/shinyapps.io/agdamsbo/webResearch.dcf index 9f889c8..4f4b018 100644 --- a/inst/apps/data_analysis/rsconnect/shinyapps.io/agdamsbo/webResearch.dcf +++ b/inst/apps/data_analysis/rsconnect/shinyapps.io/agdamsbo/webResearch.dcf @@ -5,6 +5,6 @@ account: agdamsbo server: shinyapps.io hostUrl: https://api.shinyapps.io/v1 appId: 13276335 -bundleId: 9412182 +bundleId: 9412301 url: https://agdamsbo.shinyapps.io/webResearch/ version: 1 diff --git a/inst/apps/data_analysis/server.R b/inst/apps/data_analysis/server.R index 41a4782..62e2335 100644 --- a/inst/apps/data_analysis/server.R +++ b/inst/apps/data_analysis/server.R @@ -20,10 +20,14 @@ library(here) library(broom) library(broom.helpers) library(REDCapCAST) -if (!requireNamespace("webResearch")) { - devtools::install_github("agdamsbo/webResearch", quiet = TRUE, upgrade = "never") +# if (!requireNamespace("webResearch")) { +# devtools::install_github("agdamsbo/webResearch", quiet = TRUE, upgrade = "never") +# } +# library(webResearch) + +if (file.exists(here::here("functions.R"))) { + source(here::here("functions.R")) } -library(webResearch) server <- function(input, output, session) { ## Listing files in www in session start to keep when ending and removing diff --git a/renv.lock b/renv.lock index bb81fd1..a2f0f9e 100644 --- a/renv.lock +++ b/renv.lock @@ -55,6 +55,56 @@ ], "Hash": "45f0398006e83a5b10b72a90663d8d8c" }, + "REDCapCAST": { + "Package": "REDCapCAST", + "Version": "24.11.2", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "REDCapR", + "assertthat", + "bslib", + "dplyr", + "forcats", + "glue", + "gt", + "haven", + "here", + "keyring", + "openxlsx2", + "purrr", + "readODS", + "readr", + "shiny", + "stats", + "tidyr", + "tidyselect", + "vctrs", + "zip" + ], + "Hash": "86814281365527b3983f58228d190ef4" + }, + "REDCapR": { + "Package": "REDCapR", + "Version": "1.3.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "checkmate", + "dplyr", + "httr", + "jsonlite", + "magrittr", + "methods", + "readr", + "rlang", + "tibble", + "tidyr" + ], + "Hash": "de630e9e6168aae0a178eaa3198dbe54" + }, "Rcpp": { "Package": "Rcpp", "Version": "1.0.13-1", @@ -160,23 +210,6 @@ "Repository": "CRAN", "Hash": "d972ef991d58c19e6efa71b21f5e144b" }, - "brew": { - "Package": "brew", - "Version": "1.0-10", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "8f4a384e19dccd8c65356dc096847b76" - }, - "brio": { - "Package": "brio", - "Version": "1.1.5", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R" - ], - "Hash": "c1ee497a6d999947c2c224ae46799b1a" - }, "broom": { "Package": "broom", "Version": "1.0.7", @@ -252,19 +285,6 @@ ], "Hash": "cd9a672193789068eb5a2aad65a0dedf" }, - "callr": { - "Package": "callr", - "Version": "3.7.6", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "R6", - "processx", - "utils" - ], - "Hash": "d7e13f49c19103ece9e58ad2d83a7354" - }, "cards": { "Package": "cards", "Version": "0.3.0", @@ -293,6 +313,18 @@ ], "Hash": "f61dbaec772ccd2e17705c1e872e9e7c" }, + "checkmate": { + "Package": "checkmate", + "Version": "2.3.2", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "backports", + "utils" + ], + "Hash": "0e14e01ce07e7c88fd25de6d4260d26b" + }, "cli": { "Package": "cli", "Version": "3.6.3", @@ -357,20 +389,6 @@ ], "Hash": "859d96e65ef198fd43e82b9628d593ef" }, - "credentials": { - "Package": "credentials", - "Version": "2.0.2", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "askpass", - "curl", - "jsonlite", - "openssl", - "sys" - ], - "Hash": "09fd631e607a236f8cc7f9604db32cb8" - }, "curl": { "Package": "curl", "Version": "6.0.1", @@ -381,68 +399,6 @@ ], "Hash": "e8ba62486230951fcd2b881c5be23f96" }, - "desc": { - "Package": "desc", - "Version": "1.4.3", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "R6", - "cli", - "utils" - ], - "Hash": "99b79fcbd6c4d1ce087f5c5c758b384f" - }, - "devtools": { - "Package": "devtools", - "Version": "2.4.5", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "cli", - "desc", - "ellipsis", - "fs", - "lifecycle", - "memoise", - "miniUI", - "pkgbuild", - "pkgdown", - "pkgload", - "profvis", - "rcmdcheck", - "remotes", - "rlang", - "roxygen2", - "rversions", - "sessioninfo", - "stats", - "testthat", - "tools", - "urlchecker", - "usethis", - "utils", - "withr" - ], - "Hash": "ea5bc8b4a6a01e4f12d98b58329930bb" - }, - "diffobj": { - "Package": "diffobj", - "Version": "0.3.5", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "crayon", - "methods", - "stats", - "tools", - "utils" - ], - "Hash": "bcaa8b95f8d7d01a5dedfd959ce88ab8" - }, "digest": { "Package": "digest", "Version": "0.6.37", @@ -454,26 +410,6 @@ ], "Hash": "33698c4b3127fc9f506654607fb73676" }, - "downlit": { - "Package": "downlit", - "Version": "0.4.4", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "brio", - "desc", - "digest", - "evaluate", - "fansi", - "memoise", - "rlang", - "vctrs", - "withr", - "yaml" - ], - "Hash": "45a6a596bf0108ee1ff16a040a2df897" - }, "dplyr": { "Package": "dplyr", "Version": "1.1.4", @@ -497,17 +433,6 @@ ], "Hash": "fedd9d00c2944ff00a0e2696ccf048ec" }, - "ellipsis": { - "Package": "ellipsis", - "Version": "0.3.2", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "rlang" - ], - "Hash": "bb0eec2fe32e88d9e2836c2f73ea2077" - }, "evaluate": { "Package": "evaluate", "Version": "1.0.1", @@ -544,6 +469,16 @@ "Repository": "CRAN", "Hash": "aa5e1cd11c2d15497494c5292d7ffcc8" }, + "filelock": { + "Package": "filelock", + "Version": "1.0.3", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "192053c276525c8495ccfd523aa8f2d1" + }, "fontawesome": { "Package": "fontawesome", "Version": "0.5.3", @@ -594,49 +529,6 @@ ], "Hash": "15e9634c0fcd294799e9b2e929ed1b86" }, - "gert": { - "Package": "gert", - "Version": "2.1.4", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "askpass", - "credentials", - "openssl", - "rstudioapi", - "sys", - "zip" - ], - "Hash": "ae855ad6d7be20dd7b05d43d25700398" - }, - "gh": { - "Package": "gh", - "Version": "1.4.1", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "cli", - "gitcreds", - "glue", - "httr2", - "ini", - "jsonlite", - "lifecycle", - "rlang" - ], - "Hash": "fbbbc48eba7a6626a08bb365e44b563b" - }, - "gitcreds": { - "Package": "gitcreds", - "Version": "0.1.2", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R" - ], - "Hash": "ab08ac61f3e1be454ae21911eb8bc2fe" - }, "glue": { "Package": "glue", "Version": "1.8.0", @@ -799,33 +691,20 @@ ], "Hash": "d55aa087c47a63ead0f6fc10f8fa1ee0" }, - "httr2": { - "Package": "httr2", - "Version": "1.0.6", + "httr": { + "Package": "httr", + "Version": "1.4.7", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "R6", - "cli", "curl", - "glue", - "lifecycle", - "magrittr", - "openssl", - "rappdirs", - "rlang", - "vctrs", - "withr" + "jsonlite", + "mime", + "openssl" ], - "Hash": "3ef5d07ec78803475a94367d71b40c41" - }, - "ini": { - "Package": "ini", - "Version": "0.3.1", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "6154ec2223172bce8162d4153cda21f7" + "Hash": "ac107251d9d9fd72f0ca8049988f1d7f" }, "jquerylib": { "Package": "jquerylib", @@ -857,6 +736,26 @@ ], "Hash": "3bcd11943da509341838da9399e18bce" }, + "keyring": { + "Package": "keyring", + "Version": "1.3.2", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "R6", + "askpass", + "assertthat", + "filelock", + "openssl", + "rappdirs", + "sodium", + "tools", + "utils", + "yaml" + ], + "Hash": "5cd8cfb2e90c57110b7dd1785c599aba" + }, "knitr": { "Package": "knitr", "Version": "1.49", @@ -970,18 +869,6 @@ ], "Hash": "18e9c28c1d3ca1560ce30658b22ce104" }, - "miniUI": { - "Package": "miniUI", - "Version": "0.1.1.1", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "htmltools", - "shiny", - "utils" - ], - "Hash": "fec5f52652d60615fdb3957b3d74324a" - }, "minty": { "Package": "minty", "Version": "0.0.4", @@ -1061,21 +948,6 @@ ], "Hash": "15da5a8412f317beeee6175fbc76f4bb" }, - "pkgbuild": { - "Package": "pkgbuild", - "Version": "1.4.5", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "R6", - "callr", - "cli", - "desc", - "processx" - ], - "Hash": "30eaaab94db72652e72e3475c1b55278" - }, "pkgconfig": { "Package": "pkgconfig", "Version": "2.0.3", @@ -1086,65 +958,6 @@ ], "Hash": "01f28d4278f15c76cddbea05899c5d6f" }, - "pkgdown": { - "Package": "pkgdown", - "Version": "2.1.1", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "bslib", - "callr", - "cli", - "desc", - "digest", - "downlit", - "fontawesome", - "fs", - "httr2", - "jsonlite", - "openssl", - "purrr", - "ragg", - "rlang", - "rmarkdown", - "tibble", - "whisker", - "withr", - "xml2", - "yaml" - ], - "Hash": "df2912d5873422b55a13002510f02c9f" - }, - "pkgload": { - "Package": "pkgload", - "Version": "1.4.0", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "cli", - "desc", - "fs", - "glue", - "lifecycle", - "methods", - "pkgbuild", - "processx", - "rlang", - "rprojroot", - "utils", - "withr" - ], - "Hash": "2ec30ffbeec83da57655b850cf2d3e0e" - }, - "praise": { - "Package": "praise", - "Version": "1.0.0", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "a555924add98c99d2f411e37e7d25e9f" - }, "prettyunits": { "Package": "prettyunits", "Version": "1.2.0", @@ -1168,19 +981,6 @@ ], "Hash": "0c90a7d71988856bad2a2a45dd871bb9" }, - "profvis": { - "Package": "profvis", - "Version": "0.4.0", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "htmlwidgets", - "rlang", - "vctrs" - ], - "Hash": "bffa126bf92987e677c12cfb5651fc1d" - }, "progress": { "Package": "progress", "Version": "1.2.3", @@ -1257,17 +1057,6 @@ ], "Hash": "af456d7a181750812bd8b2bfedb3ea4e" }, - "ragg": { - "Package": "ragg", - "Version": "1.3.3", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "systemfonts", - "textshaping" - ], - "Hash": "0595fe5e47357111f29ad19101c7d271" - }, "rappdirs": { "Package": "rappdirs", "Version": "0.3.3", @@ -1278,28 +1067,6 @@ ], "Hash": "5e3c5dc0b071b21fa128676560dbe94d" }, - "rcmdcheck": { - "Package": "rcmdcheck", - "Version": "1.4.0", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R6", - "callr", - "cli", - "curl", - "desc", - "digest", - "pkgbuild", - "prettyunits", - "rprojroot", - "sessioninfo", - "utils", - "withr", - "xopen" - ], - "Hash": "8f25ebe2ec38b1f2aef3b0d2ef76f6c4" - }, "reactR": { "Package": "reactR", "Version": "0.6.1", @@ -1373,20 +1140,6 @@ "Repository": "RSPM", "Hash": "cbff1b666c6fa6d21202f07e2318d4f1" }, - "remotes": { - "Package": "remotes", - "Version": "2.5.0", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "methods", - "stats", - "tools", - "utils" - ], - "Hash": "3ee025083e66f18db6cf27b56e23e141" - }, "renv": { "Package": "renv", "Version": "1.0.11", @@ -1431,32 +1184,6 @@ ], "Hash": "df99277f63d01c34e95e3d2f06a79736" }, - "roxygen2": { - "Package": "roxygen2", - "Version": "7.3.2", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "R6", - "brew", - "cli", - "commonmark", - "cpp11", - "desc", - "knitr", - "methods", - "pkgload", - "purrr", - "rlang", - "stringi", - "stringr", - "utils", - "withr", - "xml2" - ], - "Hash": "6ee25f9054a70f44d615300ed531ba8d" - }, "rprojroot": { "Package": "rprojroot", "Version": "2.0.4", @@ -1497,18 +1224,6 @@ "Repository": "CRAN", "Hash": "5f90cd73946d706cfe26024294236113" }, - "rversions": { - "Package": "rversions", - "Version": "2.1.2", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "curl", - "utils", - "xml2" - ], - "Hash": "a9881dfed103e83f9de151dc17002cd1" - }, "sass": { "Package": "sass", "Version": "0.4.9", @@ -1543,19 +1258,6 @@ ], "Hash": "c19df082ba346b0ffa6f833e92de34d1" }, - "sessioninfo": { - "Package": "sessioninfo", - "Version": "1.2.2", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "cli", - "tools", - "utils" - ], - "Hash": "3f9796a8d0a0e8c6eb49a4b029359d1f" - }, "shiny": { "Package": "shiny", "Version": "1.9.1", @@ -1589,6 +1291,13 @@ ], "Hash": "6a293995a66e12c48d13aa1f957d09c7" }, + "sodium": { + "Package": "sodium", + "Version": "1.3.2", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "869b09ca565ecaa9efc62534ebfa3efd" + }, "sourcetools": { "Package": "sourcetools", "Version": "0.1.7-1", @@ -1636,60 +1345,6 @@ "Repository": "CRAN", "Hash": "de342ebfebdbf40477d0758d05426646" }, - "systemfonts": { - "Package": "systemfonts", - "Version": "1.1.0", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "cpp11", - "lifecycle" - ], - "Hash": "213b6b8ed5afbf934843e6c3b090d418" - }, - "testthat": { - "Package": "testthat", - "Version": "3.2.1.1", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "R6", - "brio", - "callr", - "cli", - "desc", - "digest", - "evaluate", - "jsonlite", - "lifecycle", - "magrittr", - "methods", - "pkgload", - "praise", - "processx", - "ps", - "rlang", - "utils", - "waldo", - "withr" - ], - "Hash": "3f6e7e5e2220856ff865e4834766bf2b" - }, - "textshaping": { - "Package": "textshaping", - "Version": "0.4.0", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "cpp11", - "lifecycle", - "systemfonts" - ], - "Hash": "5142f8bc78ed3d819d26461b641627ce" - }, "tibble": { "Package": "tibble", "Version": "3.2.1", @@ -1769,51 +1424,6 @@ ], "Hash": "f561504ec2897f4d46f0c7657e488ae1" }, - "urlchecker": { - "Package": "urlchecker", - "Version": "1.0.1", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "cli", - "curl", - "tools", - "xml2" - ], - "Hash": "409328b8e1253c8d729a7836fe7f7a16" - }, - "usethis": { - "Package": "usethis", - "Version": "3.0.0", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "cli", - "clipr", - "crayon", - "curl", - "desc", - "fs", - "gert", - "gh", - "glue", - "jsonlite", - "lifecycle", - "purrr", - "rappdirs", - "rlang", - "rprojroot", - "rstudioapi", - "stats", - "utils", - "whisker", - "withr", - "yaml" - ], - "Hash": "b2fbf93c2127bedd2cbe9b799530d5d2" - }, "utf8": { "Package": "utf8", "Version": "1.2.4", @@ -1874,28 +1484,6 @@ ], "Hash": "390f9315bc0025be03012054103d227c" }, - "waldo": { - "Package": "waldo", - "Version": "0.6.1", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "cli", - "diffobj", - "glue", - "methods", - "rlang" - ], - "Hash": "52f574062a7b66e56926988c3fbdb3b7" - }, - "whisker": { - "Package": "whisker", - "Version": "0.4.1", - "Source": "Repository", - "Repository": "CRAN", - "Hash": "c6abfa47a46d281a7d5159d0a8891e88" - }, "withr": { "Package": "withr", "Version": "3.0.2", @@ -1934,17 +1522,6 @@ ], "Hash": "1d0336142f4cd25d8d23cd3ba7a8fb61" }, - "xopen": { - "Package": "xopen", - "Version": "1.0.1", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "processx" - ], - "Hash": "423df1e86d5533fcb73c6b02b4923b49" - }, "xtable": { "Package": "xtable", "Version": "1.8-4",