fixed incorrect import

shurgbee · shurgbee · commit 892f91a636bd · 2025-12-31T14:00:51.000-06:00
diff --git a/next.config.mjs b/next.config.mjs
@@ -1,4 +1,5 @@
 import { withSentryConfig } from '@sentry/nextjs';
+
 /**
  * Run `build` or `dev` with `SKIP_ENV_VALIDATION` to skip env validation. This is especially useful
  * for Docker builds.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,6 +19,7 @@
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
     "@hookform/resolvers": "^3.3.2",
+    "@ianvs/prettier-plugin-sort-imports": "^4.7.0",
     "@mui/icons-material": "^7.3.1",
     "@mui/material": "^7.3.1",
     "@mui/material-nextjs": "^7.3.0",
@@ -45,7 +46,6 @@
     "next": "^15.4.10",
     "next-auth": "^4.24.11",
     "postgres": "^3.3.5",
-    "prettier-plugin-sort-imports": "^1.8.9",
     "react": "^18.2.0",
     "react-day-picker": "^8.9.1",
     "react-dom": "^18.2.0",
diff --git a/src/app/api/auth/[...nextauth]/route.ts b/src/app/api/auth/[...nextauth]/route.ts
@@ -1,5 +1,4 @@
 import NextAuth from 'next-auth';
-
 import { authOptions } from '@src/server/auth';
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
diff --git a/src/app/api/files/upload/route.ts b/src/app/api/files/upload/route.ts
@@ -1,12 +1,11 @@
-import { NextResponse } from 'next/server';
-import { db } from '@src/server/db';
-import { file } from '@src/server/db/schema/file';
-import { and, eq } from 'drizzle-orm';
-import { getServerAuthSession } from '@src/server/auth';
 import fs from 'fs';
 import path from 'path';
-
+import { and, eq } from 'drizzle-orm';
+import { NextResponse } from 'next/server';
 import { z } from 'zod';
+import { getServerAuthSession } from '@src/server/auth';
+import { db } from '@src/server/db';
+import { file } from '@src/server/db/schema/file';
 
 const allowedTypes = ['image/png', 'image/jpeg', 'application/pdf'];
 
diff --git a/src/app/api/reports/route.ts b/src/app/api/reports/route.ts
@@ -4,13 +4,12 @@
 import { NextResponse } from 'next/server'; // Used to send HTTP responses (JSON, status codes)
 import { z } from 'zod'; // Zod validates and parses input data
 
+// Import session helper to check if a user is logged in
+import { getServerAuthSession } from '@src/server/auth';
 // Import database connection and the "report" table schema
 import { db } from '@src/server/db';
 import { report } from '@src/server/db/schema/reports';
 
-// Import session helper to check if a user is logged in
-import { getServerAuthSession } from '@src/server/auth';
-
 // This ensures the API only accepts the correct fields
 const CreateReportSchema = z.object({
   fileId: z.string().min(1),
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,14 +1,12 @@
 import '@src/styles/globals.css';
-
-import { ThemeProvider } from '@mui/material/styles';
 import { AppRouterCacheProvider } from '@mui/material-nextjs/v15-appRouter';
-import { Bai_Jamjuree, Inter } from 'next/font/google';
-import { type Metadata } from 'next';
+import { ThemeProvider } from '@mui/material/styles';
 import { GoogleAnalytics } from '@next/third-parties/google';
+import { type Metadata } from 'next';
+import { Bai_Jamjuree, Inter } from 'next/font/google';
 import Link from 'next/link';
-
-import theme from '@src/utils/theme';
 import { ToastProvider } from '@src/components/toast/ToastProvider';
+import theme from '@src/utils/theme';
 
 const inter = Inter({
   subsets: ['latin'],
diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -1,5 +1,5 @@
-import type { Metadata } from 'next';
 import NavBar from '@components/NavBar';
+import type { Metadata } from 'next';
 
 export const metadata: Metadata = {
   alternates: {
diff --git a/src/components/NavBar.tsx b/src/components/NavBar.tsx
@@ -1,7 +1,7 @@
-import React from 'react';
-import Link from 'next/link';
-import Image from 'next/image';
 import { IconButton, Tooltip } from '@mui/material';
+import Image from 'next/image';
+import Link from 'next/link';
+import React from 'react';
 
 export default function NavBar() {
   return (
diff --git a/src/components/toast/ToastProvider.tsx b/src/components/toast/ToastProvider.tsx
@@ -1,4 +1,5 @@
 'use client';
+
 import React, {
   createContext,
   useCallback,
diff --git a/src/server/api/root.ts b/src/server/api/root.ts
@@ -1,6 +1,6 @@
 import { createCallerFactory, createTRPCRouter } from '@src/server/api/trpc';
-import { userMetadataRouter } from './routers/userMetadata';
 import { storageRouter } from './routers/storage';
+import { userMetadataRouter } from './routers/userMetadata';
 
 /**
  * This is the primary router for your server.
diff --git a/src/server/api/routers/storage.ts b/src/server/api/routers/storage.ts
@@ -1,7 +1,7 @@
-import { callStorageAPI, getUploadURL } from '@src/utils/storage';
-import { createTRPCRouter, publicProcedure, protectedProcedure } from '../trpc';
-import { z } from 'zod';
 import { TRPCError } from '@trpc/server';
+import { z } from 'zod';
+import { callStorageAPI, getUploadURL } from '@src/utils/storage';
+import { createTRPCRouter, protectedProcedure, publicProcedure } from '../trpc';
 
 const getDeleteSchema = z.object({
   objectID: z.string(),
diff --git a/src/server/api/routers/userMetadata.ts b/src/server/api/routers/userMetadata.ts
@@ -1,9 +1,8 @@
-import { z } from 'zod';
-import { createTRPCRouter, protectedProcedure, publicProcedure } from '../trpc';
 import { eq, sql } from 'drizzle-orm';
-
+import { z } from 'zod';
 import { insertUserMetadata } from '@src/server/db/models';
 import { userMetadata, user as users } from '@src/server/db/schema/user';
+import { createTRPCRouter, protectedProcedure, publicProcedure } from '../trpc';
 
 const byIdSchema = z.object({ id: z.string().uuid() });
 
diff --git a/src/server/api/trpc.ts b/src/server/api/trpc.ts
@@ -8,12 +8,11 @@
  */
 
 import { initTRPC, TRPCError } from '@trpc/server';
