Skip to content

Commit

Permalink
Merge pull request #107 from capstone-maru/dev
Browse files Browse the repository at this point in the history
release: v0.8.0
  • Loading branch information
cjeongmin authored May 29, 2024
2 parents de5a772 + d9849ca commit 1ebad12
Show file tree
Hide file tree
Showing 43 changed files with 1,137 additions and 222 deletions.
2 changes: 1 addition & 1 deletion package.json
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",
Expand Down
1 change: 1 addition & 0 deletions public/icon-check.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/profile_img.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/profile_img_nonpercent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/app/error/page.tsx
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 />;
}
1 change: 1 addition & 0 deletions src/app/lib/axios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ axios.interceptors.response.use(
return await axios(config);
}
} catch (refreshError) {
window.location.href = '/';
return await Promise.reject(error);
} finally {
isRefreshing = false;
Expand Down
49 changes: 49 additions & 0 deletions src/app/pages/error-page.tsx
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>
);
}
1 change: 1 addition & 0 deletions src/app/pages/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ export * from './setting-page';
export * from './user-input-page';
export * from './writing-post-page';
export * from './shared-posts-page';
export * from './error-page';
2 changes: 1 addition & 1 deletion src/app/pages/mobile/mobile-main-page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ export function MobileMainPage() {
<UserCard
name={nickname}
percentage={score}
location={location}
profileImage={profileImageUrl}
location={location}
/>
</Link>
),
Expand Down
Loading

0 comments on commit 1ebad12

Please sign in to comment.