version 1.0.1

cran · Nov 23, 2020 · be6971b · be6971b
1 parent 1944b18
commit be6971b
Show file tree

Hide file tree

Showing 10 changed files with 232 additions and 217 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,29 +1,29 @@
 Package: ShinyQuickStarter
 Type: Package
-Title: Quick Setup for ShinyDashboard Apps
-Version: 1.0.0
+Title: 'RStudio' Addin for Quick Setup of ShinyDashboard Apps
+Version: 1.0.1
 Authors@R: c(person("Leon", "Binder", email = "leon.binder@th-deg.de", role = c("cre", "aut")),
-             person("Bernhard", "Bauer", email = "bernhard.bauer@th-deg.de", role = c("aut")),
-             person("Michael", "Scholz", email = "michael.scholz@th-deg.de", role = c("aut")),
-             person("Bernhard", "Daffner", email = "bernhard.daffner@th-deg.de", role = c("aut")),
-             person("Jörg", "Bauer", email = "joerg.bauer@th-deg.de", role = c("aut")))
+             person("Bernhard", "Bauer", email = "bernhard.bauer@th-deg.de", role = c("ctb")),
+             person("Michael", "Scholz", email = "michael.scholz@th-deg.de", role = c("ctb")),
+             person("Bernhard", "Daffner", email = "bernhard.daffner@th-deg.de", role = c("ctb")),
+             person("Jörg", "Bauer", email = "joerg.bauer@th-deg.de", role = c("ctb")))
 Maintainer: Leon Binder <leon.binder@th-deg.de>
-Description: This RStudio addin enables faster creation of the project structure and design of ShinyDashboard apps. The graphical interface allows you to add certain code templates interactively. In addition to generating the basic project structure, the navigation in the app itself can also be defined or the app can be structured with modules.
+Description: This 'RStudio' addin enables faster creation of the project structure and design of 'ShinyDashboard' apps. The graphical interface allows you to add certain code templates interactively. In addition to generating the basic project structure, the navigation in the app itself can also be defined or the app can be structured with modules.
 License: GPL-3
 Depends: R (>= 3.2.0)
 Imports: shiny, shinyFiles, shinyWidgets, shinyalert, miniUI,
         colourpicker, grDevices, data.table, DT, dplyr, fs, readr,
         rlist, shinycssloaders, shinyjs, stringi, stringr, styler,
-        utils, visNetwork
+        magrittr, utils, visNetwork
 Encoding: UTF-8
 StagedInstall: yes
+NeedsCompilation: yes
 RoxygenNote: 7.1.1
-NeedsCompilation: no
-Packaged: 2020-11-11 10:36:26 UTC; Leon
+Packaged: 2020-11-23 11:39:49 UTC; Leon
 Author: Leon Binder [cre, aut],
-  Bernhard Bauer [aut],
-  Michael Scholz [aut],
-  Bernhard Daffner [aut],
-  Jörg Bauer [aut]
+  Bernhard Bauer [ctb],
+  Michael Scholz [ctb],
+  Bernhard Daffner [ctb],
+  Jörg Bauer [ctb]
 Repository: CRAN
-Date/Publication: 2020-11-16 10:10:02 UTC
+Date/Publication: 2020-11-23 14:10:09 UTC
diff --git a/MD5 b/MD5
@@ -1,14 +1,14 @@
-9fd35a6e586eed70d79c4828dc92b724 *DESCRIPTION
-d1b22769ee003c68fd10a105e5478823 *NAMESPACE
-04159bdca4e8b532e740dc1c2e7f562a *NEWS.md
-3bb70d9261f73adcf44af58123f7e966 *R/ShinyQuickStarter-package.R
-ee8450063a582ce80c733727e2476503 *R/function_visNetwork.R
+134546a7b681c17a66661d4d14828ca8 *DESCRIPTION
+765fc63e5355cd2d6e4b316379874a91 *NAMESPACE
+3a1f900650af0538e8898354d02d9a08 *NEWS.md
+593e489a61995a20df698644fffcd3b8 *R/ShinyQuickStarter-package.R
+b0cd7996f72d7b19e6bd8c881850768c *R/function_visNetwork.R
 c3759168d45e4d63a56b889a336c72f6 *R/functions.R
 312d170d97c1c2a4893fc22acf2e07d8 *R/global.R
 4e82c153baca6680808fb8072f5e1f2d *R/server.R
-07336187d18814f128923dad57ae9da9 *R/shinyQuickStarter.R
+c934dbb16eb4609c4b30d5c3b21ded7b *R/shinyQuickStarter.R
 12243f6de0ddeaf32b1afb8450405ce1 *R/ui.R
-222fcba8c845c19cccd38dada3f634a6 *inst/extdata/templates/code_templates.csv
+002e12a1b224839f3b77ef8b53e07b46 *inst/extdata/templates/code_templates.csv
 ed112617c5f3502f2d9046b53c8579a0 *inst/extdata/templates/template_custom.css
 c06b39a1111b8f144432fb74091fb26a *inst/extdata/templates/template_custom.js
 4f40f6bd128cc83ac193fbfd6313dab5 *inst/extdata/templates/template_global.R
