-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #107 from capstone-maru/dev
release: v0.8.0
- Loading branch information
Showing
43 changed files
with
1,137 additions
and
222 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
{ | ||
"name": "maru", | ||
"version": "0.7.0", | ||
"version": "0.8.0", | ||
"private": true, | ||
"scripts": { | ||
"dev": "next dev", | ||
|
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
'use client'; | ||
|
||
import { ErrorPage } from '@/app/pages'; | ||
|
||
export default function Page() { | ||
return <ErrorPage />; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
'use client'; | ||
|
||
import Link from 'next/link'; | ||
import styled from 'styled-components'; | ||
|
||
const styles = { | ||
container: styled.div` | ||
display: flex; | ||
height: 100vh; | ||
width: 100vw; | ||
padding: 2rem 3rem; | ||
flex-direction: column; | ||
justify-content: center; | ||
align-items: center; | ||
gap: 1rem; | ||
align-self: stretch; | ||
h1 { | ||
color: #494949; | ||
text-align: center; | ||
font-family: 'Noto Sans KR'; | ||
font-size: 1.5rem; | ||
font-style: normal; | ||
font-weight: 700; | ||
line-height: normal; | ||
} | ||
`, | ||
|
||
title: styled.p` | ||
color: var(--Main-1, #e15637); | ||
font-family: 'Baloo 2'; | ||
font-size: 1.875rem; | ||
font-style: normal; | ||
font-weight: 700; | ||
line-height: normal; | ||
`, | ||
}; | ||
|
||
export function ErrorPage() { | ||
return ( | ||
<styles.container> | ||
<h1>존재하지 않는 페이지입니다.</h1> | ||
<styles.title> | ||
<Link href="/">maru</Link> | ||
</styles.title> | ||
</styles.container> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.