Skip to content

Commit

Permalink
Merge pull request #617 from tamagoyakii/Feat/매니저권한추가#614
Browse files Browse the repository at this point in the history
[Feat] 매니저 권한 추가 #614
  • Loading branch information
tamagoyakii authored Dec 15, 2022
2 parents 9db137a + 77a6a62 commit 991dea3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
6 changes: 3 additions & 3 deletions client/src/components/DropdownMenu/DropdownMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export default function DropdownMenu({
<MenuList onClick={(e) => e.stopPropagation()}>
<div onClick={modifyHandler}>수정</div>
<div onClick={deleteModalHandler}>삭제</div>
{isPost && roleType === 'ADMIN' && (
{isPost && (roleType === 'ADMIN' || roleType === 'MANAGER') && (
<div onClick={noticeButtonHandler}>
{isNotice ? '공지 내리기' : '공지'}
</div>
Expand All @@ -93,10 +93,10 @@ export default function DropdownMenu({
) : (
<MenuList onClick={(e) => e.stopPropagation()}>
<div onClick={reportModalHandler}>신고</div>
{roleType === 'ADMIN' && (
{(roleType === 'ADMIN' || roleType === 'MANAGER') && (
<div onClick={deleteModalHandler}>삭제</div>
)}
{isPost && roleType === 'ADMIN' && (
{isPost && (roleType === 'ADMIN' || roleType === 'MANAGER') && (
<div onClick={noticeButtonHandler}>
{isNotice ? '공지 내리기' : '공지'}
</div>
Expand Down
6 changes: 1 addition & 5 deletions client/src/components/Footer/Footer.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { AiFillAlert } from 'react-icons/ai';
import { FaGithubAlt } from 'react-icons/fa';
import { FooterWrap, GitLink, Names, Copyright } from './styled';

function Footer() {
Expand All @@ -8,14 +6,12 @@ function Footer() {
<FooterWrap>
<GitLink>
<div>
<a href="https://github.com/blind-42/Blind42/wiki/정책-정의서(1.3-update)">
{/* <AiFillAlert /> */}
<a href="https://github.com/blind-42/42byte/wiki/%EC%A0%95%EC%B1%85-%EC%A0%95%EC%9D%98%EC%84%9C">
<img src="images/scroll.png" alt="scroll-img" />
</a>
</div>
<div>
<a href="https://github.com/blind-42/Blind42">
{/* <FaGithubAlt /> */}
<img src="images/githubLogo.png" alt="githubLogo-img" />
</a>
</div>
Expand Down

0 comments on commit 991dea3

Please sign in to comment.