Merge branch 'fix/community' into develop

4bujak-4bujak · May 27, 2024 · 881916f · 881916f
2 parents 234556b + f53dd6d
commit 881916f
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 21 deletions.
diff --git a/src/components/community/Communityindex.tsx b/src/components/community/Communityindex.tsx
@@ -4,7 +4,6 @@ import React from 'react';
 import { useCurrentTalkStore } from '@/store/currentTalk.store';
 import InterestFilter from './interest/InterestFilter';
 import PostsLayout from './shared/PostsLayout';
-import MainContainer from '../shared/MainContainer';
 import WritePostButton from './shared/WritePostButton';
 import { useModalStore } from '@/store/modal.store';
 import CreateModal from './shared/modal/CreateModal';
@@ -22,13 +21,14 @@ const Communityindex = () => {
   const { open } = useModalStore();
   const { currentTalk } = useCurrentTalkStore();
   return (
-    <MainContainer>
+    <div className="mt-20">
       <CommunityHeader />
       {currentTalk === 'career' ? <PositionFilter /> : <InterestFilter />}
       <PostsLayout />
+      <div className="h-12" />
       <WritePostButton />
       {open ? <CreateModal /> : ''}
-    </MainContainer>
+    </div>
   );
 };
 

diff --git a/src/components/community/remote/post.ts b/src/components/community/remote/post.ts
@@ -95,13 +95,11 @@ export const writePost = async (writePostData: WritePostType) => {
   }
 
   try {
-    //todo 여기서 안됨/////
     const { data } = await axios.post(url, formData, {
       headers: {
         Authorization: `Bearer ${token}`
       }
     });
-    //////////////////
     return data;
   } catch (error) {
     console.error(

diff --git a/src/components/community/shared/Loader.tsx b/src/components/community/shared/Loader.tsx
@@ -1,6 +1,6 @@
 export default function Loader({ className = '' }) {
   return (
-    <div className={`flex gap-4 justify-center py-4 ${className}`}>
+    <div className={`flex gap-4 justify-center py-6 ${className}`}>
       <div className="w-2 h-2 animate-ping rounded-full bg-space-purple" />
       <div className="w-2 h-2 animate-ping rounded-full bg-space-purple" />
       <div className="w-2 h-2 animate-ping rounded-full bg-space-purple" />

diff --git a/src/components/community/shared/PostsLayout.tsx b/src/components/community/shared/PostsLayout.tsx
@@ -50,7 +50,7 @@ const PostsLayout = () => {
   const allPosts = data?.pages?.map(({ content }) => content).flat();
 
   return (
-    <div className="mx-4 mt-10">
+    <div className="mx-4 mt-8 mb-16">
       {allPosts?.map((post: postDataType, i: number) => (
         <Fragment key={post?.postId}>
           <PostItem post={post} />

diff --git a/src/components/community/shared/WritePostButton.tsx b/src/components/community/shared/WritePostButton.tsx
@@ -6,7 +6,7 @@ const WritePostButton = () => {
   return (
     <div
       onClick={() => setOpen(true)}
-      className="fixed bottom-[110px] z-10
+      className="fixed bottom-[100px] z-10
     right-4 xl:right-1/3 xl:mr-7
     cursor-pointer w-12 h-12 rounded-full bg-space-purple flex justify-center items-center">
       <img src="/community/writePost.svg" alt="" />

diff --git a/src/components/community/shared/modal/CreateModal.tsx b/src/components/community/shared/modal/CreateModal.tsx
@@ -10,7 +10,7 @@ const CreateModal = () => {
   useOnClickOutside(ref, () => setOpen(false));
 
   return (
-    <div className="fixed inset-0 bg-gray-900 bg-opacity-30 z-30">
+    <div className="fixed inset-0 bg-gray-900 bg-opacity-30 z-[9999]">
       <div
         ref={ref}
         className="z-50 w-[393px] bg-white absolute left-1/2 bottom-0 transform -translate-x-1/2 rounded-t-2xl">

diff --git a/src/components/footer/Footer.tsx b/src/components/footer/Footer.tsx
@@ -8,7 +8,7 @@ const Footer = () => {
 
   return (
     <footer>
-      <nav className=" fixed bottom-0 w-[393px] h-[97.02px] px-[25px] bg-white border-t border-stone-50 justify-between items-center inline-flex z-[9999]">
+      <nav className=" fixed bottom-0 w-[393px] h-[77.02px] px-[25px] bg-white border-t border-stone-50 justify-between items-center inline-flex z-[999]">
         <Link href="/">
           <div className="h-[44.84px] flex-col justify-start items-center gap-2.5 inline-flex">
             <div className="w-[22.06px] h-[21.82px] flex-col justify-center items-center">

diff --git a/src/components/header/Header.tsx b/src/components/header/Header.tsx
@@ -1,17 +1,18 @@
+import { useRouter } from 'next/router';
+
 const Header = () => {
+  const router = useRouter();
   return (
-    <header className="sticky top-0 w-[393px] h-12 px-4 py-1 justify-center items-center gap-[176.35px] inline-flex  bg-white z-[9999] ">
-      <img className="w-[116.35px] h-8" src="/NavLogo.png" />
-      <div className="justify-end items-center gap-6 inline-flex">
-        <div className="w-[22px] h-[22px] relative">
-          <div className="w-[9.79px] h-[6.44px] left-[5.50px] top-[8.25px] absolute"></div>
-          <img className="w-[22px] h-[22px] left-0 top-0 absolute" src="/Inquiry.svg" />
+    <header className="border-b border-stone-50  bg-white fixed top-0 w-[393px] h-20 px-4 py-6 flex justify-between items-center z-[9999]">
+      <div onClick={() => router.push('/')} className="w-[116px] cursor-pointer">
+        <img src="/NavLogo.png" alt="" />
+      </div>
+      <div className="flex items-center justify-center gap-6">
+        <div className="cursor-pointer">
+          <img src="/Inquiry.svg" alt="" />
         </div>
-        <div className="w-[22.29px] h-[21.50px] relative">
-          <img
-            className="w-[22px] h-[22px] left-0 top-0 absolute "
-            src="/Notification.svg"
-          />
+        <div className="cursor-pointer">
+          <img src="/Notification.svg" alt="" />
         </div>
       </div>
     </header>