Merge pull request #14 from isoppp/feature/move-files

move files
isoppp · Sep 23, 2024 · 31f0bce · 31f0bce
2 parents f1f7576 + f0a0e9d
commit 31f0bce
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/app/.server/trpc/routes/auth/signInWithEmailUsecase.tsx b/app/.server/trpc/routes/auth/signInWithEmailUsecase.tsx
@@ -1,6 +1,6 @@
 import { commitVerificationSessionWithValue } from '@/.server/cookie-session/verification-session'
 import type { Context } from '@/.server/trpc/trpc'
-import { generateRandomURLString } from '@/.server/utils/auth.server'
+import { generateRandomURLString } from '@/.server/utils/auth'
 import { sendEmail } from '@/.server/utils/email'
 import SignInVerification from '@/components/emails/SignInVerification'
 import { prisma } from '@/lib/prisma'

diff --git a/app/.server/trpc/routes/auth/signUpWithEmailUsecase.tsx b/app/.server/trpc/routes/auth/signUpWithEmailUsecase.tsx
@@ -1,6 +1,6 @@
 import { commitVerificationSessionWithValue } from '@/.server/cookie-session/verification-session'
 import type { Context } from '@/.server/trpc/trpc'
-import { generateRandomURLString } from '@/.server/utils/auth.server'
+import { generateRandomURLString } from '@/.server/utils/auth'
 import { sendEmail } from '@/.server/utils/email'
 import SignUpVerification from '@/components/emails/SignUpVerification'
 import { prisma } from '@/lib/prisma'

diff --git a/app/.server/utils/auth.server.ts → app/.server/utils/auth.ts b/app/.server/utils/auth.server.ts → app/.server/utils/auth.ts
diff --git a/server/logger.ts → app/.server/utils/logger.ts b/server/logger.ts → app/.server/utils/logger.ts
diff --git a/server/otel.ts → app/.server/utils/open-telemetry.ts b/server/otel.ts → app/.server/utils/open-telemetry.ts
diff --git a/app/components/emails/SignInVerification.tsx b/app/components/emails/SignInVerification.tsx
@@ -1,4 +1,4 @@
-import { generateRandomURLString } from '@/.server/utils/auth.server'
+import { generateRandomURLString } from '@/.server/utils/auth'
 import {
   Body,
   Button,

diff --git a/app/components/emails/SignUpVerification.tsx b/app/components/emails/SignUpVerification.tsx
@@ -1,4 +1,4 @@
-import { generateRandomURLString } from '@/.server/utils/auth.server'
+import { generateRandomURLString } from '@/.server/utils/auth'
 import {
   Body,
   Button,

diff --git a/server/index.ts b/server/index.ts
@@ -3,6 +3,7 @@
  */
 
 import crypto from 'node:crypto'
+import { appLogger } from '@/.server/utils/logger'
 import { createRequestHandler } from '@remix-run/express'
 import type { ServerBuild } from '@remix-run/node'
 import chalk from 'chalk'
@@ -12,9 +13,8 @@ import express from 'express'
 import rateLimit from 'express-rate-limit'
 import getPort, { portNumbers } from 'get-port'
 import helmet, { type HelmetOptions } from 'helmet'
-import './otel'
-import './logger'
-import { appLogger } from './logger'
+
+import '@/.server/utils/open-telemetry'
 
 const IS_LOCAL = process.env.APP_ENV === 'local'
 const ALLOW_INDEXING = false