Skip to content

Commit

Permalink
Merge pull request #28 from Fastcampus-Youcandoit/feature/#3
Browse files Browse the repository at this point in the history
feat: wiki 레이아웃 작업
  • Loading branch information
yeongmins authored Sep 19, 2023
2 parents 6e597c2 + 81db8d3 commit b3a0fcb
Show file tree
Hide file tree
Showing 7 changed files with 81 additions and 93 deletions.
89 changes: 0 additions & 89 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added src/assets/icons/wiki_icon/wiki_write_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/wiki/MarkdownEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ const MarkdownEditor = ({ content = "", editorRef }: Props) => {
);
};

export default MarkdownEditor;
export default MarkdownEditor;
73 changes: 73 additions & 0 deletions src/components/wiki/WikiComponent.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
import { useState } from "react";
import styled from "styled-components";
import writeIcon from "../../assets/icons/wiki_icon/wiki_write_icon.png";

const WikiContentBox = styled.div`
width: 75vw;
font-family: "NotoSansKR-Regular";
`;

const WikiHeader = styled.div`
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 25px;
`;

const WikiMainText = styled.span`
font-size: 25px;
font-family: "NotoSansKR-bold";
`;

const WriteIcon = styled.img`
width: 2.5rem;
height: 2.5rem;
`;

const WikiContent = styled.div`
width: 100%;
height: 70vh;
border: 1px solid #d2d2d2;
border-radius: 5px;
background-color: #f6f7f9;
margin-top: 10px;
align-items: center;
display: flex;
justify-content: center;
box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5);
`;

const WikiFooter = styled.div`
margin-top: 10px;
`;

const ModificationDate = styled.span`
font-size: 15px;
`;

const WikiComponent = () => {
const [WikiMainTexts] = useState([
"회사내규",
"팀 소개",
"조직도",
"진행중인 프로젝트",
"예정된 프로젝트",
"완료된 프로젝트",
"신입사원 필독서",
"온보딩 주제",
]);
return (
<WikiContentBox>
<WikiHeader>
<WikiMainText>{WikiMainTexts[0]}</WikiMainText>
<WriteIcon src={writeIcon} alt="글작성 아이콘" />
</WikiHeader>
<WikiContent>View</WikiContent>
<WikiFooter>
<ModificationDate>최종 수정일 : </ModificationDate>
</WikiFooter>
</WikiContentBox>
);
};

export default WikiComponent;
4 changes: 3 additions & 1 deletion src/components/wiki/office-life/CompanyRules.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import WikiComponent from "../WikiComponent";

const CompanyRules = () => {
return <div>회사내규 내용</div>;
return <WikiComponent />;
};

export default CompanyRules;
4 changes: 2 additions & 2 deletions src/pages/Gallery.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ const Gallery = () => {
<GalleryWrapper>
<GallerySideBar />
<Outlet />
{/* <GallerySection isModalChange={isModalChange} /> */}
<GallerySection isModalChange={isModalChange} />
{/* Modal */}
{/* {isModal && <GalleryModal isModalChange={isModalChange} />} */}
{isModal && <GalleryModal isModalChange={isModalChange} />}
</GalleryWrapper>
);
};
Expand Down
2 changes: 2 additions & 0 deletions src/pages/Wiki.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import styled from "styled-components";
import { Outlet } from "react-router-dom";
import { WikiSideBar } from "../components/sidebar/SideBar";
import Footer from "../components/common/Footer";

const WikiWrapper = styled.div`
display: flex;
Expand All @@ -11,6 +12,7 @@ const Wiki = () => {
<WikiWrapper>
<WikiSideBar />
<Outlet />
<Footer />
</WikiWrapper>
);
};
Expand Down

0 comments on commit b3a0fcb

Please sign in to comment.