version 2.0.0

pr2database · Nov 28, 2022 · 96e3369 · 96e3369
1 parent 14e5b3e
commit 96e3369
Show file tree

Hide file tree

Showing 30 changed files with 61 additions and 55 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: metapr2
 Title: Eukaryotic 18S rRNA metabarcode database 
-Version: 1.0.4
+Version: 2.0.0
 Authors@R: 
     person(given = "Daniel",
            family = "Vaulot",

diff --git a/NEWS.md b/NEWS.md
@@ -1,9 +1,10 @@
-# metapr2 1.0.4
+# metapr2 2.0.0
+
 Released: 2022-11-23
 
 ### Database 
 
-#### version 2.0 - 59 datasets
+#### 59 datasets
 
 18 new datasets
 

diff --git a/R/app.R b/R/app.R
@@ -123,9 +123,10 @@ server <- function(input, output, session) {
                                  id = "auth",
                                  check_credentials = shinymanager::check_credentials(credentials))
 
-  observeEvent(input$button_disconnect, {
-    session$close()
-  })
+  # Disconnection
+
+  observeEvent(input$button_disconnect, {session$close() } )
+
   # Validate the sample selection
   # See: https://rstudio.github.io/shinyvalidate/articles/shinyvalidate.html
 

diff --git a/R/module_datasets.R b/R/module_datasets.R
@@ -297,6 +297,9 @@ dataServer <- function(id, taxo, authentification, asv_clustered) {
       if (authentification$user == "ge") {
         dir_asv_set <- "data-qs-ge"
       }
+      if (authentification$user == "ge2") {
+        dir_asv_set <- "data-qs-ge2"
+      }
 
       if(asv_clustered) {
         file_asv_set <- "asv_set_cluster.qs"

diff --git a/R/module_display_info.R b/R/module_display_info.R
@@ -23,6 +23,7 @@ display_info_server <- function(id, authentification, asv_clustered) {
       if(length(authentification$user) == 0) return("2.0") # Defaut case
       if(authentification$user == "v1") return( "1.0")
       if(authentification$user == "ge") return( "1.0 + Green edge")
+      if(authentification$user == "ge2") return( "2.0 + Green edge")
       if(authentification$user == "private") return(  "2.0 + private")
       return("2.0")
     })

diff --git a/README.Rmd b/README.Rmd
@@ -21,16 +21,16 @@ knitr::opts_chunk$set(
 
 <!-- badges: start -->
 [![DOI](https://zenodo.org/badge/410160328.svg)](https://zenodo.org/badge/latestdoi/410160328)
-![Release](https://img.shields.io/badge/release-1.0.4-blue.svg)
+![Release](https://img.shields.io/badge/release-2.0.0-blue.svg)
 ![Date](https://img.shields.io/badge/date-23%20Nov%202022-lightgrey.svg)
 
 <!-- badges: end -->
 
 ## A database of 18S rRNA metabarcodes
 
-**Database version**:  2.0 - 59 datasets
+**Version**:  2.0.0 - 59 datasets
 
-**Shiny application version**: 1.0.4
+**Release date**: 2022-11-23
 
 ### Presentation
 
@@ -69,7 +69,7 @@ devtools::install_github("pr2database/metapr2-shiny")
 Note: You may have to install some packages required by metapr2 if they are not installed on your machine
 
 ##### Alternatively install from [R-universe](https://pr2database.r-universe.dev/ui#packages)
-No need in this case to install package `devetools`
+No need in this case to install package `devtools`
 
 ```{r, eval=FALSE, echo=TRUE}
 # Enable repository from pr2database

diff --git a/README.md b/README.md
@@ -6,16 +6,16 @@
 <!-- badges: start -->
 
 [![DOI](https://zenodo.org/badge/410160328.svg)](https://zenodo.org/badge/latestdoi/410160328)
-![Release](https://img.shields.io/badge/release-1.0.4-blue.svg)
+![Release](https://img.shields.io/badge/release-2.0.0-blue.svg)
 ![Date](https://img.shields.io/badge/date-23%20Nov%202022-lightgrey.svg)
 
 <!-- badges: end -->
 
 ## A database of 18S rRNA metabarcodes
 
-**Database version**: 2.0 - 59 datasets
+**Version**: 2.0.0 - 59 datasets
 
-**Shiny application version**: 1.0.4
+**Release date**: 2022-11-23
 
 ### Presentation
 
@@ -55,7 +55,7 @@ are not installed on your machine
 
 ##### Alternatively install from [R-universe](https://pr2database.r-universe.dev/ui#packages)
 
-No need in this case to install package `devetools`
+No need in this case to install package `devtools`
 
 ``` r
 # Enable repository from pr2database

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/metapr2.html b/docs/articles/metapr2.html
diff --git a/docs/articles/vignette-barplots.html b/docs/articles/vignette-barplots.html
diff --git a/docs/articles/vignette-data-processing.html b/docs/articles/vignette-data-processing.html
diff --git a/docs/articles/vignette-datasets.html b/docs/articles/vignette-datasets.html
diff --git a/docs/articles/vignette-diversity.html b/docs/articles/vignette-diversity.html
diff --git a/docs/articles/vignette-download.html b/docs/articles/vignette-download.html
diff --git a/docs/articles/vignette-maps.html b/docs/articles/vignette-maps.html
diff --git a/docs/articles/vignette-query.html b/docs/articles/vignette-query.html
diff --git a/docs/articles/vignette-select.html b/docs/articles/vignette-select.html
diff --git a/docs/articles/vignette-taxonomy.html b/docs/articles/vignette-taxonomy.html
diff --git a/docs/articles/vignette-treemaps.html b/docs/articles/vignette-treemaps.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -13,5 +13,5 @@ articles:
   vignette-select: vignette-select.html
   vignette-taxonomy: vignette-taxonomy.html
   vignette-treemaps: vignette-treemaps.html
-last_built: 2022-11-23T09:12Z
+last_built: 2022-11-28T06:59Z