Skip to content

Commit

Permalink
Updated based on content review
Browse files Browse the repository at this point in the history
  • Loading branch information
tomyems committed Jun 28, 2024
1 parent 01dad91 commit 522acc8
Show file tree
Hide file tree
Showing 4 changed files with 89 additions and 14 deletions.
6 changes: 3 additions & 3 deletions apps/docs/src/common/pages/patterns/address-outside-uk.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ const Page: FC<PageProps> = ({ location }) => (
</h1>
<p className="govuk-body">Ask for an address in different ways depending on what the user needs to do. They might need to enter an address:</p>
<ul className="govuk-list govuk-list--bullet">
<li><A href="/patterns/address-not-uk/valuable-delivery">for something valuable to be delivered to</A></li>
<li><A href="/patterns/address-not-uk/familiar-address">where they live, have lived, or are otherwise familiar with</A></li>
<li><A href="/patterns/address-not-uk/record-given-address">they have been given</A></li>
<li><A href="/patterns/address-outside-uk/delivery-address">for something valuable to be delivered to</A></li>
<li><A href="/patterns/address-outside-uk/familiar-address">where they live, have lived, or are otherwise familiar with</A></li>
<li><A href="/patterns/address-outside-uk/record-given-address">they have been given</A></li>
</ul>

<p className="govuk-body">The <A href="/patterns/address-not-uk/country-index">country index</A> has specific information about addresses in certain countries.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,59 @@ const Page: FC<PageProps> = ({ location }) => (
{title}
</h1>

<p className="govuk-body">The address needs of some territories may be different from the FCDO country list or delivery company data.</p>

<AZNavigation id="a-z-nav" />

<h2 className="a-z-header" id="a">A</h2>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="b">B</h2>
<h3 id="bermuda">Bermuda</h3>
<p className="govuk-body">A British overseas territory.</p>
<p className="govuk-body">Bermuda has postal codes, which are encouraged to be used.</p>
<p className="govuk-body">Some delivery companies do not accept addresses in Bermuda with postal codes.</p>
<h3 id="bonaire">Bonaire, Sint Eustatius and Saba</h3>
<p className="govuk-body">Part of the Netherlands in the FCDO country list.</p>
<p className="govuk-body">Some delivery companies use a different country code for the Netherlands and each of:</p>
<ul className="govuk-list govuk-list--bullet">
<li>Bonaire</li>
<li>Sint Eustatius</li>
<li>Saba</li>
</ul>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="c">C</h2>
<h3 id="canary-islands">Canary Islands</h3>
<p className="govuk-body">Part of Spain in the FCDO country list.</p>
<p className="govuk-body">Some delivery companies use a different country code for Spain and the Canary Islands.</p>
<h3 id="commonwealth-of-the-northern-mariana-islands">Commonwealth of the Northern Mariana Isalnds</h3>
<p className="govuk-body">Part of the United States of America in the FCDO country list.</p>
<p className="govuk-body">Also known as: Northern Mariana Islands</p>
<p className="govuk-body">Some delivery companies use a different country code for the USA and the Northern Mariana Islands</p>
<p className="govuk-body">Zip code range: 96950 to 96952</p>
<h3 id="cook-islands">Cook Islands</h3>
<p className="govuk-body">Part of New Zealand in the FCDO country list.</p>
<p className="govuk-body">The Cook Islands do not use postal codes, but New Zealand does.</p>
<h3 id="curacao">Curacao</h3>
<p className="govuk-body">Part of the Netherlands in the FCDO country list.</p>
<p className="govuk-body">Some delivery copmanies use a different country code for the Netherlands and Curacao.</p>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="d">D</h2>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="e">E</h2>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="f">F</h2>
<h3 id="faroe-islands">Faroe Islands</h3>
<p className="govuk-body">Part of Denmark in the FCDO country list.</p>
<p className="govuk-body">Faroe Islands postal codes start 'FO', followed by 3 digits. This is a different format to Denmark postal codes.</p>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="g">G</h2>
<h3 id="greenland">Greenland</h3>
<p className="govuk-body">Part of Denmark in the FCDO country list.</p>
<p className="govuk-body">Greenland postal codes start 'GL-39', followed by 2 digits. This is consistent with Denmark postal codes.</p>
<h3 id="guam">Guam</h3>
<p className="govuk-body">Part of the United States in the FCDO country list.</p>
<p className="govuk-body">Some delivery companies use a different country code for the United States and Guam.</p>
<p className="govuk-body">Zip code range: 96910 to 96932</p>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="h">H</h2>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
Expand All @@ -53,30 +91,65 @@ const Page: FC<PageProps> = ({ location }) => (
<h2 className="a-z-header" id="j">J</h2>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="k">K</h2>
<h3 id="kosovo">Kosovo</h3>
<p className="govuk-body">In the FCDO country list.</p>
<p className="govuk-body">Some delivery companies use a different country code from the one in the FCDO country list.</p>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="l">L</h2>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="m">M</h2>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="n">N</h2>
<h3 id="niue">Niue</h3>
<p className="govuk-body">Part of New Zealand in the FCDO country list.</p>
<p className="govuk-body">Niue has one postal code for the whole island, 9974. This is consistent with the New Zealand postal code format.</p>
<p className="govuk-body">Some delivery companies do not recogonise the Niue postal code.</p>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="o">O</h2>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="p">P</h2>
<h3 id="puerto-rico">Puerto Rico</h3>
<p className="govuk-body">Part of the United States in the FCDO country list.</p>
<p className="govuk-body">Some deilvery companies use a different country code for the United States and Puerto Rico</p>
<p className="govuk-body">Zip code range: 00600 to 00799 and 0900 to 00999.</p>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="q">Q</h2>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="r">R</h2>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="s">S</h2>
<h3 id='saint-barthelemy'>Saint Barthélemy</h3>
<p className="govuk-body">Part of France in the FCDO country list.</p>
<p className="govuk-body">Some delivery companies use a different country code for France and Saint Barthélemy.</p>
<h3 id="saint-pierre-and-miquelon">Saint Pierre and Miquelon</h3>
<p className="govuk-body">Part of France in the FCDO country list.</p>
<p className="govuk-body">Some delivery companies do not use a separate country code.</p>
<h3 id="sint-maarten">Saint Martin</h3>
<p className="govuk-body">Part of France in the FCDO country list.</p>
<p className="govuk-body">It is the northern part of an island, where the southern part is <a href="#sint-maarten">Sint Maarten</a>.</p>
<p className="govuk-body">Some delivery companies use the same country code for both Sint Maarten and Saint Martin. They may also only use one of Sint Maarten or Saint Martin.</p>
<p className="govuk-body">Saint Martin has one postal code: 97150.</p>
<h3 id="sint-maarten">Sint Maarten</h3>
<p className="govuk-body">Part of the Netherlands in the FCDO country list.</p>
<p className="govuk-body">It is the southern part of an island, where the northern part is <a href="#saint-martin">Saint Martin</a>.</p>
<p className="govuk-body">Some delivery companies use the same country code for both Sint Maarten and Saint Martin. They may also only use one of Sint Maarten or Saint Martin.</p>
<h3 id="saint-kitts-and-nevis">Saint Kitts and Nevis</h3>
<p className="govuk-body">In the FCDO country list.</p>
<p className="govuk-body">This country is two islands. Some delivery companies may use a country code for Saint Kitts, and another for Saint Nevis.</p>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="t">T</h2>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="u">U</h2>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="v">V</h2>
<h3 id="virgin-islands-of-the-united-states">Virgin islands of the United States</h3>
<p className="govuk-body">Part of the United States in the FCDO country list.</p>
<p className="govuk-body">Some delivery companies may use a different country code for the Unites States and the Virgin Islands of the United States.</p>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="w">W</h2>
<h3 id="wallis-and-futuna">Wallis and Futuna</h3>
<p className="govuk-body">Part of France in the FCDO country list.</p>
<p className="govuk-body">Some delivery companies may use a different country code for France and Wallis and Futuna.</p>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
<h2 className="a-z-header" id="x">X</h2>
<p className="govuk-body"><a className="back-to-top" href="#a-z-nav">Back to top</a></p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ const Page: FC<PageProps> = ({ location }) => (
<p className="govuk-body">Ask users to provide reliable addresses to delivery something valuable.</p>

<h2 className="govuk-heading-l">When to use this pattern</h2>
<p className="govuk-body">This pattern is for services where the user has a barrier to completing the service if the address is incorrect. For example, not being able to receive an important document.</p>
<p className="govuk-body">This pattern is for services where the user will receive a delivery some something valuable to this address.</p>
<p className="govuk-body">This pattern is more complicated for the user to complete, and should only be used if a wrong address has a significant negative impact on the user.</p>
<p className="govuk-body">Consider if a process to correct the address after the user has entered it would resolve this barrier.</p>

<h2 className="govuk-heading-l">How it works</h2>
Expand Down Expand Up @@ -113,6 +114,7 @@ const Page: FC<PageProps> = ({ location }) => (
<TextInput
label="Postal code"
name="postal-code"
width={10}
/>
<p className="govuk-body"><A href="#manual-entry">Enter address manually</A></p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ const Page: FC<PageProps> = ({ location }) => (
<p className="govuk-body">Ask users to enter an address that they have been given.</p>

<h2 className="govuk-heading-l">When to use this pattern</h2>
<p className="govuk-body">This pattern is for internal services where:</p>
<ul className="govuk-list govuk-list--bullet">
<li>there is a need to record an address that is not verified</li>
<li>staff are given addresses to record</li>
</ul>
<p className="govuk-body">This pattern is for internal services where staff are given addresses to record.</p>

<h2 className="govuk-heading-l">How it works</h2>

<p className="govuk-body">Check whether there is a need to record the data in a structured format. For example, the address may be recorded in a database that requires a particular format.</p>
<p className="govuk-body">Check whether there is a need to record the data in a structured format. For example:</p>
<ul className="govuk-list govuk-list--bullet">
<li>the address may be recorded in a database that requires a particular format</li>
<li>another part of the service may require another user to read the address</li>
</ul>

<h3 className="govuk-heading-m">Structured address lines</h3>
<h3 className="govuk-heading-m">Structured address</h3>

<p className="govuk-body">This structured format can be used to send letters with GOV.UK Notify. This is the maximum number of address lines GOV.UK Notify accepts.</p>

Expand All @@ -52,7 +52,7 @@ const Page: FC<PageProps> = ({ location }) => (
<Fieldset
legend={
<h1 className="govuk-heading-l">
Their home address
What is their home address?
</h1>
}>
<TextInput
Expand Down Expand Up @@ -84,11 +84,11 @@ const Page: FC<PageProps> = ({ location }) => (

<h3 className="govuk-heading-m">Not structured</h3>

<p className="govuk-body">If there is no need for structured information, users find it easier to record address in an unstructured format:</p>
<p className="govuk-body">If there is no need for structured information, consider recording the address in an unstructured format:</p>

<div className="app-example">
<Textarea
label="Their home address"
label="What is their home address?"
name="unstructured-address"
rows={5}
/>
Expand Down

1 comment on commit 522acc8

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.