diff --git a/src/lib/components/CaseCard.svelte b/src/lib/components/CaseCard.svelte index adb72e7..054091e 100644 --- a/src/lib/components/CaseCard.svelte +++ b/src/lib/components/CaseCard.svelte @@ -6,21 +6,21 @@
- +
- {cardData.image_credit} +
-

{utcFormat('%B %d, %Y')(cardData.attribution_date)}, {cardData.attribution_id}

-

{cardData.source}

-

{cardData.short_description}

+

{utcFormat('%B %d, %Y')(new Date(cardData.Attribution_Date))}

+

{cardData.source}

+

{cardData.Short_Description}

+ Title Description Attribution date Source @@ -18,11 +19,14 @@ {#each cases as attrCase} {#if attrCase.show} - {attrCase.short_description} - {utcFormat('%B %d, %Y')(attrCase.attribution_date)} + {attrCase.Short_Title} + {attrCase.Short_Description} + {utcFormat('%B %d, %Y')(new Date(attrCase.Attribution_Date))} {attrCase.source} - {attrCase.source_category} - {attrCase.actor_nation} + {attrCase.Source_Category} + {#each attrCase.actor_nation as nation, i} + {attrCase.actor_nation.length != (i + 1) ? nation + ', ' : nation} + {/each} {/if} {/each} diff --git a/src/lib/components/Controls.svelte b/src/lib/components/Controls.svelte index 6c6af1d..37b1752 100644 --- a/src/lib/components/Controls.svelte +++ b/src/lib/components/Controls.svelte @@ -16,8 +16,6 @@ } from '../../stores/filters'; export let cases; - export let isMobile; - $: console.log(isMobile) function handleButtonClick() { selectAllFilters(); diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 1ce321e..f179b63 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -33,38 +33,41 @@ const response = await csv(`https://fiat-2024-processed-data.s3.us-west-2.amazonaws.com/Demo_Attribution_Data.csv`); //const response = await csv(`${base}/Demo_Attribution_Data.csv`); cases = response; + cases = cases.filter(d => d.Attribution_ID != '') cases.forEach(d => { - d.platform = splitString(d.platform) - d.actor_nation = splitString(d.actor_nation) - d.methods = splitString(d.methods) + d.platform = splitString(d.Platforms) + d.actor_nation = splitString(d.Actor_Nation) + d.source = splitString(d.Source) + d.methods = splitString(d.Methods) d.attribution_total_score = +d.attribution_total_score - d.attribution_date = new Date(d.attribution_date) - d.search = [d.short_description, d.platform, d.methods, d.source, d.source_nation, d.source_category].flat().join('__').toLowerCase() + d.attribution_date = new Date(d.Attribution_Date) + d.search = [d.Short_Description, d.Short_Title, d.platform, d.methods, d.Source, d.Source_Nation, d.Source_cCtegory].flat().join('__').toLowerCase() d.show = false }) + platformFilter.init(cases, 'platform'); actorNationFilter.init(cases, 'actor_nation'); sourceFilter.init(cases, 'source') - sourceCategoryFilter.init(cases, 'source_category') + sourceCategoryFilter.init(cases, 'Source_Category') methodFilter.init(cases, 'methods') $attributionScoreFilter = attributionScoreDef; - //console.log(cases.map(d => d.campaign)) }); $: if (cases) { cases = cases.map(d => ({ ...d, - show: haveOverlap($actorNationFilter, d.actor_nation) + show: haveOverlap($actorNationFilter, d.Actor_Nation) && haveOverlap($platformFilter, d.platform) && haveOverlap($sourceFilter, d.source) - && haveOverlap($sourceCategoryFilter, d.source_category) + && haveOverlap($sourceCategoryFilter, d.Source_Category) && haveOverlap($methodFilter, d.methods) && withinRange($attributionScoreFilter, d.attribution_total_score) && includesTextSearch($textSearchFilter, d.search) })) - } + } + $: console.log(cases) let width = 1200 let margin = { diff --git a/static/images/1.png b/static/images/1.png new file mode 100644 index 0000000..ccc2e6c Binary files /dev/null and b/static/images/1.png differ diff --git a/static/images/11.png b/static/images/11.png new file mode 100644 index 0000000..31d2552 Binary files /dev/null and b/static/images/11.png differ diff --git a/static/images/12.png b/static/images/12.png new file mode 100644 index 0000000..456ee23 Binary files /dev/null and b/static/images/12.png differ diff --git a/static/images/15.png b/static/images/15.png new file mode 100644 index 0000000..84a4840 Binary files /dev/null and b/static/images/15.png differ diff --git a/static/images/16.png b/static/images/16.png new file mode 100644 index 0000000..2d45c32 Binary files /dev/null and b/static/images/16.png differ diff --git a/static/images/17.png b/static/images/17.png new file mode 100644 index 0000000..496c953 Binary files /dev/null and b/static/images/17.png differ diff --git a/static/images/18.png b/static/images/18.png new file mode 100644 index 0000000..5948205 Binary files /dev/null and b/static/images/18.png differ diff --git a/static/images/19.png b/static/images/19.png new file mode 100644 index 0000000..d440d36 Binary files /dev/null and b/static/images/19.png differ diff --git a/static/images/2.png b/static/images/2.png new file mode 100644 index 0000000..680a754 Binary files /dev/null and b/static/images/2.png differ diff --git a/static/images/20.png b/static/images/20.png new file mode 100644 index 0000000..010ba62 Binary files /dev/null and b/static/images/20.png differ diff --git a/static/images/21.png b/static/images/21.png new file mode 100644 index 0000000..74d9fc6 Binary files /dev/null and b/static/images/21.png differ diff --git a/static/images/22.png b/static/images/22.png new file mode 100644 index 0000000..05670b8 Binary files /dev/null and b/static/images/22.png differ diff --git a/static/images/23.png b/static/images/23.png new file mode 100644 index 0000000..19c747f Binary files /dev/null and b/static/images/23.png differ diff --git a/static/images/24.png b/static/images/24.png new file mode 100644 index 0000000..053045a Binary files /dev/null and b/static/images/24.png differ diff --git a/static/images/25.png b/static/images/25.png new file mode 100644 index 0000000..5035d18 Binary files /dev/null and b/static/images/25.png differ diff --git a/static/images/26.png b/static/images/26.png new file mode 100644 index 0000000..8dbfc74 Binary files /dev/null and b/static/images/26.png differ diff --git a/static/images/27.png b/static/images/27.png new file mode 100644 index 0000000..249992d Binary files /dev/null and b/static/images/27.png differ diff --git a/static/images/3.png b/static/images/3.png new file mode 100644 index 0000000..0b48763 Binary files /dev/null and b/static/images/3.png differ diff --git a/static/images/4.png b/static/images/4.png new file mode 100644 index 0000000..d72936d Binary files /dev/null and b/static/images/4.png differ diff --git a/static/images/5.png b/static/images/5.png new file mode 100644 index 0000000..cabd4c5 Binary files /dev/null and b/static/images/5.png differ diff --git a/static/images/6.png b/static/images/6.png new file mode 100644 index 0000000..8068819 Binary files /dev/null and b/static/images/6.png differ diff --git a/static/images/7.png b/static/images/7.png new file mode 100644 index 0000000..129a4b8 Binary files /dev/null and b/static/images/7.png differ diff --git a/static/images/8.png b/static/images/8.png new file mode 100644 index 0000000..b5756da Binary files /dev/null and b/static/images/8.png differ diff --git a/static/images/9.png b/static/images/9.png new file mode 100644 index 0000000..83075c9 Binary files /dev/null and b/static/images/9.png differ