Skip to content

Commit

Permalink
Merge pull request #160 from pkiop/feat/datepicker
Browse files Browse the repository at this point in the history
날짜 선택 위한 datepicker 추가
  • Loading branch information
pkiop committed Jan 18, 2021
2 parents de24027 + 2638fe1 commit 55bdcef
Show file tree
Hide file tree
Showing 7 changed files with 93 additions and 7 deletions.
2 changes: 2 additions & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"query-string": "^6.13.7",
"react": "^17.0.1",
"react-apollo": "^3.1.5",
"react-datepicker": "^3.4.1",
"react-dom": "^17.0.1",
"react-redux": "^7.2.2",
"react-router-dom": "^5.2.0",
Expand All @@ -47,6 +48,7 @@
"@storybook/node-logger": "^6.1.10",
"@storybook/preset-create-react-app": "^3.1.5",
"@storybook/react": "^6.1.10",
"@types/react-datepicker": "^3.1.2",
"@types/react-redux": "^7.1.11",
"@types/react-router-dom": "^5.1.6",
"@types/redux-actions": "^2.6.1",
Expand Down
20 changes: 20 additions & 0 deletions frontend/src/components/UI/atoms/DatePicker/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import React, { useState } from 'react';
import ReactDatePicker from 'react-datepicker';

import 'react-datepicker/dist/react-datepicker.css';

interface Props {
className?: string;
}
function DatePicker({ className }: Props) {
const [startDate, setStartDate] = useState<Date>(new Date());

return (
<ReactDatePicker
className={className}
selected={startDate}
onChange={(date:Date) => setStartDate(date)}
/>);
}

export default DatePicker;
4 changes: 2 additions & 2 deletions frontend/src/components/UI/atoms/Img/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ export interface Props {
className?: string;
}

