Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make govuk-frontend beautiful \(^-^)/ #101

Merged
merged 8 commits into from
Jun 10, 2024
Merged

Make govuk-frontend beautiful \(^-^)/ #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3f3296a
Make govuk-frontend beautiful \(^-^)/
zavies97 May 22, 2024
9f306fd
Merge branch 'main' into feature/govuk-frotnend_update
zavies97 May 22, 2024
9358b22
version increasing
zavies97 May 22, 2024
07b8070
fix tests
zavies97 May 22, 2024
5be41c3
Merge branch 'main' into feature/govuk-frotnend_update
zavies97 May 29, 2024
c4c9bb7
all o the versions
zavies97 May 29, 2024
4751949
Merge branch 'main' into feature/govuk-frotnend_update
zavies97 May 31, 2024
72044e2
Merge branch 'main' into feature/govuk-frotnend_update
zavies97 Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions app/assets/src/application.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
$govuk-assets-path: "~govuk-frontend/govuk/assets/";
@import "~govuk-frontend/govuk/all";
@import "../../templates/components/timeout-warning/timeout-warning";
$govuk-assets-path: "~govuk-frontend/dist/govuk/assets/";
$govuk-font-family-tabular: "~govuk-frontend/dist/govuk/helpers/typography.scss";
@import "node_modules/govuk-frontend/dist/govuk/all.scss";
@import "../../templates/components/timeout-warning/timeout-warning.scss";

.sideBarColor {
border: 1px solid #1d70b8;
Expand Down
6 changes: 3 additions & 3 deletions app/assets/src/layout.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends "govuk/template.njk" %}
{% from "govuk/components/header/macro.njk" import govukHeader %}
{% from "govuk/components/phase-banner/macro.njk" import govukPhaseBanner %}
{% extends "dist/govuk/template.njk" %}
{% from "dist/govuk/components/header/macro.njk" import govukHeader %}
{% from "dist/govuk/components/phase-banner/macro.njk" import govukPhaseBanner %}
{% from "../../templates/components/timeout-warning/macro.njk" import govukTimeoutWarning %}

