code stringlengths 41 34.3k | lang stringclasses 8
values | review stringlengths 1 4.74k |
|---|---|---|
@@ -0,0 +1,212 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import Nav from '../../../Components/Nav/Nav';
+import FeedList from './FeedList';
+import './Main.scss';
+
+class Main extends React.Component {
+ render() {
+ return (
+ <>
+ <Nav />
+ <div className="main-container">
+ <main className="section-container">
+ <section className="main-section">
+ <div className="left-contents">
+ <div className="stories">
+ <div className="story-container">
+ <div className="story">
+ <div className="story-link-container">
+ <Link to="/main" className="story-link">
+ <div className="link-background">
+ <div className="image-container">
+ <div className="image-link"></div>
+ </div>
+ </div>
+ </Link>
+ </div>
+ <span className="story-name">name</span>
+ </div>
+
+ <div className="story">
+ <div className="story-link-container">
+ <Link to="/main" className="story-link">
+ <div className="link-background">
+ <div className="image-container">
+ <div className="image-link"></div>
+ </div>
+ </div>
+ </Link>
+ </div>
+ <span className="story-name">name</span>
+ </div>
+
+ <div className="story">
+ <div className="story-link-container">
+ <Link to="/main" className="story-link">
+ <div className="link-background">
+ <div className="image-container">
+ <div className="image-link"></div>
+ </div>
+ </div>
+ </Link>
+ </div>
+ <span className="story-name">name</span>
+ </div>
+ </div>
+ </div>
+
+ <FeedList />
+ </div>
+
+ <aside className="right-contents-container">
+ <div className="right-contents">
+ <div className="profile-container transparent">
+ <div className="profile transparent">
+ <Link to="/main" className="userid-link">
+ <img
+ src="/images/hyunchanpark//images/user-icon.jpg"
+ alt="user๋์ ํ๋กํ ์ฌ์ง"
+ />
+ </Link>
+ <div className="userinfo-text">
+ <Link to="/main">userId</Link>
+ <span>username</span>
+ </div>
+ </div>
+ <button className="transparent">์ ํ</button>
+ </div>
+
+ <div className="recommend-container transparent">
+ <div className="recommend transparent">
+ <span>ํ์๋์ ์ํ ์ถ์ฒ</span>
+ <Link to="/main" className="suggest">
+ ๋ชจ๋ ๋ณด๊ธฐ
+ </Link>
+ </div>
+ <ul className="recommend-list">
+ <li className="recommend-item">
+ <div className="item">
+ <Link to="/main" className="item-link">
+ <img
+ src="/images/hyunchanpark/images/insta-sprite.png"
+ alt="other user"
+ />
+ </Link>
+ <div className="username">
+ <Link to="/main">imsj208</Link>
+ <span>kingwoobinkim๋ ์ธ 6๋ช
์ด ํ๋ก์ฐํฉ๋๋ค</span>
+ </div>
+ </div>
+ <button className="follow-button transparent">
+ ํ๋ก์ฐ
+ </button>
+ </li>
+ <li className="recommend-item">
+ <div className="item">
+ <Link to="/main" className="item-link">
+ <img
+ src="/images/hyunchanpark/images/insta-sprite.png"
+ alt="other user"
+ />
+ </Link>
+ <div className="username">
+ <Link to="/main">jinhyung.lee.5832</Link>
+ <span>ycw12495๋ ์ธ 1๋ช
์ด ํ๋ก์ฐํฉ๋๋ค</span>
+ </div>
+ </div>
+ <button className="follow-button transparent">
+ ํ๋ก์ฐ
+ </button>
+ </li>
+ <li className="recommend-item">
+ <div className="item">
+ <Link to="/main" className="item-link">
+ <img
+ src="/images/hyunchanpark/images/insta-sprite.png"
+ alt="other user"
+ />
+ </Link>
+ <div className="username">
+ <Link to="/main">msc_940216</Link>
+ <span>ํ์๋์ ํ๋ก์ฐํฉ๋๋ค</span>
+ </div>
+ </div>
+ <button className="follow-button transparent">
+ ํ๋ก์ฐ
+ </button>
+ </li>
+ </ul>
+ </div>
+
+ <footer>
+ <ul>
+ <li>
+ <Link to="/main">
+ <span>์๊ฐ</span>
+ </Link>
+ </li>
+ <li>
+ <Link to="/main">
+ <span>๋์๋ง</span>
+ </Link>
+ </li>
+ <li>
+ <Link to="/main">
+ <span>ํ๋ณด์ผํฐ</span>
+ </Link>
+ </li>
+ <li>
+ <Link to="/main">
+ <span>API</span>
+ </Link>
+ </li>
+ <li>
+ <Link to="/main">
+ <span>์ฑ์ฉ์ ๋ณด</span>
+ </Link>
+ </li>
+ <li>
+ <Link to="/main">
+ <span>๊ฐ์ธ์ ๋ณด์ฒ๋ฆฌ๋ฐฉ์นจ</span>
+ </Link>
+ </li>
+ <li>
+ <Link to="/main">
+ <span>์ฝ๊ด</span>
+ </Link>
+ </li>
+ <li>
+ <Link to="/main">
+ <span>์์น</span>
+ </Link>
+ </li>
+ <li>
+ <Link to="/main">
+ <span>์ธ๊ธฐ๊ณ์ </span>
+ </Link>
+ </li>
+ <li>
+ <Link to="/main">
+ <span>ํด์ํ๊ทธ</span>
+ </Link>
+ </li>
+ <li>
+ <Link to="/main">
+ <span>์ธ์ด</span>
+ </Link>
+ </li>
+ </ul>
+ <span>ยฉ 2021 Instagram from Facebook</span>
+ </footer>
+ </div>
+ </aside>
+ </section>
+ </main>
+ </div>
+ </>
+ );
+ }
+}
+
+export default Main; | JavaScript | ์๊ธฐ ์ฝ๋๋ ์ ์ฒด๋ก a๋งํฌ๋ฅผ ์ฃผ์
จ์ต๋๋ค Link๋ก ์ฃผ์๋ฉด ์ข์๊ฑฐ ๊ฐ์ต๋๋ค |
@@ -0,0 +1,47 @@
+import React, { Component } from 'react';
+import { Link } from 'react-router-dom';
+import Comment from './Comment';
+
+class CommentList extends Component {
+ render() {
+ const { feedId, commentList, onToggleLike, onRemoveComment } = this.props;
+
+ return (
+ <>
+ <div>
+ <div className="all-comments-show">
+ <Link to="/main">
+ ๋๊ธ <span>12,739</span>๊ฐ ๋ชจ๋ ๋ณด๊ธฐ
+ </Link>
+ </div>
+
+ <div className="other-comments">
+ {commentList?.map((comment, i) => (
+ <Comment
+ key={i}
+ feedId={feedId}
+ comment={comment}
+ onToggleLike={onToggleLike}
+ onRemoveComment={onRemoveComment}
+ />
+ ))}
+ </div>
+
+ <div className="time-container">
+ <Link to="/main">
+ <time
+ className=""
+ dateTime="2021-05-17T18:16:28.000Z"
+ title="2021๋
5์ 18์ผ"
+ >
+ 2์ผ ์
+ </time>
+ </Link>
+ </div>
+ </div>
+ </>
+ );
+ }
+}
+
+export default CommentList; | JavaScript | formํ๊ทธ์ submit์ ์ถ๊ฐํ์
์ ์ํฐํค๋ฅผ ์ณ๋ ์
๋ ฅ์ด ๊ฐ๋ฅํ๊ฒ ํ์ ๋ณด๊ธฐ ์ข์ต๋๋ค!
์ด๋ ๊ฒ ํ๋ฉด ๋ฐ๋ก ์ํฐํค ํจ์๋ฅผ ๋ง๋ค์ง ์์๋ ๋๋๊น ์ข์๊ฑฐ ๊ฐ์ต๋๋ค ! |
@@ -0,0 +1,47 @@
+import React, { Component } from 'react';
+import { Link } from 'react-router-dom';
+import Comment from './Comment';
+
+class CommentList extends Component {
+ render() {
+ const { feedId, commentList, onToggleLike, onRemoveComment } = this.props;
+
+ return (
+ <>
+ <div>
+ <div className="all-comments-show">
+ <Link to="/main">
+ ๋๊ธ <span>12,739</span>๊ฐ ๋ชจ๋ ๋ณด๊ธฐ
+ </Link>
+ </div>
+
+ <div className="other-comments">
+ {commentList?.map((comment, i) => (
+ <Comment
+ key={i}
+ feedId={feedId}
+ comment={comment}
+ onToggleLike={onToggleLike}
+ onRemoveComment={onRemoveComment}
+ />
+ ))}
+ </div>
+
+ <div className="time-container">
+ <Link to="/main">
+ <time
+ className=""
+ dateTime="2021-05-17T18:16:28.000Z"
+ title="2021๋
5์ 18์ผ"
+ >
+ 2์ผ ์
+ </time>
+ </Link>
+ </div>
+ </div>
+ </>
+ );
+ }
+}
+
+export default CommentList; | JavaScript | ์๋์......์ญ์ ๊น์ง ๊ตฌํํ์ต๋๋ค. ใ
ใ
|
@@ -61,7 +61,10 @@ class Nav extends React.Component {
</a>
<a href="/">
<div className="profile-image">
- <img src="images/profile/me.jpeg" alt="me" />
+ <img
+ src="/images/hyunchanpark//images/user-icon.jpg"
+ alt="me"
+ />
</div>
</a>
</div> | JavaScript | [์ฐธ๊ณ ](https://stackoverflow.com/questions/43087007/react-link-vs-a-tag-and-arrow-function)
`<a>`๋ ์ฌ์ฉํ๋ฉด ์๋ก๊ณ ์นจ ํ๋ ๊ฒ์ฒ๋ผ html์ ์๋ก ๋ค ๋ฐ์ ์ค๋ ๋ฐ๋ฉด, `<Link>`๋ฅผ ์ฌ์ฉํ๋ฉด ์ปดํฌ๋ํธ๋ง ๋ฐ๊ฟ์ค๋๋ค. ๋ ๋๋ง ์ต์ ํ๋ฅผ ์ํด์ `<Link>` ์ฌ์ฉํด์ฃผ์ธ์! |
@@ -22,6 +22,7 @@ nav {
.title {
margin: 0;
font-size: 30px;
+ font-weight: 400;
font-family: 'Lobster', cursive;
}
@@ -44,5 +45,30 @@ nav {
font-weight: 300;
}
}
+
+ .path-icon {
+ display: flex;
+
+ a {
+ margin-left: 24px;
+ background-color: transparent;
+ border: none;
+
+ &:hover {
+ text-decoration: none;
+ }
+
+ .profile-image {
+ width: 22px;
+ height: 22px;
+
+ img {
+ width: 22px;
+ height: 22px;
+ border-radius: 50%;
+ }
+ }
+ }
+ }
}
} | Unknown | font-weight:400์ด ๊ธฐ๋ณธ์์ฑ์ธ๋ฐ ๋ฐ๋ก ๋ถ์ฌํ์ ์ด์ ๊ฐ ์๋์? |
@@ -0,0 +1,121 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { withRouter } from 'react-router';
+import './Login.scss';
+
+const REGEXP = {
+ emailRegExp:
+ /[a-zA-Z0-9.-_+!]+@[a-zA-Z0-9]+\.[a-zA-Z0-9]{2,}(?:.[a-zA-Z0-9]{2,3})?/,
+ passwordRegExp: /[a-zA-Z0-9]{5,100}/,
+};
+
+class Login extends React.Component {
+ constructor(props) {
+ super(props);
+
+ this.state = { userId: '', userPw: '' };
+ }
+
+ validate = (value, regExp) => {
+ const reg = new RegExp(regExp);
+ return reg.test(value);
+ };
+
+ validateInputData = (id, pw) => {
+ return (
+ this.validate(id, REGEXP.emailRegExp) &&
+ this.validate(pw, REGEXP.passwordRegExp)
+ );
+ };
+
+ handleInput = e => {
+ const { name, value } = e.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = e => {
+ e.preventDefault();
+
+ const { userId, userPw } = this.state;
+ if (!this.validateInputData(userId, userPw)) return;
+
+ this.props.history.push('/main');
+ };
+
+ render() {
+ const { userId, userPw } = this.state;
+
+ return (
+ <>
+ <section className="entire-container">
+ <div className="entire">
+ <div className="entire_top content">
+ <div className="login_container">
+ <h1>westagram</h1>
+ <div className="form_container">
+ <form onSubmit={this.handleSubmit}>
+ <input
+ type="text"
+ name="userId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ value={userId}
+ onChange={this.handleInput}
+ />
+ <input
+ type="password"
+ name="userPw"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ value={userPw}
+ onChange={this.handleInput}
+ />
+ <Link to="/main">
+ <button
+ className="login-button"
+ type="submit"
+ disabled={!this.validateInputData(userId, userPw)}
+ onClick={this.handleSubmit}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ </Link>
+ </form>
+
+ <div className="line_container">
+ <div className="line"></div>
+ <div className="line-word">๋๋</div>
+ <div className="line"></div>
+ </div>
+
+ <button className="social-login-button">
+ <img
+ src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pg0KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDE4LjAuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPg0KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCINCgkgdmlld0JveD0iMCAwIDQ1NS43MyA0NTUuNzMiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDQ1NS43MyA0NTUuNzM7IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIHN0eWxlPSJmaWxsOiMzQTU1OUY7IiBkPSJNMCwwdjQ1NS43M2gyNDIuNzA0VjI3OS42OTFoLTU5LjMzdi03MS44NjRoNTkuMzN2LTYwLjM1M2MwLTQzLjg5MywzNS41ODItNzkuNDc1LDc5LjQ3NS03OS40NzUNCgloNjIuMDI1djY0LjYyMmgtNDQuMzgyYy0xMy45NDcsMC0yNS4yNTQsMTEuMzA3LTI1LjI1NCwyNS4yNTR2NDkuOTUzaDY4LjUyMWwtOS40Nyw3MS44NjRoLTU5LjA1MVY0NTUuNzNINDU1LjczVjBIMHoiLz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjwvc3ZnPg0K"
+ alt="facebook button"
+ />
+ <span>Facebook์ผ๋ก ๋ก๊ทธ์ธ</span>
+ </button>
+ </div>
+
+ <Link to="/" className="search-password">
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </Link>
+ </div>
+ </div>
+
+ <div className="entire_bottom content">
+ <p>
+ ๊ณ์ ์ด ์์ผ์ ๊ฐ์?
+ <a href="https://www.instagram.com/accounts/emailsignup/">
+ ๊ฐ์
ํ๊ธฐ
+ </a>
+ </p>
+ </div>
+ </div>
+ </section>
+ </>
+ );
+ }
+}
+
+export default withRouter(Login); | JavaScript | ์ด ๊ฐ์ ์ปดํฌ๋ํธ๋ด๋ถ์ ๊ฐ์ผ๋ก ๊ฐ์ง๊ณ ์๋๊ฒ ์ข์๋ณด์ด๋๋ฐ ์ปดํฌ๋ํธ ๋ฐ๊นฅ์์ ์ ์ธํ์ ์ด์ ๊ฐ ์๋์? |
@@ -0,0 +1,121 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { withRouter } from 'react-router';
+import './Login.scss';
+
+const REGEXP = {
+ emailRegExp:
+ /[a-zA-Z0-9.-_+!]+@[a-zA-Z0-9]+\.[a-zA-Z0-9]{2,}(?:.[a-zA-Z0-9]{2,3})?/,
+ passwordRegExp: /[a-zA-Z0-9]{5,100}/,
+};
+
+class Login extends React.Component {
+ constructor(props) {
+ super(props);
+
+ this.state = { userId: '', userPw: '' };
+ }
+
+ validate = (value, regExp) => {
+ const reg = new RegExp(regExp);
+ return reg.test(value);
+ };
+
+ validateInputData = (id, pw) => {
+ return (
+ this.validate(id, REGEXP.emailRegExp) &&
+ this.validate(pw, REGEXP.passwordRegExp)
+ );
+ };
+
+ handleInput = e => {
+ const { name, value } = e.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = e => {
+ e.preventDefault();
+
+ const { userId, userPw } = this.state;
+ if (!this.validateInputData(userId, userPw)) return;
+
+ this.props.history.push('/main');
+ };
+
+ render() {
+ const { userId, userPw } = this.state;
+
+ return (
+ <>
+ <section className="entire-container">
+ <div className="entire">
+ <div className="entire_top content">
+ <div className="login_container">
+ <h1>westagram</h1>
+ <div className="form_container">
+ <form onSubmit={this.handleSubmit}>
+ <input
+ type="text"
+ name="userId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ value={userId}
+ onChange={this.handleInput}
+ />
+ <input
+ type="password"
+ name="userPw"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ value={userPw}
+ onChange={this.handleInput}
+ />
+ <Link to="/main">
+ <button
+ className="login-button"
+ type="submit"
+ disabled={!this.validateInputData(userId, userPw)}
+ onClick={this.handleSubmit}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ </Link>
+ </form>
+
+ <div className="line_container">
+ <div className="line"></div>
+ <div className="line-word">๋๋</div>
+ <div className="line"></div>
+ </div>
+
+ <button className="social-login-button">
+ <img
+ src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pg0KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDE4LjAuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPg0KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCINCgkgdmlld0JveD0iMCAwIDQ1NS43MyA0NTUuNzMiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDQ1NS43MyA0NTUuNzM7IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIHN0eWxlPSJmaWxsOiMzQTU1OUY7IiBkPSJNMCwwdjQ1NS43M2gyNDIuNzA0VjI3OS42OTFoLTU5LjMzdi03MS44NjRoNTkuMzN2LTYwLjM1M2MwLTQzLjg5MywzNS41ODItNzkuNDc1LDc5LjQ3NS03OS40NzUNCgloNjIuMDI1djY0LjYyMmgtNDQuMzgyYy0xMy45NDcsMC0yNS4yNTQsMTEuMzA3LTI1LjI1NCwyNS4yNTR2NDkuOTUzaDY4LjUyMWwtOS40Nyw3MS44NjRoLTU5LjA1MVY0NTUuNzNINDU1LjczVjBIMHoiLz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjwvc3ZnPg0K"
+ alt="facebook button"
+ />
+ <span>Facebook์ผ๋ก ๋ก๊ทธ์ธ</span>
+ </button>
+ </div>
+
+ <Link to="/" className="search-password">
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </Link>
+ </div>
+ </div>
+
+ <div className="entire_bottom content">
+ <p>
+ ๊ณ์ ์ด ์์ผ์ ๊ฐ์?
+ <a href="https://www.instagram.com/accounts/emailsignup/">
+ ๊ฐ์
ํ๊ธฐ
+ </a>
+ </p>
+ </div>
+ </div>
+ </section>
+ </>
+ );
+ }
+}
+
+export default withRouter(Login); | JavaScript | ```suggestion
return reg.test(value)
```
test method์ return๊ฐ ์์ฒด๊ฐ boolean์ด๊ธฐ ๋๋ฌธ์ ์์ ๊ฐ์ด ๊ฐ๊ฒฐํ๊ฒ ํํ ๊ฐ๋ฅํด๋ณด์
๋๋ค! |
@@ -0,0 +1,121 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { withRouter } from 'react-router';
+import './Login.scss';
+
+const REGEXP = {
+ emailRegExp:
+ /[a-zA-Z0-9.-_+!]+@[a-zA-Z0-9]+\.[a-zA-Z0-9]{2,}(?:.[a-zA-Z0-9]{2,3})?/,
+ passwordRegExp: /[a-zA-Z0-9]{5,100}/,
+};
+
+class Login extends React.Component {
+ constructor(props) {
+ super(props);
+
+ this.state = { userId: '', userPw: '' };
+ }
+
+ validate = (value, regExp) => {
+ const reg = new RegExp(regExp);
+ return reg.test(value);
+ };
+
+ validateInputData = (id, pw) => {
+ return (
+ this.validate(id, REGEXP.emailRegExp) &&
+ this.validate(pw, REGEXP.passwordRegExp)
+ );
+ };
+
+ handleInput = e => {
+ const { name, value } = e.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = e => {
+ e.preventDefault();
+
+ const { userId, userPw } = this.state;
+ if (!this.validateInputData(userId, userPw)) return;
+
+ this.props.history.push('/main');
+ };
+
+ render() {
+ const { userId, userPw } = this.state;
+
+ return (
+ <>
+ <section className="entire-container">
+ <div className="entire">
+ <div className="entire_top content">
+ <div className="login_container">
+ <h1>westagram</h1>
+ <div className="form_container">
+ <form onSubmit={this.handleSubmit}>
+ <input
+ type="text"
+ name="userId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ value={userId}
+ onChange={this.handleInput}
+ />
+ <input
+ type="password"
+ name="userPw"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ value={userPw}
+ onChange={this.handleInput}
+ />
+ <Link to="/main">
+ <button
+ className="login-button"
+ type="submit"
+ disabled={!this.validateInputData(userId, userPw)}
+ onClick={this.handleSubmit}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ </Link>
+ </form>
+
+ <div className="line_container">
+ <div className="line"></div>
+ <div className="line-word">๋๋</div>
+ <div className="line"></div>
+ </div>
+
+ <button className="social-login-button">
+ <img
+ src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pg0KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDE4LjAuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPg0KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCINCgkgdmlld0JveD0iMCAwIDQ1NS43MyA0NTUuNzMiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDQ1NS43MyA0NTUuNzM7IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIHN0eWxlPSJmaWxsOiMzQTU1OUY7IiBkPSJNMCwwdjQ1NS43M2gyNDIuNzA0VjI3OS42OTFoLTU5LjMzdi03MS44NjRoNTkuMzN2LTYwLjM1M2MwLTQzLjg5MywzNS41ODItNzkuNDc1LDc5LjQ3NS03OS40NzUNCgloNjIuMDI1djY0LjYyMmgtNDQuMzgyYy0xMy45NDcsMC0yNS4yNTQsMTEuMzA3LTI1LjI1NCwyNS4yNTR2NDkuOTUzaDY4LjUyMWwtOS40Nyw3MS44NjRoLTU5LjA1MVY0NTUuNzNINDU1LjczVjBIMHoiLz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjwvc3ZnPg0K"
+ alt="facebook button"
+ />
+ <span>Facebook์ผ๋ก ๋ก๊ทธ์ธ</span>
+ </button>
+ </div>
+
+ <Link to="/" className="search-password">
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </Link>
+ </div>
+ </div>
+
+ <div className="entire_bottom content">
+ <p>
+ ๊ณ์ ์ด ์์ผ์ ๊ฐ์?
+ <a href="https://www.instagram.com/accounts/emailsignup/">
+ ๊ฐ์
ํ๊ธฐ
+ </a>
+ </p>
+ </div>
+ </div>
+ </section>
+ </>
+ );
+ }
+}
+
+export default withRouter(Login); | JavaScript | ๊ธฐ๋ฅ๋ณ ํจ์ ๋ถ๋ฆฌํ๊ณ ์ ์ฌํ์ฉํ์ ๊ฒ ๊ฐ์ต๋๋ค!๐ |
@@ -0,0 +1,121 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { withRouter } from 'react-router';
+import './Login.scss';
+
+const REGEXP = {
+ emailRegExp:
+ /[a-zA-Z0-9.-_+!]+@[a-zA-Z0-9]+\.[a-zA-Z0-9]{2,}(?:.[a-zA-Z0-9]{2,3})?/,
+ passwordRegExp: /[a-zA-Z0-9]{5,100}/,
+};
+
+class Login extends React.Component {
+ constructor(props) {
+ super(props);
+
+ this.state = { userId: '', userPw: '' };
+ }
+
+ validate = (value, regExp) => {
+ const reg = new RegExp(regExp);
+ return reg.test(value);
+ };
+
+ validateInputData = (id, pw) => {
+ return (
+ this.validate(id, REGEXP.emailRegExp) &&
+ this.validate(pw, REGEXP.passwordRegExp)
+ );
+ };
+
+ handleInput = e => {
+ const { name, value } = e.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = e => {
+ e.preventDefault();
+
+ const { userId, userPw } = this.state;
+ if (!this.validateInputData(userId, userPw)) return;
+
+ this.props.history.push('/main');
+ };
+
+ render() {
+ const { userId, userPw } = this.state;
+
+ return (
+ <>
+ <section className="entire-container">
+ <div className="entire">
+ <div className="entire_top content">
+ <div className="login_container">
+ <h1>westagram</h1>
+ <div className="form_container">
+ <form onSubmit={this.handleSubmit}>
+ <input
+ type="text"
+ name="userId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ value={userId}
+ onChange={this.handleInput}
+ />
+ <input
+ type="password"
+ name="userPw"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ value={userPw}
+ onChange={this.handleInput}
+ />
+ <Link to="/main">
+ <button
+ className="login-button"
+ type="submit"
+ disabled={!this.validateInputData(userId, userPw)}
+ onClick={this.handleSubmit}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ </Link>
+ </form>
+
+ <div className="line_container">
+ <div className="line"></div>
+ <div className="line-word">๋๋</div>
+ <div className="line"></div>
+ </div>
+
+ <button className="social-login-button">
+ <img
+ src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pg0KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDE4LjAuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPg0KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCINCgkgdmlld0JveD0iMCAwIDQ1NS43MyA0NTUuNzMiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDQ1NS43MyA0NTUuNzM7IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIHN0eWxlPSJmaWxsOiMzQTU1OUY7IiBkPSJNMCwwdjQ1NS43M2gyNDIuNzA0VjI3OS42OTFoLTU5LjMzdi03MS44NjRoNTkuMzN2LTYwLjM1M2MwLTQzLjg5MywzNS41ODItNzkuNDc1LDc5LjQ3NS03OS40NzUNCgloNjIuMDI1djY0LjYyMmgtNDQuMzgyYy0xMy45NDcsMC0yNS4yNTQsMTEuMzA3LTI1LjI1NCwyNS4yNTR2NDkuOTUzaDY4LjUyMWwtOS40Nyw3MS44NjRoLTU5LjA1MVY0NTUuNzNINDU1LjczVjBIMHoiLz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjwvc3ZnPg0K"
+ alt="facebook button"
+ />
+ <span>Facebook์ผ๋ก ๋ก๊ทธ์ธ</span>
+ </button>
+ </div>
+
+ <Link to="/" className="search-password">
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </Link>
+ </div>
+ </div>
+
+ <div className="entire_bottom content">
+ <p>
+ ๊ณ์ ์ด ์์ผ์ ๊ฐ์?
+ <a href="https://www.instagram.com/accounts/emailsignup/">
+ ๊ฐ์
ํ๊ธฐ
+ </a>
+ </p>
+ </div>
+ </div>
+ </section>
+ </>
+ );
+ }
+}
+
+export default withRouter(Login); | JavaScript | validateInputData ๋ฅผ ํธ์ถํ๊ณ ๊ณ์์ง๋ง ์ด ํจ์๋ ์คํ๋๊ธฐ๋ง ํ๊ณ ๋ฆฌํด๊ฐ์ ์ด๋์๋ ํ์ฉํ์ง ์๊ณ ์๋ ๊ฒ ๊ฐ์ต๋๋ค!
์ค์ง์ ์ผ๋ก ์ด๋ค ์๋ฏธ๋ ์๋ ์ฝ๋๊ฐ์ต๋๋ค! |
@@ -0,0 +1,121 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { withRouter } from 'react-router';
+import './Login.scss';
+
+const REGEXP = {
+ emailRegExp:
+ /[a-zA-Z0-9.-_+!]+@[a-zA-Z0-9]+\.[a-zA-Z0-9]{2,}(?:.[a-zA-Z0-9]{2,3})?/,
+ passwordRegExp: /[a-zA-Z0-9]{5,100}/,
+};
+
+class Login extends React.Component {
+ constructor(props) {
+ super(props);
+
+ this.state = { userId: '', userPw: '' };
+ }
+
+ validate = (value, regExp) => {
+ const reg = new RegExp(regExp);
+ return reg.test(value);
+ };
+
+ validateInputData = (id, pw) => {
+ return (
+ this.validate(id, REGEXP.emailRegExp) &&
+ this.validate(pw, REGEXP.passwordRegExp)
+ );
+ };
+
+ handleInput = e => {
+ const { name, value } = e.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = e => {
+ e.preventDefault();
+
+ const { userId, userPw } = this.state;
+ if (!this.validateInputData(userId, userPw)) return;
+
+ this.props.history.push('/main');
+ };
+
+ render() {
+ const { userId, userPw } = this.state;
+
+ return (
+ <>
+ <section className="entire-container">
+ <div className="entire">
+ <div className="entire_top content">
+ <div className="login_container">
+ <h1>westagram</h1>
+ <div className="form_container">
+ <form onSubmit={this.handleSubmit}>
+ <input
+ type="text"
+ name="userId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ value={userId}
+ onChange={this.handleInput}
+ />
+ <input
+ type="password"
+ name="userPw"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ value={userPw}
+ onChange={this.handleInput}
+ />
+ <Link to="/main">
+ <button
+ className="login-button"
+ type="submit"
+ disabled={!this.validateInputData(userId, userPw)}
+ onClick={this.handleSubmit}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ </Link>
+ </form>
+
+ <div className="line_container">
+ <div className="line"></div>
+ <div className="line-word">๋๋</div>
+ <div className="line"></div>
+ </div>
+
+ <button className="social-login-button">
+ <img
+ src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pg0KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDE4LjAuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPg0KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCINCgkgdmlld0JveD0iMCAwIDQ1NS43MyA0NTUuNzMiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDQ1NS43MyA0NTUuNzM7IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIHN0eWxlPSJmaWxsOiMzQTU1OUY7IiBkPSJNMCwwdjQ1NS43M2gyNDIuNzA0VjI3OS42OTFoLTU5LjMzdi03MS44NjRoNTkuMzN2LTYwLjM1M2MwLTQzLjg5MywzNS41ODItNzkuNDc1LDc5LjQ3NS03OS40NzUNCgloNjIuMDI1djY0LjYyMmgtNDQuMzgyYy0xMy45NDcsMC0yNS4yNTQsMTEuMzA3LTI1LjI1NCwyNS4yNTR2NDkuOTUzaDY4LjUyMWwtOS40Nyw3MS44NjRoLTU5LjA1MVY0NTUuNzNINDU1LjczVjBIMHoiLz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjwvc3ZnPg0K"
+ alt="facebook button"
+ />
+ <span>Facebook์ผ๋ก ๋ก๊ทธ์ธ</span>
+ </button>
+ </div>
+
+ <Link to="/" className="search-password">
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </Link>
+ </div>
+ </div>
+
+ <div className="entire_bottom content">
+ <p>
+ ๊ณ์ ์ด ์์ผ์ ๊ฐ์?
+ <a href="https://www.instagram.com/accounts/emailsignup/">
+ ๊ฐ์
ํ๊ธฐ
+ </a>
+ </p>
+ </div>
+ </div>
+ </section>
+ </>
+ );
+ }
+}
+
+export default withRouter(Login); | JavaScript | `const {name, value} = e.target;` ์ผ๋ก ๊ตฌ์กฐ๋ถํดํด์ ์ฌ์ฉํ์๋ฉด ์ข ๋ ๊ฐ๊ฒฐํ๊ฒ ๋ค์! |
@@ -0,0 +1,121 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { withRouter } from 'react-router';
+import './Login.scss';
+
+const REGEXP = {
+ emailRegExp:
+ /[a-zA-Z0-9.-_+!]+@[a-zA-Z0-9]+\.[a-zA-Z0-9]{2,}(?:.[a-zA-Z0-9]{2,3})?/,
+ passwordRegExp: /[a-zA-Z0-9]{5,100}/,
+};
+
+class Login extends React.Component {
+ constructor(props) {
+ super(props);
+
+ this.state = { userId: '', userPw: '' };
+ }
+
+ validate = (value, regExp) => {
+ const reg = new RegExp(regExp);
+ return reg.test(value);
+ };
+
+ validateInputData = (id, pw) => {
+ return (
+ this.validate(id, REGEXP.emailRegExp) &&
+ this.validate(pw, REGEXP.passwordRegExp)
+ );
+ };
+
+ handleInput = e => {
+ const { name, value } = e.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = e => {
+ e.preventDefault();
+
+ const { userId, userPw } = this.state;
+ if (!this.validateInputData(userId, userPw)) return;
+
+ this.props.history.push('/main');
+ };
+
+ render() {
+ const { userId, userPw } = this.state;
+
+ return (
+ <>
+ <section className="entire-container">
+ <div className="entire">
+ <div className="entire_top content">
+ <div className="login_container">
+ <h1>westagram</h1>
+ <div className="form_container">
+ <form onSubmit={this.handleSubmit}>
+ <input
+ type="text"
+ name="userId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ value={userId}
+ onChange={this.handleInput}
+ />
+ <input
+ type="password"
+ name="userPw"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ value={userPw}
+ onChange={this.handleInput}
+ />
+ <Link to="/main">
+ <button
+ className="login-button"
+ type="submit"
+ disabled={!this.validateInputData(userId, userPw)}
+ onClick={this.handleSubmit}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ </Link>
+ </form>
+
+ <div className="line_container">
+ <div className="line"></div>
+ <div className="line-word">๋๋</div>
+ <div className="line"></div>
+ </div>
+
+ <button className="social-login-button">
+ <img
+ src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pg0KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDE4LjAuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPg0KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCINCgkgdmlld0JveD0iMCAwIDQ1NS43MyA0NTUuNzMiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDQ1NS43MyA0NTUuNzM7IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIHN0eWxlPSJmaWxsOiMzQTU1OUY7IiBkPSJNMCwwdjQ1NS43M2gyNDIuNzA0VjI3OS42OTFoLTU5LjMzdi03MS44NjRoNTkuMzN2LTYwLjM1M2MwLTQzLjg5MywzNS41ODItNzkuNDc1LDc5LjQ3NS03OS40NzUNCgloNjIuMDI1djY0LjYyMmgtNDQuMzgyYy0xMy45NDcsMC0yNS4yNTQsMTEuMzA3LTI1LjI1NCwyNS4yNTR2NDkuOTUzaDY4LjUyMWwtOS40Nyw3MS44NjRoLTU5LjA1MVY0NTUuNzNINDU1LjczVjBIMHoiLz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjwvc3ZnPg0K"
+ alt="facebook button"
+ />
+ <span>Facebook์ผ๋ก ๋ก๊ทธ์ธ</span>
+ </button>
+ </div>
+
+ <Link to="/" className="search-password">
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </Link>
+ </div>
+ </div>
+
+ <div className="entire_bottom content">
+ <p>
+ ๊ณ์ ์ด ์์ผ์ ๊ฐ์?
+ <a href="https://www.instagram.com/accounts/emailsignup/">
+ ๊ฐ์
ํ๊ธฐ
+ </a>
+ </p>
+ </div>
+ </div>
+ </section>
+ </>
+ );
+ }
+}
+
+export default withRouter(Login); | JavaScript | ๐
state๊ฐ๋ ๊ตฌ์กฐ๋ถํดํด์ ์ฌ์ฉํ๋ฉด ์ข ๋ ๊ฐ๊ฒฐํด๋ณด์ผ ๊ฒ ๊ฐ์ต๋๋ค! |
@@ -0,0 +1,121 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { withRouter } from 'react-router';
+import './Login.scss';
+
+const REGEXP = {
+ emailRegExp:
+ /[a-zA-Z0-9.-_+!]+@[a-zA-Z0-9]+\.[a-zA-Z0-9]{2,}(?:.[a-zA-Z0-9]{2,3})?/,
+ passwordRegExp: /[a-zA-Z0-9]{5,100}/,
+};
+
+class Login extends React.Component {
+ constructor(props) {
+ super(props);
+
+ this.state = { userId: '', userPw: '' };
+ }
+
+ validate = (value, regExp) => {
+ const reg = new RegExp(regExp);
+ return reg.test(value);
+ };
+
+ validateInputData = (id, pw) => {
+ return (
+ this.validate(id, REGEXP.emailRegExp) &&
+ this.validate(pw, REGEXP.passwordRegExp)
+ );
+ };
+
+ handleInput = e => {
+ const { name, value } = e.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = e => {
+ e.preventDefault();
+
+ const { userId, userPw } = this.state;
+ if (!this.validateInputData(userId, userPw)) return;
+
+ this.props.history.push('/main');
+ };
+
+ render() {
+ const { userId, userPw } = this.state;
+
+ return (
+ <>
+ <section className="entire-container">
+ <div className="entire">
+ <div className="entire_top content">
+ <div className="login_container">
+ <h1>westagram</h1>
+ <div className="form_container">
+ <form onSubmit={this.handleSubmit}>
+ <input
+ type="text"
+ name="userId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ value={userId}
+ onChange={this.handleInput}
+ />
+ <input
+ type="password"
+ name="userPw"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ value={userPw}
+ onChange={this.handleInput}
+ />
+ <Link to="/main">
+ <button
+ className="login-button"
+ type="submit"
+ disabled={!this.validateInputData(userId, userPw)}
+ onClick={this.handleSubmit}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ </Link>
+ </form>
+
+ <div className="line_container">
+ <div className="line"></div>
+ <div className="line-word">๋๋</div>
+ <div className="line"></div>
+ </div>
+
+ <button className="social-login-button">
+ <img
+ src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pg0KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDE4LjAuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPg0KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCINCgkgdmlld0JveD0iMCAwIDQ1NS43MyA0NTUuNzMiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDQ1NS43MyA0NTUuNzM7IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIHN0eWxlPSJmaWxsOiMzQTU1OUY7IiBkPSJNMCwwdjQ1NS43M2gyNDIuNzA0VjI3OS42OTFoLTU5LjMzdi03MS44NjRoNTkuMzN2LTYwLjM1M2MwLTQzLjg5MywzNS41ODItNzkuNDc1LDc5LjQ3NS03OS40NzUNCgloNjIuMDI1djY0LjYyMmgtNDQuMzgyYy0xMy45NDcsMC0yNS4yNTQsMTEuMzA3LTI1LjI1NCwyNS4yNTR2NDkuOTUzaDY4LjUyMWwtOS40Nyw3MS44NjRoLTU5LjA1MVY0NTUuNzNINDU1LjczVjBIMHoiLz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjwvc3ZnPg0K"
+ alt="facebook button"
+ />
+ <span>Facebook์ผ๋ก ๋ก๊ทธ์ธ</span>
+ </button>
+ </div>
+
+ <Link to="/" className="search-password">
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </Link>
+ </div>
+ </div>
+
+ <div className="entire_bottom content">
+ <p>
+ ๊ณ์ ์ด ์์ผ์ ๊ฐ์?
+ <a href="https://www.instagram.com/accounts/emailsignup/">
+ ๊ฐ์
ํ๊ธฐ
+ </a>
+ </p>
+ </div>
+ </div>
+ </section>
+ </>
+ );
+ }
+}
+
+export default withRouter(Login); | JavaScript | ๊ฑด์ฐ๋์ด ๋ฆฌ๋ทฐ ์ ๋จ๊ฒจ์ฃผ์
จ๋ค์ ํ์ธํ๊ณ ๋ฐ์ํด๋ณด์ธ์!๐ |
@@ -0,0 +1,121 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { withRouter } from 'react-router';
+import './Login.scss';
+
+const REGEXP = {
+ emailRegExp:
+ /[a-zA-Z0-9.-_+!]+@[a-zA-Z0-9]+\.[a-zA-Z0-9]{2,}(?:.[a-zA-Z0-9]{2,3})?/,
+ passwordRegExp: /[a-zA-Z0-9]{5,100}/,
+};
+
+class Login extends React.Component {
+ constructor(props) {
+ super(props);
+
+ this.state = { userId: '', userPw: '' };
+ }
+
+ validate = (value, regExp) => {
+ const reg = new RegExp(regExp);
+ return reg.test(value);
+ };
+
+ validateInputData = (id, pw) => {
+ return (
+ this.validate(id, REGEXP.emailRegExp) &&
+ this.validate(pw, REGEXP.passwordRegExp)
+ );
+ };
+
+ handleInput = e => {
+ const { name, value } = e.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = e => {
+ e.preventDefault();
+
+ const { userId, userPw } = this.state;
+ if (!this.validateInputData(userId, userPw)) return;
+
+ this.props.history.push('/main');
+ };
+
+ render() {
+ const { userId, userPw } = this.state;
+
+ return (
+ <>
+ <section className="entire-container">
+ <div className="entire">
+ <div className="entire_top content">
+ <div className="login_container">
+ <h1>westagram</h1>
+ <div className="form_container">
+ <form onSubmit={this.handleSubmit}>
+ <input
+ type="text"
+ name="userId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ value={userId}
+ onChange={this.handleInput}
+ />
+ <input
+ type="password"
+ name="userPw"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ value={userPw}
+ onChange={this.handleInput}
+ />
+ <Link to="/main">
+ <button
+ className="login-button"
+ type="submit"
+ disabled={!this.validateInputData(userId, userPw)}
+ onClick={this.handleSubmit}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ </Link>
+ </form>
+
+ <div className="line_container">
+ <div className="line"></div>
+ <div className="line-word">๋๋</div>
+ <div className="line"></div>
+ </div>
+
+ <button className="social-login-button">
+ <img
+ src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pg0KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDE4LjAuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPg0KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCINCgkgdmlld0JveD0iMCAwIDQ1NS43MyA0NTUuNzMiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDQ1NS43MyA0NTUuNzM7IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIHN0eWxlPSJmaWxsOiMzQTU1OUY7IiBkPSJNMCwwdjQ1NS43M2gyNDIuNzA0VjI3OS42OTFoLTU5LjMzdi03MS44NjRoNTkuMzN2LTYwLjM1M2MwLTQzLjg5MywzNS41ODItNzkuNDc1LDc5LjQ3NS03OS40NzUNCgloNjIuMDI1djY0LjYyMmgtNDQuMzgyYy0xMy45NDcsMC0yNS4yNTQsMTEuMzA3LTI1LjI1NCwyNS4yNTR2NDkuOTUzaDY4LjUyMWwtOS40Nyw3MS44NjRoLTU5LjA1MVY0NTUuNzNINDU1LjczVjBIMHoiLz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjwvc3ZnPg0K"
+ alt="facebook button"
+ />
+ <span>Facebook์ผ๋ก ๋ก๊ทธ์ธ</span>
+ </button>
+ </div>
+
+ <Link to="/" className="search-password">
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </Link>
+ </div>
+ </div>
+
+ <div className="entire_bottom content">
+ <p>
+ ๊ณ์ ์ด ์์ผ์ ๊ฐ์?
+ <a href="https://www.instagram.com/accounts/emailsignup/">
+ ๊ฐ์
ํ๊ธฐ
+ </a>
+ </p>
+ </div>
+ </div>
+ </section>
+ </>
+ );
+ }
+}
+
+export default withRouter(Login); | JavaScript | ์ ์ด์ boolean์ ๋ฆฌํดํ๋ ํจ์์ด๊ธฐ ๋๋ฌธ์ not ์ฐ์ฐ์๋ฅผ ํ์ฉํด์
```suggestion
const isDisabled = !this.validateInputData(userId, userPw)
```
button tag์์ ํ๋ฒ๋ง ์ฌ์ฉ๋๋ ๊ฐ์ด๋ผ๋ฉด ๋ฐ๋ก ๋ณ์์ ์ธ ํ ๋น๊ณผ์ ๊ฑฐ์น ํ์ ์์ด ๋ฒํผ ํ๊ทธ ๋ด์ ๋ฐ๋ก ์ ์ด์ค๋ ๋ ๊ฒ ๊ฐ์ต๋๋ค! |
@@ -0,0 +1,121 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { withRouter } from 'react-router';
+import './Login.scss';
+
+const REGEXP = {
+ emailRegExp:
+ /[a-zA-Z0-9.-_+!]+@[a-zA-Z0-9]+\.[a-zA-Z0-9]{2,}(?:.[a-zA-Z0-9]{2,3})?/,
+ passwordRegExp: /[a-zA-Z0-9]{5,100}/,
+};
+
+class Login extends React.Component {
+ constructor(props) {
+ super(props);
+
+ this.state = { userId: '', userPw: '' };
+ }
+
+ validate = (value, regExp) => {
+ const reg = new RegExp(regExp);
+ return reg.test(value);
+ };
+
+ validateInputData = (id, pw) => {
+ return (
+ this.validate(id, REGEXP.emailRegExp) &&
+ this.validate(pw, REGEXP.passwordRegExp)
+ );
+ };
+
+ handleInput = e => {
+ const { name, value } = e.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = e => {
+ e.preventDefault();
+
+ const { userId, userPw } = this.state;
+ if (!this.validateInputData(userId, userPw)) return;
+
+ this.props.history.push('/main');
+ };
+
+ render() {
+ const { userId, userPw } = this.state;
+
+ return (
+ <>
+ <section className="entire-container">
+ <div className="entire">
+ <div className="entire_top content">
+ <div className="login_container">
+ <h1>westagram</h1>
+ <div className="form_container">
+ <form onSubmit={this.handleSubmit}>
+ <input
+ type="text"
+ name="userId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ value={userId}
+ onChange={this.handleInput}
+ />
+ <input
+ type="password"
+ name="userPw"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ value={userPw}
+ onChange={this.handleInput}
+ />
+ <Link to="/main">
+ <button
+ className="login-button"
+ type="submit"
+ disabled={!this.validateInputData(userId, userPw)}
+ onClick={this.handleSubmit}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ </Link>
+ </form>
+
+ <div className="line_container">
+ <div className="line"></div>
+ <div className="line-word">๋๋</div>
+ <div className="line"></div>
+ </div>
+
+ <button className="social-login-button">
+ <img
+ src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pg0KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDE4LjAuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPg0KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCINCgkgdmlld0JveD0iMCAwIDQ1NS43MyA0NTUuNzMiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDQ1NS43MyA0NTUuNzM7IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIHN0eWxlPSJmaWxsOiMzQTU1OUY7IiBkPSJNMCwwdjQ1NS43M2gyNDIuNzA0VjI3OS42OTFoLTU5LjMzdi03MS44NjRoNTkuMzN2LTYwLjM1M2MwLTQzLjg5MywzNS41ODItNzkuNDc1LDc5LjQ3NS03OS40NzUNCgloNjIuMDI1djY0LjYyMmgtNDQuMzgyYy0xMy45NDcsMC0yNS4yNTQsMTEuMzA3LTI1LjI1NCwyNS4yNTR2NDkuOTUzaDY4LjUyMWwtOS40Nyw3MS44NjRoLTU5LjA1MVY0NTUuNzNINDU1LjczVjBIMHoiLz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjxnPg0KPC9nPg0KPGc+DQo8L2c+DQo8Zz4NCjwvZz4NCjwvc3ZnPg0K"
+ alt="facebook button"
+ />
+ <span>Facebook์ผ๋ก ๋ก๊ทธ์ธ</span>
+ </button>
+ </div>
+
+ <Link to="/" className="search-password">
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </Link>
+ </div>
+ </div>
+
+ <div className="entire_bottom content">
+ <p>
+ ๊ณ์ ์ด ์์ผ์ ๊ฐ์?
+ <a href="https://www.instagram.com/accounts/emailsignup/">
+ ๊ฐ์
ํ๊ธฐ
+ </a>
+ </p>
+ </div>
+ </div>
+ </section>
+ </>
+ );
+ }
+}
+
+export default withRouter(Login); | JavaScript | ```suggestion
disabled={!this.validateInputData(userId, userPw)}
```
์์ ๋ฌ์๋๋ฆฐ ์ฝ๋ฉํธ์ ์ด์ด์ง๋ ๋ด์ฉ์
๋๋ค! |
@@ -0,0 +1,156 @@
+@import '../Styles/common.scss';
+
+.entire-container {
+ @include flex-set(row, center, center);
+ width: 100%;
+ height: 100vh;
+ background-color: $background-default-color;
+
+ .entire {
+ width: 350px;
+ background-color: $background-default-color;
+
+ .entire_top {
+ height: 380px;
+
+ &.content {
+ padding: 10px 0;
+ margin: 0 0 10px;
+ border: $border-default-set;
+
+ .login_container {
+ @include flex-set(column, center, center);
+
+ h1 {
+ width: 175px;
+ height: 51px;
+ line-height: 51px;
+ margin: 22px auto 12px;
+ font-family: 'Lobster', cursive;
+ @include font-set(40px, 100, null);
+ }
+
+ .form_container {
+ @include flex-set(column);
+ margin: 20px 0 0;
+
+ form {
+ @include flex-set(column);
+
+ input {
+ width: 268px;
+ height: 38px;
+ padding: 9px 0 7px 8px;
+ margin: 0 0 7px 0;
+ border: $border-default-set;
+
+ background: $background-default-color;
+ color: #8e8e8e;
+
+ @include font-set($font-small-size, inherit, 36px);
+ overflow: hidden;
+ outline: 0;
+ text-overflow: ellipsis;
+ }
+
+ a {
+ margin: 9px 0 18px;
+
+ .login-button {
+ width: 268px;
+ height: 30px;
+ background-color: rgb(0, 149, 246);
+ border-radius: 4px;
+ color: #fff;
+ font-weight: $font-bold-weight;
+ opacity: 1;
+
+ &:disabled {
+ cursor: default;
+ opacity: 0.3;
+ }
+ }
+ }
+ }
+
+ .line_container {
+ display: flex;
+ width: 268px;
+ margin: 0 0 28px 0;
+
+ .line {
+ position: relative;
+ top: 0.45em;
+ height: 1px;
+ flex-grow: 1;
+ background-color: #dbdbdb;
+ }
+
+ .line-word {
+ color: #8e8e8e;
+ @include font-set($font-small-size, $font-bold-weight, 15px);
+ margin: 0 25px;
+ }
+ }
+
+ .social-login-button {
+ display: inline;
+ margin-bottom: 20px;
+ border: none;
+ background-color: #fff;
+
+ &:hover {
+ cursor: pointer;
+ }
+
+ img {
+ position: relative;
+ top: 3px;
+ display: inline-block;
+ width: 16px;
+ height: 16px;
+ margin-right: 8px;
+ }
+
+ span {
+ color: rgb(56, 81, 133);
+ @include font-set($font-default-size, $font-bold-weight);
+ }
+ }
+ }
+
+ .search-password {
+ color: #00376b;
+ text-align: center;
+ }
+ }
+ }
+ }
+
+ .entire_bottom {
+ @include flex-set();
+ height: 63px;
+ color: $font-default-color;
+
+ @include font-set($font-default-size, inherit, 63px);
+ text-align: center;
+
+ &.content {
+ padding: 10px 0;
+ margin: 0 0 10px;
+ border: $border-default-set;
+ }
+
+ p {
+ color: $font-default-color;
+ font-size: $font-default-size;
+
+ a {
+ color: #0095f6;
+ font-weight: 600;
+ text-decoration: none;
+ }
+ }
+ }
+ }
+} | Unknown | ์ปดํฌ๋ํธ ์ด๋ฆ์ผ๋ก nesting ์ ์ฉํด์ฃผ์ธ์!
์ด๋ ๊ฒ ๋๋ฉด ๋ค๋ฅธ ์ปดํฌ๋ํธ๋ค์ ์คํ์ผ์๋ ์ํฅ์ ๋ฏธ์น ์ ์์ต๋๋ค! |
@@ -0,0 +1,156 @@
+@import '../Styles/common.scss';
+
+.entire-container {
+ @include flex-set(row, center, center);
+ width: 100%;
+ height: 100vh;
+ background-color: $background-default-color;
+
+ .entire {
+ width: 350px;
+ background-color: $background-default-color;
+
+ .entire_top {
+ height: 380px;
+
+ &.content {
+ padding: 10px 0;
+ margin: 0 0 10px;
+ border: $border-default-set;
+
+ .login_container {
+ @include flex-set(column, center, center);
+
+ h1 {
+ width: 175px;
+ height: 51px;
+ line-height: 51px;
+ margin: 22px auto 12px;
+ font-family: 'Lobster', cursive;
+ @include font-set(40px, 100, null);
+ }
+
+ .form_container {
+ @include flex-set(column);
+ margin: 20px 0 0;
+
+ form {
+ @include flex-set(column);
+
+ input {
+ width: 268px;
+ height: 38px;
+ padding: 9px 0 7px 8px;
+ margin: 0 0 7px 0;
+ border: $border-default-set;
+
+ background: $background-default-color;
+ color: #8e8e8e;
+
+ @include font-set($font-small-size, inherit, 36px);
+ overflow: hidden;
+ outline: 0;
+ text-overflow: ellipsis;
+ }
+
+ a {
+ margin: 9px 0 18px;
+
+ .login-button {
+ width: 268px;
+ height: 30px;
+ background-color: rgb(0, 149, 246);
+ border-radius: 4px;
+ color: #fff;
+ font-weight: $font-bold-weight;
+ opacity: 1;
+
+ &:disabled {
+ cursor: default;
+ opacity: 0.3;
+ }
+ }
+ }
+ }
+
+ .line_container {
+ display: flex;
+ width: 268px;
+ margin: 0 0 28px 0;
+
+ .line {
+ position: relative;
+ top: 0.45em;
+ height: 1px;
+ flex-grow: 1;
+ background-color: #dbdbdb;
+ }
+
+ .line-word {
+ color: #8e8e8e;
+ @include font-set($font-small-size, $font-bold-weight, 15px);
+ margin: 0 25px;
+ }
+ }
+
+ .social-login-button {
+ display: inline;
+ margin-bottom: 20px;
+ border: none;
+ background-color: #fff;
+
+ &:hover {
+ cursor: pointer;
+ }
+
+ img {
+ position: relative;
+ top: 3px;
+ display: inline-block;
+ width: 16px;
+ height: 16px;
+ margin-right: 8px;
+ }
+
+ span {
+ color: rgb(56, 81, 133);
+ @include font-set($font-default-size, $font-bold-weight);
+ }
+ }
+ }
+
+ .search-password {
+ color: #00376b;
+ text-align: center;
+ }
+ }
+ }
+ }
+
+ .entire_bottom {
+ @include flex-set();
+ height: 63px;
+ color: $font-default-color;
+
+ @include font-set($font-default-size, inherit, 63px);
+ text-align: center;
+
+ &.content {
+ padding: 10px 0;
+ margin: 0 0 10px;
+ border: $border-default-set;
+ }
+
+ p {
+ color: $font-default-color;
+ font-size: $font-default-size;
+
+ a {
+ color: #0095f6;
+ font-weight: 600;
+ text-decoration: none;
+ }
+ }
+ }
+ }
+} | Unknown | ๊ณตํต์ ์ผ๋ก ์ ์ฉ๋์ด์ผ ํ๋ ์์ฑ์ด๋ผ๋ฉด common์ ๋ฃ์ด์ฃผ์๋ ๊ฒ ๋ง์ต๋๋ค! |
@@ -0,0 +1,156 @@
+@import '../Styles/common.scss';
+
+.entire-container {
+ @include flex-set(row, center, center);
+ width: 100%;
+ height: 100vh;
+ background-color: $background-default-color;
+
+ .entire {
+ width: 350px;
+ background-color: $background-default-color;
+
+ .entire_top {
+ height: 380px;
+
+ &.content {
+ padding: 10px 0;
+ margin: 0 0 10px;
+ border: $border-default-set;
+
+ .login_container {
+ @include flex-set(column, center, center);
+
+ h1 {
+ width: 175px;
+ height: 51px;
+ line-height: 51px;
+ margin: 22px auto 12px;
+ font-family: 'Lobster', cursive;
+ @include font-set(40px, 100, null);
+ }
+
+ .form_container {
+ @include flex-set(column);
+ margin: 20px 0 0;
+
+ form {
+ @include flex-set(column);
+
+ input {
+ width: 268px;
+ height: 38px;
+ padding: 9px 0 7px 8px;
+ margin: 0 0 7px 0;
+ border: $border-default-set;
+
+ background: $background-default-color;
+ color: #8e8e8e;
+
+ @include font-set($font-small-size, inherit, 36px);
+ overflow: hidden;
+ outline: 0;
+ text-overflow: ellipsis;
+ }
+
+ a {
+ margin: 9px 0 18px;
+
+ .login-button {
+ width: 268px;
+ height: 30px;
+ background-color: rgb(0, 149, 246);
+ border-radius: 4px;
+ color: #fff;
+ font-weight: $font-bold-weight;
+ opacity: 1;
+
+ &:disabled {
+ cursor: default;
+ opacity: 0.3;
+ }
+ }
+ }
+ }
+
+ .line_container {
+ display: flex;
+ width: 268px;
+ margin: 0 0 28px 0;
+
+ .line {
+ position: relative;
+ top: 0.45em;
+ height: 1px;
+ flex-grow: 1;
+ background-color: #dbdbdb;
+ }
+
+ .line-word {
+ color: #8e8e8e;
+ @include font-set($font-small-size, $font-bold-weight, 15px);
+ margin: 0 25px;
+ }
+ }
+
+ .social-login-button {
+ display: inline;
+ margin-bottom: 20px;
+ border: none;
+ background-color: #fff;
+
+ &:hover {
+ cursor: pointer;
+ }
+
+ img {
+ position: relative;
+ top: 3px;
+ display: inline-block;
+ width: 16px;
+ height: 16px;
+ margin-right: 8px;
+ }
+
+ span {
+ color: rgb(56, 81, 133);
+ @include font-set($font-default-size, $font-bold-weight);
+ }
+ }
+ }
+
+ .search-password {
+ color: #00376b;
+ text-align: center;
+ }
+ }
+ }
+ }
+
+ .entire_bottom {
+ @include flex-set();
+ height: 63px;
+ color: $font-default-color;
+
+ @include font-set($font-default-size, inherit, 63px);
+ text-align: center;
+
+ &.content {
+ padding: 10px 0;
+ margin: 0 0 10px;
+ border: $border-default-set;
+ }
+
+ p {
+ color: $font-default-color;
+ font-size: $font-default-size;
+
+ a {
+ color: #0095f6;
+ font-weight: 600;
+ text-decoration: none;
+ }
+ }
+ }
+ }
+} | Unknown | mixin ์ ํ์ฉํด์ฃผ์
จ๋ค์! |
@@ -0,0 +1,12 @@
+package develop.baminchan;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SidedishApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(SidedishApplication.class, args);
+ }
+} | Java | Security ์ค์ ์ด ๋ณ๋ ํด๋์ค๋ก ๋
๋ฆฝํ๋ฉด ์กฐ๊ธ ๋ ์ข์ ๊ฒ ๊ฐ๋ค์. |
@@ -0,0 +1,75 @@
+package develop.baminchan.controller;
+
+import develop.baminchan.dto.BanchanDto;
+import develop.baminchan.dto.CategoryDto;
+import develop.baminchan.dto.banchan.BanchanDetailDto;
+import develop.baminchan.entity.Banchan;
+import develop.baminchan.service.BanchanService;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api")
+public class BanchanController {
+
+ private BanchanService banchanService;
+
+ public BanchanController(BanchanService banchanService) {
+ this.banchanService = banchanService;
+ }
+
+ @GetMapping("/main")
+ public ResponseEntity<Message> findMain() {
+ List<BanchanDto> banchanDtoList = banchanService.findBanchansByTag("main");
+ Message message = new Message(Message.OK, banchanDtoList);
+ return new ResponseEntity(message, HttpStatus.OK);
+ }
+
+ @GetMapping("/soup")
+ public ResponseEntity<Message> findSoup() {
+ List<BanchanDto> banchanDtoList = banchanService.findBanchansByTag("soup");
+ Message message = new Message(Message.OK, banchanDtoList);
+ return new ResponseEntity(message, HttpStatus.OK);
+ }
+
+ @GetMapping("/side")
+ public ResponseEntity<Message> findSide() {
+ List<BanchanDto> banchanDtoList = banchanService.findBanchansByTag("side");
+ Message message = new Message(Message.OK, banchanDtoList);
+ return new ResponseEntity(message, HttpStatus.OK);
+ }
+ @GetMapping("/main/{detail_hash}")
+ public BanchanDto findOneMain(@PathVariable String detail_hash) {
+ BanchanDto banchanDto = banchanService.findBanchanByDetailHash(detail_hash);
+ return banchanDto;
+ }
+
+ @GetMapping("/soup/{detail_hash}")
+ public BanchanDto findOneSoup(@PathVariable String detail_hash) {
+ BanchanDto banchanDto = banchanService.findBanchanByDetailHash(detail_hash);
+ return banchanDto;
+ }
+
+ @GetMapping("/side/{detail_hash}")
+ public BanchanDto findOneSide(@PathVariable String detail_hash) {
+ BanchanDto banchanDto = banchanService.findBanchanByDetailHash(detail_hash);
+ return banchanDto;
+ }
+
+
+ @GetMapping("/detail/{detail_hash}")
+ public BanchanDetailDto findOneDetail(@PathVariable String detail_hash) {
+ BanchanDetailDto banchanDetailDto = banchanService.findBanchanDetailByDetailHash(detail_hash);
+ System.out.println(banchanDetailDto);
+ return banchanDetailDto;
+ }
+
+ @PostMapping("/create")
+ public String create(@RequestBody Banchan banchan) {
+ banchanService.createBanchan(banchan);
+ return "success";
+ }
+} | Java | `@PathVariable` ์์ path variable name์ ์ค์ ํ ์ ์๋ ํ๋๊ฐ ์์ ๊ฑฐ๋ผ ์๊ฐํฉ๋๋ค.
์ด๋ ํ ์๊ฐ์๋ ์๋ฐ์ ๊ธฐ๋ณธ์ ์ฝ๋ฉ ์ปจ๋ฒค์
์ ๊ณ์ ์ค์ํด์ฃผ์ธ์. |
@@ -0,0 +1,24 @@
+package develop.baminchan.controller;
+
+public class Message {
+ public static final int OK = 200;
+ public static final int BAD_REQUEST = 400;
+ public static final int NOT_FOUND = 404;
+ public static final int INTERNAL_SERVER_ERROR = 500;
+
+ private int statusCode;
+ private Object body;
+
+ public Message(int statusCode, Object body) {
+ this.statusCode = statusCode;
+ this.body = body;
+ }
+
+ public int getStatusCode() {
+ return statusCode;
+ }
+
+ public Object getBody() {
+ return body;
+ }
+} | Java | `enum` ์ผ๋ก ๊ด๋ฆฌํด๋ณด์๋ฉด ์ด๋จ๊น์? |
@@ -0,0 +1,78 @@
+package develop.baminchan.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import develop.baminchan.entity.Banchan;
+
+import java.util.Set;
+
+import static develop.baminchan.dto.util.StringConvertor.convertToSet;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class BanchanDto {
+ private String detail_hash;
+ private String image;
+ private String alt;
+ private Set<String> delivery_type;
+ private String title;
+ private String description;
+ private String n_price;
+ private String s_price;
+ private Set<String> badge;
+
+ protected BanchanDto() {
+
+ }
+
+ private BanchanDto(Banchan banchan) {
+ this.detail_hash = banchan.getDetail_hash();
+ this.image = banchan.getImage();
+ this.alt = banchan.getAlt();
+ this.delivery_type = convertToSet(banchan.getDelivery_type());
+ this.title = banchan.getTitle();
+ this.description = banchan.getDescription();
+ this.n_price = banchan.getN_price();
+ this.s_price = banchan.getS_price();
+ this.badge = convertToSet(banchan.getBadge());
+ }
+
+ // Entity -> DTO
+ public static BanchanDto of(Banchan banchan) {
+ return new BanchanDto(banchan);
+ }
+
+ public String getDetail_hash() {
+ return detail_hash;
+ }
+
+ public String getImage() {
+ return image;
+ }
+
+ public String getAlt() {
+ return alt;
+ }
+
+ public Set<String> getDelivery_type() {
+ return delivery_type;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public String getN_price() {
+ return n_price;
+ }
+
+ public String getS_price() {
+ return s_price;
+ }
+
+ public Set<String> getBadge() {
+ return badge;
+ }
+} | Java | `@JsonProperty` ๋ฅผ ํตํด JSON field์ ์ด๋ฆ ์ ํด์ฃผ์๋ฉด ๋ ๊ฒ ๊ฐ์์.
์ธ๋์ค์ฝ์ด๋ ์๋ฐ ์ฝ๋์ ์์์ผ๋ฉด ํฉ๋๋ค. |
@@ -0,0 +1,78 @@
+package develop.baminchan.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import develop.baminchan.entity.Banchan;
+
+import java.util.Set;
+
+import static develop.baminchan.dto.util.StringConvertor.convertToSet;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class BanchanDto {
+ private String detail_hash;
+ private String image;
+ private String alt;
+ private Set<String> delivery_type;
+ private String title;
+ private String description;
+ private String n_price;
+ private String s_price;
+ private Set<String> badge;
+
+ protected BanchanDto() {
+
+ }
+
+ private BanchanDto(Banchan banchan) {
+ this.detail_hash = banchan.getDetail_hash();
+ this.image = banchan.getImage();
+ this.alt = banchan.getAlt();
+ this.delivery_type = convertToSet(banchan.getDelivery_type());
+ this.title = banchan.getTitle();
+ this.description = banchan.getDescription();
+ this.n_price = banchan.getN_price();
+ this.s_price = banchan.getS_price();
+ this.badge = convertToSet(banchan.getBadge());
+ }
+
+ // Entity -> DTO
+ public static BanchanDto of(Banchan banchan) {
+ return new BanchanDto(banchan);
+ }
+
+ public String getDetail_hash() {
+ return detail_hash;
+ }
+
+ public String getImage() {
+ return image;
+ }
+
+ public String getAlt() {
+ return alt;
+ }
+
+ public Set<String> getDelivery_type() {
+ return delivery_type;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public String getN_price() {
+ return n_price;
+ }
+
+ public String getS_price() {
+ return s_price;
+ }
+
+ public Set<String> getBadge() {
+ return badge;
+ }
+} | Java | `private` ์ผ๋ก ๊ฐ๋ ค๋จ์ผ๋ฏ๋ก ๋ชจ๋ ํ๋์ ํด๋นํ๋ ํ๋ผ๋ฉํฐ๋ฅผ ๋ค ์ ์ธํด์ฃผ์
๋ ๋ฉ๋๋ค.
๋ ๊ทธ๋ ๊ฒ ํด์ผ ์ถํ ํ์ฅ์ฑ ์ธก๋ฉด์์๋ ์ข์ ๊ฑฐ๋ผ ์๊ฐํฉ๋๋ค.
`Banchan` ์ ๋ฐ์์ ํ๋์ฉ ์ ๋ณด๋ฅผ ๊บผ๋ด๋ ์ฑ
์์ `.of()` ์๊ฒ ๋งก๊ธฐ๊ณ ์์ฑ์์์ ๋จ์ ๊ฐ ํ ๋น์ ์ง์คํ๋ฉด ์ด๋จ๊น์. |
@@ -0,0 +1,45 @@
+package develop.baminchan.dto;
+
+import develop.baminchan.entity.Category;
+import org.springframework.data.annotation.Id;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CategoryDto {
+ @Id
+ private int id;
+
+ private String category_id;
+ private String name;
+
+ private List<BanchanDto> items = new ArrayList<>();
+
+ public CategoryDto(String category_id, String name) {
+ this.category_id = category_id;
+ this.name = name;
+ }
+
+ public CategoryDto(Category category, List<BanchanDto> banchanDtoList) {
+ this.category_id = category.getCategory_id();
+ this.name = category.getName();
+ this.items = banchanDtoList;
+ }
+
+ // Entity -> DTO
+ public static CategoryDto of(Category category, List<BanchanDto> banchanDtoList) {
+ return new CategoryDto(category, banchanDtoList);
+ }
+
+ public String getCategory_id() {
+ return category_id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public List<BanchanDto> getItems() {
+ return items;
+ }
+} | Java | DTO์ธ๋ฐ `@Id`.... ๊ด์ฐฎ์๊น์? |
@@ -0,0 +1,20 @@
+package develop.baminchan.dto.util;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+public class StringConvertor {
+ private StringConvertor() {
+ }
+
+ public static Set<String> convertToSet(String column) {
+ if (column == null) {
+ return null;
+ }
+ Set<String> set = new HashSet<>();
+ String[] arr = column.split(", ");
+ set.addAll(Arrays.asList(arr));
+ return set;
+ }
+} | Java | [์ด ๋งํฌ](https://docs.spring.io/spring-data/jdbc/docs/current/reference/html/#jdbc.custom-converters) ๋ฅผ ์ฐธ๊ณ ํด์ฃผ์๊ณ ํ์ค ์คํ์ ๋ง๋ ํด๋์ค๋ก ์ ํ์ ๋ถํ๋๋ฆด๊ฒ์. |
@@ -0,0 +1,35 @@
+package develop.baminchan.entity;
+
+import org.springframework.data.annotation.Id;
+
+public class Order {
+ @Id
+ private Long id;
+
+ private String client_id;
+ private String detail_hash;
+ private int quantity;
+
+ public Order(Long id, String client_id, String detail_hash, int quantity) {
+ this.id = id;
+ this.client_id = client_id;
+ this.detail_hash = detail_hash;
+ this.quantity = quantity;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public String getClient_id() {
+ return client_id;
+ }
+
+ public String getDetail_hash() {
+ return detail_hash;
+ }
+
+ public int getQuantity() {
+ return quantity;
+ }
+} | Java | ๊ตณ์ด ์ฝ์ด๋ฅผ ์ฌ์ฉํ์ค ํ์๋ ์์ด ๋ณด์ด๊ธฐ๋ ํฉ๋๋ค.
ํ
์ด๋ธ ์์๋ ์ด ์ด๋ฆ์ผ๋ก ์นผ๋ผ์ด ๋ค์ด๊ฐ์๋์? ๊ทธ๋ ๋ค๋ฉด ํ ๋ค์์ธ `quantity` ๋ก์ ์ ํ์ ์ ์๋๋ฆฝ๋๋ค. |
@@ -0,0 +1,57 @@
+package develop.baminchan.service;
+
+import develop.baminchan.dto.BanchanDto;
+import develop.baminchan.dto.CategoryDto;
+import develop.baminchan.entity.Banchan;
+import develop.baminchan.entity.Category;
+import develop.baminchan.repository.BanchanRepository;
+import develop.baminchan.repository.CategoryRepository;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@Service
+public class CategoryService {
+ private CategoryRepository categoryRepository;
+ private BanchanRepository banchanRepository;
+
+ public CategoryService(CategoryRepository categoryRepository, BanchanRepository banchanRepository) {
+ this.categoryRepository = categoryRepository;
+ this.banchanRepository = banchanRepository;
+ }
+
+ public List<CategoryDto> findAllBestBanchansByCategories() {
+ Iterable<Category> categoryList = categoryRepository.findAll();
+ Set<String> setOfCategoryIds = new HashSet<>();
+ for (Category category : categoryList) {
+ setOfCategoryIds.add(category.getCategory_id());
+ }
+ System.out.println(setOfCategoryIds); //ํ
์คํธ // null๋ ๋ค์ด๊ฐ๋?
+
+ List<CategoryDto> categoryDtoList = new ArrayList<>();
+ for (String category_id : setOfCategoryIds) {
+ categoryDtoList.add(findBestBanchansByCategory(category_id));
+ }
+ return categoryDtoList;
+ }
+
+ public CategoryDto findBestBanchansByCategory(String category_id) {
+ Category category = categoryRepository.findCategoryByCategory_id(category_id);
+ CategoryDto categoryDto = CategoryDto.of(category, findBanchanListByCategoryId(category_id));
+ return categoryDto;
+ }
+
+ private List<BanchanDto> findBanchanListByCategoryId(String catrgory_id) {
+ List<BanchanDto> banchanDtoList = new ArrayList<>();
+ List<Banchan> banchanList = new ArrayList<>();
+
+ banchanList = banchanRepository.findBanchansByCategory_id(catrgory_id);
+ for (int i = 0; i < banchanList.size(); i++) {
+ banchanDtoList.add(BanchanDto.of(banchanList.get(i)));
+ }
+ return banchanDtoList;
+ }
+} | Java | `logger` ์ฌ์ฉํด์ฃผ์ธ์. |
@@ -0,0 +1,57 @@
+package develop.baminchan.service;
+
+import develop.baminchan.dto.BanchanDto;
+import develop.baminchan.dto.CategoryDto;
+import develop.baminchan.entity.Banchan;
+import develop.baminchan.entity.Category;
+import develop.baminchan.repository.BanchanRepository;
+import develop.baminchan.repository.CategoryRepository;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@Service
+public class CategoryService {
+ private CategoryRepository categoryRepository;
+ private BanchanRepository banchanRepository;
+
+ public CategoryService(CategoryRepository categoryRepository, BanchanRepository banchanRepository) {
+ this.categoryRepository = categoryRepository;
+ this.banchanRepository = banchanRepository;
+ }
+
+ public List<CategoryDto> findAllBestBanchansByCategories() {
+ Iterable<Category> categoryList = categoryRepository.findAll();
+ Set<String> setOfCategoryIds = new HashSet<>();
+ for (Category category : categoryList) {
+ setOfCategoryIds.add(category.getCategory_id());
+ }
+ System.out.println(setOfCategoryIds); //ํ
์คํธ // null๋ ๋ค์ด๊ฐ๋?
+
+ List<CategoryDto> categoryDtoList = new ArrayList<>();
+ for (String category_id : setOfCategoryIds) {
+ categoryDtoList.add(findBestBanchansByCategory(category_id));
+ }
+ return categoryDtoList;
+ }
+
+ public CategoryDto findBestBanchansByCategory(String category_id) {
+ Category category = categoryRepository.findCategoryByCategory_id(category_id);
+ CategoryDto categoryDto = CategoryDto.of(category, findBanchanListByCategoryId(category_id));
+ return categoryDto;
+ }
+
+ private List<BanchanDto> findBanchanListByCategoryId(String catrgory_id) {
+ List<BanchanDto> banchanDtoList = new ArrayList<>();
+ List<Banchan> banchanList = new ArrayList<>();
+
+ banchanList = banchanRepository.findBanchansByCategory_id(catrgory_id);
+ for (int i = 0; i < banchanList.size(); i++) {
+ banchanDtoList.add(BanchanDto.of(banchanList.get(i)));
+ }
+ return banchanDtoList;
+ }
+} | Java | `.stream().map()` ์ฌ์ฉ์ผ๋ก ์์ for loop์ด๋ ์ฌ๊ธฐ๊น์ง ์์จ ์ ์์ด ๋ณด์
๋๋ค. |
@@ -0,0 +1,57 @@
+package develop.baminchan.service;
+
+import develop.baminchan.dto.BanchanDto;
+import develop.baminchan.dto.CategoryDto;
+import develop.baminchan.entity.Banchan;
+import develop.baminchan.entity.Category;
+import develop.baminchan.repository.BanchanRepository;
+import develop.baminchan.repository.CategoryRepository;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@Service
+public class CategoryService {
+ private CategoryRepository categoryRepository;
+ private BanchanRepository banchanRepository;
+
+ public CategoryService(CategoryRepository categoryRepository, BanchanRepository banchanRepository) {
+ this.categoryRepository = categoryRepository;
+ this.banchanRepository = banchanRepository;
+ }
+
+ public List<CategoryDto> findAllBestBanchansByCategories() {
+ Iterable<Category> categoryList = categoryRepository.findAll();
+ Set<String> setOfCategoryIds = new HashSet<>();
+ for (Category category : categoryList) {
+ setOfCategoryIds.add(category.getCategory_id());
+ }
+ System.out.println(setOfCategoryIds); //ํ
์คํธ // null๋ ๋ค์ด๊ฐ๋?
+
+ List<CategoryDto> categoryDtoList = new ArrayList<>();
+ for (String category_id : setOfCategoryIds) {
+ categoryDtoList.add(findBestBanchansByCategory(category_id));
+ }
+ return categoryDtoList;
+ }
+
+ public CategoryDto findBestBanchansByCategory(String category_id) {
+ Category category = categoryRepository.findCategoryByCategory_id(category_id);
+ CategoryDto categoryDto = CategoryDto.of(category, findBanchanListByCategoryId(category_id));
+ return categoryDto;
+ }
+
+ private List<BanchanDto> findBanchanListByCategoryId(String catrgory_id) {
+ List<BanchanDto> banchanDtoList = new ArrayList<>();
+ List<Banchan> banchanList = new ArrayList<>();
+
+ banchanList = banchanRepository.findBanchansByCategory_id(catrgory_id);
+ for (int i = 0; i < banchanList.size(); i++) {
+ banchanDtoList.add(BanchanDto.of(banchanList.get(i)));
+ }
+ return banchanDtoList;
+ }
+} | Java | ์ฌ๊ธฐ๋ `.stream().map()` ์ผ๋ก ๋ฐ๊ฟ ์ ์์ต๋๋ค. |
@@ -0,0 +1,20 @@
+package develop.baminchan.dto.util;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+public class StringConvertor {
+ private StringConvertor() {
+ }
+
+ public static Set<String> convertToSet(String column) {
+ if (column == null) {
+ return null;
+ }
+ Set<String> set = new HashSet<>();
+ String[] arr = column.split(", ");
+ set.addAll(Arrays.asList(arr));
+ return set;
+ }
+} | Java | ๋ฐ์ดํฐ ๋ณํ์ ์ํ ์ปจ๋ฒํฐ์ ๋ํ ํ์ค ์คํ์ด ์์๊ตฐ์..์คํ๋ง ๋ฌธ์ ์ ์ฒด์ ์ผ๋ก ๊ผญ ํ๋ฒ ์ฝ์ด๋ด์ผ๊ฒ ๋ค์.
๊ฐ์ฌํฉ๋๋ค. |
@@ -0,0 +1,94 @@
+package develop.baminchan.entity;
+
+import develop.baminchan.entity.banchan.BanchanDetail;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.relational.core.mapping.Embedded;
+
+public class Banchan {
+ @Id
+ private Long id;
+
+ private String detail_hash;
+ private String image;
+ private String alt;
+ private String delivery_type;
+ private String title;
+ private String description;
+ private String n_price;
+ private String s_price;
+ private String badge;
+
+ private String tag;
+ private String category_id;
+
+ @Embedded.Nullable
+ private BanchanDetail banchanDetail;
+
+ public Banchan(Long id, String detail_hash, String image, String alt, String delivery_type, String title, String description, String n_price, String s_price, String badge, String tag, String category_id, BanchanDetail banchanDetail) {
+ this.id = id;
+ this.detail_hash = detail_hash;
+ this.image = image;
+ this.alt = alt;
+ this.delivery_type = delivery_type;
+ this.title = title;
+ this.description = description;
+ this.n_price = n_price;
+ this.s_price = s_price;
+ this.badge = badge;
+ this.tag = tag;
+ this.category_id = category_id;
+ this.banchanDetail = banchanDetail;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public String getDetail_hash() {
+ return detail_hash;
+ }
+
+ public String getImage() {
+ return image;
+ }
+
+ public String getAlt() {
+ return alt;
+ }
+
+ public String getDelivery_type() {
+ return delivery_type;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public String getN_price() {
+ return n_price;
+ }
+
+ public String getS_price() {
+ return s_price;
+ }
+
+ public String getBadge() {
+ return badge;
+ }
+
+ public String getTag() {
+ return tag;
+ }
+
+ public String getCategory_id() {
+ return category_id;
+ }
+
+ public BanchanDetail getBanchanDetail() {
+ return banchanDetail;
+ }
+} | Java | ๋ค๋ฅธ ๋ฆฌ๋ทฐ์์ ์ด๋ฐ ๋ฅ์ ์์ฑ์๋ฅผ ๊ต์ฅํ ์ซ์ดํ์ ๋ค๊ณ ํ์๋๋ฐ ์ฌ๊ธฐ๋ ๋๊ฐ์ ๋ถ๋ถ ๋ง๋์? |
@@ -0,0 +1,79 @@
+"use client";
+
+import { useRef, useState } from "react";
+import CameraIcon from "@/assets/images/icons/camera.svg";
+import FilledDeleteIcon from "@/assets/images/icons/filled_delete.svg";
+import { useSimpleImageUpload } from "@/hooks/useSimpleImageUpload";
+
+export default function ReviewImageInput({
+ onImageSelect,
+}: {
+ onImageSelect: (image: File | null) => void;
+}) {
+ const [isHovered, setIsHovered] = useState(false);
+ const inputRef = useRef<HTMLInputElement | null>(null);
+ const {
+ previewUrl,
+ handleImageUpload: handleImagePreview,
+ handleImageDelete,
+ } = useSimpleImageUpload();
+
+ const handleCameraclick = (e: React.MouseEvent) => {
+ e.stopPropagation();
+ if (previewUrl) {
+ handleImageDelete();
+ onImageSelect(null);
+ } else {
+ inputRef.current?.click();
+ }
+ };
+
+ const handleImageUpload = (e: React.ChangeEvent<HTMLInputElement>) => {
+ const file = e.target.files?.[0] || null;
+ handleImagePreview(e);
+ onImageSelect(file);
+ };
+
+ return (
+ <div>
+ <label className='ml-2 text-body-2-normal font-medium text-gray-300'>
+ ๋ชจ์ ๊ด๋ จ ์ฌ์ง์ด ์๋์?
+ </label>
+ <div
+ className='mt-3 flex h-[140px] cursor-pointer flex-col items-center justify-center gap-2 rounded-xl border border-gray-800 bg-gray-900 *:text-gray-500'
+ onClick={handleCameraclick}
+ onMouseEnter={() => setIsHovered(true)}
+ onMouseLeave={() => setIsHovered(false)}
+ >
+ {previewUrl ? (
+ <div className='relative h-full w-full'>
+ <img
+ className='h-full w-full rounded-xl object-cover'
+ src={previewUrl}
+ alt='๋ฆฌ๋ทฐ ์ด๋ฏธ์ง'
+ />
+ {isHovered && (
+ <div className='absolute inset-0 flex items-center justify-center rounded-xl bg-black/50'>
+ <FilledDeleteIcon className='size-8 text-gray-800' />
+ </div>
+ )}
+ </div>
+ ) : (
+ <>
+ <CameraIcon className='size-8' />
+ <p className='text-label-normal font-medium'>
+ ์ด๋ฏธ์ง๋ฅผ ์ถ๊ฐํด์ฃผ์ธ์
+ </p>
+ </>
+ )}
+ <input
+ ref={inputRef}
+ className='hidden'
+ type='file'
+ accept='image/*'
+ onChange={handleImageUpload}
+ />
+ </div>
+ </div>
+ );
+} | Unknown | useUploadImage๋ฅผ ํ์ฉํด๋ ๋์ง ์๋์?.? |
@@ -0,0 +1,104 @@
+"use client";
+
+import { FormProvider, useForm } from "react-hook-form";
+import SolidButton from "@/components/common/buttons/SolidButton";
+import CommonTextArea from "@/components/common/inputs/TextArea";
+import RatingInput from "@/components/create-reaview/RatingInput";
+import ReviewImageInput from "@/components/create-reaview/ReviewImageInput";
+import useCookie from "@/hooks/auths/useTokenState";
+import useReviewMutations from "@/hooks/review/useReviewMutation";
+
+interface ReviewFormData {
+ rating: number;
+ content: string;
+ image: File | null;
+ meetupId: number;
+}
+
+export default function CreateReviewForm({ meetupId }: { meetupId: string }) {
+ const token = useCookie("accessToken");
+ const { createReviewMutation } = useReviewMutations();
+ const methods = useForm<ReviewFormData>({
+ defaultValues: {
+ rating: -1,
+ content: "",
+ image: null,
+ meetupId: Number(meetupId),
+ },
+ mode: "onChange",
+ });
+
+ const { handleSubmit, setValue, watch } = methods;
+
+ const rating = watch("rating");
+ const content = watch("content");
+ const isFormValid = rating !== -1 && content.trim() !== "";
+
+ const handleRatingChange = (value: number) => {
+ setValue("rating", value);
+ };
+
+ const handleImageSelect = (image: File | null) => {
+ setValue("image", image);
+ };
+
+ const onSubmit = handleSubmit(async (data) => {
+ if (!token) return;
+
+ const formData = new FormData();
+
+ const requestData = {
+ meetupId: Number(data.meetupId),
+ rating: data.rating,
+ content: data.content,
+ };
+
+ formData.append(
+ "request",
+ new Blob([JSON.stringify(requestData)], { type: "application/json" }),
+ );
+
+ if (data.image) {
+ formData.append("image", data.image);
+ }
+
+ if (data.image === null) {
+ formData.append("image", new Blob(), "");
+ }
+
+ await createReviewMutation.mutateAsync({ formData, token });
+ });
+
+ return (
+ <FormProvider {...methods}>
+ <form onSubmit={onSubmit}>
+ <div className='flex flex-col gap-12'>
+ <RatingInput
+ value={methods.watch("rating")}
+ onChange={handleRatingChange}
+ />
+ <CommonTextArea
+ formClassName='h-40'
+ required={true}
+ name='content'
+ label='๊ตฌ์ฒด์ ์ธ ๊ฒฝํ์ ์๋ ค์ฃผ์ธ์'
+ placeholder='๋ชจ์์ ์ฅ์, ํ๊ฒฝ, ์งํ, ๊ตฌ์ฑ ๋ฑ ๋ง์กฑ์ค๋ฌ์ ๋์?'
+ maxLength={150}
+ />
+ <ReviewImageInput onImageSelect={handleImageSelect} />
+ </div>
+ <SolidButton
+ type='submit'
+ className='mt-10'
+ state={
+ createReviewMutation.isPending || !isFormValid || !token
+ ? "inactive"
+ : "activated"
+ }
+ >
+ {createReviewMutation.isPending ? "์์ฑ ์ค..." : "์์ฑ ์๋ฃ"}
+ </SolidButton>
+ </form>
+ </FormProvider>
+ );
+} | Unknown | `createReviewMutation.isPending` ์ฌ์ฉํด์ ์ค๋ณต ํธ์ถ ๋ฐฉ์งํ๋ฉด ์ข์๊ฒ ๊ฐ์ต๋๋ค! |
@@ -0,0 +1,104 @@
+"use client";
+
+import { FormProvider, useForm } from "react-hook-form";
+import SolidButton from "@/components/common/buttons/SolidButton";
+import CommonTextArea from "@/components/common/inputs/TextArea";
+import RatingInput from "@/components/create-reaview/RatingInput";
+import ReviewImageInput from "@/components/create-reaview/ReviewImageInput";
+import useCookie from "@/hooks/auths/useTokenState";
+import useReviewMutations from "@/hooks/review/useReviewMutation";
+
+interface ReviewFormData {
+ rating: number;
+ content: string;
+ image: File | null;
+ meetupId: number;
+}
+
+export default function CreateReviewForm({ meetupId }: { meetupId: string }) {
+ const token = useCookie("accessToken");
+ const { createReviewMutation } = useReviewMutations();
+ const methods = useForm<ReviewFormData>({
+ defaultValues: {
+ rating: -1,
+ content: "",
+ image: null,
+ meetupId: Number(meetupId),
+ },
+ mode: "onChange",
+ });
+
+ const { handleSubmit, setValue, watch } = methods;
+
+ const rating = watch("rating");
+ const content = watch("content");
+ const isFormValid = rating !== -1 && content.trim() !== "";
+
+ const handleRatingChange = (value: number) => {
+ setValue("rating", value);
+ };
+
+ const handleImageSelect = (image: File | null) => {
+ setValue("image", image);
+ };
+
+ const onSubmit = handleSubmit(async (data) => {
+ if (!token) return;
+
+ const formData = new FormData();
+
+ const requestData = {
+ meetupId: Number(data.meetupId),
+ rating: data.rating,
+ content: data.content,
+ };
+
+ formData.append(
+ "request",
+ new Blob([JSON.stringify(requestData)], { type: "application/json" }),
+ );
+
+ if (data.image) {
+ formData.append("image", data.image);
+ }
+
+ if (data.image === null) {
+ formData.append("image", new Blob(), "");
+ }
+
+ await createReviewMutation.mutateAsync({ formData, token });
+ });
+
+ return (
+ <FormProvider {...methods}>
+ <form onSubmit={onSubmit}>
+ <div className='flex flex-col gap-12'>
+ <RatingInput
+ value={methods.watch("rating")}
+ onChange={handleRatingChange}
+ />
+ <CommonTextArea
+ formClassName='h-40'
+ required={true}
+ name='content'
+ label='๊ตฌ์ฒด์ ์ธ ๊ฒฝํ์ ์๋ ค์ฃผ์ธ์'
+ placeholder='๋ชจ์์ ์ฅ์, ํ๊ฒฝ, ์งํ, ๊ตฌ์ฑ ๋ฑ ๋ง์กฑ์ค๋ฌ์ ๋์?'
+ maxLength={150}
+ />
+ <ReviewImageInput onImageSelect={handleImageSelect} />
+ </div>
+ <SolidButton
+ type='submit'
+ className='mt-10'
+ state={
+ createReviewMutation.isPending || !isFormValid || !token
+ ? "inactive"
+ : "activated"
+ }
+ >
+ {createReviewMutation.isPending ? "์์ฑ ์ค..." : "์์ฑ ์๋ฃ"}
+ </SolidButton>
+ </form>
+ </FormProvider>
+ );
+} | Unknown | ์์ฑ๋ ๋ด์ฉ๋ค์ ์๋ก๊ณ ์นจ ํ์ ๋๋ ์ฌ๋ผ์ง์ง ์๊ฒ, localStorage์ ์ ์ฅํ๋ฉด ๋ ์ข์ ๊ฒ ๊ฐ์ต๋๋ค. |
@@ -0,0 +1,104 @@
+"use client";
+
+import { FormProvider, useForm } from "react-hook-form";
+import SolidButton from "@/components/common/buttons/SolidButton";
+import CommonTextArea from "@/components/common/inputs/TextArea";
+import RatingInput from "@/components/create-reaview/RatingInput";
+import ReviewImageInput from "@/components/create-reaview/ReviewImageInput";
+import useCookie from "@/hooks/auths/useTokenState";
+import useReviewMutations from "@/hooks/review/useReviewMutation";
+
+interface ReviewFormData {
+ rating: number;
+ content: string;
+ image: File | null;
+ meetupId: number;
+}
+
+export default function CreateReviewForm({ meetupId }: { meetupId: string }) {
+ const token = useCookie("accessToken");
+ const { createReviewMutation } = useReviewMutations();
+ const methods = useForm<ReviewFormData>({
+ defaultValues: {
+ rating: -1,
+ content: "",
+ image: null,
+ meetupId: Number(meetupId),
+ },
+ mode: "onChange",
+ });
+
+ const { handleSubmit, setValue, watch } = methods;
+
+ const rating = watch("rating");
+ const content = watch("content");
+ const isFormValid = rating !== -1 && content.trim() !== "";
+
+ const handleRatingChange = (value: number) => {
+ setValue("rating", value);
+ };
+
+ const handleImageSelect = (image: File | null) => {
+ setValue("image", image);
+ };
+
+ const onSubmit = handleSubmit(async (data) => {
+ if (!token) return;
+
+ const formData = new FormData();
+
+ const requestData = {
+ meetupId: Number(data.meetupId),
+ rating: data.rating,
+ content: data.content,
+ };
+
+ formData.append(
+ "request",
+ new Blob([JSON.stringify(requestData)], { type: "application/json" }),
+ );
+
+ if (data.image) {
+ formData.append("image", data.image);
+ }
+
+ if (data.image === null) {
+ formData.append("image", new Blob(), "");
+ }
+
+ await createReviewMutation.mutateAsync({ formData, token });
+ });
+
+ return (
+ <FormProvider {...methods}>
+ <form onSubmit={onSubmit}>
+ <div className='flex flex-col gap-12'>
+ <RatingInput
+ value={methods.watch("rating")}
+ onChange={handleRatingChange}
+ />
+ <CommonTextArea
+ formClassName='h-40'
+ required={true}
+ name='content'
+ label='๊ตฌ์ฒด์ ์ธ ๊ฒฝํ์ ์๋ ค์ฃผ์ธ์'
+ placeholder='๋ชจ์์ ์ฅ์, ํ๊ฒฝ, ์งํ, ๊ตฌ์ฑ ๋ฑ ๋ง์กฑ์ค๋ฌ์ ๋์?'
+ maxLength={150}
+ />
+ <ReviewImageInput onImageSelect={handleImageSelect} />
+ </div>
+ <SolidButton
+ type='submit'
+ className='mt-10'
+ state={
+ createReviewMutation.isPending || !isFormValid || !token
+ ? "inactive"
+ : "activated"
+ }
+ >
+ {createReviewMutation.isPending ? "์์ฑ ์ค..." : "์์ฑ ์๋ฃ"}
+ </SolidButton>
+ </form>
+ </FormProvider>
+ );
+} | Unknown | ํด๋น ๋ผ์ธ์ ๋ถํ์ํ๋ค๊ณ ์๊ฐํฉ๋๋ค. ํ ํฐ์ด ์์ผ๋ฉด ์ด์งํผ ์๋ฒ์์ ๊ฒ์ฆ ํ ์๋ฌ๋ฅผ ๋์ ธ์ค๋๋ค.
UX์ ์ผ๋ก API ์์ฒญ ์ ๊ฒ์ฌ ํ ๋ฆฌ๋ค์ด๋ ํธ๊ฐ ํ์ํ๋ฉด `mutatonFn`์ wrappingํ๋ ๋ฐฉ์์ ์ฌ์ฉํ์๊ฑฐ๋
์ค์์ง์ค์์ผ๋ก ๊ด๋ฆฌํ๋ ๋ฐฉ์์ผ๋ก ๊ตฌํํ์๊ธธ ๋ฐ๋๋๋ค. |
@@ -0,0 +1,104 @@
+"use client";
+
+import { FormProvider, useForm } from "react-hook-form";
+import SolidButton from "@/components/common/buttons/SolidButton";
+import CommonTextArea from "@/components/common/inputs/TextArea";
+import RatingInput from "@/components/create-reaview/RatingInput";
+import ReviewImageInput from "@/components/create-reaview/ReviewImageInput";
+import useCookie from "@/hooks/auths/useTokenState";
+import useReviewMutations from "@/hooks/review/useReviewMutation";
+
+interface ReviewFormData {
+ rating: number;
+ content: string;
+ image: File | null;
+ meetupId: number;
+}
+
+export default function CreateReviewForm({ meetupId }: { meetupId: string }) {
+ const token = useCookie("accessToken");
+ const { createReviewMutation } = useReviewMutations();
+ const methods = useForm<ReviewFormData>({
+ defaultValues: {
+ rating: -1,
+ content: "",
+ image: null,
+ meetupId: Number(meetupId),
+ },
+ mode: "onChange",
+ });
+
+ const { handleSubmit, setValue, watch } = methods;
+
+ const rating = watch("rating");
+ const content = watch("content");
+ const isFormValid = rating !== -1 && content.trim() !== "";
+
+ const handleRatingChange = (value: number) => {
+ setValue("rating", value);
+ };
+
+ const handleImageSelect = (image: File | null) => {
+ setValue("image", image);
+ };
+
+ const onSubmit = handleSubmit(async (data) => {
+ if (!token) return;
+
+ const formData = new FormData();
+
+ const requestData = {
+ meetupId: Number(data.meetupId),
+ rating: data.rating,
+ content: data.content,
+ };
+
+ formData.append(
+ "request",
+ new Blob([JSON.stringify(requestData)], { type: "application/json" }),
+ );
+
+ if (data.image) {
+ formData.append("image", data.image);
+ }
+
+ if (data.image === null) {
+ formData.append("image", new Blob(), "");
+ }
+
+ await createReviewMutation.mutateAsync({ formData, token });
+ });
+
+ return (
+ <FormProvider {...methods}>
+ <form onSubmit={onSubmit}>
+ <div className='flex flex-col gap-12'>
+ <RatingInput
+ value={methods.watch("rating")}
+ onChange={handleRatingChange}
+ />
+ <CommonTextArea
+ formClassName='h-40'
+ required={true}
+ name='content'
+ label='๊ตฌ์ฒด์ ์ธ ๊ฒฝํ์ ์๋ ค์ฃผ์ธ์'
+ placeholder='๋ชจ์์ ์ฅ์, ํ๊ฒฝ, ์งํ, ๊ตฌ์ฑ ๋ฑ ๋ง์กฑ์ค๋ฌ์ ๋์?'
+ maxLength={150}
+ />
+ <ReviewImageInput onImageSelect={handleImageSelect} />
+ </div>
+ <SolidButton
+ type='submit'
+ className='mt-10'
+ state={
+ createReviewMutation.isPending || !isFormValid || !token
+ ? "inactive"
+ : "activated"
+ }
+ >
+ {createReviewMutation.isPending ? "์์ฑ ์ค..." : "์์ฑ ์๋ฃ"}
+ </SolidButton>
+ </form>
+ </FormProvider>
+ );
+} | Unknown | ์ฌ๊ธฐ์ throw ๋ ์๋ฌ๋ ์ด๋์ ์ด๋ป๊ฒ ํธ๋ค๋ง ๋ ๊น์? |
@@ -0,0 +1,104 @@
+"use client";
+
+import { FormProvider, useForm } from "react-hook-form";
+import SolidButton from "@/components/common/buttons/SolidButton";
+import CommonTextArea from "@/components/common/inputs/TextArea";
+import RatingInput from "@/components/create-reaview/RatingInput";
+import ReviewImageInput from "@/components/create-reaview/ReviewImageInput";
+import useCookie from "@/hooks/auths/useTokenState";
+import useReviewMutations from "@/hooks/review/useReviewMutation";
+
+interface ReviewFormData {
+ rating: number;
+ content: string;
+ image: File | null;
+ meetupId: number;
+}
+
+export default function CreateReviewForm({ meetupId }: { meetupId: string }) {
+ const token = useCookie("accessToken");
+ const { createReviewMutation } = useReviewMutations();
+ const methods = useForm<ReviewFormData>({
+ defaultValues: {
+ rating: -1,
+ content: "",
+ image: null,
+ meetupId: Number(meetupId),
+ },
+ mode: "onChange",
+ });
+
+ const { handleSubmit, setValue, watch } = methods;
+
+ const rating = watch("rating");
+ const content = watch("content");
+ const isFormValid = rating !== -1 && content.trim() !== "";
+
+ const handleRatingChange = (value: number) => {
+ setValue("rating", value);
+ };
+
+ const handleImageSelect = (image: File | null) => {
+ setValue("image", image);
+ };
+
+ const onSubmit = handleSubmit(async (data) => {
+ if (!token) return;
+
+ const formData = new FormData();
+
+ const requestData = {
+ meetupId: Number(data.meetupId),
+ rating: data.rating,
+ content: data.content,
+ };
+
+ formData.append(
+ "request",
+ new Blob([JSON.stringify(requestData)], { type: "application/json" }),
+ );
+
+ if (data.image) {
+ formData.append("image", data.image);
+ }
+
+ if (data.image === null) {
+ formData.append("image", new Blob(), "");
+ }
+
+ await createReviewMutation.mutateAsync({ formData, token });
+ });
+
+ return (
+ <FormProvider {...methods}>
+ <form onSubmit={onSubmit}>
+ <div className='flex flex-col gap-12'>
+ <RatingInput
+ value={methods.watch("rating")}
+ onChange={handleRatingChange}
+ />
+ <CommonTextArea
+ formClassName='h-40'
+ required={true}
+ name='content'
+ label='๊ตฌ์ฒด์ ์ธ ๊ฒฝํ์ ์๋ ค์ฃผ์ธ์'
+ placeholder='๋ชจ์์ ์ฅ์, ํ๊ฒฝ, ์งํ, ๊ตฌ์ฑ ๋ฑ ๋ง์กฑ์ค๋ฌ์ ๋์?'
+ maxLength={150}
+ />
+ <ReviewImageInput onImageSelect={handleImageSelect} />
+ </div>
+ <SolidButton
+ type='submit'
+ className='mt-10'
+ state={
+ createReviewMutation.isPending || !isFormValid || !token
+ ? "inactive"
+ : "activated"
+ }
+ >
+ {createReviewMutation.isPending ? "์์ฑ ์ค..." : "์์ฑ ์๋ฃ"}
+ </SolidButton>
+ </form>
+ </FormProvider>
+ );
+} | Unknown | `Blob` ์ธ์คํด์ค๋ก ๋ง๋๋ ์ด์ ๊ฐ ๊ถ๊ธํฉ๋๋ค. |
@@ -0,0 +1,79 @@
+"use client";
+
+import { useRef, useState } from "react";
+import CameraIcon from "@/assets/images/icons/camera.svg";
+import FilledDeleteIcon from "@/assets/images/icons/filled_delete.svg";
+import { useSimpleImageUpload } from "@/hooks/useSimpleImageUpload";
+
+export default function ReviewImageInput({
+ onImageSelect,
+}: {
+ onImageSelect: (image: File | null) => void;
+}) {
+ const [isHovered, setIsHovered] = useState(false);
+ const inputRef = useRef<HTMLInputElement | null>(null);
+ const {
+ previewUrl,
+ handleImageUpload: handleImagePreview,
+ handleImageDelete,
+ } = useSimpleImageUpload();
+
+ const handleCameraclick = (e: React.MouseEvent) => {
+ e.stopPropagation();
+ if (previewUrl) {
+ handleImageDelete();
+ onImageSelect(null);
+ } else {
+ inputRef.current?.click();
+ }
+ };
+
+ const handleImageUpload = (e: React.ChangeEvent<HTMLInputElement>) => {
+ const file = e.target.files?.[0] || null;
+ handleImagePreview(e);
+ onImageSelect(file);
+ };
+
+ return (
+ <div>
+ <label className='ml-2 text-body-2-normal font-medium text-gray-300'>
+ ๋ชจ์ ๊ด๋ จ ์ฌ์ง์ด ์๋์?
+ </label>
+ <div
+ className='mt-3 flex h-[140px] cursor-pointer flex-col items-center justify-center gap-2 rounded-xl border border-gray-800 bg-gray-900 *:text-gray-500'
+ onClick={handleCameraclick}
+ onMouseEnter={() => setIsHovered(true)}
+ onMouseLeave={() => setIsHovered(false)}
+ >
+ {previewUrl ? (
+ <div className='relative h-full w-full'>
+ <img
+ className='h-full w-full rounded-xl object-cover'
+ src={previewUrl}
+ alt='๋ฆฌ๋ทฐ ์ด๋ฏธ์ง'
+ />
+ {isHovered && (
+ <div className='absolute inset-0 flex items-center justify-center rounded-xl bg-black/50'>
+ <FilledDeleteIcon className='size-8 text-gray-800' />
+ </div>
+ )}
+ </div>
+ ) : (
+ <>
+ <CameraIcon className='size-8' />
+ <p className='text-label-normal font-medium'>
+ ์ด๋ฏธ์ง๋ฅผ ์ถ๊ฐํด์ฃผ์ธ์
+ </p>
+ </>
+ )}
+ <input
+ ref={inputRef}
+ className='hidden'
+ type='file'
+ accept='image/*'
+ onChange={handleImageUpload}
+ />
+ </div>
+ </div>
+ );
+} | Unknown | `useSimpleImageUpload`๋ ์ด์ ์ IndexedDB ์ด์๊ฐ ์์์ ๋ ๊ธํ๊ฒ ๋์ฒด ๊ตฌํ์ด ํ์ํด์ ๋ง๋ค์ด๋ ํ
์
๋๋ค.
์ดํ IndexedDB ์ด์๊ฐ ํด๊ฒฐ๋์์ง๋ง ์ ์ ํ์ด์ง๋ฅผ ๋น๋กฏํ ๊ธฐํ ์์
์ ์์ง ์ค์ ์ ์ฉ์ ํด๋ณด์ง ์์ ์ํ๋ผ ์ผ๋จ `useSimpleImageUpload`๋ก ๊ตฌํํ์ต๋๋ค!
์ถํ ๋ฆฌํฉํ ๋ง ๋จ๊ณ์์ IndexedDB๋ฅผ ์ ์ฉํ๋ฉด์ ์ด ๋ถ๋ถ๋ `useUploadImage`๋ก ๊ต์ฒดํ๋๋ก ํ๊ฒ ์ต๋๋น |
@@ -0,0 +1,104 @@
+"use client";
+
+import { FormProvider, useForm } from "react-hook-form";
+import SolidButton from "@/components/common/buttons/SolidButton";
+import CommonTextArea from "@/components/common/inputs/TextArea";
+import RatingInput from "@/components/create-reaview/RatingInput";
+import ReviewImageInput from "@/components/create-reaview/ReviewImageInput";
+import useCookie from "@/hooks/auths/useTokenState";
+import useReviewMutations from "@/hooks/review/useReviewMutation";
+
+interface ReviewFormData {
+ rating: number;
+ content: string;
+ image: File | null;
+ meetupId: number;
+}
+
+export default function CreateReviewForm({ meetupId }: { meetupId: string }) {
+ const token = useCookie("accessToken");
+ const { createReviewMutation } = useReviewMutations();
+ const methods = useForm<ReviewFormData>({
+ defaultValues: {
+ rating: -1,
+ content: "",
+ image: null,
+ meetupId: Number(meetupId),
+ },
+ mode: "onChange",
+ });
+
+ const { handleSubmit, setValue, watch } = methods;
+
+ const rating = watch("rating");
+ const content = watch("content");
+ const isFormValid = rating !== -1 && content.trim() !== "";
+
+ const handleRatingChange = (value: number) => {
+ setValue("rating", value);
+ };
+
+ const handleImageSelect = (image: File | null) => {
+ setValue("image", image);
+ };
+
+ const onSubmit = handleSubmit(async (data) => {
+ if (!token) return;
+
+ const formData = new FormData();
+
+ const requestData = {
+ meetupId: Number(data.meetupId),
+ rating: data.rating,
+ content: data.content,
+ };
+
+ formData.append(
+ "request",
+ new Blob([JSON.stringify(requestData)], { type: "application/json" }),
+ );
+
+ if (data.image) {
+ formData.append("image", data.image);
+ }
+
+ if (data.image === null) {
+ formData.append("image", new Blob(), "");
+ }
+
+ await createReviewMutation.mutateAsync({ formData, token });
+ });
+
+ return (
+ <FormProvider {...methods}>
+ <form onSubmit={onSubmit}>
+ <div className='flex flex-col gap-12'>
+ <RatingInput
+ value={methods.watch("rating")}
+ onChange={handleRatingChange}
+ />
+ <CommonTextArea
+ formClassName='h-40'
+ required={true}
+ name='content'
+ label='๊ตฌ์ฒด์ ์ธ ๊ฒฝํ์ ์๋ ค์ฃผ์ธ์'
+ placeholder='๋ชจ์์ ์ฅ์, ํ๊ฒฝ, ์งํ, ๊ตฌ์ฑ ๋ฑ ๋ง์กฑ์ค๋ฌ์ ๋์?'
+ maxLength={150}
+ />
+ <ReviewImageInput onImageSelect={handleImageSelect} />
+ </div>
+ <SolidButton
+ type='submit'
+ className='mt-10'
+ state={
+ createReviewMutation.isPending || !isFormValid || !token
+ ? "inactive"
+ : "activated"
+ }
+ >
+ {createReviewMutation.isPending ? "์์ฑ ์ค..." : "์์ฑ ์๋ฃ"}
+ </SolidButton>
+ </form>
+ </FormProvider>
+ );
+} | Unknown | ๋ต ๋ฆฌํฉํ ๋ง ๋ ๋ฐ์ํด๋ณด๊ฒ ์ต๋๋ค |
@@ -0,0 +1,104 @@
+"use client";
+
+import { FormProvider, useForm } from "react-hook-form";
+import SolidButton from "@/components/common/buttons/SolidButton";
+import CommonTextArea from "@/components/common/inputs/TextArea";
+import RatingInput from "@/components/create-reaview/RatingInput";
+import ReviewImageInput from "@/components/create-reaview/ReviewImageInput";
+import useCookie from "@/hooks/auths/useTokenState";
+import useReviewMutations from "@/hooks/review/useReviewMutation";
+
+interface ReviewFormData {
+ rating: number;
+ content: string;
+ image: File | null;
+ meetupId: number;
+}
+
+export default function CreateReviewForm({ meetupId }: { meetupId: string }) {
+ const token = useCookie("accessToken");
+ const { createReviewMutation } = useReviewMutations();
+ const methods = useForm<ReviewFormData>({
+ defaultValues: {
+ rating: -1,
+ content: "",
+ image: null,
+ meetupId: Number(meetupId),
+ },
+ mode: "onChange",
+ });
+
+ const { handleSubmit, setValue, watch } = methods;
+
+ const rating = watch("rating");
+ const content = watch("content");
+ const isFormValid = rating !== -1 && content.trim() !== "";
+
+ const handleRatingChange = (value: number) => {
+ setValue("rating", value);
+ };
+
+ const handleImageSelect = (image: File | null) => {
+ setValue("image", image);
+ };
+
+ const onSubmit = handleSubmit(async (data) => {
+ if (!token) return;
+
+ const formData = new FormData();
+
+ const requestData = {
+ meetupId: Number(data.meetupId),
+ rating: data.rating,
+ content: data.content,
+ };
+
+ formData.append(
+ "request",
+ new Blob([JSON.stringify(requestData)], { type: "application/json" }),
+ );
+
+ if (data.image) {
+ formData.append("image", data.image);
+ }
+
+ if (data.image === null) {
+ formData.append("image", new Blob(), "");
+ }
+
+ await createReviewMutation.mutateAsync({ formData, token });
+ });
+
+ return (
+ <FormProvider {...methods}>
+ <form onSubmit={onSubmit}>
+ <div className='flex flex-col gap-12'>
+ <RatingInput
+ value={methods.watch("rating")}
+ onChange={handleRatingChange}
+ />
+ <CommonTextArea
+ formClassName='h-40'
+ required={true}
+ name='content'
+ label='๊ตฌ์ฒด์ ์ธ ๊ฒฝํ์ ์๋ ค์ฃผ์ธ์'
+ placeholder='๋ชจ์์ ์ฅ์, ํ๊ฒฝ, ์งํ, ๊ตฌ์ฑ ๋ฑ ๋ง์กฑ์ค๋ฌ์ ๋์?'
+ maxLength={150}
+ />
+ <ReviewImageInput onImageSelect={handleImageSelect} />
+ </div>
+ <SolidButton
+ type='submit'
+ className='mt-10'
+ state={
+ createReviewMutation.isPending || !isFormValid || !token
+ ? "inactive"
+ : "activated"
+ }
+ >
+ {createReviewMutation.isPending ? "์์ฑ ์ค..." : "์์ฑ ์๋ฃ"}
+ </SolidButton>
+ </form>
+ </FormProvider>
+ );
+} | Unknown | ๊ทธ๊ฒ ๋ ์ข์ ๋ฐฉ์ ๊ฐ๋ค์! ๊ทธ๋ ๊ฒ ์์ ํด๋ณด๊ฒ ์ต๋๋ค! |
@@ -0,0 +1,104 @@
+"use client";
+
+import { FormProvider, useForm } from "react-hook-form";
+import SolidButton from "@/components/common/buttons/SolidButton";
+import CommonTextArea from "@/components/common/inputs/TextArea";
+import RatingInput from "@/components/create-reaview/RatingInput";
+import ReviewImageInput from "@/components/create-reaview/ReviewImageInput";
+import useCookie from "@/hooks/auths/useTokenState";
+import useReviewMutations from "@/hooks/review/useReviewMutation";
+
+interface ReviewFormData {
+ rating: number;
+ content: string;
+ image: File | null;
+ meetupId: number;
+}
+
+export default function CreateReviewForm({ meetupId }: { meetupId: string }) {
+ const token = useCookie("accessToken");
+ const { createReviewMutation } = useReviewMutations();
+ const methods = useForm<ReviewFormData>({
+ defaultValues: {
+ rating: -1,
+ content: "",
+ image: null,
+ meetupId: Number(meetupId),
+ },
+ mode: "onChange",
+ });
+
+ const { handleSubmit, setValue, watch } = methods;
+
+ const rating = watch("rating");
+ const content = watch("content");
+ const isFormValid = rating !== -1 && content.trim() !== "";
+
+ const handleRatingChange = (value: number) => {
+ setValue("rating", value);
+ };
+
+ const handleImageSelect = (image: File | null) => {
+ setValue("image", image);
+ };
+
+ const onSubmit = handleSubmit(async (data) => {
+ if (!token) return;
+
+ const formData = new FormData();
+
+ const requestData = {
+ meetupId: Number(data.meetupId),
+ rating: data.rating,
+ content: data.content,
+ };
+
+ formData.append(
+ "request",
+ new Blob([JSON.stringify(requestData)], { type: "application/json" }),
+ );
+
+ if (data.image) {
+ formData.append("image", data.image);
+ }
+
+ if (data.image === null) {
+ formData.append("image", new Blob(), "");
+ }
+
+ await createReviewMutation.mutateAsync({ formData, token });
+ });
+
+ return (
+ <FormProvider {...methods}>
+ <form onSubmit={onSubmit}>
+ <div className='flex flex-col gap-12'>
+ <RatingInput
+ value={methods.watch("rating")}
+ onChange={handleRatingChange}
+ />
+ <CommonTextArea
+ formClassName='h-40'
+ required={true}
+ name='content'
+ label='๊ตฌ์ฒด์ ์ธ ๊ฒฝํ์ ์๋ ค์ฃผ์ธ์'
+ placeholder='๋ชจ์์ ์ฅ์, ํ๊ฒฝ, ์งํ, ๊ตฌ์ฑ ๋ฑ ๋ง์กฑ์ค๋ฌ์ ๋์?'
+ maxLength={150}
+ />
+ <ReviewImageInput onImageSelect={handleImageSelect} />
+ </div>
+ <SolidButton
+ type='submit'
+ className='mt-10'
+ state={
+ createReviewMutation.isPending || !isFormValid || !token
+ ? "inactive"
+ : "activated"
+ }
+ >
+ {createReviewMutation.isPending ? "์์ฑ ์ค..." : "์์ฑ ์๋ฃ"}
+ </SolidButton>
+ </form>
+ </FormProvider>
+ );
+} | Unknown | ๋ต ํผ๋๋ฐฑ ๊ฐ์ฌํฉ๋๋ค!
๋ง์ํ์ ๋๋ก api ๋ ๋ฒจ์ ํ ํฐ ์ฒดํฌ๋ ์ ๊ฑฐํ๊ณ , ์ปดํฌ๋ํธ ์ง์
์์ ์ ์ฒ๋ฆฌํ๋๋ก ์์ ํ์ต๋๋ค! |
@@ -0,0 +1,104 @@
+"use client";
+
+import { FormProvider, useForm } from "react-hook-form";
+import SolidButton from "@/components/common/buttons/SolidButton";
+import CommonTextArea from "@/components/common/inputs/TextArea";
+import RatingInput from "@/components/create-reaview/RatingInput";
+import ReviewImageInput from "@/components/create-reaview/ReviewImageInput";
+import useCookie from "@/hooks/auths/useTokenState";
+import useReviewMutations from "@/hooks/review/useReviewMutation";
+
+interface ReviewFormData {
+ rating: number;
+ content: string;
+ image: File | null;
+ meetupId: number;
+}
+
+export default function CreateReviewForm({ meetupId }: { meetupId: string }) {
+ const token = useCookie("accessToken");
+ const { createReviewMutation } = useReviewMutations();
+ const methods = useForm<ReviewFormData>({
+ defaultValues: {
+ rating: -1,
+ content: "",
+ image: null,
+ meetupId: Number(meetupId),
+ },
+ mode: "onChange",
+ });
+
+ const { handleSubmit, setValue, watch } = methods;
+
+ const rating = watch("rating");
+ const content = watch("content");
+ const isFormValid = rating !== -1 && content.trim() !== "";
+
+ const handleRatingChange = (value: number) => {
+ setValue("rating", value);
+ };
+
+ const handleImageSelect = (image: File | null) => {
+ setValue("image", image);
+ };
+
+ const onSubmit = handleSubmit(async (data) => {
+ if (!token) return;
+
+ const formData = new FormData();
+
+ const requestData = {
+ meetupId: Number(data.meetupId),
+ rating: data.rating,
+ content: data.content,
+ };
+
+ formData.append(
+ "request",
+ new Blob([JSON.stringify(requestData)], { type: "application/json" }),
+ );
+
+ if (data.image) {
+ formData.append("image", data.image);
+ }
+
+ if (data.image === null) {
+ formData.append("image", new Blob(), "");
+ }
+
+ await createReviewMutation.mutateAsync({ formData, token });
+ });
+
+ return (
+ <FormProvider {...methods}>
+ <form onSubmit={onSubmit}>
+ <div className='flex flex-col gap-12'>
+ <RatingInput
+ value={methods.watch("rating")}
+ onChange={handleRatingChange}
+ />
+ <CommonTextArea
+ formClassName='h-40'
+ required={true}
+ name='content'
+ label='๊ตฌ์ฒด์ ์ธ ๊ฒฝํ์ ์๋ ค์ฃผ์ธ์'
+ placeholder='๋ชจ์์ ์ฅ์, ํ๊ฒฝ, ์งํ, ๊ตฌ์ฑ ๋ฑ ๋ง์กฑ์ค๋ฌ์ ๋์?'
+ maxLength={150}
+ />
+ <ReviewImageInput onImageSelect={handleImageSelect} />
+ </div>
+ <SolidButton
+ type='submit'
+ className='mt-10'
+ state={
+ createReviewMutation.isPending || !isFormValid || !token
+ ? "inactive"
+ : "activated"
+ }
+ >
+ {createReviewMutation.isPending ? "์์ฑ ์ค..." : "์์ฑ ์๋ฃ"}
+ </SolidButton>
+ </form>
+ </FormProvider>
+ );
+} | Unknown | `multipart/form-data`๋ก ํ์ผ๊ณผ JSON ๊ฐ์ฒด๋ฅผ ํจ๊ป ์ ์กํ ๋ ๋ฐ์ํ๋ ํ์ฑ ์ด์๋ฅผ ํด๊ฒฐํ๊ธฐ ์ํด ์ฌ์ฉํ์ต๋๋ค.
์ผ์ ์ ํ๋กํ์์ ์์
๋ ๊ฐ์ ์ด์๊ฐ ์์๋๋ฐ, ์ด ๋ฐฉ์์ด ์ ์๋ํ์ฌ ๋์ผํ ํจํด์ ์ ์ฉํ์ต๋๋ค. |
@@ -0,0 +1,104 @@
+"use client";
+
+import { FormProvider, useForm } from "react-hook-form";
+import SolidButton from "@/components/common/buttons/SolidButton";
+import CommonTextArea from "@/components/common/inputs/TextArea";
+import RatingInput from "@/components/create-reaview/RatingInput";
+import ReviewImageInput from "@/components/create-reaview/ReviewImageInput";
+import useCookie from "@/hooks/auths/useTokenState";
+import useReviewMutations from "@/hooks/review/useReviewMutation";
+
+interface ReviewFormData {
+ rating: number;
+ content: string;
+ image: File | null;
+ meetupId: number;
+}
+
+export default function CreateReviewForm({ meetupId }: { meetupId: string }) {
+ const token = useCookie("accessToken");
+ const { createReviewMutation } = useReviewMutations();
+ const methods = useForm<ReviewFormData>({
+ defaultValues: {
+ rating: -1,
+ content: "",
+ image: null,
+ meetupId: Number(meetupId),
+ },
+ mode: "onChange",
+ });
+
+ const { handleSubmit, setValue, watch } = methods;
+
+ const rating = watch("rating");
+ const content = watch("content");
+ const isFormValid = rating !== -1 && content.trim() !== "";
+
+ const handleRatingChange = (value: number) => {
+ setValue("rating", value);
+ };
+
+ const handleImageSelect = (image: File | null) => {
+ setValue("image", image);
+ };
+
+ const onSubmit = handleSubmit(async (data) => {
+ if (!token) return;
+
+ const formData = new FormData();
+
+ const requestData = {
+ meetupId: Number(data.meetupId),
+ rating: data.rating,
+ content: data.content,
+ };
+
+ formData.append(
+ "request",
+ new Blob([JSON.stringify(requestData)], { type: "application/json" }),
+ );
+
+ if (data.image) {
+ formData.append("image", data.image);
+ }
+
+ if (data.image === null) {
+ formData.append("image", new Blob(), "");
+ }
+
+ await createReviewMutation.mutateAsync({ formData, token });
+ });
+
+ return (
+ <FormProvider {...methods}>
+ <form onSubmit={onSubmit}>
+ <div className='flex flex-col gap-12'>
+ <RatingInput
+ value={methods.watch("rating")}
+ onChange={handleRatingChange}
+ />
+ <CommonTextArea
+ formClassName='h-40'
+ required={true}
+ name='content'
+ label='๊ตฌ์ฒด์ ์ธ ๊ฒฝํ์ ์๋ ค์ฃผ์ธ์'
+ placeholder='๋ชจ์์ ์ฅ์, ํ๊ฒฝ, ์งํ, ๊ตฌ์ฑ ๋ฑ ๋ง์กฑ์ค๋ฌ์ ๋์?'
+ maxLength={150}
+ />
+ <ReviewImageInput onImageSelect={handleImageSelect} />
+ </div>
+ <SolidButton
+ type='submit'
+ className='mt-10'
+ state={
+ createReviewMutation.isPending || !isFormValid || !token
+ ? "inactive"
+ : "activated"
+ }
+ >
+ {createReviewMutation.isPending ? "์์ฑ ์ค..." : "์์ฑ ์๋ฃ"}
+ </SolidButton>
+ </form>
+ </FormProvider>
+ );
+} | Unknown | ์, throw๋ ์๋ฌ๊ฐ ์ ๋๋ก ํธ๋ค๋ง๋์ง ์๊ณ ์์์ต๋๋ค๐ฅน
`useReviewMutation`์ `onError`์์ ๋ชจ๋ฌ ์๋ฆผ์ฐฝ์ ๋์ฐ๋๋ก ์์ ํ์ต๋๋ค. |
@@ -0,0 +1,104 @@
+"use client";
+
+import { FormProvider, useForm } from "react-hook-form";
+import SolidButton from "@/components/common/buttons/SolidButton";
+import CommonTextArea from "@/components/common/inputs/TextArea";
+import RatingInput from "@/components/create-reaview/RatingInput";
+import ReviewImageInput from "@/components/create-reaview/ReviewImageInput";
+import useCookie from "@/hooks/auths/useTokenState";
+import useReviewMutations from "@/hooks/review/useReviewMutation";
+
+interface ReviewFormData {
+ rating: number;
+ content: string;
+ image: File | null;
+ meetupId: number;
+}
+
+export default function CreateReviewForm({ meetupId }: { meetupId: string }) {
+ const token = useCookie("accessToken");
+ const { createReviewMutation } = useReviewMutations();
+ const methods = useForm<ReviewFormData>({
+ defaultValues: {
+ rating: -1,
+ content: "",
+ image: null,
+ meetupId: Number(meetupId),
+ },
+ mode: "onChange",
+ });
+
+ const { handleSubmit, setValue, watch } = methods;
+
+ const rating = watch("rating");
+ const content = watch("content");
+ const isFormValid = rating !== -1 && content.trim() !== "";
+
+ const handleRatingChange = (value: number) => {
+ setValue("rating", value);
+ };
+
+ const handleImageSelect = (image: File | null) => {
+ setValue("image", image);
+ };
+
+ const onSubmit = handleSubmit(async (data) => {
+ if (!token) return;
+
+ const formData = new FormData();
+
+ const requestData = {
+ meetupId: Number(data.meetupId),
+ rating: data.rating,
+ content: data.content,
+ };
+
+ formData.append(
+ "request",
+ new Blob([JSON.stringify(requestData)], { type: "application/json" }),
+ );
+
+ if (data.image) {
+ formData.append("image", data.image);
+ }
+
+ if (data.image === null) {
+ formData.append("image", new Blob(), "");
+ }
+
+ await createReviewMutation.mutateAsync({ formData, token });
+ });
+
+ return (
+ <FormProvider {...methods}>
+ <form onSubmit={onSubmit}>
+ <div className='flex flex-col gap-12'>
+ <RatingInput
+ value={methods.watch("rating")}
+ onChange={handleRatingChange}
+ />
+ <CommonTextArea
+ formClassName='h-40'
+ required={true}
+ name='content'
+ label='๊ตฌ์ฒด์ ์ธ ๊ฒฝํ์ ์๋ ค์ฃผ์ธ์'
+ placeholder='๋ชจ์์ ์ฅ์, ํ๊ฒฝ, ์งํ, ๊ตฌ์ฑ ๋ฑ ๋ง์กฑ์ค๋ฌ์ ๋์?'
+ maxLength={150}
+ />
+ <ReviewImageInput onImageSelect={handleImageSelect} />
+ </div>
+ <SolidButton
+ type='submit'
+ className='mt-10'
+ state={
+ createReviewMutation.isPending || !isFormValid || !token
+ ? "inactive"
+ : "activated"
+ }
+ >
+ {createReviewMutation.isPending ? "์์ฑ ์ค..." : "์์ฑ ์๋ฃ"}
+ </SolidButton>
+ </form>
+ </FormProvider>
+ );
+} | Unknown | JSON ๊ฐ์ฒด๋ฅผ ํจ๊ป ์ ์ก์ ์ด๋ค ํ์ฑ์ด์๊ฐ ๋ฐ์ํ๋์? |
@@ -0,0 +1,104 @@
+"use client";
+
+import { FormProvider, useForm } from "react-hook-form";
+import SolidButton from "@/components/common/buttons/SolidButton";
+import CommonTextArea from "@/components/common/inputs/TextArea";
+import RatingInput from "@/components/create-reaview/RatingInput";
+import ReviewImageInput from "@/components/create-reaview/ReviewImageInput";
+import useCookie from "@/hooks/auths/useTokenState";
+import useReviewMutations from "@/hooks/review/useReviewMutation";
+
+interface ReviewFormData {
+ rating: number;
+ content: string;
+ image: File | null;
+ meetupId: number;
+}
+
+export default function CreateReviewForm({ meetupId }: { meetupId: string }) {
+ const token = useCookie("accessToken");
+ const { createReviewMutation } = useReviewMutations();
+ const methods = useForm<ReviewFormData>({
+ defaultValues: {
+ rating: -1,
+ content: "",
+ image: null,
+ meetupId: Number(meetupId),
+ },
+ mode: "onChange",
+ });
+
+ const { handleSubmit, setValue, watch } = methods;
+
+ const rating = watch("rating");
+ const content = watch("content");
+ const isFormValid = rating !== -1 && content.trim() !== "";
+
+ const handleRatingChange = (value: number) => {
+ setValue("rating", value);
+ };
+
+ const handleImageSelect = (image: File | null) => {
+ setValue("image", image);
+ };
+
+ const onSubmit = handleSubmit(async (data) => {
+ if (!token) return;
+
+ const formData = new FormData();
+
+ const requestData = {
+ meetupId: Number(data.meetupId),
+ rating: data.rating,
+ content: data.content,
+ };
+
+ formData.append(
+ "request",
+ new Blob([JSON.stringify(requestData)], { type: "application/json" }),
+ );
+
+ if (data.image) {
+ formData.append("image", data.image);
+ }
+
+ if (data.image === null) {
+ formData.append("image", new Blob(), "");
+ }
+
+ await createReviewMutation.mutateAsync({ formData, token });
+ });
+
+ return (
+ <FormProvider {...methods}>
+ <form onSubmit={onSubmit}>
+ <div className='flex flex-col gap-12'>
+ <RatingInput
+ value={methods.watch("rating")}
+ onChange={handleRatingChange}
+ />
+ <CommonTextArea
+ formClassName='h-40'
+ required={true}
+ name='content'
+ label='๊ตฌ์ฒด์ ์ธ ๊ฒฝํ์ ์๋ ค์ฃผ์ธ์'
+ placeholder='๋ชจ์์ ์ฅ์, ํ๊ฒฝ, ์งํ, ๊ตฌ์ฑ ๋ฑ ๋ง์กฑ์ค๋ฌ์ ๋์?'
+ maxLength={150}
+ />
+ <ReviewImageInput onImageSelect={handleImageSelect} />
+ </div>
+ <SolidButton
+ type='submit'
+ className='mt-10'
+ state={
+ createReviewMutation.isPending || !isFormValid || !token
+ ? "inactive"
+ : "activated"
+ }
+ >
+ {createReviewMutation.isPending ? "์์ฑ ์ค..." : "์์ฑ ์๋ฃ"}
+ </SolidButton>
+ </form>
+ </FormProvider>
+ );
+} | Unknown | ์ฒ์์ FormData์ request ๊ฐ์ฒด๋ฅผ JSON.stringify๋ก appendํ์ ๋๋ ์์ฒญ์ด ์คํจํ๋๋ฐ, ์ฐพ์๋ณด๋ ์ด๋ฏธ์ง ํ์ผ๊ณผ ํจ๊ป ๋ณด๋ด๋ ๋ฉํฐํํธ ํผ๋ฐ์ดํฐ์์๋ ๋ชจ๋ ๋ฐ์ดํฐ๊ฐ ๋ฐ์ด๋๋ฆฌ ํํ์ฌ์ผ ์๋ฒ์์ ์ ๋๋ก ํ์ฑํ ์ ์๋ค๊ณ ํด์ Blob ๊ฐ์ฒด๋ก ๋ณํํ์ฌ ์ ์กํ๋๋ ์ฑ๊ณตํ์ต๋๋ค. |
@@ -8,7 +8,7 @@ export default class PlanMapper {
toDomain(): IPlan {
if (!this.plan) return null;
- return new Plan({
+ const returnPlan = new Plan({
id: this.plan.id,
createdAt: this.plan.createdAt,
updatedAt: this.plan.updatedAt,
@@ -19,11 +19,19 @@ export default class PlanMapper {
serviceArea: this.plan.serviceArea,
details: this.plan.details,
address: this.plan.address,
- status: this.plan.status ?? StatusEnum.PENDING,
- quotes: this.plan.quotes,
+ status: this.plan.status,
+ quotes: this.plan.quotes?.map((quote) => ({
+ ...quote,
+ maker: {
+ id: quote.maker.id,
+ nickName: quote.maker.nickName,
+ image: quote.maker?.makerProfile?.image
+ }
+ })),
assignees: this.plan.assignees,
dreamer: this.plan.dreamer,
dreamerId: this.plan.dreamerId
});
+ return returnPlan;
}
} | TypeScript | ์ด๊ฑฐ ์ด์ ์ ์ฒดํฌ ์ ํ ๊ฒ ๊ฐ์๋ฐ, status๋ ๋ฐ์ดํฐ๋ฒ ์ด์ค์์ default ๊ฐ์ด PENDING์ผ๋ก ์ฃผ์ด์ง๋๊น mapper์๋ ํ์์์ ๊ฒ ๊ฐ์์. ์ด์ mapper๋ repo์์๋ง ์ฐ๋ ๊ฑธ๋ก ์์ ํ์
จ๋ค๋ฉด ์ง์๋ ๋ ๊ฒ ๊ฐ์ต๋๋ค~! |
@@ -8,7 +8,7 @@ export default class PlanMapper {
toDomain(): IPlan {
if (!this.plan) return null;
- return new Plan({
+ const returnPlan = new Plan({
id: this.plan.id,
createdAt: this.plan.createdAt,
updatedAt: this.plan.updatedAt,
@@ -19,11 +19,19 @@ export default class PlanMapper {
serviceArea: this.plan.serviceArea,
details: this.plan.details,
address: this.plan.address,
- status: this.plan.status ?? StatusEnum.PENDING,
- quotes: this.plan.quotes,
+ status: this.plan.status,
+ quotes: this.plan.quotes?.map((quote) => ({
+ ...quote,
+ maker: {
+ id: quote.maker.id,
+ nickName: quote.maker.nickName,
+ image: quote.maker?.makerProfile?.image
+ }
+ })),
assignees: this.plan.assignees,
dreamer: this.plan.dreamer,
dreamerId: this.plan.dreamerId
});
+ return returnPlan;
}
} | TypeScript | PlanMapperProperties๋ฅผ ๋ณด๋ makerProfile ์์ image๊ฐ ๋ค์ด๊ฐ๋ ๊ฒ ๊ฐ์๋ฐ, image ํ๋๋ ๋ณ๊ฐ์ธ๊ฐ์? makerProfile์ undefined๋ก ์ถ๊ฐํ๋ ์ด์ ๋ ๊ถ๊ธํฉ๋๋ค.
```
maker?: {
id: string;
nickName: string;
makerProfile: { image: ProfileImage };
};
``` |
@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
import PlanOrder from 'src/common/constants/planOrder.enum';
import { RoleEnum } from 'src/common/constants/role.type';
import SortOrder from 'src/common/constants/sortOrder.enum';
+import { StatusEnum } from 'src/common/constants/status.type';
import { TRIP_TYPE } from 'src/common/constants/tripType.type';
import IPlan from 'src/common/domains/plan/plan.interface';
import PlanMapper from 'src/common/domains/plan/plan.mapper';
@@ -16,7 +17,8 @@ export default class PlanRepository {
constructor(private readonly db: DBClient) {}
async findMany(options: PlanQueryOptions): Promise<IPlan[]> {
- const { orderBy, page, pageSize } = options || {};
+ const { orderBy, page, pageSize, reviewed } = options || {};
+ const isHasReview = reviewed === true || reviewed === false;
const whereConditions = this.buildWhereConditions(options);
const orderByField: PlanOrderByField =
@@ -29,9 +31,20 @@ export default class PlanRepository {
skip: pageSize * (page - 1),
include: {
dreamer: { select: { id: true, nickName: true } },
- assignees: { select: { id: true, nickName: true } }
+ assignees: { select: { id: true, nickName: true } },
+ quotes: isHasReview
+ ? {
+ where: { isConfirmed: true },
+ select: {
+ id: true,
+ price: true,
+ maker: { select: { id: true, nickName: true, makerProfile: { select: { image: true } } } }
+ }
+ }
+ : {}
}
});
+
const domainPlans = plans.map((plan) => new PlanMapper(plan).toDomain());
return domainPlans;
}
@@ -79,7 +92,7 @@ export default class PlanRepository {
}
async create(data: IPlan): Promise<IPlan> {
- const { title, tripDate, tripType, serviceArea, details, address, status, dreamerId } = data.toDB();
+ const { title, tripDate, tripType, serviceArea, details, address, dreamerId } = data.toDB();
const plan = await this.db.plan.create({
data: {
title,
@@ -88,7 +101,7 @@ export default class PlanRepository {
serviceArea,
details,
address,
- status,
+ status: StatusEnum.PENDING,
dreamer: { connect: { id: dreamerId } }
},
include: {
@@ -147,7 +160,7 @@ export default class PlanRepository {
}
private buildWhereConditions(whereOptions: PlanQueryOptions): PlanWhereConditions {
- const { keyword, tripDate, tripType, serviceArea, isAssigned, userId, status, role } = whereOptions;
+ const { keyword, tripDate, tripType, serviceArea, isAssigned, userId, status, role, reviewed } = whereOptions;
const whereConditions: PlanWhereConditions = {
isDeletedAt: null
@@ -156,7 +169,7 @@ export default class PlanRepository {
if (tripDate) {
whereConditions.tripDate = { lte: tripDate };
whereConditions.status = { in: status };
- } //NOTE.์ค์ผ์ค๋ฌ ์กฐ๊ฑด
+ } //NOTE.์ค์ผ์ค๋ฌ ์กฐ๊ฑด + readyToCompete ์กฐ๊ฑด
if (serviceArea) whereConditions.serviceArea = { in: serviceArea };
@@ -165,13 +178,14 @@ export default class PlanRepository {
if (role === RoleEnum.MAKER) {
whereConditions.status = { in: status }; //NOTE. Maker ์ ์ฉ api ์กฐ๊ฑด
whereConditions.quotes = { some: { makerId: { not: userId } } };
- } else if (status && userId) {
- whereConditions.status = { in: status };
+ if (isAssigned === true) whereConditions.assignees = { some: { id: userId } }; //NOTE. ์ง์ ๊ฒฌ์ ์กฐํ API
+ } else if (userId) {
whereConditions.dreamerId = userId; //NOTE. Dreamer ์ ์ฉ api ์กฐ๊ฑด
+ if (status) whereConditions.status = { in: status };
+ if (reviewed === true) whereConditions.review = { isNot: null };
+ else if (reviewed === false) whereConditions.review = { is: null };
}
- if (isAssigned === true) whereConditions.assignees = { some: { id: userId } }; //NOTE. ์ง์ ๊ฒฌ์ ์กฐํ API
-
if (keyword) {
whereConditions.OR = [
{ | TypeScript | isHasReview๋ผ๋ ์ด๋ฆ์ด ๋๋ฌด ์ด์ํฉ๋๋ค ใ
ใ
ใ
ใ
ใ
ใ
ใ
ใ
ใ
ํน์ ๋ฐ๊ฟ์ฃผ์ค ์ ์๋์..? |
@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
import PlanOrder from 'src/common/constants/planOrder.enum';
import { RoleEnum } from 'src/common/constants/role.type';
import SortOrder from 'src/common/constants/sortOrder.enum';
+import { StatusEnum } from 'src/common/constants/status.type';
import { TRIP_TYPE } from 'src/common/constants/tripType.type';
import IPlan from 'src/common/domains/plan/plan.interface';
import PlanMapper from 'src/common/domains/plan/plan.mapper';
@@ -16,7 +17,8 @@ export default class PlanRepository {
constructor(private readonly db: DBClient) {}
async findMany(options: PlanQueryOptions): Promise<IPlan[]> {
- const { orderBy, page, pageSize } = options || {};
+ const { orderBy, page, pageSize, reviewed } = options || {};
+ const isHasReview = reviewed === true || reviewed === false;
const whereConditions = this.buildWhereConditions(options);
const orderByField: PlanOrderByField =
@@ -29,9 +31,20 @@ export default class PlanRepository {
skip: pageSize * (page - 1),
include: {
dreamer: { select: { id: true, nickName: true } },
- assignees: { select: { id: true, nickName: true } }
+ assignees: { select: { id: true, nickName: true } },
+ quotes: isHasReview
+ ? {
+ where: { isConfirmed: true },
+ select: {
+ id: true,
+ price: true,
+ maker: { select: { id: true, nickName: true, makerProfile: { select: { image: true } } } }
+ }
+ }
+ : {}
}
});
+
const domainPlans = plans.map((plan) => new PlanMapper(plan).toDomain());
return domainPlans;
}
@@ -79,7 +92,7 @@ export default class PlanRepository {
}
async create(data: IPlan): Promise<IPlan> {
- const { title, tripDate, tripType, serviceArea, details, address, status, dreamerId } = data.toDB();
+ const { title, tripDate, tripType, serviceArea, details, address, dreamerId } = data.toDB();
const plan = await this.db.plan.create({
data: {
title,
@@ -88,7 +101,7 @@ export default class PlanRepository {
serviceArea,
details,
address,
- status,
+ status: StatusEnum.PENDING,
dreamer: { connect: { id: dreamerId } }
},
include: {
@@ -147,7 +160,7 @@ export default class PlanRepository {
}
private buildWhereConditions(whereOptions: PlanQueryOptions): PlanWhereConditions {
- const { keyword, tripDate, tripType, serviceArea, isAssigned, userId, status, role } = whereOptions;
+ const { keyword, tripDate, tripType, serviceArea, isAssigned, userId, status, role, reviewed } = whereOptions;
const whereConditions: PlanWhereConditions = {
isDeletedAt: null
@@ -156,7 +169,7 @@ export default class PlanRepository {
if (tripDate) {
whereConditions.tripDate = { lte: tripDate };
whereConditions.status = { in: status };
- } //NOTE.์ค์ผ์ค๋ฌ ์กฐ๊ฑด
+ } //NOTE.์ค์ผ์ค๋ฌ ์กฐ๊ฑด + readyToCompete ์กฐ๊ฑด
if (serviceArea) whereConditions.serviceArea = { in: serviceArea };
@@ -165,13 +178,14 @@ export default class PlanRepository {
if (role === RoleEnum.MAKER) {
whereConditions.status = { in: status }; //NOTE. Maker ์ ์ฉ api ์กฐ๊ฑด
whereConditions.quotes = { some: { makerId: { not: userId } } };
- } else if (status && userId) {
- whereConditions.status = { in: status };
+ if (isAssigned === true) whereConditions.assignees = { some: { id: userId } }; //NOTE. ์ง์ ๊ฒฌ์ ์กฐํ API
+ } else if (userId) {
whereConditions.dreamerId = userId; //NOTE. Dreamer ์ ์ฉ api ์กฐ๊ฑด
+ if (status) whereConditions.status = { in: status };
+ if (reviewed === true) whereConditions.review = { isNot: null };
+ else if (reviewed === false) whereConditions.review = { is: null };
}
- if (isAssigned === true) whereConditions.assignees = { some: { id: userId } }; //NOTE. ์ง์ ๊ฒฌ์ ์กฐํ API
-
if (keyword) {
whereConditions.OR = [
{ | TypeScript | hasReview๋ฅผ reviewed๋ก ์ ์ฒด ๋ฐ๊ฟ๋ ๊ด์ฐฎ์ ๊ฒ ๊ฐ์์. ์ด์ฐจํผ ๋ฆฌ๋ทฐ๋ ํ ๋ฒ๋ฐ์ ๋ชป ์ฐ๋๊น |
@@ -9,17 +9,15 @@ import ErrorMessage from 'src/common/constants/errorMessage.enum';
import { CreateOptionalQuoteData, QuoteQueryOptions } from 'src/common/types/quote/quote.type';
import { QuoteToClientProperties } from 'src/common/types/quote/quoteProperties';
import { CreatePlanData } from 'src/common/types/plan/plan.type';
-import QuoteMapper from 'src/common/domains/quote/quote.mapper';
import ForbiddenError from 'src/common/errors/forbiddenError';
import { ServiceArea } from 'src/common/constants/serviceArea.type';
import { RoleEnum } from 'src/common/constants/role.type';
-import PlanMapper from 'src/common/domains/plan/plan.mapper';
import BadRequestError from 'src/common/errors/badRequestError';
import { StatusEnum } from 'src/common/constants/status.type';
import { GroupByCount } from 'src/common/types/plan/plan.dto';
import { NotificationEventName } from 'src/common/types/notification/notification.types';
import UserService from '../user/user.service';
-import Quote from 'src/common/domains/quote/quote.domain';
+import Plan from 'src/common/domains/plan/plan.domain';
@Injectable()
export default class PlanService {
@@ -58,13 +56,27 @@ export default class PlanService {
userId: string,
options: PlanQueryOptions
): Promise<{ totalCount: number; list: PlanToClientProperties[] }> {
+ const { reviewed, readyToComplete } = options || {};
+ const isReviewQuery = reviewed === true || reviewed === false;
+ const isWithQuote = isReviewQuery || readyToComplete;
+
options.userId = userId;
+ if (isReviewQuery) options.status = [StatusEnum.COMPLETED]; //NOTE. status COMPLETE ์ง์
+
+ if (readyToComplete) {
+ const today = new Date(); //NOTE. ์๋ฃํ ์ ์๋ ํ๋ ํํฐ๋ง
+ const koreaTime = today.toLocaleString('en-US', { timeZone: 'Asia/Seoul' });
+ const tripDate = new Date(koreaTime.split(',')[0]);
+ options.status = [StatusEnum.CONFIRMED];
+ options.tripDate = tripDate; //NOTE. CONFIRMED ์ํ๋ก ์ง์ ๋ฐ tripDate ์ง์
+ }
+
const [totalCount, list] = await Promise.all([
this.planRepository.totalCount(options),
this.planRepository.findMany(options)
]);
- const toClientList = list.map((plan) => plan.toClient());
+ const toClientList = list.map((plan) => (isWithQuote ? plan.toClientWithQuotes() : plan.toClient()));
return { totalCount, list: toClientList };
}
@@ -104,7 +116,7 @@ export default class PlanService {
}
async postPlan(data: CreatePlanData): Promise<PlanToClientProperties> {
- const domainData = new PlanMapper(data).toDomain();
+ const domainData = Plan.create(data);
const plan = await this.planRepository.create(domainData);
return plan.toClientWithAddress();
}
@@ -119,7 +131,7 @@ export default class PlanService {
const quote = await this.quoteService.createQuote({ ...data, planId, isAssigned, makerId: userId });
const makerNickName = quote.maker.nickName;
- const tripType = plan.toClient().tripType;
+ const tripType = plan.getTripType();
this.eventEmitter.emit('notification', {
userId: plan.getDreamerId(),
event: NotificationEventName.ARRIVE_QUOTE,
@@ -148,7 +160,7 @@ export default class PlanService {
const updatedPlan = await this.planRepository.update(plan);
const nickName = updatedPlan.getDreamerNickName();
- const tripType = updatedPlan.toClient().tripType;
+ const tripType = updatedPlan.getTripType();
this.eventEmitter.emit('notification', {
userId: assigneeId,
event: NotificationEventName.ARRIVE_REQUEST, | TypeScript | hasReview๊ฐ boolean ๊ฐ์ธ๋ฐ, isHasReview๋ก ๋ค์ ํ ๋ฒ boolean ์ผ๋ก ์นํํ๋ ์ด์ ๊ฐ ์๋์? |
@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
import PlanOrder from 'src/common/constants/planOrder.enum';
import { RoleEnum } from 'src/common/constants/role.type';
import SortOrder from 'src/common/constants/sortOrder.enum';
+import { StatusEnum } from 'src/common/constants/status.type';
import { TRIP_TYPE } from 'src/common/constants/tripType.type';
import IPlan from 'src/common/domains/plan/plan.interface';
import PlanMapper from 'src/common/domains/plan/plan.mapper';
@@ -16,7 +17,8 @@ export default class PlanRepository {
constructor(private readonly db: DBClient) {}
async findMany(options: PlanQueryOptions): Promise<IPlan[]> {
- const { orderBy, page, pageSize } = options || {};
+ const { orderBy, page, pageSize, reviewed } = options || {};
+ const isHasReview = reviewed === true || reviewed === false;
const whereConditions = this.buildWhereConditions(options);
const orderByField: PlanOrderByField =
@@ -29,9 +31,20 @@ export default class PlanRepository {
skip: pageSize * (page - 1),
include: {
dreamer: { select: { id: true, nickName: true } },
- assignees: { select: { id: true, nickName: true } }
+ assignees: { select: { id: true, nickName: true } },
+ quotes: isHasReview
+ ? {
+ where: { isConfirmed: true },
+ select: {
+ id: true,
+ price: true,
+ maker: { select: { id: true, nickName: true, makerProfile: { select: { image: true } } } }
+ }
+ }
+ : {}
}
});
+
const domainPlans = plans.map((plan) => new PlanMapper(plan).toDomain());
return domainPlans;
}
@@ -79,7 +92,7 @@ export default class PlanRepository {
}
async create(data: IPlan): Promise<IPlan> {
- const { title, tripDate, tripType, serviceArea, details, address, status, dreamerId } = data.toDB();
+ const { title, tripDate, tripType, serviceArea, details, address, dreamerId } = data.toDB();
const plan = await this.db.plan.create({
data: {
title,
@@ -88,7 +101,7 @@ export default class PlanRepository {
serviceArea,
details,
address,
- status,
+ status: StatusEnum.PENDING,
dreamer: { connect: { id: dreamerId } }
},
include: {
@@ -147,7 +160,7 @@ export default class PlanRepository {
}
private buildWhereConditions(whereOptions: PlanQueryOptions): PlanWhereConditions {
- const { keyword, tripDate, tripType, serviceArea, isAssigned, userId, status, role } = whereOptions;
+ const { keyword, tripDate, tripType, serviceArea, isAssigned, userId, status, role, reviewed } = whereOptions;
const whereConditions: PlanWhereConditions = {
isDeletedAt: null
@@ -156,7 +169,7 @@ export default class PlanRepository {
if (tripDate) {
whereConditions.tripDate = { lte: tripDate };
whereConditions.status = { in: status };
- } //NOTE.์ค์ผ์ค๋ฌ ์กฐ๊ฑด
+ } //NOTE.์ค์ผ์ค๋ฌ ์กฐ๊ฑด + readyToCompete ์กฐ๊ฑด
if (serviceArea) whereConditions.serviceArea = { in: serviceArea };
@@ -165,13 +178,14 @@ export default class PlanRepository {
if (role === RoleEnum.MAKER) {
whereConditions.status = { in: status }; //NOTE. Maker ์ ์ฉ api ์กฐ๊ฑด
whereConditions.quotes = { some: { makerId: { not: userId } } };
- } else if (status && userId) {
- whereConditions.status = { in: status };
+ if (isAssigned === true) whereConditions.assignees = { some: { id: userId } }; //NOTE. ์ง์ ๊ฒฌ์ ์กฐํ API
+ } else if (userId) {
whereConditions.dreamerId = userId; //NOTE. Dreamer ์ ์ฉ api ์กฐ๊ฑด
+ if (status) whereConditions.status = { in: status };
+ if (reviewed === true) whereConditions.review = { isNot: null };
+ else if (reviewed === false) whereConditions.review = { is: null };
}
- if (isAssigned === true) whereConditions.assignees = { some: { id: userId } }; //NOTE. ์ง์ ๊ฒฌ์ ์กฐํ API
-
if (keyword) {
whereConditions.OR = [
{ | TypeScript | ์ด๊ฑด ๋์ค์ ์ฌ์ฉํ ์์ ์ด์ ๊ฐ์? |
@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
import PlanOrder from 'src/common/constants/planOrder.enum';
import { RoleEnum } from 'src/common/constants/role.type';
import SortOrder from 'src/common/constants/sortOrder.enum';
+import { StatusEnum } from 'src/common/constants/status.type';
import { TRIP_TYPE } from 'src/common/constants/tripType.type';
import IPlan from 'src/common/domains/plan/plan.interface';
import PlanMapper from 'src/common/domains/plan/plan.mapper';
@@ -16,7 +17,8 @@ export default class PlanRepository {
constructor(private readonly db: DBClient) {}
async findMany(options: PlanQueryOptions): Promise<IPlan[]> {
- const { orderBy, page, pageSize } = options || {};
+ const { orderBy, page, pageSize, reviewed } = options || {};
+ const isHasReview = reviewed === true || reviewed === false;
const whereConditions = this.buildWhereConditions(options);
const orderByField: PlanOrderByField =
@@ -29,9 +31,20 @@ export default class PlanRepository {
skip: pageSize * (page - 1),
include: {
dreamer: { select: { id: true, nickName: true } },
- assignees: { select: { id: true, nickName: true } }
+ assignees: { select: { id: true, nickName: true } },
+ quotes: isHasReview
+ ? {
+ where: { isConfirmed: true },
+ select: {
+ id: true,
+ price: true,
+ maker: { select: { id: true, nickName: true, makerProfile: { select: { image: true } } } }
+ }
+ }
+ : {}
}
});
+
const domainPlans = plans.map((plan) => new PlanMapper(plan).toDomain());
return domainPlans;
}
@@ -79,7 +92,7 @@ export default class PlanRepository {
}
async create(data: IPlan): Promise<IPlan> {
- const { title, tripDate, tripType, serviceArea, details, address, status, dreamerId } = data.toDB();
+ const { title, tripDate, tripType, serviceArea, details, address, dreamerId } = data.toDB();
const plan = await this.db.plan.create({
data: {
title,
@@ -88,7 +101,7 @@ export default class PlanRepository {
serviceArea,
details,
address,
- status,
+ status: StatusEnum.PENDING,
dreamer: { connect: { id: dreamerId } }
},
include: {
@@ -147,7 +160,7 @@ export default class PlanRepository {
}
private buildWhereConditions(whereOptions: PlanQueryOptions): PlanWhereConditions {
- const { keyword, tripDate, tripType, serviceArea, isAssigned, userId, status, role } = whereOptions;
+ const { keyword, tripDate, tripType, serviceArea, isAssigned, userId, status, role, reviewed } = whereOptions;
const whereConditions: PlanWhereConditions = {
isDeletedAt: null
@@ -156,7 +169,7 @@ export default class PlanRepository {
if (tripDate) {
whereConditions.tripDate = { lte: tripDate };
whereConditions.status = { in: status };
- } //NOTE.์ค์ผ์ค๋ฌ ์กฐ๊ฑด
+ } //NOTE.์ค์ผ์ค๋ฌ ์กฐ๊ฑด + readyToCompete ์กฐ๊ฑด
if (serviceArea) whereConditions.serviceArea = { in: serviceArea };
@@ -165,13 +178,14 @@ export default class PlanRepository {
if (role === RoleEnum.MAKER) {
whereConditions.status = { in: status }; //NOTE. Maker ์ ์ฉ api ์กฐ๊ฑด
whereConditions.quotes = { some: { makerId: { not: userId } } };
- } else if (status && userId) {
- whereConditions.status = { in: status };
+ if (isAssigned === true) whereConditions.assignees = { some: { id: userId } }; //NOTE. ์ง์ ๊ฒฌ์ ์กฐํ API
+ } else if (userId) {
whereConditions.dreamerId = userId; //NOTE. Dreamer ์ ์ฉ api ์กฐ๊ฑด
+ if (status) whereConditions.status = { in: status };
+ if (reviewed === true) whereConditions.review = { isNot: null };
+ else if (reviewed === false) whereConditions.review = { is: null };
}
- if (isAssigned === true) whereConditions.assignees = { some: { id: userId } }; //NOTE. ์ง์ ๊ฒฌ์ ์กฐํ API
-
if (keyword) {
whereConditions.OR = [
{ | TypeScript | review: { is: null } | { isNot: null } ์ด๊ฑด ์ด๋์ ์ด๋ป๊ฒ ์ฌ์ฉ๋๋์ง ์ฝ๋๋ง ๋ด์ ์ ๋ชจ๋ฅด๊ฒ ์ด์. ์ค๋ช
ํด ์ฃผ์ค ์ ์๋์? |
@@ -9,17 +9,15 @@ import ErrorMessage from 'src/common/constants/errorMessage.enum';
import { CreateOptionalQuoteData, QuoteQueryOptions } from 'src/common/types/quote/quote.type';
import { QuoteToClientProperties } from 'src/common/types/quote/quoteProperties';
import { CreatePlanData } from 'src/common/types/plan/plan.type';
-import QuoteMapper from 'src/common/domains/quote/quote.mapper';
import ForbiddenError from 'src/common/errors/forbiddenError';
import { ServiceArea } from 'src/common/constants/serviceArea.type';
import { RoleEnum } from 'src/common/constants/role.type';
-import PlanMapper from 'src/common/domains/plan/plan.mapper';
import BadRequestError from 'src/common/errors/badRequestError';
import { StatusEnum } from 'src/common/constants/status.type';
import { GroupByCount } from 'src/common/types/plan/plan.dto';
import { NotificationEventName } from 'src/common/types/notification/notification.types';
import UserService from '../user/user.service';
-import Quote from 'src/common/domains/quote/quote.domain';
+import Plan from 'src/common/domains/plan/plan.domain';
@Injectable()
export default class PlanService {
@@ -58,13 +56,27 @@ export default class PlanService {
userId: string,
options: PlanQueryOptions
): Promise<{ totalCount: number; list: PlanToClientProperties[] }> {
+ const { reviewed, readyToComplete } = options || {};
+ const isReviewQuery = reviewed === true || reviewed === false;
+ const isWithQuote = isReviewQuery || readyToComplete;
+
options.userId = userId;
+ if (isReviewQuery) options.status = [StatusEnum.COMPLETED]; //NOTE. status COMPLETE ์ง์
+
+ if (readyToComplete) {
+ const today = new Date(); //NOTE. ์๋ฃํ ์ ์๋ ํ๋ ํํฐ๋ง
+ const koreaTime = today.toLocaleString('en-US', { timeZone: 'Asia/Seoul' });
+ const tripDate = new Date(koreaTime.split(',')[0]);
+ options.status = [StatusEnum.CONFIRMED];
+ options.tripDate = tripDate; //NOTE. CONFIRMED ์ํ๋ก ์ง์ ๋ฐ tripDate ์ง์
+ }
+
const [totalCount, list] = await Promise.all([
this.planRepository.totalCount(options),
this.planRepository.findMany(options)
]);
- const toClientList = list.map((plan) => plan.toClient());
+ const toClientList = list.map((plan) => (isWithQuote ? plan.toClientWithQuotes() : plan.toClient()));
return { totalCount, list: toClientList };
}
@@ -104,7 +116,7 @@ export default class PlanService {
}
async postPlan(data: CreatePlanData): Promise<PlanToClientProperties> {
- const domainData = new PlanMapper(data).toDomain();
+ const domainData = Plan.create(data);
const plan = await this.planRepository.create(domainData);
return plan.toClientWithAddress();
}
@@ -119,7 +131,7 @@ export default class PlanService {
const quote = await this.quoteService.createQuote({ ...data, planId, isAssigned, makerId: userId });
const makerNickName = quote.maker.nickName;
- const tripType = plan.toClient().tripType;
+ const tripType = plan.getTripType();
this.eventEmitter.emit('notification', {
userId: plan.getDreamerId(),
event: NotificationEventName.ARRIVE_QUOTE,
@@ -148,7 +160,7 @@ export default class PlanService {
const updatedPlan = await this.planRepository.update(plan);
const nickName = updatedPlan.getDreamerNickName();
- const tripType = updatedPlan.toClient().tripType;
+ const tripType = updatedPlan.getTripType();
this.eventEmitter.emit('notification', {
userId: assigneeId,
event: NotificationEventName.ARRIVE_REQUEST, | TypeScript | false๋ if๋ฌธ์์ ํํฐ๊ฐ ๋์ง ์์์ ์กฐ๊ฑด๋ฌธ์ผ๋ก true๊ฑฐ๋ false๊ฑฐ๋ ํํฐ๋ฅผ ํ๊ฒ ํ์ด์ |
@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
import PlanOrder from 'src/common/constants/planOrder.enum';
import { RoleEnum } from 'src/common/constants/role.type';
import SortOrder from 'src/common/constants/sortOrder.enum';
+import { StatusEnum } from 'src/common/constants/status.type';
import { TRIP_TYPE } from 'src/common/constants/tripType.type';
import IPlan from 'src/common/domains/plan/plan.interface';
import PlanMapper from 'src/common/domains/plan/plan.mapper';
@@ -16,7 +17,8 @@ export default class PlanRepository {
constructor(private readonly db: DBClient) {}
async findMany(options: PlanQueryOptions): Promise<IPlan[]> {
- const { orderBy, page, pageSize } = options || {};
+ const { orderBy, page, pageSize, reviewed } = options || {};
+ const isHasReview = reviewed === true || reviewed === false;
const whereConditions = this.buildWhereConditions(options);
const orderByField: PlanOrderByField =
@@ -29,9 +31,20 @@ export default class PlanRepository {
skip: pageSize * (page - 1),
include: {
dreamer: { select: { id: true, nickName: true } },
- assignees: { select: { id: true, nickName: true } }
+ assignees: { select: { id: true, nickName: true } },
+ quotes: isHasReview
+ ? {
+ where: { isConfirmed: true },
+ select: {
+ id: true,
+ price: true,
+ maker: { select: { id: true, nickName: true, makerProfile: { select: { image: true } } } }
+ }
+ }
+ : {}
}
});
+
const domainPlans = plans.map((plan) => new PlanMapper(plan).toDomain());
return domainPlans;
}
@@ -79,7 +92,7 @@ export default class PlanRepository {
}
async create(data: IPlan): Promise<IPlan> {
- const { title, tripDate, tripType, serviceArea, details, address, status, dreamerId } = data.toDB();
+ const { title, tripDate, tripType, serviceArea, details, address, dreamerId } = data.toDB();
const plan = await this.db.plan.create({
data: {
title,
@@ -88,7 +101,7 @@ export default class PlanRepository {
serviceArea,
details,
address,
- status,
+ status: StatusEnum.PENDING,
dreamer: { connect: { id: dreamerId } }
},
include: {
@@ -147,7 +160,7 @@ export default class PlanRepository {
}
private buildWhereConditions(whereOptions: PlanQueryOptions): PlanWhereConditions {
- const { keyword, tripDate, tripType, serviceArea, isAssigned, userId, status, role } = whereOptions;
+ const { keyword, tripDate, tripType, serviceArea, isAssigned, userId, status, role, reviewed } = whereOptions;
const whereConditions: PlanWhereConditions = {
isDeletedAt: null
@@ -156,7 +169,7 @@ export default class PlanRepository {
if (tripDate) {
whereConditions.tripDate = { lte: tripDate };
whereConditions.status = { in: status };
- } //NOTE.์ค์ผ์ค๋ฌ ์กฐ๊ฑด
+ } //NOTE.์ค์ผ์ค๋ฌ ์กฐ๊ฑด + readyToCompete ์กฐ๊ฑด
if (serviceArea) whereConditions.serviceArea = { in: serviceArea };
@@ -165,13 +178,14 @@ export default class PlanRepository {
if (role === RoleEnum.MAKER) {
whereConditions.status = { in: status }; //NOTE. Maker ์ ์ฉ api ์กฐ๊ฑด
whereConditions.quotes = { some: { makerId: { not: userId } } };
- } else if (status && userId) {
- whereConditions.status = { in: status };
+ if (isAssigned === true) whereConditions.assignees = { some: { id: userId } }; //NOTE. ์ง์ ๊ฒฌ์ ์กฐํ API
+ } else if (userId) {
whereConditions.dreamerId = userId; //NOTE. Dreamer ์ ์ฉ api ์กฐ๊ฑด
+ if (status) whereConditions.status = { in: status };
+ if (reviewed === true) whereConditions.review = { isNot: null };
+ else if (reviewed === false) whereConditions.review = { is: null };
}
- if (isAssigned === true) whereConditions.assignees = { some: { id: userId } }; //NOTE. ์ง์ ๊ฒฌ์ ์กฐํ API
-
if (keyword) {
whereConditions.OR = [
{ | TypeScript | ํ์ํ ๊น ์ถ์ด์ ๋ง๋ ๊ฑด๋ฐ ์์ป๋๋ณด๋ค์ ์ง์ฐ๊ฒ ์ต๋๋ค |
@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
import PlanOrder from 'src/common/constants/planOrder.enum';
import { RoleEnum } from 'src/common/constants/role.type';
import SortOrder from 'src/common/constants/sortOrder.enum';
+import { StatusEnum } from 'src/common/constants/status.type';
import { TRIP_TYPE } from 'src/common/constants/tripType.type';
import IPlan from 'src/common/domains/plan/plan.interface';
import PlanMapper from 'src/common/domains/plan/plan.mapper';
@@ -16,7 +17,8 @@ export default class PlanRepository {
constructor(private readonly db: DBClient) {}
async findMany(options: PlanQueryOptions): Promise<IPlan[]> {
- const { orderBy, page, pageSize } = options || {};
+ const { orderBy, page, pageSize, reviewed } = options || {};
+ const isHasReview = reviewed === true || reviewed === false;
const whereConditions = this.buildWhereConditions(options);
const orderByField: PlanOrderByField =
@@ -29,9 +31,20 @@ export default class PlanRepository {
skip: pageSize * (page - 1),
include: {
dreamer: { select: { id: true, nickName: true } },
- assignees: { select: { id: true, nickName: true } }
+ assignees: { select: { id: true, nickName: true } },
+ quotes: isHasReview
+ ? {
+ where: { isConfirmed: true },
+ select: {
+ id: true,
+ price: true,
+ maker: { select: { id: true, nickName: true, makerProfile: { select: { image: true } } } }
+ }
+ }
+ : {}
}
});
+
const domainPlans = plans.map((plan) => new PlanMapper(plan).toDomain());
return domainPlans;
}
@@ -79,7 +92,7 @@ export default class PlanRepository {
}
async create(data: IPlan): Promise<IPlan> {
- const { title, tripDate, tripType, serviceArea, details, address, status, dreamerId } = data.toDB();
+ const { title, tripDate, tripType, serviceArea, details, address, dreamerId } = data.toDB();
const plan = await this.db.plan.create({
data: {
title,
@@ -88,7 +101,7 @@ export default class PlanRepository {
serviceArea,
details,
address,
- status,
+ status: StatusEnum.PENDING,
dreamer: { connect: { id: dreamerId } }
},
include: {
@@ -147,7 +160,7 @@ export default class PlanRepository {
}
private buildWhereConditions(whereOptions: PlanQueryOptions): PlanWhereConditions {
- const { keyword, tripDate, tripType, serviceArea, isAssigned, userId, status, role } = whereOptions;
+ const { keyword, tripDate, tripType, serviceArea, isAssigned, userId, status, role, reviewed } = whereOptions;
const whereConditions: PlanWhereConditions = {
isDeletedAt: null
@@ -156,7 +169,7 @@ export default class PlanRepository {
if (tripDate) {
whereConditions.tripDate = { lte: tripDate };
whereConditions.status = { in: status };
- } //NOTE.์ค์ผ์ค๋ฌ ์กฐ๊ฑด
+ } //NOTE.์ค์ผ์ค๋ฌ ์กฐ๊ฑด + readyToCompete ์กฐ๊ฑด
if (serviceArea) whereConditions.serviceArea = { in: serviceArea };
@@ -165,13 +178,14 @@ export default class PlanRepository {
if (role === RoleEnum.MAKER) {
whereConditions.status = { in: status }; //NOTE. Maker ์ ์ฉ api ์กฐ๊ฑด
whereConditions.quotes = { some: { makerId: { not: userId } } };
- } else if (status && userId) {
- whereConditions.status = { in: status };
+ if (isAssigned === true) whereConditions.assignees = { some: { id: userId } }; //NOTE. ์ง์ ๊ฒฌ์ ์กฐํ API
+ } else if (userId) {
whereConditions.dreamerId = userId; //NOTE. Dreamer ์ ์ฉ api ์กฐ๊ฑด
+ if (status) whereConditions.status = { in: status };
+ if (reviewed === true) whereConditions.review = { isNot: null };
+ else if (reviewed === false) whereConditions.review = { is: null };
}
- if (isAssigned === true) whereConditions.assignees = { some: { id: userId } }; //NOTE. ์ง์ ๊ฒฌ์ ์กฐํ API
-
if (keyword) {
whereConditions.OR = [
{ | TypeScript | ํ๋ฆฌ์ฆ๋ง์์ 1:1 ๊ด๊ณ์ฑ ํ๋์ผ ๋ id๋ก ์ฒดํฌํ๋๊ฒ ๊ฐ์ฅ ์ข์ง๋ง plan๊ณผ review๋ ๋ฆฌ๋ทฐ๋ง ํ๋ id๋ฅผ ๊ฐ์ง๊ณ ์์ฃ
๊ทธ๋ ๊ธฐ์ ๋ฆฌ๋ทฐ๊ฐ ์๋์ง ์๋์ง๋ฅผ ์ฒดํฌํ๊ธฐ ์ํ ๋ฌธ๋ฒ์
๋๋ค. ํน์ ๋ค๋ฅธ ๋ฌธ๋ฒ์ ์์๋๊ฒ ์์ผ์ ๊ฐ์? |
@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
import PlanOrder from 'src/common/constants/planOrder.enum';
import { RoleEnum } from 'src/common/constants/role.type';
import SortOrder from 'src/common/constants/sortOrder.enum';
+import { StatusEnum } from 'src/common/constants/status.type';
import { TRIP_TYPE } from 'src/common/constants/tripType.type';
import IPlan from 'src/common/domains/plan/plan.interface';
import PlanMapper from 'src/common/domains/plan/plan.mapper';
@@ -16,7 +17,8 @@ export default class PlanRepository {
constructor(private readonly db: DBClient) {}
async findMany(options: PlanQueryOptions): Promise<IPlan[]> {
- const { orderBy, page, pageSize } = options || {};
+ const { orderBy, page, pageSize, reviewed } = options || {};
+ const isHasReview = reviewed === true || reviewed === false;
const whereConditions = this.buildWhereConditions(options);
const orderByField: PlanOrderByField =
@@ -29,9 +31,20 @@ export default class PlanRepository {
skip: pageSize * (page - 1),
include: {
dreamer: { select: { id: true, nickName: true } },
- assignees: { select: { id: true, nickName: true } }
+ assignees: { select: { id: true, nickName: true } },
+ quotes: isHasReview
+ ? {
+ where: { isConfirmed: true },
+ select: {
+ id: true,
+ price: true,
+ maker: { select: { id: true, nickName: true, makerProfile: { select: { image: true } } } }
+ }
+ }
+ : {}
}
});
+
const domainPlans = plans.map((plan) => new PlanMapper(plan).toDomain());
return domainPlans;
}
@@ -79,7 +92,7 @@ export default class PlanRepository {
}
async create(data: IPlan): Promise<IPlan> {
- const { title, tripDate, tripType, serviceArea, details, address, status, dreamerId } = data.toDB();
+ const { title, tripDate, tripType, serviceArea, details, address, dreamerId } = data.toDB();
const plan = await this.db.plan.create({
data: {
title,
@@ -88,7 +101,7 @@ export default class PlanRepository {
serviceArea,
details,
address,
- status,
+ status: StatusEnum.PENDING,
dreamer: { connect: { id: dreamerId } }
},
include: {
@@ -147,7 +160,7 @@ export default class PlanRepository {
}
private buildWhereConditions(whereOptions: PlanQueryOptions): PlanWhereConditions {
- const { keyword, tripDate, tripType, serviceArea, isAssigned, userId, status, role } = whereOptions;
+ const { keyword, tripDate, tripType, serviceArea, isAssigned, userId, status, role, reviewed } = whereOptions;
const whereConditions: PlanWhereConditions = {
isDeletedAt: null
@@ -156,7 +169,7 @@ export default class PlanRepository {
if (tripDate) {
whereConditions.tripDate = { lte: tripDate };
whereConditions.status = { in: status };
- } //NOTE.์ค์ผ์ค๋ฌ ์กฐ๊ฑด
+ } //NOTE.์ค์ผ์ค๋ฌ ์กฐ๊ฑด + readyToCompete ์กฐ๊ฑด
if (serviceArea) whereConditions.serviceArea = { in: serviceArea };
@@ -165,13 +178,14 @@ export default class PlanRepository {
if (role === RoleEnum.MAKER) {
whereConditions.status = { in: status }; //NOTE. Maker ์ ์ฉ api ์กฐ๊ฑด
whereConditions.quotes = { some: { makerId: { not: userId } } };
- } else if (status && userId) {
- whereConditions.status = { in: status };
+ if (isAssigned === true) whereConditions.assignees = { some: { id: userId } }; //NOTE. ์ง์ ๊ฒฌ์ ์กฐํ API
+ } else if (userId) {
whereConditions.dreamerId = userId; //NOTE. Dreamer ์ ์ฉ api ์กฐ๊ฑด
+ if (status) whereConditions.status = { in: status };
+ if (reviewed === true) whereConditions.review = { isNot: null };
+ else if (reviewed === false) whereConditions.review = { is: null };
}
- if (isAssigned === true) whereConditions.assignees = { some: { id: userId } }; //NOTE. ์ง์ ๊ฒฌ์ ์กฐํ API
-
if (keyword) {
whereConditions.OR = [
{ | TypeScript | ์ข์ต๋๋ค ๋ณ๊ฒฝํ ๊ฒ์ ใ
ใ
ใ
|
@@ -8,7 +8,7 @@ export default class PlanMapper {
toDomain(): IPlan {
if (!this.plan) return null;
- return new Plan({
+ const returnPlan = new Plan({
id: this.plan.id,
createdAt: this.plan.createdAt,
updatedAt: this.plan.updatedAt,
@@ -19,11 +19,19 @@ export default class PlanMapper {
serviceArea: this.plan.serviceArea,
details: this.plan.details,
address: this.plan.address,
- status: this.plan.status ?? StatusEnum.PENDING,
- quotes: this.plan.quotes,
+ status: this.plan.status,
+ quotes: this.plan.quotes?.map((quote) => ({
+ ...quote,
+ maker: {
+ id: quote.maker.id,
+ nickName: quote.maker.nickName,
+ image: quote.maker?.makerProfile?.image
+ }
+ })),
assignees: this.plan.assignees,
dreamer: this.plan.dreamer,
dreamerId: this.plan.dreamerId
});
+ return returnPlan;
}
} | TypeScript | ๋ฐ์์ฌ ๋๋ makerProfile์ ๋ด๊ฒจ์ค์ง๋ง ๋งตํผ์์ makerProfile ์์ ์๋ image๋ฅผ ๋ฐ์ผ๋ก ๋์ง์ด์ค๊ณ makerProfile์ด๋ ํ๋๋ฅผ ์์ ์ฃผ๊ธฐ ์ํด undefined๋ฅผ ๋ฃ์์ต๋๋ค |
@@ -8,7 +8,7 @@ export default class PlanMapper {
toDomain(): IPlan {
if (!this.plan) return null;
- return new Plan({
+ const returnPlan = new Plan({
id: this.plan.id,
createdAt: this.plan.createdAt,
updatedAt: this.plan.updatedAt,
@@ -19,11 +19,19 @@ export default class PlanMapper {
serviceArea: this.plan.serviceArea,
details: this.plan.details,
address: this.plan.address,
- status: this.plan.status ?? StatusEnum.PENDING,
- quotes: this.plan.quotes,
+ status: this.plan.status,
+ quotes: this.plan.quotes?.map((quote) => ({
+ ...quote,
+ maker: {
+ id: quote.maker.id,
+ nickName: quote.maker.nickName,
+ image: quote.maker?.makerProfile?.image
+ }
+ })),
assignees: this.plan.assignees,
dreamer: this.plan.dreamer,
dreamerId: this.plan.dreamerId
});
+ return returnPlan;
}
} | TypeScript | ๋ค ์์ ํ๊ฒ ์ต๋๋ค |
@@ -9,17 +9,15 @@ import ErrorMessage from 'src/common/constants/errorMessage.enum';
import { CreateOptionalQuoteData, QuoteQueryOptions } from 'src/common/types/quote/quote.type';
import { QuoteToClientProperties } from 'src/common/types/quote/quoteProperties';
import { CreatePlanData } from 'src/common/types/plan/plan.type';
-import QuoteMapper from 'src/common/domains/quote/quote.mapper';
import ForbiddenError from 'src/common/errors/forbiddenError';
import { ServiceArea } from 'src/common/constants/serviceArea.type';
import { RoleEnum } from 'src/common/constants/role.type';
-import PlanMapper from 'src/common/domains/plan/plan.mapper';
import BadRequestError from 'src/common/errors/badRequestError';
import { StatusEnum } from 'src/common/constants/status.type';
import { GroupByCount } from 'src/common/types/plan/plan.dto';
import { NotificationEventName } from 'src/common/types/notification/notification.types';
import UserService from '../user/user.service';
-import Quote from 'src/common/domains/quote/quote.domain';
+import Plan from 'src/common/domains/plan/plan.domain';
@Injectable()
export default class PlanService {
@@ -58,13 +56,27 @@ export default class PlanService {
userId: string,
options: PlanQueryOptions
): Promise<{ totalCount: number; list: PlanToClientProperties[] }> {
+ const { reviewed, readyToComplete } = options || {};
+ const isReviewQuery = reviewed === true || reviewed === false;
+ const isWithQuote = isReviewQuery || readyToComplete;
+
options.userId = userId;
+ if (isReviewQuery) options.status = [StatusEnum.COMPLETED]; //NOTE. status COMPLETE ์ง์
+
+ if (readyToComplete) {
+ const today = new Date(); //NOTE. ์๋ฃํ ์ ์๋ ํ๋ ํํฐ๋ง
+ const koreaTime = today.toLocaleString('en-US', { timeZone: 'Asia/Seoul' });
+ const tripDate = new Date(koreaTime.split(',')[0]);
+ options.status = [StatusEnum.CONFIRMED];
+ options.tripDate = tripDate; //NOTE. CONFIRMED ์ํ๋ก ์ง์ ๋ฐ tripDate ์ง์
+ }
+
const [totalCount, list] = await Promise.all([
this.planRepository.totalCount(options),
this.planRepository.findMany(options)
]);
- const toClientList = list.map((plan) => plan.toClient());
+ const toClientList = list.map((plan) => (isWithQuote ? plan.toClientWithQuotes() : plan.toClient()));
return { totalCount, list: toClientList };
}
@@ -104,7 +116,7 @@ export default class PlanService {
}
async postPlan(data: CreatePlanData): Promise<PlanToClientProperties> {
- const domainData = new PlanMapper(data).toDomain();
+ const domainData = Plan.create(data);
const plan = await this.planRepository.create(domainData);
return plan.toClientWithAddress();
}
@@ -119,7 +131,7 @@ export default class PlanService {
const quote = await this.quoteService.createQuote({ ...data, planId, isAssigned, makerId: userId });
const makerNickName = quote.maker.nickName;
- const tripType = plan.toClient().tripType;
+ const tripType = plan.getTripType();
this.eventEmitter.emit('notification', {
userId: plan.getDreamerId(),
event: NotificationEventName.ARRIVE_QUOTE,
@@ -148,7 +160,7 @@ export default class PlanService {
const updatedPlan = await this.planRepository.update(plan);
const nickName = updatedPlan.getDreamerNickName();
- const tripType = updatedPlan.toClient().tripType;
+ const tripType = updatedPlan.getTripType();
this.eventEmitter.emit('notification', {
userId: assigneeId,
event: NotificationEventName.ARRIVE_REQUEST, | TypeScript | service์์๋ if ์กฐ๊ฑด๋ฌธ์ hasReview=true์ธ ๊ฒฝ์ฐ๋ง ํํฐ๋งํ๋ ๊ฒ ๊ฐ์๋ฐ false๋ ํ์ํ ๊ฑด๊ฐ์? |
@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
import PlanOrder from 'src/common/constants/planOrder.enum';
import { RoleEnum } from 'src/common/constants/role.type';
import SortOrder from 'src/common/constants/sortOrder.enum';
+import { StatusEnum } from 'src/common/constants/status.type';
import { TRIP_TYPE } from 'src/common/constants/tripType.type';
import IPlan from 'src/common/domains/plan/plan.interface';
import PlanMapper from 'src/common/domains/plan/plan.mapper';
@@ -16,7 +17,8 @@ export default class PlanRepository {
constructor(private readonly db: DBClient) {}
async findMany(options: PlanQueryOptions): Promise<IPlan[]> {
- const { orderBy, page, pageSize } = options || {};
+ const { orderBy, page, pageSize, reviewed } = options || {};
+ const isHasReview = reviewed === true || reviewed === false;
const whereConditions = this.buildWhereConditions(options);
const orderByField: PlanOrderByField =
@@ -29,9 +31,20 @@ export default class PlanRepository {
skip: pageSize * (page - 1),
include: {
dreamer: { select: { id: true, nickName: true } },
- assignees: { select: { id: true, nickName: true } }
+ assignees: { select: { id: true, nickName: true } },
+ quotes: isHasReview
+ ? {
+ where: { isConfirmed: true },
+ select: {
+ id: true,
+ price: true,
+ maker: { select: { id: true, nickName: true, makerProfile: { select: { image: true } } } }
+ }
+ }
+ : {}
}
});
+
const domainPlans = plans.map((plan) => new PlanMapper(plan).toDomain());
return domainPlans;
}
@@ -79,7 +92,7 @@ export default class PlanRepository {
}
async create(data: IPlan): Promise<IPlan> {
- const { title, tripDate, tripType, serviceArea, details, address, status, dreamerId } = data.toDB();
+ const { title, tripDate, tripType, serviceArea, details, address, dreamerId } = data.toDB();
const plan = await this.db.plan.create({
data: {
title,
@@ -88,7 +101,7 @@ export default class PlanRepository {
serviceArea,
details,
address,
- status,
+ status: StatusEnum.PENDING,
dreamer: { connect: { id: dreamerId } }
},
include: {
@@ -147,7 +160,7 @@ export default class PlanRepository {
}
private buildWhereConditions(whereOptions: PlanQueryOptions): PlanWhereConditions {
- const { keyword, tripDate, tripType, serviceArea, isAssigned, userId, status, role } = whereOptions;
+ const { keyword, tripDate, tripType, serviceArea, isAssigned, userId, status, role, reviewed } = whereOptions;
const whereConditions: PlanWhereConditions = {
isDeletedAt: null
@@ -156,7 +169,7 @@ export default class PlanRepository {
if (tripDate) {
whereConditions.tripDate = { lte: tripDate };
whereConditions.status = { in: status };
- } //NOTE.์ค์ผ์ค๋ฌ ์กฐ๊ฑด
+ } //NOTE.์ค์ผ์ค๋ฌ ์กฐ๊ฑด + readyToCompete ์กฐ๊ฑด
if (serviceArea) whereConditions.serviceArea = { in: serviceArea };
@@ -165,13 +178,14 @@ export default class PlanRepository {
if (role === RoleEnum.MAKER) {
whereConditions.status = { in: status }; //NOTE. Maker ์ ์ฉ api ์กฐ๊ฑด
whereConditions.quotes = { some: { makerId: { not: userId } } };
- } else if (status && userId) {
- whereConditions.status = { in: status };
+ if (isAssigned === true) whereConditions.assignees = { some: { id: userId } }; //NOTE. ์ง์ ๊ฒฌ์ ์กฐํ API
+ } else if (userId) {
whereConditions.dreamerId = userId; //NOTE. Dreamer ์ ์ฉ api ์กฐ๊ฑด
+ if (status) whereConditions.status = { in: status };
+ if (reviewed === true) whereConditions.review = { isNot: null };
+ else if (reviewed === false) whereConditions.review = { is: null };
}
- if (isAssigned === true) whereConditions.assignees = { some: { id: userId } }; //NOTE. ์ง์ ๊ฒฌ์ ์กฐํ API
-
if (keyword) {
whereConditions.OR = [
{ | TypeScript | plan์์ ๋ฆฌ๋ทฐ ์ ๋ฌด๋ฅผ ํ์ธํ๋ prisma ๋ฌธ๋ฒ์ด๊ตฐ์! ์ด์ ์ ์ ๋ฌด ์ฒดํฌํ ๋ ์ด๋ป๊ฒ ํ๋์ง ๊ธฐ์ต์ด ์๋๋ค์ ใ
ใ
ใ
์๋ ค์ฃผ์
์ ๊ฐ์ฌํฉ๋๋ค~! |
@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
import PlanOrder from 'src/common/constants/planOrder.enum';
import { RoleEnum } from 'src/common/constants/role.type';
import SortOrder from 'src/common/constants/sortOrder.enum';
+import { StatusEnum } from 'src/common/constants/status.type';
import { TRIP_TYPE } from 'src/common/constants/tripType.type';
import IPlan from 'src/common/domains/plan/plan.interface';
import PlanMapper from 'src/common/domains/plan/plan.mapper';
@@ -16,7 +17,8 @@ export default class PlanRepository {
constructor(private readonly db: DBClient) {}
async findMany(options: PlanQueryOptions): Promise<IPlan[]> {
- const { orderBy, page, pageSize } = options || {};
+ const { orderBy, page, pageSize, reviewed } = options || {};
+ const isHasReview = reviewed === true || reviewed === false;
const whereConditions = this.buildWhereConditions(options);
const orderByField: PlanOrderByField =
@@ -29,9 +31,20 @@ export default class PlanRepository {
skip: pageSize * (page - 1),
include: {
dreamer: { select: { id: true, nickName: true } },
- assignees: { select: { id: true, nickName: true } }
+ assignees: { select: { id: true, nickName: true } },
+ quotes: isHasReview
+ ? {
+ where: { isConfirmed: true },
+ select: {
+ id: true,
+ price: true,
+ maker: { select: { id: true, nickName: true, makerProfile: { select: { image: true } } } }
+ }
+ }
+ : {}
}
});
+
const domainPlans = plans.map((plan) => new PlanMapper(plan).toDomain());
return domainPlans;
}
@@ -79,7 +92,7 @@ export default class PlanRepository {
}
async create(data: IPlan): Promise<IPlan> {
- const { title, tripDate, tripType, serviceArea, details, address, status, dreamerId } = data.toDB();
+ const { title, tripDate, tripType, serviceArea, details, address, dreamerId } = data.toDB();
const plan = await this.db.plan.create({
data: {
title,
@@ -88,7 +101,7 @@ export default class PlanRepository {
serviceArea,
details,
address,
- status,
+ status: StatusEnum.PENDING,
dreamer: { connect: { id: dreamerId } }
},
include: {
@@ -147,7 +160,7 @@ export default class PlanRepository {
}
private buildWhereConditions(whereOptions: PlanQueryOptions): PlanWhereConditions {
- const { keyword, tripDate, tripType, serviceArea, isAssigned, userId, status, role } = whereOptions;
+ const { keyword, tripDate, tripType, serviceArea, isAssigned, userId, status, role, reviewed } = whereOptions;
const whereConditions: PlanWhereConditions = {
isDeletedAt: null
@@ -156,7 +169,7 @@ export default class PlanRepository {
if (tripDate) {
whereConditions.tripDate = { lte: tripDate };
whereConditions.status = { in: status };
- } //NOTE.์ค์ผ์ค๋ฌ ์กฐ๊ฑด
+ } //NOTE.์ค์ผ์ค๋ฌ ์กฐ๊ฑด + readyToCompete ์กฐ๊ฑด
if (serviceArea) whereConditions.serviceArea = { in: serviceArea };
@@ -165,13 +178,14 @@ export default class PlanRepository {
if (role === RoleEnum.MAKER) {
whereConditions.status = { in: status }; //NOTE. Maker ์ ์ฉ api ์กฐ๊ฑด
whereConditions.quotes = { some: { makerId: { not: userId } } };
- } else if (status && userId) {
- whereConditions.status = { in: status };
+ if (isAssigned === true) whereConditions.assignees = { some: { id: userId } }; //NOTE. ์ง์ ๊ฒฌ์ ์กฐํ API
+ } else if (userId) {
whereConditions.dreamerId = userId; //NOTE. Dreamer ์ ์ฉ api ์กฐ๊ฑด
+ if (status) whereConditions.status = { in: status };
+ if (reviewed === true) whereConditions.review = { isNot: null };
+ else if (reviewed === false) whereConditions.review = { is: null };
}
- if (isAssigned === true) whereConditions.assignees = { some: { id: userId } }; //NOTE. ์ง์ ๊ฒฌ์ ์กฐํ API
-
if (keyword) {
whereConditions.OR = [
{ | TypeScript | reviewed์ isReqviewQuery๋ก ๋ณ๊ฒฝํ์ต๋๋ค |
@@ -9,17 +9,15 @@ import ErrorMessage from 'src/common/constants/errorMessage.enum';
import { CreateOptionalQuoteData, QuoteQueryOptions } from 'src/common/types/quote/quote.type';
import { QuoteToClientProperties } from 'src/common/types/quote/quoteProperties';
import { CreatePlanData } from 'src/common/types/plan/plan.type';
-import QuoteMapper from 'src/common/domains/quote/quote.mapper';
import ForbiddenError from 'src/common/errors/forbiddenError';
import { ServiceArea } from 'src/common/constants/serviceArea.type';
import { RoleEnum } from 'src/common/constants/role.type';
-import PlanMapper from 'src/common/domains/plan/plan.mapper';
import BadRequestError from 'src/common/errors/badRequestError';
import { StatusEnum } from 'src/common/constants/status.type';
import { GroupByCount } from 'src/common/types/plan/plan.dto';
import { NotificationEventName } from 'src/common/types/notification/notification.types';
import UserService from '../user/user.service';
-import Quote from 'src/common/domains/quote/quote.domain';
+import Plan from 'src/common/domains/plan/plan.domain';
@Injectable()
export default class PlanService {
@@ -58,13 +56,27 @@ export default class PlanService {
userId: string,
options: PlanQueryOptions
): Promise<{ totalCount: number; list: PlanToClientProperties[] }> {
+ const { reviewed, readyToComplete } = options || {};
+ const isReviewQuery = reviewed === true || reviewed === false;
+ const isWithQuote = isReviewQuery || readyToComplete;
+
options.userId = userId;
+ if (isReviewQuery) options.status = [StatusEnum.COMPLETED]; //NOTE. status COMPLETE ์ง์
+
+ if (readyToComplete) {
+ const today = new Date(); //NOTE. ์๋ฃํ ์ ์๋ ํ๋ ํํฐ๋ง
+ const koreaTime = today.toLocaleString('en-US', { timeZone: 'Asia/Seoul' });
+ const tripDate = new Date(koreaTime.split(',')[0]);
+ options.status = [StatusEnum.CONFIRMED];
+ options.tripDate = tripDate; //NOTE. CONFIRMED ์ํ๋ก ์ง์ ๋ฐ tripDate ์ง์
+ }
+
const [totalCount, list] = await Promise.all([
this.planRepository.totalCount(options),
this.planRepository.findMany(options)
]);
- const toClientList = list.map((plan) => plan.toClient());
+ const toClientList = list.map((plan) => (isWithQuote ? plan.toClientWithQuotes() : plan.toClient()));
return { totalCount, list: toClientList };
}
@@ -104,7 +116,7 @@ export default class PlanService {
}
async postPlan(data: CreatePlanData): Promise<PlanToClientProperties> {
- const domainData = new PlanMapper(data).toDomain();
+ const domainData = Plan.create(data);
const plan = await this.planRepository.create(domainData);
return plan.toClientWithAddress();
}
@@ -119,7 +131,7 @@ export default class PlanService {
const quote = await this.quoteService.createQuote({ ...data, planId, isAssigned, makerId: userId });
const makerNickName = quote.maker.nickName;
- const tripType = plan.toClient().tripType;
+ const tripType = plan.getTripType();
this.eventEmitter.emit('notification', {
userId: plan.getDreamerId(),
event: NotificationEventName.ARRIVE_QUOTE,
@@ -148,7 +160,7 @@ export default class PlanService {
const updatedPlan = await this.planRepository.update(plan);
const nickName = updatedPlan.getDreamerNickName();
- const tripType = updatedPlan.toClient().tripType;
+ const tripType = updatedPlan.getTripType();
this.eventEmitter.emit('notification', {
userId: assigneeId,
event: NotificationEventName.ARRIVE_REQUEST, | TypeScript | hasReview=false์ธ ๊ฒฝ์ฐ๋ง ํ์ํ์ง๋ง ํ๋๊น์ true๋ ๊ฐ์ด ๋ง๋ค์ด ๋์ต๋๋ค |
@@ -8,7 +8,7 @@ export default class PlanMapper {
toDomain(): IPlan {
if (!this.plan) return null;
- return new Plan({
+ const returnPlan = new Plan({
id: this.plan.id,
createdAt: this.plan.createdAt,
updatedAt: this.plan.updatedAt,
@@ -19,11 +19,19 @@ export default class PlanMapper {
serviceArea: this.plan.serviceArea,
details: this.plan.details,
address: this.plan.address,
- status: this.plan.status ?? StatusEnum.PENDING,
- quotes: this.plan.quotes,
+ status: this.plan.status,
+ quotes: this.plan.quotes?.map((quote) => ({
+ ...quote,
+ maker: {
+ id: quote.maker.id,
+ nickName: quote.maker.nickName,
+ image: quote.maker?.makerProfile?.image
+ }
+ })),
assignees: this.plan.assignees,
dreamer: this.plan.dreamer,
dreamerId: this.plan.dreamerId
});
+ return returnPlan;
}
} | TypeScript | undefined ๋์ ๋งตํ๋ฐฉ์์ผ๋ก ๋ณ๊ฒฝ |
@@ -0,0 +1,80 @@
+import React from 'react';
+import Comment from './Comment';
+import './CommentList.scss';
+
+class CommentList extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ commentInput: '',
+ newComment: [],
+ nickname: '',
+ commentList: [],
+ commentValue: '',
+ };
+ }
+
+ componentDidMount() {
+ fetch('http://localhost:3000/data/commentData.json', {
+ method: 'GET', // GET method๋ ๊ธฐ๋ณธ๊ฐ์ด๋ผ์ ์๋ต์ด ๊ฐ๋ฅํฉ๋๋ค.
+ }) // ์์์ฝ๋์์๋ ์ดํด๋ฅผ ๋๊ธฐ ์ํด ๋ช
์์ ์ผ๋ก ๊ธฐ์
ํด๋์ต๋๋ค.
+ .then(res => res.json())
+ .then(data => {
+ this.setState({
+ commentList: data,
+ });
+ });
+ }
+
+ checkInput = e => {
+ this.setState({
+ commentInput: e.target.value,
+ });
+ };
+
+ inputToComment = () => {
+ const { newComment, commentInput } = this.state;
+ this.setState({
+ nickname: 'wecode_bootcamp',
+ newComment: newComment.concat(commentInput),
+ });
+ };
+
+ enterPress = e => {
+ if (e.key === 'Enter') {
+ this.inputToComment();
+ }
+ e.target.value = '';
+ };
+
+ render() {
+ const { commentValue, commentList } = this.state;
+ return (
+ <div className="commentList">
+ {commentList.map(comment => {
+ return (
+ <Comment
+ key={comment.id}
+ nickname={comment.userName}
+ comment={comment.content}
+ />
+ );
+ })}
+
+ <div className="newText">
+ <input
+ id="typingText"
+ value={commentValue}
+ onChange={this.checkInput}
+ onKeyPress={this.enterPress}
+ type="text"
+ placeholder="๋๊ธ ๋ฌ๊ธฐ...."
+ />
+ <button onClick={this.checkInput}>๊ฒ์</button>
+ </div>
+ </div>
+ );
+ }
+}
+
+export default CommentList; | JavaScript | ๋น๊ตฌ์กฐํ ํ ๋น์ ์ ์ฉํ๋ฉด ๋ ์ข์ ๊ฒ ๊ฐ์ต๋๋ค. |
@@ -0,0 +1,23 @@
+import React from 'react';
+import './Comment.scss';
+
+class NewComment extends React.Component {
+ render() {
+ // const newArray = this.props.newComment.map((commentarray, index) => (
+ // <li key={index}>
+ // <span className="newCommentid">{this.props.nickname}</span>
+ // <span className="newComments">{commentarray}</span>
+ // </li>
+ // ));
+ return (
+ <div className="comment">
+ <div className="newComment">
+ <span className="newCommentid">{this.props.nickname}</span>
+ <span className="newComments">{this.props.comment}</span>
+ </div>
+ </div>
+ );
+ }
+}
+
+export default NewComment; | JavaScript | - state ๋ฅผ ์ฌ์ฉํ์ง ์๋๋ค๋ฉด, constructor ์ ์ ์ธ์ด ํ์ ์์ต๋๋ค! |
@@ -0,0 +1,15 @@
+.comment {
+ .newComment {
+ margin-bottom: 5px;
+ }
+
+ .newCommentid {
+ font-weight: bold;
+ margin-bottom: 0;
+ }
+
+ .newComments {
+ font-weight: normal;
+ margin-left: 5px;
+ }
+} | Unknown | - `.comment` ์๋๋ก ๋ค์คํ
ํด์ฃผ์ธ์! |
@@ -0,0 +1,80 @@
+import React from 'react';
+import Comment from './Comment';
+import './CommentList.scss';
+
+class CommentList extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ commentInput: '',
+ newComment: [],
+ nickname: '',
+ commentList: [],
+ commentValue: '',
+ };
+ }
+
+ componentDidMount() {
+ fetch('http://localhost:3000/data/commentData.json', {
+ method: 'GET', // GET method๋ ๊ธฐ๋ณธ๊ฐ์ด๋ผ์ ์๋ต์ด ๊ฐ๋ฅํฉ๋๋ค.
+ }) // ์์์ฝ๋์์๋ ์ดํด๋ฅผ ๋๊ธฐ ์ํด ๋ช
์์ ์ผ๋ก ๊ธฐ์
ํด๋์ต๋๋ค.
+ .then(res => res.json())
+ .then(data => {
+ this.setState({
+ commentList: data,
+ });
+ });
+ }
+
+ checkInput = e => {
+ this.setState({
+ commentInput: e.target.value,
+ });
+ };
+
+ inputToComment = () => {
+ const { newComment, commentInput } = this.state;
+ this.setState({
+ nickname: 'wecode_bootcamp',
+ newComment: newComment.concat(commentInput),
+ });
+ };
+
+ enterPress = e => {
+ if (e.key === 'Enter') {
+ this.inputToComment();
+ }
+ e.target.value = '';
+ };
+
+ render() {
+ const { commentValue, commentList } = this.state;
+ return (
+ <div className="commentList">
+ {commentList.map(comment => {
+ return (
+ <Comment
+ key={comment.id}
+ nickname={comment.userName}
+ comment={comment.content}
+ />
+ );
+ })}
+
+ <div className="newText">
+ <input
+ id="typingText"
+ value={commentValue}
+ onChange={this.checkInput}
+ onKeyPress={this.enterPress}
+ type="text"
+ placeholder="๋๊ธ ๋ฌ๊ธฐ...."
+ />
+ <button onClick={this.checkInput}>๊ฒ์</button>
+ </div>
+ </div>
+ );
+ }
+}
+
+export default CommentList; | JavaScript | - ๊ตฌ์กฐ ๋ถํด ํ ๋น ํด์ฃผ์ธ์!
```suggestion
inputToComment = () => {
const { comment, commentInput } = this.state;
this.setState({
id: 'wecode_bootcamp',
comment: comment.concat(commentInput),
});
};
``` |
@@ -0,0 +1,23 @@
+import React from 'react';
+import './Comment.scss';
+
+class NewComment extends React.Component {
+ render() {
+ // const newArray = this.props.newComment.map((commentarray, index) => (
+ // <li key={index}>
+ // <span className="newCommentid">{this.props.nickname}</span>
+ // <span className="newComments">{commentarray}</span>
+ // </li>
+ // ));
+ return (
+ <div className="comment">
+ <div className="newComment">
+ <span className="newCommentid">{this.props.nickname}</span>
+ <span className="newComments">{this.props.comment}</span>
+ </div>
+ </div>
+ );
+ }
+}
+
+export default NewComment; | JavaScript | - ์ปดํฌ๋ํธ์ ๋์ผํ๊ฒ ํด๋์ค๋ค์ ์ง์ด์ฃผ์๊ณ , ์ฒซ๊ธ์๋ฅผ ๋๋ฌธ์๋ก ์์ฑํ๋ ์ปจ๋ฒค์
์ ์ปดํฌ๋ํธ๋ฅผ ๋ค์ด๋ฐ ํ๊ธฐ ์ํ ์ปจ๋ฒค์
์
๋๋ค!
```suggestion
<div className="comment">
``` |
@@ -0,0 +1,80 @@
+import React from 'react';
+import Comment from './Comment';
+import './CommentList.scss';
+
+class CommentList extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ commentInput: '',
+ newComment: [],
+ nickname: '',
+ commentList: [],
+ commentValue: '',
+ };
+ }
+
+ componentDidMount() {
+ fetch('http://localhost:3000/data/commentData.json', {
+ method: 'GET', // GET method๋ ๊ธฐ๋ณธ๊ฐ์ด๋ผ์ ์๋ต์ด ๊ฐ๋ฅํฉ๋๋ค.
+ }) // ์์์ฝ๋์์๋ ์ดํด๋ฅผ ๋๊ธฐ ์ํด ๋ช
์์ ์ผ๋ก ๊ธฐ์
ํด๋์ต๋๋ค.
+ .then(res => res.json())
+ .then(data => {
+ this.setState({
+ commentList: data,
+ });
+ });
+ }
+
+ checkInput = e => {
+ this.setState({
+ commentInput: e.target.value,
+ });
+ };
+
+ inputToComment = () => {
+ const { newComment, commentInput } = this.state;
+ this.setState({
+ nickname: 'wecode_bootcamp',
+ newComment: newComment.concat(commentInput),
+ });
+ };
+
+ enterPress = e => {
+ if (e.key === 'Enter') {
+ this.inputToComment();
+ }
+ e.target.value = '';
+ };
+
+ render() {
+ const { commentValue, commentList } = this.state;
+ return (
+ <div className="commentList">
+ {commentList.map(comment => {
+ return (
+ <Comment
+ key={comment.id}
+ nickname={comment.userName}
+ comment={comment.content}
+ />
+ );
+ })}
+
+ <div className="newText">
+ <input
+ id="typingText"
+ value={commentValue}
+ onChange={this.checkInput}
+ onKeyPress={this.enterPress}
+ type="text"
+ placeholder="๋๊ธ ๋ฌ๊ธฐ...."
+ />
+ <button onClick={this.checkInput}>๊ฒ์</button>
+ </div>
+ </div>
+ );
+ }
+}
+
+export default CommentList; | JavaScript | - id ๋ผ๋ ๊ฐ์ ๋ฌด์จ ์ฉ๋๋ฅผ ์ํด ์์ฑํด ์ฃผ์ ๊ฑธ๊น์? id ๋ ๊ผญ ํ์ํ ๋ถ๋ถ์ด ์๋๋ผ๋ฉด ์ฌ์ฉ์ ์ง์ํด์ฃผ์ธ์! id ๊ฐ์ ํ๋ก์ ํธ ๋ด์์ ์ ์ผํด์ผ ํฉ๋๋ค.
- id ๋ฅผ ์ฌ์ฉํ๋ ๊ฒฝ์ฐ๋ ์๋ฅผ ๋ค์ด, google map api ๋ฅผ ์ฌ์ฉํด์ ์ง๋๋ฅผ ๊ทธ๋ฆด๋, ์ง๋๋ฅผ ๊ทธ๋ฆด html element ๋ฅผ ํน์ ํ ๋ ์ฌ์ฉ๋๊ณค ํฉ๋๋ค. |
@@ -0,0 +1,80 @@
+import React from 'react';
+import Comment from './Comment';
+import './CommentList.scss';
+
+class CommentList extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ commentInput: '',
+ newComment: [],
+ nickname: '',
+ commentList: [],
+ commentValue: '',
+ };
+ }
+
+ componentDidMount() {
+ fetch('http://localhost:3000/data/commentData.json', {
+ method: 'GET', // GET method๋ ๊ธฐ๋ณธ๊ฐ์ด๋ผ์ ์๋ต์ด ๊ฐ๋ฅํฉ๋๋ค.
+ }) // ์์์ฝ๋์์๋ ์ดํด๋ฅผ ๋๊ธฐ ์ํด ๋ช
์์ ์ผ๋ก ๊ธฐ์
ํด๋์ต๋๋ค.
+ .then(res => res.json())
+ .then(data => {
+ this.setState({
+ commentList: data,
+ });
+ });
+ }
+
+ checkInput = e => {
+ this.setState({
+ commentInput: e.target.value,
+ });
+ };
+
+ inputToComment = () => {
+ const { newComment, commentInput } = this.state;
+ this.setState({
+ nickname: 'wecode_bootcamp',
+ newComment: newComment.concat(commentInput),
+ });
+ };
+
+ enterPress = e => {
+ if (e.key === 'Enter') {
+ this.inputToComment();
+ }
+ e.target.value = '';
+ };
+
+ render() {
+ const { commentValue, commentList } = this.state;
+ return (
+ <div className="commentList">
+ {commentList.map(comment => {
+ return (
+ <Comment
+ key={comment.id}
+ nickname={comment.userName}
+ comment={comment.content}
+ />
+ );
+ })}
+
+ <div className="newText">
+ <input
+ id="typingText"
+ value={commentValue}
+ onChange={this.checkInput}
+ onKeyPress={this.enterPress}
+ type="text"
+ placeholder="๋๊ธ ๋ฌ๊ธฐ...."
+ />
+ <button onClick={this.checkInput}>๊ฒ์</button>
+ </div>
+ </div>
+ );
+ }
+}
+
+export default CommentList; | JavaScript | - ์ฌ๊ธฐ๋ id ๋ฅผ ์ฌ์ฉํ์ง ์๋๋ฐ ๋ถํ์ํ๊ฒ ์ฌ์ฉํ๋ ๊ฒ ๊ฐ์ต๋๋ค! ์ง์์ฃผ์ธ์~ |
@@ -1,13 +1,92 @@
import React from 'react';
+import { withRouter } from 'react-router-dom';
+import './Login.scss';
class LoginAh extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ idInput: '',
+ pwInput: '',
+ };
+ }
+
+ loginTest = () => {
+ fetch('users/login', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({
+ email: this.state.idInput,
+ password: this.state.pwInput,
+ }),
+ })
+ .then(response => response.json())
+ .then(response => {
+ if (response.token) {
+ localStorage.setItem('token', response.token);
+ this.props.history.push('/MainAh');
+ } else {
+ alert('์์ด๋/๋น๋ฐ๋ฒํธ๊ฐ ํ๋ ธ์ต๋๋ค!');
+ }
+ });
+ };
+ handleInput = event => {
+ const { name, value } = event.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ goToMain = () => {
+ this.props.history.push('/MainAh');
+ };
+
render() {
+ const { idInput, pwInput } = this.state;
+ const isButtonActive = idInput.includes('@') && pwInput.length >= 5;
return (
- <div>
- <p>๋ค์ฌ</p>
+ <div className="Login">
+ <div className="container">
+ <div className="loginContainer">
+ <p>westagram</p>
+ <div className="idContainer">
+ <input
+ onChange={this.handleInput}
+ name="idInput"
+ type="text"
+ className="inputId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ />
+ </div>
+ <div className="passwordContainer">
+ <input
+ onChange={this.handleInput}
+ name="pwInput"
+ type="password"
+ className="inputPassword"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ />
+ </div>
+ <button
+ disabled={!isButtonActive}
+ className={`loginButton ${
+ isButtonActive ? 'loginButtonOn' : 'loginButtonOff'
+ }`}
+ // onClick={this.goToMain}
+ onClick={this.loginTest}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ <div>
+ <a href="google.com">๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?</a>
+ </div>
+ </div>
+ </div>
</div>
);
}
}
-export default LoginAh;
+export default withRouter(LoginAh); | JavaScript | - constructor ์ ์ธ์ ๊ฐ์ฅ ์์ ์์น์์ผ์ฃผ์ธ์! |
@@ -1,13 +1,92 @@
import React from 'react';
+import { withRouter } from 'react-router-dom';
+import './Login.scss';
class LoginAh extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ idInput: '',
+ pwInput: '',
+ };
+ }
+
+ loginTest = () => {
+ fetch('users/login', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({
+ email: this.state.idInput,
+ password: this.state.pwInput,
+ }),
+ })
+ .then(response => response.json())
+ .then(response => {
+ if (response.token) {
+ localStorage.setItem('token', response.token);
+ this.props.history.push('/MainAh');
+ } else {
+ alert('์์ด๋/๋น๋ฐ๋ฒํธ๊ฐ ํ๋ ธ์ต๋๋ค!');
+ }
+ });
+ };
+ handleInput = event => {
+ const { name, value } = event.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ goToMain = () => {
+ this.props.history.push('/MainAh');
+ };
+
render() {
+ const { idInput, pwInput } = this.state;
+ const isButtonActive = idInput.includes('@') && pwInput.length >= 5;
return (
- <div>
- <p>๋ค์ฌ</p>
+ <div className="Login">
+ <div className="container">
+ <div className="loginContainer">
+ <p>westagram</p>
+ <div className="idContainer">
+ <input
+ onChange={this.handleInput}
+ name="idInput"
+ type="text"
+ className="inputId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ />
+ </div>
+ <div className="passwordContainer">
+ <input
+ onChange={this.handleInput}
+ name="pwInput"
+ type="password"
+ className="inputPassword"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ />
+ </div>
+ <button
+ disabled={!isButtonActive}
+ className={`loginButton ${
+ isButtonActive ? 'loginButtonOn' : 'loginButtonOff'
+ }`}
+ // onClick={this.goToMain}
+ onClick={this.loginTest}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ <div>
+ <a href="google.com">๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?</a>
+ </div>
+ </div>
+ </div>
</div>
);
}
}
-export default LoginAh;
+export default withRouter(LoginAh); | JavaScript | - defaultColor ์ disabled ๋ state ๋ก ๊ด๋ฆฌํ๊ธฐ์๋ ๋ถ์ ์ ํ ๊ฐ ๊ฐ์ต๋๋ค. idInput ๊ณผ pwInput ๋ฅผ ์ฌ์ฉํด์ ๊ณ์ฐํ ์ ์๋ ๊ฐ์ด๊ธฐ ๋๋ฌธ์
๋๋ค!
- ์ด๋ค ๊ธฐ์ค์ผ๋ก state ๋ฅผ ๋ง๋ค์ด์ผ ํ๋์ง์ ๋ํด์๋ ์๋ ๋ฌธ์๋ฅผ ์ฐธ๊ณ ํด์ฃผ์ธ์!
- https://ko.reactjs.org/docs/thinking-in-react.html#step-3-identify-the-minimal-but-complete-representation-of-ui-state
- state ๋ก ๊ด๋ฆฌํ ํ์๊ฐ ์๋ ๊ฐ๋ค์ state ๋ฅผ ๋ง๋ค์ง ์๋๋ก ํด์ฃผ์ธ์. ๊ฐ์ ์์ ํ๊ธฐ ์ํด์ , setState ๋ฅผ ์ฌ์ฉํด์ผํ๊ณ , ์ด๋ ์ผ์ด๋์ง ์์๋ ๋๋ ๋ถํ์ํ ๋ ๋๋ง์ ๋ฐ์์ํค๊ธฐ ๋๋ฌธ์
๋๋ค. |
@@ -1,13 +1,92 @@
import React from 'react';
+import { withRouter } from 'react-router-dom';
+import './Login.scss';
class LoginAh extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ idInput: '',
+ pwInput: '',
+ };
+ }
+
+ loginTest = () => {
+ fetch('users/login', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({
+ email: this.state.idInput,
+ password: this.state.pwInput,
+ }),
+ })
+ .then(response => response.json())
+ .then(response => {
+ if (response.token) {
+ localStorage.setItem('token', response.token);
+ this.props.history.push('/MainAh');
+ } else {
+ alert('์์ด๋/๋น๋ฐ๋ฒํธ๊ฐ ํ๋ ธ์ต๋๋ค!');
+ }
+ });
+ };
+ handleInput = event => {
+ const { name, value } = event.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ goToMain = () => {
+ this.props.history.push('/MainAh');
+ };
+
render() {
+ const { idInput, pwInput } = this.state;
+ const isButtonActive = idInput.includes('@') && pwInput.length >= 5;
return (
- <div>
- <p>๋ค์ฌ</p>
+ <div className="Login">
+ <div className="container">
+ <div className="loginContainer">
+ <p>westagram</p>
+ <div className="idContainer">
+ <input
+ onChange={this.handleInput}
+ name="idInput"
+ type="text"
+ className="inputId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ />
+ </div>
+ <div className="passwordContainer">
+ <input
+ onChange={this.handleInput}
+ name="pwInput"
+ type="password"
+ className="inputPassword"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ />
+ </div>
+ <button
+ disabled={!isButtonActive}
+ className={`loginButton ${
+ isButtonActive ? 'loginButtonOn' : 'loginButtonOff'
+ }`}
+ // onClick={this.goToMain}
+ onClick={this.loginTest}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ <div>
+ <a href="google.com">๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?</a>
+ </div>
+ </div>
+ </div>
</div>
);
}
}
-export default LoginAh;
+export default withRouter(LoginAh); | JavaScript | - ๊ตฌ์กฐ ๋ถํด ํ ๋น ํ์ฉํด ์ฃผ์๋ฉด ๋ ์ข์ ๊ฒ ๊ฐ์ต๋๋ค!
```suggestion
const { name, value } = event.target;
this.setState({
[name]: value,
});
``` |
@@ -1,13 +1,92 @@
import React from 'react';
+import { withRouter } from 'react-router-dom';
+import './Login.scss';
class LoginAh extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ idInput: '',
+ pwInput: '',
+ };
+ }
+
+ loginTest = () => {
+ fetch('users/login', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({
+ email: this.state.idInput,
+ password: this.state.pwInput,
+ }),
+ })
+ .then(response => response.json())
+ .then(response => {
+ if (response.token) {
+ localStorage.setItem('token', response.token);
+ this.props.history.push('/MainAh');
+ } else {
+ alert('์์ด๋/๋น๋ฐ๋ฒํธ๊ฐ ํ๋ ธ์ต๋๋ค!');
+ }
+ });
+ };
+ handleInput = event => {
+ const { name, value } = event.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ goToMain = () => {
+ this.props.history.push('/MainAh');
+ };
+
render() {
+ const { idInput, pwInput } = this.state;
+ const isButtonActive = idInput.includes('@') && pwInput.length >= 5;
return (
- <div>
- <p>๋ค์ฌ</p>
+ <div className="Login">
+ <div className="container">
+ <div className="loginContainer">
+ <p>westagram</p>
+ <div className="idContainer">
+ <input
+ onChange={this.handleInput}
+ name="idInput"
+ type="text"
+ className="inputId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ />
+ </div>
+ <div className="passwordContainer">
+ <input
+ onChange={this.handleInput}
+ name="pwInput"
+ type="password"
+ className="inputPassword"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ />
+ </div>
+ <button
+ disabled={!isButtonActive}
+ className={`loginButton ${
+ isButtonActive ? 'loginButtonOn' : 'loginButtonOff'
+ }`}
+ // onClick={this.goToMain}
+ onClick={this.loginTest}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ <div>
+ <a href="google.com">๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?</a>
+ </div>
+ </div>
+ </div>
</div>
);
}
}
-export default LoginAh;
+export default withRouter(LoginAh); | JavaScript | - defaultColor ์ disabled ๋ฅผ state ์์ ๊ด๋ฆฌํ์ง ์๋๋ก ํ๋ค๋ฉด, ์ด ๋ก์ง ๋ถ๋ถ์ ๋ ์ด์ ํ์ ์์ ๊ฒ ๊ฐ์ต๋๋ค. |
@@ -1,13 +1,92 @@
import React from 'react';
+import { withRouter } from 'react-router-dom';
+import './Login.scss';
class LoginAh extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ idInput: '',
+ pwInput: '',
+ };
+ }
+
+ loginTest = () => {
+ fetch('users/login', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({
+ email: this.state.idInput,
+ password: this.state.pwInput,
+ }),
+ })
+ .then(response => response.json())
+ .then(response => {
+ if (response.token) {
+ localStorage.setItem('token', response.token);
+ this.props.history.push('/MainAh');
+ } else {
+ alert('์์ด๋/๋น๋ฐ๋ฒํธ๊ฐ ํ๋ ธ์ต๋๋ค!');
+ }
+ });
+ };
+ handleInput = event => {
+ const { name, value } = event.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ goToMain = () => {
+ this.props.history.push('/MainAh');
+ };
+
render() {
+ const { idInput, pwInput } = this.state;
+ const isButtonActive = idInput.includes('@') && pwInput.length >= 5;
return (
- <div>
- <p>๋ค์ฌ</p>
+ <div className="Login">
+ <div className="container">
+ <div className="loginContainer">
+ <p>westagram</p>
+ <div className="idContainer">
+ <input
+ onChange={this.handleInput}
+ name="idInput"
+ type="text"
+ className="inputId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ />
+ </div>
+ <div className="passwordContainer">
+ <input
+ onChange={this.handleInput}
+ name="pwInput"
+ type="password"
+ className="inputPassword"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ />
+ </div>
+ <button
+ disabled={!isButtonActive}
+ className={`loginButton ${
+ isButtonActive ? 'loginButtonOn' : 'loginButtonOff'
+ }`}
+ // onClick={this.goToMain}
+ onClick={this.loginTest}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ <div>
+ <a href="google.com">๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?</a>
+ </div>
+ </div>
+ </div>
</div>
);
}
}
-export default LoginAh;
+export default withRouter(LoginAh); | JavaScript | - idInput ๊ณผ pwInput ์ ์ฌ์ฉํด์ ๋ฐ๋ก ๊ฐ์ ๊ณ์ฐํ ์ ์์ต๋๋ค. ์ฝ๋๋ ๋ค์๊ณผ ๊ฐ์ต๋๋ค. ์ฐธ๊ณ ํด์ฃผ์ธ์!
- inline ์คํ์ผ๋ง์ ์ฃผ์๋ ๊ฒ์ ๊ผญ ํ์ํ ๊ฒฝ์ฐ๊ฐ ์๋๋ผ๋ฉด ์ง์ํด์ฃผ์๊ณ , className ์ ๋์ ์ผ๋ก ๋ถ์ฌํ๋ ๊ฒ์ผ๋ก ์คํ์ผ๋ง ํด์ฃผ์ธ์!
- inline ์คํ์ผ๋ง์ ์ฌ์ฉํ์๋ ๊ฒฝ์ฐ๋, ์ฌ๋ผ์ด๋๋ฅผ ๊ตฌํ๊ณผ ๊ฐ์ด ์คํ์ผ๋ง์ด ๋งค์ฐ ๋ง์ด ์ง์์ ์ผ๋ก ๋ณํด์ผ ํ๋ ์ํฉ์ ์ฌ์ฉํด ์ฃผ์๋ ๊ฒ๋๋ค!
```jsx
render () {
const { idInput, pwInput } = this.state;
isButtonActive = idInput.includes('@') && pwInput.length >= 5
return (
...
<button
disabled={!isButtonActive}
className={`loginButton ${isButtonActive ? 'active' : ''}`}
onClick={this.goToMain}
>
...
)
}
``` |
@@ -0,0 +1,46 @@
+@import url('https://fonts.googleapis.com/css2?family=Lobster&display=swap');
+@import '../../../styles/variable.scss';
+
+.Login {
+ .container {
+ width: 2000px;
+ max-width: 100vw;
+
+ .loginContainer {
+ width: 350px;
+ height: 400px;
+ margin: 25vh auto;
+ border: 2px solid lightgrey;
+ text-align: center;
+
+ p {
+ margin: 50px auto;
+ font-family: 'Lobster';
+ font-size: 40px;
+ }
+
+ .inputId {
+ @include idpwContainer;
+ }
+
+ .inputPassword {
+ @include idpwContainer;
+ }
+
+ .loginButtonOn {
+ @include loginButton;
+ background-color: blue;
+ }
+
+ .loginButtonOff {
+ @include loginButton;
+ background-color: skyblue;
+ }
+
+ a {
+ text-decoration: none;
+ color: blue;
+ }
+ }
+ }
+} | Unknown | - common.scss ์ ์ ํฉํ๋ ๊ฒ ๊ฐ์ต๋๋ค! |
@@ -0,0 +1,46 @@
+@import url('https://fonts.googleapis.com/css2?family=Lobster&display=swap');
+@import '../../../styles/variable.scss';
+
+.Login {
+ .container {
+ width: 2000px;
+ max-width: 100vw;
+
+ .loginContainer {
+ width: 350px;
+ height: 400px;
+ margin: 25vh auto;
+ border: 2px solid lightgrey;
+ text-align: center;
+
+ p {
+ margin: 50px auto;
+ font-family: 'Lobster';
+ font-size: 40px;
+ }
+
+ .inputId {
+ @include idpwContainer;
+ }
+
+ .inputPassword {
+ @include idpwContainer;
+ }
+
+ .loginButtonOn {
+ @include loginButton;
+ background-color: blue;
+ }
+
+ .loginButtonOff {
+ @include loginButton;
+ background-color: skyblue;
+ }
+
+ a {
+ text-decoration: none;
+ color: blue;
+ }
+ }
+ }
+} | Unknown | - mixin ์ variable.scss ์ ๊ฐ์ ๋ณ๋์ ํ์ผ์ ํ๋ ๋ ๋ง๋ค์ด์ ๊ทธ๊ณณ์์ ์ผ๊ด์ ์ผ๋ก ๊ด๋ฆฌํด์ฃผ์ธ์! |
@@ -0,0 +1,46 @@
+@import url('https://fonts.googleapis.com/css2?family=Lobster&display=swap');
+@import '../../../styles/variable.scss';
+
+.Login {
+ .container {
+ width: 2000px;
+ max-width: 100vw;
+
+ .loginContainer {
+ width: 350px;
+ height: 400px;
+ margin: 25vh auto;
+ border: 2px solid lightgrey;
+ text-align: center;
+
+ p {
+ margin: 50px auto;
+ font-family: 'Lobster';
+ font-size: 40px;
+ }
+
+ .inputId {
+ @include idpwContainer;
+ }
+
+ .inputPassword {
+ @include idpwContainer;
+ }
+
+ .loginButtonOn {
+ @include loginButton;
+ background-color: blue;
+ }
+
+ .loginButtonOff {
+ @include loginButton;
+ background-color: skyblue;
+ }
+
+ a {
+ text-decoration: none;
+ color: blue;
+ }
+ }
+ }
+} | Unknown | - ์คํ์ผ๋ง์ ๋ถ์ฌํ๊ธฐ ์ํจ์ผ๋ก๋ className ์ผ๋ก๋ ์ถฉ๋ถํฉ๋๋ค. id ๋ฅผ ์ฌ์ฉํ์ค ์ด์ ๊ฐ ์์ต๋๋ค. |
@@ -1,13 +1,108 @@
import React from 'react';
+import { withRouter } from 'react-router-dom';
+import Nav from '../../../components/Nav/Nav';
+import CommentList from '../Comment/CommentList';
+import './Main.scss';
class MainAh extends React.Component {
render() {
return (
- <div>
- <p>๋ช
์ฑ</p>
+ <div className="MainAh">
+ <Nav />
+ <div className="mainContainer">
+ <div className="feedsContainer">
+ <article>
+ <div className="feedsTop">
+ <img
+ className="profileImage"
+ src="/images/baeyoonah/Main/mark.png"
+ alt=""
+ />
+ <span className="feedsId">wecode-bootcamp</span>
+ </div>
+ <img src="/images/baeyoonah/Main/liberty.jpg" alt="" />
+ <div className="feedsIcon">
+ <ul>
+ <li>
+ <img src="/images/baeyoonah/Main/redheart.png" alt="" />
+ </li>
+ <li>
+ <img src="/images/baeyoonah/Main/what.png" alt="" />
+ </li>
+ <li>
+ <img src="/images/baeyoonah/Main/share.png" alt="" />
+ </li>
+ </ul>
+ <img src="/images/baeyoonah/Main/tag.png" alt="" />
+ </div>
+ <div className="feedsContent">
+ <div>
+ <img src="/images/baeyoonah/Main/mark.png" alt="" />
+ <span className="feedsId">ainworld</span>
+ <span className="feedsText">๋ ์ธ 4๋ช
์ด ์ข์ํฉ๋๋ค.</span>
+ </div>
+ <CommentList />
+ </div>
+ </article>
+ </div>
+ <div className="mainRightContainer">
+ <div className="mainRightTop">
+ <img src="/images/baeyoonah/Main/mark.png" alt="" />
+ <span className="siteId">wecode_bootcamp</span>
+ <p className="mainRightIdInfo">Wecode | ์์ฝ๋</p>
+ </div>
+
+ <div className="storyContainer">
+ <div className="storyMenu">
+ <span className="storyId">์คํ ๋ฆฌ</span>
+ <span className="storyIdInfo">๋ชจ๋๋ณด๊ธฐ</span>
+ </div>
+ <div className="storyContent">
+ <img src="/images/baeyoonah/Main/mark.png" alt="" />
+ <span className="siteId">_yms_s</span>
+ <p className="siteIdInfo">16๋ถ ์ </p>
+ </div>
+ <div className="storyContent">
+ <img src="/images/baeyoonah/Main/mark.png" alt="" />
+ <span className="siteId">_yms_s</span>
+ <p className="siteIdInfo">16๋ถ ์ </p>
+ </div>
+ <div className="storyContent">
+ <img src="/images/baeyoonah/Main/mark.png" alt="" />
+ <span className="siteId">_yms_s</span>
+ <p className="siteIdInfo">16๋ถ ์ </p>
+ </div>
+ </div>
+
+ <div className="follow">
+ <div className="storyMenu">
+ <span className="storyId">ํ์๋์ ์ํ ์ถ์ฒ</span>
+ <span className="storyIdInfo">๋ชจ๋ ๋ณด๊ธฐ</span>
+ </div>
+ <div className="storyContent">
+ <img src="/images/baeyoonah/Main/mark.png" alt="" />
+ <span className="siteId">ioaaaaaahye</span>
+ <p className="siteIdInfo">_legenda๋ ์ธ 2๋ช
์ด ...</p>
+ <button className="followBtn">ํ๋ก์ฐ</button>
+ </div>
+ <div className="storyContent">
+ <img src="/images/baeyoonah/Main/mark.png" alt="" />
+ <span className="siteId">ioaaaaaahye</span>
+ <p className="siteIdInfo">_legenda๋ ์ธ 2๋ช
์ด ...</p>
+ <button className="followBtn">ํ๋ก์ฐ</button>
+ </div>
+ <div className="storyContent">
+ <img src="/images/baeyoonah/Main/mark.png" alt="" />
+ <span className="siteId">ioaaaaaahye</span>
+ <p className="siteIdInfo">_legenda๋ ์ธ 2๋ช
์ด ...</p>
+ <button className="followBtn">ํ๋ก์ฐ</button>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
);
}
}
-export default MainAh;
+export default withRouter(MainAh); | JavaScript | - ๋ฐ๋ณต์ ์ธ ๊ตฌ์กฐ๊ฐ ๋ณด์ด๋ค์! ๊ทธ๋ฆฌ๊ณ ์ฌ์ค ์ด ๋ถ๋ถ์ ๋ฐฑ์๋์์ ์ ๋ณด๋ฅผ ๋ฐ์์์ ํ๋ฉด์ ๊ทธ๋ฆฌ๋ ๊ฒ์ด๋ฏ๋ก, ๋ชฉ์
๋ฐ์ดํฐ๋ฅผ ๊ตฌ์ฑํ์
์ map ํจ์๋ฅผ ์ฌ์ฉํ์ฌ ๊ตฌํํด์ฃผ์๋๊ฒ ์ข์ ๊ฒ ๊ฐ์ต๋๋ค! |
@@ -1,13 +1,108 @@
import React from 'react';
+import { withRouter } from 'react-router-dom';
+import Nav from '../../../components/Nav/Nav';
+import CommentList from '../Comment/CommentList';
+import './Main.scss';
class MainAh extends React.Component {
render() {
return (
- <div>
- <p>๋ช
์ฑ</p>
+ <div className="MainAh">
+ <Nav />
+ <div className="mainContainer">
+ <div className="feedsContainer">
+ <article>
+ <div className="feedsTop">
+ <img
+ className="profileImage"
+ src="/images/baeyoonah/Main/mark.png"
+ alt=""
+ />
+ <span className="feedsId">wecode-bootcamp</span>
+ </div>
+ <img src="/images/baeyoonah/Main/liberty.jpg" alt="" />
+ <div className="feedsIcon">
+ <ul>
+ <li>
+ <img src="/images/baeyoonah/Main/redheart.png" alt="" />
+ </li>
+ <li>
+ <img src="/images/baeyoonah/Main/what.png" alt="" />
+ </li>
+ <li>
+ <img src="/images/baeyoonah/Main/share.png" alt="" />
+ </li>
+ </ul>
+ <img src="/images/baeyoonah/Main/tag.png" alt="" />
+ </div>
+ <div className="feedsContent">
+ <div>
+ <img src="/images/baeyoonah/Main/mark.png" alt="" />
+ <span className="feedsId">ainworld</span>
+ <span className="feedsText">๋ ์ธ 4๋ช
์ด ์ข์ํฉ๋๋ค.</span>
+ </div>
+ <CommentList />
+ </div>
+ </article>
+ </div>
+ <div className="mainRightContainer">
+ <div className="mainRightTop">
+ <img src="/images/baeyoonah/Main/mark.png" alt="" />
+ <span className="siteId">wecode_bootcamp</span>
+ <p className="mainRightIdInfo">Wecode | ์์ฝ๋</p>
+ </div>
+
+ <div className="storyContainer">
+ <div className="storyMenu">
+ <span className="storyId">์คํ ๋ฆฌ</span>
+ <span className="storyIdInfo">๋ชจ๋๋ณด๊ธฐ</span>
+ </div>
+ <div className="storyContent">
+ <img src="/images/baeyoonah/Main/mark.png" alt="" />
+ <span className="siteId">_yms_s</span>
+ <p className="siteIdInfo">16๋ถ ์ </p>
+ </div>
+ <div className="storyContent">
+ <img src="/images/baeyoonah/Main/mark.png" alt="" />
+ <span className="siteId">_yms_s</span>
+ <p className="siteIdInfo">16๋ถ ์ </p>
+ </div>
+ <div className="storyContent">
+ <img src="/images/baeyoonah/Main/mark.png" alt="" />
+ <span className="siteId">_yms_s</span>
+ <p className="siteIdInfo">16๋ถ ์ </p>
+ </div>
+ </div>
+
+ <div className="follow">
+ <div className="storyMenu">
+ <span className="storyId">ํ์๋์ ์ํ ์ถ์ฒ</span>
+ <span className="storyIdInfo">๋ชจ๋ ๋ณด๊ธฐ</span>
+ </div>
+ <div className="storyContent">
+ <img src="/images/baeyoonah/Main/mark.png" alt="" />
+ <span className="siteId">ioaaaaaahye</span>
+ <p className="siteIdInfo">_legenda๋ ์ธ 2๋ช
์ด ...</p>
+ <button className="followBtn">ํ๋ก์ฐ</button>
+ </div>
+ <div className="storyContent">
+ <img src="/images/baeyoonah/Main/mark.png" alt="" />
+ <span className="siteId">ioaaaaaahye</span>
+ <p className="siteIdInfo">_legenda๋ ์ธ 2๋ช
์ด ...</p>
+ <button className="followBtn">ํ๋ก์ฐ</button>
+ </div>
+ <div className="storyContent">
+ <img src="/images/baeyoonah/Main/mark.png" alt="" />
+ <span className="siteId">ioaaaaaahye</span>
+ <p className="siteIdInfo">_legenda๋ ์ธ 2๋ช
์ด ...</p>
+ <button className="followBtn">ํ๋ก์ฐ</button>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
);
}
}
-export default MainAh;
+export default withRouter(MainAh); | JavaScript | - ์ฌ๊ธฐ๋ ์์ ๋์ผํฉ๋๋ค! |
@@ -0,0 +1,201 @@
+body {
+ margin: 0;
+}
+@import url('https://fonts.googleapis.com/css2?family=Lobster&display=swap');
+
+.MainAh {
+ .mainContainer {
+ display: flex;
+ position: relative;
+ justify-content: center;
+ width: 2000px;
+ max-width: 100vw;
+ height: 2000px;
+ background-color: #fafafa;
+ }
+
+ .feedsContainer {
+ position: absolute;
+ left: 15%;
+ margin-top: 50px;
+ width: 45%;
+ border: 2px solid lightgrey;
+ background-color: white;
+
+ p {
+ margin: 0;
+ }
+ }
+
+ .feedsTop {
+ margin: 15px 0;
+ }
+
+ article {
+ width: 100%;
+ .profileImage {
+ vertical-align: middle;
+ margin-left: 15px;
+ margin-right: 10px;
+ width: 30px;
+ height: 30px;
+ }
+
+ img {
+ width: 100%;
+ }
+ }
+
+ .feedsIcon {
+ display: flex;
+ justify-content: space-between;
+ margin-top: 5px;
+
+ ul {
+ display: flex;
+ margin: 0;
+ padding-left: 10px;
+ }
+ li {
+ list-style: none;
+ margin-right: 10px;
+ }
+ img {
+ margin-right: 10px;
+ width: 30px;
+ height: 30px;
+ }
+ }
+
+ .feedsContent {
+ padding: 10px;
+ border-bottom: 2px solid lightgrey;
+
+ img {
+ margin-right: 5px;
+ width: 15px;
+ height: 15px;
+ }
+
+ .feedsId {
+ font-weight: bold;
+ }
+ .feedsText {
+ margin-left: 10px;
+ font-weight: normal;
+ }
+ }
+
+ .newText {
+ margin: 15px 0px 15px 10px;
+
+ input {
+ width: 90%;
+ border: none;
+ color: black;
+ }
+ button {
+ border: none;
+ background-color: white;
+ color: skyblue;
+ }
+ }
+
+ .mainRightContainer {
+ display: flex;
+ flex-direction: column;
+ position: fixed;
+ left: 63%;
+ margin-top: 50px;
+ width: 20%;
+
+ img {
+ width: 40px;
+ height: 40px;
+ }
+
+ .mainRightIdInfo {
+ position: absolute;
+ top: 20px;
+ left: 5px;
+ margin: 0;
+ margin-left: 50px;
+ color: grey;
+ }
+ }
+ .mainRightTop {
+ margin-bottom: 10px;
+
+ img {
+ vertical-align: middle;
+ margin-right: 10px;
+ width: 45px;
+ height: 45px;
+ }
+ }
+
+ .storyContainer {
+ border: 2px solid lightgrey;
+ margin-top: 10px;
+ background-color: white;
+ }
+ // story, follow ๊ณตํต ์ฌ์ฉ
+ .storyMenu {
+ display: flex;
+ justify-content: space-between;
+ margin: 15px;
+ }
+ .storyContent {
+ margin: 15px;
+ position: relative;
+
+ img {
+ vertical-align: middle;
+ margin-right: 15px;
+ width: 35px;
+ height: 35px;
+ }
+ }
+ // ํน์ ์ปจํ
์ด๋ ์์ ๋ค์ด๊ฐ์์ง ์๊ณ ๊ณตํต์ผ๋ก ์ฐ๋์ค
+ .siteId {
+ position: absolute;
+ top: 2px;
+ font-weight: bold;
+ }
+
+ .siteIdInfo {
+ position: absolute;
+ top: 20px;
+ left: 5px;
+ margin: 0;
+ margin-left: 45px;
+ color: grey;
+ }
+
+ .storyId {
+ color: grey;
+ margin: 0;
+ }
+
+ .storyIdinfo {
+ font-weight: bold;
+ }
+
+ .follow {
+ margin-top: 15px;
+ border: 2px solid lightgrey;
+ background-color: white;
+
+ .followBtn {
+ position: absolute;
+ top: 10px;
+ right: 0;
+ float: right;
+ padding: 0;
+ border: none;
+ background-color: white;
+ color: blue;
+ font-size: 15px;
+ }
+ }
+} | Unknown | - reset.scss ์ ์ ํฉํด ๋ณด์ด๋ค์! |
@@ -0,0 +1,80 @@
+import React from 'react';
+import Comment from './Comment';
+import './CommentList.scss';
+
+class CommentList extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ commentInput: '',
+ newComment: [],
+ nickname: '',
+ commentList: [],
+ commentValue: '',
+ };
+ }
+
+ componentDidMount() {
+ fetch('http://localhost:3000/data/commentData.json', {
+ method: 'GET', // GET method๋ ๊ธฐ๋ณธ๊ฐ์ด๋ผ์ ์๋ต์ด ๊ฐ๋ฅํฉ๋๋ค.
+ }) // ์์์ฝ๋์์๋ ์ดํด๋ฅผ ๋๊ธฐ ์ํด ๋ช
์์ ์ผ๋ก ๊ธฐ์
ํด๋์ต๋๋ค.
+ .then(res => res.json())
+ .then(data => {
+ this.setState({
+ commentList: data,
+ });
+ });
+ }
+
+ checkInput = e => {
+ this.setState({
+ commentInput: e.target.value,
+ });
+ };
+
+ inputToComment = () => {
+ const { newComment, commentInput } = this.state;
+ this.setState({
+ nickname: 'wecode_bootcamp',
+ newComment: newComment.concat(commentInput),
+ });
+ };
+
+ enterPress = e => {
+ if (e.key === 'Enter') {
+ this.inputToComment();
+ }
+ e.target.value = '';
+ };
+
+ render() {
+ const { commentValue, commentList } = this.state;
+ return (
+ <div className="commentList">
+ {commentList.map(comment => {
+ return (
+ <Comment
+ key={comment.id}
+ nickname={comment.userName}
+ comment={comment.content}
+ />
+ );
+ })}
+
+ <div className="newText">
+ <input
+ id="typingText"
+ value={commentValue}
+ onChange={this.checkInput}
+ onKeyPress={this.enterPress}
+ type="text"
+ placeholder="๋๊ธ ๋ฌ๊ธฐ...."
+ />
+ <button onClick={this.checkInput}>๊ฒ์</button>
+ </div>
+ </div>
+ );
+ }
+}
+
+export default CommentList; | JavaScript | ์ ์ฉ์๋ฃ~! ๋ค์ฌ๋ ์ต๊ณ ! |
@@ -0,0 +1,23 @@
+import React from 'react';
+import './Comment.scss';
+
+class NewComment extends React.Component {
+ render() {
+ // const newArray = this.props.newComment.map((commentarray, index) => (
+ // <li key={index}>
+ // <span className="newCommentid">{this.props.nickname}</span>
+ // <span className="newComments">{commentarray}</span>
+ // </li>
+ // ));
+ return (
+ <div className="comment">
+ <div className="newComment">
+ <span className="newCommentid">{this.props.nickname}</span>
+ <span className="newComments">{this.props.comment}</span>
+ </div>
+ </div>
+ );
+ }
+}
+
+export default NewComment; | JavaScript | ์ง์ ์ต๋๋ค! |
@@ -0,0 +1,15 @@
+.comment {
+ .newComment {
+ margin-bottom: 5px;
+ }
+
+ .newCommentid {
+ font-weight: bold;
+ margin-bottom: 0;
+ }
+
+ .newComments {
+ font-weight: normal;
+ margin-left: 5px;
+ }
+} | Unknown | ์์ ํ์ต๋๋ค! |
@@ -0,0 +1,80 @@
+import React from 'react';
+import Comment from './Comment';
+import './CommentList.scss';
+
+class CommentList extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ commentInput: '',
+ newComment: [],
+ nickname: '',
+ commentList: [],
+ commentValue: '',
+ };
+ }
+
+ componentDidMount() {
+ fetch('http://localhost:3000/data/commentData.json', {
+ method: 'GET', // GET method๋ ๊ธฐ๋ณธ๊ฐ์ด๋ผ์ ์๋ต์ด ๊ฐ๋ฅํฉ๋๋ค.
+ }) // ์์์ฝ๋์์๋ ์ดํด๋ฅผ ๋๊ธฐ ์ํด ๋ช
์์ ์ผ๋ก ๊ธฐ์
ํด๋์ต๋๋ค.
+ .then(res => res.json())
+ .then(data => {
+ this.setState({
+ commentList: data,
+ });
+ });
+ }
+
+ checkInput = e => {
+ this.setState({
+ commentInput: e.target.value,
+ });
+ };
+
+ inputToComment = () => {
+ const { newComment, commentInput } = this.state;
+ this.setState({
+ nickname: 'wecode_bootcamp',
+ newComment: newComment.concat(commentInput),
+ });
+ };
+
+ enterPress = e => {
+ if (e.key === 'Enter') {
+ this.inputToComment();
+ }
+ e.target.value = '';
+ };
+
+ render() {
+ const { commentValue, commentList } = this.state;
+ return (
+ <div className="commentList">
+ {commentList.map(comment => {
+ return (
+ <Comment
+ key={comment.id}
+ nickname={comment.userName}
+ comment={comment.content}
+ />
+ );
+ })}
+
+ <div className="newText">
+ <input
+ id="typingText"
+ value={commentValue}
+ onChange={this.checkInput}
+ onKeyPress={this.enterPress}
+ type="text"
+ placeholder="๋๊ธ ๋ฌ๊ธฐ...."
+ />
+ <button onClick={this.checkInput}>๊ฒ์</button>
+ </div>
+ </div>
+ );
+ }
+}
+
+export default CommentList; | JavaScript | ์ ์ฉํ์ต๋๋ค. ๊ตฌ์กฐ ๋ถํด ํ ๋น์ด ์ต์ํ์ง์์ ์จ์ผํ ๊ณณ์ ์ ๊ตฌ๋ถํ์ง ๋ชปํ๋๊ฒ ๊ฐ์ต๋๋ค.. ใ
|
@@ -0,0 +1,23 @@
+import React from 'react';
+import './Comment.scss';
+
+class NewComment extends React.Component {
+ render() {
+ // const newArray = this.props.newComment.map((commentarray, index) => (
+ // <li key={index}>
+ // <span className="newCommentid">{this.props.nickname}</span>
+ // <span className="newComments">{commentarray}</span>
+ // </li>
+ // ));
+ return (
+ <div className="comment">
+ <div className="newComment">
+ <span className="newCommentid">{this.props.nickname}</span>
+ <span className="newComments">{this.props.comment}</span>
+ </div>
+ </div>
+ );
+ }
+}
+
+export default NewComment; | JavaScript | ์ ์ด๋ฐ ์ค์๋ฅผ ... ์์ ํ์ต๋๋ค! |
@@ -0,0 +1,80 @@
+import React from 'react';
+import Comment from './Comment';
+import './CommentList.scss';
+
+class CommentList extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ commentInput: '',
+ newComment: [],
+ nickname: '',
+ commentList: [],
+ commentValue: '',
+ };
+ }
+
+ componentDidMount() {
+ fetch('http://localhost:3000/data/commentData.json', {
+ method: 'GET', // GET method๋ ๊ธฐ๋ณธ๊ฐ์ด๋ผ์ ์๋ต์ด ๊ฐ๋ฅํฉ๋๋ค.
+ }) // ์์์ฝ๋์์๋ ์ดํด๋ฅผ ๋๊ธฐ ์ํด ๋ช
์์ ์ผ๋ก ๊ธฐ์
ํด๋์ต๋๋ค.
+ .then(res => res.json())
+ .then(data => {
+ this.setState({
+ commentList: data,
+ });
+ });
+ }
+
+ checkInput = e => {
+ this.setState({
+ commentInput: e.target.value,
+ });
+ };
+
+ inputToComment = () => {
+ const { newComment, commentInput } = this.state;
+ this.setState({
+ nickname: 'wecode_bootcamp',
+ newComment: newComment.concat(commentInput),
+ });
+ };
+
+ enterPress = e => {
+ if (e.key === 'Enter') {
+ this.inputToComment();
+ }
+ e.target.value = '';
+ };
+
+ render() {
+ const { commentValue, commentList } = this.state;
+ return (
+ <div className="commentList">
+ {commentList.map(comment => {
+ return (
+ <Comment
+ key={comment.id}
+ nickname={comment.userName}
+ comment={comment.content}
+ />
+ );
+ })}
+
+ <div className="newText">
+ <input
+ id="typingText"
+ value={commentValue}
+ onChange={this.checkInput}
+ onKeyPress={this.enterPress}
+ type="text"
+ placeholder="๋๊ธ ๋ฌ๊ธฐ...."
+ />
+ <button onClick={this.checkInput}>๊ฒ์</button>
+ </div>
+ </div>
+ );
+ }
+}
+
+export default CommentList; | JavaScript | ์์์ ๋ฐ์์จ 'wecode-bootcamp' ๋ผ๋ id ๊ฐ์ ๋ฐ์์ค๊ธฐ ์ํด ์ฌ์ฉํ๋๋ฐ, ํ์คํ id ๋ผ๋๊ฒ์ ์ ์ ์น ์์ nickname ์ผ๋ก ์์ ํ์ต๋๋ค! |
@@ -0,0 +1,80 @@
+import React from 'react';
+import Comment from './Comment';
+import './CommentList.scss';
+
+class CommentList extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ commentInput: '',
+ newComment: [],
+ nickname: '',
+ commentList: [],
+ commentValue: '',
+ };
+ }
+
+ componentDidMount() {
+ fetch('http://localhost:3000/data/commentData.json', {
+ method: 'GET', // GET method๋ ๊ธฐ๋ณธ๊ฐ์ด๋ผ์ ์๋ต์ด ๊ฐ๋ฅํฉ๋๋ค.
+ }) // ์์์ฝ๋์์๋ ์ดํด๋ฅผ ๋๊ธฐ ์ํด ๋ช
์์ ์ผ๋ก ๊ธฐ์
ํด๋์ต๋๋ค.
+ .then(res => res.json())
+ .then(data => {
+ this.setState({
+ commentList: data,
+ });
+ });
+ }
+
+ checkInput = e => {
+ this.setState({
+ commentInput: e.target.value,
+ });
+ };
+
+ inputToComment = () => {
+ const { newComment, commentInput } = this.state;
+ this.setState({
+ nickname: 'wecode_bootcamp',
+ newComment: newComment.concat(commentInput),
+ });
+ };
+
+ enterPress = e => {
+ if (e.key === 'Enter') {
+ this.inputToComment();
+ }
+ e.target.value = '';
+ };
+
+ render() {
+ const { commentValue, commentList } = this.state;
+ return (
+ <div className="commentList">
+ {commentList.map(comment => {
+ return (
+ <Comment
+ key={comment.id}
+ nickname={comment.userName}
+ comment={comment.content}
+ />
+ );
+ })}
+
+ <div className="newText">
+ <input
+ id="typingText"
+ value={commentValue}
+ onChange={this.checkInput}
+ onKeyPress={this.enterPress}
+ type="text"
+ placeholder="๋๊ธ ๋ฌ๊ธฐ...."
+ />
+ <button onClick={this.checkInput}>๊ฒ์</button>
+ </div>
+ </div>
+ );
+ }
+}
+
+export default CommentList; | JavaScript | ์ง์ ์ต๋๋ค! |
@@ -1,13 +1,92 @@
import React from 'react';
+import { withRouter } from 'react-router-dom';
+import './Login.scss';
class LoginAh extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ idInput: '',
+ pwInput: '',
+ };
+ }
+
+ loginTest = () => {
+ fetch('users/login', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({
+ email: this.state.idInput,
+ password: this.state.pwInput,
+ }),
+ })
+ .then(response => response.json())
+ .then(response => {
+ if (response.token) {
+ localStorage.setItem('token', response.token);
+ this.props.history.push('/MainAh');
+ } else {
+ alert('์์ด๋/๋น๋ฐ๋ฒํธ๊ฐ ํ๋ ธ์ต๋๋ค!');
+ }
+ });
+ };
+ handleInput = event => {
+ const { name, value } = event.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ goToMain = () => {
+ this.props.history.push('/MainAh');
+ };
+
render() {
+ const { idInput, pwInput } = this.state;
+ const isButtonActive = idInput.includes('@') && pwInput.length >= 5;
return (
- <div>
- <p>๋ค์ฌ</p>
+ <div className="Login">
+ <div className="container">
+ <div className="loginContainer">
+ <p>westagram</p>
+ <div className="idContainer">
+ <input
+ onChange={this.handleInput}
+ name="idInput"
+ type="text"
+ className="inputId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ />
+ </div>
+ <div className="passwordContainer">
+ <input
+ onChange={this.handleInput}
+ name="pwInput"
+ type="password"
+ className="inputPassword"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ />
+ </div>
+ <button
+ disabled={!isButtonActive}
+ className={`loginButton ${
+ isButtonActive ? 'loginButtonOn' : 'loginButtonOff'
+ }`}
+ // onClick={this.goToMain}
+ onClick={this.loginTest}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ <div>
+ <a href="google.com">๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?</a>
+ </div>
+ </div>
+ </div>
</div>
);
}
}
-export default LoginAh;
+export default withRouter(LoginAh); | JavaScript | ์์ ํ์ต๋๋ค! |
@@ -1,13 +1,92 @@
import React from 'react';
+import { withRouter } from 'react-router-dom';
+import './Login.scss';
class LoginAh extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ idInput: '',
+ pwInput: '',
+ };
+ }
+
+ loginTest = () => {
+ fetch('users/login', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({
+ email: this.state.idInput,
+ password: this.state.pwInput,
+ }),
+ })
+ .then(response => response.json())
+ .then(response => {
+ if (response.token) {
+ localStorage.setItem('token', response.token);
+ this.props.history.push('/MainAh');
+ } else {
+ alert('์์ด๋/๋น๋ฐ๋ฒํธ๊ฐ ํ๋ ธ์ต๋๋ค!');
+ }
+ });
+ };
+ handleInput = event => {
+ const { name, value } = event.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ goToMain = () => {
+ this.props.history.push('/MainAh');
+ };
+
render() {
+ const { idInput, pwInput } = this.state;
+ const isButtonActive = idInput.includes('@') && pwInput.length >= 5;
return (
- <div>
- <p>๋ค์ฌ</p>
+ <div className="Login">
+ <div className="container">
+ <div className="loginContainer">
+ <p>westagram</p>
+ <div className="idContainer">
+ <input
+ onChange={this.handleInput}
+ name="idInput"
+ type="text"
+ className="inputId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ />
+ </div>
+ <div className="passwordContainer">
+ <input
+ onChange={this.handleInput}
+ name="pwInput"
+ type="password"
+ className="inputPassword"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ />
+ </div>
+ <button
+ disabled={!isButtonActive}
+ className={`loginButton ${
+ isButtonActive ? 'loginButtonOn' : 'loginButtonOff'
+ }`}
+ // onClick={this.goToMain}
+ onClick={this.loginTest}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ <div>
+ <a href="google.com">๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?</a>
+ </div>
+ </div>
+ </div>
</div>
);
}
}
-export default LoginAh;
+export default withRouter(LoginAh); | JavaScript | defaultColor๋ ์์ ์ง์ฐ๊ณ ์ผํญ์ฐ์ฐ์๋ฅผ ์ด์ฉํ ํด๊ฒฐ๋ฐฉ๋ฒ์ ๋ฐ์ ์ฃผ์
์ ๊ทธ๊ฑฐ๋ก ์์ ๋ณํ๊น์ง ์ ์ฉํ์์ต๋๋ค. ์ํ๊ฐ ๋ณํ๋ค๊ณ ์๊ฐ๋๋๊ฒ์ ์๊พธ state๋ฅผ ์ด์ฉํ๊ฒ ๋๋๊ฑฐ ๊ฐ์ ๋ ๊ณต๋ถํ๊ฒ ์ต๋๋ค. |
@@ -1,13 +1,92 @@
import React from 'react';
+import { withRouter } from 'react-router-dom';
+import './Login.scss';
class LoginAh extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ idInput: '',
+ pwInput: '',
+ };
+ }
+
+ loginTest = () => {
+ fetch('users/login', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({
+ email: this.state.idInput,
+ password: this.state.pwInput,
+ }),
+ })
+ .then(response => response.json())
+ .then(response => {
+ if (response.token) {
+ localStorage.setItem('token', response.token);
+ this.props.history.push('/MainAh');
+ } else {
+ alert('์์ด๋/๋น๋ฐ๋ฒํธ๊ฐ ํ๋ ธ์ต๋๋ค!');
+ }
+ });
+ };
+ handleInput = event => {
+ const { name, value } = event.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ goToMain = () => {
+ this.props.history.push('/MainAh');
+ };
+
render() {
+ const { idInput, pwInput } = this.state;
+ const isButtonActive = idInput.includes('@') && pwInput.length >= 5;
return (
- <div>
- <p>๋ค์ฌ</p>
+ <div className="Login">
+ <div className="container">
+ <div className="loginContainer">
+ <p>westagram</p>
+ <div className="idContainer">
+ <input
+ onChange={this.handleInput}
+ name="idInput"
+ type="text"
+ className="inputId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ />
+ </div>
+ <div className="passwordContainer">
+ <input
+ onChange={this.handleInput}
+ name="pwInput"
+ type="password"
+ className="inputPassword"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ />
+ </div>
+ <button
+ disabled={!isButtonActive}
+ className={`loginButton ${
+ isButtonActive ? 'loginButtonOn' : 'loginButtonOff'
+ }`}
+ // onClick={this.goToMain}
+ onClick={this.loginTest}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ <div>
+ <a href="google.com">๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?</a>
+ </div>
+ </div>
+ </div>
</div>
);
}
}
-export default LoginAh;
+export default withRouter(LoginAh); | JavaScript | ์์ ํ์ต๋๋ค! |
@@ -1,13 +1,92 @@
import React from 'react';
+import { withRouter } from 'react-router-dom';
+import './Login.scss';
class LoginAh extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ idInput: '',
+ pwInput: '',
+ };
+ }
+
+ loginTest = () => {
+ fetch('users/login', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({
+ email: this.state.idInput,
+ password: this.state.pwInput,
+ }),
+ })
+ .then(response => response.json())
+ .then(response => {
+ if (response.token) {
+ localStorage.setItem('token', response.token);
+ this.props.history.push('/MainAh');
+ } else {
+ alert('์์ด๋/๋น๋ฐ๋ฒํธ๊ฐ ํ๋ ธ์ต๋๋ค!');
+ }
+ });
+ };
+ handleInput = event => {
+ const { name, value } = event.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ goToMain = () => {
+ this.props.history.push('/MainAh');
+ };
+
render() {
+ const { idInput, pwInput } = this.state;
+ const isButtonActive = idInput.includes('@') && pwInput.length >= 5;
return (
- <div>
- <p>๋ค์ฌ</p>
+ <div className="Login">
+ <div className="container">
+ <div className="loginContainer">
+ <p>westagram</p>
+ <div className="idContainer">
+ <input
+ onChange={this.handleInput}
+ name="idInput"
+ type="text"
+ className="inputId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ />
+ </div>
+ <div className="passwordContainer">
+ <input
+ onChange={this.handleInput}
+ name="pwInput"
+ type="password"
+ className="inputPassword"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ />
+ </div>
+ <button
+ disabled={!isButtonActive}
+ className={`loginButton ${
+ isButtonActive ? 'loginButtonOn' : 'loginButtonOff'
+ }`}
+ // onClick={this.goToMain}
+ onClick={this.loginTest}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ <div>
+ <a href="google.com">๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?</a>
+ </div>
+ </div>
+ </div>
</div>
);
}
}
-export default LoginAh;
+export default withRouter(LoginAh); | JavaScript | ํ๋จ์ ์ฃผ์ ํด๊ฒฐ๋ฒ์ผ๋ก ์์ ํ์ต๋๋ค! |
@@ -1,13 +1,92 @@
import React from 'react';
+import { withRouter } from 'react-router-dom';
+import './Login.scss';
class LoginAh extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ idInput: '',
+ pwInput: '',
+ };
+ }
+
+ loginTest = () => {
+ fetch('users/login', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({
+ email: this.state.idInput,
+ password: this.state.pwInput,
+ }),
+ })
+ .then(response => response.json())
+ .then(response => {
+ if (response.token) {
+ localStorage.setItem('token', response.token);
+ this.props.history.push('/MainAh');
+ } else {
+ alert('์์ด๋/๋น๋ฐ๋ฒํธ๊ฐ ํ๋ ธ์ต๋๋ค!');
+ }
+ });
+ };
+ handleInput = event => {
+ const { name, value } = event.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ goToMain = () => {
+ this.props.history.push('/MainAh');
+ };
+
render() {
+ const { idInput, pwInput } = this.state;
+ const isButtonActive = idInput.includes('@') && pwInput.length >= 5;
return (
- <div>
- <p>๋ค์ฌ</p>
+ <div className="Login">
+ <div className="container">
+ <div className="loginContainer">
+ <p>westagram</p>
+ <div className="idContainer">
+ <input
+ onChange={this.handleInput}
+ name="idInput"
+ type="text"
+ className="inputId"
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ />
+ </div>
+ <div className="passwordContainer">
+ <input
+ onChange={this.handleInput}
+ name="pwInput"
+ type="password"
+ className="inputPassword"
+ placeholder="๋น๋ฐ๋ฒํธ"
+ />
+ </div>
+ <button
+ disabled={!isButtonActive}
+ className={`loginButton ${
+ isButtonActive ? 'loginButtonOn' : 'loginButtonOff'
+ }`}
+ // onClick={this.goToMain}
+ onClick={this.loginTest}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ <div>
+ <a href="google.com">๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?</a>
+ </div>
+ </div>
+ </div>
</div>
);
}
}
-export default LoginAh;
+export default withRouter(LoginAh); | JavaScript | ์ ๋ง ๊ฐ์ฌํฉ๋๋ค. ๋ฌด์กฐ๊ฑด constructor ๋จ์์ ๋ณํ์ํค๋ ์ค ์๊ณ ๊ทธ๊ณณ์์๋ง ํด๊ฒฐํ๋ ค๊ณ ํ๋๋ฐ render์์ ๋ณ๊ฒฝํ๋ฉด ๋ ๊ฐ๋จํ๊ฒ ๋๋ ๊ฒ ๊ฐ์ต๋๋ค. inline ์คํ์ผ๋ง ์ง์ํ๊ฒ ์ต๋๋ค!!! |
@@ -0,0 +1,15 @@
+{
+ "arrowParens": "always",
+ "bracketSpacing": true,
+ "jsxBracketSameLine": false,
+ "jsxSingleQuote": false,
+ "printWidth": 80,
+ "proseWrap": "always",
+ "quoteProps": "as-needed",
+ "semi": true,
+ "singleQuote": false,
+ "tabWidth": 2,
+ "trailingComma": "es5",
+ "useTabs": false,
+ "endOfLine": "auto"
+}
\ No newline at end of file | Unknown | EOL์ด ์๋ค์ |
@@ -10,7 +10,17 @@
"@babel/core": "^7.23.0",
"@babel/preset-env": "^7.22.20",
"babel-jest": "^29.7.0",
- "jest": "29.6.0"
+ "eslint": "^8.56.0",
+ "eslint-config-airbnb": "^19.0.4",
+ "eslint-config-prettier": "^9.1.0",
+ "eslint-plugin-import": "^2.29.1",
+ "eslint-plugin-jsx-a11y": "^6.8.0",
+ "eslint-plugin-prettier": "^5.1.3",
+ "eslint-plugin-react": "^7.33.2",
+ "eslint-plugin-react-hooks": "^4.6.0",
+ "husky": "^9.0.7",
+ "jest": "29.6.0",
+ "prettier": "^3.2.4"
},
"scripts": {
"test": "jest" | Unknown | ์ค.. husky๊น์ง |
@@ -0,0 +1,28 @@
+import GameMessage from "./GameMessage.js";
+import { VALID_INPUT_LENGTH } from "./gameConstants.js";
+
+class Validator {
+ static isValidInput(input) {
+ if (!this.isNumber(input))
+ throw new Error(GameMessage.INVALID_INPUT_NOT_A_NUMBER);
+ if (!this.isValidLength(input))
+ throw new Error(GameMessage.INVALID_INPUT_NOT_A_CORRECT_LENGTH);
+ if (!this.isValidLength(input))
+ throw new Error(GameMessage.INVALID_INPUT_IS_DUPLICATED);
+ return true;
+ }
+
+ static isNumber(input) {
+ return !Number.isNaN(input);
+ }
+
+ static isValidLength(input) {
+ return input.length === VALID_INPUT_LENGTH;
+ }
+
+ static isDuplicate(input) {
+ return [...new Set(input)].length === VALID_INPUT_LENGTH;
+ }
+}
+
+export default Validator; | JavaScript | 3์ด๋ผ๋ ์ซ์๋ ์ด๋ค ์๋ฏธ๋ฅผ ๊ฐ์ง๊ณ ์๋ ์ซ์ ๊ฐ์๋ฐ์,
์ด๋ฌํ ์ซ์๊ฐ ์ซ์ ๊ทธ๋๋ก ์กด์ฌํ๋ ๊ฒ์ ํํ ๋งค์ง๋๋ฒ๋ผ๊ณ ๋ถ๋ฆ
๋๋ค.
๋ฐ๋ผ์ ์ด๋ฌํ ์ซ์๋ ๋ค์์ ์ด์ ๋ก ์์ํ ํด์ฃผ๋ ๊ฒ์ด ์ข์ต๋๋ค.
1. ์์๋ก ์ซ์์ผ๊ตฌ ๊ฒ์์ ์ซ์๊ฐฏ์๊ฐ 4๋ก ๋์ด๋ฌ๋ค. ๊ทธ๋ ๋ค๋ฉด ๋ชจ๋ ํ์ผ์ ๋ค์ ธ์ 3์ 4๋ก ๊ณ ์ณ์ผํ๋ค. (๋ณ๊ฒฝ์ ์ฉ์ดํ์ง ์๋ค.)
2. ์ฒ์ ์จ๋ณด๋ฉ ํ๋ ์ฌ๋์ ์ด ์ซ์์ ์๋ฏธ๋ฅผ ํ์
ํ๊ธฐ ํ๋ค๋ค. ์ฝ๋ ๊ฐ๋
์ฑ์ด ์ค์ด๋ ๋ค. |
@@ -0,0 +1,28 @@
+import GameMessage from "./GameMessage.js";
+import { VALID_INPUT_LENGTH } from "./gameConstants.js";
+
+class Validator {
+ static isValidInput(input) {
+ if (!this.isNumber(input))
+ throw new Error(GameMessage.INVALID_INPUT_NOT_A_NUMBER);
+ if (!this.isValidLength(input))
+ throw new Error(GameMessage.INVALID_INPUT_NOT_A_CORRECT_LENGTH);
+ if (!this.isValidLength(input))
+ throw new Error(GameMessage.INVALID_INPUT_IS_DUPLICATED);
+ return true;
+ }
+
+ static isNumber(input) {
+ return !Number.isNaN(input);
+ }
+
+ static isValidLength(input) {
+ return input.length === VALID_INPUT_LENGTH;
+ }
+
+ static isDuplicate(input) {
+ return [...new Set(input)].length === VALID_INPUT_LENGTH;
+ }
+}
+
+export default Validator; | JavaScript | 1. ์ฝ๋๋ฅผ ๋ค์๊ณผ ๊ฐ์ด ๊ณ ์น๋ฉด ๋ ์ค์ด๋ญ๋๋ค ใ
ใ
```suggestion
const newArr = [...new Set(input)]
```
2. newArr์ด๋ผ๋ ์์๋ช
์ด ์ด๋ค ์๋ฏธ๋ฅผ ๋ด๊ณ ์๋ ์ด๋ฆ์ธ๊ฐ์? ์๋ฏธ๊ฐ ์๊ณ , ๋จ๋ฐ์ฑ์ผ๋ก ์ฌ์ฉ๋๋ ์ธก๋ฉด์์
์ด๋ ๊ฒ ์์ฑํด๋ ๋ ๊ฒ ๊ฐ์์.
```js
isDuplicate(input) {
if ([...new Set(input)].length !== 3) throw new Error(GameMessage.INVALID_INPUT_IS_DUPLICATED)
return true;
}
``` |
@@ -0,0 +1,28 @@
+import GameMessage from "./GameMessage.js";
+import { VALID_INPUT_LENGTH } from "./gameConstants.js";
+
+class Validator {
+ static isValidInput(input) {
+ if (!this.isNumber(input))
+ throw new Error(GameMessage.INVALID_INPUT_NOT_A_NUMBER);
+ if (!this.isValidLength(input))
+ throw new Error(GameMessage.INVALID_INPUT_NOT_A_CORRECT_LENGTH);
+ if (!this.isValidLength(input))
+ throw new Error(GameMessage.INVALID_INPUT_IS_DUPLICATED);
+ return true;
+ }
+
+ static isNumber(input) {
+ return !Number.isNaN(input);
+ }
+
+ static isValidLength(input) {
+ return input.length === VALID_INPUT_LENGTH;
+ }
+
+ static isDuplicate(input) {
+ return [...new Set(input)].length === VALID_INPUT_LENGTH;
+ }
+}
+
+export default Validator; | JavaScript | 1. ๊ฐ์ธ์ ์ธ ๊ฒฌํด๋ก๋ ๊ฒ์ฆํจ์์์๋ ํด๋น input์ด ์ ํจํ์ง/์ํ์ง(boolean) ํ๊ฐํ ๋ค์,
์ด ๊ฒฐ๊ณผ์ ๋ฐ๋ผ ์๋ฌ๋ฅผ ๋์ ธ์ฃผ๋ ํจํด์ ์ ํธํฉ๋๋ค.
๋ค์ ๋งํ๋ฉด ์๋ฌ๋ฅผ ๋์ ธ์ฃผ๋ ๋ถ๋ถ์ ์ด ํจ์(is..)๋ฅผ ํธ์ถํ๋ ๋ถ๋ถ์ผ๋ก ๋๊ธฐ๋ ๋ฐฉ์์ผ๋ก ํ๊ณคํฉ๋๋ค
2. ์ด๊ฒ static method๊ฐ ์๋ method์ผ ์ด์ ๊ฐ ์๋์? |
@@ -0,0 +1,28 @@
+import GameMessage from "./GameMessage.js";
+import { VALID_INPUT_LENGTH } from "./gameConstants.js";
+
+class Validator {
+ static isValidInput(input) {
+ if (!this.isNumber(input))
+ throw new Error(GameMessage.INVALID_INPUT_NOT_A_NUMBER);
+ if (!this.isValidLength(input))
+ throw new Error(GameMessage.INVALID_INPUT_NOT_A_CORRECT_LENGTH);
+ if (!this.isValidLength(input))
+ throw new Error(GameMessage.INVALID_INPUT_IS_DUPLICATED);
+ return true;
+ }
+
+ static isNumber(input) {
+ return !Number.isNaN(input);
+ }
+
+ static isValidLength(input) {
+ return input.length === VALID_INPUT_LENGTH;
+ }
+
+ static isDuplicate(input) {
+ return [...new Set(input)].length === VALID_INPUT_LENGTH;
+ }
+}
+
+export default Validator; | JavaScript | ํ์์๋ ์ฃผ์์ ์ง์ฐ๋ฉด ์ข๊ฒ ์ต๋๋ค ! |
@@ -0,0 +1,28 @@
+import GameMessage from "./GameMessage.js";
+import { VALID_INPUT_LENGTH } from "./gameConstants.js";
+
+class Validator {
+ static isValidInput(input) {
+ if (!this.isNumber(input))
+ throw new Error(GameMessage.INVALID_INPUT_NOT_A_NUMBER);
+ if (!this.isValidLength(input))
+ throw new Error(GameMessage.INVALID_INPUT_NOT_A_CORRECT_LENGTH);
+ if (!this.isValidLength(input))
+ throw new Error(GameMessage.INVALID_INPUT_IS_DUPLICATED);
+ return true;
+ }
+
+ static isNumber(input) {
+ return !Number.isNaN(input);
+ }
+
+ static isValidLength(input) {
+ return input.length === VALID_INPUT_LENGTH;
+ }
+
+ static isDuplicate(input) {
+ return [...new Set(input)].length === VALID_INPUT_LENGTH;
+ }
+}
+
+export default Validator; | JavaScript | boolean์ ๋ฆฌํดํ ๋๋ ๋ฉ์๋์ prefix์ is, has๋ฅผ ๋ถ์ฌ์ฃผ๋ ๊ฒ์ด ๊ด๋ก์
๋๋คใ
_ใ
|
@@ -0,0 +1,49 @@
+import { Random } from "@woowacourse/mission-utils";
+import {
+ VALID_INPUT_LENGTH,
+ MIN_RANDOM_NUMBER,
+ MAX_RANDOM_NUMBER,
+} from "./gameConstants.js";
+
+class Computer {
+ #solution;
+
+ seeSolution() {
+ return this.#solution;
+ }
+
+ makeSolution() {
+ const computer = [];
+ while (computer.length < VALID_INPUT_LENGTH) {
+ const number = Random.pickNumberInRange(
+ MIN_RANDOM_NUMBER,
+ MAX_RANDOM_NUMBER
+ );
+ if (!computer.includes(number)) {
+ computer.push(number);
+ }
+ }
+ this.#solution = computer;
+ }
+
+ assessUserInput(input) {
+ let strike = 0;
+ let ball = 0;
+ const userInput = input.split("").map(Number);
+ userInput.forEach((item, index) => {
+ if (
+ this.#solution.indexOf(item) === index &&
+ this.#solution.includes(item)
+ )
+ strike += 1;
+ else if (
+ this.#solution.indexOf(item) !== index &&
+ this.#solution.includes(item)
+ )
+ ball += 1;
+ });
+ return { strike, ball };
+ }
+}
+
+export default Computer; | JavaScript | ์ด๋ค ๊ตฌ๋ฌธ์๋ ์ธ๋ฏธ์ฝ๋ก ์ด ์๊ณ , ์ด๋ค ๊ตฌ๋ฌธ์๋ ์ธ๋ฏธ์ฝ๋ก ์ด ์์ง ์๋ค์.
๋ ์ค ํ๋๋ง ํ์๋ ๊ฑธ ์ถ์ฒ๋๋ฆฌ๊ณ , ๊ฐ์ ํ๊ณ ์ถ๋ค๋ฉด prettier๋ฑ์ ์ด์ฉํด๋ณด์ธ์. |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.