resource naming and referencing

victor-navarro · Mar 13, 2024 · 626d155 · 626d155
1 parent 3b6f796
commit 626d155
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/R/launch_app.R b/R/launch_app.R
@@ -5,7 +5,7 @@ launch_app <- function(
     browser = getOption("shiny.launch.browser", interactive())) {
   shiny::addResourcePath(
     "resources",
-    system.file("app_resources", package = "calmr.app")
+    system.file("resources", package = "calmr.app")
   )
   ui <- calmr_ui(
     analytics_file = NULL

diff --git a/R/ui.R b/R/ui.R
@@ -3,7 +3,7 @@
 #' Default is NULL, in which case, no analytics are pushed.
 #' @export
 calmr_ui <- function(
-    analytics_file = "inst/app_resources/google_analytics.html") {
+    analytics_file = "inst/resources/google_analytics.html") {
   if (!is.null(analytics_file)) {
     analytics <- htmltools::includeHTML(analytics_file)
   } else {
@@ -207,7 +207,7 @@ calmr_ui <- function(
           tabName = "about",
           shiny::fluidPage(
             htmltools::HTML(
-              '<center><img src="logo.png" width="20%"></center>'
+              '<center><img src="resources/logo.png" width="20%"></center>'
             ),
             htmltools::br(), htmltools::br(),
             htmltools::HTML('Canonical Associative Learning Models

diff --git a/inst/app_resources/google_analytics.html → inst/resources/google_analytics.html b/inst/app_resources/google_analytics.html → inst/resources/google_analytics.html
diff --git a/inst/app_resources/logo.png → inst/resources/logo.png b/inst/app_resources/logo.png → inst/resources/logo.png
diff --git a/inst/test_deployment.R b/inst/test_deployment.R
@@ -6,13 +6,14 @@ devtools::install_github("victor-navarro/calmr", force = TRUE)
 tmp <- tempdir()
 file.copy("R/server.R", file.path(tmp, "server.R"))
 file.copy("R/ui.R", file.path(tmp, "ui.R"))
-file.copy("inst/app_resources", tmp, recursive = TRUE)
+file.copy("inst/resources", tmp, recursive = TRUE)
 
 shiny::addResourcePath(
   "resources",
-  system.file("app_resources", package = "calmr.app")
+  system.file("resources", package = "calmr.app")
 )
 
 rsconnect::deployApp(tmp,
+  appName = "calmr_app_test",
   forceUpdate = TRUE
 )
diff --git a/man/calmr_ui.Rd b/man/calmr_ui.Rd