Shiny template lait merge #8
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…e updated for new files and comments. Updating bds_wide_to_long to use fn_ prefix.
…ignore for allowing google-analytics.html to be committed
…ned line length in helper_fns
…ore files doesn't pick up comments
…s added. Important merge conflicts dealt with - .Rprofile, .gitignore, datafiles_log, google-analytics, .Rproj, and renv (been updated and cleaned).
…s and mods, kept admin global vars and added LAIT global data load, clean and vars
…LAIT LA level to first tabpanel. Need to investigate how to incoprate bslib and why buttons different colour to shiny-template.
…g other fn files from shiny-template as not needed
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
There was a problem hiding this comment.
lintr found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.
….qmd, updating bds_long dataset and renv
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request overview
This the one we have been waiting for...
The merge of the mighty DfE
shiny-templateand the formidable LAIT LA level page.Pull request checklist
Please check if your PR fulfills the following:
shinytest2::test_app())styler::style_dir()andlintr::lint_dir())What is the current behaviour?
The repository is in a state of separation, with the LAIT work in a branch on the side-line(
prepare-la-level-azure), ready to be merged into themainwhich is currently occupied by the JT adjusted DfEshiny-template.This merger is needed to bring the LAIT work inline with the DfE and government style of web applications.
What is the new behaviour?
The two branches have been merged, keeping the best bits of both. The LAIT work is now occupying the tab where the
example tabin the DfEshiny-templatewas.Throughout the app, the admin code from the
shiny-templatehas been kept (such as the cookies,shinyGovstylebanners, ...) but the core content has been replaced by LAIT. This includes the data, functions, Shiny app scripts (global.R) and some additions to files such as thedfe_shiny_gov_style.cssandrenv.lock.The app is in a fully working form, keeping the same layout and format as the
shiny-template, and with all the LAIT functionality that has been built so far (the LA level page).Anything else
There is a lot of work to be done to further integrate LAIT and the
shiny-template, such as using{bslib}app infrastructure, customising thecssfile to adjust to this and improving the general layout and feel of the app (which should come with these former improvements).As well as this, unit tests and shinytests are needed for the LAIT features (clearing out the legacy
shiny-templatetests).