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

Develop #87

Merged
merged 64 commits into from
Nov 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
ef7e407
feat: 카카오맵 API 연동
jk6722 Oct 28, 2023
8db3790
Revert 6 feat/#1/design system (#7)
jk6722 Oct 28, 2023
cec2334
Feat/#1/design system (#9)
jk6722 Oct 28, 2023
4ce76c6
Merge branch 'develop' of https://github.com/Kusitms-28th-Meet-Up-B/F…
jk6722 Oct 28, 2023
0446184
chore: 절대 경로 설정
AAminha Oct 28, 2023
c79cb66
chore: zoom 설정
AAminha Oct 28, 2023
40595e3
[CHORE] 디자인 시스템 세팅 (#10)
AAminha Oct 28, 2023
84d86eb
chore: GlobalStyle 내부 css 요소 import 경로 수정
AAminha Oct 28, 2023
5a97b09
Merge branch 'develop' of https://github.com/Kusitms-28th-Meet-Up-B/F…
jk6722 Oct 28, 2023
791ffe4
Feat/#11/header (#12)
jk6722 Oct 30, 2023
3ac3fd7
Feat/#18/programCard (#19)
AAminha Oct 30, 2023
50cdfa6
Merge branch 'develop' of https://github.com/Kusitms-28th-Meet-Up-B/F…
jk6722 Oct 30, 2023
78c8721
Feat/#15/login (#16)
jk6722 Oct 30, 2023
b03f794
Chore/#20/axios setting (#21)
jk6722 Oct 30, 2023
f11865e
Feat/#3/map (#13)
jk6722 Oct 30, 2023
6252535
Merge branch 'develop' of https://github.com/Kusitms-28th-Meet-Up-B/F…
jk6722 Oct 30, 2023
d377432
Feat/#14/main (#22)
jk6722 Nov 1, 2023
fbdf54f
Merge branch 'develop' of https://github.com/Kusitms-28th-Meet-Up-B/F…
jk6722 Nov 1, 2023
6597ce1
Feature/#17/detail (#24)
AAminha Nov 4, 2023
1515fff
Merge branch 'develop' of https://github.com/Kusitms-28th-Meet-Up-B/F…
jk6722 Nov 6, 2023
a933bdb
chore: 중복된 QueryClient 제거
jk6722 Nov 6, 2023
8c41db1
Feat/#25/board (#27)
jk6722 Nov 7, 2023
bf5dd97
Feature/#5/search (#23)
AAminha Nov 10, 2023
8df9210
Feat/#30/my posting (#31)
jk6722 Nov 10, 2023
4cfb12d
Feat/#28/posting detail (#29)
jk6722 Nov 11, 2023
c03710b
Feat/#40/mileage (#41)
jk6722 Nov 18, 2023
3b69398
fix: CustomCalendar 에러 해결
AAminha Nov 18, 2023
e2ea14b
Feat/#37/writing (#38)
jk6722 Nov 18, 2023
1b57986
Feat/#32/signup (#33)
jk6722 Nov 18, 2023
b23020e
Feature/#26/register program (#36)
AAminha Nov 18, 2023
ed32209
Fix/#45/image source (#46)
jk6722 Nov 18, 2023
6c4b804
Merge branch 'main' into develop
jk6722 Nov 18, 2023
d6406cd
Feat/#42/api jaeguk (#48)
jk6722 Nov 19, 2023
95583b2
Feat/#42/api login (#49)
jk6722 Nov 20, 2023
68c4b9d
Feature/#50/about (#51)
AAminha Nov 20, 2023
99db9ac
Feature/#34/profile (#53)
AAminha Nov 21, 2023
23081fb
Feature/#43/api minha (#54)
AAminha Nov 21, 2023
8b27fa8
Feature/#39/dash board (#55)
AAminha Nov 21, 2023
1e2acc4
Feat/#42/api jaeguk (#56)
jk6722 Nov 21, 2023
ac1321b
feat: 꿀팁 페이지 제작 (#58)
AAminha Nov 21, 2023
ff8102e
Feat/#42/api jaeguk (#59)
jk6722 Nov 21, 2023
26ed150
Feature/#52/detail program (#60)
AAminha Nov 21, 2023
14b57f9
Feature/#35/wish list (#61)
AAminha Nov 22, 2023
ec2c8c6
Feat/#42/api jaeguk (#64)
jk6722 Nov 22, 2023
6ee5c20
Fix/#62/minha (#63)
AAminha Nov 22, 2023
92d4663
Feat/#42/api jaeguk (#66)
jk6722 Nov 22, 2023
3528314
Merge branch 'main' into develop
jk6722 Nov 22, 2023
ea9c966
chore: 중복된 import 제거
jk6722 Nov 22, 2023
8817397
fix: 게시물 페이지 없는 속성 참조하는 버그 수정 (#68)
jk6722 Nov 22, 2023
e7529d9
Merge branch 'main' into develop
jk6722 Nov 22, 2023
a728d91
fix: interceptor refresh 조건 변경
jk6722 Nov 22, 2023
9757662
fix: quill 에디터에서 이미지 처리가 어려워 임시 제거
jk6722 Nov 22, 2023
e7bad7f
Merge branch 'develop' of https://github.com/Kusitms-28th-Meet-Up-B/F…
jk6722 Nov 22, 2023
98fce9d
Hotfix/#71/jaeguk (#72)
jk6722 Nov 22, 2023
718954e
Hotfix/#71/jaeguk (#77)
jk6722 Nov 23, 2023
6d4ff82
Merge branch 'main' into develop
jk6722 Nov 23, 2023
3e759df
Hotfix/#71/jaeguk (#79)
jk6722 Nov 23, 2023
3afd54f
Merge branch 'main' into develop
jk6722 Nov 23, 2023
8ee2f76
Merge branch 'main' into develop
jk6722 Nov 23, 2023
0eda3e4
Merge branch 'develop' of https://github.com/Kusitms-28th-Meet-Up-B/F…
jk6722 Nov 23, 2023
659d54c
Hotfix/#71/jaeguk (#81)
jk6722 Nov 23, 2023
cba0a43
Hotfix/#71/jaeguk (#83)
jk6722 Nov 23, 2023
27da526
Merge branch 'main' into develop
jk6722 Nov 23, 2023
bf972b5
Hotfix/#71/jaeguk (#86)
jk6722 Nov 23, 2023
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
8 changes: 7 additions & 1 deletion src/components/SearchBar/SearchBar.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { ChangeEvent } from 'react';
import React, { ChangeEvent, useCallback } from 'react';
import styled from 'styled-components';
import SearchImage from '@/assets/icons/icon-search.svg';

Expand All @@ -18,6 +18,11 @@ const SearchBar: React.FC<Props> = ({
const onChange = (e: ChangeEvent<HTMLInputElement>) => {
setSearchInput(e.target.value);
};

const handleFocus = useCallback(() => {
setSearchInput('');
}, []);

return (
<Container
onSubmit={e => {
Expand All @@ -29,6 +34,7 @@ const SearchBar: React.FC<Props> = ({
value={searchInput}
placeholder={placeHolder}
onChange={onChange}
onFocus={handleFocus}
/>
<button type="submit">
<img src={SearchImage} alt="search" />
Expand Down
1 change: 1 addition & 0 deletions src/pages/DetailPosting/PostingBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import Attatchment from './Attatchment';
import Posting from './Posting';
import { PostingDataType } from '@/types';
import PostingNav from './PostingNav';

const PostingBox: React.FC<{
id: number;
postingData: PostingDataType;
Expand Down
9 changes: 5 additions & 4 deletions src/pages/DetailPosting/index.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { useEffect, useState } from 'react';
import { useParams } from 'react-router-dom';
import { useQuery } from 'react-query';
import styled from 'styled-components';

import PostingBox from './PostingBox';
import OtherPostings from './OtherPostings';
import { useEffect, useState } from 'react';
import { PostingDataType } from '@/types';
import { useParams } from 'react-router-dom';
import { useQuery } from 'react-query';
import { fetchPostingDetail } from '@/apis/posting';
import Loading from '@/components/Loading/Loading';

Expand Down Expand Up @@ -36,7 +37,7 @@ const DetailPosting: React.FC<Props> = ({ title }) => {
useEffect(() => {
window.scrollTo({ top: 0, behavior: 'smooth' });
}, []);

if (isLoading) return <Loading />;

const postingData: PostingDataType = data?.data?.result;
Expand Down
28 changes: 14 additions & 14 deletions src/pages/DetailPosting/styles/posting.module.css
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
.ql-body h1 {
h1 {
font-size: 2em;
}
.ql-body h2 {
h2 {
font-size: 1.5em;
}
.ql-body h3 {
h3 {
font-size: 1.17em;
}
.ql-body h4 {
h4 {
font-size: 1em;
}
.ql-body h5 {
h5 {
font-size: 0.83em;
}
.ql-body h6 {
h6 {
font-size: 0.67em;
}
.ql-body a {
u {
text-decoration: underline;
}

.ql-body strong {
p {
font-size: 20px;
}
strong {
font-weight: bold;
}
.ql-body em {
em {
font-style: italic;
}
.ql-body u {
text-decoration: underline;
}
.ql-body s {

s {
text-decoration: line-through;
}
23 changes: 11 additions & 12 deletions src/pages/board/Board.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect, useState } from 'react';
import React, { useCallback, useEffect, useState } from 'react';
import { useLocation } from 'react-router-dom';
import styled from 'styled-components';
import { useQuery } from 'react-query';
Expand All @@ -20,7 +20,7 @@ interface BoardProps {
}

const filterList: string[][] = [
['전체', '여행 지원사업 후기', '여행 대외활동 후기', '여행 공모전 후기'],
['전체', '여행 지원사업 후기', '여행 공모전 후기', '여행 대외활동 후기'],
['전체', '지원서 예시자료', '보고서 예시자료'],
];

Expand All @@ -46,10 +46,9 @@ const Board: React.FC<BoardProps> = ({ title, description }) => {
},
);

useEffect(() => {
// 라우팅이 변경되면 검색 내용 초기화
setSearch('');
}, [boardType]);
const handleSearch = useCallback(() => {
setSearch(searchInput);
}, [searchInput]);

useEffect(() => {
if (location?.state?.filter) {
Expand All @@ -58,8 +57,11 @@ const Board: React.FC<BoardProps> = ({ title, description }) => {
}, [location]);

useEffect(() => {
// 라우팅, 필터가 변경되면 검색 내용 초기화
setSearchInput('');
setSearch('');
window.scrollTo({ top: 0, behavior: 'smooth' });
}, [filter]);
}, [filter, boardType]);

if (isLoading) return <Loading />;

Expand All @@ -83,10 +85,7 @@ const Board: React.FC<BoardProps> = ({ title, description }) => {
placeHolder={'검색어를 입력해 주세요'}
searchInput={searchInput}
setSearchInput={setSearchInput}
handleSubmit={() => {
setSearch(searchInput);
setSearchInput('');
}}
handleSubmit={handleSearch}
/>
</SearchBarWrapper>
<PostingList
Expand All @@ -108,7 +107,7 @@ const Container = styled.div`

width: 1400px;
margin: 0 auto 128px;

body:not(&) {
background-color: white;
}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/map/Map.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ const MapPage = () => {
</SearchBarWrapper>

<Map
center={{ lat: 36.58775, lng: 127.968238 }}
center={{ lat: 35.58775, lng: 127.968238 }}
style={{ width: '100%', height: '133.3333vh', zoom: '1.33333' }}
level={12}
>
Expand Down