Merge pull request #5 from guidomaggioorg/develop

shinyfaithful 1.0.0

Author: guimaggio

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: shinyfaithful
 Title: Shiny4 workshop pkg
-Version: 0.0.0.9000
+Version: 1.0.0
 Authors@R: person('Guido', 'Maggio', email = '[email protected]', role = c('cre', 'aut'))
 Description: Package used for the 4th course of the Series Intro to Shiny.
 License: MIT + file LICENSE

NEWS.md

@@ -1,3 +1,3 @@
-# shinyfaithful (development version)
+# shinyfaithful 1.0.0
 
-* Initial CRAN submission.
+* Duplicated histogram (#1).

R/app_server.R

@@ -6,5 +6,6 @@
 #' @noRd
 app_server <- function(input, output, session) {
   # Your application server logic
-  mod_faithful_hist_server("hist")
+  mod_faithful_hist_server("hist-waiting", variable = "waiting")
+  mod_faithful_hist_server("hist-eruptions", variable = "eruptions")
 }

R/app_ui.R

@@ -11,7 +11,8 @@ app_ui <- function(request) {
     # Your application UI logic
     fluidPage(
       h1("Old Faithful Geyser - Hist"),
-      mod_faithful_hist_ui("hist")
+      mod_faithful_hist_ui("hist-waiting"),
+      mod_faithful_hist_ui("hist-eruptions")
     )
   )
 }

R/mod_faithful_hist.R

@@ -28,13 +28,14 @@ mod_faithful_hist_ui <- function(id) {
 }
 
 #' @rdname mod_faithful_hist
+#' @param variable character column name of faithful data
 #'
 #' @import shiny
-mod_faithful_hist_server <- function(id){
+mod_faithful_hist_server <- function(id, variable){
   moduleServer( id, function(input, output, session){
     ns <- session$ns
     # generate bins based on input$bins from ui.R
-    variable <- "waiting"
+    # variable <- "waiting"
     x    <- datasets::faithful[, variable, drop = FALSE]
     bins <- reactive(seq(min(x), max(x), length.out = input$bins + 1))