Skip to content

Commit

Permalink
[Feat] #7 메모 수정 페이지 UI 추가
Browse files Browse the repository at this point in the history
  • Loading branch information
soyoungjeong committed May 5, 2020
1 parent 1fe2d1e commit 7f606d5
Show file tree
Hide file tree
Showing 15 changed files with 184 additions and 8 deletions.
2 changes: 2 additions & 0 deletions src/components/Header/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.24), 0px 0px 2px rgba(0, 0, 0, 0.12);
border-radius: 2px;

position: sticky;

background: #fafafa;
}

Expand Down
11 changes: 6 additions & 5 deletions src/containers/App/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ import styles from './styles.scss';
import Header from '../../components/Header';
import FolderList from '../../components/FolderList';
import MemoList from '../../components/MemoList';
import MemoEditPage from '../MemoEditPage';

const App = () => {
return <div className={styles.App}>
<Header />
{/* <FolderList /> */}
<MemoList />
</div>;
return (
<div className={styles.App}>
<MemoEditPage />
</div>
);
};

export default App;
10 changes: 7 additions & 3 deletions src/containers/App/styles.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
$font-color: blue;

body {
html, body {
height: 100%;
margin: 0;
padding: 0;

font-family: NanumSquare;

body > div {
height: 100%;
}
}

.App {
width: 100%;
height: 100%;
margin: 0;
padding: 0;
}
65 changes: 65 additions & 0 deletions src/containers/MemoEditPage/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import React from 'react';

import Header from '../../components/Header';
import styles from './styles.scss';

import bold from '../../images/edit/bold.png';
import ialic from '../../images/edit/italic.png';
import image from '../../images/edit/image.png';
import align from '../../images/edit/align.png';
import link from '../../images/edit/link.png';
import removeline from '../../images/edit/removeline.png';
import underline from '../../images/edit/underline.png';
import divider from '../../images/edit/divider.png';
import table from '../../images/edit/table.png';
import logo from '../../images/icon_64x64.png';
import folder from '../../images/body/folder_btn.png';

const MemoEditPage = () => {
return (
<div className={styles.edit_container}>
<Header />
<div className={styles.toolbar}>
<div className={styles.bold}>
<img src={bold} alt="bold" />
</div>
<div className={styles.italic}>
<img src={ialic} alt="ialic" />
</div>
<div className={styles.underline}>
<img src={underline} alt="underline" />
</div>
<div className={styles.removeline}>
<img src={removeline} alt="removeline" />
</div>
<div className={styles.divider}>
<img src={divider} alt="divider" />
</div>
<div className={styles.align}>
<img src={align} alt="align" />
</div>
<div className={styles.divider}>
<img src={divider} alt="divider" />
</div>
<div>
<img src={link} alt="link" />
</div>
<div>
<img src={image} alt="imagefile" />
</div>
<div>
<img src={table} alt="table" />
</div>
<div className={styles.logo}>
<img src={logo} alt="logo" />
</div>
<div className={styles.folder}>
<img src={folder} alt="folder" />
</div>
</div>
<div className={styles.edit_area} />
</div>
);
};

export default MemoEditPage;
87 changes: 87 additions & 0 deletions src/containers/MemoEditPage/styles.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
.edit_container {
width: 100%;
height: 100%;

background-color: #FFF1A6;

.toolbar {
display: flex;
flex-direction: row;
align-items: center;
padding: 7px 10px;
padding-top: 10px;
box-sizing: border-box;
margin-top: -5px;

width: 100%;

background-color: #EEEEEE;

div {
margin: 5px 8px;
cursor: pointer;
}

.bold {
width: 13px;
img {
width: 100%;
}
}

.italic {
padding-bottom: 1px;
width: 13px;
img {
width: 100%;
opacity: 54%;
}
}

.underline {
margin-top: 7px;
width: 13px;
img {
width: 100%;
opacity: 54%;
}
}

.removeline {
width: 18px;
img {
width: 100%;
}
}

.divider {
width: 1px;
cursor: none;
}

.align {
margin-left: 10px;
margin-right: 10px;
}

.logo {
width: 25px;

img {
width: 100%;
}
}

.folder {
width: 25px;

img {
width: 100%;
}
}
}

.edit_area {
width: 100%;
}
}
17 changes: 17 additions & 0 deletions src/containers/MemoEditPage/styles.scss.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// This file is automatically generated.
// Please do not change this file!
interface CssExports {
'align': string;
'bold': string;
'divider': string;
'edit_area': string;
'edit_container': string;
'folder': string;
'italic': string;
'logo': string;
'removeline': string;
'toolbar': string;
'underline': string;
}
export const cssExports: CssExports;
export default cssExports;
Binary file added src/images/edit/align.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 src/images/edit/bold.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 src/images/edit/divider.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 src/images/edit/image.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 src/images/edit/italic.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 src/images/edit/link.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 src/images/edit/removeline.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 src/images/edit/table.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 src/images/edit/underline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7f606d5

Please sign in to comment.