Fix somes issues with totals of companies

ddxv · Nov 1, 2024 · f305e47 · f305e47
1 parent 14f3818
commit f305e47
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 19 deletions.
diff --git a/frontend/src/routes/(newcategorical)/companies/+page.svelte b/frontend/src/routes/(newcategorical)/companies/+page.svelte
@@ -60,7 +60,7 @@
 			{#snippet card1()}
 				<WhiteCard>
 					<div class="bg-white p-6 rounded-lg shadow-md">
-						<h2 class="text-xl font-bold text-gray-800 mb-4">Total Ad Tech Companies</h2>
+						<h2 class="text-xl font-bold text-gray-800 mb-4">Total Companies</h2>
 						<p class="text-lg text-gray-700">
 							<span class="font-semibold text-gray-900"
 								>{formatNumber(myData.categories.categories.all.total_apps)}</span

diff --git a/frontend/src/routes/(newcategorical)/companies/[name]/+page.server.ts b/frontend/src/routes/(newcategorical)/companies/[name]/+page.server.ts
@@ -5,26 +5,26 @@ export const csr: boolean = true;
 
 export const load: PageServerLoad = async ({ parent, params }) => {
 	const networkName = params.name;
+
+	const res_parent_categories = fetch(
+		`http://localhost:8000/api/companies/${networkName}/parentcategories`
+	);
 	const res_apps = fetch(`http://localhost:8000/api/companies/${networkName}/topapps`);
 	const res_sdks = fetch(`http://localhost:8000/api/companies/${networkName}/sdks`);
 
 	const { companyDetails, companyTree } = await parent();
 
-	const res_parent_categories = fetch(
-		`http://localhost:8000/api/companies/${networkName}/parentcategories`
-	);
 	console.log(`start load overview for company=${networkName}`);
 	try {
 		return {
 			companyDetails: companyDetails,
-			companyTree: companyTree,
-			companyTopApps: res_apps
+			companyParentCategories: res_parent_categories
 				.then((resp) => {
 					if (resp.status === 200) {
 						return resp.json();
 					} else if (resp.status === 404) {
-						console.log('Company Not found');
-						return 'Company Not Found';
+						console.log('Company Parent Categories Not found');
+						return 'Company Parent Categories Not Found';
 					} else if (resp.status === 500) {
 						console.log('API Server error');
 						return 'Backend Error';
@@ -37,13 +37,14 @@ export const load: PageServerLoad = async ({ parent, params }) => {
 						return 'Uncaught Error';
 					}
 				),
-			companySdks: res_sdks
+			companyTree: companyTree,
+			companyTopApps: res_apps
 				.then((resp) => {
 					if (resp.status === 200) {
 						return resp.json();
 					} else if (resp.status === 404) {
-						console.log('Company SDKs Not found');
-						return 'Company SDKs Not Found';
+						console.log('Company Not found');
+						return 'Company Not Found';
 					} else if (resp.status === 500) {
 						console.log('API Server error');
 						return 'Backend Error';
@@ -56,13 +57,13 @@ export const load: PageServerLoad = async ({ parent, params }) => {
 						return 'Uncaught Error';
 					}
 				),
-			companyParentCategories: res_parent_categories
+			companySdks: res_sdks
 				.then((resp) => {
 					if (resp.status === 200) {
 						return resp.json();
 					} else if (resp.status === 404) {
-						console.log('Company Parent Categories Not found');
-						return 'Company Parent Categories Not Found';
+						console.log('Company SDKs Not found');
+						return 'Company SDKs Not Found';
 					} else if (resp.status === 500) {
 						console.log('API Server error');
 						return 'Backend Error';

diff --git a/frontend/src/routes/(newcategorical)/companies/[name]/+page.svelte b/frontend/src/routes/(newcategorical)/companies/[name]/+page.svelte
@@ -64,17 +64,17 @@
 <CompaniesLayout>
 	{#snippet card1()}
 		<WhiteCard>
-			{#await data.companyDetails}
+			{#await data.companyParentCategories}
 				<span class="text-lg text-gray-600">Loading...</span>
 			{:then myData}
 				{#if typeof myData == 'string'}
 					<p class="text-red-500 text-center">Failed to load company details.</p>
-				{:else if myData.categories.all}
+				{:else if myData && myData.length > 0}
 					<div class="bg-white p-2 rounded-lg shadow-md">
 						<h2 class="text-xl font-bold text-gray-800 mb-4">Total Apps</h2>
 						<p class="text-lg text-gray-700">
 							<span class="font-semibold text-gray-900"
-								>{formatNumber(myData.categories.all.total_apps)}</span
+								>{formatNumber(myData.map((d) => d.value).reduce((a, b) => a + b, 0))}</span
 							>
 						</p>
 					</div>

diff --git a/frontend/src/routes/(newcategorical)/companies/categories/[category]/+page.svelte b/frontend/src/routes/(newcategorical)/companies/categories/[category]/+page.svelte
@@ -34,7 +34,7 @@
 			{#snippet card1()}
 				<WhiteCard>
 					<div class="bg-white p-6 rounded-lg shadow-md">
-						<h2 class="text-xl font-bold text-gray-800 mb-4">Total Apps</h2>
+						<h2 class="text-xl font-bold text-gray-800 mb-4">Total Companies</h2>
 						<p class="text-lg text-gray-700">
 							<span class="font-semibold text-gray-900"
 								>{formatNumber(myData.categories.categories.all.total_apps)}</span

diff --git a/frontend/src/routes/(newcategorical)/companies/types/[type]/+page.svelte b/frontend/src/routes/(newcategorical)/companies/types/[type]/+page.svelte
@@ -50,7 +50,7 @@
 			{#snippet card1()}
 				<WhiteCard>
 					<div class="bg-white p-6 rounded-lg shadow-md">
-						<h2 class="text-xl font-bold text-gray-800 mb-4">Total Ad Tech Companies</h2>
+						<h2 class="text-xl font-bold text-gray-800 mb-4">Total Companies</h2>
 						<p class="text-lg text-gray-700">
 							<span class="font-semibold text-gray-900"
 								>{formatNumber(myData.categories.categories.all.total_apps)}</span