Skip to content

Commit

Permalink
Revert "Release 1.0.9"
Browse files Browse the repository at this point in the history
  • Loading branch information
joonseong11 authored Jul 30, 2024
1 parent 42e8cf8 commit 29bec87
Show file tree
Hide file tree
Showing 16 changed files with 21 additions and 306 deletions.
67 changes: 0 additions & 67 deletions src/app/job/JobCard.tsx

This file was deleted.

72 changes: 0 additions & 72 deletions src/app/job/[id]/page.tsx

This file was deleted.

10 changes: 0 additions & 10 deletions src/app/job/layout.tsx

This file was deleted.

70 changes: 0 additions & 70 deletions src/app/job/page.tsx

This file was deleted.

7 changes: 0 additions & 7 deletions src/app/job/template.tsx

This file was deleted.

5 changes: 1 addition & 4 deletions src/app/panel/layout-panel/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ const Header = ({
if (!isLogin) {
router.push('/login?redirect=/my-page')
} else setTitle('마이페이지')
} else if (pathname == '/job') {
setTitle('채용공고')
} else {
setTitle('')
}
Expand All @@ -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}>
Expand Down
17 changes: 3 additions & 14 deletions src/app/panel/layout-panel/MobileNav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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('')
}
Expand Down Expand Up @@ -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 />}
/>
Expand Down
38 changes: 4 additions & 34 deletions src/app/panel/layout-panel/PcNav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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={{
Expand All @@ -189,7 +159,7 @@ const PcNav = () => {
</Stack>
}
onClick={() => {
router.push('/job')
router.push('/showcase')
}}
sx={{
...navStyle,
Expand Down
11 changes: 6 additions & 5 deletions src/app/panel/main-page/MainCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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: () => <></>,
Expand Down Expand Up @@ -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>

Expand Down
3 changes: 2 additions & 1 deletion src/app/panel/main-page/MainMobileView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const MainMobileView = ({ initData }: { initData: IPagination<IPost[]> }) => {

return (
<Container sx={{ ...containerStyle, paddingBottom: '2rem' }}>
{queryKeyword == '' ? (
{queryKeyword === '' ? (
<>
<Box width={'100%'}>
<MainBanner />
Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions src/app/panel/main-page/MainPcView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading

0 comments on commit 29bec87

Please sign in to comment.