From f44ba810c41b8250bd8ace669e472c5b65977842 Mon Sep 17 00:00:00 2001 From: Adrian Cockcroft Date: Sat, 26 Dec 2020 17:12:01 -0800 Subject: [PATCH 1/7] fixed Mac install to use electron path --- R/startFun.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/startFun.R b/R/startFun.R index c230642..d6e6960 100644 --- a/R/startFun.R +++ b/R/startFun.R @@ -118,7 +118,7 @@ startFun <- function(input_path, cran_packages=NULL, bioc_packages=NULL, github_ } else if(.Platform$OS.type=="unix") { - r_portable_path <- normalizePath(file.path(input_path, "R-Portable-Mac")) + r_portable_path <- normalizePath(file.path(electron_path, "R-Portable-Mac")) r_electron_version <- system(sprintf("cd %s; ./R CMD BATCH --version", From 19b58ba45ced6d221f3300158ee1c86a8ff83154 Mon Sep 17 00:00:00 2001 From: Adrian Cockcroft Date: Mon, 28 Dec 2020 12:46:39 -0800 Subject: [PATCH 2/7] Added Done button --- R/photon_rstudioaddin.R | 2 ++ 1 file changed, 2 insertions(+) diff --git a/R/photon_rstudioaddin.R b/R/photon_rstudioaddin.R index 5ff32fc..8133f0c 100644 --- a/R/photon_rstudioaddin.R +++ b/R/photon_rstudioaddin.R @@ -56,6 +56,8 @@ photon_rstudioaddin <- function(RscriptRepository = NULL) { )))), miniUI::miniButtonBlock( actionButton("create", "Build", icon("play-circle"), + style="color: #fff; background-color: #337ab7; border-color: #2e6da4"), + actionButton("done", "Done", icon("stop-circle"), style="color: #fff; background-color: #337ab7; border-color: #2e6da4") ) ) From 7e871fa1059757b1a41d67a4e7d255a675911131 Mon Sep 17 00:00:00 2001 From: Adrian Cockcroft Date: Mon, 28 Dec 2020 12:49:56 -0800 Subject: [PATCH 3/7] Update photon_rstudioaddin.R --- R/photon_rstudioaddin.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/photon_rstudioaddin.R b/R/photon_rstudioaddin.R index 8133f0c..3acae08 100644 --- a/R/photon_rstudioaddin.R +++ b/R/photon_rstudioaddin.R @@ -28,6 +28,8 @@ photon_rstudioaddin <- function(RscriptRepository = NULL) { shiny::verbatimTextOutput('currentdirselected') ), shiny::br(), + actionButton("done", "Done", + style="color: #fff; background-color: #337ab7; border-color: #2e6da4") shiny::br(), shiny::h4("CRAN Packages:"), shiny::textInput('cran_packages', @@ -56,8 +58,6 @@ photon_rstudioaddin <- function(RscriptRepository = NULL) { )))), miniUI::miniButtonBlock( actionButton("create", "Build", icon("play-circle"), - style="color: #fff; background-color: #337ab7; border-color: #2e6da4"), - actionButton("done", "Done", icon("stop-circle"), style="color: #fff; background-color: #337ab7; border-color: #2e6da4") ) ) From 0c9a4ae24472274c7bfc993cd63c4367c3aa459b Mon Sep 17 00:00:00 2001 From: Adrian Cockcroft Date: Mon, 28 Dec 2020 12:51:06 -0800 Subject: [PATCH 4/7] Update photon_rstudioaddin.R --- R/photon_rstudioaddin.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/photon_rstudioaddin.R b/R/photon_rstudioaddin.R index 3acae08..bf626f9 100644 --- a/R/photon_rstudioaddin.R +++ b/R/photon_rstudioaddin.R @@ -29,7 +29,7 @@ photon_rstudioaddin <- function(RscriptRepository = NULL) { ), shiny::br(), actionButton("done", "Done", - style="color: #fff; background-color: #337ab7; border-color: #2e6da4") + style="color: #fff; background-color: #337ab7; border-color: #2e6da4"), shiny::br(), shiny::h4("CRAN Packages:"), shiny::textInput('cran_packages', From 871b8a2cfe419fe965e736469dcb308a383410a7 Mon Sep 17 00:00:00 2001 From: Adrian Cockcroft Date: Mon, 28 Dec 2020 12:53:56 -0800 Subject: [PATCH 5/7] Update photon_rstudioaddin.R --- R/photon_rstudioaddin.R | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/R/photon_rstudioaddin.R b/R/photon_rstudioaddin.R index bf626f9..c06065c 100644 --- a/R/photon_rstudioaddin.R +++ b/R/photon_rstudioaddin.R @@ -28,8 +28,6 @@ photon_rstudioaddin <- function(RscriptRepository = NULL) { shiny::verbatimTextOutput('currentdirselected') ), shiny::br(), - actionButton("done", "Done", - style="color: #fff; background-color: #337ab7; border-color: #2e6da4"), shiny::br(), shiny::h4("CRAN Packages:"), shiny::textInput('cran_packages', @@ -59,6 +57,10 @@ photon_rstudioaddin <- function(RscriptRepository = NULL) { miniUI::miniButtonBlock( actionButton("create", "Build", icon("play-circle"), style="color: #fff; background-color: #337ab7; border-color: #2e6da4") + ), + miniUI::miniButtonBlock( + actionButton("done", "Done", icon("stop-circle"), + style="color: #fff; background-color: #337ab7; border-color: #2e6da4") ) ) From 1367ae56b9bdfefac5c07ca0750584f2fd7727da Mon Sep 17 00:00:00 2001 From: Adrian Cockcroft Date: Mon, 28 Dec 2020 13:06:11 -0800 Subject: [PATCH 6/7] Added finished message --- R/startFun.R | 1 + 1 file changed, 1 insertion(+) diff --git a/R/startFun.R b/R/startFun.R index d6e6960..d9aadec 100644 --- a/R/startFun.R +++ b/R/startFun.R @@ -160,6 +160,7 @@ startFun <- function(input_path, cran_packages=NULL, bioc_packages=NULL, github_ system(sprintf("cd %s; npm install; npm run package-mac", r_portable_path)) } + message("Photon finished") } From 3f4cda0f2d339095d24a646dabab7f4d6b036c69 Mon Sep 17 00:00:00 2001 From: Adrian Cockcroft Date: Mon, 28 Dec 2020 13:11:26 -0800 Subject: [PATCH 7/7] Enabled Done button --- R/photon_rstudioaddin.R | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/R/photon_rstudioaddin.R b/R/photon_rstudioaddin.R index c06065c..489cc8d 100644 --- a/R/photon_rstudioaddin.R +++ b/R/photon_rstudioaddin.R @@ -14,7 +14,7 @@ photon_rstudioaddin <- function(RscriptRepository = NULL) { # Shiny fileinput resethandler miniUI::gadgetTitleBar("Use Photon to Build Standalone Shiny Apps", - left = NULL, right = NULL), + left = NULL), miniUI::miniTabstripPanel( #miniUI::miniTabPanel( @@ -57,10 +57,6 @@ photon_rstudioaddin <- function(RscriptRepository = NULL) { miniUI::miniButtonBlock( actionButton("create", "Build", icon("play-circle"), style="color: #fff; background-color: #337ab7; border-color: #2e6da4") - ), - miniUI::miniButtonBlock( - actionButton("done", "Done", icon("stop-circle"), - style="color: #fff; background-color: #337ab7; border-color: #2e6da4") ) )