diff --git a/README.md b/README.md index 867781f..a5a5a2e 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # freesearcheR - [![Lifecycle: experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://lifecycle.r-lib.org/articles/stages.html#experimental) [![rhub](https://github.com/agdamsbo/freesearcheR/actions/workflows/rhub.yaml/badge.svg)](https://github.com/agdamsbo/freesearcheR/actions/workflows/rhub.yaml) +[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.14527429.svg)](https://doi.org/10.5281/zenodo.14527429) [![freesearcheR](https://img.shields.io/badge/Shiny-shinyapps.io-blue?style=flat&labelColor=white&logo=RStudio&logoColor=blue)](https://agdamsbo.shinyapps.io/freesearcheR/) diff --git a/_pkgdown.yml b/_pkgdown.yml index b2dd8c2..d6a51b5 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -6,8 +6,12 @@ template: secondary: "#FF6F61" bootswatch: "united" base_font: {google: "Montserrat"} - heading_font: {google: "Public Sans",wght: "700"} + heading_font: {google: "Public Sans"} code_font: {google: "Open Sans"} + light-switch: false navbar: bg: primary + +includes: + in_header: umami-page.html diff --git a/inst/apps/data_analysis_modules/app.R b/inst/apps/data_analysis_modules/app.R index 2142587..f76f274 100644 --- a/inst/apps/data_analysis_modules/app.R +++ b/inst/apps/data_analysis_modules/app.R @@ -3096,28 +3096,46 @@ ui_elements <- list( fluidRow( shiny::column( width = 9, - update_variables_ui("vars_update") + update_variables_ui("vars_update"), + shiny::tags$br() ), shiny::column( width = 3, - tags$h3("Create new variables"), + tags$h4("Create new variables"), shiny::tags$br(), - shiny::actionButton("modal_cut", "Create factor variable"), + shiny::actionButton( + inputId = "modal_cut", + label = "Create factor variable", + width = "100%" + ), shiny::tags$br(), shiny::helpText("Create factor/categorical variable from an other value."), shiny::tags$br(), shiny::tags$br(), - shiny::actionButton("modal_update", "Reorder factor levels"), + shiny::actionButton( + inputId = "modal_update", + label = "Reorder factor levels", + width = "100%" + ), shiny::tags$br(), shiny::helpText("Reorder the levels of factor/categorical variables."), shiny::tags$br(), shiny::tags$br(), - shiny::actionButton("modal_column", "New variable"), + shiny::actionButton( + inputId = "modal_column", + label = "New variable", + width = "100%" + ), shiny::tags$br(), shiny::helpText("Create a new variable/column based on an R-expression."), shiny::tags$br(), shiny::tags$br(), - shiny::actionButton("data_reset", "Restore original data"), + tags$h4("Restore"), + shiny::actionButton( + inputId = "data_reset", + label = "Restore original data", + width = "100%" + ), shiny::tags$br(), shiny::helpText("Reset to original imported dataset. Careful! There is no un-doing."), shiny::tags$br() # , @@ -3321,11 +3339,11 @@ ui_elements <- list( "docs" = bslib::nav_item( # shiny::img(shiny::icon("book")), shiny::tags$a( - href = "https://agdamsbo.github.io/freesearcheR/", - "Docs (external)", - target = "_blank", - rel = "noopener noreferrer" - ) + href = "https://agdamsbo.github.io/freesearcheR/", + "Docs (external)", + target = "_blank", + rel = "noopener noreferrer" + ) ) # bslib::nav_panel( # title = "Documentation", @@ -3346,6 +3364,7 @@ dark <- custom_theme( # https://webdesignerdepot.com/17-open-source-fonts-youll-actually-love/ ui <- bslib::page_fixed( + shiny::tags$head(includeHTML(("www/umami-app.html"))), shiny::tags$style( type = "text/css", # add the name of the tab you want to use as title in data-value @@ -3945,7 +3964,7 @@ server <- function(input, output, session) { ############################################################################## shiny::observeEvent(input$act_start, { - bslib::nav_select(id = "main_panel", selected = "Modifications") + bslib::nav_select(id = "main_panel", selected = "Data") }) diff --git a/inst/apps/data_analysis_modules/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf b/inst/apps/data_analysis_modules/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf index d0bc823..680fd6c 100644 --- a/inst/apps/data_analysis_modules/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf +++ b/inst/apps/data_analysis_modules/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf @@ -5,6 +5,6 @@ account: agdamsbo server: shinyapps.io hostUrl: https://api.shinyapps.io/v1 appId: 13611288 -bundleId: 9656431 +bundleId: 9656811 url: https://agdamsbo.shinyapps.io/freesearcheR/ version: 1 diff --git a/inst/apps/data_analysis_modules/server.R b/inst/apps/data_analysis_modules/server.R index 50647b5..b34d3c9 100644 --- a/inst/apps/data_analysis_modules/server.R +++ b/inst/apps/data_analysis_modules/server.R @@ -554,7 +554,7 @@ server <- function(input, output, session) { ############################################################################## shiny::observeEvent(input$act_start, { - bslib::nav_select(id = "main_panel", selected = "Modifications") + bslib::nav_select(id = "main_panel", selected = "Data") }) diff --git a/inst/apps/data_analysis_modules/ui.R b/inst/apps/data_analysis_modules/ui.R index dd88d4c..95eb6c1 100644 --- a/inst/apps/data_analysis_modules/ui.R +++ b/inst/apps/data_analysis_modules/ui.R @@ -160,28 +160,46 @@ ui_elements <- list( fluidRow( shiny::column( width = 9, - update_variables_ui("vars_update") + update_variables_ui("vars_update"), + shiny::tags$br() ), shiny::column( width = 3, - tags$h3("Create new variables"), + tags$h4("Create new variables"), shiny::tags$br(), - shiny::actionButton("modal_cut", "Create factor variable"), + shiny::actionButton( + inputId = "modal_cut", + label = "Create factor variable", + width = "100%" + ), shiny::tags$br(), shiny::helpText("Create factor/categorical variable from an other value."), shiny::tags$br(), shiny::tags$br(), - shiny::actionButton("modal_update", "Reorder factor levels"), + shiny::actionButton( + inputId = "modal_update", + label = "Reorder factor levels", + width = "100%" + ), shiny::tags$br(), shiny::helpText("Reorder the levels of factor/categorical variables."), shiny::tags$br(), shiny::tags$br(), - shiny::actionButton("modal_column", "New variable"), + shiny::actionButton( + inputId = "modal_column", + label = "New variable", + width = "100%" + ), shiny::tags$br(), shiny::helpText("Create a new variable/column based on an R-expression."), shiny::tags$br(), shiny::tags$br(), - shiny::actionButton("data_reset", "Restore original data"), + tags$h4("Restore"), + shiny::actionButton( + inputId = "data_reset", + label = "Restore original data", + width = "100%" + ), shiny::tags$br(), shiny::helpText("Reset to original imported dataset. Careful! There is no un-doing."), shiny::tags$br() # , @@ -385,11 +403,11 @@ ui_elements <- list( "docs" = bslib::nav_item( # shiny::img(shiny::icon("book")), shiny::tags$a( - href = "https://agdamsbo.github.io/freesearcheR/", - "Docs (external)", - target = "_blank", - rel = "noopener noreferrer" - ) + href = "https://agdamsbo.github.io/freesearcheR/", + "Docs (external)", + target = "_blank", + rel = "noopener noreferrer" + ) ) # bslib::nav_panel( # title = "Documentation", @@ -410,6 +428,7 @@ dark <- custom_theme( # https://webdesignerdepot.com/17-open-source-fonts-youll-actually-love/ ui <- bslib::page_fixed( + shiny::tags$head(includeHTML(("www/umami-app.html"))), shiny::tags$style( type = "text/css", # add the name of the tab you want to use as title in data-value diff --git a/inst/apps/data_analysis_modules/www/intro.md b/inst/apps/data_analysis_modules/www/intro.md index 9271b5c..4b5e9f6 100644 --- a/inst/apps/data_analysis_modules/www/intro.md +++ b/inst/apps/data_analysis_modules/www/intro.md @@ -20,6 +20,6 @@ There are four simple steps to go through (see corresponding tabs in the top): 4. Export the the analyses results for MS Word or [LibreOffice](https://www.libreoffice.org/) as well as the data with preserved metadata. -Have a look at the [documentations page]() for further project description. If you're interested in the source code, then go on, [have a look](https://github.com/agdamsbo/freesearcheR)! +Have a look at the [documentations page](https://agdamsbo.github.io/freesearcheR/) for further project description. If you're interested in the source code, then go on, [have a look](https://github.com/agdamsbo/freesearcheR)! If you encounter anything strange or the app doesn't act as expected. Please [report on Github](https://github.com/agdamsbo/freesearcheR/issues). diff --git a/inst/apps/data_analysis_modules/www/umami-app.html b/inst/apps/data_analysis_modules/www/umami-app.html new file mode 100644 index 0000000..1270d51 --- /dev/null +++ b/inst/apps/data_analysis_modules/www/umami-app.html @@ -0,0 +1 @@ + diff --git a/pkgdown/extra.css b/pkgdown/extra.css new file mode 100644 index 0000000..66d9f58 --- /dev/null +++ b/pkgdown/extra.css @@ -0,0 +1,3 @@ +h1,h2,h3 { + font-weight: 700; + } diff --git a/umami-page.html b/umami-page.html new file mode 100644 index 0000000..57eeb5a --- /dev/null +++ b/umami-page.html @@ -0,0 +1 @@ +