Skip to content

Commit

Permalink
Put about on landing page, remove ATIP word, fix small font thing (#550)
Browse files Browse the repository at this point in the history
* Put about on landing page, remove ATIP word, fix small font thing

* Fix npm run check

* changes suggested in PR

---------

Co-authored-by: Peter York <[email protected]>
  • Loading branch information
Pete-Y-CS and Peter York authored Nov 26, 2024
1 parent 0d4e4e8 commit a93b5c4
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 33 deletions.
23 changes: 15 additions & 8 deletions src/lib/sketch/About.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
export let open: boolean;
</script>

<Modal title="About the Active Travel Infrastructure Platform" bind:open>
<Modal title="About Plan Your Active Travel Schemes" bind:open>
<div class="govuk-prose">
<p>
ATIP Scheme Sketcher v2 is an
Plan Your Active Travel Schemes is an
<ExternalLink href="https://github.com/acteng/atip">
open source project
</ExternalLink> supported by Active Travel England and developed by:
Expand All @@ -26,6 +26,12 @@
Peter York
</ExternalLink>
</li>
<li>
With UX design led by
<ExternalLink href="https://www.linkedin.com/in/jadene-aderonmu-b4713771">
Jadene Aderonmu
</ExternalLink>
</li>
<li>
With UX help from
<ExternalLink href="https://www.linkedin.com/in/madison-wang-841977bb/">
Expand All @@ -38,13 +44,13 @@
</ExternalLink>
</li>
<li>
With great thanks to ATIP's various users for feedback, testing, and
With great thanks to our various users for feedback, testing, and
ideas
</li>
</ul>

<p>
ATIP builds on
Plan Your Active Travel Schemes builds on
<ExternalLink href="https://www.openstreetmap.org/about">
OpenStreetMap
</ExternalLink>
Expand All @@ -54,16 +60,13 @@
svelte-maplibre
</ExternalLink>,
<ExternalLink href="https://georust.org/">GeoRust</ExternalLink>,
<ExternalLink href="https://github.com/a-b-street/osm2streets">
osm2streets
</ExternalLink>,
<ExternalLink href="https://material.io/resources/icons/">
Material icons
</ExternalLink>, and other open source projects.
</p>

<p>
We want your feedback about ATIP! Please <ExternalLink
We want your feedback about Plan Your Active Travel Schemes! Please <ExternalLink
href="https://github.com/acteng/atip/issues/new"
>
start an issue on Github
Expand All @@ -77,6 +80,10 @@

<h2>Recent changes</h2>
<ul>
<li>
<b>Public Beta</b>
launched December 2024, with various UI improvements, better integration of browse and sketch tools, and official public access.
</li>
<li>
<b>v2</b>
launched on 2 June 2023. Changes: a complete UI rewrite, new draw tools,
Expand Down
4 changes: 2 additions & 2 deletions src/lib/sketch/FileManagement.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@
</nav>

<div style="display: flex; justify-content: space-between">
<div>
<p>
<b>You are editing</b>
<br />
<span>{filename}</span>
</div>
</p>

<SecondaryButton
on:click={() => exportFile(authority, filename, $gjSchemes)}
Expand Down
12 changes: 1 addition & 11 deletions src/pages/ChooseArea.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
ErrorMessage,
FileInput,
Radio,
SecondaryButton,
AutocompleteTextInput,
} from "govuk-svelte";
import { onMount } from "svelte";
Expand All @@ -21,7 +20,6 @@
Popup,
describeAuthority,
} from "lib/common";
import About from "lib/sketch/About.svelte";
import { schema as schemaStore } from "stores";
import {
FillLayer,
Expand All @@ -42,7 +40,6 @@
features: [],
};
let showAbout = false;
const params = new URLSearchParams(window.location.search);
let pageErrorMessage = params.get("error") || "";
let uploadErrorMessage = "";
Expand Down Expand Up @@ -97,13 +94,7 @@
<LoggedIn />
</div>

<div style="display: flex; justify-content: space-between">
<h1>Scheme Sketcher</h1>

<SecondaryButton on:click={() => (showAbout = !showAbout)}>
About
</SecondaryButton>
</div>
<h1>Scheme Sketcher</h1>

<ErrorMessage errorMessage={pageErrorMessage} />

Expand Down Expand Up @@ -204,7 +195,6 @@
</div>
</div>
</div>
<About bind:open={showAbout} />

<style>
:global(body) {
Expand Down
8 changes: 8 additions & 0 deletions src/pages/LandingPage.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
// @ts-expect-error no declarations
import { initAll } from "govuk-frontend";
import { AlphaBanner, DefaultButton } from "govuk-svelte";
import About from "lib/sketch/About.svelte";
import { SecondaryButton } from "govuk-svelte";
import { Header } from "lib/common";
import { onMount } from "svelte";
let showAbout = false;
onMount(async () => {
// For govuk components. Must happen here.
initAll();
Expand All @@ -25,6 +29,10 @@
<AlphaBanner />

<h1 style="margin-top: 30px">Welcome to Plan Your Active Travel Schemes!</h1>
<SecondaryButton on:click={() => (showAbout = true)}>
About
</SecondaryButton>
<About bind:open={showAbout} />

<h2>Sketch Your Scheme:</h2>
<p>
Expand Down
13 changes: 1 addition & 12 deletions src/pages/SketchSchemes.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
Header,
} from "lib/common";
import { mode } from "scheme-sketcher-lib/draw/stores";
import { SecondaryButton } from "govuk-svelte";
import About from "lib/sketch/About.svelte";
import FileManagement from "lib/sketch/FileManagement.svelte";
import { ListMode, EditFeatureForm } from "scheme-sketcher-lib/sidebar";
import { map, mapStyle, schema } from "stores";
Expand All @@ -35,8 +33,6 @@
// FileManagement will set this up
let gjSchemes = writable(emptySchemes(cfg));
let showAbout = false;
let params = new URLSearchParams(window.location.search);
// If the authority is invalid, it'll be handled in onMount asynchronously
let authority = params.get("authority") || "";
Expand Down Expand Up @@ -93,12 +89,7 @@
<LoggedIn />
</div>

<div style="display: flex; justify-content: space-between">
<h2 style="margin-bottom: 0px">Scheme Sketcher</h2>
<SecondaryButton on:click={() => (showAbout = true)} noBottomMargin>
About
</SecondaryButton>
</div>
<h2 style="margin-bottom: 0px">Scheme Sketcher</h2>
{/if}

<FileManagement {gjSchemes} {authority} {filename} />
Expand Down Expand Up @@ -128,8 +119,6 @@
</div>
</div>

<About bind:open={showAbout} />

<style>
* {
box-sizing: border-box;
Expand Down

0 comments on commit a93b5c4

Please sign in to comment.