{% set urlPrefix = "<%= htmlWebpackPlugin.options.metadata.urlPrefix %>" %}
Expand Down
2 changes: 1 addition & 1 deletion app/routes/assets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = {
options: {
handler: {
directory: {
path: ['app/assets/dist', 'node_modules/govuk-frontend/govuk/assets']
path: ['app/assets/dist', 'node_modules/govuk-frontend/dist/govuk/assets']
}
},
cache: {
Expand Down
6 changes: 3 additions & 3 deletions app/templates/check-details.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{% extends '.layout.njk' %}

{% from "govuk/components/back-link/macro.njk" import govukBackLink %}
{% from "govuk/components/button/macro.njk" import govukButton %}
{% from "dist/govuk/components/back-link/macro.njk" import govukBackLink %}
{% from "dist/govuk/components/button/macro.njk" import govukButton %}
{% from "./components/macro.njk" import crumbToken %}
{% from "govuk/components/summary-list/macro.njk" import govukSummaryList %}
{% from "dist/govuk/components/summary-list/macro.njk" import govukSummaryList %}

{% block pageTitle %}
Check your details - {{siteTitle}}
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/macro.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% macro crumbToken(crumb) %}
{% from "govuk/components/details/macro.njk" import govukDetails %}
{% from "govuk/components/button/macro.njk" import govukButton %}
{% from "dist/govuk/components/details/macro.njk" import govukDetails %}
{% from "dist/govuk/components/button/macro.njk" import govukButton %}

<input type="hidden" name="crumb" id="crumb"
value="{{ crumb }}" autocomplete="off" />
Expand Down
2 changes: 1 addition & 1 deletion app/templates/cookies/cookie-banner.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% from "govuk/components/cookie-banner/macro.njk" import govukCookieBanner %}
{% from "dist/govuk/components/cookie-banner/macro.njk" import govukCookieBanner %}
{% from "../components/macro.njk" import crumbToken %}
<noscript>
{{ govukCookieBanner({
Expand Down
8 changes: 4 additions & 4 deletions app/templates/cookies/cookie-policy.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{% extends '.layout.njk' %}

{% from "govuk/components/table/macro.njk" import govukTable %}
{% from "govuk/components/radios/macro.njk" import govukRadios %}
{% from "govuk/components/button/macro.njk" import govukButton %}
{% from "govuk/components/notification-banner/macro.njk" import govukNotificationBanner %}
{% from "dist/govuk/components/table/macro.njk" import govukTable %}
{% from "dist/govuk/components/radios/macro.njk" import govukRadios %}
{% from "dist/govuk/components/button/macro.njk" import govukButton %}
{% from "dist/govuk/components/notification-banner/macro.njk" import govukNotificationBanner %}
{% from "components/macro.njk" import crumbToken %}

{% block content %}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/cookies/notification-banner.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% from "govuk/components/notification-banner/macro.njk" import govukNotificationBanner %}
{% from "dist/govuk/components/notification-banner/macro.njk" import govukNotificationBanner %}

{% set html %}
<p class="govuk-notification-banner__heading">
Expand Down
10 changes: 5 additions & 5 deletions app/templates/home.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{% extends '.layout.njk' %}
{% from "govuk/components/button/macro.njk" import govukButton %}
{% from "govuk/components/warning-text/macro.njk" import govukWarningText %}
{% from "govuk/components/breadcrumbs/macro.njk" import govukBreadcrumbs %}
{% from "govuk/components/input/macro.njk" import govukInput %}
{% from "govuk/components/inset-text/macro.njk" import govukInsetText %}
{% from "dist/govuk/components/button/macro.njk" import govukButton %}
{% from "dist/govuk/components/warning-text/macro.njk" import govukWarningText %}
{% from "dist/govuk/components/breadcrumbs/macro.njk" import govukBreadcrumbs %}
{% from "dist/govuk/components/input/macro.njk" import govukInput %}
{% from "dist/govuk/components/inset-text/macro.njk" import govukInsetText %}
{% block pageTitle %}
{{ siteTitle }} - Start
{% endblock %}
Expand Down
6 changes: 3 additions & 3 deletions app/templates/login.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends '.layout.njk' %}

{% from "govuk/components/button/macro.njk" import govukButton %}
{% from "govuk/components/error-message/macro.njk" import govukErrorMessage %}
{% from "govuk/components/input/macro.njk" import govukInput %}
{% from "dist/govuk/components/button/macro.njk" import govukButton %}
{% from "dist/govuk/components/error-message/macro.njk" import govukErrorMessage %}
{% from "dist/govuk/components/input/macro.njk" import govukInput %}

{% block content %}
<div class="govuk-grid-row">
Expand Down
16 changes: 8 additions & 8 deletions app/templates/maybe-eligible.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{% extends '.layout.njk' %}
{% from "govuk/components/back-link/macro.njk" import govukBackLink %}
{% from "govuk/components/button/macro.njk" import govukButton %}
{% from "govuk/components/warning-text/macro.njk" import govukWarningText %}
{% from "govuk/components/checkboxes/macro.njk" import govukCheckboxes %}
{% from "govuk/components/input/macro.njk" import govukInput %}
{% from "govuk/components/panel/macro.njk" import govukPanel %}
{% from "dist/govuk/components/back-link/macro.njk" import govukBackLink %}
{% from "dist/govuk/components/button/macro.njk" import govukButton %}
{% from "dist/govuk/components/warning-text/macro.njk" import govukWarningText %}
{% from "dist/govuk/components/checkboxes/macro.njk" import govukCheckboxes %}
{% from "dist/govuk/components/input/macro.njk" import govukInput %}
{% from "dist/govuk/components/panel/macro.njk" import govukPanel %}
{% from "./components/macro.njk" import crumbToken %}
{% from "govuk/components/inset-text/macro.njk" import govukInsetText %}
{% from "govuk/components/details/macro.njk" import govukDetails %}
{% from "dist/govuk/components/inset-text/macro.njk" import govukInsetText %}
{% from "dist/govuk/components/details/macro.njk" import govukDetails %}

{% block pageTitle %}
{{siteTitle}}
Expand Down
8 changes: 4 additions & 4 deletions app/templates/not-eligible.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends '.layout.njk' %}
{% from "govuk/components/back-link/macro.njk" import govukBackLink %}
{% from "govuk/components/details/macro.njk" import govukDetails %}
{% from "govuk/components/warning-text/macro.njk" import govukWarningText %}
{% from "govuk/components/inset-text/macro.njk" import govukInsetText %}
{% from "dist/govuk/components/back-link/macro.njk" import govukBackLink %}
{% from "dist/govuk/components/details/macro.njk" import govukDetails %}
{% from "dist/govuk/components/warning-text/macro.njk" import govukWarningText %}
{% from "dist/govuk/components/inset-text/macro.njk" import govukInsetText %}

{% block pageTitle %}
{{siteTitle}} - You cannot apply for grant
Expand Down
16 changes: 8 additions & 8 deletions app/templates/page.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{% extends '.layout.njk' %}

{% from "govuk/components/input/macro.njk" import govukInput %}
{% from "govuk/components/button/macro.njk" import govukButton %}
{% from "govuk/components/back-link/macro.njk" import govukBackLink %}
{% from "govuk/components/radios/macro.njk" import govukRadios %}
{% from "govuk/components/checkboxes/macro.njk" import govukCheckboxes %}
{% from "govuk/components/select/macro.njk" import govukSelect %}
{% from "govuk/components/error-summary/macro.njk" import govukErrorSummary %}
{% from "govuk/components/warning-text/macro.njk" import govukWarningText %}
{% from "dist/govuk/components/input/macro.njk" import govukInput %}
{% from "dist/govuk/components/button/macro.njk" import govukButton %}
{% from "dist/govuk/components/back-link/macro.njk" import govukBackLink %}
{% from "dist/govuk/components/radios/macro.njk" import govukRadios %}
{% from "dist/govuk/components/checkboxes/macro.njk" import govukCheckboxes %}
{% from "dist/govuk/components/select/macro.njk" import govukSelect %}
{% from "dist/govuk/components/error-summary/macro.njk" import govukErrorSummary %}
{% from "dist/govuk/components/warning-text/macro.njk" import govukWarningText %}
{% from "./components/macro.njk" import crumbToken, multiSideBar, conditionalButtons %}

{% block pageTitle %}
Expand Down
6 changes: 3 additions & 3 deletions app/templates/score.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{% extends '.layout.njk' %}

{% from "govuk/components/back-link/macro.njk" import govukBackLink %}
{% from "govuk/components/button/macro.njk" import govukButton %}
{% from "dist/govuk/components/back-link/macro.njk" import govukBackLink %}
{% from "dist/govuk/components/button/macro.njk" import govukButton %}
{% from "./components/macro.njk" import crumbToken %}
{% from "govuk/components/warning-text/macro.njk" import govukWarningText %}
{% from "dist/govuk/components/warning-text/macro.njk" import govukWarningText %}

{% block pageTitle %}
Scoring results - {{siteTitle}}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/session-timeout.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends '.layout.njk' %}
{% from "govuk/components/button/macro.njk" import govukButton %}
{% from "dist/govuk/components/button/macro.njk" import govukButton %}

{% block pageTitle %}
Your session has ended due to inactivity - {{siteTitle}}
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ffc-grants-addvalue-web",
"version": "2.28.10",
"version": "2.29.0",
"description": "Web frontend for FTF adding value scheme",
"homepage": "https://github.com/DEFRA/ffc-grants-addvalue-web",
"main": "app/index.js",
Expand Down Expand Up @@ -47,7 +47,7 @@
"ffc-grants-common-functionality": "^1.8.0",
"ffc-messaging": "^2.6.5",
"ffc-protective-monitoring": "^1.0.3",
"govuk-frontend": "^4.3.1",
"govuk-frontend": "^5.4.0",
"joi": "^17.6.0",
"jsdom": "^24.0.0",
"nunjucks": "^3.2.4",
Expand Down
2 changes: 1 addition & 1 deletion test/integration/narrow/routes/potential-amount-solar-details.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,6 @@ describe('Page: /potential-amount-solar-details', () => {

const response = await global.__SERVER__.inject(options)
expect(response.statusCode).toBe(200)
expect(response.payload).toContain('<a href=\"solar-PV-cost" class=\"govuk-back-link\" id=\"linkBack\">Back</a>')
expect(response.payload).toContain('<a href=\"solar-PV-cost" class=\"govuk-back-link\"')
})
})
2 changes: 1 addition & 1 deletion test/integration/narrow/routes/potential-amount-solar.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@ describe('Page: /potential-amount-solar', () => {

const response = await global.__SERVER__.inject(options)
expect(response.statusCode).toBe(200)
expect(response.payload).toContain('<a href=\"solar-PV-cost" class=\"govuk-back-link\" id=\"linkBack\">Back</a>')
expect(response.payload).toContain('<a href=\"solar-PV-cost" class=\"govuk-back-link\"')
})
})
2 changes: 1 addition & 1 deletion test/integration/narrow/routes/potential-amount.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ describe('Page: /potential-amount', () => {
}
const response = await global.__SERVER__.inject(options)
expect(response.statusCode).toBe(200)
expect(response.payload).toContain('<a href=\"project-cost\" class=\"govuk-back-link\" id=\"linkBack\">Back</a>')
expect(response.payload).toContain('<a href=\"project-cost\" class=\"govuk-back-link\"')
})
})