diff --git a/src/atoms/Badge.svelte b/src/atoms/Badge.svelte new file mode 100644 index 0000000..8855fb5 --- /dev/null +++ b/src/atoms/Badge.svelte @@ -0,0 +1,9 @@ + + +
+ {text} +
\ No newline at end of file diff --git a/src/molecules/Location.svelte b/src/molecules/Location.svelte index 68a779f..0c54205 100644 --- a/src/molecules/Location.svelte +++ b/src/molecules/Location.svelte @@ -1,19 +1,30 @@
Flag of {country.name} +

{name}

+

{country.name}

+ + {#if dateOlderThan(last_updated, timeLimit)} + + {/if}
diff --git a/src/routes/_layout.svelte b/src/routes/_layout.svelte index a25c5c2..0cd3322 100644 --- a/src/routes/_layout.svelte +++ b/src/routes/_layout.svelte @@ -1,6 +1,6 @@ @@ -112,30 +154,6 @@ '/fonts/M-Light.woff2', ] } - - - /* - ** Manipulate data - */ - if (process.browser) { - if ($countries) { - $countries.forEach(country => { - const matchingContinent = $continents.find(continent => continent.id === country.continent.id) - // Replace continent with request data - country.continent = matchingContinent - // Add countries to each continents - matchingContinent.countries = [] - matchingContinent.countries.push(country) - }) - } - - if ($locations) { - // Replace each location's country with request data - $locations.forEach(location => { - location.country = $countries.find(country => country.id === location.country.id) - }) - } - }