Merge pull request #115 from official-Trippy/feature/#107

Feature/#107
official-Trippy · Sep 9, 2024 · 6ec3cdc · 6ec3cdc
2 parents 0559c96 + 9c356f6
commit 6ec3cdc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/src/app/search/[keyword]/page.tsx b/src/app/search/[keyword]/page.tsx
@@ -8,8 +8,8 @@ import Keywords from "@/components/search/Keywords";
 import PopularSearches from "@/components/search/popularSearches";
 import axios from "axios";
 import { useRouter } from "next/navigation";
-import SortingBar from "@/components/search/\bsortingBar";
-import PostAllCard from "@/components/search/\bpostAllCard";
+import SortingBar from "@/components/search/sortingBar";
+import PostAllCard from "@/components/search/postAllCard";
 import getBoard from "@/services/board/get/getBoard";
 import { useQuery } from "react-query";
 
@@ -114,6 +114,7 @@ const SearchPage = () => {
     queryKey: ["boardData"],
     queryFn: () => getBoard(PAGE_SIZE, pages),
   });
+
   console.log();
 
   console.log(boardData);
@@ -122,7 +123,7 @@ const SearchPage = () => {
   return (
     <div className="w-full min-h-screen bg-white">
       <Header />
-      <div className="w-[80%] mx-auto mt-8 px-10">
+      <div className="mx-auto mt-8 px-10 w-[66%] mx-auto">
         <h1 className="text-4xl font-semibold mb-6">
           <span className="text-[#FB3463]">{RealKeyword}</span>에 대한
           <span className="text-[#FB3463]"> {count}</span>건의 검색 결과입니다.
@@ -144,7 +145,7 @@ const SearchPage = () => {
                   posts={posts}
                   selectedPostType={selectedPostType}
                 />
-                <div className="flexflex mt-8">
+                <div className="flexflex mt-8 ml-[25px]">
                   <div className="flex-none w-[300px] ml-8">
                     <Keywords />
                   </div>

diff --git a/src/components/search/Keywords.tsx b/src/components/search/Keywords.tsx
@@ -21,7 +21,7 @@ const Keywords: React.FC = () => {
         {sampleKeywords.map((keyword, index) => (
           <span
             key={index}
-            className="bg-gray-200 text-gray-800 px-4 py-2 rounded-full text-sm"
+            className="bg-gray-200 text-gray-800 px-4 py-2 rounded-full text-m"
           >
             {keyword}
           </span>

diff --git a/src/components/search/postAllCard.tsx → src/components/search/postAllCard.tsx b/src/components/search/postAllCard.tsx → src/components/search/postAllCard.tsx
@@ -46,7 +46,7 @@ const PostAllCard: React.FC<PostCardProps> = ({
             ? `/board/${postDetails?.id}`
             : selectedPostType === "OOTD"
               ? `/ootd/${postDetails?.id}`
-              : `/profile/${postDetails?.id}`; // NICKNAME일 경우 프로필로 연결
+              : `/user/${member?.nickName}`;
 
         return (
           <Link

diff --git a/src/components/search/sortingBar.tsx → src/components/search/sortingBar.tsx b/src/components/search/sortingBar.tsx → src/components/search/sortingBar.tsx
@@ -19,6 +19,7 @@ const SortingBar: React.FC<SortingBarProps> = ({
     { label: "게시글", value: "POST" },
     { label: "OOTD", value: "OOTD" },
     { label: "사용자 닉네임", value: "NICKNAME" },
+    { label: "블로그 이름", value: "BLOGNAME" },
   ];
 
   const sortOrders = [
@@ -27,7 +28,7 @@ const SortingBar: React.FC<SortingBarProps> = ({
   ];
 
   return (
-    <div className="flex justify-between items-center mb-4 mr-[520px] mb-[50px] mt-[30px]">
+    <div className="flex justify-between items-center mb-4 mr-[0px] mb-[50px] mt-[30px] w-[789px]">
       <div className="flex space-x-4">
         {postTypes.map((type) => (
           <button

diff --git a/src/services/follow.ts b/src/services/follow.ts
@@ -5,7 +5,7 @@ import { useFollowingStore } from "@/store/useFollowingStore";
 const backendUrl = process.env.NEXT_PUBLIC_BACKEND_URL;
 let accessToken = "";
 
-export async function showFollows(memberId: string) {
+export async function showFollows(memberId: string, accessToken: any) {
   try {
     const response = await axios.get(
       `${backendUrl}/api/member/follower?memberId=${memberId}`,
@@ -22,7 +22,7 @@ export async function showFollows(memberId: string) {
   }
 }
 
-export async function showFollowings(memberId: string) {
+export async function showFollowings(memberId: string, accessToken: any) {
   try {
     const response = await axios.get(
       `${backendUrl}/api/member/following?memberId=${memberId}`,