Merge pull request #1140 from peer-42seoul/revert-1139-release-1.0.9

Revert "Release 1.0.9"
peer-42seoul · Jul 30, 2024 · 7a4f9b8 · 7a4f9b8
2 parents 42e8cf8 + 29bec87
commit 7a4f9b8
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 306 deletions.
diff --git a/src/app/job/JobCard.tsx b/src/app/job/JobCard.tsx
diff --git a/src/app/job/[id]/page.tsx b/src/app/job/[id]/page.tsx
diff --git a/src/app/job/layout.tsx b/src/app/job/layout.tsx
diff --git a/src/app/job/page.tsx b/src/app/job/page.tsx
diff --git a/src/app/job/template.tsx b/src/app/job/template.tsx
diff --git a/src/app/panel/layout-panel/Header.tsx b/src/app/panel/layout-panel/Header.tsx
@@ -67,8 +67,6 @@ const Header = ({
       if (!isLogin) {
         router.push('/login?redirect=/my-page')
       } else setTitle('마이페이지')
-    } else if (pathname == '/job') {
-      setTitle('채용공고')
     } else {
       setTitle('')
     }
@@ -79,8 +77,7 @@ const Header = ({
   const onlyTitle =
     pathname?.startsWith('/my-page') ||
     pathname?.startsWith('/team-list') ||
-    pathname?.startsWith('/login') ||
-    pathname?.startsWith('/job')
+    pathname?.startsWith('/login')
 
   return (
     <AppBar position="fixed" sx={mobileHeader}>

diff --git a/src/app/panel/layout-panel/MobileNav.tsx b/src/app/panel/layout-panel/MobileNav.tsx
@@ -39,8 +39,6 @@ const MobileNav = () => {
       else setValue('my-page')
     } else if (pathname.startsWith('/showcase')) {
       setValue('showcase')
-    } else if (pathname.startsWith('/job')) {
-      setValue('job')
     } else {
       setValue('')
     }
@@ -84,21 +82,12 @@ const MobileNav = () => {
             router.push('/hitchhiking')
           }}
         />
-        {/*<BottomNavigationAction*/}
-        {/*  sx={bottomNavStyle}*/}
-        {/*  label={<Typography fontSize={'0.6875rem'}>쇼케이스</Typography>}*/}
-        {/*  value={'showcase'}*/}
-        {/*  onClick={() => {*/}
-        {/*    router.push('/showcase')*/}
-        {/*  }}*/}
-        {/*  icon={<ShowcaseIcon />}*/}
-        {/*/>*/}
         <BottomNavigationAction
           sx={bottomNavStyle}
-          label={<Typography fontSize={'0.6875rem'}>채용공고</Typography>}
-          value={'job'}
+          label={<Typography fontSize={'0.6875rem'}>쇼케이스</Typography>}
+          value={'showcase'}
           onClick={() => {
-            router.push('/job')
+            router.push('/showcase')
           }}
           icon={<ShowcaseIcon />}
         />

diff --git a/src/app/panel/layout-panel/PcNav.tsx b/src/app/panel/layout-panel/PcNav.tsx
@@ -136,49 +136,19 @@ const PcNav = () => {
               }}
               sx={navStyle}
             />
-            {/*<BottomNavigationAction*/}
-            {/*  value={'showcase'}*/}
-            {/*  label={*/}
-            {/*    <Stack*/}
-            {/*      direction={'row'}*/}
-            {/*      alignItems={'center'}*/}
-            {/*      spacing={'0.15rem'}*/}
-            {/*    >*/}
-            {/*      <Typography*/}
-            {/*        color={value === 'showcase' ? 'primary' : 'text.normal'}*/}
-            {/*        variant="Caption"*/}
-            {/*      >*/}
-            {/*        쇼케이스*/}
-            {/*      </Typography>*/}
-            {/*      <BetaIcon*/}
-            {/*        style={{*/}
-            {/*          position: 'relative',*/}
-            {/*          top: '-0.5rem',*/}
-            {/*        }}*/}
-            {/*      />*/}
-            {/*    </Stack>*/}
-            {/*  }*/}
-            {/*  onClick={() => {*/}
-            {/*    router.push('/showcase')*/}
-            {/*  }}*/}
-            {/*  sx={{*/}
-            {/*    ...navStyle,*/}
-            {/*    wordBreak: 'keep-all',*/}
-            {/*  }}*/}
-            {/*/>*/}
             <BottomNavigationAction
-              value={'job'}
+              value={'showcase'}
               label={
                 <Stack
                   direction={'row'}
                   alignItems={'center'}
                   spacing={'0.15rem'}
                 >
                   <Typography
-                    color={value === 'job' ? 'primary' : 'text.normal'}
+                    color={value === 'showcase' ? 'primary' : 'text.normal'}
                     variant="Caption"
                   >
-                    채용공고
+                    쇼케이스
                   </Typography>
                   <BetaIcon
                     style={{
@@ -189,7 +159,7 @@ const PcNav = () => {
                 </Stack>
               }
               onClick={() => {
-                router.push('/job')
+                router.push('/showcase')
               }}
               sx={{
                 ...navStyle,

diff --git a/src/app/panel/main-page/MainCard.tsx b/src/app/panel/main-page/MainCard.tsx
@@ -16,8 +16,6 @@ import { ChipStyle } from '@/app/panel/main-page/MainCard.style'
 import CuPhotoBox from '@/components/CuPhotoBox'
 import dynamic from 'next/dynamic'
 import dayjs from 'dayjs'
-import { TypeChip } from '@/app/recruit/[id]/panel/RecruitInfoElement'
-import React from 'react'
 
 const DynamicOtherProfile = dynamic(() => import('@/app/panel/OthersProfile'), {
   loading: () => <></>,
@@ -183,10 +181,13 @@ const MainCard = ({
           >
             {title}
           </Typography>
-          <Stack direction={'row'} mt={0.5} alignItems={'center'} gap={1}>
-            <TypeChip type={type} />
+
+          <Stack justifyContent={'space-between'} direction={'row'} mt={0.5}>
+            <Typography variant="Body2" color="text.alternative">
+              {dayjs(createdAt).format('YYYY-MM-DD')}
+            </Typography>
             <Typography variant="Body2" color="text.alternative">
-              {dayjs(createdAt).format('YYYY-MM-DD')} · {member}명
+              {member}명
             </Typography>
           </Stack>
 

diff --git a/src/app/panel/main-page/MainMobileView.tsx b/src/app/panel/main-page/MainMobileView.tsx
@@ -29,7 +29,7 @@ const MainMobileView = ({ initData }: { initData: IPagination<IPost[]> }) => {
 
   return (
     <Container sx={{ ...containerStyle, paddingBottom: '2rem' }}>
-      {queryKeyword == '' ? (
+      {queryKeyword === '' ? (
         <>
           <Box width={'100%'}>
             <MainBanner />
@@ -74,6 +74,7 @@ const MainMobileView = ({ initData }: { initData: IPagination<IPost[]> }) => {
                 <Box key={project.recruit_id}>
                   <MainCard
                     {...project}
+                    type={type}
                     favorite={
                       isInit
                         ? getFavoriteData(project.recruit_id)

diff --git a/src/app/panel/main-page/MainPcView.tsx b/src/app/panel/main-page/MainPcView.tsx
@@ -101,6 +101,7 @@ const MainPcView = ({ initData }: { initData: IPagination<IPost[]> }) => {
                   <Grid item key={project.recruit_id} sm={12} md={6} lg={4}>
                     <MainCard
                       {...project}
+                      type={type}
                       favorite={
                         isInit
                           ? getFavoriteData(project.recruit_id)