Release v1.0.10 (#139)

* 지원영역 및 열람 부분 디자인수정 (#134) * 기술스텍 부분 좌우 스크롤 추가 (#136) * MS 폰트 적용 및 GA 미적용 이슈 (#138) * Design: MS 폰트 미적용 버그 설정 * Design: 글자 크기 조정 --------- Co-authored-by: 김강민 <[email protected]>
GDG-on-Campus-KNU · Aug 29, 2024 · 6bc7a96 · 6bc7a96
1 parent 3927f82
commit 6bc7a96
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 19 deletions.
diff --git a/src/components/feature/header/MainNavigation.tsx b/src/components/feature/header/MainNavigation.tsx
@@ -22,6 +22,10 @@ import { displayCenter } from '@gdsc/styles/LayoutStyle';
 import { renderDropdownItems } from './StatusDropDownItems';
 import styled from '@emotion/styled';
 
+export const LinkText = styled(Link)`
+  margin-top: 3px;
+`;
+
 export const Header = styled.div`
   z-index: 1000;
   position: fixed;
@@ -46,12 +50,15 @@ export const Menu = styled.ul`
   list-style: none;
   display: flex;
   flex-direction: row;
-
+  align-items: center;
+  padding: 9px 0px;
+  height: calc(100% - 18px);
   background-color: var(--color-navy);
 `;
 export const MenuList = styled.li`
   display: flex;
   flex-direction: row;
+  -webkit-box-align: center;
   align-items: center;
   margin-right: 20px;
   position: relative;
@@ -137,24 +144,32 @@ const MainNavigation = () => {
             </MenuList>
           )}
           <MenuList>
-            <Link to='/introduce'>
-              <Text color='white'>동아리 소개</Text>
-            </Link>
+            <LinkText to='/introduce'>
+              <Text size='md' color='white'>
+                동아리 소개
+              </Text>
+            </LinkText>
           </MenuList>
           <MenuList>
-            <Link to='/apply'>
-              <Text color='white'>지원하기</Text>
-            </Link>
+            <LinkText to='/apply'>
+              <Text size='md' color='white'>
+                지원하기
+              </Text>
+            </LinkText>
           </MenuList>
           <MenuList>
-            <Link to='/techblog'>
-              <Text color='white'>테크블로그</Text>
-            </Link>
+            <LinkText to='/techblog'>
+              <Text size='md' color='white'>
+                테크블로그
+              </Text>
+            </LinkText>
           </MenuList>
           <MenuList>
-            <Link to='/community'>
-              <Text color='white'>커뮤니티</Text>
-            </Link>
+            <LinkText to='/community'>
+              <Text size='md' color='white'>
+                커뮤니티
+              </Text>
+            </LinkText>
           </MenuList>
         </Menu>
         {accessToken ? (
@@ -164,7 +179,7 @@ const MainNavigation = () => {
                 src={MyData?.profileUrl ? MyData.profileUrl : NoneProfile}
                 alt='profile'
               />
-              <div>
+              <div style={{ marginTop: '3px' }}>
                 <Text color='white'>{MyData?.name}</Text>
               </div>
               {dropdownOpen ? (
@@ -198,7 +213,9 @@ const MainNavigation = () => {
           <Menu>
             <MenuList>
               <Link to='/signin'>
-                <Text color='white'>로그인</Text>
+                <Text size='md' color='white'>
+                  로그인
+                </Text>
               </Link>
             </MenuList>
           </Menu>

diff --git a/src/constants/DocsTableColumns.tsx b/src/constants/DocsTableColumns.tsx
@@ -1,3 +1,4 @@
+import CheckIcon from '@gdsc/assets/admin/check.svg';
 import star from '@gdsc/assets/admin/miniStar.svg';
 
 import { MemberData } from '@gdsc/types/AdminInterface';
@@ -14,6 +15,23 @@ const formatDate = (dateString: string) => {
   return `${year}-${month}-${day}`;
 };
 
+const translateTrack = (track: string): string => {
+  switch (track) {
+    case 'FRONT_END':
+      return '프론트엔드';
+    case 'BACK_END':
+      return '백엔드';
+    case 'ANDROID':
+      return '안드로이드';
+    case 'AI':
+      return 'AI';
+    case 'DESIGNER':
+      return '디자이너';
+    default:
+      return track;
+  }
+};
+
 export const columns = () => [
   columnHelper.accessor('marked', {
     header: '',
@@ -28,6 +46,13 @@ export const columns = () => [
   }),
   columnHelper.accessor('studentNumber', { header: '학번' }),
   columnHelper.accessor('major', { header: '학과' }),
-  columnHelper.accessor('track', { header: '지원영역' }),
-  columnHelper.accessor('open', { header: '열람' }),
+  columnHelper.accessor('track', {
+    header: '지원영역',
+    cell: ({ getValue }) => translateTrack(getValue() as string),
+  }),
+  columnHelper.accessor('open', {
+    header: '열람',
+    cell: ({ getValue }) =>
+      getValue() ? <img src={CheckIcon} alt='Checked' /> : null,
+  }),
 ];
diff --git a/src/pages/admin/components/docs/TechStack.tsx b/src/pages/admin/components/docs/TechStack.tsx
@@ -19,6 +19,9 @@ const CardWrapper = styled.div`
   display: flex;
   justify-content: flex-start;
   gap: 5px;
+
+  overflow: auto;
+  white-space: nowrap;
 `;
 
 const TechStackCard = styled.div`

diff --git a/src/pages/apply/components/ApplyNavBox.tsx b/src/pages/apply/components/ApplyNavBox.tsx
@@ -146,7 +146,7 @@ const ApplyNavBox = () => {
               mdHeight='40px'
               mdSize='md'
               mSize='sm'
-              mWidth='100px'
+              mWidth='112px'
               mHeight='30px'
               padding='8px 63px'
               mPadding='5.5px 24px'

diff --git a/src/styles/GlobalStyle.ts b/src/styles/GlobalStyle.ts
@@ -125,7 +125,7 @@ export const GlobalStyle = css`
     -ms-overflow-style: none;
     scrollbar-width: none;
     flex-direction: column;
-    font-family: 'NotoSansKR-VariableFont_wght', monospace;
+    font-family: 'NotoSansKR-VariableFont_wght';
     font-optical-sizing: auto;
     background-color: var(--color-revolver);
     color: var(--color-white);