diff --git a/.github/workflows/deploy-shiny.yaml b/.github/workflows/deploy-shiny.yaml
index 8681d1d..97bb65f 100644
--- a/.github/workflows/deploy-shiny.yaml
+++ b/.github/workflows/deploy-shiny.yaml
@@ -69,7 +69,7 @@ jobs:
shell: Rscript {0}
run: |
if (!requireNamespace("renv", quietly = TRUE)) install.packages("renv")
- renv::install("rsconnect@0.8.29")
+ renv::install("rsconnect")
# Tokens are stored as secrets in GitHub to make sure only DfE analysts can publish apps in our shiny.io area
# Navigate to Settings > Secrets to add and view secrets. These can also be things like admin login and passwords for SQL databases.
@@ -79,5 +79,5 @@ jobs:
run: >
Rscript
-e "rsconnect::setAccountInfo(name = 'department-for-education', token = '${{secrets.SHINYAPPS_TOKEN}}', secret = '${{secrets.SHINYAPPS_SECRET}}')"
- -e "rsconnect::deployApp(appName=${{env.SHINYAPP_NAME}})"
- -e "rsconnect::deployApp(appName=${{env.SHINYAPP_OVERFLOW_NAME}})"
+ -e "rsconnect::deployApp(appName=${{env.SHINYAPP_NAME}}, forceUpdate = TRUE)"
+ -e "rsconnect::deployApp(appName=${{env.SHINYAPP_OVERFLOW_NAME}}, forceUpdate = TRUE)"
diff --git a/.hooks/pre-commit.R b/.hooks/pre-commit.R
index 9bd9dda..0022310 100644
--- a/.hooks/pre-commit.R
+++ b/.hooks/pre-commit.R
@@ -57,9 +57,10 @@ for (file in current_files$files) {
}
if(grepl('G-Z967JJVQQX', htmltools::includeHTML(("google-analytics.html"))) &
- !(toupper(Sys.getenv("USERNAME")) %in% c("CFOSTER4", "CRACE", "LSELBY","RBIELBY", "JEN-MACHIN"))){
+ !(toupper(Sys.getenv("USERNAME")) %in% c("CFOSTER4", "CRACE", "LSELBY","RBIELBY", "JMACHIN"))){
cat("Cleaning out the template's Google Analytics tag.",fill=TRUE)
gsub_file("google-analytics.html", pattern = "G-Z967JJVQQX", replacement = "G-XXXXXXXXXX")
+ gsub_file("ui.R", pattern = "Z967JJVQQX", replacement = "XXXXXXXXXX")
system2(command = "git", args=c("add","google-analytics.html"))
}
diff --git a/R/dashboard_panels.R b/R/dashboard_panels.R
index b00b270..bbada7b 100644
--- a/R/dashboard_panels.R
+++ b/R/dashboard_panels.R
@@ -1,3 +1,6 @@
+# message("Sourcing dashboard panels")
+
+
homepage_panel <- function() {
tabPanel(
"User guide and information",
diff --git a/R/dfe_resources.R b/R/dfe_resources.R
index 49ca6f2..bd1ae2d 100644
--- a/R/dfe_resources.R
+++ b/R/dfe_resources.R
@@ -7,4 +7,6 @@
# 2023-09-21: update made to change hex codes to AF colours package
# guidance here: https://best-practice-and-impact.github.io/afcolours/
+# message("Sourcing gss colour palette")
+
suppressMessages(gss_colour_pallette <- afcolours::af_colours("categorical", colour_format = "hex", n = 6))
diff --git a/R/dfe_template.R b/R/dfe_template.R
index 022a53f..b7b380d 100644
--- a/R/dfe_template.R
+++ b/R/dfe_template.R
@@ -2,6 +2,7 @@
# across dashboards. If you want to change anything in this script, please
# talk to the DfE Statistics Development team first.
+# message("Sourcing dfe_template")
valueBox <- function(value, subtitle, icon = NULL,
color = "blue", width = 4,
href = NULL, fontsize = "medium")
diff --git a/R/plotting.R b/R/plotting.R
index 3978cd4..5f00df6 100644
--- a/R/plotting.R
+++ b/R/plotting.R
@@ -1,3 +1,6 @@
+# message("Sourcing plotting")
+
+
createAvgRevTimeSeries <- function(df, inputArea) {
ggplot(df, aes(
x = year,
diff --git a/global.R b/global.R
index 61c9d70..8c63500 100644
--- a/global.R
+++ b/global.R
@@ -6,6 +6,7 @@
# whereas the server and UI files are constantly interacting and responsive to user input.
#
# ---------------------------------------------------------
+# message("Sourcing global")
# Library calls ---------------------------------------------------------------------------------
diff --git a/google-analytics.html b/google-analytics.html
index 9106476..b3f8646 100644
--- a/google-analytics.html
+++ b/google-analytics.html
@@ -12,7 +12,7 @@
-
+