Merge branch 'main' into ui_renovation

RE-QDA · Jun 23, 2023 · d9e1e0d · d9e1e0d
2 parents 0238633 + f04b1a3
commit d9e1e0d
Show file tree

Hide file tree

Showing 9 changed files with 669 additions and 397 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: requal
 Title: Shiny Application for Computer-Assisted Qualitative Data Analysis
-Version: 0.10.0.9001
+Version: 1.0.0
 Authors@R:
     c(
      person(given = "Radim",

diff --git a/R/mod_about.R b/R/mod_about.R
@@ -23,8 +23,8 @@ mod_about_ui <- function(id){
 
         p(),
         HTML(paste0("For help, consult ", 
-        a("reQual Wiki", href="https://github.com/RE-QDA/requal/wiki", target = "_blank"), 
-        ".")),
+                    a("reQual Wiki", href="https://github.com/RE-QDA/requal/wiki", target = "_blank"), 
+                    ".")),
         p(),
         p("The development of this tool has been supported by", 
           a(href = "https://www.tacr.cz/en/technology-agency-of-the-czech-republic", 

diff --git a/R/mod_memo_utils_memo.R b/R/mod_memo_utils_memo.R
@@ -56,7 +56,7 @@ add_memo_record <- function(pool, project, text, user_id) {
                           .data$text == !!memo_df$text) %>% 
             dplyr::pull(memo_id)
         log_add_memo_record(pool, memo_df$project_id, memo_df %>% 
-                                dplyr::mutate(memo_id = memo_id), 
+                                dplyr::mutate(memo_id = max(memo_id)), 
                             user_id = user_id)
     }
 }

diff --git a/README.Rmd b/README.Rmd
@@ -22,7 +22,6 @@ knitr::opts_chunk$set(
 
 The goal of `requal` is to provide reproducibility support for qualitative coding.  
 
-⚠️ __The package is in development and experimental stage.__ ⚠️
 
 ```{r screenshot, echo=FALSE}
 knitr::include_graphics("https://owncloud.cesnet.cz/index.php/s/mQcxC998RC6qwVP/download")

diff --git a/README.md b/README.md
@@ -13,8 +13,6 @@ experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](h
 The goal of `requal` is to provide reproducibility support for
 qualitative coding.
 
-⚠️ **The package is in development and experimental stage.** ⚠️
-
 <img src="https://owncloud.cesnet.cz/index.php/s/mQcxC998RC6qwVP/download" width="100%" />
 
 ## Installation

diff --git a/dev/run_dev.R b/dev/run_dev.R
@@ -10,7 +10,7 @@ golem::document_and_reload()
 
 # Run the application
 (run_app(
-  mode = "server",
+  mode = "local",
   dbname = "requal",
   dbhost = "localhost",
   dbusername = "requal_admin",

diff --git a/inst/app/www/requal_logo.png b/inst/app/www/requal_logo.png