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

Hotfix/#71/jaeguk #83

Merged
merged 28 commits into from
Nov 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
4be3f04
fix: refresh토큰 만료시간 6시간으로 조정
jk6722 Nov 22, 2023
c69d680
feat: 마일리지 관련 팁 데이터 변경
jk6722 Nov 22, 2023
5641929
fix: 회원가입 완료시 confirm이 아닌 alert로 알림
jk6722 Nov 22, 2023
47462cd
fix: 내 글 목록에서 글쓰기 버튼시 Not Found로 가는 버그 해결
jk6722 Nov 22, 2023
fea8530
style: MapCard 컴포넌트 스타일링 변경
jk6722 Nov 22, 2023
d898e3f
feat: 기업회원 회원가입 추가
jk6722 Nov 22, 2023
a64c9db
feat: 사업자 등록번호 key registNum으로 통일
jk6722 Nov 22, 2023
ac4bdfb
chore: 불필요한 import 제거
jk6722 Nov 22, 2023
1554ea7
feat: 헤더 NavBar 클릭 시 대표 페이지로 이동
jk6722 Nov 22, 2023
39f990e
chore: D-day 표시에 D- 빠진 것 추가
jk6722 Nov 22, 2023
7dddcf8
Merge branch 'develop' into hotfix/#71/jaeguk
jk6722 Nov 23, 2023
9c0a07d
chore: confrim 메시지 출력 후 취소시 뒤로가기
jk6722 Nov 23, 2023
c128e44
style: 게시물 목록 컴포넌트 width 고정
jk6722 Nov 23, 2023
997fc1b
style: 게시물 Item 레이아웃 조정
jk6722 Nov 23, 2023
7935522
style: 게시물 Item 등록날짜 태그 width 변경
jk6722 Nov 23, 2023
948209c
fix: 게시물 상세 페이지에서 데이터 로드되지 않으면 레이아웃 보이지 않게
jk6722 Nov 23, 2023
7ff01cf
fix: 관리자는 좋아요 버튼 비활성화
jk6722 Nov 23, 2023
3b5b69e
fix: 401에러 반환시 처리하는 로직 변경
jk6722 Nov 23, 2023
cbcb176
Merge branch 'develop' into hotfix/#71/jaeguk
jk6722 Nov 23, 2023
bb0ab29
fix: 좋아요 버튼 클릭시 관리자인지 확인
jk6722 Nov 23, 2023
d863235
Merge branch 'hotfix/#71/jaeguk' of https://github.com/Kusitms-28th-M…
jk6722 Nov 23, 2023
eb7dd0d
fix: 관리자 좋아요 버튼 비활성화
jk6722 Nov 23, 2023
0d301e6
Merge branch 'develop' into hotfix/#71/jaeguk
jk6722 Nov 23, 2023
eb6c45e
fix: 페이지바 끝페이지 이동 버튼 활성화
jk6722 Nov 23, 2023
78eaad3
feat: 지도에 검색 기능 추가
jk6722 Nov 23, 2023
a5a72a8
chore: 지도 중심좌표 변경
jk6722 Nov 23, 2023
d77cac4
style: 게시글 상세 페이지 module.css 변경
jk6722 Nov 23, 2023
d9fea28
Merge branch 'develop' into hotfix/#71/jaeguk
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
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;
}
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