move server typings to ~/types/server

Signed-off-by: Vu Van Dung <joulev.vvd@yahoo.com>

server/handlers/pageHandlers.ts

@@ -2,13 +2,14 @@
 import { NextApiRequest, NextApiResponse } from "next";
 
 import * as PageUtils from "~/server/utils/pageUtils";
+import { extractFirstQueryValue, reportBadRequest } from "~/server/utils/nextHandlerUtils";
+
 import {
     CreateCommentRequest,
     CreatePageRequest,
     UpdateCommentRequest,
     UpdatePageRequest,
-} from "~/server/types";
-import { extractFirstQueryValue, reportBadRequest } from "~/server/utils/nextHandlerUtils";
+} from "~/types/server";
 
 ///////////
 // PAGES //

server/handlers/siteHandlers.ts

@@ -1,9 +1,10 @@
 import { NextApiRequest, NextApiResponse } from "next";
 
 import * as SiteUtils from "~/server/utils/siteUtils";
-import { CreateSiteRequest, UpdateSiteRequest } from "~/server/types";
 import { extractFirstQueryValue, reportBadRequest } from "~/server/utils/nextHandlerUtils";
 
+import { CreateSiteRequest, UpdateSiteRequest } from "~/types/server";
+
 export async function getSite(req: NextApiRequest, res: NextApiResponse) {
     const { siteId } = extractFirstQueryValue(req);
     try {

server/middlewares/removeProps/index.ts

@@ -1,8 +1,8 @@
 /**
  * This module provides middlewares to remove ALL redudant properties of an object.
  */
-import { KeyNameSet } from "~/server/types";
-import { INextApiMiddleware } from "~/server/types/nextApi.type";
+import { KeyNameSet } from "~/types/server";
+import { INextApiMiddleware } from "~/types/server/nextApi.type";
 
 export function _createRemovePropsMiddleware<T>(allowed: KeyNameSet<T>) {
     const allowedNames = allowed as Set<string>;

server/middlewares/removeProps/sites.ts

@@ -1,4 +1,4 @@
-import { CreateSiteRequest, KeyName, KeyNameSet, UpdateSiteRequest } from "~/server/types";
+import { CreateSiteRequest, KeyName, KeyNameSet, UpdateSiteRequest } from "~/types/server";
 
 import { _createRemovePropsMiddleware } from ".";
 

server/middlewares/validateRequests.ts

@@ -1,7 +1,8 @@
-import { INextApiMiddleware } from "~/server/types/nextApi.type";
 import { verifyJWT, verifySessionCookie } from "~/server/utils/authUtils";
 import { extractFirstQueryValue, reportBadRequest } from "~/server/utils/nextHandlerUtils";
 
+import { INextApiMiddleware } from "~/types/server/nextApi.type";
+
 /**
  * Middleware that checks whether the current user's uid and the targeted document's uid match.
  *

server/utils/pageUtils.ts

@@ -1,11 +1,12 @@
 import { firestoreAdmin } from "~/server/firebase/firebaseAdmin";
+
 import {
     Comment,
     CreateCommentRequest,
     CreatePageRequest,
     UpdateCommentRequest,
     UpdatePageRequest,
-} from "~/server/types";
+} from "~/types/server";
 
 import { deleteCollection } from "./firestoreUtils";
 

server/utils/siteUtils.ts

@@ -1,6 +1,7 @@
 // TODO: Fix sites and pages models
 import { firestoreAdmin } from "~/server/firebase/firebaseAdmin";
-import { CreateSiteRequest, UpdateSiteRequest } from "~/server/types";
+
+import { CreateSiteRequest, UpdateSiteRequest } from "~/types/server";
 
 import { deleteQuery } from "./firestoreUtils";