+import { cache } from 'react';
 import superjson from 'superjson';
 import { ZodError } from 'zod';
-
 import { getServerAuthSession } from '@src/server/auth';
 import { db } from '@src/server/db';
-import { cache } from 'react';
 
 /**
  * 1. CONTEXT
diff --git a/src/server/auth.ts b/src/server/auth.ts
@@ -1,16 +1,16 @@
+import { DrizzleAdapter } from '@auth/drizzle-adapter';
+import { eq } from 'drizzle-orm';
+import { pgTable } from 'drizzle-orm/pg-core';
 import {
   getServerSession,
-  type NextAuthOptions,
   type DefaultSession,
+  type NextAuthOptions,
 } from 'next-auth';
-import GoogleProvider from 'next-auth/providers/google';
 import DiscordProvider from 'next-auth/providers/discord';
+import GoogleProvider from 'next-auth/providers/google';
 import { env } from '@src/env.mjs';
-import { DrizzleAdapter } from '@auth/drizzle-adapter';
 import { db } from './db';
-import { eq } from 'drizzle-orm';
-import { type SelectUserMetadata, type InsertUserMetadata } from './db/models';
-import { pgTable } from 'drizzle-orm/pg-core';
+import { type InsertUserMetadata, type SelectUserMetadata } from './db/models';
 import { userMetadata } from './db/schema/user';
 
 /**
diff --git a/src/server/db/index.ts b/src/server/db/index.ts
@@ -1,10 +1,10 @@
 import { drizzle } from 'drizzle-orm/neon-http';
 import { env } from '@src/env.mjs';
-
-import * as user from './schema/user';
 import * as file from './schema/file';
-import * as section from './schema/section';
 import * as report from './schema/reports';
+import * as section from './schema/section';
+import * as user from './schema/user';
+
 const schema = {
   ...file,
   ...section,
diff --git a/src/server/db/models.ts b/src/server/db/models.ts
@@ -1,5 +1,5 @@
-import { type z } from 'zod';
 import { createInsertSchema, createSelectSchema } from 'drizzle-zod';
+import { type z } from 'zod';
 import { userMetadata } from './schema/user';
 
 // Schema types for userMetadata
diff --git a/src/server/db/schema/file.ts b/src/server/db/schema/file.ts
@@ -1,17 +1,17 @@
 import { relations, sql } from 'drizzle-orm';
 import {
-  pgTable,
-  varchar,
-  text,
   boolean,
+  check,
+  index,
   integer,
+  pgTable,
+  text,
   timestamp,
-  index,
   uniqueIndex,
-  check,
+  varchar,
 } from 'drizzle-orm/pg-core';
-import { user } from './user';
 import { section } from './section';
+import { user } from './user';
 
 export const file = pgTable(
   'file',
diff --git a/src/server/db/schema/reports.ts b/src/server/db/schema/reports.ts
@@ -1,9 +1,9 @@
 // Minimal table so API can insert a report.
 
 import { sql } from 'drizzle-orm';
-import { pgTable, text, varchar, timestamp } from 'drizzle-orm/pg-core';
-import { user } from './user';
+import { pgTable, text, timestamp, varchar } from 'drizzle-orm/pg-core';
 import { file } from './file';
+import { user } from './user';
 
 export const report = pgTable('report', {
   id: text('id')
diff --git a/src/server/db/schema/section.ts b/src/server/db/schema/section.ts
@@ -1,14 +1,14 @@
 import { relations, sql } from 'drizzle-orm';
 import {
-  pgTable,
+  index,
+  integer,
   pgEnum,
+  pgTable,
   smallint,
-  integer,
-  varchar,
   text,
   timestamp,
   uniqueIndex,
-  index,
+  varchar,
 } from 'drizzle-orm/pg-core';
 import { file } from './file';
 
diff --git a/src/trpc/react.tsx b/src/trpc/react.tsx
@@ -1,12 +1,11 @@
 'use client';
 
-import { type QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { createTRPCClient, loggerLink, httpBatchLink } from '@trpc/client';
+import { QueryClientProvider, type QueryClient } from '@tanstack/react-query';
+import { createTRPCClient, httpBatchLink, loggerLink } from '@trpc/client';
+import { createTRPCContext } from '@trpc/tanstack-react-query';
 import { useState } from 'react';
-
 import { type AppRouter } from '@src/server/api/root';
 import { getUrl, makeQueryClient, transformer } from './shared';
-import { createTRPCContext } from '@trpc/tanstack-react-query';
 
 let browserQueryClient: QueryClient;
 
diff --git a/src/trpc/server.ts b/src/trpc/server.ts
@@ -1,9 +1,8 @@
 import 'server-only';
-
-import { createTRPCContext } from '@src/server/api/trpc';
-import { cache } from 'react';
 import { createTRPCOptionsProxy } from '@trpc/tanstack-react-query';
+import { cache } from 'react';
 import { appRouter } from '@src/server/api/root';
+import { createTRPCContext } from '@src/server/api/trpc';
 import { makeQueryClient } from './shared';
 
 export const getQueryClient = cache(makeQueryClient);
diff --git a/src/trpc/shared.ts b/src/trpc/shared.ts
@@ -1,10 +1,10 @@
-import { type inferRouterInputs, type inferRouterOutputs } from '@trpc/server';
-import superjson from 'superjson';
-import { type AppRouter } from '@src/server/api/root';
 import {
-  QueryClient,
   defaultShouldDehydrateQuery,
+  QueryClient,
 } from '@tanstack/react-query';
+import { type inferRouterInputs, type inferRouterOutputs } from '@trpc/server';
+import superjson from 'superjson';
+import { type AppRouter } from '@src/server/api/root';
 
 export const transformer = superjson;
 function getBaseUrl() {
diff --git a/tests/test.ts b/tests/test.ts
@@ -1,8 +1,8 @@
 import { describe, expect, test } from '@jest/globals';
+import { eq } from 'drizzle-orm';
 import { db } from '@src/server/db';
 import { type InsertClub } from '@src/server/db/models';
 import { club } from '@src/server/db/schema';
-import { eq } from 'drizzle-orm';
 
 describe('This should create a club on supabase', () => {
   test('Should create a new club', async () => {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import { withSentryConfig } from '@sentry/nextjs';`
	`2`	`+`
`2`	`3`	`/**`
`3`	`4`	* Run `build` or `dev` with `SKIP_ENV_VALIDATION` to skip env validation. This is especially useful
`4`	`5`	`* for Docker builds.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import NextAuth from 'next-auth';`
`2`		`-`
`3`	`2`	`import { authOptions } from '@src/server/auth';`
`4`	`3`
`5`	`4`	`// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`'use client';`
	`2`	`+`
`2`	`3`	`import React, {`
`3`	`4`	`createContext,`
`4`	`5`	`useCallback,`