fix: navigation 로고

team-aliens · Dec 28, 2022 · 765f908 · 765f908
1 parent dbc7662
commit 765f908
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
     "prettier": "^2.7.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router-dom": "^6.4.4",
+    "react-router-dom": "^6.6.1",
     "semantic-release": "^19.0.5",
     "styled-components": "^5.3.6",
     "ts-loader": "^9.4.1",

diff --git a/src/components/logo/Horizontal.tsx b/src/components/logo/Horizontal.tsx
@@ -1,6 +1,6 @@
 interface PropsType {
-  width: number;
-  height: number;
+  width?: number;
+  height?: number;
 }
 
 export const Horizontal = ({ width = 707, height = 254 }: PropsType) => (

diff --git a/src/components/logo/Vertical.tsx b/src/components/logo/Vertical.tsx
@@ -1,6 +1,6 @@
 interface PropsType {
-  width: number;
-  height: number;
+  width?: number;
+  height?: number;
 }
 
 export const Vertical = ({ width = 458, height = 556 }: PropsType) => (

diff --git a/src/components/logo/index.tsx b/src/components/logo/index.tsx
@@ -4,8 +4,8 @@ import { Vertical } from './Vertical';
 
 interface PropsType extends marginCssType {
   type: 'horizontal' | 'vertical';
-  width: number;
-  height: number;
+  width?: number;
+  height?: number;
 }
 
 export const Logo = ({ type, margin, width, height }: PropsType) => {

diff --git a/src/components/navigatorBar/index.tsx b/src/components/navigatorBar/index.tsx
@@ -7,6 +7,7 @@ import { ArchiveBox } from '../styleGuide/icon/ArchiveBox';
 import { Human } from '../styleGuide/icon/Human';
 import { Text } from '../styleGuide/text/Text';
 import { Item } from './Item';
+import { Logo } from '../logo';
 
 type NavListType = '홈' | '신청' | '공지' | '설문' | '분실물' | '마이페이지';
 
@@ -18,9 +19,12 @@ export const NavigatorBar = ({ navList }: PropsType) => {
   return (
     <_Filler>
       <_Navigation>
-        <Text margin={['bottom', 30]} size="headlineL" color="primary">
-          DMS
-        </Text>
+        <Logo
+          margin={['bottom', 48]}
+          width={113}
+          height={40}
+          type="horizontal"
+        />
         {navList.map((name, idx) => {
           const { Icon, link } = nameToIconLink[name];
           return <Item key={idx} name={name} Icon={Icon} link={link} />;

diff --git a/yarn.lock b/yarn.lock
@@ -3906,7 +3906,7 @@ __metadata:
     react: ^18.2.0
     react-dom: ^18.2.0
     react-outside-click-handler: ^1.3.0
-    react-router-dom: ^6.4.4
+    react-router-dom: ^6.6.1
     semantic-release: ^19.0.5
     styled-components: ^5.3.6
     ts-loader: ^9.4.1
@@ -3917,7 +3917,6 @@ __metadata:
   peerDependencies:
     react: ">= 18"
     react-dom: ">= 18"
-    react-router-dom: ">= 6"
     styled-components: ">= 5"
   languageName: unknown
   linkType: soft
@@ -14886,7 +14885,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-router-dom@npm:^6.4.4":
+"react-router-dom@npm:^6.6.1":
   version: 6.6.1
   resolution: "react-router-dom@npm:6.6.1"
   dependencies: