Merge pull request #313 from Bamdoliro/develop

Release - user v1.0.3
Bamdoliro · Aug 23, 2023 · 2bc559e · 2bc559e
2 parents 3bbee65 + 5d33362
commit 2bc559e
Show file tree

Hide file tree

Showing 79 changed files with 361 additions and 297 deletions.
diff --git a/apps/admin/src/app/layout.tsx b/apps/admin/src/app/layout.tsx
@@ -6,11 +6,11 @@ export const metadata = {
     description: '부산소프트웨어마이스터고등학교 입학전형 시스템 마루의 어드민 페이지입니다.',
 };
 
-interface PropsType {
+interface Props {
     children: ReactNode;
 }
 
-const RootLayout = ({ children }: PropsType) => {
+const RootLayout = ({ children }: Props) => {
     return (
         <html lang="en">
             <body>

diff --git a/apps/admin/src/components/Provider.tsx b/apps/admin/src/components/Provider.tsx
@@ -3,11 +3,11 @@
 import { GlobalStyle } from '@maru/theme';
 import { ReactNode } from 'react';
 
-interface PropsType {
+interface Props {
     children: ReactNode;
 }
 
-const Provider = ({ children }: PropsType) => {
+const Provider = ({ children }: Props) => {
     return (
         <>
             <GlobalStyle />

diff --git a/apps/admin/src/components/common/ListHeader/ListHeader.tsx b/apps/admin/src/components/common/ListHeader/ListHeader.tsx
@@ -3,11 +3,11 @@ import { flex } from '@maru/utils';
 import { ReactNode } from 'react';
 import { styled } from 'styled-components';
 
-interface PropsType {
+interface Props {
     children: ReactNode;
 }
 
-const ListHeader = ({ children }: PropsType) => {
+const ListHeader = ({ children }: Props) => {
     return <StyledListHeader>{children}</StyledListHeader>;
 };
 

diff --git a/apps/admin/src/components/common/ListItem/ListItem.tsx b/apps/admin/src/components/common/ListItem/ListItem.tsx
@@ -3,11 +3,11 @@ import { flex } from '@maru/utils';
 import { ReactNode } from 'react';
 import { styled } from 'styled-components';
 
-interface PropsType {
+interface Props {
     children: ReactNode;
 }
 
-const ListItem = ({ children }: PropsType) => {
+const ListItem = ({ children }: Props) => {
     return <StyledListItem>{children}</StyledListItem>;
 };
 

diff --git a/apps/admin/src/layouts/AppLayout.tsx b/apps/admin/src/layouts/AppLayout.tsx
@@ -3,11 +3,11 @@ import { flex } from '@maru/utils';
 import { ReactNode } from 'react';
 import { styled } from 'styled-components';
 
-interface PropsType {
+interface Props {
     children: ReactNode;
 }
 
-const AppLayout = ({ children }: PropsType) => {
+const AppLayout = ({ children }: Props) => {
     return (
         <StyledAppLayout>
             <SideBar />
@@ -20,7 +20,7 @@ export default AppLayout;
 
 const StyledAppLayout = styled.div`
     ${flex({ flexDirection: 'row' })}
-    width: 100vw;
+    width: 100%;
     height: 100vh;
 `;
 

diff --git a/apps/user/public/svg/error.svg b/apps/user/public/svg/error.svg