Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor/detail/add detail #11

Merged
merged 13 commits into from
Nov 20, 2022
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 62 additions & 0 deletions components/common/FacilitiesIcons.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import Image from 'next/image'
import styled from '@emotion/styled'
import { PlaceInfoType } from '../../types'

// 시설 정보 아이콘 뷰
const FacilitiesIcons = ({
place,
size,
hasDescription,
}: {
place: PlaceInfoType
size: number
hasDescription: boolean
seohyun319 marked this conversation as resolved.
Show resolved Hide resolved
}) => {
const IconImage = ({
src,
description,
}: {
src: string
description: string
}) => (
<IconWrapper hasDescription={hasDescription}>
<Image src={src} width={size} height={size} />
seohyun319 marked this conversation as resolved.
Show resolved Hide resolved
{hasDescription && <DescriptionText>{description}</DescriptionText>}
</IconWrapper>
)

return (
<IconsSection>
{place.isToiletExists && (
<IconImage src="/images/toilet.svg" description="장애인 화장실" />
)}
{place.isChargerExists && (
<IconImage src="/images/charger.svg" description="휠체어 충전기" />
)}
{place.isElevatorExists && (
<IconImage src="/images/elevator.svg" description="엘리베이터" />
)}
{place.isSlopeExists && (
<IconImage src="/images/slope.svg" description="슬로프" />
)}
</IconsSection>
)
}

const IconsSection = styled.section`
display: flex;
margin-top: 0.5rem;
justify-content: flex-end;
`
const IconWrapper = styled.div<{ hasDescription: boolean }>`
margin: 0 ${({ hasDescription }) => (hasDescription ? 0.4 : 0.1)}rem;
display: flex;
flex-direction: column;
align-items: center;
`
const DescriptionText = styled.div`
margin-top: 0.4rem;
font-size: 0.7rem;
`

export default FacilitiesIcons
25 changes: 4 additions & 21 deletions components/common/PlaceInfo.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
import Image from 'next/image'
import Link from 'next/link'
import styled from '@emotion/styled'
import { PlaceInfoType } from '../../types'
import { conceptColors } from './BaseLayout'
import Text from './Text'
import FacilitiesIcons from './FacilitiesIcons'

