Skip to content

Commit

Permalink
Update button padding and alignment***
Browse files Browse the repository at this point in the history
***Update file find container margin and alignment***
***Update progress bar styling and dimensions***
***Update main page uploading state
  • Loading branch information
minpeter committed Mar 30, 2024
1 parent 427c1b2 commit dec10ab
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/components/Button/styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const ButtonContainer = styled.input<{ bgColor: string }>`
border-radius: 0.8rem;
margin: 0 1rem 0 1rem;
padding: 0.8rem 1.2rem;
padding: 0 3rem;
`;

ButtonContainer.defaultProps = { type: 'button' };
3 changes: 2 additions & 1 deletion src/components/FileFind/styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ export const FileFindContainer = styled.div`
width: 100%;
display: flex;
align-items: center;
margin-top: 2rem;
justify-content: center;
margin: 2rem 2rem 0 2rem;
`;

export const FileFindText = styled.p`
Expand Down
16 changes: 5 additions & 11 deletions src/components/Progress/styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ export const ProgressContainer = styled.div`
display: flex;
flex-direction: column;
align-items: center;
width: 100%;
`;

export const ProgressBar = styled.div<{ width: number }>`
display: flex;
min-width: 70rem;
min-height: 5.6rem;
background: var(--color-backgorund-progressbar);
border-radius: 1.5rem;
overflow: hidden;
border-radius: 0.5rem;
width: 90%;
height: 3rem;
&::before {
content: ' ';
transition: all 1s;
Expand All @@ -28,10 +29,3 @@ export const ProgressText = styled.div`
font-weight: 700;
margin-top: 2rem;
`;

export const ProgressAnimationBox = styled.div`
width: 20rem;
height: 20rem;
overflow: hidden;
margin-bottom: 1rem;
`;
8 changes: 4 additions & 4 deletions src/pages/main/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import * as S from './styled';
export function MainPage() {
const typingText = ['.', '..', '...'];
const [typingCount, setTypingCount] = useState(0);
const [uploading, setUploading] = useState(true);
const [uploading, setUploading] = useState(false);
const [progressValue, setProgressValue] = useState(0);
const [progressStateText, setProgressStateText] = useState('uploading');

Expand Down Expand Up @@ -145,8 +145,8 @@ export function MainPage() {
}, [typingCount]);
return (
<S.MainPageContainer>
{uploading ? (
<>
{!uploading ? (
<S.MainControlledSection>
<S.MainPageCheckBoxSection>
<CheckBox
click={() => sethideBoolean(!hideBoolean)}
Expand Down Expand Up @@ -191,7 +191,7 @@ export function MainPage() {
hideBoolean={hideBoolean}
/>
<UpLoadButton type={'button'} value={'업로드'} onClick={UpLoad} />
</>
</S.MainControlledSection>
) : (
<Progress
value={progressValue}
Expand Down
10 changes: 10 additions & 0 deletions src/pages/main/styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ export const MainPageContainer = styled.div`
display: flex;
flex-direction: column;
align-items: center;
width: 100%;
justify-content: center;
`;
export const MainControlledSection = styled.div`
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
width: 100%;
`;

export const MainPageCheckBoxSection = styled.div`
Expand Down

0 comments on commit dec10ab

Please sign in to comment.