From de70b00f4211a53e887a63239f0d73a0e2c7b7a7 Mon Sep 17 00:00:00 2001
From: Nisarg <awesomenisarg@gmail.com>
Date: Mon, 11 Oct 2021 12:30:14 -0700
Subject: [PATCH] hopefully this works

---
 components/metrics/CityTable.js    | 15 +++++++++++++++
 components/metrics/RegionTable.js  | 15 +++++++++++++++
 components/pages/WebsiteDetails.js | 18 ++++++++++++++----
 3 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 components/metrics/CityTable.js
 create mode 100644 components/metrics/RegionTable.js

diff --git a/components/metrics/CityTable.js b/components/metrics/CityTable.js
new file mode 100644
index 00000000..744fbaed
--- /dev/null
+++ b/components/metrics/CityTable.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import MetricsTable from './MetricsTable';
+import { FormattedMessage } from 'react-intl';
+
+export default function CityTable({ websiteId, ...props }) {
+  return (
+    <MetricsTable
+      {...props}
+      title={<FormattedMessage id="metrics.city" defaultMessage="City" />}
+      type="city"
+      metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
+      websiteId={websiteId}
+    />
+  );
+}
diff --git a/components/metrics/RegionTable.js b/components/metrics/RegionTable.js
new file mode 100644
index 00000000..1258494b
--- /dev/null
+++ b/components/metrics/RegionTable.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import MetricsTable from './MetricsTable';
+import { FormattedMessage } from 'react-intl';
+
+export default function RegionTable({ websiteId, ...props }) {
+  return (
+    <MetricsTable
+      {...props}
+      title={<FormattedMessage id="metrics.region" defaultMessage="Region" />}
+      type="region"
+      metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
+      websiteId={websiteId}
+    />
+  );
+}
diff --git a/components/pages/WebsiteDetails.js b/components/pages/WebsiteDetails.js
index dd8034fc..f3b7fccc 100644
--- a/components/pages/WebsiteDetails.js
+++ b/components/pages/WebsiteDetails.js
@@ -16,6 +16,8 @@ import BrowsersTable from '../metrics/BrowsersTable';
 import OSTable from '../metrics/OSTable';
 import DevicesTable from '../metrics/DevicesTable';
 import CountriesTable from '../metrics/CountriesTable';
+import RegionTable from '../metrics/RegionTable';
+import CityTable from '../metrics/CityTable';
 import EventsTable from '../metrics/EventsTable';
 import EventsChart from '../metrics/EventsChart';
 import useFetch from 'hooks/useFetch';
@@ -151,12 +153,20 @@ export default function WebsiteDetails({ websiteId }) {
             </GridColumn>
           </GridRow>
           <GridRow>
-            <GridColumn xs={12} md={12} lg={8}>
-              <WorldMap data={countryData} />
-            </GridColumn>
-            <GridColumn xs={12} md={12} lg={4}>
+            <GridColumn md={12} lg={4}>
               <CountriesTable {...tableProps} onDataLoad={setCountryData} />
             </GridColumn>
+            <GridColumn md={12} lg={4}>
+              <RegionTable {...tableProps} />
+            </GridColumn>
+            <GridColumn md={12} lg={4}>
+              <CityTable {...tableProps} />
+            </GridColumn>
+          </GridRow>
+          <GridRow>
+            <GridColumn xs={12} md={12} lg={12}>
+              <WorldMap data={countryData} />
+            </GridColumn>
           </GridRow>
           <GridRow className={classNames({ [styles.hidden]: !eventsData?.length > 0 })}>
             <GridColumn xs={12} md={12} lg={4}>