-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #178 from 98OO/develop
main 브랜치 병합
- Loading branch information
Showing
38 changed files
with
1,753 additions
and
96 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import { axiosInstance } from '@apis/axiosInstance'; | ||
| import { END_POINTS } from '@constants/api'; | ||
| import type { SubTaskResponse } from '@type/feed'; | ||
|
|
||
| const getCollectSubTask = async ( | ||
| teamspaceId: number, | ||
| feedId: number, | ||
| userId: number | ||
| ): Promise<SubTaskResponse> => { | ||
| const response = await axiosInstance.get( | ||
| `${END_POINTS.GET_COLLECT_SUB_TASK(teamspaceId, feedId, userId)}` | ||
| ); | ||
|
|
||
| return response.data.content; | ||
| }; | ||
|
|
||
| export default getCollectSubTask; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import { axiosInstance } from '@apis/axiosInstance'; | ||
| import { END_POINTS } from '@constants/api'; | ||
|
|
||
| export interface CollectSubTaskParams { | ||
| teamspaceId: number | undefined; | ||
| feedId: number; | ||
| title: string | null; | ||
| content: string | null; | ||
| } | ||
|
|
||
| const patchCollectSubTask = async ({ | ||
| teamspaceId, | ||
| feedId, | ||
| title, | ||
| content, | ||
| }: CollectSubTaskParams) => { | ||
| const response = await axiosInstance.patch( | ||
| `${END_POINTS.PATCH_COLLECT_SUB_TASK(teamspaceId!, feedId)}`, | ||
| { | ||
| title, | ||
| content, | ||
| } | ||
| ); | ||
|
|
||
| return response.data; | ||
| }; | ||
|
|
||
| export default patchCollectSubTask; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import { axiosInstance } from '@apis/axiosInstance'; | ||
| import { END_POINTS } from '@constants/api'; | ||
| import type { CollectFeedForm } from '@type/feed'; | ||
|
|
||
| const postCollectFeed = async ({ | ||
| teamspaceId, | ||
| title, | ||
| images, | ||
| attachments, | ||
| details, | ||
| }: CollectFeedForm) => { | ||
| const response = await axiosInstance.post( | ||
| `${END_POINTS.POST_COLLECT_FEED(teamspaceId)}`, | ||
| { | ||
| title, | ||
| images, | ||
| attachments, | ||
| details, | ||
| } | ||
| ); | ||
|
|
||
| return response.data; | ||
| }; | ||
|
|
||
| export default postCollectFeed; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| import { axiosInstance } from '@apis/axiosInstance'; | ||
| import { END_POINTS } from '@constants/api'; | ||
| import type { SchedulingFeedForm } from '@type/feed'; | ||
|
|
||
| const postFeed = async ( | ||
| { title, details }: SchedulingFeedForm, | ||
| teamspaceId: number | ||
| ) => { | ||
| const response = await axiosInstance.post( | ||
| `${END_POINTS.POST_SCHEDULING_FEED(teamspaceId)}`, | ||
| { | ||
| title, | ||
| details, | ||
| } | ||
| ); | ||
|
|
||
| return response.data; | ||
| }; | ||
|
|
||
| export default postFeed; |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
src/components/Feed/Detail/SubTask/SubTaskDetail.styled.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| import { styled } from 'styled-components'; | ||
| import { editorStyles } from '@styles/editorStyles'; | ||
| import theme from '@styles/theme'; | ||
|
|
||
| export const SubTaskPostContainer = styled.form` | ||
| display: flex; | ||
| flex-direction: column; | ||
| width: 680px; | ||
| gap: ${theme.units.spacing.space32}; | ||
| `; | ||
|
|
||
| export const PostInput = styled.input` | ||
| font-size: ${theme.typography.fontSize.header.sm}; | ||
| font-weight: ${theme.typography.fontWeight.semiBold}; | ||
| border: none; | ||
| outline: none; | ||
| `; | ||
|
|
||
| export const DetailWrapper = styled.div` | ||
| ${editorStyles} | ||
| margin-bottom: ${theme.units.spacing.space48}; | ||
| width: 732px; | ||
| min-height: 150px; | ||
| `; |
Oops, something went wrong.