@@ -19,5 +19,5 @@ bcd51942bfaefa33e825ff6e1ad4b698 *inst/extdata/templates/template_ui.R
 1434f28202fc47ad575bfa07d4940cda *inst/extdata/www/custom.css
 1e94c65b765dba4a37e9b4a0878ddfde *inst/extdata/www/custom.js
 64eda21a759e83c330233ae9913ef16b *inst/rstudio/addins.dcf
-4c6ff5fe61ad080af199e148206326a2 *man/ShinyQuickStarter-package.Rd
-ca8d2fdc5db13078abc8d382d6c6a597 *man/shinyQuickStarter.Rd
+23764142a86284c0dd76614d046d54ea *man/ShinyQuickStarter-package.Rd
+dd68583b7f30e955937fb71654e941f5 *man/shinyQuickStarter.Rd
diff --git a/NAMESPACE b/NAMESPACE
@@ -19,6 +19,7 @@ importFrom(dplyr,full_join)
 importFrom(dplyr,inner_join)
 importFrom(fs,path_home)
 importFrom(grDevices,colorRampPalette)
+importFrom(magrittr,"%>%")
 importFrom(shinyFiles,getVolumes)
 importFrom(shinyFiles,parseDirPath)
 importFrom(shinyFiles,shinyDirButton)

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# ShinyQuickStarter 1.0.1 (23/11/2020)
+
+## Warning error because of installation from binary
+
 # ShinyQuickStarter 1.0.0 (11/11/2020)
 
 ## Initial Version
diff --git a/R/ShinyQuickStarter-package.R b/R/ShinyQuickStarter-package.R
@@ -5,7 +5,7 @@
 #' the basic project structure, the navigation in the app itself can also be defined or the app can be structured with modules.
 #'
 #' \tabular{ll}{ Package: \tab ShinyQuickStarter\cr Type: \tab Package\cr Version:
-#' \tab 1.0.0\cr Date: \tab 2020-11-11\cr License: \tab GPL-3\cr Depends: \tab
+#' \tab 1.0.1\cr Date: \tab 2020-11-23\cr License: \tab GPL-3\cr Depends: \tab
 #' R (>= 3.2.0)}
 #'
 #' @name ShinyQuickStarter-package
@@ -36,6 +36,7 @@
 #' @importFrom fs path_home
 #' @importFrom grDevices colorRampPalette
 #' @importFrom stringr str_detect str_replace_all str_split str_replace str_split_fixed str_extract_all
+#' @importFrom magrittr %>%
 #' @importFrom utils tail stack
 #' @importFrom stats setNames
 

diff --git a/R/function_visNetwork.R b/R/function_visNetwork.R
@@ -226,7 +226,6 @@
 
   network = visNetwork(nodes, edges) %>%
     visEdges(arrows = "from") %>%
-    #visIgraphLayout(layout="layout_as_tree", flip.y=FALSE) %>%
     visHierarchicalLayout() %>%
     visOptions(highlightNearest = list(enabled = T, hover = F), nodesIdSelection = F) %>%
     visGroups(groupname = "App", color = "#fffff0") %>%

diff --git a/R/shinyQuickStarter.R b/R/shinyQuickStarter.R
@@ -9,13 +9,23 @@
 #' \dontrun{shinyQuickStarter()}
 #' @export
 shinyQuickStarter <- function() {
-  # Fix for colourInput from colourpicker that is not displayed in some cases, because the
-  # corresponding js files are not loaded.
-  shiny::addResourcePath("colourpicker-binding",
-                         system.file("srcjs", package = "colourpicker"))
-  shiny::addResourcePath("colourpicker-lib",
-                         system.file("www", "shared", "colourpicker", package = "colourpicker"))
+
+  warning("ShinyQuickStarter currently only works if you install it by source - 
+  otherwise there will be the error 'Couldn't normalize path in `addResourcePath`': \n
+  use:  install.packages('ShinyQuickStarter', type='source') \n
+  Do you want to proceed? [y]/n", immediate.=TRUE)
+
+  user_input = readline()
+
+  cat(user_input)
+
+  if (user_input == "y" | user_input == "") {
+    shiny::addResourcePath("colourpicker-binding", 
+                           system.file("srcjs", package = "colourpicker"))
+    shiny::addResourcePath("colourpicker-lib", 
+                           system.file("www", "shared", "colourpicker", package = "colourpicker"))
 
-  runApp(list(ui = .shiny_quick_starter_ui, server = .shiny_quick_starter_server),
-         launch.browser = TRUE)
+    runApp(list(ui = .shiny_quick_starter_ui, server = .shiny_quick_starter_server),
+           launch.browser = TRUE)
+  }
 }