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

Fixes SentateURL by creating a redirect page and function #91

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fixes SentateURL by creating a redirect page and function #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d758ee
adds a redirect for non-standard links
zhik Nov 8, 2023
2120245
uncomment window redirect
zhik Nov 8, 2023
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
27 changes: 27 additions & 0 deletions src/App.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,27 @@
import Map from './components/Map.svelte';
import Sidebar from './components/Sidebar/Sidebar.svelte';
import Controls from './components/Controls.svelte';
import { onMount } from 'svelte';
import { layers } from './assets/boundaries/index'

const params = new URLSearchParams(window.location.search);

let redirected = false
let redirect_url = ''

onMount(async()=> {
//redirect if needed
if(params.get('redirect')){
redirected = true
const boundaryId = params.get('map') ?? 'ss'
const district = params.get('dist') ?? '0'
// @ts-ignore
const url = await layers[boundaryId].redirectUrl(district)
redirect_url = url
window.location.href = url
}
})

$: {
$selectedDistrict
? params.set('dist', $selectedDistrict)
Expand All @@ -36,6 +54,14 @@
}
</script>

{#if redirected}
<div class="grid h-screen place-items-center">
<h2 class="text-2xl">You are being redirected...</h2>
{#if redirect_url}
<p>If you are stuck, try the following: <a class="underline text-blue-600" href="{redirect_url}">{redirect_url}</a></p>
{/if}
</div>
{:else}
<main
id="main"
class="flex flex-col md:flex-row h-full absolute bottom-0 left-0 right-0"
Expand All @@ -46,3 +72,4 @@
<Map />
</div>
</main>
{/if}
12 changes: 11 additions & 1 deletion src/assets/boundaries/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ export interface ILayer {
/** Url to link to for more info */
formatUrl?: (name: string) => string;

/** Used with the redirect url param, to run a function to find and go to a url */
redirectUrl?: Function;

/** Formatted display name of district, e.g. transforms 101 to Manhattan - 1 */
formatContent: (name: any) => string;
}
Expand Down Expand Up @@ -169,7 +172,14 @@ export const layers: ILayers = {
description_url: 'https://www.nysenate.gov/',
sql: `SELECT * FROM all_bounds WHERE id = 'ss'`,
icon: '⚖️',
formatUrl: name => `https://www.nysenate.gov/district/${name}`,
formatUrl: name => `/?redirect=true&map=ss&dist=${name}`,
redirectUrl: async (district: string) => {
// docs for api here: https://github.com/nysenate/GeoApi/blob/c92a0ef81ddf1f21b23751e26e1cb2a7021a3ec7/docs/index.rst
const requestURL = `https://4dvj5dcxge.execute-api.us-east-1.amazonaws.com/staging/https://pubgeo.nysenate.gov/api/v2/map/senate?showMembers=true&district=${district}`
const data = await fetch(requestURL).then(r => r.json())
const memberUrl = data.member.url
return memberUrl
},
formatContent: name => format_default(name)
},
nta: {
Expand Down