Merge pull request #80 from 9oormthonUniv-seoultech/develop

에러수정

src/App.tsx

@@ -29,6 +29,7 @@ import CheckPhoto from "./pages/PhotoUpload/CheckPhoto";
 import WriteDetail from "./pages/PhotoUpload/WriteDetail";
 import Share from "./pages/Share";
 import AlertDialog from "./components/Alert/AlertDialog";
+import ShareCompleteScreen from "./pages/PhotoUpload/ShareCompleteScreen";
 
 function App() {
   const { isLoggedIn } = useAuthStore();
@@ -86,6 +87,7 @@ function App() {
             <Route path="/photo-check" element={<CheckPhoto />} />
             <Route path="/write-detail" element={<WriteDetail />} />
             <Route path="/upload-complete" element={<UploadComplete />} />
+            <Route path="/share-complete" element={<ShareCompleteScreen />} />
             <Route path="/album" element={<Album />} />
           </Route>
           <Route path="/share" element={<Share />} />

src/api/my.ts

@@ -86,7 +86,7 @@ export const getPhotoLikes = async (accessToken: string) => {
   try {
     const res = await Get<{ albumId: number; photoUrl: string; like: boolean }[]>("/api/v1/album/favorite", {
       headers: {
-        Authorization: `Bearer: ${accessToken}`,
+        Authorization: `Bearer ${accessToken}`,
       },
     });
     return res.data.payload;

src/components/Album/AlbumMap.tsx

@@ -12,13 +12,7 @@ import { getBoothLatLng } from "../../api/booth";
 export default function AlbumMap() {
   const { lat, lng, selectedBrands } = useBoothFilterStore();
   const [activeId, setActiveId] = useState<number>(-1);
-
-  //전체 포토부스 위치 정보 조회 api 호출
-  const { isLoading, data } = useQuery({
-    queryKey: ["getBoothLatLng", lat, lng, selectedBrands],
-    queryFn: () => getBoothLatLng(lat, lng, selectedBrands!),
-  });
-
+
   //처음 페이지 접속 시 사용자의 현 위치를 받아와서 center 세팅
   useEffect(() => {
     //현 위치 받아오기
@@ -31,35 +25,22 @@ export default function AlbumMap() {
         });
       }
     };
-    
+
     fetchLocation();
   }, []);
-  
+
   const handleClick = (id: number) => {
     if (activeId === id) {
       setActiveId(-1);
     } else {
       setActiveId(id);
     }
   };
-  
+
   return (
     <MapContainer lat={lat} lng={lng}>
       {/* CustomOverlayMap으로 커스텀 마커를 직접 렌더링 */}
-      {!isLoading &&
-        data &&
-        data.map((item, index) => (
-          <CustomOverlayMap position={{ lat: item.x, lng: item.y }} zIndex={1} key={index}>
-            <div onClick={() => handleClick(item.id)} className="flex flex-col items-center">
-              {activeId === item.id ? (
-                <ActiveCustomMarker width={58} height={68} imageUrl={getLogoUrl(item.brand)} color="#5453EE" />
-              ) : (
-                <CustomMarker width={44} height={50} imageUrl={getLogoUrl(item.brand)} color="#2A303A" />
-              )}
-            </div>
-          </CustomOverlayMap>
-        ))}
-
+
       {/* 클릭 시 해당 포토부스에 해당 되는 모달창 렌더링 */}
       {/*{activeId >= 0 && <BoothModal boothId={activeId.toString()} />}*/}
     </MapContainer>

src/components/Album/HashtagSearchModal.tsx

@@ -84,8 +84,8 @@ export default function HashtagSearchModal({ setIsModalOpen }: BoothFilterProps)
           </div>
         ) : (
           <>
-            <div className="flex-col justify-start items-start gap-[5px] inline-flex">
-              <div className="text-[#171d24] text-lg font-semibold font-['Pretendard']">
+            <div className="flex-col justify-start items-start gap-[5px] inline-flex w-full ml-8 mt-3">
+              <div className="text-[#171d24] text-[18px] font-semibold font-['Pretendard']">
                 {imageList.length}장의 추억
               </div>
             </div>
@@ -127,7 +127,7 @@ const Container = styled.div`
 `;
 
 const ImageContainer = styled.div`
-  ${tw`flex flex-col w-full h-[80vh] mt-4`}
+  ${tw`flex flex-col w-full h-[80vh] mt-3`}
   overflow-y: auto;
   position: relative;
   z-index: 1; /* 다른 요소들보다 낮게 설정 */