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

Main #313

Open
wants to merge 35 commits into
base: develop
Choose a base branch
from
Open

Main #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
ba512f8
Merge pull request #292 from donga-it-club/develop
yeneua Jun 2, 2024
a2bd3b8
Merge branch 'develop'
heejung0413 Jun 13, 2024
ae40c30
🐛Fix: 이미지렌더링 버그 수정
heejung0413 Jun 13, 2024
d781589
🐛Fix: main페이지 이미지 렌더링 버그 수정 #1
heejung0413 Jun 13, 2024
6209cc8
Squashed commit of the following:
heejung0413 Jun 30, 2024
fa8a7a8
🐛fix: 메인페이지 이미지 import 수정
heejung0413 Jun 30, 2024
a2c85d4
🐛fix: 메인페이지 이미지 첨부 수정
heejung0413 Jun 30, 2024
8a28ffb
🐛fix: 메인페이지 디자인 수정
heejung0413 Jun 30, 2024
0c1fa1c
Merge branch 'develop'
heejung0413 Jul 12, 2024
043efc7
Merge branch 'develop'
heejung0413 Jul 17, 2024
8d3a273
🐛fix: 메인페이지 이미지 수정
heejung0413 Jul 17, 2024
61b9f35
✨feat: sidebar 아코디언 아이템 삭제
heejung0413 Jul 19, 2024
6173264
Merge branch 'develop'
heejung0413 Jul 21, 2024
9e8fe9b
Merge pull request #330 from donga-it-club/develop
yeneua Jul 22, 2024
bf58345
✨feat: 배포 링크 수정
heejung0413 Jul 23, 2024
811c172
Merge pull request #339 from donga-it-club/develop
yeneua Jul 23, 2024
c414a27
✨feat: 자잘한 수정
heejung0413 Jul 25, 2024
1e058c1
Merge branch 'develop'
heejung0413 Jul 26, 2024
2a51b89
🐛fix: 메인페이지 이미지 크기 조정 및 auth 에러 메세지 삭제
heejung0413 Jul 26, 2024
6251e5c
:sparkles: Feat: 임시 공지사항 게시물 추가 (#346)
sunflower888 Jul 26, 2024
6f88d4f
:sparkles: Feat: 임시 게시물 오타 수정 (#348)
sunflower888 Jul 26, 2024
4d4f485
Merge pull request #352 from donga-it-club/develop
yeneua Jul 28, 2024
4bba623
:sparkles: Feat: 게시물 종료 버튼 추가 (#354)
sunflower888 Jul 29, 2024
6a05da4
Merge pull request #358 from donga-it-club/develop
yeneua Jul 29, 2024
ea7ac2e
🐛fix: 프로필 이미지 삭제 이슈 해결
heejung0413 Jul 29, 2024
5db37c9
🐛fix: 회고 보기 권한 설정
heejung0413 Jul 29, 2024
29163f8
🐛fix: 오류 수정
heejung0413 Jul 30, 2024
765e3d5
✨feat: AB테스트
heejung0413 Aug 3, 2024
01876d8
Revert "✨feat: AB테스트"
heejung0413 Aug 3, 2024
75c3bf5
✨feat: AB테스트
heejung0413 Aug 3, 2024
08e5bec
✨fix: contact -> 건의 및 문의사항
heejung0413 Aug 6, 2024
d649143
Merge branch 'develop'
heejung0413 Aug 15, 2024
f498da9
🐛fix: section props 삭제
heejung0413 Aug 15, 2024
94193c6
✨feat: QA 테스트 스크립트 코드 추가
heejung0413 Aug 19, 2024
8d15901
fix
heejung0413 Oct 28, 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
14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@

<div align="center">

| **임희정** | **김예나** | **공정민** | **배금빈** |
| :---------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------: |
| [<img src="https://avatars.githubusercontent.com/u/138123134?v=4" height=150 width=150> <br/> @heejung0413](https://github.com/heejung0413) | [<img src="https://avatars.githubusercontent.com/u/76564438?v=4" height=150 width=150> <br/> @yeneua](https://github.com/yeneua) | [<img src="https://avatars.githubusercontent.com/u/102538362?v=4" height=150 width=150> <br/> @jeongmin59](https://github.com/jeongmin59) |[<img src="https://avatars.githubusercontent.com/u/84950772?v=4" height=150 width=150> <br/> @sunflower888](https://github.com/sunflower888) |
| **임희정** | **김예나** | **공정민** | **배금빈** |
| :-----------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------: |
| [<img src="https://avatars.githubusercontent.com/u/138123134?v=4" height=150 width=150> <br/> @heejung0413](https://github.com/heejung0413) | [<img src="https://avatars.githubusercontent.com/u/76564438?v=4" height=150 width=150> <br/> @yeneua](https://github.com/yeneua) | [<img src="https://avatars.githubusercontent.com/u/102538362?v=4" height=150 width=150> <br/> @jeongmin59](https://github.com/jeongmin59) | [<img src="https://avatars.githubusercontent.com/u/84950772?v=4" height=150 width=150> <br/> @sunflower888](https://github.com/sunflower888) |

</div>

Expand Down Expand Up @@ -158,6 +158,7 @@

| 메인페이지 |
| ---------- |

| ![mainPage](https://github.com/donga-it-club/past-forward-frontend/assets/138123134/e54876e6-34e6-4d79-a6f5-fc0ed4e86cb5)

<br>
Expand Down Expand Up @@ -201,6 +202,7 @@

| 레이아웃 |
| -------- |

| ![layout](https://github.com/donga-it-club/past-forward-frontend/assets/138123134/bce14804-789e-40c4-977b-36bcf288aa0e)

<br>
Expand Down Expand Up @@ -274,6 +276,6 @@

- 생성한 회고들을 그룹화 시킬 수 있습니다.

| 그룹화페이지 |
| ------------------------------------------------------------------------------------------------------------------------ |
| ![group](https://github.com/user-attachments/assets/a8d746c4-4621-417a-9092-7a428518ef7a) |
| 그룹화페이지 |
| ----------------------------------------------------------------------------------------- |
| ![group](https://github.com/user-attachments/assets/a8d746c4-4621-417a-9092-7a428518ef7a) |
7 changes: 7 additions & 0 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@
f.parentNode.insertBefore(j, f);
})(window, document, 'script', 'dataLayer', 'GTM-5MBRZF34');
</script>
<script>
if (userId) {
gtag('config', 'G-KGEPKHTDL6', {
user_id: userId, // 'userId'는 동적으로 할당된 사용자 ID입니다.
});
}
</script>
<link
rel="stylesheet"
as="style"
Expand Down
1 change: 0 additions & 1 deletion src/api/@types/Retrospectives.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ export interface GetRetrospectiveData {
export interface PostRetrospectivesRequest {
title: string;
type: keyof TRetrospective;
userId: number;
templateId: number | null;
status: keyof TStatus;
thumbnail: string | null;
Expand Down
1 change: 0 additions & 1 deletion src/components/createRetro/modal/CreateModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ const CreateModal: React.FC<CreateModalProps> = ({ isOpen, onClose, templateId,
const [requestData, setRequestData] = useState<PostRetrospectivesRequest>({
title: '',
type: type,
userId: 1,
templateId: templateId || null,
status: status,
thumbnail: null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const TeamTaskMessage: FC<Props> = ({ section, setRendering, user, teamId }) =>

const handlePostComment = async () => {
setIsDisabled(true);

try {
await CommentService.post({ sectionId: section.sectionId, commentContent: value });
setTimeout(() => setIsDisabled(false), 1500);
Expand Down Expand Up @@ -130,7 +131,7 @@ const TeamTaskMessage: FC<Props> = ({ section, setRendering, user, teamId }) =>
</S.TaskUserProfile>
{user.userName === section.username && (
<>
<ReviseCommentModal comment={section} setRendering={setRendering} section={section} />
<ReviseCommentModal comment={section} setRendering={setRendering} />
<DeleteData
value="댓글"
handleDeleteValue={() => {
Expand Down
Loading