Merge pull request #337 from Team-TenTen/develop

[Release] v0.1.17

Author: dudwns

next.config.js

@@ -4,6 +4,9 @@ const withPlugins = require('next-compose-plugins')
 
 const withPWA = require('next-pwa')({
   dest: 'public',
+  disable: process.env.NODE_ENV === 'development',
+  register: true,
+  skipWaiting: true,
 })
 
 const withBundleAnalyzer = require('@next/bundle-analyzer')({
@@ -15,7 +18,10 @@ const nextConfig = {
   reactStrictMode: false,
   images: {
     minimumCacheTTL: 1 * 60 * 60 * 24 * 365,
-    domains: ['linkhub-s3-2025.s3.ap-northeast-2.amazonaws.com'],
+    domains: [
+      'linkhub-s3-2025.s3.ap-northeast-2.amazonaws.com',
+      'linkhub-s3.s3.ap-northeast-2.amazonaws.com',
+    ],
     formats: ['image/avif', 'image/webp'],
     remotePatterns: [
       {

package-lock.json

@@ -1,7 +1,7 @@
 'use client'
 
 import NotificationList from '@/components/common/NotificationList/NotificationList'
-import { fetchGetInvitations } from '@/services/notification/invitations'
+import { fetchGetInvitations } from '@/services/notification/useNotification'
 
 const NotificationInvitePage = () => {
   return (

src/app/(routes)/notification/invite/page.tsx

@@ -6,15 +6,15 @@ import CommentList from '@/components/CommentList/CommentList'
 import Button from '@/components/common/Button/Button'
 import DeferredComponent from '@/components/common/DeferedComponent/DeferedComponent'
 import Space from '@/components/common/Space/Space'
-import useGetSpace from '@/components/common/Space/hooks/useGetSpace'
 import Tab from '@/components/common/Tab/Tab'
 import TabItem from '@/components/common/Tab/TabItem'
 import useTab from '@/components/common/Tab/hooks/useTab'
 import { CATEGORIES_RENDER, MIN_TAB_NUMBER } from '@/constants'
 import { useModal } from '@/hooks'
 import { useCurrentUser } from '@/hooks/useCurrentUser'
 import useSpaceComment from '@/hooks/useSpaceComment'
-import { fetchGetComments } from '@/services/comment/comment'
+import { fetchGetComments } from '@/services/comments/useComments'
+import { useGetSpace } from '@/services/space/useSpace'
 import { XMarkIcon } from '@heroicons/react/20/solid'
 import dynamic from 'next/dynamic'
 
@@ -29,7 +29,7 @@ export interface CommentFormValues {
 
 const SpaceCommentPage = ({ params }: { params: { spaceId: number } }) => {
   const { isLoggedIn } = useCurrentUser()
-  const { space, isSpaceLoading } = useGetSpace()
+  const { data: space, isLoading: isSpaceLoading } = useGetSpace(params.spaceId)
   const { register, unregister, setValue, setFocus, handleSubmit } =
     useForm<CommentFormValues>({
       defaultValues: {

src/app/(routes)/space/[spaceId]/comment/page.tsx

@@ -1,14 +1,16 @@
-import { fetchGetSpace } from '@/services/space/space'
 import { Metadata } from 'next'
 
 type SpaceLayoutProps = {
   params: { spaceId: number }
 }
+const baseURL = process.env.NEXT_PUBLIC_API_ADDRESS
 
 export async function generateMetadata({
   params: { spaceId },
 }: SpaceLayoutProps): Promise<Metadata> {
-  const space = await fetchGetSpace({ spaceId })
+  const space = await fetch(`${baseURL}/spaces/${spaceId}`, {
+    method: 'GET',
+  }).then((res) => res.json())
 
   return {
     title: space.spaceName,

src/app/(routes)/space/[spaceId]/layout.tsx

@@ -5,8 +5,6 @@ import Button from '@/components/common/Button/Button'
 import DeferredComponent from '@/components/common/DeferedComponent/DeferedComponent'
 import useViewLink from '@/components/common/LinkList/hooks/useViewLink'
 import Space from '@/components/common/Space/Space'
-import useGetSpace from '@/components/common/Space/hooks/useGetSpace'
-import useGetTags from '@/components/common/Space/hooks/useGetTags'
 import Tab from '@/components/common/Tab/Tab'
 import TabItem from '@/components/common/Tab/TabItem'
 import useTab from '@/components/common/Tab/hooks/useTab'
@@ -15,7 +13,8 @@ import { CATEGORIES_RENDER, MIN_TAB_NUMBER } from '@/constants'
 import { useSortParam } from '@/hooks'
 import { useCurrentUser } from '@/hooks/useCurrentUser'
 import useTagParam from '@/hooks/useTagParam'
-import { fetchGetLinks } from '@/services/link/link'
+import { fetchGetLinks } from '@/services/link/useLink'
+import { useGetSpace, useGetTags } from '@/services/space/useSpace'
 import { cls } from '@/utils'
 import { PencilSquareIcon } from '@heroicons/react/24/outline'
 import {
@@ -26,12 +25,12 @@ import {
 
 const SpacePage = ({ params }: { params: { spaceId: number } }) => {
   const { currentUser } = useCurrentUser()
-  const { space, isSpaceLoading } = useGetSpace()
+  const { data: space, isLoading: isSpaceLoading } = useGetSpace(params.spaceId)
   const [isEdit, editToggle] = useToggle(false)
   const [view, handleChangeList, handleChangeCard] = useViewLink()
   const { currentTab, tabList } = useTab({ type: 'space', space })
   const { sort, sortIndex, handleSortChange } = useSortParam('link')
-  const { tags, refetchTags, isTagsLoading } = useGetTags({
+  const { data: tags, isLoading: isTagsLoading } = useGetTags({
     spaceId: space?.spaceId,
   })
   const { tag, tagIndex, handleTagChange } = useTagParam({ tags })
@@ -138,10 +137,10 @@ const SpacePage = ({ params }: { params: { spaceId: number } }) => {
               isCanEdit={space.isCanEdit}
               isMember={
                 !!space?.memberDetailInfos.find(
-                  (member) => member.memberId === currentUser?.memberId,
+                  (member: { memberId: number }) =>
+                    member.memberId === currentUser?.memberId,
                 )
               }
-              refetchTags={refetchTags}
             />
           )}
           <SpaceMemberList

src/app/(routes)/space/[spaceId]/page.tsx

@@ -5,20 +5,20 @@ import { Spinner } from '@/components'
 import SpaceForm from '@/components/Space/SpaceForm'
 import Button from '@/components/common/Button/Button'
 import DeferredComponent from '@/components/common/DeferedComponent/DeferedComponent'
-import useGetSpace from '@/components/common/Space/hooks/useGetSpace'
 import { notify } from '@/components/common/Toast/Toast'
 import { useModal } from '@/hooks'
-import { fetchDeleteSpace } from '@/services/space/space'
+import { useDeleteSpace, useGetSpace } from '@/services/space/useSpace'
 import { useRouter } from 'next/navigation'
 
 const SpaceSettingPage = ({ params }: { params: { spaceId: number } }) => {
   const router = useRouter()
   const spaceId = params.spaceId
-  const { space, isSpaceLoading } = useGetSpace()
+  const { data: space, isLoading: isSpaceLoading } = useGetSpace(spaceId)
   const { Modal, isOpen, modalOpen, modalClose } = useModal(false)
+  const { mutate: deleteSpace } = useDeleteSpace()
 
-  const handleConfirm = async () => {
-    await fetchDeleteSpace(spaceId)
+  const handleConfirm = () => {
+    deleteSpace({ spaceId })
     notify('info', '스페이스가 삭제되었습니다.')
     router.replace('/')
   }

src/app/(routes)/space/[spaceId]/setting/page.tsx

@@ -3,7 +3,7 @@
 import { useForm } from 'react-hook-form'
 import { CategoryList, Input, SpaceList } from '@/components'
 import { useCategoryParam, useProfileSpacesSearch } from '@/hooks'
-import { fetchGetMyFavoriteSpaces } from '@/services/user/profile/favorites'
+import { fetchGetMyFavoriteSpaces } from '@/services/space/useSpaces'
 import { usePathname, useSearchParams } from 'next/navigation'
 import { SearchFormValue } from '../space/page'
 

src/app/(routes)/user/[userId]/favorite/page.tsx

@@ -1,5 +1,5 @@
 import { ProfileTap } from '@/components'
-import { fetchGetUserProfile } from '@/services/user/profile/profile'
+import { fetchGetUserProfile } from '@/services/users/useUsers'
 import { Metadata } from 'next'
 
 export type UserLayoutProps = {

src/app/(routes)/user/[userId]/layout.tsx

@@ -5,7 +5,7 @@ import {
   ProfileEditButton,
 } from '@/components'
 import { CATEGORIES_RENDER, PROFILE_MSG } from '@/constants'
-import { fetchGetUserProfile } from '@/services/user/profile/profile'
+import { fetchGetUserProfile } from '@/services/users/useUsers'
 import { UserLayoutProps } from './layout'
 
 export default async function UserPage({