Skip to content

Commit

Permalink
Merge 72f9bd1 into 71621a2
Browse files Browse the repository at this point in the history
  • Loading branch information
n-ryu committed Dec 16, 2022
2 parents 71621a2 + 72f9bd1 commit d448b99
Show file tree
Hide file tree
Showing 7 changed files with 1,295 additions and 238 deletions.
5 changes: 3 additions & 2 deletions client/src/container/main/TodoStatus.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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;
Expand Down Expand Up @@ -47,7 +48,7 @@ const TodoStatus = (): ReactElement => {
fontSize={'18px'}
fontWeight={'700'}
/>
{userState === 'working' ? <Image src={Working} transform={transform} /> : <Relaxing transform={transform} />}
{userState === 'working' ? <Working transform={transform} /> : <Relaxing transform={transform} />}
<BlankBox />
</Wrapper>
<Hr />
Expand Down
5 changes: 2 additions & 3 deletions client/src/container/todos/TodosHeader.tsx
Original file line number Diff line number Diff line change
@@ -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%;
Expand All @@ -13,7 +12,7 @@ const TodosHeader = (): ReactElement => {
return (
<Wrapper>
<Text textAlign={'left'} margin={'0 25px'} text="할일 전체보기" />
<Image src={Waiting} />
<Waiting />
</Wrapper>
);
};
Expand Down
345 changes: 188 additions & 157 deletions client/src/images/Relaxing.tsx

Large diffs are not rendered by default.

153 changes: 77 additions & 76 deletions client/src/images/Waiting.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
641 changes: 641 additions & 0 deletions client/src/images/Waiting.tsx

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions client/src/images/Working.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit d448b99

Please sign in to comment.