fix imports

lilith · Feb 18, 2024 · 633f3ca · 633f3ca
1 parent bb0a1fb
commit 633f3ca
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 24 deletions.
diff --git a/src/lib/logics/Calendar/Wrapper/logic.ts b/src/lib/logics/Calendar/Wrapper/logic.ts
@@ -1,5 +1,5 @@
+import generateSchedRows from '$lib/logics/_shared/generateSchedRows';
 import type { AvailabilityDates } from '$lib/logics/_shared/types';
-import generateSchedRows from '$lib/server/_shared/generateSchedRows';
 import { writeReq } from '$lib/logics/_shared/utils';
 
 export const initVals = (dbVals: { dbDates: AvailabilityDates; timeZone: string }) => {

diff --git a/src/lib/logics/_shared/constants.ts b/src/lib/logics/_shared/constants.ts
@@ -170,3 +170,5 @@ export const EMOTICONS_REVERSE: { [key: string]: string } = {
 
 export const LEGEND_STR =
 	'Legend: 🏠(host) 🚗(visit) 👤(dropoff) 👥(together) 🏫(via school) ⭐(good) 🌟(great) 🙏(needed)\n';
+
+export const NUM_DAYS_IN_SCHED = 21;
diff --git a/src/lib/server/_shared/generateSchedRows.ts → src/lib/logics/_shared/generateSchedRows.ts b/src/lib/server/_shared/generateSchedRows.ts → src/lib/logics/_shared/generateSchedRows.ts
@@ -1,12 +1,10 @@
-import { getEnglishDayAndMonthDay, startOfToday } from '$lib/logics/_shared/date';
 import { UNAVAILABLE } from '$lib/logics/Calendar/_shared/constants';
 import { extractAvailRange } from '$lib/logics/Calendar/_shared/utils';
-import type { AvailabilityDates } from '$lib/logics/_shared/types';
+import { getEnglishDayAndMonthDay, startOfToday } from '$lib/logics/_shared/date';
 import { destructRange } from '$lib/logics/_shared/parse';
-import type { Row } from '$lib/logics/_shared/types';
+import type { AvailabilityDates, Row } from '$lib/logics/_shared/types';
 import { AvailabilityStatus, type AvailabilityDate } from '@prisma/client';
 import { DateTime } from 'luxon';
-import AvailabilityDateRepository from '../repository/AvailabilityDate';
 import { NUM_DAYS_IN_SCHED } from './constants';
 
 export function convertAvailabilityDateToRow({
@@ -69,17 +67,6 @@ export function putDbDatesInDict(dbDates: AvailabilityDate[], timeZone: string)
 	return res;
 }
 
-export async function getDbDates(householdId: number, timeZone: string) {
-	const now = startOfToday(timeZone);
-
-	return await AvailabilityDateRepository.findAll({
-		householdId,
-		date: {
-			gte: now.toJSDate()
-		}
-	});
-}
-
 /*
   generate rows for next NUM_DAYS_IN_SCHED days
 */

diff --git a/src/lib/server/_shared/constants.ts b/src/lib/server/_shared/constants.ts
diff --git a/src/lib/server/_shared/getDbDates.ts b/src/lib/server/_shared/getDbDates.ts
@@ -0,0 +1,13 @@
+import { startOfToday } from '$lib/logics/_shared/date';
+import AvailabilityDateRepository from '../repository/AvailabilityDate';
+
+export async function getDbDates(householdId: number, timeZone: string) {
+	const now = startOfToday(timeZone);
+
+	return await AvailabilityDateRepository.findAll({
+		householdId,
+		date: {
+			gte: now.toJSDate()
+		}
+	});
+}
diff --git a/src/lib/server/dbRoutes/acceptFriendReq.ts b/src/lib/server/dbRoutes/acceptFriendReq.ts
@@ -1,7 +1,8 @@
 import { generateFullSchedule } from '$lib/logics/_shared/format';
+import generateSchedRows, { putDbDatesInDict } from '$lib/logics/_shared/generateSchedRows';
 import type { User } from '@prisma/client';
 import { error } from '@sveltejs/kit';
-import generateSchedRows, { getDbDates, putDbDatesInDict } from '../_shared/generateSchedRows';
+import { getDbDates } from '../_shared/getDbDates';
 import FriendRequestRepository from '../repository/FriendRequest';
 import HouseholdRepository from '../repository/Household';
 import HouseholdConnectionRepository from '../repository/HouseholdConnection';

diff --git a/src/lib/server/loaders/calendar.ts b/src/lib/server/loaders/calendar.ts
@@ -1,7 +1,8 @@
-import { getDbDates, putDbDatesInDict } from '$lib/server/_shared/generateSchedRows';
+import type { HouseholdWithExtraInfo } from '$lib/logics/Calendar/_shared/types';
+import { putDbDatesInDict } from '$lib/logics/_shared/generateSchedRows';
+import { getDbDates } from '$lib/server/_shared/getDbDates';
 import HouseholdChildRepository from '$lib/server/repository/HouseholdChild';
 import HouseholdConnectionRepository from '$lib/server/repository/HouseholdConnection';
-import type { HouseholdWithExtraInfo } from '$lib/logics/Calendar/_shared/types';
 
 export const getDatesDict = async (householdId: number | null, timeZone: string) => {
 	if (!householdId) return {};

diff --git a/src/lib/server/loaders/dashboard.ts b/src/lib/server/loaders/dashboard.ts
@@ -13,7 +13,7 @@ import type {
 } from '$lib/logics/Dashboard/_shared/types';
 import { EMOTICONS_REVERSE } from '$lib/logics/_shared/constants';
 import { startOfToday } from '$lib/logics/_shared/date';
-import generateSchedRows, { putDbDatesInDict } from '$lib/server/_shared/generateSchedRows';
+import generateSchedRows, { putDbDatesInDict } from '$lib/logics/_shared/generateSchedRows';
 import HouseholdConnectionRepository from '$lib/server/repository/HouseholdConnection';
 import { AvailabilityStatus } from '@prisma/client';
 

diff --git a/src/routes/circle/+page.svelte b/src/routes/circle/+page.svelte
@@ -6,7 +6,7 @@
 	import NavBar from '$lib/components/NavBar.svelte';
 	import Modal from '$lib/components/Modal.svelte';
 	import PhoneInput from '$lib/components/PhoneInput.svelte';
-	import { circleInviteMsg } from '$lib/format';
+	import { circleInviteMsg } from '$lib/logics/_shared/format';
 
 	let phoneInput: object;
 	let inviteesPhone: string;

diff --git a/src/routes/dashboard/+page.server.ts b/src/routes/dashboard/+page.server.ts
@@ -1,8 +1,8 @@
 import type { CircleMember } from '$lib/logics/Dashboard/_shared/types';
 import generateSchedRows, {
-	getDbDates,
 	putDbDatesInDict
-} from '$lib/server/_shared/generateSchedRows';
+} from '$lib/logics/_shared/generateSchedRows';
+import { getDbDates } from '$lib/server/_shared/getDbDates';
 import {
 	getCircleMembers,
 	getOverlaps,