From 92f252c7b94e4d96b2c3e4f37d74dc42d399dd67 Mon Sep 17 00:00:00 2001 From: n-ryu Date: Thu, 15 Dec 2022 16:14:53 +0900 Subject: [PATCH 01/11] =?UTF-8?q?fix:=20Working=20Image=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20Relaxing=20=EC=9D=B4=EB=AF=B8=EC=A7=80?= =?UTF-8?q?=20=EC=9C=84=EC=B9=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/container/main/TodoStatus.tsx | 1 + client/src/images/Relaxing.tsx | 9 ++++++++- client/src/images/Working.svg | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/client/src/container/main/TodoStatus.tsx b/client/src/container/main/TodoStatus.tsx index 1120d5b..b1f00c7 100644 --- a/client/src/container/main/TodoStatus.tsx +++ b/client/src/container/main/TodoStatus.tsx @@ -14,6 +14,7 @@ import { todoStatusText } from '@util/Common'; const Wrapper = styled.div` width: 850px; + height: 280px; padding: 0 6px; display: flex; flex-direction: row; diff --git a/client/src/images/Relaxing.tsx b/client/src/images/Relaxing.tsx index eff67e8..227d7c0 100644 --- a/client/src/images/Relaxing.tsx +++ b/client/src/images/Relaxing.tsx @@ -35,7 +35,14 @@ const Wrapper = styled.div` const Relaxing = ({ transform }: PropsType): ReactElement => { return ( - + + + From 528934ec9be20c9c2fa5993a2a1ee8178541f1c1 Mon Sep 17 00:00:00 2001 From: n-ryu Date: Thu, 15 Dec 2022 16:40:17 +0900 Subject: [PATCH 02/11] =?UTF-8?q?feat:=20=ED=85=8C=EC=9D=B4=EB=B8=94=20?= =?UTF-8?q?=EB=B7=B0=EC=9D=98=20=ED=9E=88=EC=96=B4=EB=A1=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=8B=9C=EA=B3=84=20=EC=95=A0=EB=8B=88?= =?UTF-8?q?=EB=A9=94=EC=9D=B4=EC=85=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/container/todos/TodosHeader.tsx | 5 +- client/src/images/Waiting.svg | 153 ++--- client/src/images/Waiting.tsx | 629 +++++++++++++++++++++ client/src/images/Waiting_HourHand.svg | 3 + client/src/images/Waiting_MinuteHand.svg | 3 + 5 files changed, 714 insertions(+), 79 deletions(-) create mode 100644 client/src/images/Waiting.tsx create mode 100644 client/src/images/Waiting_HourHand.svg create mode 100644 client/src/images/Waiting_MinuteHand.svg diff --git a/client/src/container/todos/TodosHeader.tsx b/client/src/container/todos/TodosHeader.tsx index 114d0b8..ed42437 100644 --- a/client/src/container/todos/TodosHeader.tsx +++ b/client/src/container/todos/TodosHeader.tsx @@ -1,8 +1,7 @@ import { ReactElement, memo } from 'react'; -import Waiting from '@images/Waiting.svg'; -import Image from '@components/Image'; import Text from '@components/Text'; import styled from 'styled-components'; +import Waiting from '@images/Waiting'; const Wrapper = styled.div` width: 100%; @@ -13,7 +12,7 @@ const TodosHeader = (): ReactElement => { return ( - + ); }; diff --git a/client/src/images/Waiting.svg b/client/src/images/Waiting.svg index a8a2cb2..fc2cfd7 100644 --- a/client/src/images/Waiting.svg +++ b/client/src/images/Waiting.svg @@ -1,77 +1,78 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/src/images/Waiting.tsx b/client/src/images/Waiting.tsx new file mode 100644 index 0000000..885dc3d --- /dev/null +++ b/client/src/images/Waiting.tsx @@ -0,0 +1,629 @@ +import { ReactElement } from 'react'; + +const Relaxing = (): ReactElement => { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +}; +export default Relaxing; diff --git a/client/src/images/Waiting_HourHand.svg b/client/src/images/Waiting_HourHand.svg new file mode 100644 index 0000000..8be8800 --- /dev/null +++ b/client/src/images/Waiting_HourHand.svg @@ -0,0 +1,3 @@ + + + diff --git a/client/src/images/Waiting_MinuteHand.svg b/client/src/images/Waiting_MinuteHand.svg new file mode 100644 index 0000000..ecafae6 --- /dev/null +++ b/client/src/images/Waiting_MinuteHand.svg @@ -0,0 +1,3 @@ + + + From 0e9f6dc20e80adfc1f2552e311b14848fcc0a9b3 Mon Sep 17 00:00:00 2001 From: n-ryu Date: Thu, 15 Dec 2022 16:40:33 +0900 Subject: [PATCH 03/11] =?UTF-8?q?chore:=20=ED=95=84=EC=9A=94=20=EC=97=86?= =?UTF-8?q?=EB=8A=94=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/images/Waiting_HourHand.svg | 3 --- client/src/images/Waiting_MinuteHand.svg | 3 --- 2 files changed, 6 deletions(-) delete mode 100644 client/src/images/Waiting_HourHand.svg delete mode 100644 client/src/images/Waiting_MinuteHand.svg diff --git a/client/src/images/Waiting_HourHand.svg b/client/src/images/Waiting_HourHand.svg deleted file mode 100644 index 8be8800..0000000 --- a/client/src/images/Waiting_HourHand.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/src/images/Waiting_MinuteHand.svg b/client/src/images/Waiting_MinuteHand.svg deleted file mode 100644 index ecafae6..0000000 --- a/client/src/images/Waiting_MinuteHand.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - From e48f53a1f65150ec7b9aecf0bdec57ff4b97c555 Mon Sep 17 00:00:00 2001 From: n-ryu Date: Thu, 15 Dec 2022 16:41:14 +0900 Subject: [PATCH 04/11] =?UTF-8?q?fix:=20=ED=85=8C=EC=9D=B4=EB=B8=94=20?= =?UTF-8?q?=EB=B7=B0=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=82=AC=EC=9D=B4?= =?UTF-8?q?=EC=A6=88=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/images/Waiting.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/images/Waiting.tsx b/client/src/images/Waiting.tsx index 885dc3d..a7544c9 100644 --- a/client/src/images/Waiting.tsx +++ b/client/src/images/Waiting.tsx @@ -2,7 +2,7 @@ import { ReactElement } from 'react'; const Relaxing = (): ReactElement => { return ( - + Date: Thu, 15 Dec 2022 17:03:05 +0900 Subject: [PATCH 05/11] =?UTF-8?q?feat:=20=ED=85=8C=EC=9D=B4=EB=B8=94=20?= =?UTF-8?q?=EB=B7=B0=20=ED=9E=88=EC=96=B4=EB=A1=9C=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=EC=97=90=20=EB=88=88=EC=95=8C=20=EC=9B=80=EC=A7=81?= =?UTF-8?q?=EC=9D=B4=EB=8A=94=20=EC=95=A0=EB=8B=88=EB=A9=94=EC=9D=B4?= =?UTF-8?q?=EC=85=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/images/Waiting.tsx | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/client/src/images/Waiting.tsx b/client/src/images/Waiting.tsx index a7544c9..8e1c0e6 100644 --- a/client/src/images/Waiting.tsx +++ b/client/src/images/Waiting.tsx @@ -78,7 +78,18 @@ const Relaxing = (): ReactElement => { strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" - /> + > + + { strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" - /> + > + + Date: Thu, 15 Dec 2022 17:04:20 +0900 Subject: [PATCH 06/11] =?UTF-8?q?fix:=20=ED=85=8C=EC=9D=B4=EB=B8=94=20?= =?UTF-8?q?=EB=B7=B0=20=ED=9E=88=EC=96=B4=EB=A1=9C=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EC=8B=9C=EC=B9=A8=20=EC=B4=88=EC=B9=A8=20=EC=83=89?= =?UTF-8?q?=EC=83=81=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/images/Waiting.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/images/Waiting.tsx b/client/src/images/Waiting.tsx index 8e1c0e6..4bc5846 100644 --- a/client/src/images/Waiting.tsx +++ b/client/src/images/Waiting.tsx @@ -612,7 +612,7 @@ const Relaxing = (): ReactElement => { { Date: Thu, 15 Dec 2022 17:56:52 +0900 Subject: [PATCH 07/11] =?UTF-8?q?feat:=20=EC=86=90=EA=B0=80=EB=9D=BD=20?= =?UTF-8?q?=EC=9B=80=EC=A7=81=EC=9E=84=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/container/main/TodoStatus.tsx | 4 +- client/src/images/Working.tsx | 287 +++++++++++++++++++++++ 2 files changed, 289 insertions(+), 2 deletions(-) create mode 100644 client/src/images/Working.tsx diff --git a/client/src/container/main/TodoStatus.tsx b/client/src/container/main/TodoStatus.tsx index b1f00c7..3e44f7f 100644 --- a/client/src/container/main/TodoStatus.tsx +++ b/client/src/container/main/TodoStatus.tsx @@ -5,7 +5,7 @@ import Image from '@components/Image'; import { isOnProgress, asyncActiveTodo } from '@util/GlobalState'; import { useAtom } from 'jotai'; -import Working from '@images/Working.svg'; +import Working from '@images/Working'; import Relaxing from '@images/Relaxing'; import styled from 'styled-components'; @@ -48,7 +48,7 @@ const TodoStatus = (): ReactElement => { fontSize={'18px'} fontWeight={'700'} /> - {userState === 'working' ? : } + {userState === 'working' ? : }
diff --git a/client/src/images/Working.tsx b/client/src/images/Working.tsx new file mode 100644 index 0000000..8001eb0 --- /dev/null +++ b/client/src/images/Working.tsx @@ -0,0 +1,287 @@ +import { ReactElement } from 'react'; +import styled from 'styled-components'; + +interface PropsType { + transform?: string; +} + +const Wrapper = styled.div` + transform: ${(props) => props.transform}; +`; +const Working = ({ transform }: PropsType): ReactElement => { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +}; +export default Working; From 0e9ba35f0e44d8dc970b5e880d9f31238484031d Mon Sep 17 00:00:00 2001 From: n-ryu Date: Thu, 15 Dec 2022 19:29:06 +0900 Subject: [PATCH 08/11] =?UTF-8?q?feat:=20=EC=86=90=EA=B0=80=EB=9D=BD=20?= =?UTF-8?q?=EC=95=A0=EB=8B=88=EB=A9=94=EC=9D=B4=EC=85=98=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/images/Working.tsx | 45 ++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/client/src/images/Working.tsx b/client/src/images/Working.tsx index 8001eb0..03b337f 100644 --- a/client/src/images/Working.tsx +++ b/client/src/images/Working.tsx @@ -45,8 +45,8 @@ const Working = ({ transform }: PropsType): ReactElement => { attributeName="transform" attributeType="XML" type="rotate" - from="0 304.65 185.589" - to="360 304.65 185.589" + values="0,304.65,185.589;15,304.65,185.589;0,304.65,185.589;" + keyTimes="0;0.5;1" dur="1s" repeatCount="indefinite" /> @@ -156,17 +156,24 @@ const Working = ({ transform }: PropsType): ReactElement => { strokeLinecap="round" strokeLinejoin="round" /> - + > + + { strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" - /> + > + + { strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" - /> + > + + Date: Thu, 15 Dec 2022 19:33:48 +0900 Subject: [PATCH 09/11] =?UTF-8?q?feat:=20working=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=EC=97=90=20=EB=88=88=20=EC=9B=80=EC=A7=81=EC=9D=B4?= =?UTF-8?q?=EB=8A=94=20=EC=95=A0=EB=8B=88=EB=A9=94=EC=9D=B4=EC=85=98=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/images/Working.tsx | 36 +++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/client/src/images/Working.tsx b/client/src/images/Working.tsx index 03b337f..d822a6b 100644 --- a/client/src/images/Working.tsx +++ b/client/src/images/Working.tsx @@ -121,20 +121,28 @@ const Working = ({ transform }: PropsType): ReactElement => { strokeLinecap="round" strokeLinejoin="round" /> - - + + + + + + Date: Fri, 16 Dec 2022 01:05:57 +0900 Subject: [PATCH 10/11] =?UTF-8?q?fix:=20=EC=86=90=EA=B0=80=EB=9D=BD=20?= =?UTF-8?q?=EC=95=A0=EB=8B=88=EB=A9=94=EC=9D=B4=EC=85=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/images/Working.tsx | 308 +++++++++++++++++++++------------- 1 file changed, 188 insertions(+), 120 deletions(-) diff --git a/client/src/images/Working.tsx b/client/src/images/Working.tsx index 03b337f..a9cf65d 100644 --- a/client/src/images/Working.tsx +++ b/client/src/images/Working.tsx @@ -17,26 +17,36 @@ const Working = ({ transform }: PropsType): ReactElement => { viewBox="0 0 600 280" fill="none" xmlns="http://www.w3.org/2000/svg" - transform="translate(0, 5)" + transform="translate(0,4)" > + > + + - { attributeName="transform" attributeType="XML" type="rotate" - values="0,304.65,185.589;15,304.65,185.589;0,304.65,185.589;" + dur="0.6s" + values="10,302.45,178.61;-10,302.45,178.61;10,302.45,178.61;" keyTimes="0;0.5;1" - dur="1s" repeatCount="indefinite" /> + > + + + > + + + > + + + > + + + > + + - - + /> + + + + + - - - + /> + - - + /> Date: Fri, 16 Dec 2022 11:13:45 +0900 Subject: [PATCH 11/11] =?UTF-8?q?fix:=20=EC=95=A0=EB=8B=88=EB=A9=94?= =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EB=94=94=ED=85=8C=EC=9D=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/images/Waiting.tsx | 54 ++++++++++++++--------------------- client/src/images/Working.tsx | 24 ++++++++-------- 2 files changed, 34 insertions(+), 44 deletions(-) diff --git a/client/src/images/Waiting.tsx b/client/src/images/Waiting.tsx index 4bc5846..97b6de1 100644 --- a/client/src/images/Waiting.tsx +++ b/client/src/images/Waiting.tsx @@ -71,44 +71,34 @@ const Relaxing = (): ReactElement => { strokeLinecap="round" strokeLinejoin="round" /> - + - - - - + + { type="rotate" from="0 531.115 200.567" to="360 531.115 200.567" - dur="60s" + dur="30s" repeatCount="indefinite" /> @@ -641,7 +631,7 @@ const Relaxing = (): ReactElement => { type="rotate" from="0 531.115 200.567" to="360 531.115 200.567" - dur="3600s" + dur="1800s" repeatCount="indefinite" /> diff --git a/client/src/images/Working.tsx b/client/src/images/Working.tsx index a9cf65d..a11d83d 100644 --- a/client/src/images/Working.tsx +++ b/client/src/images/Working.tsx @@ -38,7 +38,7 @@ const Working = ({ transform }: PropsType): ReactElement => { attributeType="XML" type="rotate" dur="0.5s" - values="-10,302.45,178.61;10,302.45,178.61;-10,302.45,178.61;" + values="-10,302.45,178.61;5,302.45,178.61;-10,302.45,178.61;" keyTimes="0;0.5;1" repeatCount="indefinite" /> @@ -56,7 +56,7 @@ const Working = ({ transform }: PropsType): ReactElement => { attributeType="XML" type="rotate" dur="0.6s" - values="10,302.45,178.61;-10,302.45,178.61;10,302.45,178.61;" + values="5,302.45,178.61;-10,302.45,178.61;5,302.45,178.61;" keyTimes="0;0.5;1" repeatCount="indefinite" /> @@ -75,7 +75,7 @@ const Working = ({ transform }: PropsType): ReactElement => { type="rotate" dur="0.5s" begin="0.1s" - values="10,302.45,178.61;-10,302.45,178.61;10,302.45,178.61;" + values="5,302.45,178.61;-10,302.45,178.61;5,302.45,178.61;" keyTimes="0;0.5;1" repeatCount="indefinite" /> @@ -94,7 +94,7 @@ const Working = ({ transform }: PropsType): ReactElement => { type="rotate" dur="0.8s" begin="0.2s" - values="10,302.45,178.61;-10,302.45,178.61;10,302.45,178.61;" + values="5,302.45,178.61;-10,302.45,178.61;5,302.45,178.61;" keyTimes="0;0.5;1" repeatCount="indefinite" /> @@ -127,7 +127,7 @@ const Working = ({ transform }: PropsType): ReactElement => { type="rotate" dur="0.8s" begin="0s" - values="10,362.67,181.97;-10,362.67,181.97;10,362.67,181.97;" + values="5,362.67,181.97;-10,362.67,181.97;5,362.67,181.97;" keyTimes="0;0.5;1" repeatCount="indefinite" /> @@ -153,7 +153,7 @@ const Working = ({ transform }: PropsType): ReactElement => { type="rotate" dur="0.8s" begin="0.4s" - values="10,362.67,181.97;-10,362.67,181.97;10,362.67,181.97;" + values="5,362.67,181.97;-10,362.67,181.97;5,362.67,181.97;" keyTimes="0;0.5;1" repeatCount="indefinite" /> @@ -170,9 +170,9 @@ const Working = ({ transform }: PropsType): ReactElement => { attributeName="transform" attributeType="XML" type="rotate" - dur="0.5s" + dur="0.7s" begin="0.4s" - values="10,346.52,193.2;-10,346.52,193.2;10,346.52,193.2;" + values="5,346.52,193.2;-10,346.52,193.2;5,346.52,193.2;" keyTimes="0;0.5;1" repeatCount="indefinite" /> @@ -259,10 +259,10 @@ const Working = ({ transform }: PropsType): ReactElement => { attributeName="transform" attributeType="XML" type="translate" - dur="1.5s" - begin="0.4s" - values="0,0;3,0;0,0" - keyTimes="0;0.7;1" + dur="3s" + begin="0s" + values="0,0;5,0;0,0" + keyTimes="0;0.75;1" repeatCount="indefinite" />