From e68d1b32334715ce0cff59f63ccaa33b1236ef08 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 28 Feb 2024 10:22:32 -0800
Subject: [PATCH 1/4] remove cloud mode for transfer website

---
 .../websites/[websiteId]/WebsiteData.tsx      | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx
index 080b9b5c..ed2a4046 100644
--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx
+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx
@@ -33,23 +33,21 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?:
 
   return (
     <>
-      {process.env.cloudMode && (
-        <ActionForm
-          label={formatMessage(labels.transferWebsite)}
-          description={formatMessage(messages.transferWebsite)}
-        >
-          <ModalTrigger disabled={!isTeamOwner}>
-            <Button variant="secondary" disabled={!isTeamOwner}>
-              {formatMessage(labels.transfer)}
-            </Button>
-            <Modal title={formatMessage(labels.transferWebsite)}>
-              {(close: () => void) => (
-                <WebsiteTransferForm websiteId={websiteId} onSave={handleSave} onClose={close} />
-              )}
-            </Modal>
-          </ModalTrigger>
-        </ActionForm>
-      )}
+      <ActionForm
+        label={formatMessage(labels.transferWebsite)}
+        description={formatMessage(messages.transferWebsite)}
+      >
+        <ModalTrigger disabled={!isTeamOwner}>
+          <Button variant="secondary" disabled={!isTeamOwner}>
+            {formatMessage(labels.transfer)}
+          </Button>
+          <Modal title={formatMessage(labels.transferWebsite)}>
+            {(close: () => void) => (
+              <WebsiteTransferForm websiteId={websiteId} onSave={handleSave} onClose={close} />
+            )}
+          </Modal>
+        </ModalTrigger>
+      </ActionForm>
       <ActionForm
         label={formatMessage(labels.resetWebsite)}
         description={formatMessage(messages.resetWebsiteWarning)}

From 300a0f63e7472f1ad0dcb890712a4ae154d5057b Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Wed, 28 Feb 2024 10:19:22 -0800
Subject: [PATCH 2/4] add orderby to query.

---
 src/pages/api/teams/[teamId]/users/index.ts | 8 +-------
 src/pages/api/users/[userId]/teams.ts       | 8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/pages/api/teams/[teamId]/users/index.ts b/src/pages/api/teams/[teamId]/users/index.ts
index 3c4dfd71..3a03feaf 100644
--- a/src/pages/api/teams/[teamId]/users/index.ts
+++ b/src/pages/api/teams/[teamId]/users/index.ts
@@ -44,8 +44,6 @@ export default async (
       return unauthorized(res);
     }
 
-    const { query, page, pageSize } = req.query;
-
     const users = await getTeamUsers(
       {
         where: {
@@ -63,11 +61,7 @@ export default async (
           },
         },
       },
-      {
-        query,
-        page,
-        pageSize,
-      },
+      req.query,
     );
 
     return ok(res, users);
diff --git a/src/pages/api/users/[userId]/teams.ts b/src/pages/api/users/[userId]/teams.ts
index dda65355..279df1e3 100644
--- a/src/pages/api/users/[userId]/teams.ts
+++ b/src/pages/api/users/[userId]/teams.ts
@@ -39,13 +39,7 @@ export default async (
       return unauthorized(res);
     }
 
-    const { page, query, pageSize } = req.query;
-
-    const teams = await getUserTeams(userId as string, {
-      query,
-      page,
-      pageSize,
-    });
+    const teams = await getUserTeams(userId as string, req.query);
 
     return ok(res, teams);
   }

From 719699762c6d1d67ddc0df893aaa4bd936de9c30 Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Wed, 28 Feb 2024 12:40:23 -0800
Subject: [PATCH 3/4] add orderBy

---
 src/pages/api/teams/[teamId]/websites/index.ts | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/pages/api/teams/[teamId]/websites/index.ts b/src/pages/api/teams/[teamId]/websites/index.ts
index e4919d20..dd2fdeff 100644
--- a/src/pages/api/teams/[teamId]/websites/index.ts
+++ b/src/pages/api/teams/[teamId]/websites/index.ts
@@ -43,13 +43,7 @@ export default async (
       return unauthorized(res);
     }
 
-    const { page, query, pageSize } = req.query;
-
-    const websites = await getTeamWebsites(teamId, {
-      page,
-      query,
-      pageSize,
-    });
+    const websites = await getTeamWebsites(teamId, req.query);
 
     return ok(res, websites);
   }

From 87b947d174695719fb7f89b32f824ca74d5eb640 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Wed, 28 Feb 2024 16:08:50 -0800
Subject: [PATCH 4/4] Fixed date buttons for today/yesterday selection.

---
 src/lib/date.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/lib/date.ts b/src/lib/date.ts
index cf2f09df..79dd8976 100644
--- a/src/lib/date.ts
+++ b/src/lib/date.ts
@@ -263,6 +263,13 @@ export function getOffsetDateRange(dateRange: DateRange, increment: number) {
   const { unit: originalUnit } = parseDateValue(value) || {};
 
   switch (originalUnit) {
+    case 'day':
+      return {
+        ...dateRange,
+        startDate: addDays(startDate, increment),
+        endDate: addDays(endDate, increment),
+        offset: offset + increment,
+      };
     case 'week':
       return {
         ...dateRange,