From f576e3c73da378ebe7f80d0feefaf571dab77d86 Mon Sep 17 00:00:00 2001
From: luannguyenbkit <luannguyenbkit@gmail.com>
Date: Sun, 22 Dec 2024 23:28:01 +0700
Subject: [PATCH 1/2] refactor: ui

---
 packages/ui/src/components/molecules/skeleton/posts.tsx | 4 ++--
 packages/ui/src/components/ui/use-toast.ts              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/ui/src/components/molecules/skeleton/posts.tsx b/packages/ui/src/components/molecules/skeleton/posts.tsx
index 4471d238..7a18cb8b 100644
--- a/packages/ui/src/components/molecules/skeleton/posts.tsx
+++ b/packages/ui/src/components/molecules/skeleton/posts.tsx
@@ -1,7 +1,7 @@
 import * as React from "react"
 
-import { Skeleton } from "@/components/ui/skeleton"
-import { cn } from "@/lib/utils"
+import { cn } from "../../../lib/utils"
+import { Skeleton } from "../../ui/skeleton"
 
 interface PostSkeletonProps extends React.HTMLAttributes<HTMLDivElement> {
   total?: number
diff --git a/packages/ui/src/components/ui/use-toast.ts b/packages/ui/src/components/ui/use-toast.ts
index 2e4c6ea2..9abb52e6 100644
--- a/packages/ui/src/components/ui/use-toast.ts
+++ b/packages/ui/src/components/ui/use-toast.ts
@@ -3,7 +3,7 @@
 // Inspired by react-hot-toast library
 import * as React from "react"
 
-import type { ToastActionElement, ToastProps } from "@/components/ui/toast"
+import type { ToastActionElement, ToastProps } from "./toast"
 
 const TOAST_LIMIT = 1
 const TOAST_REMOVE_DELAY = 1000000

From ba7a7ff0a0bc998c0a1a32c0644a5be00cdd497e Mon Sep 17 00:00:00 2001
From: luannguyenbkit <luannguyenbkit@gmail.com>
Date: Mon, 23 Dec 2024 22:43:15 +0700
Subject: [PATCH 2/2] refactor import

---
 apps/docs/app/page.tsx                        |  3 +-
 apps/web/src/actions/auth/index.ts            |  7 +-
 apps/web/src/actions/protect/postAction.ts    |  9 +--
 .../web/src/app/[lang]/(auth)/signin/page.tsx |  5 +-
 .../web/src/app/[lang]/(auth)/signup/page.tsx |  2 +-
 .../web/src/app/[lang]/(protected)/layout.tsx |  2 +-
 .../[lang]/(protected)/user/posts/page.tsx    |  7 +-
 .../[lang]/(protected)/user/profile/page.tsx  | 10 +--
 .../user/posts/[postId]/edit/page.tsx         |  3 +-
 .../user/posts/create/page.tsx                |  6 +-
 .../src/app/[lang]/(public)/contact/page.tsx  |  4 +-
 apps/web/src/app/[lang]/(public)/layout.tsx   |  7 +-
 apps/web/src/app/[lang]/(public)/page.tsx     |  5 +-
 .../src/app/[lang]/(public)/search/page.tsx   |  7 +-
 .../web/src/app/[lang]/(public)/tags/page.tsx |  6 +-
 apps/web/src/app/[lang]/(public)/ui/page.tsx  |  5 +-
 .../author/[authorId]/followers/page.tsx      |  9 ++-
 .../author/[authorId]/page.tsx                |  5 +-
 .../posts/[postId]/page.tsx                   | 15 ++--
 .../tags/[tagId]/follower/page.tsx            | 13 ++--
 .../(public-fullwidth)/tags/[tagId]/page.tsx  |  5 +-
 apps/web/src/app/[lang]/layout.tsx            |  7 +-
 .../src/app/api/auth/[...nextauth]/route.ts   |  2 +-
 .../src/app/api/protected/comment/route.ts    |  2 +-
 .../web/src/app/api/protected/images/route.ts | 19 +++--
 apps/web/src/app/api/protected/tags/route.ts  |  2 +-
 .../protected/user/[userId]/follower/route.ts |  7 +-
 .../user/[userId]/followers/route.ts          |  3 +-
 .../post/[postIdOrSlug]/comments/route.ts     | 12 ++--
 .../api/public/post/[postIdOrSlug]/route.ts   |  4 +-
 apps/web/src/app/api/public/tags/route.ts     |  9 +--
 apps/web/src/emails/index.ts                  |  3 +-
 apps/web/src/hooks/useBookMark.ts             | 70 ------------------
 apps/web/src/hooks/useFollowUser.ts           |  5 +-
 apps/web/src/hooks/useGetImages.ts            |  1 +
 apps/web/src/hooks/useLike.ts                 | 71 -------------------
 apps/web/src/libs/validationAction/index.ts   |  3 +-
 apps/web/src/middleware.ts                    |  7 +-
 apps/web/src/molecules/auth/sign-up/index.tsx |  7 +-
 .../molecules/follower/followers/index.tsx    |  4 +-
 .../follower/user-profile/follow-button.tsx   |  3 +-
 .../molecules/follower/user-profile/index.tsx |  2 +-
 apps/web/src/molecules/home/filter/index.tsx  |  3 +-
 .../src/molecules/infinite-scroll/index.tsx   |  3 +-
 .../src/molecules/language-switcher/index.tsx |  5 +-
 apps/web/src/molecules/nav/index.tsx          |  3 +-
 apps/web/src/molecules/nav/logo.tsx           |  3 +-
 apps/web/src/molecules/post-form/index.tsx    |  6 +-
 .../post-detail/comments/comment-detail.tsx   |  6 +-
 .../post-detail/comments/comment-header.tsx   |  5 +-
 .../post-detail/comments/comment-input.tsx    |  6 +-
 .../posts/post-detail/comments/index.tsx      |  3 +-
 .../post-detail/edit-post-button/index.tsx    |  5 +-
 .../edit-post-button/toggle-post.tsx          |  3 +-
 .../src/molecules/posts/post-detail/index.tsx |  9 +--
 .../post-detail/like-button/LikeButton.tsx    |  5 +-
 .../posts/post-detail/like-button/Likers.tsx  |  5 +-
 .../posts/post-detail/like-button/index.tsx   |  3 +-
 .../posts/post-detail/post-content/index.tsx  |  3 +-
 .../bookmark-button/BookmarkButton.tsx        |  5 +-
 .../posts/post-item/bookmark-button/index.tsx |  3 +-
 .../posts/post-item/comment-button/index.tsx  |  5 +-
 .../src/molecules/posts/post-item/index.tsx   |  7 +-
 .../posts/post-item/post-meta/index.tsx       |  5 +-
 .../src/molecules/posts/post-list/index.tsx   |  3 +-
 apps/web/src/molecules/profile/index.tsx      |  4 +-
 .../web/src/molecules/tag/tag-badge/index.tsx |  5 +-
 .../src/molecules/tag/tag-detail/index.tsx    |  2 +-
 apps/web/src/molecules/tag/tag-item/index.tsx |  6 +-
 apps/web/src/molecules/tag/tag-list/index.tsx |  8 +--
 .../src/molecules/top-tags/NumberIndex.tsx    |  3 +-
 apps/web/src/molecules/top-tags/index.tsx     | 14 +++-
 .../src/molecules/upload/AssetsManagement.tsx |  4 +-
 .../molecules/upload/FileManagerContainer.tsx |  7 +-
 .../src/molecules/upload/ImageSearchBar.tsx   |  3 +-
 .../molecules/upload/UploadImageButton.tsx    |  3 +-
 apps/web/src/molecules/upload/index.tsx       |  5 +-
 .../web/src/molecules/user-nav/LogoutMenu.tsx |  3 +-
 apps/web/src/molecules/user-nav/index.tsx     |  3 +-
 apps/web/src/molecules/user/posts/filter.tsx  |  3 +-
 apps/web/src/utils/navigation.ts              |  3 +-
 apps/web/tsconfig.json                        |  6 +-
 .../20241223151825_rename_tag/migration.sql   | 46 ++++++++++++
 packages/database/prisma/schema.prisma        |  6 +-
 packages/database/src/images/type.ts          |  4 +-
 packages/database/src/index.ts                |  3 +-
 packages/database/src/posts/queries.ts        |  6 +-
 packages/database/src/posts/type.ts           |  2 +-
 packages/database/src/tags/queries.ts         | 61 +++-------------
 packages/database/src/tags/selects.ts         | 23 +++---
 90 files changed, 318 insertions(+), 397 deletions(-)
 delete mode 100644 apps/web/src/hooks/useBookMark.ts
 delete mode 100644 apps/web/src/hooks/useLike.ts
 create mode 100644 packages/database/prisma/migrations/20241223151825_rename_tag/migration.sql

diff --git a/apps/docs/app/page.tsx b/apps/docs/app/page.tsx
index faafb106..b0c4aeaf 100644
--- a/apps/docs/app/page.tsx
+++ b/apps/docs/app/page.tsx
@@ -1,9 +1,8 @@
-import { Button, Header } from "ui"
+import { Button } from "ui"
 
 export default function Page() {
   return (
     <>
-      <Header text="Docs" />
       <Button />
     </>
   )
diff --git a/apps/web/src/actions/auth/index.ts b/apps/web/src/actions/auth/index.ts
index 38933de9..488d14a6 100644
--- a/apps/web/src/actions/auth/index.ts
+++ b/apps/web/src/actions/auth/index.ts
@@ -1,12 +1,13 @@
 "use server"
 
 import bcryptjs from "bcryptjs"
-import { signIn, signOut } from "configs/auth"
 import { Prisma } from "database"
 import { createUser } from "database/src/users/queries"
-import { sendEmail } from "emails"
 import VerifyEmail from "emails/verify-email"
-import { redirect } from "utils/navigation"
+
+import { signIn, signOut } from "@/configs/auth"
+import { sendEmail } from "@/emails"
+import { redirect } from "@/utils/navigation"
 
 import { SignUpDataOutput, signUpSchema } from "./type"
 
diff --git a/apps/web/src/actions/protect/postAction.ts b/apps/web/src/actions/protect/postAction.ts
index bc80cfa4..51cc5aed 100644
--- a/apps/web/src/actions/protect/postAction.ts
+++ b/apps/web/src/actions/protect/postAction.ts
@@ -3,8 +3,6 @@
 import { revalidatePath } from "next/cache"
 import { redirect } from "next/navigation"
 
-import { auth } from "configs/auth"
-import APP_ROUTES from "constants/routes"
 import prisma, {
   createPost,
   PostOnUserType,
@@ -15,11 +13,14 @@ import prisma, {
   updatePost,
   updatePostStatus,
 } from "database"
-import { ActionState, validatedActionWithUser } from "libs/validationAction"
 import { toast } from "react-toastify"
-import { TUserItem, userSelect } from "types/users"
 import * as z from "zod"
 
+import { auth } from "@/configs/auth"
+import APP_ROUTES from "@/constants/routes"
+import { ActionState, validatedActionWithUser } from "@/libs/validationAction"
+import { TUserItem, userSelect } from "@/types/users"
+
 export const getTotalActions = async ({
   postId,
   actionType,
diff --git a/apps/web/src/app/[lang]/(auth)/signin/page.tsx b/apps/web/src/app/[lang]/(auth)/signin/page.tsx
index ce5bf0e7..1aba8fe0 100644
--- a/apps/web/src/app/[lang]/(auth)/signin/page.tsx
+++ b/apps/web/src/app/[lang]/(auth)/signin/page.tsx
@@ -1,10 +1,11 @@
 import React from "react"
 import { redirect } from "next/navigation"
 
-import { auth } from "configs/auth"
-import SignIn from "molecules/auth/sign-in"
 import { getTranslations } from "next-intl/server"
 
+import { auth } from "@/configs/auth"
+import SignIn from "@/molecules/auth/sign-in"
+
 export async function generateMetadata() {
   const t = await getTranslations()
 
diff --git a/apps/web/src/app/[lang]/(auth)/signup/page.tsx b/apps/web/src/app/[lang]/(auth)/signup/page.tsx
index 8061a578..3951aa07 100644
--- a/apps/web/src/app/[lang]/(auth)/signup/page.tsx
+++ b/apps/web/src/app/[lang]/(auth)/signup/page.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 
-import SignUp from "molecules/auth/sign-up"
+import SignUp from "@/molecules/auth/sign-up"
 
 const RegisterPage: React.FC = () => {
   return (
diff --git a/apps/web/src/app/[lang]/(protected)/layout.tsx b/apps/web/src/app/[lang]/(protected)/layout.tsx
index 20694759..89ed9ead 100644
--- a/apps/web/src/app/[lang]/(protected)/layout.tsx
+++ b/apps/web/src/app/[lang]/(protected)/layout.tsx
@@ -1,4 +1,4 @@
-import SidebarItem, { SidebarItemProps } from "molecules/sidebar-item"
+import SidebarItem, { SidebarItemProps } from "@/molecules/sidebar-item"
 
 const SIDE_BAR = [
   {
diff --git a/apps/web/src/app/[lang]/(protected)/user/posts/page.tsx b/apps/web/src/app/[lang]/(protected)/user/posts/page.tsx
index e2b45fc4..a564c061 100644
--- a/apps/web/src/app/[lang]/(protected)/user/posts/page.tsx
+++ b/apps/web/src/app/[lang]/(protected)/user/posts/page.tsx
@@ -1,13 +1,14 @@
 import React from "react"
 import { Metadata } from "next/types"
 
-import { auth } from "configs/auth"
 import { getUser } from "database"
-import PageTitle from "molecules/page-title"
+
+import { auth } from "@/configs/auth"
+import PageTitle from "@/molecules/page-title"
 
 export async function generateMetadata(): Promise<Metadata> {
   const session = await auth()
-  const user = await getUser({ userId: session?.user?.id })
+  const user = await getUser({ where: { id: session?.user?.id } })
 
   return {
     title: `Posts - ${user?.data?.name}`,
diff --git a/apps/web/src/app/[lang]/(protected)/user/profile/page.tsx b/apps/web/src/app/[lang]/(protected)/user/profile/page.tsx
index 89335697..4da926f5 100644
--- a/apps/web/src/app/[lang]/(protected)/user/profile/page.tsx
+++ b/apps/web/src/app/[lang]/(protected)/user/profile/page.tsx
@@ -1,8 +1,8 @@
-import { auth } from "configs/auth"
-import APP_APIS from "constants/apis"
-import PageTitle from "molecules/page-title"
-import Profile from "molecules/profile"
-import { generatePath } from "utils/generatePath"
+import { auth } from "@/configs/auth"
+import APP_APIS from "@/constants/apis"
+import PageTitle from "@/molecules/page-title"
+import Profile from "@/molecules/profile"
+import { generatePath } from "@/utils/generatePath"
 
 export default async function Page() {
   let currentUser = null
diff --git a/apps/web/src/app/[lang]/(protected-post)/user/posts/[postId]/edit/page.tsx b/apps/web/src/app/[lang]/(protected-post)/user/posts/[postId]/edit/page.tsx
index a5819f75..62531c7d 100644
--- a/apps/web/src/app/[lang]/(protected-post)/user/posts/[postId]/edit/page.tsx
+++ b/apps/web/src/app/[lang]/(protected-post)/user/posts/[postId]/edit/page.tsx
@@ -1,7 +1,8 @@
 import { Metadata } from "next"
 
 import { getPost } from "database"
-import PostForm from "molecules/post-form"
+
+import PostForm from "@/molecules/post-form"
 
 export async function generateMetadata(props): Promise<Metadata> {
   const params = await props.params
diff --git a/apps/web/src/app/[lang]/(protected-post)/user/posts/create/page.tsx b/apps/web/src/app/[lang]/(protected-post)/user/posts/create/page.tsx
index fb6b1b6a..85160b19 100644
--- a/apps/web/src/app/[lang]/(protected-post)/user/posts/create/page.tsx
+++ b/apps/web/src/app/[lang]/(protected-post)/user/posts/create/page.tsx
@@ -1,8 +1,8 @@
 import { redirect } from "next/navigation"
 
-import { auth } from "configs/auth"
-import APP_ROUTES from "constants/routes"
-import PostForm from "molecules/post-form"
+import { auth } from "@/configs/auth"
+import APP_ROUTES from "@/constants/routes"
+import PostForm from "@/molecules/post-form"
 
 export const metadata = {
   title: "Create Post",
diff --git a/apps/web/src/app/[lang]/(public)/contact/page.tsx b/apps/web/src/app/[lang]/(public)/contact/page.tsx
index c91e0026..3c10f91e 100644
--- a/apps/web/src/app/[lang]/(public)/contact/page.tsx
+++ b/apps/web/src/app/[lang]/(public)/contact/page.tsx
@@ -1,5 +1,5 @@
-import ContactForm from "molecules/contact-form/contact-form"
-import PageTitle from "molecules/page-title"
+import ContactForm from "@/molecules/contact-form/contact-form"
+import PageTitle from "@/molecules/page-title"
 
 export default async function ContactUs() {
   return (
diff --git a/apps/web/src/app/[lang]/(public)/layout.tsx b/apps/web/src/app/[lang]/(public)/layout.tsx
index dc6414d2..8a325825 100644
--- a/apps/web/src/app/[lang]/(public)/layout.tsx
+++ b/apps/web/src/app/[lang]/(public)/layout.tsx
@@ -1,9 +1,10 @@
 import { BookCopy, HomeIcon, Smartphone, TagIcon } from "lucide-react"
-import SidebarItem, { SidebarItemProps } from "molecules/sidebar-item"
-import SquareAdvertisement from "molecules/square-advertisement"
-import TopTag from "molecules/top-tags"
 import { useTranslations } from "next-intl"
 
+import SidebarItem, { SidebarItemProps } from "@/molecules/sidebar-item"
+import SquareAdvertisement from "@/molecules/square-advertisement"
+import TopTag from "@/molecules/top-tags"
+
 export default function PublicLayout({ children }: { children: React.ReactNode }) {
   const t = useTranslations("common")
 
diff --git a/apps/web/src/app/[lang]/(public)/page.tsx b/apps/web/src/app/[lang]/(public)/page.tsx
index 39a628cb..c228a4ad 100644
--- a/apps/web/src/app/[lang]/(public)/page.tsx
+++ b/apps/web/src/app/[lang]/(public)/page.tsx
@@ -2,10 +2,11 @@ import { Suspense } from "react"
 import { Metadata } from "next"
 
 import { PostStatus } from "database"
-import Filter from "molecules/home/filter"
-import PostList from "molecules/posts/post-list"
 import { PostSkeleton } from "ui"
 
+import Filter from "@/molecules/home/filter"
+import PostList from "@/molecules/posts/post-list"
+
 export const metadata: Metadata = {
   title: "Next-forum - Share the best things",
   description: "Share the best things in the world",
diff --git a/apps/web/src/app/[lang]/(public)/search/page.tsx b/apps/web/src/app/[lang]/(public)/search/page.tsx
index 41863052..4dbb9bd5 100644
--- a/apps/web/src/app/[lang]/(public)/search/page.tsx
+++ b/apps/web/src/app/[lang]/(public)/search/page.tsx
@@ -1,11 +1,12 @@
 import { Metadata } from "next"
 
-import Filter from "molecules/home/filter"
-import SearchBar from "molecules/nav/search-bar"
-import PostList from "molecules/posts/post-list"
 import { getTranslations } from "next-intl/server"
 import { Typography } from "ui"
 
+import Filter from "@/molecules/home/filter"
+import SearchBar from "@/molecules/nav/search-bar"
+import PostList from "@/molecules/posts/post-list"
+
 export async function generateMetadata(props): Promise<Metadata> {
   const searchParams = await props.searchParams
   return {
diff --git a/apps/web/src/app/[lang]/(public)/tags/page.tsx b/apps/web/src/app/[lang]/(public)/tags/page.tsx
index b31d80ff..e874dfae 100644
--- a/apps/web/src/app/[lang]/(public)/tags/page.tsx
+++ b/apps/web/src/app/[lang]/(public)/tags/page.tsx
@@ -1,6 +1,6 @@
-import PageTitle from "molecules/page-title"
-import Filter from "molecules/tag/filter"
-import TagList from "molecules/tag/tag-list"
+import PageTitle from "@/molecules/page-title"
+import Filter from "@/molecules/tag/filter"
+import TagList from "@/molecules/tag/tag-list"
 
 export const metadata = {
   title: "Tags",
diff --git a/apps/web/src/app/[lang]/(public)/ui/page.tsx b/apps/web/src/app/[lang]/(public)/ui/page.tsx
index 2395fddb..5b65cd0e 100644
--- a/apps/web/src/app/[lang]/(public)/ui/page.tsx
+++ b/apps/web/src/app/[lang]/(public)/ui/page.tsx
@@ -1,10 +1,11 @@
 import { Metadata } from "next"
 
 import { LucideHeart } from "lucide-react"
-import PageTitle from "molecules/page-title"
-import TagBadge from "molecules/tag/tag-badge"
 import { Button, Input, Typography } from "ui"
 
+import PageTitle from "@/molecules/page-title"
+import TagBadge from "@/molecules/tag/tag-badge"
+
 export const metadata: Metadata = {
   title: "Next-forum - Page UI",
   description: "UI components for pages",
diff --git a/apps/web/src/app/[lang]/(public-fullwidth)/author/[authorId]/followers/page.tsx b/apps/web/src/app/[lang]/(public-fullwidth)/author/[authorId]/followers/page.tsx
index 2d6950bf..1075cbd1 100644
--- a/apps/web/src/app/[lang]/(public-fullwidth)/author/[authorId]/followers/page.tsx
+++ b/apps/web/src/app/[lang]/(public-fullwidth)/author/[authorId]/followers/page.tsx
@@ -1,11 +1,10 @@
 import { Metadata } from "next"
 
-import APP_APIS from "constants/apis"
-import Followers from "molecules/follower/followers"
-import UserProfile from "molecules/follower/user-profile"
-import { generatePath } from "utils/generatePath"
-
+import APP_APIS from "@/constants/apis"
+import Followers from "@/molecules/follower/followers"
+import UserProfile from "@/molecules/follower/user-profile"
 import { TUserItem } from "@/types/users"
+import { generatePath } from "@/utils/generatePath"
 
 export async function generateMetadata(props: {
   params: Promise<{ authorId: string }>
diff --git a/apps/web/src/app/[lang]/(public-fullwidth)/author/[authorId]/page.tsx b/apps/web/src/app/[lang]/(public-fullwidth)/author/[authorId]/page.tsx
index 37a1117e..3246e396 100644
--- a/apps/web/src/app/[lang]/(public-fullwidth)/author/[authorId]/page.tsx
+++ b/apps/web/src/app/[lang]/(public-fullwidth)/author/[authorId]/page.tsx
@@ -1,6 +1,7 @@
 import { getUser } from "database"
-import UserProfile from "molecules/follower/user-profile"
-import PostList from "molecules/posts/post-list"
+
+import UserProfile from "@/molecules/follower/user-profile"
+import PostList from "@/molecules/posts/post-list"
 
 export const generateMetadata = async (props) => {
   const params = await props.params
diff --git a/apps/web/src/app/[lang]/(public-fullwidth)/posts/[postId]/page.tsx b/apps/web/src/app/[lang]/(public-fullwidth)/posts/[postId]/page.tsx
index ea1f89ed..afdbdd67 100644
--- a/apps/web/src/app/[lang]/(public-fullwidth)/posts/[postId]/page.tsx
+++ b/apps/web/src/app/[lang]/(public-fullwidth)/posts/[postId]/page.tsx
@@ -1,17 +1,18 @@
 import { Metadata } from "next"
 import { notFound } from "next/navigation"
 
-import PostDetail from "molecules/posts/post-detail"
-import Comments from "molecules/posts/post-detail/comments"
-import LikeButton from "molecules/posts/post-detail/like-button"
-import TableOfContents from "molecules/posts/post-detail/table-of-contents"
-import BookmarkButton from "molecules/posts/post-item/bookmark-button"
+import PostDetail from "@/molecules/posts/post-detail"
+import Comments from "@/molecules/posts/post-detail/comments"
+import LikeButton from "@/molecules/posts/post-detail/like-button"
+import TableOfContents from "@/molecules/posts/post-detail/table-of-contents"
+import BookmarkButton from "@/molecules/posts/post-item/bookmark-button"
 
 import "./tocbot.css"
 
-import { auth } from "configs/auth"
 import { getPost, PostStatus } from "database"
-import { TSearchParams } from "types"
+
+import { auth } from "@/configs/auth"
+import { TSearchParams } from "@/types"
 
 export async function generateMetadata(props): Promise<Metadata> {
   const params = await props.params
diff --git a/apps/web/src/app/[lang]/(public-fullwidth)/tags/[tagId]/follower/page.tsx b/apps/web/src/app/[lang]/(public-fullwidth)/tags/[tagId]/follower/page.tsx
index 1f00845d..24a7a05e 100644
--- a/apps/web/src/app/[lang]/(public-fullwidth)/tags/[tagId]/follower/page.tsx
+++ b/apps/web/src/app/[lang]/(public-fullwidth)/tags/[tagId]/follower/page.tsx
@@ -1,6 +1,5 @@
-import TagDetail from "molecules/tag/tag-detail"
-
-import { getTagById } from "@/actions/public/tags"
+// import { getTagById } from "@/actions/public/tags"
+import TagDetail from "@/molecules/tag/tag-detail"
 
 export const metadata = {
   title: "Tags",
@@ -9,11 +8,7 @@ export const metadata = {
 
 export default async function Page(props: { params: Promise<{ tagId: string }> }) {
   const params = await props.params
-  const tag = await getTagById(params?.tagId as string)
+  // const tag = await getTagById(params?.tagId as string)
 
-  return (
-    <div className="grid grid-cols-12 gap-10">
-      <TagDetail tag={tag} />
-    </div>
-  )
+  return <div className="grid grid-cols-12 gap-10">{/* <TagDetail tag={tag} /> */}</div>
 }
diff --git a/apps/web/src/app/[lang]/(public-fullwidth)/tags/[tagId]/page.tsx b/apps/web/src/app/[lang]/(public-fullwidth)/tags/[tagId]/page.tsx
index 8cd1a1f7..f59dbdbf 100644
--- a/apps/web/src/app/[lang]/(public-fullwidth)/tags/[tagId]/page.tsx
+++ b/apps/web/src/app/[lang]/(public-fullwidth)/tags/[tagId]/page.tsx
@@ -1,6 +1,7 @@
 import { getTag } from "database"
-import PostList from "molecules/posts/post-list"
-import TagDetail from "molecules/tag/tag-detail"
+
+import PostList from "@/molecules/posts/post-list"
+import TagDetail from "@/molecules/tag/tag-detail"
 
 export const generateMetadata = async (props) => {
   const params = await props.params
diff --git a/apps/web/src/app/[lang]/layout.tsx b/apps/web/src/app/[lang]/layout.tsx
index da839c8a..c04f7f2c 100644
--- a/apps/web/src/app/[lang]/layout.tsx
+++ b/apps/web/src/app/[lang]/layout.tsx
@@ -4,12 +4,13 @@ import "./globals.css"
 import "ui/dist/index.css"
 import "react-toastify/dist/ReactToastify.css"
 
-import Footer from "molecules/footer"
-import Nav from "molecules/nav"
 import { NextIntlClientProvider, useMessages } from "next-intl"
-import { Providers } from "providers"
 import { ToastContainer } from "react-toastify"
 
+import Footer from "@/molecules/footer"
+import Nav from "@/molecules/nav"
+import { Providers } from "@/providers"
+
 export const metadata = {
   icons: {
     icon: "/assets/logo.png",
diff --git a/apps/web/src/app/api/auth/[...nextauth]/route.ts b/apps/web/src/app/api/auth/[...nextauth]/route.ts
index 15f7a4d8..ecef16ea 100644
--- a/apps/web/src/app/api/auth/[...nextauth]/route.ts
+++ b/apps/web/src/app/api/auth/[...nextauth]/route.ts
@@ -1,3 +1,3 @@
-import { GET, POST } from "configs/auth"
+import { GET, POST } from "@/configs/auth"
 
 export { GET, POST }
diff --git a/apps/web/src/app/api/protected/comment/route.ts b/apps/web/src/app/api/protected/comment/route.ts
index 30004ab6..a5b31b38 100644
--- a/apps/web/src/app/api/protected/comment/route.ts
+++ b/apps/web/src/app/api/protected/comment/route.ts
@@ -1,9 +1,9 @@
 import { NextRequest } from "next/server"
 
-import { auth } from "configs/auth"
 import prisma from "database"
 import { z } from "zod"
 
+import { auth } from "@/configs/auth"
 import { commentSelect } from "@/types/comment"
 
 export async function POST(request: NextRequest) {
diff --git a/apps/web/src/app/api/protected/images/route.ts b/apps/web/src/app/api/protected/images/route.ts
index b820c62b..66a6992b 100644
--- a/apps/web/src/app/api/protected/images/route.ts
+++ b/apps/web/src/app/api/protected/images/route.ts
@@ -2,12 +2,13 @@ import fs from "fs/promises"
 import path from "path"
 import { NextRequest } from "next/server"
 
-import { auth } from "configs/auth"
-import { OrderByField } from "constants/upload"
-import { createImage, getImage, getImages, IImageFilter, ImageOrderBys, OrderBy } from "database"
+import { createImage, getImage, getImages, IImageFilter, ImageOrderBys } from "database"
 import sharp from "sharp"
 import { v4 as uuidv4 } from "uuid"
 
+import { auth } from "@/configs/auth"
+import { OrderByField } from "@/constants/upload"
+
 const OrderMap = {
   [OrderByField.nameAsc]: {
     order: "asc",
@@ -37,9 +38,9 @@ export async function GET(request: NextRequest) {
   const params: IImageFilter = {
     page,
     limit,
-    search,
-    orderBy: OrderMap[order].orderBy as ImageOrderBys,
-    order: OrderMap[order].order as OrderBy,
+    // search,
+    // orderBy: OrderMap[order].orderBy as ImageOrderBys,
+    // order: OrderMap[order].order as OrderBy,
   }
 
   try {
@@ -155,7 +156,11 @@ export async function POST(request: NextRequest) {
       caption: "",
       url: urls[0],
       mime: file.type,
-      userId: session.user.id,
+      user: {
+        connect: {
+          id: session.user.id,
+        },
+      },
     })
 
     return Response.json({
diff --git a/apps/web/src/app/api/protected/tags/route.ts b/apps/web/src/app/api/protected/tags/route.ts
index 4692c1c1..2ed5d144 100644
--- a/apps/web/src/app/api/protected/tags/route.ts
+++ b/apps/web/src/app/api/protected/tags/route.ts
@@ -7,7 +7,7 @@ export async function GET(request: NextRequest) {
   const search = newUrl.searchParams.get("search") || ""
 
   try {
-    const posts = await prisma.tags.findMany({
+    const posts = await prisma.tag.findMany({
       where: {
         name: {
           contains: search,
diff --git a/apps/web/src/app/api/protected/user/[userId]/follower/route.ts b/apps/web/src/app/api/protected/user/[userId]/follower/route.ts
index 6895aac8..51e23e37 100644
--- a/apps/web/src/app/api/protected/user/[userId]/follower/route.ts
+++ b/apps/web/src/app/api/protected/user/[userId]/follower/route.ts
@@ -1,15 +1,16 @@
 import { NextRequest } from "next/server"
 
-import { auth } from "configs/auth"
 import prisma from "database"
 
+import { auth } from "@/configs/auth"
+
 export async function GET(request: NextRequest, props: { params: Promise<{ userId: string }> }) {
   const params = await props.params
   const { userId } = params
 
-  try {
-    const currentUser = await getServerSession()
+  const currentUser = await auth()
 
+  try {
     if (!currentUser) {
       return Response.json({ isFollowing: false }, { status: 200 })
     }
diff --git a/apps/web/src/app/api/protected/user/[userId]/followers/route.ts b/apps/web/src/app/api/protected/user/[userId]/followers/route.ts
index 900bc9bb..b0453568 100644
--- a/apps/web/src/app/api/protected/user/[userId]/followers/route.ts
+++ b/apps/web/src/app/api/protected/user/[userId]/followers/route.ts
@@ -1,9 +1,10 @@
 import { revalidatePath } from "next/cache"
 import { NextRequest } from "next/server"
 
-import { auth } from "configs/auth"
 import prisma from "database"
 
+import { auth } from "@/configs/auth"
+
 export async function GET(request: NextRequest, props: { params: Promise<{ userId: string }> }) {
   const params = await props.params
   const { userId } = params
diff --git a/apps/web/src/app/api/public/post/[postIdOrSlug]/comments/route.ts b/apps/web/src/app/api/public/post/[postIdOrSlug]/comments/route.ts
index c9ed98af..7e6afadd 100644
--- a/apps/web/src/app/api/public/post/[postIdOrSlug]/comments/route.ts
+++ b/apps/web/src/app/api/public/post/[postIdOrSlug]/comments/route.ts
@@ -19,9 +19,9 @@ export async function GET(
     commentOnPostId: params.postIdOrSlug,
   }
 
-  const orderBy: Prisma.CommentOrderByWithRelationAndSearchRelevanceInput = {
-    updatedAt: sort === "new" ? "desc" : "asc",
-  }
+  // const orderBy: Prisma.CommentOrderByWithRelationAndSearchRelevanceInput = {
+  //   updatedAt: sort === "new" ? "desc" : "asc",
+  // }
 
   if (searchTerm) {
     where = {
@@ -41,9 +41,9 @@ export async function GET(
         select: commentSelect,
         take: Number(limit),
         skip: (Number(page) - 1) * Number(limit),
-        orderBy: {
-          ...orderBy,
-        },
+        // orderBy: {
+        //   ...orderBy,
+        // },
       }),
     ])
 
diff --git a/apps/web/src/app/api/public/post/[postIdOrSlug]/route.ts b/apps/web/src/app/api/public/post/[postIdOrSlug]/route.ts
index 1738d6c5..c36d2b50 100644
--- a/apps/web/src/app/api/public/post/[postIdOrSlug]/route.ts
+++ b/apps/web/src/app/api/public/post/[postIdOrSlug]/route.ts
@@ -1,6 +1,6 @@
 import { NextRequest } from "next/server"
 
-import { postSelect } from "@/types/posts"
+import prisma from "database"
 
 export async function GET(
   request: NextRequest,
@@ -22,7 +22,7 @@ export async function GET(
         //   },
         // ],
       },
-      select: postSelect,
+      // select: postSelect,
     })
 
     if (!post)
diff --git a/apps/web/src/app/api/public/tags/route.ts b/apps/web/src/app/api/public/tags/route.ts
index 13dd8bef..efa1337f 100644
--- a/apps/web/src/app/api/public/tags/route.ts
+++ b/apps/web/src/app/api/public/tags/route.ts
@@ -1,8 +1,9 @@
-import { DEFAULT_TAG_PAGE_LIMIT } from "constants"
 import { NextRequest } from "next/server"
 
 import prisma, { Prisma, tagListSelect } from "database"
 
+import { DEFAULT_TAG_PAGE_LIMIT } from "@/constants"
+
 export async function GET(request: NextRequest) {
   const newUrl = request.nextUrl.clone()
   const searchTerm = newUrl.searchParams.get("query") || ""
@@ -19,12 +20,12 @@ export async function GET(request: NextRequest) {
         mode: "insensitive",
       },
     },
-  } as Prisma.TagsFindManyArgs
+  } as Prisma.TagFindManyArgs
 
   try {
     const [data, total] = await Promise.all([
-      prisma.tags.findMany(query),
-      prisma.tags.count({
+      prisma.tag.findMany(query),
+      prisma.tag.count({
         where: query.where,
       }),
     ])
diff --git a/apps/web/src/emails/index.ts b/apps/web/src/emails/index.ts
index abc83c6f..aaf619e0 100644
--- a/apps/web/src/emails/index.ts
+++ b/apps/web/src/emails/index.ts
@@ -1,10 +1,11 @@
 import { ReactElement } from "react"
 
 import { render } from "@react-email/components"
-import { resend } from "libs/resend"
 import nodemailer from "nodemailer"
 import { CreateEmailOptions } from "resend"
 
+import { resend } from "@/libs/resend"
+
 // Send email using SMTP (Recommended for local development)
 const sendEmailViaSMTP = async ({
   email,
diff --git a/apps/web/src/hooks/useBookMark.ts b/apps/web/src/hooks/useBookMark.ts
deleted file mode 100644
index 3d5747f0..00000000
--- a/apps/web/src/hooks/useBookMark.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { useState } from "react"
-
-import APP_APIS from "constants/apis"
-import { getSession } from "next-auth/react"
-import { toast } from "react-toastify"
-import { generatePath } from "utils/generatePath"
-
-import { TPostItem } from "@/types/posts"
-
-interface BookMarkProps {
-  post: TPostItem
-}
-
-interface BookMarkState {
-  isLoading: boolean
-  totalBookMark: number
-  isBookMarked: boolean
-  bookMark: () => Promise<void>
-}
-
-const useBookMark = ({ post }: BookMarkProps): BookMarkState => {
-  const [isLoading, setIsLoading] = useState(false)
-
-  const [isBookMarked, setIsBookMarked] = useState(() => {
-    return post?.postOnUser?.some(
-      (user) => user?.userId === post?.author?.id && user?.type === "BOOKMARK"
-    )
-  })
-
-  const [totalBookMark, setTotalBookMark] = useState(
-    post?.postOnUser?.filter((user) => user?.type === "BOOKMARK").length
-  )
-
-  const bookMark = async () => {
-    const session = await getSession()
-
-    if (!session) {
-      toast.error("You must be logged in to like a post")
-      return
-    }
-
-    try {
-      setIsLoading(true)
-      await fetch(generatePath(APP_APIS.protected.post.ACTIONS, { postId: post?.id }), {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          action: isBookMarked ? "UNBOOKMARK" : "BOOKMARK",
-        }),
-      })
-      setIsBookMarked((prev) => !prev)
-      setTotalBookMark((prev) => (isBookMarked ? prev - 1 : prev + 1))
-    } catch (error) {
-      toast.error(error.message)
-    } finally {
-      setIsLoading(false)
-    }
-  }
-
-  return {
-    totalBookMark,
-    isBookMarked,
-    isLoading,
-    bookMark,
-  }
-}
-
-export default useBookMark
diff --git a/apps/web/src/hooks/useFollowUser.ts b/apps/web/src/hooks/useFollowUser.ts
index d5a30563..cf5108ea 100644
--- a/apps/web/src/hooks/useFollowUser.ts
+++ b/apps/web/src/hooks/useFollowUser.ts
@@ -3,9 +3,10 @@
 import { useEffect, useState } from "react"
 import { useParams, useRouter } from "next/navigation"
 
-import APP_APIS from "constants/apis"
 import { toast } from "react-toastify"
-import { generatePath } from "utils/generatePath"
+
+import APP_APIS from "@/constants/apis"
+import { generatePath } from "@/utils/generatePath"
 
 const useFollowUser = () => {
   const [isLoading, setIsLoading] = useState<boolean>(false)
diff --git a/apps/web/src/hooks/useGetImages.ts b/apps/web/src/hooks/useGetImages.ts
index 1d6ae2e0..4eb8d41f 100644
--- a/apps/web/src/hooks/useGetImages.ts
+++ b/apps/web/src/hooks/useGetImages.ts
@@ -1,3 +1,4 @@
+// @ts-nocheck
 import { useMemo } from "react"
 
 import { IImageFilter, IListImageResponse } from "database"
diff --git a/apps/web/src/hooks/useLike.ts b/apps/web/src/hooks/useLike.ts
deleted file mode 100644
index c9bb89e7..00000000
--- a/apps/web/src/hooks/useLike.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { useState } from "react"
-
-import APP_APIS from "constants/apis"
-import { getSession } from "next-auth/react"
-import { toast } from "react-toastify"
-import { generatePath } from "utils/generatePath"
-
-import { TPostItem } from "@/types/posts"
-
-type UseLikeProps = {
-  post: TPostItem
-}
-
-type UseLikeReturn = {
-  isLoading: boolean
-  totalLike: number | undefined
-  isLiked: boolean | undefined
-  likePost: () => Promise<void>
-}
-
-const useLike = ({ post }: UseLikeProps): UseLikeReturn => {
-  const [isLoading, setIsLoading] = useState(false)
-
-  const [totalLike, setTotalLike] = useState(
-    post?.postOnUser?.filter((user) => user?.type === "LIKE").length
-  )
-
-  const [isLiked, setIsLiked] = useState(() => {
-    return post?.postOnUser?.some(
-      (user) => user?.userId === post?.author?.id && user?.type === "LIKE"
-    )
-  })
-
-  const likePost = async () => {
-    const session = await getSession()
-
-    if (!session) {
-      toast.error("You must be logged in to like a post")
-      return
-    }
-
-    try {
-      setIsLoading(true)
-      await fetch(generatePath(APP_APIS.protected.post.ACTIONS, { postId: post?.id }), {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          action: isLiked ? "UNLIKE" : "LIKE",
-          postId: post?.id,
-        }),
-      })
-        .then((res) => res.json())
-        .catch((error) => {
-          throw new Error(error.message)
-        })
-
-      setIsLiked((prev) => !prev)
-      setTotalLike((prev) => (isLiked ? prev - 1 : prev + 1))
-    } catch (error) {
-      toast.error(error.message)
-    } finally {
-      setIsLoading(false)
-    }
-  }
-
-  return { totalLike, isLiked, isLoading, likePost }
-}
-
-export default useLike
diff --git a/apps/web/src/libs/validationAction/index.ts b/apps/web/src/libs/validationAction/index.ts
index b676614f..623d79e3 100644
--- a/apps/web/src/libs/validationAction/index.ts
+++ b/apps/web/src/libs/validationAction/index.ts
@@ -1,8 +1,9 @@
 // Based on https://next-saas-start.vercel.app/
-import { auth } from "configs/auth"
 import { Session } from "next-auth"
 import { z } from "zod"
 
+import { auth } from "@/configs/auth"
+
 export type ActionState = {
   error?: string
   success?: string
diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts
index c6bb808c..49c54306 100644
--- a/apps/web/src/middleware.ts
+++ b/apps/web/src/middleware.ts
@@ -1,10 +1,11 @@
 import { NextRequest, NextResponse } from "next/server"
 
-import { auth } from "configs/auth"
-import { locales } from "i18n"
-import { NextAuthRequest } from "next-auth/lib"
 import createIntlMiddleware from "next-intl/middleware"
 
+import { auth } from "@/configs/auth"
+
+import { locales } from "./i18n"
+
 const handleI18nRouting = createIntlMiddleware({
   locales,
   localePrefix: "as-needed",
diff --git a/apps/web/src/molecules/auth/sign-up/index.tsx b/apps/web/src/molecules/auth/sign-up/index.tsx
index b7d8f1cb..8abf983d 100644
--- a/apps/web/src/molecules/auth/sign-up/index.tsx
+++ b/apps/web/src/molecules/auth/sign-up/index.tsx
@@ -17,11 +17,10 @@ import {
   Input,
   Typography,
 } from "ui"
-import { redirect } from "utils/navigation"
-import { z } from "zod"
 
 import { signUp } from "@/actions/auth"
 import { SignUpDataInput, signUpSchema } from "@/actions/auth/type"
+import { redirect } from "@/utils/navigation"
 
 import AuthForm from "../auth-form"
 
@@ -56,9 +55,9 @@ export default function SignUp() {
     }
     if (error.fieldErrors) {
       Object?.entries(error.fieldErrors)?.forEach(([field, message]) => {
-        setError(field, {
+        setError(field as keyof SignUpDataInput, {
           type: "manual",
-          message,
+          message: message.at(0),
         })
       })
       return
diff --git a/apps/web/src/molecules/follower/followers/index.tsx b/apps/web/src/molecules/follower/followers/index.tsx
index 1bd98787..ec191ed0 100644
--- a/apps/web/src/molecules/follower/followers/index.tsx
+++ b/apps/web/src/molecules/follower/followers/index.tsx
@@ -1,7 +1,7 @@
 import React from "react"
 
-import APP_APIS from "constants/apis"
-import { generateApi } from "utils/generatePath"
+import APP_APIS from "@/constants/apis"
+import { generateApi } from "@/utils/generatePath"
 
 import FollowerItem from "./follower-item"
 
diff --git a/apps/web/src/molecules/follower/user-profile/follow-button.tsx b/apps/web/src/molecules/follower/user-profile/follow-button.tsx
index ed65a916..d4ebc3d5 100644
--- a/apps/web/src/molecules/follower/user-profile/follow-button.tsx
+++ b/apps/web/src/molecules/follower/user-profile/follow-button.tsx
@@ -3,11 +3,12 @@
 import React from "react"
 import Link from "next/link"
 
-import useFollowUser from "hooks/useFollowUser"
 import { useSession } from "next-auth/react"
 import { useTranslations } from "next-intl"
 import { Button, buttonVariants, cn } from "ui"
 
+import useFollowUser from "@/hooks/useFollowUser"
+
 const FollowButton: React.FC<{ authorId: string }> = ({ authorId }: { authorId: string }) => {
   const t = useTranslations()
   const session = useSession()
diff --git a/apps/web/src/molecules/follower/user-profile/index.tsx b/apps/web/src/molecules/follower/user-profile/index.tsx
index 5e4af810..f512f5cc 100644
--- a/apps/web/src/molecules/follower/user-profile/index.tsx
+++ b/apps/web/src/molecules/follower/user-profile/index.tsx
@@ -13,7 +13,7 @@ export type UserProfileProps = {
 
 export async function UserProfile({ authorId }: UserProfileProps) {
   const t = await getTranslations()
-  const { data: author, error } = await getUser({ userId: authorId })
+  const { data: author, error } = await getUser({ where: { id: authorId } })
 
   if (error) {
     return notFound()
diff --git a/apps/web/src/molecules/home/filter/index.tsx b/apps/web/src/molecules/home/filter/index.tsx
index 5cc987df..69f10f01 100644
--- a/apps/web/src/molecules/home/filter/index.tsx
+++ b/apps/web/src/molecules/home/filter/index.tsx
@@ -5,7 +5,8 @@ import { usePathname, useRouter, useSearchParams } from "next/navigation"
 
 import { FilterValues, PeriodValues } from "database"
 import { cn } from "ui"
-import { capitalizeFirstLetter } from "utils/text"
+
+import { capitalizeFirstLetter } from "@/utils/text"
 
 import { FilterItem } from "./filter-item"
 
diff --git a/apps/web/src/molecules/infinite-scroll/index.tsx b/apps/web/src/molecules/infinite-scroll/index.tsx
index 8299b09b..7d18fbf2 100644
--- a/apps/web/src/molecules/infinite-scroll/index.tsx
+++ b/apps/web/src/molecules/infinite-scroll/index.tsx
@@ -1,8 +1,9 @@
 "use client"
 
-import useInfiniteScroll from "hooks/useInfinityScroll"
 import { Loader } from "lucide-react"
 
+import useInfiniteScroll from "@/hooks/useInfinityScroll"
+
 interface InfiniteScrollProps {
   containerClassName?: string
   children: React.ReactNode
diff --git a/apps/web/src/molecules/language-switcher/index.tsx b/apps/web/src/molecules/language-switcher/index.tsx
index 7b887fcd..e786502b 100644
--- a/apps/web/src/molecules/language-switcher/index.tsx
+++ b/apps/web/src/molecules/language-switcher/index.tsx
@@ -3,10 +3,11 @@
 import { useTransition } from "react"
 import { useParams } from "next/navigation"
 
-import { locales } from "i18n"
 import { useTranslations } from "next-intl"
 import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from "ui"
-import { usePathname, useRouter } from "utils/navigation"
+
+import { locales } from "@/i18n"
+import { usePathname, useRouter } from "@/utils/navigation"
 
 const LanguageSwitcher = () => {
   const router = useRouter()
diff --git a/apps/web/src/molecules/nav/index.tsx b/apps/web/src/molecules/nav/index.tsx
index df9e52a0..63e720f3 100644
--- a/apps/web/src/molecules/nav/index.tsx
+++ b/apps/web/src/molecules/nav/index.tsx
@@ -1,10 +1,11 @@
 import Link from "next/link"
 
-import { auth } from "configs/auth"
 import { Edit } from "lucide-react"
 import { getTranslations } from "next-intl/server"
 import { buttonVariants, cn } from "ui"
 
+import { auth } from "@/configs/auth"
+
 import { UserNav } from "../user-nav"
 import Logo from "./logo"
 import SearchBar from "./search-bar"
diff --git a/apps/web/src/molecules/nav/logo.tsx b/apps/web/src/molecules/nav/logo.tsx
index 1364ac0e..55f5e8d8 100644
--- a/apps/web/src/molecules/nav/logo.tsx
+++ b/apps/web/src/molecules/nav/logo.tsx
@@ -3,9 +3,10 @@
 import React from "react"
 import Link from "next/link"
 
-import { bebasNeue } from "font"
 import { cn } from "ui"
 
+import { bebasNeue } from "@/font"
+
 const Logo: React.FC = () => {
   return (
     <Link href="/">
diff --git a/apps/web/src/molecules/post-form/index.tsx b/apps/web/src/molecules/post-form/index.tsx
index 018037c3..84e75ec3 100644
--- a/apps/web/src/molecules/post-form/index.tsx
+++ b/apps/web/src/molecules/post-form/index.tsx
@@ -6,10 +6,8 @@ import Image from "next/image"
 import Link from "next/link"
 
 import { zodResolver } from "@hookform/resolvers/zod"
-import APP_ROUTES from "constants/routes"
 import { Prisma, TImage, TPostItem } from "database"
 import { Upload as UploadIcon, X } from "lucide-react"
-import InputTitle from "molecules/input-title"
 import { useSession } from "next-auth/react"
 import { useTranslations } from "next-intl"
 import { Controller, useForm } from "react-hook-form"
@@ -18,6 +16,8 @@ import { Button, buttonVariants, cn, Label, LoadingButton, Typography } from "ui
 import z from "zod"
 
 import { handleCreateUpdatePost } from "@/actions/protect/postAction"
+import APP_ROUTES from "@/constants/routes"
+import InputTitle from "@/molecules/input-title"
 
 import Upload from "../upload"
 
@@ -28,7 +28,7 @@ const PostForm = ({ post: postData }: { post?: TPostItem }) => {
 
   const t = useTranslations()
   const session = useSession()
-  const [image, setImage] = useState<TImage | null>(postData?.Image)
+  const [image, setImage] = useState(postData?.image)
 
   const userId = session?.data?.user?.id
 
diff --git a/apps/web/src/molecules/posts/post-detail/comments/comment-detail.tsx b/apps/web/src/molecules/posts/post-detail/comments/comment-detail.tsx
index 170be3b5..c8cdd41a 100644
--- a/apps/web/src/molecules/posts/post-detail/comments/comment-detail.tsx
+++ b/apps/web/src/molecules/posts/post-detail/comments/comment-detail.tsx
@@ -3,12 +3,12 @@
 import React from "react"
 import Link from "next/link"
 
-import APP_ROUTES from "constants/routes"
 import dayjs from "dayjs"
-import { Avatar, AvatarFallback, AvatarImage, Button, Typography } from "ui"
-import { generatePath } from "utils/generatePath"
+import { Avatar, AvatarFallback, AvatarImage, Typography } from "ui"
 
+import APP_ROUTES from "@/constants/routes"
 import { TCommentItem } from "@/types/comment"
+import { generatePath } from "@/utils/generatePath"
 
 interface CommentItemProps {
   comment: TCommentItem
diff --git a/apps/web/src/molecules/posts/post-detail/comments/comment-header.tsx b/apps/web/src/molecules/posts/post-detail/comments/comment-header.tsx
index 7e4d7e6f..7fa3a73e 100644
--- a/apps/web/src/molecules/posts/post-detail/comments/comment-header.tsx
+++ b/apps/web/src/molecules/posts/post-detail/comments/comment-header.tsx
@@ -4,8 +4,6 @@ import React from "react"
 import { usePathname, useRouter, useSearchParams } from "next/navigation"
 
 import { TPostItem } from "database"
-import { GetDataSuccessType } from "types"
-import { TCommentItem } from "types/comment"
 import {
   Select,
   SelectContent,
@@ -16,6 +14,9 @@ import {
   Typography,
 } from "ui"
 
+import { GetDataSuccessType } from "@/types"
+import { TCommentItem } from "@/types/comment"
+
 type CommentHeaderProps = {
   post: TPostItem
   comments: GetDataSuccessType<TCommentItem[]>
diff --git a/apps/web/src/molecules/posts/post-detail/comments/comment-input.tsx b/apps/web/src/molecules/posts/post-detail/comments/comment-input.tsx
index 1a408df5..b6255a85 100644
--- a/apps/web/src/molecules/posts/post-detail/comments/comment-input.tsx
+++ b/apps/web/src/molecules/posts/post-detail/comments/comment-input.tsx
@@ -3,8 +3,6 @@
 import React, { useState } from "react"
 import Link from "next/link"
 
-import APP_APIS from "constants/apis"
-import APP_ROUTES from "constants/routes"
 import { useSession } from "next-auth/react"
 import { toast } from "react-toastify"
 import {
@@ -17,9 +15,11 @@ import {
   Textarea,
   Typography,
 } from "ui"
-import { generatePath } from "utils/generatePath"
 
+import APP_APIS from "@/constants/apis"
+import APP_ROUTES from "@/constants/routes"
 import { TCommentItem } from "@/types/comment"
+import { generatePath } from "@/utils/generatePath"
 
 interface CommentInputProps {
   postId: string
diff --git a/apps/web/src/molecules/posts/post-detail/comments/index.tsx b/apps/web/src/molecules/posts/post-detail/comments/index.tsx
index 5e46a512..8a6645ef 100644
--- a/apps/web/src/molecules/posts/post-detail/comments/index.tsx
+++ b/apps/web/src/molecules/posts/post-detail/comments/index.tsx
@@ -1,8 +1,9 @@
 import React from "react"
 
+import { TPostItem } from "database"
+
 import { GetDataSuccessType, TSearchParams } from "@/types"
 import { TCommentItem } from "@/types/comment"
-import { TPostItem } from "@/types/posts"
 
 import CommentHeader from "./comment-header"
 import CommentList from "./comment-list"
diff --git a/apps/web/src/molecules/posts/post-detail/edit-post-button/index.tsx b/apps/web/src/molecules/posts/post-detail/edit-post-button/index.tsx
index 4e62b7a5..c91bcafe 100644
--- a/apps/web/src/molecules/posts/post-detail/edit-post-button/index.tsx
+++ b/apps/web/src/molecules/posts/post-detail/edit-post-button/index.tsx
@@ -1,13 +1,14 @@
 import React from "react"
 import Link from "next/link"
 
-import { auth } from "configs/auth"
-import APP_ROUTES from "constants/routes"
 import { TPostItem } from "database"
 import { LucideEdit } from "lucide-react"
 import { getTranslations } from "next-intl/server"
 import { buttonVariants, cn } from "ui"
 
+import { auth } from "@/configs/auth"
+import APP_ROUTES from "@/constants/routes"
+
 import TogglePost from "./toggle-post"
 
 interface EditPostButtonProps {
diff --git a/apps/web/src/molecules/posts/post-detail/edit-post-button/toggle-post.tsx b/apps/web/src/molecules/posts/post-detail/edit-post-button/toggle-post.tsx
index 9372622d..37c423ca 100644
--- a/apps/web/src/molecules/posts/post-detail/edit-post-button/toggle-post.tsx
+++ b/apps/web/src/molecules/posts/post-detail/edit-post-button/toggle-post.tsx
@@ -2,11 +2,12 @@
 
 import { useActionState } from "react"
 
-import { onTogglePost } from "actions/protect/postAction"
 import { PostStatus, TPostItem } from "database"
 import { useTranslations } from "next-intl"
 import { Button } from "ui"
 
+import { onTogglePost } from "@/actions/protect/postAction"
+
 export default function TogglePost({ post }: { post: TPostItem }) {
   const t = useTranslations()
 
diff --git a/apps/web/src/molecules/posts/post-detail/index.tsx b/apps/web/src/molecules/posts/post-detail/index.tsx
index bbbe5e81..47d10fa0 100644
--- a/apps/web/src/molecules/posts/post-detail/index.tsx
+++ b/apps/web/src/molecules/posts/post-detail/index.tsx
@@ -1,11 +1,12 @@
 import Link from "next/link"
 
-import APP_ROUTES from "constants/routes"
 import { TPostItem } from "database"
-import TagListMeta from "molecules/tag/tag-list-meta"
-import PostMeta from "molecules/user/posts/post-meta"
 import { Typography } from "ui"
-import { generatePath } from "utils/generatePath"
+
+import APP_ROUTES from "@/constants/routes"
+import TagListMeta from "@/molecules/tag/tag-list-meta"
+import PostMeta from "@/molecules/user/posts/post-meta"
+import { generatePath } from "@/utils/generatePath"
 
 import EditPostButton from "./edit-post-button"
 import PostContent from "./post-content"
diff --git a/apps/web/src/molecules/posts/post-detail/like-button/LikeButton.tsx b/apps/web/src/molecules/posts/post-detail/like-button/LikeButton.tsx
index 2f46a353..b171ce3b 100644
--- a/apps/web/src/molecules/posts/post-detail/like-button/LikeButton.tsx
+++ b/apps/web/src/molecules/posts/post-detail/like-button/LikeButton.tsx
@@ -2,13 +2,14 @@
 
 import { useActionState } from "react"
 
-import { onToggleLikePostWithUser, ToggleLikePostSchemaType } from "actions/protect/postAction"
 import { TPostItem } from "database"
-import { ActionState } from "libs/validationAction"
 import { Heart } from "lucide-react"
 import { useTranslations } from "next-intl"
 import { Button, cn, Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "ui"
 
+import { onToggleLikePostWithUser, ToggleLikePostSchemaType } from "@/actions/protect/postAction"
+import { ActionState } from "@/libs/validationAction"
+
 type LikeButtonProps = {
   post: TPostItem
   totalLike: number
diff --git a/apps/web/src/molecules/posts/post-detail/like-button/Likers.tsx b/apps/web/src/molecules/posts/post-detail/like-button/Likers.tsx
index 3d2870be..fa8d845e 100644
--- a/apps/web/src/molecules/posts/post-detail/like-button/Likers.tsx
+++ b/apps/web/src/molecules/posts/post-detail/like-button/Likers.tsx
@@ -1,11 +1,12 @@
 import React, { use } from "react"
 
-import { getLikers } from "actions/protect/postAction"
 import { TPostItem } from "database"
-import FollowerItem from "molecules/follower/followers/follower-item"
 import { useTranslations } from "next-intl"
 import { Button, Dialog, DialogContent, DialogHeader, DialogTrigger, Typography } from "ui"
 
+import { getLikers } from "@/actions/protect/postAction"
+import FollowerItem from "@/molecules/follower/followers/follower-item"
+
 interface LikerProps {
   totalLike: number
   post: TPostItem
diff --git a/apps/web/src/molecules/posts/post-detail/like-button/index.tsx b/apps/web/src/molecules/posts/post-detail/like-button/index.tsx
index 0618b525..26b5f50e 100644
--- a/apps/web/src/molecules/posts/post-detail/like-button/index.tsx
+++ b/apps/web/src/molecules/posts/post-detail/like-button/index.tsx
@@ -1,6 +1,7 @@
-import { getTotalActions } from "actions/protect/postAction"
 import { PostOnUserType, TPostItem } from "database"
 
+import { getTotalActions } from "@/actions/protect/postAction"
+
 import LikeButton from "./LikeButton"
 import Liker from "./Likers"
 
diff --git a/apps/web/src/molecules/posts/post-detail/post-content/index.tsx b/apps/web/src/molecules/posts/post-detail/post-content/index.tsx
index d276a555..db06b235 100644
--- a/apps/web/src/molecules/posts/post-detail/post-content/index.tsx
+++ b/apps/web/src/molecules/posts/post-detail/post-content/index.tsx
@@ -1,9 +1,8 @@
 import React from "react"
 
+import { TPostItem } from "database"
 import reactHtmlParser from "react-html-parser"
 
-import { TPostItem } from "@/types/posts"
-
 interface PostContentProps {
   post: TPostItem
 }
diff --git a/apps/web/src/molecules/posts/post-item/bookmark-button/BookmarkButton.tsx b/apps/web/src/molecules/posts/post-item/bookmark-button/BookmarkButton.tsx
index 4d100b1f..4fd7b9b4 100644
--- a/apps/web/src/molecules/posts/post-item/bookmark-button/BookmarkButton.tsx
+++ b/apps/web/src/molecules/posts/post-item/bookmark-button/BookmarkButton.tsx
@@ -2,12 +2,13 @@
 
 import React, { useActionState } from "react"
 
-import { handleBookmark } from "actions/protect/postAction"
 import { TPostItem } from "database"
-import { ActionState } from "libs/validationAction"
 import { BookmarkCheck, BookmarkIcon } from "lucide-react"
 import { Button, cn, Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "ui"
 
+import { handleBookmark } from "@/actions/protect/postAction"
+import { ActionState } from "@/libs/validationAction"
+
 interface BookmarkButtonProps {
   totalBookmark: number
   isBookmarked: boolean
diff --git a/apps/web/src/molecules/posts/post-item/bookmark-button/index.tsx b/apps/web/src/molecules/posts/post-item/bookmark-button/index.tsx
index 900fa608..84b96c9d 100644
--- a/apps/web/src/molecules/posts/post-item/bookmark-button/index.tsx
+++ b/apps/web/src/molecules/posts/post-item/bookmark-button/index.tsx
@@ -1,8 +1,9 @@
 import React from "react"
 
-import { getTotalActions } from "actions/protect/postAction"
 import { PostOnUserType, TPostItem } from "database"
 
+import { getTotalActions } from "@/actions/protect/postAction"
+
 import BookmarkButton from "./BookmarkButton"
 
 type BookmarkButtonContainerProps = {
diff --git a/apps/web/src/molecules/posts/post-item/comment-button/index.tsx b/apps/web/src/molecules/posts/post-item/comment-button/index.tsx
index 4ed9471d..92669011 100644
--- a/apps/web/src/molecules/posts/post-item/comment-button/index.tsx
+++ b/apps/web/src/molecules/posts/post-item/comment-button/index.tsx
@@ -1,11 +1,12 @@
 import React from "react"
 import Link from "next/link"
 
-import APP_ROUTES from "constants/routes"
 import { TPostItem } from "database"
 import { MessageSquareCode } from "lucide-react"
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "ui"
-import { generatePath } from "utils/generatePath"
+
+import APP_ROUTES from "@/constants/routes"
+import { generatePath } from "@/utils/generatePath"
 
 type CommentButtonProps = {
   post: TPostItem
diff --git a/apps/web/src/molecules/posts/post-item/index.tsx b/apps/web/src/molecules/posts/post-item/index.tsx
index 25015c35..b559f204 100644
--- a/apps/web/src/molecules/posts/post-item/index.tsx
+++ b/apps/web/src/molecules/posts/post-item/index.tsx
@@ -1,12 +1,13 @@
 import Image from "next/image"
 import Link from "next/link"
 
-import APP_ROUTES from "constants/routes"
 import { TPostItem } from "database"
-import TagListMeta from "molecules/tag/tag-list-meta"
 import { useTranslations } from "next-intl"
 import { Typography } from "ui"
-import { generatePath } from "utils/generatePath"
+
+import APP_ROUTES from "@/constants/routes"
+import TagListMeta from "@/molecules/tag/tag-list-meta"
+import { generatePath } from "@/utils/generatePath"
 
 import CommentButton from "./comment-button"
 import LikeButton from "./like-button"
diff --git a/apps/web/src/molecules/posts/post-item/post-meta/index.tsx b/apps/web/src/molecules/posts/post-item/post-meta/index.tsx
index e3bc1dad..3842c624 100644
--- a/apps/web/src/molecules/posts/post-item/post-meta/index.tsx
+++ b/apps/web/src/molecules/posts/post-item/post-meta/index.tsx
@@ -1,10 +1,11 @@
 import React from "react"
 import Link from "next/link"
 
-import APP_ROUTES from "constants/routes"
 import { TPostItem } from "database"
 import dayjs from "dayjs"
-import { generatePath } from "utils/generatePath"
+
+import APP_ROUTES from "@/constants/routes"
+import { generatePath } from "@/utils/generatePath"
 
 type PostMetaProps = {
   post: TPostItem
diff --git a/apps/web/src/molecules/posts/post-list/index.tsx b/apps/web/src/molecules/posts/post-list/index.tsx
index c19e4bd4..95ec0594 100644
--- a/apps/web/src/molecules/posts/post-list/index.tsx
+++ b/apps/web/src/molecules/posts/post-list/index.tsx
@@ -4,9 +4,10 @@ import React, { useCallback, useState } from "react"
 import { useParams } from "next/navigation"
 
 import { getPosts, TGetPostsRequest, TPostItem } from "database"
-import InfiniteScroll from "molecules/infinite-scroll"
 import { cn } from "ui"
 
+import InfiniteScroll from "@/molecules/infinite-scroll"
+
 import PostItem from "../post-item"
 
 export type TPostListProps = {
diff --git a/apps/web/src/molecules/profile/index.tsx b/apps/web/src/molecules/profile/index.tsx
index 5f340f09..9156c4f8 100644
--- a/apps/web/src/molecules/profile/index.tsx
+++ b/apps/web/src/molecules/profile/index.tsx
@@ -2,12 +2,12 @@
 
 import React from "react"
 
-import APP_APIS from "constants/apis"
 import { useForm } from "react-hook-form"
 import { Button, Input, Label, Textarea, Typography } from "ui"
-import { generatePath } from "utils/generatePath"
 
+import APP_APIS from "@/constants/apis"
 import { TUserItem } from "@/types/users"
+import { generatePath } from "@/utils/generatePath"
 
 type ProfileType = {
   user: TUserItem
diff --git a/apps/web/src/molecules/tag/tag-badge/index.tsx b/apps/web/src/molecules/tag/tag-badge/index.tsx
index 492a233f..0d052375 100644
--- a/apps/web/src/molecules/tag/tag-badge/index.tsx
+++ b/apps/web/src/molecules/tag/tag-badge/index.tsx
@@ -1,10 +1,11 @@
 import React from "react"
 import Link from "next/link"
 
-import APP_ROUTES from "constants/routes"
 import { TTagItem } from "database"
 import { Badge } from "ui"
-import { generatePath } from "utils/generatePath"
+
+import APP_ROUTES from "@/constants/routes"
+import { generatePath } from "@/utils/generatePath"
 
 interface TagBadgeProps {
   tag: {
diff --git a/apps/web/src/molecules/tag/tag-detail/index.tsx b/apps/web/src/molecules/tag/tag-detail/index.tsx
index 5a75c14e..e57d16d3 100644
--- a/apps/web/src/molecules/tag/tag-detail/index.tsx
+++ b/apps/web/src/molecules/tag/tag-detail/index.tsx
@@ -32,7 +32,7 @@ export default async function TagDetail({ tagIdOrSlug }: { tagIdOrSlug: string }
             </Typography>
             <div className="mt-4 flex w-full flex-1 divide-x">
               <div className="flex flex-1 flex-col items-center justify-center">
-                <div className="font-bold text-slate-800">{tag?._count?.tagOnPost || 0}</div>
+                <div className="font-bold text-slate-800">{0}</div>
                 <div className="text-gray-400 hover:underline">
                   <Link href={`/tags/${tag.id}`}>posts</Link>
                 </div>
diff --git a/apps/web/src/molecules/tag/tag-item/index.tsx b/apps/web/src/molecules/tag/tag-item/index.tsx
index b1b187ed..86dd51de 100644
--- a/apps/web/src/molecules/tag/tag-item/index.tsx
+++ b/apps/web/src/molecules/tag/tag-item/index.tsx
@@ -1,10 +1,10 @@
 import Link from "next/link"
 
-import { TTagItem } from "database"
+import { TTagListItem } from "database"
 import { useTranslations } from "next-intl"
 import { Card, CardContent, CardHeader, Typography } from "ui"
 
-export default function TagItem({ tag }: { tag: TTagItem }) {
+export default function TagItem({ tag }: { tag: TTagListItem }) {
   const t = useTranslations("common")
 
   return (
@@ -28,7 +28,7 @@ export default function TagItem({ tag }: { tag: TTagItem }) {
               variant="span"
               className="font-semibold"
             >
-              {t("post_plural", { total: tag?._count?.tagOnPost || 0 })}
+              {tag?.description}
             </Typography>
           </div>
         </CardContent>
diff --git a/apps/web/src/molecules/tag/tag-list/index.tsx b/apps/web/src/molecules/tag/tag-list/index.tsx
index ed85e64b..115674d6 100644
--- a/apps/web/src/molecules/tag/tag-list/index.tsx
+++ b/apps/web/src/molecules/tag/tag-list/index.tsx
@@ -3,15 +3,16 @@
 import React, { useCallback, useState } from "react"
 import { useParams } from "next/navigation"
 
-import { getTags, TTagItem } from "database"
-import InfiniteScroll from "molecules/infinite-scroll"
+import { getTags, TTagListItem } from "database"
+
+import InfiniteScroll from "@/molecules/infinite-scroll"
 
 import TagItem from "../tag-item"
 
 const TagList: React.FC = () => {
   const searchParams = useParams()
   const [isLoading, setIsLoading] = useState(false)
-  const [tags, setTags] = useState<TTagItem[]>([])
+  const [tags, setTags] = useState<TTagListItem[]>([])
   const [page, setPage] = useState(1)
   const [hasNextPage, setHasNextPage] = useState(true)
 
@@ -21,7 +22,6 @@ const TagList: React.FC = () => {
     setIsLoading(true)
     const { data } = await getTags({
       ...searchParams,
-      page,
     })
 
     setTags((prev) => [...prev, ...data?.data])
diff --git a/apps/web/src/molecules/top-tags/NumberIndex.tsx b/apps/web/src/molecules/top-tags/NumberIndex.tsx
index b12f1151..ad3cf5d4 100644
--- a/apps/web/src/molecules/top-tags/NumberIndex.tsx
+++ b/apps/web/src/molecules/top-tags/NumberIndex.tsx
@@ -2,9 +2,10 @@
 
 import React from "react"
 
-import { bebasNeue } from "font"
 import { cn } from "ui"
 
+import { bebasNeue } from "@/font"
+
 interface NumberIndexProps {
   number: number
 }
diff --git a/apps/web/src/molecules/top-tags/index.tsx b/apps/web/src/molecules/top-tags/index.tsx
index e8b6fae7..fe30adc2 100644
--- a/apps/web/src/molecules/top-tags/index.tsx
+++ b/apps/web/src/molecules/top-tags/index.tsx
@@ -1,7 +1,7 @@
 import React from "react"
 import Link from "next/link"
 
-import { getTopTags } from "database"
+import { getTags } from "database"
 import { getTranslations } from "next-intl/server"
 import { Typography } from "ui"
 
@@ -10,7 +10,15 @@ import NumberIndex from "./NumberIndex"
 const TopTag: React.FC = async () => {
   const t = await getTranslations()
 
-  const { data: topTags } = await getTopTags()
+  const { data: topTags } = await getTags({
+    take: 10,
+    skip: 0,
+    // orderBy: {
+    //   tagOnPost: {
+    //     _count: "desc",
+    //   },
+    // },
+  })
 
   return (
     <div className="mt-4 border-t pt-4">
@@ -27,7 +35,7 @@ const TopTag: React.FC = async () => {
                 <Typography variant="strong">#{tag.name}</Typography>
                 <Typography variant="mutedText">
                   {t("common.total_post_plural", {
-                    total: tag?._count?.tagOnPost || 0,
+                    total: 0, //tag?._count?.tagOnPost || 0,
                   })}
                 </Typography>
               </div>
diff --git a/apps/web/src/molecules/upload/AssetsManagement.tsx b/apps/web/src/molecules/upload/AssetsManagement.tsx
index 8e5e2e96..dc2a690e 100644
--- a/apps/web/src/molecules/upload/AssetsManagement.tsx
+++ b/apps/web/src/molecules/upload/AssetsManagement.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useMemo, useRef } from "react"
 
-import { useGetImages } from "hooks/useGetImages"
-import useInfiniteScroll from "hooks/useInfinityScroll"
+import { useGetImages } from "@/hooks/useGetImages"
+import useInfiniteScroll from "@/hooks/useInfinityScroll"
 
 import { useFileManager } from "./FileManagerContainer"
 import ImageList from "./ImageList"
diff --git a/apps/web/src/molecules/upload/FileManagerContainer.tsx b/apps/web/src/molecules/upload/FileManagerContainer.tsx
index 1ef8e026..edf290b6 100644
--- a/apps/web/src/molecules/upload/FileManagerContainer.tsx
+++ b/apps/web/src/molecules/upload/FileManagerContainer.tsx
@@ -1,7 +1,8 @@
 import React, { createContext, useCallback, useContext, useReducer } from "react"
 
-import { OrderByField } from "constants/upload"
-import { Image, OrderBy } from "database"
+import { Image, ImageOrderBys } from "database"
+
+import { OrderByField } from "@/constants/upload"
 
 export type FileManagerState = {
   selectedFiles: Image[]
@@ -62,7 +63,7 @@ const FileManagerContainer = ({ children }: { children: React.ReactNode }) => {
     dispatch({ type: "SET_SEARCH", payload: search })
   }, [])
 
-  const setOrder = useCallback((order: OrderBy) => {
+  const setOrder = useCallback((order: ImageOrderBys) => {
     dispatch({ type: "SET_ORDER", payload: order })
   }, [])
 
diff --git a/apps/web/src/molecules/upload/ImageSearchBar.tsx b/apps/web/src/molecules/upload/ImageSearchBar.tsx
index efa74ad2..4cc5b761 100644
--- a/apps/web/src/molecules/upload/ImageSearchBar.tsx
+++ b/apps/web/src/molecules/upload/ImageSearchBar.tsx
@@ -1,6 +1,5 @@
 "use client"
 
-import { OrderByField } from "constants/upload"
 import { ArrowDownWideNarrow } from "lucide-react"
 import { useTranslations } from "next-intl"
 import {
@@ -15,6 +14,8 @@ import {
   Input,
 } from "ui"
 
+import { OrderByField } from "@/constants/upload"
+
 import { useFileManager } from "./FileManagerContainer"
 
 export default function ImageSearchBar() {
diff --git a/apps/web/src/molecules/upload/UploadImageButton.tsx b/apps/web/src/molecules/upload/UploadImageButton.tsx
index 9cb74b46..43ca369e 100644
--- a/apps/web/src/molecules/upload/UploadImageButton.tsx
+++ b/apps/web/src/molecules/upload/UploadImageButton.tsx
@@ -2,12 +2,13 @@
 
 import { useRef } from "react"
 
-import { useUploadImage } from "hooks/useUploadImage"
 import { Upload } from "lucide-react"
 import { useTranslations } from "next-intl"
 import { toast } from "react-toastify"
 import { LoadingButton } from "ui"
 
+import { useUploadImage } from "@/hooks/useUploadImage"
+
 const UploadImageButton = () => {
   const fileInputRef = useRef<HTMLInputElement>(null)
   const t = useTranslations("uploads")
diff --git a/apps/web/src/molecules/upload/index.tsx b/apps/web/src/molecules/upload/index.tsx
index 88776c6c..e6f7d058 100644
--- a/apps/web/src/molecules/upload/index.tsx
+++ b/apps/web/src/molecules/upload/index.tsx
@@ -1,7 +1,6 @@
 import { ReactNode, useState } from "react"
 
 import { Image } from "database"
-import { useGetImages } from "hooks/useGetImages"
 import { X } from "lucide-react"
 import { useTranslations } from "next-intl"
 import {
@@ -15,7 +14,9 @@ import {
   Separator,
   Typography,
 } from "ui"
-import { truncateFileName } from "utils/text"
+
+import { useGetImages } from "@/hooks/useGetImages"
+import { truncateFileName } from "@/utils/text"
 
 import AssetManagement from "./AssetsManagement"
 import FileManagerContainer, { useFileManager } from "./FileManagerContainer"
diff --git a/apps/web/src/molecules/user-nav/LogoutMenu.tsx b/apps/web/src/molecules/user-nav/LogoutMenu.tsx
index d26558de..cd04f559 100644
--- a/apps/web/src/molecules/user-nav/LogoutMenu.tsx
+++ b/apps/web/src/molecules/user-nav/LogoutMenu.tsx
@@ -1,9 +1,10 @@
 "use client"
 
-import { onSignOut } from "actions/auth"
 import { useTranslations } from "next-intl"
 import { DropdownMenuItem, DropdownMenuShortcut } from "ui"
 
+import { onSignOut } from "@/actions/auth"
+
 export const LogoutMenu = () => {
   const t = useTranslations()
 
diff --git a/apps/web/src/molecules/user-nav/index.tsx b/apps/web/src/molecules/user-nav/index.tsx
index 06c87e6c..ee0b4970 100644
--- a/apps/web/src/molecules/user-nav/index.tsx
+++ b/apps/web/src/molecules/user-nav/index.tsx
@@ -1,6 +1,5 @@
 import Link from "next/link"
 
-import { auth } from "configs/auth"
 import { getTranslations } from "next-intl/server"
 import {
   Avatar,
@@ -18,6 +17,8 @@ import {
   Typography,
 } from "ui"
 
+import { auth } from "@/configs/auth"
+
 import { LogoutMenu } from "./LogoutMenu"
 
 export async function UserNav() {
diff --git a/apps/web/src/molecules/user/posts/filter.tsx b/apps/web/src/molecules/user/posts/filter.tsx
index 5844caba..18e0a19e 100644
--- a/apps/web/src/molecules/user/posts/filter.tsx
+++ b/apps/web/src/molecules/user/posts/filter.tsx
@@ -3,10 +3,11 @@
 import React from "react"
 import { usePathname, useRouter, useSearchParams } from "next/navigation"
 
-import { ORDER_BY } from "constants/order"
 import { useTranslations } from "next-intl"
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "ui"
 
+import { ORDER_BY } from "@/constants/order"
+
 interface FilterProps {
   total: number
 }
diff --git a/apps/web/src/utils/navigation.ts b/apps/web/src/utils/navigation.ts
index 88c4c35e..b6bb49e4 100644
--- a/apps/web/src/utils/navigation.ts
+++ b/apps/web/src/utils/navigation.ts
@@ -1,6 +1,7 @@
-import { locales } from "i18n"
 import { createSharedPathnamesNavigation } from "next-intl/navigation"
 
+import { locales } from "@/i18n"
+
 export const localePrefix = "as-needed"
 
 export const { Link, redirect, usePathname, useRouter } = createSharedPathnamesNavigation({
diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
index 90875fe4..210330db 100644
--- a/apps/web/tsconfig.json
+++ b/apps/web/tsconfig.json
@@ -7,12 +7,10 @@
         "name": "next"
       }
     ],
-    "baseUrl": "./src",
+    "baseUrl": ".",
     "paths": {
       "@/*": [
-        "./src/*",
-        "@/*",
-        "assets/*"
+        "src/*"
       ],
       "emails/*": [
         "src/emails/*"
diff --git a/packages/database/prisma/migrations/20241223151825_rename_tag/migration.sql b/packages/database/prisma/migrations/20241223151825_rename_tag/migration.sql
new file mode 100644
index 00000000..69b5faed
--- /dev/null
+++ b/packages/database/prisma/migrations/20241223151825_rename_tag/migration.sql
@@ -0,0 +1,46 @@
+/*
+  Warnings:
+
+  - You are about to drop the `Tags` table. If the table is not empty, all the data it contains will be lost.
+
+*/
+-- DropForeignKey
+ALTER TABLE "TagOnPost" DROP CONSTRAINT "TagOnPost_tagId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "Tags" DROP CONSTRAINT "Tags_imageId_fkey";
+
+-- DropTable
+DROP TABLE "Tags";
+
+-- CreateTable
+CREATE TABLE "Tag" (
+    "id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "type" "TagType" NOT NULL DEFAULT 'TAG',
+    "name" VARCHAR(255) NOT NULL,
+    "slug" VARCHAR(255) NOT NULL,
+    "description" TEXT,
+    "parent" VARCHAR(255),
+    "count" INTEGER NOT NULL DEFAULT 0,
+    "totalFollowers" INTEGER NOT NULL DEFAULT 0,
+    "totalLike" INTEGER NOT NULL DEFAULT 0,
+    "totalPost" INTEGER NOT NULL DEFAULT 0,
+    "totalView" INTEGER NOT NULL DEFAULT 0,
+    "imageId" TEXT,
+
+    CONSTRAINT "Tag_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Tag_name_key" ON "Tag"("name");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Tag_slug_key" ON "Tag"("slug");
+
+-- AddForeignKey
+ALTER TABLE "TagOnPost" ADD CONSTRAINT "TagOnPost_tagId_fkey" FOREIGN KEY ("tagId") REFERENCES "Tag"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Tag" ADD CONSTRAINT "Tag_imageId_fkey" FOREIGN KEY ("imageId") REFERENCES "Image"("id") ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/packages/database/prisma/schema.prisma b/packages/database/prisma/schema.prisma
index 640c8731..2c34f3cd 100644
--- a/packages/database/prisma/schema.prisma
+++ b/packages/database/prisma/schema.prisma
@@ -133,12 +133,12 @@ model TagOnPost {
   postId    String
   tagId     String
   post      Post     @relation(fields: [postId], references: [id])
-  tag       Tags     @relation(fields: [tagId], references: [id])
+  tag       Tag      @relation(fields: [tagId], references: [id])
 
   @@id([postId, tagId])
 }
 
-model Tags {
+model Tag {
   id             String      @id @default(cuid())
   createdAt      DateTime    @default(now())
   updatedAt      DateTime    @updatedAt
@@ -235,7 +235,7 @@ model Image {
   userId     String
   user       User     @relation(fields: [userId], references: [id])
   posts      Post[]
-  tags       Tags[]
+  tags       Tag[]
 }
 
 enum UserType {
diff --git a/packages/database/src/images/type.ts b/packages/database/src/images/type.ts
index 87b7e038..7945e535 100644
--- a/packages/database/src/images/type.ts
+++ b/packages/database/src/images/type.ts
@@ -1,5 +1,6 @@
 import { Image, Prisma } from "@prisma/client"
-import { IActionReturn, IGetListResponse } from "src/shared/type"
+
+import { IActionReturn, IGetListResponse } from "../shared/type"
 
 export type ImageOrderBys = "createdAt" | "name"
 
@@ -7,6 +8,7 @@ export interface IImageFilter {
   page?: number
   limit?: number
   userId?: string
+  search?: string
   where?: Prisma.ImageWhereInput
   order?: Prisma.ImageOrderByRelevanceInput
 }
diff --git a/packages/database/src/index.ts b/packages/database/src/index.ts
index b42b493f..8ff50e01 100644
--- a/packages/database/src/index.ts
+++ b/packages/database/src/index.ts
@@ -20,7 +20,7 @@ import {
   IGetListResponse,
   PeriodValues,
 } from "./shared/type"
-import { createTag, getTag, getTags, getTopTags } from "./tags/queries"
+import { createTag, getTag, getTags } from "./tags/queries"
 import type { TTagItem, TTagListItem } from "./tags/selects"
 import { tagListSelect } from "./tags/selects"
 import { createUser, getUser, updateUser } from "./users/queries"
@@ -34,7 +34,6 @@ export {
   createTag,
   getTag,
   getTags,
-  getTopTags,
   tagListSelect,
 
   // Posts
diff --git a/packages/database/src/posts/queries.ts b/packages/database/src/posts/queries.ts
index e861f600..c28a37b2 100644
--- a/packages/database/src/posts/queries.ts
+++ b/packages/database/src/posts/queries.ts
@@ -193,7 +193,8 @@ export const createPost = async (
         authorId: userId,
         postStatus: PostStatus.PUBLISHED,
         tagOnPost: {
-          create: data.tags?.map((tag) => {
+          // @ts-ignore
+          create: data?.tags?.map((tag: any) => {
             if (!tag.__isNew__) {
               return {
                 tag: {
@@ -234,6 +235,7 @@ export const updatePost = async (
   userId: string
 ): Promise<IActionReturn<TPostItem>> => {
   try {
+    // @ts-ignore
     const { tags, ...postData } = data
 
     const post = await prisma.post.update({
@@ -245,7 +247,7 @@ export const updatePost = async (
         ...postData,
         tagOnPost: {
           deleteMany: {},
-          create: tags?.map((tag) => {
+          create: tags?.map((tag: any) => {
             if (!tag.__isNew__) {
               return {
                 tag: {
diff --git a/packages/database/src/posts/type.ts b/packages/database/src/posts/type.ts
index ce1fafc7..3245f5c8 100644
--- a/packages/database/src/posts/type.ts
+++ b/packages/database/src/posts/type.ts
@@ -1,6 +1,6 @@
 import { PostStatus } from "@prisma/client"
-import { IActionReturn, IGetListResponse } from "src/shared/type"
 
+import { IActionReturn, IGetListResponse } from "../shared/type"
 import { TPostItem } from "./selects"
 
 export type TGetPostsResponse = IActionReturn<IGetListResponse<TPostItem>>
diff --git a/packages/database/src/tags/queries.ts b/packages/database/src/tags/queries.ts
index ad666088..011dc183 100644
--- a/packages/database/src/tags/queries.ts
+++ b/packages/database/src/tags/queries.ts
@@ -1,6 +1,6 @@
 "use server"
 
-import { Prisma, Tags } from "@prisma/client"
+import { Prisma, Tag } from "@prisma/client"
 import slugify from "slugify"
 
 import { LIMIT_PER_PAGE } from "../constant"
@@ -9,24 +9,22 @@ import { DEFAULT_LIMIT, DEFAULT_PAGE, IActionReturn, IGetListResponse } from "..
 import { tagItemSelect, tagListSelect, TTagItem, TTagListItem } from "./selects"
 
 export const getTags = async (
-  tagsFindManyArgs: Prisma.TagsFindManyArgs = {
+  tagsFindManyArgs: Prisma.TagFindManyArgs = {
     take: LIMIT_PER_PAGE,
     skip: DEFAULT_LIMIT * (DEFAULT_PAGE - 1),
   }
 ): Promise<IActionReturn<IGetListResponse<TTagListItem>>> => {
   try {
     const [data, total] = await Promise.all([
-      prisma.tags.findMany({
+      prisma.tag.findMany({
         ...tagsFindManyArgs,
         select: tagListSelect,
       }),
-      prisma.tags.count({
+      prisma.tag.count({
         where: tagsFindManyArgs?.where || {},
       }),
     ])
 
-    prisma.tags.findMany()
-
     return {
       data: {
         data,
@@ -35,8 +33,6 @@ export const getTags = async (
       },
     }
   } catch (error) {
-    console.log("error", error)
-
     throw {
       data: {
         data: [],
@@ -56,7 +52,7 @@ export const getTag = async ({
   tagIdOrSlug,
 }: GetTagProps): Promise<IActionReturn<TTagItem | null>> => {
   try {
-    const data = await prisma.tags.findFirst({
+    const data = await prisma.tag.findFirst({
       where: {
         OR: [
           {
@@ -80,8 +76,8 @@ export const getTag = async ({
   }
 }
 
-export const createTag = async (tag: Prisma.TagsCreateInput): Promise<TTagItem> => {
-  return prisma.tags.create({
+export const createTag = async (tag: Prisma.TagCreateInput): Promise<TTagItem> => {
+  return prisma.tag.create({
     data: {
       ...tag,
       slug: tag.slug || slugify(tag.name.toLocaleLowerCase()) + "-" + Date.now(),
@@ -95,9 +91,9 @@ export const updateTag = async ({
   tag,
 }: {
   tagId: string
-  tag: Prisma.TagsUpdateArgs["data"]
+  tag: Prisma.TagUpdateArgs["data"]
 }): Promise<TTagItem> => {
-  return prisma.tags.update({
+  return prisma.tag.update({
     where: {
       id: tagId,
     },
@@ -107,47 +103,10 @@ export const updateTag = async ({
 }
 
 export const deleteTag = async (tagId: string): Promise<TTagItem> => {
-  return prisma.tags.delete({
+  return prisma.tag.delete({
     where: {
       id: tagId,
     },
     select: tagItemSelect,
   })
 }
-
-// Get top 10 tags
-export const getTopTags = async (props?: {
-  page?: number
-  limit?: number
-}): Promise<IActionReturn<IGetListResponse<TTagItem>>> => {
-  const { page = DEFAULT_PAGE, limit = DEFAULT_LIMIT } = props || {}
-  const query = {
-    select: tagListSelect,
-    take: Number(limit),
-    skip: (page === 0 ? 0 : page - 1) * Number(limit),
-    orderBy: {
-      tagOnPost: {
-        _count: "desc",
-      },
-    },
-  } satisfies Prisma.TagsFindManyArgs
-
-  try {
-    const data = await prisma.tags.findMany(query)
-
-    return {
-      data: {
-        data,
-        total: data.length,
-        limit,
-        page,
-        totalPages: Math.ceil(data.length / limit),
-      },
-    }
-  } catch (error) {
-    throw {
-      data: [],
-      error,
-    }
-  }
-}
diff --git a/packages/database/src/tags/selects.ts b/packages/database/src/tags/selects.ts
index fd9a7026..c9607e97 100644
--- a/packages/database/src/tags/selects.ts
+++ b/packages/database/src/tags/selects.ts
@@ -15,12 +15,7 @@ export const tagListSelect = {
   totalFollowers: true,
   updatedAt: true,
   createdAt: true,
-  _count: {
-    select: {
-      tagOnPost: true,
-    },
-  },
-} satisfies Prisma.TagsSelect
+} satisfies Prisma.TagSelect
 
 export const tagItemSelect = {
   id: true,
@@ -31,17 +26,23 @@ export const tagItemSelect = {
   totalFollowers: true,
   updatedAt: true,
   createdAt: true,
-  _count: {
+  image: {
     select: {
-      tagOnPost: true,
+      id: true,
+      url: true,
     },
   },
-} satisfies Prisma.TagsSelect
+  // _count: {
+  //   select: {
+  //     tagOnPost: true,
+  //   },
+  // },
+} satisfies Prisma.TagSelect
 
-export type TTagItem = Prisma.TagsGetPayload<{
+export type TTagItem = Prisma.TagGetPayload<{
   select: typeof tagItemSelect
 }>
 
-export type TTagListItem = Prisma.TagsGetPayload<{
+export type TTagListItem = Prisma.TagGetPayload<{
   select: typeof tagListSelect
 }>