Merge pull request #158 from Jeju-Month/main

main 머지

Author: jaeyo03

src/pages/MyPage/components/aside/Aside.jsx

@@ -10,8 +10,8 @@ import { useSelector } from 'react-redux';
 import { useQuery } from '@tanstack/react-query';
 
 import { useState } from 'react';
-import UserFollow from '../userfollower/userFollow';
 import { getUserApi } from '@/apis/userApi';
+import UserFollow from '../userfollower/UserFollow';
 
 const Aside = () => {
   const { userId, userFullName } = useSelector(state => state.user);

src/pages/MyPage/components/main/comment/CommentSection.jsx

@@ -2,9 +2,9 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import Comment from './Comment';
 import { useSelector } from 'react-redux';
 import { deleteCommentApi } from '@/apis/commentApi';
-import MyPageHeader from '../common/myPageHeader';
 import NoContent from '../common/NoContent';
 import { getUserApi } from '@/apis/userApi';
+import MyPageHeader from '../common/MyPageHeader';
 
 const CommentSection = () => {
   const { userId } = useSelector(state => state.user);

src/pages/MyPage/components/main/liked/LikedSection.jsx

@@ -1,7 +1,7 @@
 import { getAllUserLikedArticlesApi } from '@/apis/supabaseApi';
 import LikedPost from './LikedPost';
 import { useSelector } from 'react-redux';
-import MyPageHeader from '../common/myPageHeader';
+import MyPageHeader from '../common/MyPageHeader';
 import NoContent from '../common/NoContent';
 import { deleteUserLikedArticleApi } from '@/apis/supabaseApi';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';

src/pages/MyPage/components/main/post/PostsSection.jsx

@@ -2,7 +2,7 @@
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import Post from './Post';
 import { useSelector } from 'react-redux';
-import MyPageHeader from '../common/myPageHeader';
+import MyPageHeader from '../common/MyPageHeader';
 import NoContent from '../common/NoContent';
 import { deletePostApi, getUserPost } from '@/apis/postApi';
 

src/pages/MyPage/components/main/schedule/ScheduleSection.jsx

@@ -2,7 +2,7 @@ import { useEffect } from 'react';
 import { useState } from 'react';
 import { useSelector } from 'react-redux';
 import { deleteTripApi, getAllTripsApi } from '@/apis/supabaseApi';
-import MyPageHeader from '../common/myPageHeader';
+import MyPageHeader from '../common/MyPageHeader';
 import NoContent from '../common/NoContent';
 import Schedule from './Schedule';
 

src/pages/MyPage/components/main/scrap/ScrapSection.jsx

@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
 import { deleteUserLikedPlaceApi, getAllUserLikedPlacesApi } from '@/apis/supabaseApi';
 import ScrapPlaceCard from './ScrapPlaceCard';
 import { useSelector } from 'react-redux';
-import MyPageHeader from '../common/myPageHeader';
+import MyPageHeader from '../common/MyPageHeader';
 import NoContent from '../common/NoContent';
 import Container from './Container';
 

src/pages/MyPage/components/userfollower/followerTab/FollowerItem.jsx

@@ -37,7 +37,7 @@ FollowerItem.propTypes = {
     image: PropTypes.string,
     fullName: PropTypes.string.isRequired,
     _id: PropTypes.string.isRequired,
-    followerForFollower: PropTypes.bool.isRequired,
+    followerForFollower: PropTypes.bool,
   }),
 
   followHandler: PropTypes.func,

src/pages/SearchPage/index.jsx

@@ -312,6 +312,7 @@ const SearchPage = () => {
       <main className="mt-22 ">
         <div className="min-h-658">
           {isLoading ? (
+            // <SkeletonLayout layout={layout} itemList={itemListLength} />
             <SkeletonLayout layout={layout} itemList={itemListLength} />
           ) : (
             <div className={layout === 'medium-layout' ? 'flex flex-wrap' : ''}>

src/redux/slices/wishlist.slice.js

@@ -3,7 +3,7 @@ import {
   getAllUserLikedPlacesApi, 
   postUserLikedPlaceApi, 
   deleteUserLikedPlaceApi 
-} from '../../apis/supabaseApi';
+} from '@/apis/supabaseApi';
 
 const initialState = {
   likedPlaces: [],