Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/community #11

Closed
wants to merge 40 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
baca0f3
feat : community 폴더 구조 완성
banhogu May 14, 2024
103d9e1
Merge branch 'develop' into feature/community
banhogu May 14, 2024
666ab34
Merge branch 'develop' into feature/community
banhogu May 14, 2024
07fb555
feat: 커뮤니티 페이지 레이아웃 잡기 완료
banhogu May 14, 2024
ebae3a5
feat : 커뮤니티 상단 인기글 부분 디자인 완료
banhogu May 15, 2024
5765d05
feat : 카테고리 데이터 popular posts store initial value로 저장완료
banhogu May 15, 2024
9a18f48
feat: 글 불러오기 filter 컴포넌트 제작
banhogu May 15, 2024
5f4909c
feat : 커뮤니티 메인페이지 레이아웃 1차 완성
banhogu May 16, 2024
f3d9658
Merge remote-tracking branch 'origin/feat/nav' into feature/community
banhogu May 16, 2024
bbf44c0
feat : layout 적용, postDeail 페이지 생성 및 기본 구조 잡기
banhogu May 16, 2024
b462194
feat: 커뮤니티 글 디테일 컴포넌트 1차완성
banhogu May 17, 2024
c9362ad
Merge branch 'develop' into feature/community
banhogu May 17, 2024
24151c1
feat: 커뮤니티 글 디테일 컴포넌트 2차완성
banhogu May 17, 2024
dd44b20
feat: 커뮤니티 페이지 댓글 fixed 컴포넌트 생성
banhogu May 17, 2024
09948b6
feat: 커뮤니티 페이지 댓글 달기 컴포넌트 조정, 글 작성 버튼 생성, 삭제시 모달 띄우기
banhogu May 18, 2024
f2f4ff1
feat : 커뮤니티 글 작성 레이아웃 구조 잡기
banhogu May 18, 2024
d379b6c
feat: 커뮤니티 글 작성
banhogu May 19, 2024
f42b198
feat: 커뮤니티 글작성 완성
banhogu May 19, 2024
dc1ee9c
fix : sign 페이지 jobModal x 버튼 눌러도 그대로 적용되는 문제 수정
banhogu May 19, 2024
a81cfb7
fix : 커뮤니티 글쓰기 이미지 안나오는 문제 해결
banhogu May 19, 2024
f7ad6b3
fix : 커뮤니티 페이지 글자 색 조정 및 좋아요 눌렀을 시 구분 색 적용
banhogu May 20, 2024
f58ba13
feat : 커뮤니티 페이지 mock api 연결 1차
banhogu May 22, 2024
ff9f076
feat : 커뮤니티 페이지 mock api 연결 2차
banhogu May 23, 2024
6f0a582
feat : 커뮤니티 페이지 mock api 연결 3차
banhogu May 23, 2024
94d375b
fix : careerTalk store initial값을 user store에서 받아와 설정
banhogu May 23, 2024
89e9afe
feat : 커뮤니티 페이지 mock api 연결 4차
banhogu May 24, 2024
8f0e02c
feat : 커뮤니티 페이지 mock api 연결 5차
banhogu May 24, 2024
ff66e49
feat: 커뮤니티 페이지 mock api 연결 완료
banhogu May 25, 2024
79ac8dd
feat: 커뮤니티 페이지 axios 에러 핸들링
banhogu May 25, 2024
f80fead
feat: 커뮤니티 페이지 글쓰기 api 연결 및 기능 정상 작동 확인
banhogu May 26, 2024
03f109f
feat: 커뮤니티 페이지 글 전체조회, 상세조회 api 연결 및 기능 확인
banhogu May 26, 2024
116f294
feat: 커뮤니티 페이지 api 최종 연결 완성
banhogu May 26, 2024
0c0fbc6
fix : 글 등록 시 모바일 이미지가 안올라가는 문제 발견
banhogu May 27, 2024
c4e4227
fix : 커뮤니티 페이지 Loader 스타일 변경, 댓글 query 수정
banhogu May 27, 2024
8f74147
Merge remote-tracking branch 'origin/develop' into feature/community
banhogu May 27, 2024
a3e1326
chore: 커뮤니티페이지 <- develop 머지 수행
banhogu May 27, 2024
a62a924
fix: lint fix
eun-hak May 27, 2024
d994711
fix: careerTalk 파일 이름 수정
banhogu May 27, 2024
5c6721d
Merge branch 'feature/community' of https://github.com/4bujak-4bujak/…
eun-hak May 27, 2024
2cf3bf0
fix: lint fix
eun-hak May 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions next.config.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
images: {
domains: [
'bzbz-file-bucket.s3.ap-northeast-2.amazonaws.com',
'userimage.bucket.s3.ap-northeast-2.amazonaws.com',
'*'
]
},
reactStrictMode: true,
webpack: (config, { isServer }) => {
if (isServer) {
Expand Down
19 changes: 19 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"react-query": "^3.39.3",
"react-toastify": "^10.0.5",
"remark-gfm": "^4.0.0",
"swiper": "^11.1.3",
"zustand": "^4.5.2"
},
"devDependencies": {
Expand Down
10 changes: 10 additions & 0 deletions public/community/back.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/community/check.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/community/circle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/community/colorCircle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/community/colorHeart.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/community/deleteImg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/community/devider.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/community/heart.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions public/community/picture.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions public/community/reply.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions public/community/toBottom.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions public/community/toNext.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions public/community/toTop.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/community/userImg.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions public/community/viewCount.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions public/community/writePost.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/api/types/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export interface IUserInfo {
memberJob: string;
memberNickName: string;
memberSmsAgree: string;
imageUrl?: string;
}

export interface IWithdraw {
Expand Down
35 changes: 35 additions & 0 deletions src/components/community/Communityindex.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
'use client';
import dynamic from 'next/dynamic';
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';

const CommunityHeader = dynamic(
() => import('@/components/community/shared/CommunityHeader'),
{ ssr: false }
);
const PositionFilter = dynamic(
() => import('@/components/community/career/PositionFilter'),
{ ssr: false }
);

const Communityindex = () => {
const { open } = useModalStore();
const { currentTalk } = useCurrentTalkStore();
return (
<MainContainer>
<CommunityHeader />
{currentTalk === 'career' ? <PositionFilter /> : <InterestFilter />}
<PostsLayout />
<WritePostButton />
{open ? <CreateModal /> : ''}
</MainContainer>
);
};

export default Communityindex;
44 changes: 44 additions & 0 deletions src/components/community/PostDetailIndex.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import React from 'react';
import ToBackComunity from './shared/ToBackComunity';
import PostDetail from './shared/PostDetail';
import CommentsLayout from './comments/CommentsLayout';
import WriteCommentLayout from './comments/WriteCommentLayout';
import { useModalStore } from '@/store/modal.store';
import dynamic from 'next/dynamic';
import { useRouter } from 'next/router';
import { useQuery } from 'react-query';
import { getPostDetail } from './remote/post';
import ConfirmModal from './shared/modal/ConfirmModal';

const DeleteModal = dynamic(() => import('./shared/modal/DeleteModal'), { ssr: false });

const PostDetailIndex = () => {
const { open } = useModalStore();
const router = useRouter();
const { id } = router.query as { id: string };

const { data: postData } = useQuery(['post', id], () => getPostDetail(id), {
enabled: id != null
});

if (postData?.status == 'FAIL') {
return <ConfirmModal />;
}

return (
<div className="mx-4">
<div className="h-[60px]" />
<ToBackComunity />
<PostDetail postData={postData && postData} />
{/* 구분선 */}
<div className="w-full h-1 bg-gray-100" />
{/* 댓글자리 */}
<CommentsLayout />
{/* 댓글입력자리 */}
<WriteCommentLayout postId={id} />
{open ? <DeleteModal /> : ''}
</div>
);
};

export default PostDetailIndex;
Loading