diff --git a/package-lock.json b/package-lock.json
index 2ef5f05d..2eb97abd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4189,24 +4189,6 @@
"@types/react": "^17"
}
},
- "node_modules/@testing-library/react/node_modules/ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "dependencies": {
- "@types/prop-types": "*",
- "@types/scheduler": "*",
- "csstype": "^3.0.2"
- }
- },
- "node_modules/@testing-library/react/node_modules/@types/react-dom": {
- "version": "17.0.20",
- "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.20.tgz",
- "integrity": "sha512-4pzIjSxDueZZ90F52mU3aPoogkHIoSIDG+oQ+wQK7Cy2B9S+MvOqY0uEA/qawKz381qrEDkvpwyt8Bm31I8sbA==",
- "dependencies": {
- "@types/react": "^17"
- }
- },
"node_modules/@testing-library/user-event": {
"version": "13.5.0",
"resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.5.0.tgz",
@@ -4469,19 +4451,6 @@
"resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
"integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
},
- "node_modules/@types/lodash": {
- "version": "4.14.198",
- "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.198.tgz",
- "integrity": "sha512-trNJ/vtMZYMLhfN45uLq4ShQSw0/S7xCTLLVM+WM1rmFpba/VS42jVUgaO3w/NOLiWR/09lnYk0yMaA/atdIsg=="
- },
- "node_modules/@types/lodash.memoize": {
- "version": "4.1.7",
- "resolved": "https://registry.npmjs.org/@types/lodash.memoize/-/lodash.memoize-4.1.7.tgz",
- "integrity": "sha512-lGN7WeO4vO6sICVpf041Q7BX/9k1Y24Zo3FY0aUezr1QlKznpjzsDk3T3wvH8ofYzoK0QupN9TWcFAFZlyPwQQ==",
- "dependencies": {
- "@types/lodash": "*"
- }
- },
"node_modules/@types/mime": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
@@ -5092,14 +5061,6 @@
"@xtuc/long": "4.2.2"
}
},
- "node_modules/@wojtekmaj/date-utils": {
- "version": "1.5.0",
- "resolved": "https://registry.npmjs.org/@wojtekmaj/date-utils/-/date-utils-1.5.0.tgz",
- "integrity": "sha512-0mq88lCND6QiffnSDWp+TbOxzJSwy2V/3XN+HwWZ7S2n19QAgR5dy5hRVhlECXvQIq2r+VcblBu+S9V+yMcxXw==",
- "funding": {
- "url": "https://github.com/wojtekmaj/date-utils?sponsor=1"
- }
- },
"node_modules/@xtuc/ieee754": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -6281,14 +6242,6 @@
"node": ">=12"
}
},
- "node_modules/clsx": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz",
- "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==",
- "engines": {
- "node": ">=6"
- }
- },
"node_modules/co": {
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -9227,18 +9180,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/get-user-locale": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/get-user-locale/-/get-user-locale-2.3.0.tgz",
- "integrity": "sha512-I3rQvAUwu2nauRD9YyQBSXVFJZixNouwA+eZld51Sn4Pn0N1qFbgcgOi/nPigJPQlNY519mT95fiSPRgflQiTA==",
- "dependencies": {
- "@types/lodash.memoize": "^4.1.7",
- "lodash.memoize": "^4.1.1"
- },
- "funding": {
- "url": "https://github.com/wojtekmaj/get-user-locale?sponsor=1"
- }
- },
"node_modules/glob": {
"version": "7.2.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -14335,31 +14276,6 @@
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
"integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
},
- "node_modules/react-calendar": {
- "version": "4.6.0",
- "resolved": "https://registry.npmjs.org/react-calendar/-/react-calendar-4.6.0.tgz",
- "integrity": "sha512-GJ6ZipKMQmlK666t+0hgmecu6WHydEnMWJjKdEkUxW6F471hiM5DkbWXkfr8wlAg9tc9feNCBhXw3SqsPOm01A==",
- "dependencies": {
- "@wojtekmaj/date-utils": "^1.1.3",
- "clsx": "^2.0.0",
- "get-user-locale": "^2.2.1",
- "prop-types": "^15.6.0",
- "tiny-warning": "^1.0.0"
- },
- "funding": {
- "url": "https://github.com/wojtekmaj/react-calendar?sponsor=1"
- },
- "peerDependencies": {
- "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
- "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
- "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
- },
- "peerDependenciesMeta": {
- "@types/react": {
- "optional": true
- }
- }
- },
"node_modules/react-dev-utils": {
"version": "12.0.1",
"resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz",
@@ -16373,11 +16289,6 @@
"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
},
- "node_modules/tiny-warning": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
- "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
- },
"node_modules/titleize": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/titleize/-/titleize-3.0.0.tgz",
diff --git a/src/assets/icons/wiki_icon/wiki_write_icon.png b/src/assets/icons/wiki_icon/wiki_write_icon.png
new file mode 100644
index 00000000..8e214884
Binary files /dev/null and b/src/assets/icons/wiki_icon/wiki_write_icon.png differ
diff --git a/src/components/wiki/MarkdownEditor.tsx b/src/components/wiki/MarkdownEditor.tsx
index da6dc836..f82cdfdb 100644
--- a/src/components/wiki/MarkdownEditor.tsx
+++ b/src/components/wiki/MarkdownEditor.tsx
@@ -39,4 +39,4 @@ const MarkdownEditor = ({ content = "", editorRef }: Props) => {
);
};
-export default MarkdownEditor;
\ No newline at end of file
+export default MarkdownEditor;
diff --git a/src/components/wiki/WikiComponent.tsx b/src/components/wiki/WikiComponent.tsx
new file mode 100644
index 00000000..178d0b24
--- /dev/null
+++ b/src/components/wiki/WikiComponent.tsx
@@ -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 (
+
+
+ {WikiMainTexts[0]}
+
+
+ View
+
+ 최종 수정일 :
+
+
+ );
+};
+
+export default WikiComponent;
diff --git a/src/components/wiki/office-life/CompanyRules.tsx b/src/components/wiki/office-life/CompanyRules.tsx
index 93de9175..4380900b 100644
--- a/src/components/wiki/office-life/CompanyRules.tsx
+++ b/src/components/wiki/office-life/CompanyRules.tsx
@@ -1,5 +1,7 @@
+import WikiComponent from "../WikiComponent";
+
const CompanyRules = () => {
- return 회사내규 내용
;
+ return ;
};
export default CompanyRules;
diff --git a/src/pages/Gallery.tsx b/src/pages/Gallery.tsx
index e01b56f4..86703440 100644
--- a/src/pages/Gallery.tsx
+++ b/src/pages/Gallery.tsx
@@ -21,9 +21,9 @@ const Gallery = () => {
- {/* */}
+
{/* Modal */}
- {/* {isModal && } */}
+ {isModal && }
);
};
diff --git a/src/pages/Wiki.tsx b/src/pages/Wiki.tsx
index af002bba..997b3b92 100644
--- a/src/pages/Wiki.tsx
+++ b/src/pages/Wiki.tsx
@@ -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;
@@ -11,6 +12,7 @@ const Wiki = () => {
+
);
};