const PlaceInfo = ({ place }: { place: PlaceInfoType }) => {
const IconImage = ({ src }: { src: string }) => (
<IconWrapper>
<Image src={src} width={30} height={30} />
</IconWrapper>
)

return (
<Link href={`detail/${place._id}`}>
<PlaceInfoContainer>
Expand All @@ -29,12 +23,7 @@ const PlaceInfo = ({ place }: { place: PlaceInfoType }) => {
<Text color="#b0b0b0" size={0.8}>
{place.address}
</Text>
<IconsSection>
{place.isToiletExists && <IconImage src="/images/toilet.svg" />}
{place.isChargerExists && <IconImage src="/images/charger.svg" />}
{place.isElevatorExists && <IconImage src="/images/elevator.svg" />}
{place.isSlopeExists && <IconImage src="/images/slope.svg" />}
</IconsSection>
<FacilitiesIcons place={place} size={30} hasDescription={false} />
</PlaceInfoContainer>
</Link>
)
Expand All @@ -59,13 +48,7 @@ const NameTypeSection = styled.section`
margin-left: 0.4rem;
}
`
const IconsSection = styled.section`
display: flex;
margin-top: 0.5rem;
justify-content: flex-end;
`
const IconWrapper = styled.div`
margin: 0 0.1rem;
`

export { NameTypeSection }

export default PlaceInfo
2 changes: 1 addition & 1 deletion components/common/Text.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const Text = ({ children, color, size = 1, bold }: TextType) => {
)
}

const StyledText = styled.div<TextType>`
export const StyledText = styled.div<TextType>`
seohyun319 marked this conversation as resolved.
Show resolved Hide resolved
color: ${({ color }) => color};
font-size: ${({ size }) => size}rem;
font-weight: ${({ bold }) => bold && 'bold'};
Expand Down
60 changes: 60 additions & 0 deletions components/common/ToggleView.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import React from 'react'
import { styled } from '@mui/material/styles'
import MuiAccordion, { AccordionProps } from '@mui/material/Accordion'
import AccordionDetails from '@mui/material/AccordionDetails'
import MuiAccordionSummary, {
AccordionSummaryProps,
} from '@mui/material/AccordionSummary'
import ExpandMoreIcon from '@mui/icons-material/ExpandMore'

const ToggleView = ({
children,
title,
}: {
children: React.ReactNode
title: string
}) => {
const [expanded, setExpanded] = React.useState<string | false>(false)
seohyun319 marked this conversation as resolved.
Show resolved Hide resolved

const handleChange =
(panel: string) => (event: React.SyntheticEvent, isExpanded: boolean) => {
setExpanded(isExpanded ? panel : false)
}

return (
<Accordion
expanded={expanded === 'panel1'}
seohyun319 marked this conversation as resolved.
Show resolved Hide resolved
onChange={handleChange('panel1')}
>
<AccordionSummary expandIcon={<ExpandMoreIcon />}>
{title}
</AccordionSummary>
<AccordionDetails>{children}</AccordionDetails>
</Accordion>
)
}

const Accordion = styled((props: AccordionProps) => (
<MuiAccordion disableGutters elevation={0} {...props} />
))(() => ({
border: 'none',
}))

const AccordionSummary = styled((props: AccordionSummaryProps) => (
<MuiAccordionSummary {...props} />
))(() => ({
flexDirection: 'row-reverse',
minHeight: '0px',
'& .MuiAccordionSummary-expandIconWrapper': {
transform: 'rotate(-90deg)',
},
'& .MuiAccordionSummary-expandIconWrapper.Mui-expanded': {
transform: 'rotate(0deg)',
},
'& .MuiAccordionSummary-content': {
margin: '0.4rem',
flexGrow: 'inherit',
},
}))

export default ToggleView
74 changes: 74 additions & 0 deletions components/detail/ChargerInfoToggle.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
import styled from '@emotion/styled'
import { chargerDetail } from '../../data'
import Text from '../common/Text'
import ToggleView from '../common/ToggleView'

const ChargerInfoToggle = () => {
const charger = chargerDetail.data

type ChargerInfoType = {
title: string
data: string
}

const ChargerInfoList: ChargerInfoType[] = [
{
title: '설치 장소',
data: charger.instllcdesc,
},
{
title: '공기 주입 가능',
data: charger.airinjectoryn,
},
{
title: '휴대전화 충전',
data: charger.moblphonchrstnyn,
},
{ title: '동시 사용 가능 대수', data: charger.smtmuseco },
{
title: '평일 운영 시간',
data: `${charger.weekdayoperopenhhmm} ~ ${charger.weekdayopercolsehhmm}`,
},
{
title: '토요일 운영 시간',
data: `${charger.satoperoperopenhhmm} ~ ${charger.satoperclosehhmm}`,
},
{
title: '공휴일 운영 시간',
data: `${charger.holidayoperopenhhmm} ~ ${charger.holidaycloseopenhhmm}`,
},
{ title: '시설명', data: charger.fcltynm },
{ title: '관리기관명', data: charger.institutionnm },
{ title: '관리기관 번호', data: charger.institutionphonenumber },
{ title: '데이터 기준 일자', data: charger.referencedate },
]

return (
<ChargerInfoToggleSection>
<ToggleView title="휠체어 충전기 세부 정보 보기">
{ChargerInfoList.map((chargerInfo: ChargerInfoType, index: number) => (
<ChargerInfoWrapper key={index}>
<Text bold>{chargerInfo.title}</Text>
<ChargerDataText>{chargerInfo.data}</ChargerDataText>
</ChargerInfoWrapper>
))}
</ToggleView>
</ChargerInfoToggleSection>
)
}

const ChargerInfoToggleSection = styled.section`
display: flex;
justify-content: center;
margin: 1rem 0;
`
const ChargerInfoWrapper = styled.div`
display: flex;
justify-content: space-between;
margin: 0.1rem;
`
const ChargerDataText = styled.div`
margin-left: 3rem;
`

export default ChargerInfoToggle
64 changes: 64 additions & 0 deletions components/detail/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import Link from 'next/link'
import styled from '@emotion/styled'
import { placeDetail, reviewAverageCount } from '../../data'
import { PlaceInfoType } from '../../types'
import FacilitiesIcons from '../common/FacilitiesIcons'
import { NameTypeSection } from '../common/PlaceInfo'
import Text, { StyledText } from '../common/Text'
import ChargerInfoToggle from './ChargerInfoToggle'

const Detail = () => {
const place: PlaceInfoType = placeDetail.response
// TODO: 동적 id와 실데이터 연결

return (
<DetailContainer>
<Link href={`/`}>◀ 뒤로 가기</Link>
{/* TODO: 모바일 환경에서는 /list (리스트로 가기) */}
<DetailInfoSection>
<NameTypeSection>
<Text size={1.2} bold>
{place.name}
</Text>
<Text color="#00B8E0" size={0.8}>
{place.locationType}
</Text>
</NameTypeSection>
<AddressText color="#b0b0b0" size={0.8}>
{place.address}
</AddressText>
{reviewAverageCount && (
<ReviewAverageCountSection>
{reviewAverageCount.average}
<Text>
(리뷰 <b>{reviewAverageCount.count}</b>
개)
</Text>
</ReviewAverageCountSection>
)}
<FacilitiesIcons place={place} size={50} hasDescription />
</DetailInfoSection>
<ChargerInfoToggle />
{/* <ReviewPage locationId={id} /> */}
</DetailContainer>
)
}

const DetailContainer = styled.article`
margin-top: 0.4rem;
`
const DetailInfoSection = styled.section`
display: flex;
flex-direction: column;
align-items: center;
margin: 0.4rem 0;
`
const AddressText = styled(StyledText)`
margin-top: 0.4rem;
`
const ReviewAverageCountSection = styled.section`
display: flex;
margin: 1rem 0;
`

export default Detail
Loading