Skip to content

Commit 4c7b3c5

Browse files
ddxvddxv
committed
Better totalsbox on all companies pages
1 parent 60634c4 commit 4c7b3c5

File tree

3 files changed

+50
-37
lines changed

3 files changed

+50
-37
lines changed

‎frontend/src/lib/TotalsBox.svelte‎

Lines changed: 42 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
return new Intl.NumberFormat('en-US').format(num);
44
}
55
6-
let { myTotals, myType } = $props();
6+
let { myTotals, myType, hideAdstxtApps = false } = $props();
77
88
const titleFont = 'text-md text-primary-800-200 uppercase tracking-wide';
99
const subTitleFont = 'text-sm text-primary-800-200 uppercase tracking-wide';
@@ -32,32 +32,51 @@
3232
</div>
3333
</div>
3434
{#if myType.url_slug === 'ad-networks' || myType.url_slug === 'all-companies'}
35-
<hr />
36-
<div class={titleFont}>App-Ads.txt DIRECT Domains</div>
37-
<div class="grid grid-cols-2 gap-4 p-4">
38-
<div class="stat-container">
39-
<div class={subTitleFont}>Android Adstxt companies</div>
40-
<div class="text-2xl font-bold text-primary-900">
41-
{formatNumber(myTotals.adstxt_direct_android_total_companies)}
35+
{#if myTotals.total_companies}
36+
<hr />
37+
<div class={titleFont}>App-Ads.txt DIRECT Domains</div>
38+
<div class="grid grid-cols-2 gap-4 p-4">
39+
<div class="stat-container">
40+
<div class={subTitleFont}>Android Adstxt companies</div>
41+
<div class="text-2xl font-bold text-primary-900">
42+
{formatNumber(myTotals.adstxt_direct_android_total_companies)}
43+
</div>
4244
</div>
43-
</div>
44-
<div class="stat-container">
45-
<div class={subTitleFont}>iOS Adstxt companies</div>
46-
<div class="text-2xl font-bold text-primary-900">
47-
{formatNumber(myTotals.adstxt_direct_ios_total_companies)}
45+
<div class="stat-container">
46+
<div class={subTitleFont}>iOS Adstxt companies</div>
47+
<div class="text-2xl font-bold text-primary-900">
48+
{formatNumber(myTotals.adstxt_direct_ios_total_companies)}
49+
</div>
4850
</div>
49-
</div>
5051

51-
<div class="stat-container">
52-
{#if myType}
53-
<div class={subTitleFont}>{myType.name}</div>
54-
{:else}
55-
<div class={subTitleFont}>All Companies</div>
56-
{/if}
52+
<div class="stat-container">
53+
{#if myType}
54+
<div class={subTitleFont}>{myType.name}</div>
55+
{:else}
56+
<div class={subTitleFont}>All Companies</div>
57+
{/if}
5758

58-
<div class="text-2xl font-bold text-primary-900">
59-
{formatNumber(myTotals.total_companies)}
59+
<div class="text-2xl font-bold text-primary-900">
60+
{formatNumber(myTotals.total_companies)}
61+
</div>
6062
</div>
6163
</div>
62-
</div>
64+
{:else if !hideAdstxtApps && myTotals.adstxt_direct_android_total_apps}
65+
<hr />
66+
<div class={titleFont}>App-Ads.txt DIRECT apps</div>
67+
<div class="grid grid-cols-2 gap-4 p-4">
68+
<div class="stat-container">
69+
<div class={subTitleFont}>Android Adstxt apps</div>
70+
<div class="text-2xl font-bold text-primary-900">
71+
{formatNumber(myTotals.adstxt_direct_android_total_apps)}
72+
</div>
73+
</div>
74+
<div class="stat-container">
75+
<div class={subTitleFont}>iOS Adstxt apps</div>
76+
<div class="text-2xl font-bold text-primary-900">
77+
{formatNumber(myTotals.adstxt_direct_ios_total_apps)}
78+
</div>
79+
</div>
80+
</div>
81+
{:else}{/if}
6382
{/if}

‎frontend/src/routes/(categorical)/companies/[domain]/+page.svelte‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
44
import AdsTxtPubIDsTable from '$lib/AdsTxtPubIDsTable.svelte';
55
6+
import TotalsBox from '$lib/TotalsBox.svelte';
7+
68
import CompanyCategoryPie from '$lib/CompanyCategoryPie.svelte';
79
import AdsTxtTotalsBox from '$lib/AdsTxtTotalsBox.svelte';
810
import CompanyTableGrid from '$lib/CompanyTableGrid.svelte';
@@ -31,17 +33,17 @@
3133
{:else if myData && myData.length > 0}
3234
<WhiteCard>
3335
{#snippet title()}
34-
<span>Company's Total Apps</span>
36+
<span>Company Apps</span>
3537
{/snippet}
3638

37-
<p class="text-lg">
38-
<span class="font-semibold text-primary-900-100"
39-
>{formatNumber(myData.map((d) => d.value).reduce((a, b) => a + b, 0))}</span
40-
>
41-
</p>
4239
{#await data.companyDetails}
4340
<div><span>Loading...</span></div>
4441
{:then detailsData}
42+
<TotalsBox
43+
myTotals={detailsData.categories.all}
44+
myType={{ name: 'All Companies & Domains', url_slug: 'all-companies' }}
45+
hideAdstxtApps={true}
46+
/>
4547
{#if detailsData && detailsData.adstxt_ad_domain_overview}
4648
<AdsTxtTotalsBox myTotals={detailsData.adstxt_ad_domain_overview} />
4749
{/if}

‎frontend/src/routes/(categorical)/companies/[domain]/[category]/+page.svelte‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33
import { page } from '$app/state';
44
55
import TotalsBox from '$lib/TotalsBox.svelte';
6-
import AdsTxtTotalsBox from '$lib/AdsTxtTotalsBox.svelte';
7-
86
import CompaniesLayout from '$lib/CompaniesLayout.svelte';
97
import WhiteCard from '$lib/WhiteCard.svelte';
10-
118
import CompanyTableGrid from '$lib/CompanyTableGrid.svelte';
129
interface Props {
1310
data: CompanyCategoryDetails;
@@ -16,10 +13,6 @@
1613
let { data }: Props = $props();
1714
1815
let company_category = $derived(page.params.category);
19-
20-
function formatNumber(num: number) {
21-
return new Intl.NumberFormat('en-US').format(num);
22-
}
2316
</script>
2417

2518
{#await data.companyDetails}
@@ -37,7 +30,6 @@
3730
myTotals={myData.categories[company_category]}
3831
myType={{ name: 'All Companies & Domains', url_slug: 'all-companies' }}
3932
/>
40-
<AdsTxtTotalsBox myTotals={myData.categories[company_category]} />
4133
</WhiteCard>
4234
{/snippet}
4335
</CompaniesLayout>

0 commit comments

Comments
 (0)