Merge pull request #66 from dfe-analytical-services/add-dfeshiny

Add dfeshiny package

.Rprofile

@@ -12,10 +12,10 @@ cat("Sourcing .Rprofile.", fill = TRUE)
 
 source("renv/activate.R")
 
-# Tidy code function
-tidy_code <- function() {
-  source("global.r")
-  tidy_code_function()
+if (system.file(package = "dfeshiny") != "") {
+  library(dfeshiny)
+} else {
+  warning("dfeshiny package is not installed, please run renv::restore() to set up the necessary package environment")
 }
 
 # Function to run tests

.github/workflows/tidyCode.yaml

@@ -58,7 +58,7 @@ jobs:
         run: |
             source("global.R")
         
-            codeChecks <- tidy_code_function()
+            codeChecks <- tidy_code()
             
             if(any(is.na(codeChecks))) {
               stop("There is a breaking error in the code.")

R/dfe_resources.R

@@ -7,4 +7,4 @@
 # 2023-09-21: update made to change hex codes to AF colours package
 # guidance here: https://best-practice-and-impact.github.io/afcolours/
 
-gss_colour_pallette <- afcolours::af_colours("categorical", colour_format = "hex", n = 6)
+suppressMessages(gss_colour_pallette <- afcolours::af_colours("categorical", colour_format = "hex", n = 6))

R/standard_panels.R

@@ -37,52 +37,3 @@ a11y_panel <- function() {
     )
   )
 }
-
-support_links <- function() {
-  tabPanel(
-    "Support and feedback",
-    gov_main_layout(
-      gov_row(
-        column(
-          width = 12,
-          h1("Support and feedback"),
-          h2("Give us feedback"),
-          p(
-            "This dashboard is a new service that we are developing. If you have any feedback or suggestions for improvements, please submit them using our ",
-            a(
-              href = "https://forms.office.com",
-              "feedback form", .noWS = c("after")
-            ), "."
-          ),
-          p(
-            "If you spot any errors or bugs while using this dashboard, please screenshot and email them to ",
-            a(href = "mailto:[email protected]", "[email protected]", .noWS = c("after")), "."
-          ),
-          h2("Find more information on the data"),
-          p(
-            "The data used to produce the dashboard, along with methodological information can be found on ",
-            a(href = "https://explore-education-statistics.service.gov.uk/", "Explore Education Statistics", .noWS = c("after")),
-            "."
-          ),
-          h2("Contact us"),
-          p(
-            "If you have questions about the dashboard or data within it, please contact us at ",
-            a(href = "mailto:[email protected]", "[email protected]", .noWS = c("after"))
-          ),
-          h2("See the source code"),
-          p(
-            "The source code for this dashboard is available in our ",
-            a(href = "https://github.com/dfe-analytical-services/shiny-template", "GitHub repository", .noWS = c("after")),
-            "."
-          )
-        ),
-        column(
-          12,
-          h2("Use of cookies"),
-          textOutput("cookie_status"),
-          actionButton("remove", "Reset cookie consent"),
-        )
-      )
-    )
-  )
-}

global.R

@@ -27,6 +27,8 @@ shhh(library(metathis))
 shhh(library(shinyalert))
 shhh(library(shinytest2))
 shhh(library(rstudioapi))
+shhh(library(bslib))
+shhh(library(dfeshiny))
 # shhh(library(shinya11y))
 
 # Functions ---------------------------------------------------------------------------------
@@ -45,25 +47,6 @@ cs_num <- function(value) {
   format(value, big.mark = ",", trim = TRUE)
 }
 
-# tidy_code_function -------------------------------------------------------------------------------
-# Code to tidy up the scripts.
-
-tidy_code_function <- function() {
-  message("----------------------------------------")
-  message("App scripts")
-  message("----------------------------------------")
-  app_scripts <- eval(styler::style_dir(recursive = FALSE)$changed)
-  message("R scripts")
-  message("----------------------------------------")
-  r_scripts <- eval(styler::style_dir("R/")$changed)
-  message("Test scripts")
-  message("----------------------------------------")
-  test_scripts <- eval(styler::style_dir("tests/", filetype = "r")$changed)
-  script_changes <- c(app_scripts, r_scripts, test_scripts)
-  return(script_changes)
-}
-
-
 # Source scripts ---------------------------------------------------------------------------------
 
 # Source any scripts here. Scripts may be needed to process data before it gets to the server file.