function App({ src, className }: Props) {
function Img({ src, className }: Props) {
return (
<>
<S.Img src={src} className={className} />
</>
);
}

export default App;
export default Img;
2 changes: 1 addition & 1 deletion frontend/src/components/UI/organisms/HeaderBar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function App({ className }: Props) {
<S.HeaderBar className={className}>
<S.Logo src={LogoImg} />
<S.DigitalClockWrap>
<S.DigitalClock />
<S.DatePicker />
</S.DigitalClockWrap>
<S.UserProfile>
<S.UserImg src={userImage} />
Expand Down
12 changes: 12 additions & 0 deletions frontend/src/components/UI/organisms/HeaderBar/style.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import styled from 'styled-components';
import Img from 'components/UI/atoms/Img';
import DigitalClockComponent from 'components/UI/atoms/DigitalClock';
import DatePickerComponent from 'components/UI/atoms/DatePicker';

export const HeaderBar = styled.div`
background-color: ${({ theme }) => theme.color.black};
Expand All @@ -22,6 +23,17 @@ export const DigitalClockWrap = styled.div`
padding: 0.3rem;
`;

export const DatePicker = styled(DatePickerComponent)`
background-color: black ;
color: white ;
text-align: center;
color: transparent;
text-shadow: 0 0 0 white;
:focus {
outline: none;
}
`;

export const DigitalClock = styled(DigitalClockComponent)`
width: 3.25rem;
color: white;
Expand Down
1 change: 0 additions & 1 deletion frontend/src/components/UI/organisms/RecodeInput/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ function RecodeInput({
endMinRef.current.value = '';
}
}
useEffect(() => {}, [recodeId]);

return (
<S.RecodeInput className={className}>
Expand Down
59 changes: 56 additions & 3 deletions frontend/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4131,6 +4131,15 @@
"@types/react" "*"
"@types/reactcss" "*"

"@types/react-datepicker@^3.1.2":
version "3.1.2"
resolved "https://registry.yarnpkg.com/@types/react-datepicker/-/react-datepicker-3.1.2.tgz#72c80a16ec2c323e8f51063e08b3c24f41352ed3"
integrity sha512-luMH1fUF3GRJwaNFh4cogHV7FSFCJLU8Ai2dZ60Xw0n+MrExvuwOHxcbNkaIkIztPwyuT0H0K8Q4g0RN88LoFQ==
dependencies:
"@types/react" "*"
date-fns "^2.0.1"
popper.js "^1.14.1"

"@types/react-dom@^16.9.8":
version "16.9.10"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.10.tgz#4485b0bec3d41f856181b717f45fd7831101156f"
Expand Down Expand Up @@ -6492,7 +6501,7 @@ class-utils@^0.3.5:
isobject "^3.0.0"
static-extend "^0.1.1"

classnames@^2.2.5:
classnames@^2.2.5, classnames@^2.2.6:
version "2.2.6"
resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
Expand Down Expand Up @@ -6967,7 +6976,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
safe-buffer "^5.0.1"
sha.js "^2.4.8"

[email protected]:
[email protected], create-react-context@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.3.0.tgz#546dede9dc422def0d3fc2fe03afe0bc0f4f7d8c"
integrity sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==
Expand Down Expand Up @@ -7337,6 +7346,11 @@ data-urls@^2.0.0:
whatwg-mimetype "^2.3.0"
whatwg-url "^8.0.0"

date-fns@^2.0.1:
version "2.16.1"
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.16.1.tgz#05775792c3f3331da812af253e1a935851d3834b"
integrity sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ==

[email protected], debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
Expand Down Expand Up @@ -7390,7 +7404,7 @@ deep-diff@^0.3.5:
resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84"
integrity sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ=

deep-equal@^1.0.1:
deep-equal@^1.0.1, deep-equal@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==
Expand Down Expand Up @@ -12795,6 +12809,11 @@ [email protected]:
resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz#cf6847b807da3799d80ee3d6d2f90df8a3f50b05"
integrity sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA==

popper.js@^1.14.1, popper.js@^1.14.4:
version "1.16.1"
resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==

portfinder@^1.0.26:
version "1.0.28"
resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
Expand Down Expand Up @@ -13847,6 +13866,17 @@ react-color@^2.17.0:
reactcss "^1.2.0"
tinycolor2 "^1.4.1"

react-datepicker@^3.4.1:
version "3.4.1"
resolved "https://registry.yarnpkg.com/react-datepicker/-/react-datepicker-3.4.1.tgz#3c8e8989f1ab31a767c17170a2d1318aa3c3b9ef"
integrity sha512-ASyVb7UmVx1vzeITidD7Cr/EXRXhKyjjbSkBndPc1MipYq4rqQ3eMFgvRQzpsXc3JmIMFgICm7nmN6Otc1GE/Q==
dependencies:
classnames "^2.2.6"
date-fns "^2.0.1"
prop-types "^15.7.2"
react-onclickoutside "^6.9.0"
react-popper "^1.3.4"

react-dev-utils@^10.0.0:
version "10.2.1"
resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.1.tgz#f6de325ae25fa4d546d09df4bb1befdc6dd19c19"
Expand Down Expand Up @@ -14030,6 +14060,11 @@ react-native-get-random-values@^1.4.0:
dependencies:
fast-base64-decode "^1.0.0"

react-onclickoutside@^6.9.0:
version "6.9.1"
resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.9.1.tgz#44f94aba8e82721f2550fbd187c7d2d4669eab14"
integrity sha512-fkeEZOym0eyf8pemEUFRI6rttdREwfYtNWpN9msWsYtwz0G+w1KeKODc466lKJtfMHn3u8gVmBnGPf2fQ9LxoQ==

react-popper-tooltip@^3.1.0:
version "3.1.1"
resolved "https://registry.yarnpkg.com/react-popper-tooltip/-/react-popper-tooltip-3.1.1.tgz#329569eb7b287008f04fcbddb6370452ad3f9eac"
Expand All @@ -14039,6 +14074,19 @@ react-popper-tooltip@^3.1.0:
"@popperjs/core" "^2.5.4"
react-popper "^2.2.4"

react-popper@^1.3.4:
version "1.3.7"
resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.7.tgz#f6a3471362ef1f0d10a4963673789de1baca2324"
integrity sha512-nmqYTx7QVjCm3WUZLeuOomna138R1luC4EqkW3hxJUrAe+3eNz3oFCLYdnPwILfn0mX1Ew2c3wctrjlUMYYUww==
dependencies:
"@babel/runtime" "^7.1.2"
create-react-context "^0.3.0"
deep-equal "^1.1.1"
popper.js "^1.14.4"
prop-types "^15.6.1"
typed-styles "^0.0.7"
warning "^4.0.2"

react-popper@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.2.4.tgz#d2ad3d2474ac9f1abf93df3099d408e5aa6a2e22"
Expand Down Expand Up @@ -16246,6 +16294,11 @@ type@^2.0.0:
resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"
integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==

typed-styles@^0.0.7:
version "0.0.7"
resolved "https://registry.yarnpkg.com/typed-styles/-/typed-styles-0.0.7.tgz#93392a008794c4595119ff62dde6809dbc40a3d9"
integrity sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q==

typedarray-to-buffer@^3.1.5:
version "3.1.5"
resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
Expand Down

0 comments on commit 55bdcef

Please sign in to comment.