Pixel/links development. New validations folder. More refactoring.

src/app/api/websites/[websiteId]/active/route.ts

@@ -1,4 +1,4 @@
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { json, unauthorized } from '@/lib/response';
 import { getActiveVisitors } from '@/queries';
 import { parseRequest } from '@/lib/request';
@@ -19,7 +19,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const result = await getActiveVisitors(websiteId);
+  const visitors = await getActiveVisitors(websiteId);
 
-  return json(result);
+  return json(visitors);
 }

src/app/api/websites/[websiteId]/daterange/route.ts

@@ -1,4 +1,4 @@
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { getWebsiteDateRange } from '@/queries';
 import { json, unauthorized } from '@/lib/response';
 import { parseRequest } from '@/lib/request';
@@ -19,7 +19,7 @@ export async function GET(
     return unauthorized();
   }
 
-  const result = await getWebsiteDateRange(websiteId);
+  const dateRange = await getWebsiteDateRange(websiteId);
 
-  return json(result);
+  return json(dateRange);
 }

src/app/api/websites/[websiteId]/event-data/[eventId]/route.ts

@@ -1,6 +1,6 @@
 import { parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { getEventData } from '@/queries/sql/events/getEventData';
 
 export async function GET(

src/app/api/websites/[websiteId]/event-data/events/route.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { getEventDataEvents } from '@/queries/sql/events/getEventDataEvents';
 
 export async function GET(

src/app/api/websites/[websiteId]/event-data/fields/route.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { getEventDataFields } from '@/queries';
 
 export async function GET(

src/app/api/websites/[websiteId]/event-data/properties/route.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { getEventDataProperties } from '@/queries';
 
 export async function GET(

src/app/api/websites/[websiteId]/event-data/stats/route.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { getEventDataStats } from '@/queries';
 
 export async function GET(

src/app/api/websites/[websiteId]/event-data/values/route.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { getEventDataValues } from '@/queries';
 
 export async function GET(

src/app/api/websites/[websiteId]/events/route.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { dateRangeParams, pagingParams, filterParams, searchParams } from '@/lib/schema';
 import { getWebsiteEvents } from '@/queries';
 

src/app/api/websites/[websiteId]/events/series/route.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { parseRequest, getQueryFilters } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { filterParams, timezoneParam, unitParam } from '@/lib/schema';
 import { getEventStats } from '@/queries';
 

src/app/api/websites/[websiteId]/export/route.ts

@@ -3,7 +3,7 @@ import JSZip from 'jszip';
 import Papa from 'papaparse';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { pagingParams, dateRangeParams } from '@/lib/schema';
 import { getEventMetrics, getPageviewMetrics, getSessionMetrics } from '@/queries';
 

src/app/api/websites/[websiteId]/metrics/expanded/route.ts

@@ -1,4 +1,4 @@
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { EVENT_COLUMNS, SESSION_COLUMNS } from '@/lib/constants';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { badRequest, json, unauthorized } from '@/lib/response';

src/app/api/websites/[websiteId]/metrics/route.ts

@@ -1,4 +1,4 @@
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { EVENT_COLUMNS, SESSION_COLUMNS } from '@/lib/constants';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { badRequest, json, unauthorized } from '@/lib/response';

src/app/api/websites/[websiteId]/pageviews/route.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { dateRangeParams, filterParams } from '@/lib/schema';
 import { getCompareDate } from '@/lib/date';

src/app/api/websites/[websiteId]/reports/route.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { getReports } from '@/queries';
 import { filterParams, pagingParams } from '@/lib/schema';
 import { parseRequest } from '@/lib/request';

src/app/api/websites/[websiteId]/reset/route.ts

@@ -1,4 +1,4 @@
-import { canUpdateWebsite } from '@/lib/auth';
+import { canUpdateWebsite } from '@/validations';
 import { resetWebsite } from '@/queries';
 import { unauthorized, ok } from '@/lib/response';
 import { parseRequest } from '@/lib/request';

src/app/api/websites/[websiteId]/route.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { canUpdateWebsite, canDeleteWebsite, canViewWebsite } from '@/lib/auth';
+import { canUpdateWebsite, canDeleteWebsite, canViewWebsite } from '@/validations';
 import { SHARE_ID_REGEX } from '@/lib/constants';
 import { parseRequest } from '@/lib/request';
 import { ok, json, unauthorized, serverError } from '@/lib/response';

src/app/api/websites/[websiteId]/segments/[segmentId]/route.ts

@@ -1,4 +1,4 @@
-import { canDeleteWebsite, canUpdateWebsite, canViewWebsite } from '@/lib/auth';
+import { canDeleteWebsite, canUpdateWebsite, canViewWebsite } from '@/validations';
 import { parseRequest } from '@/lib/request';
 import { json, notFound, ok, unauthorized } from '@/lib/response';
 import { segmentTypeParam } from '@/lib/schema';

src/app/api/websites/[websiteId]/segments/route.ts

@@ -1,4 +1,4 @@
-import { canUpdateWebsite, canViewWebsite } from '@/lib/auth';
+import { canUpdateWebsite, canViewWebsite } from '@/validations';
 import { uuid } from '@/lib/crypto';
 import { parseRequest } from '@/lib/request';
 import { json, unauthorized } from '@/lib/response';

src/app/api/websites/[websiteId]/session-data/properties/route.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { getSessionDataProperties } from '@/queries';
 
 export async function GET(

src/app/api/websites/[websiteId]/session-data/values/route.ts

@@ -1,4 +1,4 @@
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { json, unauthorized } from '@/lib/response';
 import { getSessionDataValues } from '@/queries';

src/app/api/websites/[websiteId]/sessions/[sessionId]/activity/route.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { parseRequest, getQueryFilters } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { getSessionActivity } from '@/queries';
 
 export async function GET(

src/app/api/websites/[websiteId]/sessions/[sessionId]/properties/route.ts

@@ -1,5 +1,5 @@
 import { unauthorized, json } from '@/lib/response';
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { getSessionData } from '@/queries';
 import { parseRequest } from '@/lib/request';
 

src/app/api/websites/[websiteId]/sessions/[sessionId]/route.ts

@@ -1,5 +1,5 @@
 import { unauthorized, json } from '@/lib/response';
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { getWebsiteSession } from '@/queries';
 import { parseRequest } from '@/lib/request';
 

src/app/api/websites/[websiteId]/sessions/route.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { dateRangeParams, filterParams, pagingParams, searchParams } from '@/lib/schema';
 import { getWebsiteSessions } from '@/queries';
 

src/app/api/websites/[websiteId]/sessions/stats/route.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { parseRequest, getQueryFilters } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { filterParams } from '@/lib/schema';
 import { getWebsiteSessionStats } from '@/queries';
 

src/app/api/websites/[websiteId]/sessions/weekly/route.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { pagingParams, timezoneParam } from '@/lib/schema';
 import { getWebsiteSessionsWeekly } from '@/queries';
 

src/app/api/websites/[websiteId]/stats/route.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { parseRequest, getQueryFilters } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { dateRangeParams, filterParams } from '@/lib/schema';
 import { getWebsiteStats } from '@/queries';
 import { getCompareDate } from '@/lib/date';

src/app/api/websites/[websiteId]/transfer/route.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { canTransferWebsiteToTeam, canTransferWebsiteToUser } from '@/lib/auth';
+import { canTransferWebsiteToTeam, canTransferWebsiteToUser } from '@/validations';
 import { updateWebsite } from '@/queries';
 import { parseRequest } from '@/lib/request';
 import { badRequest, unauthorized, json } from '@/lib/response';

src/app/api/websites/[websiteId]/values/route.ts

@@ -1,4 +1,4 @@
-import { canViewWebsite } from '@/lib/auth';
+import { canViewWebsite } from '@/validations';
 import { EVENT_COLUMNS, FILTER_COLUMNS, FILTER_GROUPS, SESSION_COLUMNS } from '@/lib/constants';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { badRequest, json, unauthorized } from '@/lib/response';

src/app/api/websites/route.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { canCreateTeamWebsite, canCreateWebsite } from '@/lib/auth';
+import { canCreateTeamWebsite, canCreateWebsite } from '@/validations';
 import { json, unauthorized } from '@/lib/response';
 import { uuid } from '@/lib/crypto';
 import { parseRequest } from '@/lib/request';