Skip to content

Commit 2bc559e

Browse files
SEOKKAMONISEOKKAMONI
authored
Merge pull request #313 from Bamdoliro/develop
Release - user v1.0.3
2 parents 3bbee65 + 5d33362 commit 2bc559e

File tree

79 files changed

+361
-297
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+361
-297
lines changed

‎apps/admin/src/app/layout.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ export const metadata = {
66
description: '부산소프트웨어마이스터고등학교 입학전형 시스템 마루의 어드민 페이지입니다.',
77
};
88

9-
interface PropsType {
9+
interface Props {
1010
children: ReactNode;
1111
}
1212

13-
const RootLayout = ({ children }: PropsType) => {
13+
const RootLayout = ({ children }: Props) => {
1414
return (
1515
<html lang="en">
1616
<body>

‎apps/admin/src/components/Provider.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import { GlobalStyle } from '@maru/theme';
44
import { ReactNode } from 'react';
55

6-
interface PropsType {
6+
interface Props {
77
children: ReactNode;
88
}
99

10-
const Provider = ({ children }: PropsType) => {
10+
const Provider = ({ children }: Props) => {
1111
return (
1212
<>
1313
<GlobalStyle />

‎apps/admin/src/components/common/ListHeader/ListHeader.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import { flex } from '@maru/utils';
33
import { ReactNode } from 'react';
44
import { styled } from 'styled-components';
55

6-
interface PropsType {
6+
interface Props {
77
children: ReactNode;
88
}
99

10-
const ListHeader = ({ children }: PropsType) => {
10+
const ListHeader = ({ children }: Props) => {
1111
return <StyledListHeader>{children}</StyledListHeader>;
1212
};
1313

‎apps/admin/src/components/common/ListItem/ListItem.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import { flex } from '@maru/utils';
33
import { ReactNode } from 'react';
44
import { styled } from 'styled-components';
55

6-
interface PropsType {
6+
interface Props {
77
children: ReactNode;
88
}
99

10-
const ListItem = ({ children }: PropsType) => {
10+
const ListItem = ({ children }: Props) => {
1111
return <StyledListItem>{children}</StyledListItem>;
1212
};
1313

‎apps/admin/src/layouts/AppLayout.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import { flex } from '@maru/utils';
33
import { ReactNode } from 'react';
44
import { styled } from 'styled-components';
55

6-
interface PropsType {
6+
interface Props {
77
children: ReactNode;
88
}
99

10-
const AppLayout = ({ children }: PropsType) => {
10+
const AppLayout = ({ children }: Props) => {
1111
return (
1212
<StyledAppLayout>
1313
<SideBar />
@@ -20,7 +20,7 @@ export default AppLayout;
2020

2121
const StyledAppLayout = styled.div`
2222
${flex({ flexDirection: 'row' })}
23-
width: 100vw;
23+
width: 100%;
2424
height: 100vh;
2525
`;
2626

‎apps/user/public/svg/error.svg‎

Lines changed: 9 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)