Skip to content

Commit

Permalink
Merge pull request #95 from CAUCSE/feat/#87
Browse files Browse the repository at this point in the history
[FEAT] 서비스 오픈 대비 유지보수 배포 3차
  • Loading branch information
selfishAltruism authored Mar 7, 2024
2 parents 09086a5 + 112c4ca commit 13afaf0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
14 changes: 8 additions & 6 deletions src/pages/board/boardCreate/BoardCreatePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ const BoardCreatePage: React.FC = observer(() => {
};
if (me?.isCircleLeader && data.circleName !== '전체') {
//동아리장이 동아리 게시판을 생성하는 경우
if (data.category === '공지 게시판') {
if (data.category === '동아리 공지 게시판') {
body.createRoleList = ['ADMIN', 'VICE_PRESIDENT', 'PRESIDENT', 'LEADER_CIRCLE'];
body.circleId =
me.circleIds![me.circleNames!.findIndex(circleName => circleName === data.circleName)];
} else if (data.category === '자유 게시판') {
} else if (data.category === '동아리 자유 게시판') {
body.createRoleList = [
'ADMIN',
'VICE_PRESIDENT',
Expand Down Expand Up @@ -138,17 +138,19 @@ const BoardCreatePage: React.FC = observer(() => {
label="게시판 카테고리"
control={control}
required
options={['공지 게시판', '자유 게시판']}
options={
me?.isCircleLeader
? ['동아리 공지 게시판', '동아리 자유 게시판']
: ['공지 게시판', '자유 게시판']
}
/>
{me?.isCircleLeader ? (
<SelectInput
name="circleName"
label="게시판 생성 동아리"
control={control}
required
options={
me.isAdmin || me.isPresidents ? ['전체', ...me.circleNames!] : me.circleNames
}
options={me.circleNames}
/>
) : null}
</BodyScreen>
Expand Down
2 changes: 2 additions & 0 deletions src/pages/board/postDetail/styled.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import styled from '@emotion/styled';

export const PostContent = styled.p`
background-color: red;
width: 100%;
padding: 0;
height: auto;
font-size: 14px;
Expand Down

0 comments on commit 13afaf0

Please sign in to comment.