Skip to content

Commit

Permalink
Merge commit '21a0b9ee7326a645197c043bb7e6f36a0300d276' into 483-upda…
Browse files Browse the repository at this point in the history
…te-tests-to-use-mock-data-generated-from-valibot-schemas
  • Loading branch information
GeorgeGoodall committed Sep 30, 2024
2 parents 8393b31 + 21a0b9e commit c671439
Show file tree
Hide file tree
Showing 8 changed files with 193 additions and 78 deletions.
38 changes: 27 additions & 11 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@sentry/node": "^8.7.0",
"@sentry/profiling-node": "^8.7.0",
"@x-govuk/govuk-prototype-components": "^3.0.5",
"@x-govuk/govuk-prototype-filters": "github:GeorgeGoodall/govuk-prototype-filters#fix/markdownFilterStackOverflow",
"@x-govuk/govuk-prototype-filters": "^1.4.3",
"accessible-autocomplete": "^3.0.0",
"aws-sdk": "^2.1581.0",
"axios": "^1.6.2",
Expand Down
57 changes: 57 additions & 0 deletions src/assets/scss/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,63 @@ code * {
font-family: monospace;
}

.app-image-card {
display: flex;
flex-wrap: wrap;
margin-bottom: govuk-spacing(7);
}

.app-image-card--large {
@include govuk-media-query($from: desktop) {
flex-wrap: nowrap;

.app-image-card__image-wrapper {
max-width: 50%;
margin-right: govuk-spacing(4);
}
}
}

.app-image-card__image-wrapper {
width: 100%;
margin: 0;
@include govuk-responsive-margin(2, "bottom");
}

.app-image-card__text {
*:last-child {
margin-bottom: 0;
}
}

.app-masthead {
@include govuk-responsive-padding(6, "top");
@include govuk-responsive-padding(6, "bottom");
border-bottom: 1px solid govuk-colour("blue");
color: govuk-colour("white");
background-color: govuk-colour("blue");
}

.app-masthead__title {
color: govuk-colour("white");
@include govuk-responsive-margin(6, "bottom");
}

.app-masthead__description {
@include govuk-font(24);
margin-bottom: 0;
color: govuk-colour("white");
}

.app-masthead__image {
display: none;
@include govuk-media-query($from: desktop) {
display: block;
width: 100%;
margin-top: govuk-spacing(3);
}
}

.padding-top {
padding-top: 40px;
}
4 changes: 2 additions & 2 deletions src/routes/manage.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import nunjucks from 'nunjucks'
const router = express.Router()

router.get('/', (req, res) => {
const manage = nunjucks.render('start.html', {})
res.send(manage)
const landing = nunjucks.render('landing.html', {})
res.send(landing)
})

export default router
2 changes: 1 addition & 1 deletion src/routes/schemas.js
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ export const templateSchema = new Map([
['errorPages/500', ErrorParams],
['errorPages/404', EmptyParams],
['privacy-notice.html', EmptyParams],
['start.html', EmptyParams],
['landing.html', EmptyParams],
['cookies.html', EmptyParams],
['accessibility.html', EmptyParams]
])
104 changes: 104 additions & 0 deletions src/views/landing.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
{% extends "layouts/main.html" %}
{% from "govuk/components/button/macro.njk" import govukButton %}

{% set serviceType = 'Manage' %}
{% set pageName = '' %}

{% block main %}
<div class="app-masthead">
<div class="govuk-width-container">
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds-from-desktop">
<h1 class="govuk-heading-xl app-masthead__title">Submit and update your planning data</h1>

<p class="app-masthead__description">The Planning Data platform is a single national platform that indexes the
data and makes it available in a standardised
format.</p>

<a href="/organisations" role="button" draggable="false"
class="govuk-button govuk-button--inverse govuk-!-margin-top-6 govuk-!-margin-bottom-0 govuk-button--start"
data-module="govuk-button">
Submit and update your data now
<svg class="govuk-button__start-icon" xmlns="http://www.w3.org/2000/svg" width="17.5" height="19"
viewBox="0 0 33 40" aria-hidden="true" focusable="false">
<path fill="currentColor" d="M0 0h13l20 20-20 20H0l20-20z"></path>
</svg>
</a>
</div>

<div class="govuk-grid-column-one-third-from-desktop">

</div>
</div>
</div>
</div>
{{ super() }}
{% endblock %}

{% block content %}
<div class="govuk-grid-row">
<hr class="govuk-section-break govuk-section-break--visible govuk-section-break--xl govuk-!-margin-top-0">

<div class="govuk-grid-column-two-thirds">
<h2 class="govuk-heading-l">National planning data in one place</h2>

<p class="govuk-body">Having a national index of planning data means developers, housing associations, policy
colleagues, researchers and journalists can access the data they need simply and quickly.</p>

<p class="govuk-body">It means less overhead for local authorities and organisations, reducing the time spent
preparing for data requests and freedom of information requests.</p>

<p class="govuk-body">The data is updated from local authority websites every night, ensuring the data is up-to-date
and complete.</p>
</div>
</div>

<div class="govuk-grid-row">
<hr class="govuk-section-break govuk-section-break--visible govuk-section-break--xl">

<div class="govuk-grid-column-two-thirds">
<h2 class="govuk-heading-l">You provide trusted and authoritative local data</h2>

<p class="govuk-body">Your organisation is responsible for providing authoritative local data, which is why you must
publish it on your website.
</p>

<p class="govuk-body">
You need to provide information about the data on your website including links to the data itself. This can be a
simple file hosted on your website, but it’s better if it is supplied through an API that links directly to your
planning database software.
</p>

<p class="govuk-body">
Whenever you make changes to the data on the URL you’ve given us, the platform will automatically index the data
and make the updates available to users.
</p>
</div>
</div>

<div class="govuk-grid-row">
<hr class="govuk-section-break govuk-section-break--visible govuk-section-break--xl">

<div class="govuk-grid-column-two-thirds">
<h2 class="govuk-heading-l">We help you to improve your data</h2>

<p class="govuk-body">
The submit and update service tells you which datasets you need to provide, gives you information about the data
you have provided and what you can do to improve the data quality.
</p>

<p class="govuk-body">
Your data doesn’t need to be complete or perfect to start. Any data we have from you means we can start to index
it and provide it on the platform. And we can help you to identify what data needs improvement and how to do it,
so you can focus your time on making things better.
</p>

<p class="govuk-body">
The dashboard gives you a clear view of the data you’ve supplied as well as other information we hold about your
local area.
</p>

<p class="govuk-body">As we grow the service we’ll add more features to help you to improve your data.</p>
</div>
</div>
{% endblock %}
62 changes: 0 additions & 62 deletions src/views/start.html

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const nunjucks = setupNunjucks({ datasetNameMapping: new Map() })

describe('Start View', () => {
const params = {}
const html = nunjucks.render('start.html', params)
const html = nunjucks.render('landing.html', params)

runGenericPageTests(html, {
// we skip pageTitle since this is the main page, and service name alone is sufficient
Expand Down

0 comments on commit c671439

Please sign in to comment.