diff --git a/R/dashboard_panels.R b/R/dashboard_panels.R index 4ab71b7..d14b7d6 100644 --- a/R/dashboard_panels.R +++ b/R/dashboard_panels.R @@ -8,7 +8,7 @@ homepage_panel <- function() { gov_row( column( 12, - h1("DfE Analytical Services R-Shiny data dashboard template (h1)"), + h1("Department for Education (DfE) Analytical Services R-Shiny data dashboard template"), br(), br() ), @@ -24,12 +24,12 @@ homepage_panel <- function() { class = "panel-heading", style = "color: white;font-size: 18px;font-style: bold; background-color: #1d70b8;", - h2("Contents (h2)") + h2("Contents") ), div( class = "panel-body", tags$div( - h3("Introduction (h3)"), + h3("Introduction"), p("This app demonstrates the DfE Analytical Services R-Shiny data dashboard template."), p("You might want to add some brief introductory text here @@ -56,11 +56,11 @@ homepage_panel <- function() { class = "panel-heading", style = "color: white;font-size: 18px;font-style: bold; background-color: #1d70b8;", - h2("Background Info (h2)") + h2("Background Info") ), div( class = "panel-body", - h3("Context and purpose (h3)"), + h3("Context and purpose"), p("This app is the DfE Analytical Service's R-Shiny template demonstration app and is being developed to provide a coherent styling for DfE dashboards alongside some useful example @@ -69,9 +69,10 @@ homepage_panel <- function() { styling and layout, keeping the header, footer and side navigation list formats."), p("You might want to add some relevant background information - for your users here. For example some useful links to your EES + for your users here. For example some useful links to your + Explore Education Statistics (EES) publication, data sources and other relevant resources."), - h3("Guidance sources (h3)"), + h3("Guidance sources"), p("For example, here we'll add some of the key resources we draw on to guide styling and vizualisation...") ) @@ -96,7 +97,7 @@ dashboard_panel <- function() { gov_row( column( width = 12, - h1("Overall content title for this dashboard page (h1)"), + h1("Overall content title for this dashboard page"), ), column( width = 12, @@ -147,7 +148,7 @@ dashboard_panel <- function() { fluidRow( column( width = 12, - h2("Examples of producing value boxes in R-Shiny (h2)"), + h2("Examples of producing value boxes in R-Shiny"), fluidRow( column( width = 12, @@ -177,7 +178,7 @@ dashboard_panel <- function() { fluidRow( column( width = 12, - h2("An example line chart using ggplot and ggiraph (h2)"), + h2("An example line chart using ggplot and ggiraph"), girafeOutput("lineRevBal", width = "100%", height = "100%") ) ) @@ -187,7 +188,7 @@ dashboard_panel <- function() { fluidRow( column( width = 12, - h2("An example bar chart using ggplot and ggiraph (h2)"), + h2("An example bar chart using ggplot and ggiraph"), p("This is the standard paragraph style for adding guiding info around data content."), column( @@ -206,7 +207,7 @@ dashboard_panel <- function() { column( width = 12, selectizeInput("selectBenchLAs", - "Select benchmark LAs", + "Select benchmark local authorities", choices = choicesLAs$area_name, multiple = TRUE, options = list(maxItems = 3) diff --git a/global.R b/global.R index e67cd83..edac7b9 100644 --- a/global.R +++ b/global.R @@ -77,7 +77,7 @@ appLoadingCSS <- " } " -site_title <- "DfE Shiny Template" +site_title <- "Department for Education (DfE) Shiny Template" site_primary <- "https://department-for-education.shinyapps.io/dfe-shiny-template/" site_overflow <- "https://department-for-education.shinyapps.io/dfe-shiny-template-overflow/" # We can add further mirrors where necessary. Each one can generally handle @@ -94,7 +94,10 @@ google_analytics_key <- "Z967JJVQQX" source("R/read_data.R") # Read in the data -dfRevBal <- read_revenue_data() +dfRevBal <- read_revenue_data() %>% + mutate(school_phase = case_when(school_phase == "All LA maintained schools" ~ "All local authority maintained schools", + .default = school_phase + )) # Get geographical levels from data dfAreas <- dfRevBal %>% select( diff --git a/renv.lock b/renv.lock index 9c9f585..e099e13 100644 --- a/renv.lock +++ b/renv.lock @@ -1,6 +1,6 @@ { "R": { - "Version": "4.3.2", + "Version": "4.3.3", "Repositories": [ { "Name": "CRAN", @@ -18,16 +18,16 @@ }, "BH": { "Package": "BH", - "Version": "1.81.0-1", + "Version": "1.84.0-0", "Source": "Repository", "Repository": "CRAN", - "Hash": "68122010f01c4dcfbe58ce7112f2433d" + "Hash": "a8235afbcd6316e6e91433ea47661013" }, "DT": { "Package": "DT", - "Version": "0.30", + "Version": "0.33", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "crosstalk", "htmltools", @@ -38,7 +38,7 @@ "magrittr", "promises" ], - "Hash": "dffb4d94a00be1b4a4507e53ab95bd90" + "Hash": "64ff3427f559ce3f2597a4fe13255cb6" }, "MASS": { "Package": "MASS", @@ -100,16 +100,16 @@ }, "R.oo": { "Package": "R.oo", - "Version": "1.25.0", + "Version": "1.26.0", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "R.methodsS3", "methods", "utils" ], - "Hash": "a0900a114f4f0194cf4aa8cd4a700681" + "Hash": "4fed809e53ddb5407b3da3d0f572e591" }, "R.utils": { "Package": "R.utils", @@ -146,16 +146,28 @@ ], "Hash": "45f0398006e83a5b10b72a90663d8d8c" }, + "RCurl": { + "Package": "RCurl", + "Version": "1.98-1.14", + "Source": "Repository", + "Repository": "RSPM", + "Requirements": [ + "R", + "bitops", + "methods" + ], + "Hash": "47f648d288079d0c696804ad4e55197e" + }, "Rcpp": { "Package": "Rcpp", - "Version": "1.0.11", + "Version": "1.0.12", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "methods", "utils" ], - "Hash": "ae6cbbe1492f4de79c45fce06f967ce8" + "Hash": "5ea2700d21e038ace58269ecdbeb9ec0" }, "afcolours": { "Package": "afcolours", @@ -193,13 +205,13 @@ }, "backports": { "Package": "backports", - "Version": "1.4.1", + "Version": "1.5.0", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R" ], - "Hash": "c39fbec8a30d23e721980b8afb31984c" + "Hash": "e1e1b9d75c37401117b636b7ae50827a" }, "base64enc": { "Package": "base64enc", @@ -211,32 +223,44 @@ ], "Hash": "543776ae6848fde2f48ff3816d0628bc" }, + "bitops": { + "Package": "bitops", + "Version": "1.0-7", + "Source": "Repository", + "Repository": "RSPM", + "Hash": "b7d8d8ee39869c18d8846a184dd8a1af" + }, "brio": { "Package": "brio", - "Version": "1.1.3", + "Version": "1.1.5", "Source": "Repository", - "Repository": "CRAN", - "Hash": "976cf154dfb043c012d87cddd8bca363" + "Repository": "RSPM", + "Requirements": [ + "R" + ], + "Hash": "c1ee497a6d999947c2c224ae46799b1a" }, "bslib": { "Package": "bslib", - "Version": "0.5.1", + "Version": "0.7.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "base64enc", "cachem", + "fastmap", "grDevices", "htmltools", "jquerylib", "jsonlite", + "lifecycle", "memoise", "mime", "rlang", "sass" ], - "Hash": "283015ddfbb9d7bf15ea9f0b5698f0d9" + "Hash": "8644cc53f43828f19133548195d7e59e" }, "cachem": { "Package": "cachem", @@ -251,20 +275,20 @@ }, "callr": { "Package": "callr", - "Version": "3.7.3", + "Version": "3.7.6", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "R6", "processx", "utils" ], - "Hash": "9b2191ede20fa29828139b9900922e51" + "Hash": "d7e13f49c19103ece9e58ad2d83a7354" }, "checkmate": { "Package": "checkmate", - "Version": "2.3.0", + "Version": "2.3.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -272,11 +296,11 @@ "backports", "utils" ], - "Hash": "ed4275b13c6ab74b89a31def0b6bf835" + "Hash": "c01cab1cb0f9125211a6fc99d540e315" }, "chromote": { "Package": "chromote", - "Version": "0.1.2", + "Version": "0.2.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -289,9 +313,10 @@ "processx", "promises", "rlang", + "utils", "websocket" ], - "Hash": "14c8f71bf7b112634b154f8a6a0867e1" + "Hash": "3cfaf9cbd331e07055acada321664e12" }, "cli": { "Package": "cli", @@ -330,20 +355,20 @@ }, "commonmark": { "Package": "commonmark", - "Version": "1.9.0", + "Version": "1.9.1", "Source": "Repository", - "Repository": "CRAN", - "Hash": "d691c61bff84bd63c383874d2d0c3307" + "Repository": "RSPM", + "Hash": "5d8225445acb167abf7797de48b2ee3c" }, "cpp11": { "Package": "cpp11", - "Version": "0.4.6", + "Version": "0.4.7", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "707fae4bbf73697ec8d85f9d7076c061" + "Hash": "5a295d7d963cc5035284dcdbaf334f4e" }, "crayon": { "Package": "crayon", @@ -359,7 +384,7 @@ }, "crosstalk": { "Package": "crosstalk", - "Version": "1.2.0", + "Version": "1.2.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -368,45 +393,51 @@ "jsonlite", "lazyeval" ], - "Hash": "6aa54f69598c32177e920eb3402e8293" + "Hash": "ab12c7b080a57475248a30f4db6298c0" }, "curl": { "Package": "curl", - "Version": "5.1.0", + "Version": "5.2.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "9123f3ef96a2c1a93927d828b2fe7d4c" + "Hash": "411ca2c03b1ce5f548345d2fc2685f7a" }, "desc": { "Package": "desc", - "Version": "1.4.2", + "Version": "1.4.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "R6", "cli", - "rprojroot", "utils" ], - "Hash": "6b9602c7ebbe87101a9c8edb6e8b6d21" + "Hash": "99b79fcbd6c4d1ce087f5c5c758b384f" }, "dfeshiny": { "Package": "dfeshiny", "Version": "0.1.1", - "Source": "git", - "RemoteType": "git", - "RemoteUrl": "https://github.com/dfe-analytical-services/dfeshiny", - "RemoteRef": "", - "Requirements": [ + "Source": "GitHub", + "RemoteType": "github", + "RemoteHost": "api.github.com", + "RemoteUsername": "dfe-analytical-services", + "RemoteRepo": "dfeshiny", + "RemoteRef": "add-disconnect-message", + "RemoteSha": "855453b76628dd2df00c5fad26beac89841324f0", + "Requirements": [ + "RCurl", + "htmltools", "shiny", "shinyGovstyle", + "shinyjs", + "stringr", "styler" ], - "Hash": "18ef87ef6400ddf97ba458852ba7442c" + "Hash": "acb5366681ce3a2c53d01fb7fb4ece01" }, "diffobj": { "Package": "diffobj", @@ -457,17 +488,6 @@ ], "Hash": "fedd9d00c2944ff00a0e2696ccf048ec" }, - "ellipsis": { - "Package": "ellipsis", - "Version": "0.3.2", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "rlang" - ], - "Hash": "bb0eec2fe32e88d9e2836c2f73ea2077" - }, "evaluate": { "Package": "evaluate", "Version": "0.23", @@ -481,7 +501,7 @@ }, "fansi": { "Package": "fansi", - "Version": "1.0.5", + "Version": "1.0.6", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -489,14 +509,14 @@ "grDevices", "utils" ], - "Hash": "3e8583a60163b4bc1a80016e63b9959e" + "Hash": "962174cf2aeb5b9eea581522286a911f" }, "farver": { "Package": "farver", - "Version": "2.1.1", + "Version": "2.1.2", "Source": "Repository", - "Repository": "CRAN", - "Hash": "8106d78941f34855c440ddb946b8f7a5" + "Repository": "RSPM", + "Hash": "680887028577f3fa2a81e410ed0d6e42" }, "fastmap": { "Package": "fastmap", @@ -541,11 +561,12 @@ }, "ggiraph": { "Package": "ggiraph", - "Version": "0.8.8", + "Version": "0.8.10", "Source": "Repository", "Repository": "RSPM", "Requirements": [ "Rcpp", + "cli", "ggplot2", "grid", "htmltools", @@ -557,13 +578,13 @@ "uuid", "vctrs" ], - "Hash": "120f23937aa0311367eb1d94731660f7" + "Hash": "15748f4335af873289fbdd31610c3f96" }, "ggplot2": { "Package": "ggplot2", - "Version": "3.4.4", + "Version": "3.5.1", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "MASS", "R", @@ -582,18 +603,18 @@ "vctrs", "withr" ], - "Hash": "313d31eff2274ecf4c1d3581db7241f9" + "Hash": "44c6a2f8202d5b7e878ea274b1092426" }, "globals": { "Package": "globals", - "Version": "0.16.2", + "Version": "0.16.3", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "codetools" ], - "Hash": "baa9585ab4ce47a9f4618e671778cc6f" + "Hash": "2580567908cafd4f187c1e5a91e98b7f" }, "glue": { "Package": "glue", @@ -608,9 +629,9 @@ }, "gtable": { "Package": "gtable", - "Version": "0.3.4", + "Version": "0.3.5", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "cli", @@ -619,35 +640,34 @@ "lifecycle", "rlang" ], - "Hash": "b29cf3031f49b04ab9c852c912547eef" + "Hash": "e18861963cbc65a27736e02b3cd3c4a0" }, "highr": { "Package": "highr", - "Version": "0.10", + "Version": "0.11", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "xfun" ], - "Hash": "06230136b2d2b9ba5805e1963fa6e890" + "Hash": "d65ba49117ca223614f71b60d85b8ab7" }, "htmltools": { "Package": "htmltools", - "Version": "0.5.7", + "Version": "0.5.8.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "base64enc", "digest", - "ellipsis", "fastmap", "grDevices", "rlang", "utils" ], - "Hash": "2d7b3857980e0e0d0a1fd6f11928ab0f" + "Hash": "81d371a9cc60640e74e4ab6ac46dcedc" }, "htmlwidgets": { "Package": "htmlwidgets", @@ -666,9 +686,9 @@ }, "httpuv": { "Package": "httpuv", - "Version": "1.6.12", + "Version": "1.6.15", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "R6", @@ -677,7 +697,7 @@ "promises", "utils" ], - "Hash": "c992f75861325961c29a188b45e549f7" + "Hash": "d55aa087c47a63ead0f6fc10f8fa1ee0" }, "httr": { "Package": "httr", @@ -717,13 +737,13 @@ }, "jsonlite": { "Package": "jsonlite", - "Version": "1.8.7", + "Version": "1.8.8", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "methods" ], - "Hash": "266a20443ca13c65688b2116d5220f76" + "Hash": "e1b9c55281c5adc4dd113652d9e26768" }, "knitr": { "Package": "knitr", @@ -754,18 +774,18 @@ }, "later": { "Package": "later", - "Version": "1.3.1", + "Version": "1.3.2", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "Rcpp", "rlang" ], - "Hash": "40401c9cf2bc2259dfe83311c9384710" + "Hash": "a3e051d405326b8b0012377434c62b37" }, "lattice": { "Package": "lattice", - "Version": "0.22-5", + "Version": "0.22-6", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -776,7 +796,7 @@ "stats", "utils" ], - "Hash": "7c5e89f04e72d6611c77451f6331a091" + "Hash": "cc5ac1ba4c238c7ca9fa6a87ca11a7e2" }, "lazyeval": { "Package": "lazyeval", @@ -837,7 +857,7 @@ }, "mgcv": { "Package": "mgcv", - "Version": "1.9-0", + "Version": "1.9-1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -850,7 +870,7 @@ "stats", "utils" ], - "Hash": "086028ca0460d0c368028d3bda58f31b" + "Hash": "110ee9d83b496279960e162ac97764ce" }, "mime": { "Package": "mime", @@ -864,18 +884,18 @@ }, "munsell": { "Package": "munsell", - "Version": "0.5.0", + "Version": "0.5.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "colorspace", "methods" ], - "Hash": "6dfe8bf774944bd5595785e3229d8771" + "Hash": "4fd8900853b746af55b81fda99da7695" }, "nlme": { "Package": "nlme", - "Version": "3.1-163", + "Version": "3.1-164", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -885,17 +905,17 @@ "stats", "utils" ], - "Hash": "8d1938040a05566f4f7a14af4feadd6b" + "Hash": "a623a2239e642806158bc4dc3f51565d" }, "openssl": { "Package": "openssl", - "Version": "2.1.1", + "Version": "2.2.0", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "askpass" ], - "Hash": "2a0dc8c6adfb6f032e4d4af82d258ab5" + "Hash": "2bcca3848e4734eb3b16103bc9aa4b8e" }, "pillar": { "Package": "pillar", @@ -916,18 +936,19 @@ }, "pingr": { "Package": "pingr", - "Version": "2.0.2", + "Version": "2.0.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ + "R", "processx", "utils" ], - "Hash": "b762f8f7d305f7eb0bab96eb1a3c782a" + "Hash": "8d2db1d13f4198a00ebf2f066bf2ab67" }, "pkgbuild": { "Package": "pkgbuild", - "Version": "1.4.2", + "Version": "1.4.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -935,13 +956,10 @@ "R6", "callr", "cli", - "crayon", "desc", - "prettyunits", - "processx", - "rprojroot" + "processx" ], - "Hash": "beb25b32a957a22a5c301a9e441190b3" + "Hash": "a29e8e134a460a01e0ca67a4763c595b" }, "pkgconfig": { "Package": "pkgconfig", @@ -955,7 +973,7 @@ }, "pkgload": { "Package": "pkgload", - "Version": "1.3.3", + "Version": "1.3.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -972,7 +990,7 @@ "utils", "withr" ], - "Hash": "903d68319ae9923fb2e2ee7fa8230b91" + "Hash": "876c618df5ae610be84356d5d7a5d124" }, "praise": { "Package": "praise", @@ -981,34 +999,24 @@ "Repository": "CRAN", "Hash": "a555924add98c99d2f411e37e7d25e9f" }, - "prettyunits": { - "Package": "prettyunits", - "Version": "1.2.0", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R" - ], - "Hash": "6b01fc98b1e86c4f705ce9dcfd2f57c7" - }, "processx": { "Package": "processx", - "Version": "3.8.2", + "Version": "3.8.4", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "R6", "ps", "utils" ], - "Hash": "3efbd8ac1be0296a46c55387aeace0f3" + "Hash": "0c90a7d71988856bad2a2a45dd871bb9" }, "promises": { "Package": "promises", - "Version": "1.2.1", + "Version": "1.3.0", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R6", "Rcpp", @@ -1018,18 +1026,18 @@ "rlang", "stats" ], - "Hash": "0d8a15c9d000970ada1ab21405387dee" + "Hash": "434cd5388a3979e74be5c219bcd6e77d" }, "ps": { "Package": "ps", - "Version": "1.7.5", + "Version": "1.7.6", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "utils" ], - "Hash": "709d852d33178db54b17c722e5b1e594" + "Hash": "dd2b9319ee0656c8acf45c7f40c59de7" }, "purrr": { "Package": "purrr", @@ -1068,28 +1076,28 @@ }, "renv": { "Package": "renv", - "Version": "1.0.3", + "Version": "1.0.7", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "utils" ], - "Hash": "41b847654f567341725473431dd0d5ab" + "Hash": "397b7b2a265bc5a7a06852524dabae20" }, "rlang": { "Package": "rlang", - "Version": "1.1.2", + "Version": "1.1.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "utils" ], - "Hash": "50a6dbdc522936ca35afc5e2082ea91b" + "Hash": "42548638fae05fd9a9b5f3f437fbbbe2" }, "rmarkdown": { "Package": "rmarkdown", - "Version": "2.25", + "Version": "2.27", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1102,14 +1110,13 @@ "jsonlite", "knitr", "methods", - "stringr", "tinytex", "tools", "utils", "xfun", "yaml" ], - "Hash": "d65e35823c817f09f4de424fcdfa812a" + "Hash": "27f9502e1cdbfa195f94e03b0f517484" }, "rprojroot": { "Package": "rprojroot", @@ -1123,14 +1130,14 @@ }, "rstudioapi": { "Package": "rstudioapi", - "Version": "0.15.0", + "Version": "0.16.0", "Source": "Repository", - "Repository": "RSPM", - "Hash": "5564500e25cffad9e22244ced1379887" + "Repository": "CRAN", + "Hash": "96710351d642b70e8f02ddeb237c46a7" }, "sass": { "Package": "sass", - "Version": "0.4.7", + "Version": "0.4.9", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1140,31 +1147,33 @@ "rappdirs", "rlang" ], - "Hash": "6bd4d33b50ff927191ec9acbf52fd056" + "Hash": "d53dbfddf695303ea4ad66f86e99b95d" }, "scales": { "Package": "scales", - "Version": "1.2.1", + "Version": "1.3.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "R6", "RColorBrewer", + "cli", "farver", + "glue", "labeling", "lifecycle", "munsell", "rlang", "viridisLite" ], - "Hash": "906cb23d2f1c5680b8ce439b44c6fa63" + "Hash": "c19df082ba346b0ffa6f833e92de34d1" }, "shiny": { "Package": "shiny", - "Version": "1.8.0", + "Version": "1.8.1.1", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "R6", @@ -1172,7 +1181,6 @@ "cachem", "commonmark", "crayon", - "ellipsis", "fastmap", "fontawesome", "glue", @@ -1192,7 +1200,7 @@ "withr", "xtable" ], - "Hash": "3a1f41807d648a908e3c7f0334bf85e6" + "Hash": "54b26646816af9960a4c64d8ceec75d6" }, "shinyGovstyle": { "Package": "shinyGovstyle", @@ -1210,9 +1218,9 @@ }, "shinyWidgets": { "Package": "shinyWidgets", - "Version": "0.8.0", + "Version": "0.8.6", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "anytime", @@ -1224,22 +1232,20 @@ "sass", "shiny" ], - "Hash": "c6acc72327e63668bbc7bd258ee54132" + "Hash": "bc918b6911c4e928e24a9928295de834" }, "shinyalert": { "Package": "shinyalert", - "Version": "3.0.0", + "Version": "3.1.0", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "htmltools", - "knitr", "shiny", - "stats", "uuid" ], - "Hash": "2fd42421abd79dcaf0855fa1d21599a3" + "Hash": "45f99f3173e5513e2dec78dc4d63f9f0" }, "shinydashboard": { "Package": "shinydashboard", @@ -1270,9 +1276,9 @@ }, "shinytest2": { "Package": "shinytest2", - "Version": "0.3.1", + "Version": "0.3.2", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R6", "callr", @@ -1280,7 +1286,6 @@ "chromote", "cpp11", "crayon", - "ellipsis", "fs", "globals", "httr", @@ -1292,7 +1297,7 @@ "testthat", "withr" ], - "Hash": "04e60b31d4afef1d221ede5fafb0c6f6" + "Hash": "a414c1bb2eb6e2a920742d3ebce84962" }, "shinytitle": { "Package": "shinytitle", @@ -1316,16 +1321,16 @@ }, "stringi": { "Package": "stringi", - "Version": "1.8.1", + "Version": "1.8.4", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "stats", "tools", "utils" ], - "Hash": "12bf57fdcb9b7068bea39b32f87ecac9" + "Hash": "39e1144fd75428983dc3f63aa53dfa91" }, "stringr": { "Package": "stringr", @@ -1346,9 +1351,9 @@ }, "styler": { "Package": "styler", - "Version": "1.10.2", + "Version": "1.10.3", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "R.cache", @@ -1361,7 +1366,7 @@ "vctrs", "withr" ], - "Hash": "d61238fd44fc63c8adf4565efe8eb682" + "Hash": "93a2b1beac2437bdcc4724f8bf867e2c" }, "sys": { "Package": "sys", @@ -1372,20 +1377,21 @@ }, "systemfonts": { "Package": "systemfonts", - "Version": "1.0.5", + "Version": "1.1.0", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", - "cpp11" + "cpp11", + "lifecycle" ], - "Hash": "15b594369e70b975ba9f064295983499" + "Hash": "213b6b8ed5afbf934843e6c3b090d418" }, "testthat": { "Package": "testthat", - "Version": "3.2.0", + "Version": "3.2.1.1", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "R6", @@ -1394,7 +1400,6 @@ "cli", "desc", "digest", - "ellipsis", "evaluate", "jsonlite", "lifecycle", @@ -1409,7 +1414,7 @@ "waldo", "withr" ], - "Hash": "877508719fcb8c9525eccdadf07a5102" + "Hash": "3f6e7e5e2220856ff865e4834766bf2b" }, "tibble": { "Package": "tibble", @@ -1432,7 +1437,7 @@ }, "tidyselect": { "Package": "tidyselect", - "Version": "1.2.0", + "Version": "1.2.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1444,17 +1449,17 @@ "vctrs", "withr" ], - "Hash": "79540e5fcd9e0435af547d885f184fd5" + "Hash": "829f27b9c4919c16b593794a6344d6c0" }, "tinytex": { "Package": "tinytex", - "Version": "0.48", + "Version": "0.51", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "xfun" ], - "Hash": "8f96d229b7311beb32b94cf413b13f84" + "Hash": "d44e2fcd2e4e076f0aac540208559d1d" }, "utf8": { "Package": "utf8", @@ -1468,17 +1473,17 @@ }, "uuid": { "Package": "uuid", - "Version": "1.1-1", + "Version": "1.2-0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "3d78edfb977a69fc7a0341bee25e163f" + "Hash": "303c19bfd970bece872f93a824e323d9" }, "vctrs": { "Package": "vctrs", - "Version": "0.6.4", + "Version": "0.6.5", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1488,7 +1493,7 @@ "lifecycle", "rlang" ], - "Hash": "266c1ca411266ba8f365fcc726444b87" + "Hash": "c03fa420630029418f7e6da3667aac4a" }, "viridisLite": { "Package": "viridisLite", @@ -1533,16 +1538,15 @@ }, "withr": { "Package": "withr", - "Version": "2.5.2", + "Version": "3.0.0", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "grDevices", - "graphics", - "stats" + "graphics" ], - "Hash": "4b25e70111b7d644322e9513f403a272" + "Hash": "d31b6c62c10dcf11ec530ca6b0dd5d35" }, "xfun": { "Package": "xfun", diff --git a/renv/activate.R b/renv/activate.R index cb5401f..7409d8d 100644 --- a/renv/activate.R +++ b/renv/activate.R @@ -2,7 +2,7 @@ local({ # the requested version of renv - version <- "1.0.3" + version <- "1.0.7" attr(version, "sha") <- NULL # the project directory diff --git a/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-001.json b/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-001.json index 73b419a..23efe1f 100644 --- a/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-001.json +++ b/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-001.json @@ -12,7 +12,7 @@ "navlistPanel": "dashboard", "selectArea": "England", "selectBenchLAs": null, - "selectPhase": "All LA maintained schools", + "selectPhase": "All local authority maintained schools", "tabsetpanels": "Valuebox example" }, "output": { @@ -52,6 +52,6 @@ ] }, - "dropdown_label": "Current selections: All LA maintained schools, England" + "dropdown_label": "Current selections: All local authority maintained schools, England" } } diff --git a/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-001_.png b/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-001_.png index 9c0be30..c5f90dc 100644 Binary files a/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-001_.png and b/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-001_.png differ diff --git a/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-002.json b/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-002.json index 94f75d2..745a170 100644 --- a/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-002.json +++ b/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-002.json @@ -12,7 +12,7 @@ "navlistPanel": "dashboard", "selectArea": "England", "selectBenchLAs": null, - "selectPhase": "All LA maintained schools", + "selectPhase": "All local authority maintained schools", "tabsetpanels": "Line chart example" }, "output": { @@ -52,10 +52,10 @@ ] }, - "dropdown_label": "Current selections: All LA maintained schools, England", + "dropdown_label": "Current selections: All local authority maintained schools, England", "lineRevBal": { "x": { - "html": "\n\n \n \n \n <\/clipPath>\n \n \n <\/clipPath>\n <\/defs>\n \n \n \n \n <\/g>\n \n \n \n \n \n \n \n \n \n <\/g>\n \n \n £120,000<\/text>\n £140,000<\/text>\n £160,000<\/text>\n \n \n \n \n \n \n \n \n \n \n 2016<\/text>\n 2017<\/text>\n 2018<\/text>\n 2019<\/text>\n 2020<\/text>\n 2021<\/text>\n Academic year end<\/text>\n Average revenue<\/text>\n balance<\/text>\n \n Area<\/text>\n \n \n England<\/text>\n <\/g>\n <\/g>\n<\/svg>", + "html": "\n\n \n \n \n <\/clipPath>\n \n \n <\/clipPath>\n <\/defs>\n \n \n \n \n <\/g>\n \n \n \n \n \n \n \n \n \n <\/g>\n \n \n £120,000<\/text>\n £140,000<\/text>\n £160,000<\/text>\n \n \n \n \n \n \n \n \n \n \n 2016<\/text>\n 2017<\/text>\n 2018<\/text>\n 2019<\/text>\n 2020<\/text>\n 2021<\/text>\n Academic year end<\/text>\n Average revenue<\/text>\n balance<\/text>\n \n Area<\/text>\n \n \n \n England<\/text>\n <\/g>\n <\/g>\n<\/svg>", "js": null, "uid": "svg_random_giraph_string", "ratio": 1.92, @@ -124,6 +124,7 @@ "position": "topright", "pngname": "diagram", "tooltips": null, + "fixed": false, "hidden": [ ], diff --git a/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-002_.png b/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-002_.png index ab0f8de..85b9ee3 100644 Binary files a/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-002_.png and b/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-002_.png differ diff --git a/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-003.json b/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-003.json index b2a482f..0580b7c 100644 --- a/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-003.json +++ b/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-003.json @@ -12,7 +12,7 @@ "navlistPanel": "dashboard", "selectArea": "England", "selectBenchLAs": null, - "selectPhase": "All LA maintained schools", + "selectPhase": "All local authority maintained schools", "tabsetpanels": "Benchmarking example" }, "output": { @@ -54,7 +54,7 @@ }, "colBenchmark": { "x": { - "html": "\n\n \n \n \n <\/clipPath>\n \n \n <\/clipPath>\n <\/defs>\n \n \n \n \n <\/g>\n \n \n \n <\/g>\n \n \n £0<\/text>\n £50,000<\/text>\n £100,000<\/text>\n £150,000<\/text>\n \n \n \n \n \n \n England<\/text>\n Average<\/text>\n revenue<\/text>\n balance<\/text>\n <\/g>\n <\/g>\n<\/svg>", + "html": "\n\n \n \n \n <\/clipPath>\n \n \n <\/clipPath>\n <\/defs>\n \n \n \n \n <\/g>\n \n \n \n <\/g>\n \n \n £0<\/text>\n £50,000<\/text>\n £100,000<\/text>\n £150,000<\/text>\n \n \n \n \n \n \n England<\/text>\n Average<\/text>\n revenue<\/text>\n balance<\/text>\n <\/g>\n <\/g>\n<\/svg>", "js": null, "uid": "svg_random_giraph_string", "ratio": 1, @@ -123,6 +123,7 @@ "position": "topright", "pngname": "diagram", "tooltips": null, + "fixed": false, "hidden": [ ], @@ -145,10 +146,10 @@ ] }, - "dropdown_label": "Current selections: All LA maintained schools, England", + "dropdown_label": "Current selections: All local authority maintained schools, England", "lineRevBal": { "x": { - "html": "\n\n \n \n \n <\/clipPath>\n \n \n <\/clipPath>\n <\/defs>\n \n \n \n \n <\/g>\n \n \n \n \n \n \n \n \n \n <\/g>\n \n \n £120,000<\/text>\n £140,000<\/text>\n £160,000<\/text>\n \n \n \n \n \n \n \n \n \n \n 2016<\/text>\n 2017<\/text>\n 2018<\/text>\n 2019<\/text>\n 2020<\/text>\n 2021<\/text>\n Academic year end<\/text>\n Average revenue<\/text>\n balance<\/text>\n \n Area<\/text>\n \n \n England<\/text>\n <\/g>\n <\/g>\n<\/svg>", + "html": "\n\n \n \n \n <\/clipPath>\n \n \n <\/clipPath>\n <\/defs>\n \n \n \n \n <\/g>\n \n \n \n \n \n \n \n \n \n <\/g>\n \n \n £120,000<\/text>\n £140,000<\/text>\n £160,000<\/text>\n \n \n \n \n \n \n \n \n \n \n 2016<\/text>\n 2017<\/text>\n 2018<\/text>\n 2019<\/text>\n 2020<\/text>\n 2021<\/text>\n Academic year end<\/text>\n Average revenue<\/text>\n balance<\/text>\n \n Area<\/text>\n \n \n \n England<\/text>\n <\/g>\n <\/g>\n<\/svg>", "js": null, "uid": "svg_random_giraph_string", "ratio": 1.92, @@ -217,6 +218,7 @@ "position": "topright", "pngname": "diagram", "tooltips": null, + "fixed": false, "hidden": [ ], diff --git a/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-003_.png b/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-003_.png index e066374..0909baf 100644 Binary files a/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-003_.png and b/tests/testthat/_snaps/shinytest2-basic-checks/basic_load-003_.png differ diff --git a/ui.R b/ui.R index 6ca75b5..90e372c 100644 --- a/ui.R +++ b/ui.R @@ -66,15 +66,15 @@ ui <- function(input, output, session) { href = "dfefavicon.png" ), # Add title for browser tabs - tags$title("DfE Shiny Template") + tags$title("Department for Education (DfE) Shiny Template") ), use_shiny_title(), tags$html(lang = "en"), # Add meta description for search engines meta() %>% meta_general( - application_name = "DfE Shiny Template", - description = "DfE Shiny Template", + application_name = "Department for Education (DfE) Shiny Template", + description = "Department for Education (DfE) Shiny Template", robots = "index,follow", generator = "R-Shiny", subject = "stats development", @@ -103,11 +103,11 @@ ui <- function(input, output, session) { href = "dfe_shiny_gov_style.css" ) ), - shinyGovstyle::cookieBanner("DfE R-Shiny dashboard template"), + shinyGovstyle::cookieBanner("Department for Education (DfE) R-Shiny dashboard template"), shinyGovstyle::header( main_text = "", main_link = "https://www.gov.uk/government/organisations/department-for-education", - secondary_text = "DfE Shiny Template", + secondary_text = "Department for Education (DfE) Shiny Template", logo = "images/DfE_logo_landscape.png", logo_width = 150, logo_height = 32