code stringlengths 41 34.3k | lang stringclasses 8
values | review stringlengths 1 4.74k |
|---|---|---|
@@ -19,41 +19,56 @@ export default class Repo {
}) {
this.id = id;
this.name = name;
- this.full_name = full_name;
+ this.fullName = full_name;
this.owner = owner;
- this.html_url = html_url;
+ this.htmlUrl = html_url;
this.description = description;
- this.stargazers_count = stargazers_count;
- this.watchers_count = watchers_count;
- this.forks_count = forks_count;
+ this.stargazersCount = stargazers_count;
+ this.watchersCount = watchers_count;
+ this.forksCount = forks_count;
this.forks = forks;
- this.created_at = created_at;
- this.updated_at = updated_at;
- this.clone_url = clone_url;
+ this.createdAt = created_at;
+ this.updatedAt = updated_at;
+ this.cloneUrl = clone_url;
this.language = language;
this.watchers = watchers;
this.visibility = visibility;
}
render() {
return `
- <div class="col-12 col-sm-6 mb-4" id="repo-${this.id}">
+ <div class="col-12 col-sm-6 mb-4 px-2" id="repo-${this.id}">
<div class="card border-secondary h-100" >
- <div class="card-body">
- <div class="d-flex align-items-center flex-wrap">
- <h5 class="mb-2 mr-2">
- ${this.name}
- </h5>
- <span class="mb-2 badge bg-light">
+ <div class="card-body d-flex flex-column justify-content-between">
+ <div class="d-flex align-items-center flex-wrap" >
+ <a class="text-info d-flex align-items-center flex-wrap mb-2 mr-2" href="${
+ this.htmlUrl
+ }" target="_blank">
+ <h5>
+ ${this.name}
+ </h5>
+ </a>
+ <span class="mb-2 badge bg-light mr-2">
${this.visibility}
</span>
+ <span class="mb-2 d-flex align-items-center">
+ <img alt="๋ ํฌ์งํ ๋ฆฌ ์คํ ์์ด์ฝ" src="${
+ this.stargazersCount > 0 ? "star_filled.svg" : "star.svg"
+ }" height="16"/>
+ ${this.stargazersCount}
+ </span>
</div>
<p class="card-text">${this.description ?? ""}</p>
<div>
- <span class="text-secondary">
+ <span class="text-secondary mr-2">
${this.language ?? ""}
</span>
+ <span class="text-secondary mr-2">
+ <img src="fork.svg" alt="ํฌํฌ ์์ด์ฝ" height="18"/>
+ ${this.forks}
+ </span>
<span class="text-secondary">
- ${this.forks > 0 ? this.forks : ""}
+ <img src="watch.svg" alt="์์น ์์ด์ฝ" height="18"/>
+ ${this.watchersCount}
</span>
</div>
</div> | JavaScript | ๊ทธ ๋ถ๋ถ์ ์ ๊ฒฝ์ฐ์ง ๋ชปํ๋ค์!
ํ๊ตญ ์๋น์ค์์๋ alt๋ ํ๊ธ๋ก ์ ์ด์ฃผ๋๊ฒ ๋ ๋์๊น์? |
@@ -1,83 +1,112 @@
import GithubApiController from "@controllers/githubController";
import User from "@models/User";
+import {
+ NO_SEARCH_RESULT_TEMPLATE,
+ SEARCH_LOADING_TEMPLATE,
+ getReposTemplate,
+ NO_REPOS_TEMPLATE,
+} from "@templates/search";
+import { SPINNER_TEMPLATE } from "@templates/spinner";
+import { NUMBER_OF_REPOS } from "@constants/search";
const searchResultContainer = document.body.querySelector(".search-result");
export default class SearchController {
- constructor(inputEl, submitEl) {
+ constructor(inputEl, submitEl, historyController) {
this.inputEl = inputEl;
this.submitEl = submitEl;
this.fetcher = new GithubApiController();
+ this.historyController = historyController;
this.init();
}
init() {
this.inputEl.addEventListener("keypress", (event) => {
- if (event.code === 'Enter') {
+ if (event.code === "Enter") {
this.search(this.inputEl.value);
}
});
this.submitEl.addEventListener("click", () => {
this.search(this.inputEl.value);
});
+
+ this.historyController.historyContainer.addEventListener(
+ "click",
+ (event) => {
+ if (
+ event.target.classList.contains("list-group-item") &&
+ !event.target.classList.contains("button__delete")
+ ) {
+ const [searchValue] = event.target.textContent.trim().split("\n");
+ this.search(searchValue);
+ }
+ }
+ );
}
async search(searchValue) {
const renderUser = (user) => {
const userResult = searchResultContainer.querySelector("#user-result");
userResult.id = user.id;
- userResult.innerHTML = user.render();
+ user.render(userResult);
};
-
- const renderRepos = (repos) => {
+ const renderNoUserInfo = () => {
+ const userResult = searchResultContainer.querySelector("#user-result");
+ userResult.innerHTML = NO_SEARCH_RESULT_TEMPLATE;
+ };
+ const createRepoResultContainerEl = () => {
const repoResult = document.createElement("div");
- repoResult.id = "#repos-result";
+ repoResult.id = "repo-result";
repoResult.className = "bs-component";
+ return repoResult;
+ };
+ const renderRepos = (repos, numberOfRepos) => {
+ const repoResult = createRepoResultContainerEl();
+ repoResult.innerHTML = getReposTemplate(repos, numberOfRepos);
- repoResult.innerHTML = `
- <div class="container">
- <div class="row">
- ${repos
- .slice(0, 5)
- .map((repo) => repo.render())
- .join("\n")}
- </div>
- </div>
- `;
searchResultContainer.appendChild(repoResult);
};
+ const renderNoRepos = () => {
+ const repoResult = createRepoResultContainerEl();
+ repoResult.innerHTML = NO_REPOS_TEMPLATE;
+
+ searchResultContainer.appendChild(repoResult);
+ };
+ const createLoadingElement = () => {
+ const element = document.createElement("div");
+ element.className = "card-body d-flex align-items-center";
+ element.innerHTML = SPINNER_TEMPLATE;
+ return element;
+ };
const trimmedValue = searchValue.trim();
if (!trimmedValue) {
alert("๊ฒ์์ด๋ฅผ ์
๋ ฅํด์ฃผ์ธ์");
return;
}
-
- searchResultContainer.innerHTML = `
- <div class="card my-3">
- <h4 class="card-header">๊ฒ์๊ฒฐ๊ณผ</h4>
- <div id="user-result" class="card-body d-flex align-items-center">
- <p class="text-center container-fluid">
- ๊ฒ์์ค
- </p>
- </div>
- </div>
- `;
+ this.historyController.addHistory(trimmedValue);
+ searchResultContainer.innerHTML = SEARCH_LOADING_TEMPLATE;
const userInfo = await this.fetcher.getUser(trimmedValue);
if (!userInfo) {
- const userResult = searchResultContainer.querySelector("#user-result");
- userResult.innerHTML = `
- <p class="text-center container-fluid">
- ๊ฒ์ ๊ฒฐ๊ณผ๊ฐ ์์ต๋๋ค.
- </p>
- `;
+ renderNoUserInfo();
return;
}
const user = new User(userInfo);
renderUser(user);
- user.setRepos(await this.fetcher.getRepos(user));
- renderRepos(user.repos);
+ const loadingEl = createLoadingElement();
+
+ searchResultContainer.appendChild(loadingEl);
+ const repos = await this.fetcher.getRepos(user);
+ searchResultContainer.removeChild(loadingEl);
+
+ if (repos.length === 0) {
+ renderNoRepos();
+ return;
+ }
+
+ user.setRepos(repos);
+ renderRepos(user.repos, NUMBER_OF_REPOS);
}
} | JavaScript | ๊ธฐ์กด vs ์๋ก ์์ฑ์ ๋ค๋ฅธ ๊ฒฝ์ฐ๋๊น create๊ฐ ๋ ๋ช
ํํ๊ฒ ๋ค์ :) |
@@ -0,0 +1,65 @@
+import History from "@models/History";
+import {
+ getHistoryItemTemplate,
+ NO_HISTORY_TEMPLATE,
+} from "@templates/history";
+
+export default class HistoryController {
+ constructor(historyContainer) {
+ this.historyContainer = historyContainer;
+ this.numberOfHistory = 0;
+ this._init();
+ }
+ _init() {
+ this._initEvent();
+ this._initHistory();
+ }
+ _initEvent() {
+ this.historyContainer.addEventListener("click", (event) => {
+ if (event.target.classList.contains("button__delete")) {
+ const toDeleteEl = event.target.parentElement;
+ this.deleteHistory(toDeleteEl);
+ }
+ });
+ }
+ _initHistory() {
+ const history = History.getAll();
+ this.numberOfHistory = history.length;
+
+ if (this.numberOfHistory === 0) {
+ this.historyContainer.innerHTML = NO_HISTORY_TEMPLATE;
+ return;
+ }
+
+ const historyTemplates = history
+ .map(({ value, id }) => getHistoryItemTemplate(value, id))
+ .join("");
+ this.historyContainer.innerHTML = historyTemplates;
+ }
+ addHistory(searchValue) {
+ const historyId = History.add(searchValue);
+ if (!historyId) {
+ return;
+ }
+
+ const listItemEl = getHistoryItemTemplate(searchValue, historyId);
+
+ this.numberOfHistory++;
+ if (this.numberOfHistory === 1) {
+ this.historyContainer.innerHTML = listItemEl;
+ return;
+ }
+
+ this.historyContainer.insertAdjacentHTML("beforeend", listItemEl);
+ }
+ deleteHistory(historyEl) {
+ const id = historyEl.id;
+ this.historyContainer.removeChild(historyEl);
+ History.delete(id);
+ this.numberOfHistory--;
+
+ if (this.numberOfHistory === 0) {
+ this.historyContainer.innerHTML = NO_HISTORY_TEMPLATE;
+ }
+ }
+} | JavaScript | ๊ฐ๊ฒฐํ ๋ฒ์ ๋ ๊ด์ฐฎ๊ตฐ์ ใ
ใ
|
@@ -1,11 +1,13 @@
import Repo from "@models/Repo";
+import { getDateDiff } from "@utils/dateUtils";
export default class User {
constructor({
id,
avatar_url,
created_at,
email,
+ bio,
followers,
following,
login,
@@ -22,57 +24,114 @@ export default class User {
this.id = id;
this.avartar = avatar_url;
this.name = name;
+ this.bio = bio;
this.followers = followers;
this.following = following;
this.loginId = login;
this.email = email;
- this.public_repos = public_repos;
- this.public_gists = public_gists;
- this.created_at = created_at;
- this.html_url = html_url;
+ this.publicRepos = public_repos;
+ this.publicGists = public_gists;
+ this.createdAt = created_at;
+ this.htmlUrl = html_url;
this.organizations_url = organizations_url;
- this.starred_url = starred_url;
+ this.starredUrl = starred_url;
this.subscriptions_url = subscriptions_url;
- this.repos_url = repos_url;
- this.updated_at = updated_at;
+ this.reposUrl = repos_url;
+ this.updatedAt = updated_at;
this.repos = [];
}
- render() {
+ _getCreatedDateInfo() {
+ const today = new Date();
+ const createdDate = new Date(this.createdAt);
+ const monthDiff = getDateDiff(today, createdDate, "month");
+
+ if (monthDiff === 0) {
+ const dayDiff = getDateDiff(today, createdDate, "day");
+ return `${dayDiff}์ผ ์ `;
+ }
+
+ const year = Math.floor(monthDiff / 12);
+ const month = monthDiff % 12;
+ if (year === 0) {
+ return `${month}๊ฐ์ ์ `;
+ }
+ if (month === 0) {
+ return `${year}๋
์ `;
+ }
+
+ return `${year}๋
${month}๊ฐ์ ์ `;
+ }
+ setEvent() {
+ const activityChart = document.body.querySelector("#activity-chart");
+ activityChart.onerror = (event) => {
+ event.target.style.setProperty("display", "none");
+ event.target.parentElement.insertAdjacentHTML(
+ "beforeend",
+ '<div class="activity-error ml-4">No Activity Chart</div>'
+ );
+ };
+ }
+ template() {
return `
- <div>
- <img
- src="${this.avartar}"
- alt="${this.name} ํ๋กํ์ฌ์ง"
- width="90"
- class="mr-3 rounded-circle"
- />
+ <div class="w-100 flex-lg-row flex-column d-flex align-items-center justify-content-center">
+ <div class="d-flex align-items-center justify-content-center">
+ <img
+ src="${this.avartar}"
+ alt="${this.name} ํ๋กํ์ฌ์ง"
+ width="200"
+ class="mr-xl-3 mb-3 mb-xl-0 rounded-circle"
+ />
+ </div>
+ <div class="w-100 d-flex flex-column align-items-lg-start align-items-center">
+ <div class="px-4 text-lg-left text-center">
+ <a class="text-primary" href="${this.htmlUrl}" target="_blank">
+ <h5 class="card-title">${this.loginId} </h5>
+ </a>
+ <div class="d-flex align-items-end">
+ <h6 class="card-subtitle m-0">${this.name ?? ""}</h6>
+ <span class="card-text text-muted ml-2 font-size-xs">${this._getCreatedDateInfo()}</span>
</div>
- <div>
- <h5 class="card-title">${this.name} </h5>
- <h6 class="card-subtitle text-muted">${this.loginId}</h6>
- <div class="card-body p-0 mt-2">
- <a
- href="https://github.com/dmstmdrbs?tab=followers"
- target="_blank"
- class="card-link badge bg-success text-white"
- >Followers ${this.followers}๋ช
</a
- >
- <a
- href="https://github.com/dmstmdrbs?tab=following"
- target="_blank"
- class="card-link badge bg-success text-white ml-2"
- >Following ${this.following}๋ช
</a
- >
- <a
- href="https://github.com/dmstmdrbs?tab=repositories"
- target="_blank"
- class="card-link badge bg-info text-white ml-2"
- >Repos ${this.public_repos}๊ฐ</a
- >
- <span class="badge bg-secondary text-white ml-2">Gists ${this.public_gists}๊ฐ</span>
- </div>
- </div>
- `;
+ <p class="m-0 mt-2">${this.bio ?? ""}</p>
+ </div>
+ <div class="card-body py-1 ml-1 mb-2">
+ <a
+ href="https://github.com/${this.loginId}?tab=followers"
+ target="_blank"
+ class="card-link badge bg-success text-white"
+ >Followers ${this.followers}๋ช
</a
+ >
+ <a
+ href="https://github.com/${this.loginId}?tab=following"
+ target="_blank"
+ class="card-link badge bg-success text-white ml-2"
+ >Following ${this.following}๋ช
</a
+ >
+ <a
+ href="https://github.com/${this.loginId}?tab=repositories"
+ target="_blank"
+ class="card-link badge bg-info text-white ml-2"
+ >Repos ${this.publicRepos}๊ฐ
+ </a>
+ <span class="badge bg-secondary text-white ml-2">
+ Gists ${this.publicGists}๊ฐ
+ </span>
+ </div>
+ <div class="w-100">
+ <img
+ id="activity-chart"
+ class="w-100"
+ style="max-width: 663px;"
+ src="https://ghchart.rshah.org/${this.loginId}"
+ alt="๊นํ๋ธ ํ๋ ์ฐจํธ"
+ />
+ </div>
+ </div>
+ </div>
+ `;
+ }
+ render(container) {
+ container.innerHTML = this.template();
+ this.setEvent();
}
setRepos(repos) {
this.repos = repos | JavaScript | ๊ฐ์ฒด ํ๋กํผํฐ๋ฅผ ๋ณต์ฌํด์ค๋ ๊ณผ์ ์์ ๋ค๋ฅธ ๋ถ๋ถ์ ์ ๊ฒฝ์ ์ฐ์ง ๋ชปํ๋ค์...! ํต์ผ ์์ผ๋ณด๊ฒ ์ต๋๋ค |
@@ -19,41 +19,56 @@ export default class Repo {
}) {
this.id = id;
this.name = name;
- this.full_name = full_name;
+ this.fullName = full_name;
this.owner = owner;
- this.html_url = html_url;
+ this.htmlUrl = html_url;
this.description = description;
- this.stargazers_count = stargazers_count;
- this.watchers_count = watchers_count;
- this.forks_count = forks_count;
+ this.stargazersCount = stargazers_count;
+ this.watchersCount = watchers_count;
+ this.forksCount = forks_count;
this.forks = forks;
- this.created_at = created_at;
- this.updated_at = updated_at;
- this.clone_url = clone_url;
+ this.createdAt = created_at;
+ this.updatedAt = updated_at;
+ this.cloneUrl = clone_url;
this.language = language;
this.watchers = watchers;
this.visibility = visibility;
}
render() {
return `
- <div class="col-12 col-sm-6 mb-4" id="repo-${this.id}">
+ <div class="col-12 col-sm-6 mb-4 px-2" id="repo-${this.id}">
<div class="card border-secondary h-100" >
- <div class="card-body">
- <div class="d-flex align-items-center flex-wrap">
- <h5 class="mb-2 mr-2">
- ${this.name}
- </h5>
- <span class="mb-2 badge bg-light">
+ <div class="card-body d-flex flex-column justify-content-between">
+ <div class="d-flex align-items-center flex-wrap" >
+ <a class="text-info d-flex align-items-center flex-wrap mb-2 mr-2" href="${
+ this.htmlUrl
+ }" target="_blank">
+ <h5>
+ ${this.name}
+ </h5>
+ </a>
+ <span class="mb-2 badge bg-light mr-2">
${this.visibility}
</span>
+ <span class="mb-2 d-flex align-items-center">
+ <img alt="๋ ํฌ์งํ ๋ฆฌ ์คํ ์์ด์ฝ" src="${
+ this.stargazersCount > 0 ? "star_filled.svg" : "star.svg"
+ }" height="16"/>
+ ${this.stargazersCount}
+ </span>
</div>
<p class="card-text">${this.description ?? ""}</p>
<div>
- <span class="text-secondary">
+ <span class="text-secondary mr-2">
${this.language ?? ""}
</span>
+ <span class="text-secondary mr-2">
+ <img src="fork.svg" alt="ํฌํฌ ์์ด์ฝ" height="18"/>
+ ${this.forks}
+ </span>
<span class="text-secondary">
- ${this.forks > 0 ? this.forks : ""}
+ <img src="watch.svg" alt="์์น ์์ด์ฝ" height="18"/>
+ ${this.watchersCount}
</span>
</div>
</div> | JavaScript | ๋ต~ ์ ๊ฐ ์ง๊ธ ์งํํ๊ณ ์๋ ํ๋ก์ ํธ์ ๊ฒฝ์ฐ ๋ค ํ๊ธ๋ก alt ์ ์ด์ฃผ๊ณ ์์ต๋๋ค! |
@@ -19,41 +19,56 @@ export default class Repo {
}) {
this.id = id;
this.name = name;
- this.full_name = full_name;
+ this.fullName = full_name;
this.owner = owner;
- this.html_url = html_url;
+ this.htmlUrl = html_url;
this.description = description;
- this.stargazers_count = stargazers_count;
- this.watchers_count = watchers_count;
- this.forks_count = forks_count;
+ this.stargazersCount = stargazers_count;
+ this.watchersCount = watchers_count;
+ this.forksCount = forks_count;
this.forks = forks;
- this.created_at = created_at;
- this.updated_at = updated_at;
- this.clone_url = clone_url;
+ this.createdAt = created_at;
+ this.updatedAt = updated_at;
+ this.cloneUrl = clone_url;
this.language = language;
this.watchers = watchers;
this.visibility = visibility;
}
render() {
return `
- <div class="col-12 col-sm-6 mb-4" id="repo-${this.id}">
+ <div class="col-12 col-sm-6 mb-4 px-2" id="repo-${this.id}">
<div class="card border-secondary h-100" >
- <div class="card-body">
- <div class="d-flex align-items-center flex-wrap">
- <h5 class="mb-2 mr-2">
- ${this.name}
- </h5>
- <span class="mb-2 badge bg-light">
+ <div class="card-body d-flex flex-column justify-content-between">
+ <div class="d-flex align-items-center flex-wrap" >
+ <a class="text-info d-flex align-items-center flex-wrap mb-2 mr-2" href="${
+ this.htmlUrl
+ }" target="_blank">
+ <h5>
+ ${this.name}
+ </h5>
+ </a>
+ <span class="mb-2 badge bg-light mr-2">
${this.visibility}
</span>
+ <span class="mb-2 d-flex align-items-center">
+ <img alt="๋ ํฌ์งํ ๋ฆฌ ์คํ ์์ด์ฝ" src="${
+ this.stargazersCount > 0 ? "star_filled.svg" : "star.svg"
+ }" height="16"/>
+ ${this.stargazersCount}
+ </span>
</div>
<p class="card-text">${this.description ?? ""}</p>
<div>
- <span class="text-secondary">
+ <span class="text-secondary mr-2">
${this.language ?? ""}
</span>
+ <span class="text-secondary mr-2">
+ <img src="fork.svg" alt="ํฌํฌ ์์ด์ฝ" height="18"/>
+ ${this.forks}
+ </span>
<span class="text-secondary">
- ${this.forks > 0 ? this.forks : ""}
+ <img src="watch.svg" alt="์์น ์์ด์ฝ" height="18"/>
+ ${this.watchersCount}
</span>
</div>
</div> | JavaScript | ์ํ! ์ฐธ๊ณ ํด์ ์งํํด๋ณด๋๋ก ํ๊ฒ ์ต๋๋ค~ |
@@ -1,70 +1,10 @@
-# Getting Started with Create React App
+# React Westagram 3ํ
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+instagram์ ๋ชจํฐ๋ธ๋ก ํ ํด๋ก ํ ํ๋ก์ ํธ
-## Available Scripts
+# ํ์
-In the project directory, you can run:
-
-### `npm start`
-
-Runs the app in the development mode.\
-Open [http://localhost:3000](http://localhost:3000) to view it in your browser.
-
-The page will reload when you make changes.\
-You may also see any lint errors in the console.
-
-### `npm test`
-
-Launches the test runner in the interactive watch mode.\
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `npm run build`
-
-Builds the app for production to the `build` folder.\
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.\
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `npm run eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can't go back!**
-
-If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.
-
-You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
-
-### Code Splitting
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
-
-### Analyzing the Bundle Size
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
-
-### Making a Progressive Web App
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
-
-### Advanced Configuration
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
-
-### Deployment
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
-
-### `npm run build` fails to minify
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
+- ์ ๋ค์ธ
+- ๋ค๋
+- ์ด์งํ
+- ํ์ง์ | Unknown | ๐ README.md ํ์ผ ์์ ํด์ฃผ์
์ ๊ฐ์ฌํฉ๋๋ค ^^ |
@@ -0,0 +1,61 @@
+import React, { useState, useEffect } from "react";
+import { useNavigate } from "react-router-dom";
+import "./Login.scss";
+
+const Login = () => {
+ const navigate = useNavigate();
+ const [showErrorMessage, setShowErrorMessage] = useState(false);
+
+ const [userInfo, setUserInfo] = useState({
+ userId: "",
+ userPw: "",
+ });
+
+ const isActive = userInfo.userPw.length >= 5 && userInfo.userId.includes("@");
+
+ useEffect(() => {}, [userInfo, showErrorMessage]);
+
+ const handleInput = (event) => {
+ const { value, id } = event.target;
+ setUserInfo({ ...userInfo, [id]: value });
+ };
+
+ const goToMain = () => {
+ if (isActive) {
+ navigate("/jisun-main");
+ } else {
+ setShowErrorMessage(true);
+ }
+ };
+
+ return (
+ <div className="login">
+ <div className="box">
+ <h1>Westagram</h1>
+ <input
+ type="text"
+ id="userId"
+ onChange={handleInput}
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ />
+ <input type="password" id="userPw" onChange={handleInput} placeholder="๋น๋ฐ๋ฒํธ" />
+ <button
+ className="btnLogin"
+ onClick={goToMain}
+ style={{ backgroundColor: isActive ? "#2d94ef" : "#67b5fa" }}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ <span>๋๋</span>
+ <button className="btnFacebook">Facebook์ผ๋ก ๋ก๊ทธ์ธ</button>
+ {showErrorMessage && <p className="err">์๋ชป๋ ๋น๋ฐ๋ฒํธ์
๋๋ค. ๋ค์ ํ์ธํ์ธ์.</p>}
+ <button className="findPassword">๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?</button>
+ </div>
+ <div className="box">
+ ๊ณ์ ์ด ์์ผ์ ๊ฐ์? <a href="/signup">๊ฐ์
ํ๊ธฐ</a>
+ </div>
+ </div>
+ );
+};
+
+export default Login; | Unknown | ๋ ์ด์ ์ฌ์ฉํ์ง ์๋ ๋ถํ์ํ ์ฝ๋์ ๋ํ ์ฃผ์์ ๊ผญ ์ญ์ ํด์ฃผ์ธ์ |
@@ -0,0 +1,61 @@
+import React, { useState, useEffect } from "react";
+import { useNavigate } from "react-router-dom";
+import "./Login.scss";
+
+const Login = () => {
+ const navigate = useNavigate();
+ const [showErrorMessage, setShowErrorMessage] = useState(false);
+
+ const [userInfo, setUserInfo] = useState({
+ userId: "",
+ userPw: "",
+ });
+
+ const isActive = userInfo.userPw.length >= 5 && userInfo.userId.includes("@");
+
+ useEffect(() => {}, [userInfo, showErrorMessage]);
+
+ const handleInput = (event) => {
+ const { value, id } = event.target;
+ setUserInfo({ ...userInfo, [id]: value });
+ };
+
+ const goToMain = () => {
+ if (isActive) {
+ navigate("/jisun-main");
+ } else {
+ setShowErrorMessage(true);
+ }
+ };
+
+ return (
+ <div className="login">
+ <div className="box">
+ <h1>Westagram</h1>
+ <input
+ type="text"
+ id="userId"
+ onChange={handleInput}
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ />
+ <input type="password" id="userPw" onChange={handleInput} placeholder="๋น๋ฐ๋ฒํธ" />
+ <button
+ className="btnLogin"
+ onClick={goToMain}
+ style={{ backgroundColor: isActive ? "#2d94ef" : "#67b5fa" }}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ <span>๋๋</span>
+ <button className="btnFacebook">Facebook์ผ๋ก ๋ก๊ทธ์ธ</button>
+ {showErrorMessage && <p className="err">์๋ชป๋ ๋น๋ฐ๋ฒํธ์
๋๋ค. ๋ค์ ํ์ธํ์ธ์.</p>}
+ <button className="findPassword">๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?</button>
+ </div>
+ <div className="box">
+ ๊ณ์ ์ด ์์ผ์ ๊ฐ์? <a href="/signup">๊ฐ์
ํ๊ธฐ</a>
+ </div>
+ </div>
+ );
+};
+
+export default Login; | Unknown | ์ฝ์๋ ๋ง์ฐฌ๊ฐ์ง์
๋๋ค ํ
์คํธ๊ฐ ๋๋ ์ฝ๋๋ ํญ์ ์ง์์ฃผ์ธ์!
์๋์ ๋จ์์๋ ๋ชจ๋ ์ฝ์์ ์ญ์ ํด์ฃผ์ธ์ |
@@ -0,0 +1,61 @@
+import React, { useState, useEffect } from "react";
+import { useNavigate } from "react-router-dom";
+import "./Login.scss";
+
+const Login = () => {
+ const navigate = useNavigate();
+ const [showErrorMessage, setShowErrorMessage] = useState(false);
+
+ const [userInfo, setUserInfo] = useState({
+ userId: "",
+ userPw: "",
+ });
+
+ const isActive = userInfo.userPw.length >= 5 && userInfo.userId.includes("@");
+
+ useEffect(() => {}, [userInfo, showErrorMessage]);
+
+ const handleInput = (event) => {
+ const { value, id } = event.target;
+ setUserInfo({ ...userInfo, [id]: value });
+ };
+
+ const goToMain = () => {
+ if (isActive) {
+ navigate("/jisun-main");
+ } else {
+ setShowErrorMessage(true);
+ }
+ };
+
+ return (
+ <div className="login">
+ <div className="box">
+ <h1>Westagram</h1>
+ <input
+ type="text"
+ id="userId"
+ onChange={handleInput}
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ />
+ <input type="password" id="userPw" onChange={handleInput} placeholder="๋น๋ฐ๋ฒํธ" />
+ <button
+ className="btnLogin"
+ onClick={goToMain}
+ style={{ backgroundColor: isActive ? "#2d94ef" : "#67b5fa" }}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ <span>๋๋</span>
+ <button className="btnFacebook">Facebook์ผ๋ก ๋ก๊ทธ์ธ</button>
+ {showErrorMessage && <p className="err">์๋ชป๋ ๋น๋ฐ๋ฒํธ์
๋๋ค. ๋ค์ ํ์ธํ์ธ์.</p>}
+ <button className="findPassword">๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?</button>
+ </div>
+ <div className="box">
+ ๊ณ์ ์ด ์์ผ์ ๊ฐ์? <a href="/signup">๊ฐ์
ํ๊ธฐ</a>
+ </div>
+ </div>
+ );
+};
+
+export default Login; | Unknown | ๐ useEffect ๊น์ง ํ์ฉํด๋ณด์
จ๊ตฐ์!
condition ๋ณ์๊ฐ userInfo๋ผ๋ state๋ฅผ ์ด๋ฏธ ์ฐธ์กฐํ ๊ฐ์ด๊ธฐ๋๋ฌธ์ isActive๋ผ๋ ๊ฐ์ ๋ฐ๋ก state๋ก ๊ด๋ฆฌํ์ง์์๋
condition ๋ณ์๊ฐ ์ฐธ์กฐํ๊ณ ์๋ ๊ฐ์ด ์ด๋ฏธ state๋ผ์ state๋ณํ์ ๋ฐ๋ผ ์ฆ๊ฐ์ ์ผ๋ก ๋ค๋ฅธ ๊ฐ์ ๊ฐ์ง ์ ์์ต๋๋ค.
isActive๋ฅผ state๊ฐ ์๋ ์ผ๋ฐ๋ณ์๋ก ๊ด๋ฆฌํด๋ณด์๋๊ฒ ์ด๋จ๊น์? |
@@ -0,0 +1,61 @@
+import React, { useState, useEffect } from "react";
+import { useNavigate } from "react-router-dom";
+import "./Login.scss";
+
+const Login = () => {
+ const navigate = useNavigate();
+ const [showErrorMessage, setShowErrorMessage] = useState(false);
+
+ const [userInfo, setUserInfo] = useState({
+ userId: "",
+ userPw: "",
+ });
+
+ const isActive = userInfo.userPw.length >= 5 && userInfo.userId.includes("@");
+
+ useEffect(() => {}, [userInfo, showErrorMessage]);
+
+ const handleInput = (event) => {
+ const { value, id } = event.target;
+ setUserInfo({ ...userInfo, [id]: value });
+ };
+
+ const goToMain = () => {
+ if (isActive) {
+ navigate("/jisun-main");
+ } else {
+ setShowErrorMessage(true);
+ }
+ };
+
+ return (
+ <div className="login">
+ <div className="box">
+ <h1>Westagram</h1>
+ <input
+ type="text"
+ id="userId"
+ onChange={handleInput}
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ />
+ <input type="password" id="userPw" onChange={handleInput} placeholder="๋น๋ฐ๋ฒํธ" />
+ <button
+ className="btnLogin"
+ onClick={goToMain}
+ style={{ backgroundColor: isActive ? "#2d94ef" : "#67b5fa" }}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ <span>๋๋</span>
+ <button className="btnFacebook">Facebook์ผ๋ก ๋ก๊ทธ์ธ</button>
+ {showErrorMessage && <p className="err">์๋ชป๋ ๋น๋ฐ๋ฒํธ์
๋๋ค. ๋ค์ ํ์ธํ์ธ์.</p>}
+ <button className="findPassword">๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?</button>
+ </div>
+ <div className="box">
+ ๊ณ์ ์ด ์์ผ์ ๊ฐ์? <a href="/signup">๊ฐ์
ํ๊ธฐ</a>
+ </div>
+ </div>
+ );
+};
+
+export default Login; | Unknown | ๐ ์กฐ๊ฑด๋ถ๋๋๋ง ํ์ฉํด๋ณด์
จ๊ตฐ์!! ์คํ๋ ค showErrorMessage๋ฅผ ๊ด๋ฆฌํ๋ ํจ์๋ฅผ useEffectํจ์ ๋ด์์ ์ ์ธํ condition๊ฐ์ ๋ฐ๋ผ ๋ค๋ฅด๊ฒ ๊ด๋ฆฌํด๋ณผ ์ ์๊ฒ ์ต๋๋ค! |
@@ -0,0 +1,144 @@
+.login {
+ width: 100%;
+ height: 100vh;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+
+ .box {
+ padding: 25px 40px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ width: 100%;
+ max-width: 350px;
+ box-sizing: border-box;
+ border: 1px solid #dbdbdb;
+
+ &:first-of-type {
+ margin-bottom: 12px;
+ }
+
+ h1 {
+ margin: 15px 0 40px;
+ font-family: "Lobster", cursive;
+ font-weight: 100;
+ font-size: 42px;
+ }
+
+ input {
+ padding: 8px 8px;
+ width: 100%;
+ background: #fafafa;
+ color: #737373;
+ font-size: 12px;
+ box-sizing: border-box;
+ border: 1px solid #dbdbdb;
+ border-radius: 4px;
+
+ &:first-of-type {
+ margin-bottom: 7px;
+ }
+
+ &:last-of-type {
+ margin-bottom: 14px;
+ }
+ }
+
+ span {
+ margin: 20px 0 30px;
+ padding: 0 20px;
+ position: relative;
+ font-size: 12px;
+ color: #737373;
+
+ &:before {
+ content: "";
+ position: absolute;
+ top: 50%;
+ right: -110px;
+ width: 110px;
+ height: 1px;
+ background: #dbdbdb;
+ }
+
+ &:after {
+ content: "";
+ position: absolute;
+ top: 50%;
+ left: -110px;
+ width: 110px;
+ height: 1px;
+ background: #dbdbdb;
+ }
+ }
+
+ .btnLogin {
+ padding: 10px 0;
+ width: 100%;
+ background: #67b5fa;
+ color: #fff;
+ font-size: 14px;
+ font-weight: 500;
+ border: none;
+ border-radius: 8px;
+
+ // &:hover {
+ // background: #2d94ef;
+ // }
+ }
+
+ .btnLoginChange {
+ background: #2d94ef;
+ }
+
+ .btnFacebook {
+ padding-left: 24px;
+ position: relative;
+ height: 16px;
+ background: none;
+ color: #375085;
+ border: none;
+ font-size: 14px;
+ font-weight: 600;
+
+ &:before {
+ content: "";
+ position: absolute;
+ left: 0;
+ width: 16px;
+ height: 16px;
+ background: url("../../../assets/jisun/Login/icon_facebook.png") no-repeat;
+ }
+ }
+
+ .err {
+ margin: 35px 0 10px;
+ color: #ed4956;
+ font-size: 14px;
+ }
+
+ .findPassword {
+ margin-top: 25px;
+ color: #375085;
+ font-size: 12px;
+ font-weight: 600;
+ background: none;
+ border: none;
+ }
+ }
+
+ .box:last-of-type {
+ flex-direction: row;
+ justify-content: center;
+ color: #000;
+ font-size: 13px;
+ font-weight: 500;
+
+ &:last-of-type > a {
+ margin-left: 4px;
+ color: #0095f6;
+ }
+ }
+} | Unknown | ์นํฐํธ ๊ฐ์๊ฒฝ์ฐ๋ index.htmlํ์ผ์์ ์ถ๊ฐํ ์๋ ์๊ณ
common.scss์์ ๊ด๋ฆฌํ ์๋ ์์ต๋๋ค |
@@ -0,0 +1,160 @@
+import React from "react";
+import "./Main.scss";
+import { Link, useNavigate } from "react-router-dom";
+
+const Main = () => {
+ const navigate = useNavigate();
+
+ const goToMain = () => {
+ navigate("/jisun-main");
+ };
+
+ return (
+ <div className="main">
+ <nav>
+ <Link to="/jisun-main" className="goHome">
+ <span className="logo"></span>
+ <p>Westagram</p>
+ </Link>
+ <div className="inputWrap">
+ <input type="search" placeholder="๊ฒ์" />
+ </div>
+ <div className="icons">
+ <button className="iconCompass"></button>
+ <button className="iconLike on"></button>
+ <button className="iconMypage"></button>
+ </div>
+ </nav>
+ <div className="contentsWrap">
+ <div className="feeds">
+ <article>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img alt="๊ณ์ ํ๋กํ ์ฌ์ง" src="/images/jisun/img_profile.png" />
+ </a>
+ <a className="accountName">hanccino</a>
+ <a className="moreMenu">
+ <img alt="๋๋ณด๊ธฐ ์์ด์ฝ" src="../../../../images/jisun/icon_more.png" />
+ </a>
+ </div>
+ <div className="image">
+ <img alt="์ฐ์์ฝ๊ธฐ ํ๊ฐ" src="../../../../images/jisun/img_feed.png" />
+ </div>
+ <div className="text">
+ <div className="buttons">
+ <span className="like on"></span>
+ <span className="dm"></span>
+ <span className="share"></span>
+ <span className="bookMark"></span>
+ </div>
+ <div className="likedStatus">
+ <a className="accountPicture">
+ <img
+ alt="์์ฝ๋ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_wecode.png"
+ />
+ </a>
+ <a className="accountName">wecode_life</a>๋ <a>์ธ 10๋ช
</a>์ด ์ข์ํฉ๋๋ค.
+ </div>
+ <div className="mention">
+ <a className="accountName mr5">hanccino</a>
+ ์ฐ๋ฆฌ์ง ๊ฐ์์ง ์ธ๋ฅด๋ฅผ ์ข์ํด...
+ <span className="viewMore">๋ ๋ณด๊ธฐ</span>
+ </div>
+ <div className="currentComments">
+ <a className="accountName mr5">wecode_bootcamp</a>์กธ๊ทํฑ!
+ </div>
+ <div className="addComments">
+ <textarea aria-label="๋๊ธ ๋ฌ๊ธฐ..." placeholder="๋๊ธ ๋ฌ๊ธฐ..."></textarea>
+ </div>
+ </div>
+ </article>
+ </div>
+ <div className="mainRight">
+ <div className="myAccount accountWrap">
+ <a className="accountPicture">
+ <img alt="๊ณ์ ํ๋กํ ์ฌ์ง" src="../../../../images/jisun/img_profile.png" />
+ </a>
+ <span>
+ <a className="accountName">hanccino</a>
+ Jisun lives with a corgi
+ </span>
+ </div>
+ <div className="recommandList">
+ <div>
+ <strong>ํ์๋์ ์ํ ์ถ์ฒ</strong>
+ <span className="viewAll">๋ชจ๋ ๋ณด๊ธฐ</span>
+ </div>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img
+ alt="์์ํฌ ๊ณ์ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_wework.jpeg"
+ />
+ </a>
+ <span>
+ <a className="accountName">wework</a>
+ wecode_bootcamp๋ ์ธ 3๋ช
์ด ํ๋ก์ฐํฉ๋๋ค
+ </span>
+ <span className="follow">ํ๋ก์ฐ</span>
+ </div>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img
+ alt="๋ทํ๋ฆญ์ค ๊ณ์ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_netflix.jpeg"
+ />
+ </a>
+ <span>
+ <a className="accountName">netflixkr</a>
+ wecode_premium๋ ์ธ 6๋ช
์ด ํ๋ก์ฐํฉ๋๋ค
+ </span>
+ <span className="follow">ํ๋ก์ฐ</span>
+ </div>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img
+ alt="๊ฐฑ๋์ฝ๊ธฐ ๊ณ์ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_corgi.jpeg"
+ />
+ </a>
+ <span>
+ <a className="accountName">gang_the_corgi</a>
+ ํ์๋์ ํ๋ก์ฐํฉ๋๋ค
+ </span>
+ <span className="follow">ํ๋ก์ฐ</span>
+ </div>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img
+ alt="๋ฐค๋น ๊ณ์ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_bambi.jpeg"
+ />
+ </a>
+ <span>
+ <a className="accountName">bambi__jeju</a>
+ gdragon๋ ์ธ 4๋ช
์ด ํ๋ก์ฐํฉ๋๋ค
+ </span>
+ <span className="follow">ํ๋ก์ฐ</span>
+ </div>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img
+ alt="ํผ์๋ํ ๊ณ์ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_psickuniv.jpeg"
+ />
+ </a>
+ <span>
+ <a className="accountName">psickuniv</a>
+ dev_gag๋ ์ธ 6๋ช
์ด ํ๋ก์ฐํฉ๋๋ค
+ </span>
+ <span className="follow">ํ๋ก์ฐ</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ );
+};
+
+export default Main; | Unknown | reset.scss ํ์ผ๋ ๋ง์ฐฌ๊ฐ์ง๋ก ์ ์ญ์์ ์ ์ฉ๋์ด์ผ ํ๋ ํ์ผ์์ผ๋ก index.js์์ importํด ์ค๋๊ฒ์ด ์ข์ต๋๋ค. |
@@ -0,0 +1,160 @@
+import React from "react";
+import "./Main.scss";
+import { Link, useNavigate } from "react-router-dom";
+
+const Main = () => {
+ const navigate = useNavigate();
+
+ const goToMain = () => {
+ navigate("/jisun-main");
+ };
+
+ return (
+ <div className="main">
+ <nav>
+ <Link to="/jisun-main" className="goHome">
+ <span className="logo"></span>
+ <p>Westagram</p>
+ </Link>
+ <div className="inputWrap">
+ <input type="search" placeholder="๊ฒ์" />
+ </div>
+ <div className="icons">
+ <button className="iconCompass"></button>
+ <button className="iconLike on"></button>
+ <button className="iconMypage"></button>
+ </div>
+ </nav>
+ <div className="contentsWrap">
+ <div className="feeds">
+ <article>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img alt="๊ณ์ ํ๋กํ ์ฌ์ง" src="/images/jisun/img_profile.png" />
+ </a>
+ <a className="accountName">hanccino</a>
+ <a className="moreMenu">
+ <img alt="๋๋ณด๊ธฐ ์์ด์ฝ" src="../../../../images/jisun/icon_more.png" />
+ </a>
+ </div>
+ <div className="image">
+ <img alt="์ฐ์์ฝ๊ธฐ ํ๊ฐ" src="../../../../images/jisun/img_feed.png" />
+ </div>
+ <div className="text">
+ <div className="buttons">
+ <span className="like on"></span>
+ <span className="dm"></span>
+ <span className="share"></span>
+ <span className="bookMark"></span>
+ </div>
+ <div className="likedStatus">
+ <a className="accountPicture">
+ <img
+ alt="์์ฝ๋ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_wecode.png"
+ />
+ </a>
+ <a className="accountName">wecode_life</a>๋ <a>์ธ 10๋ช
</a>์ด ์ข์ํฉ๋๋ค.
+ </div>
+ <div className="mention">
+ <a className="accountName mr5">hanccino</a>
+ ์ฐ๋ฆฌ์ง ๊ฐ์์ง ์ธ๋ฅด๋ฅผ ์ข์ํด...
+ <span className="viewMore">๋ ๋ณด๊ธฐ</span>
+ </div>
+ <div className="currentComments">
+ <a className="accountName mr5">wecode_bootcamp</a>์กธ๊ทํฑ!
+ </div>
+ <div className="addComments">
+ <textarea aria-label="๋๊ธ ๋ฌ๊ธฐ..." placeholder="๋๊ธ ๋ฌ๊ธฐ..."></textarea>
+ </div>
+ </div>
+ </article>
+ </div>
+ <div className="mainRight">
+ <div className="myAccount accountWrap">
+ <a className="accountPicture">
+ <img alt="๊ณ์ ํ๋กํ ์ฌ์ง" src="../../../../images/jisun/img_profile.png" />
+ </a>
+ <span>
+ <a className="accountName">hanccino</a>
+ Jisun lives with a corgi
+ </span>
+ </div>
+ <div className="recommandList">
+ <div>
+ <strong>ํ์๋์ ์ํ ์ถ์ฒ</strong>
+ <span className="viewAll">๋ชจ๋ ๋ณด๊ธฐ</span>
+ </div>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img
+ alt="์์ํฌ ๊ณ์ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_wework.jpeg"
+ />
+ </a>
+ <span>
+ <a className="accountName">wework</a>
+ wecode_bootcamp๋ ์ธ 3๋ช
์ด ํ๋ก์ฐํฉ๋๋ค
+ </span>
+ <span className="follow">ํ๋ก์ฐ</span>
+ </div>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img
+ alt="๋ทํ๋ฆญ์ค ๊ณ์ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_netflix.jpeg"
+ />
+ </a>
+ <span>
+ <a className="accountName">netflixkr</a>
+ wecode_premium๋ ์ธ 6๋ช
์ด ํ๋ก์ฐํฉ๋๋ค
+ </span>
+ <span className="follow">ํ๋ก์ฐ</span>
+ </div>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img
+ alt="๊ฐฑ๋์ฝ๊ธฐ ๊ณ์ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_corgi.jpeg"
+ />
+ </a>
+ <span>
+ <a className="accountName">gang_the_corgi</a>
+ ํ์๋์ ํ๋ก์ฐํฉ๋๋ค
+ </span>
+ <span className="follow">ํ๋ก์ฐ</span>
+ </div>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img
+ alt="๋ฐค๋น ๊ณ์ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_bambi.jpeg"
+ />
+ </a>
+ <span>
+ <a className="accountName">bambi__jeju</a>
+ gdragon๋ ์ธ 4๋ช
์ด ํ๋ก์ฐํฉ๋๋ค
+ </span>
+ <span className="follow">ํ๋ก์ฐ</span>
+ </div>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img
+ alt="ํผ์๋ํ ๊ณ์ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_psickuniv.jpeg"
+ />
+ </a>
+ <span>
+ <a className="accountName">psickuniv</a>
+ dev_gag๋ ์ธ 6๋ช
์ด ํ๋ก์ฐํฉ๋๋ค
+ </span>
+ <span className="follow">ํ๋ก์ฐ</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ );
+};
+
+export default Main; | Unknown | ์์ด์ฝ๋ค์ ๋๋ ์๋ ํน์ ํ์ด์ง๋ก ์ด๋ํด์ผํ๋๊ฒ์ด ์๋๋ผ๋ฉด a ํ๊ทธ๋ Link ํ๊ทธ๊ฐ ์๋ ์ฌํ ๋ค๋ฅธํ๊ทธ๋ฅผ ํ์ฉํด์ ๊ธฐ๋ฅ์ ๊ตฌํํ ์ ์์ต๋๋ค! |
@@ -0,0 +1,160 @@
+import React from "react";
+import "./Main.scss";
+import { Link, useNavigate } from "react-router-dom";
+
+const Main = () => {
+ const navigate = useNavigate();
+
+ const goToMain = () => {
+ navigate("/jisun-main");
+ };
+
+ return (
+ <div className="main">
+ <nav>
+ <Link to="/jisun-main" className="goHome">
+ <span className="logo"></span>
+ <p>Westagram</p>
+ </Link>
+ <div className="inputWrap">
+ <input type="search" placeholder="๊ฒ์" />
+ </div>
+ <div className="icons">
+ <button className="iconCompass"></button>
+ <button className="iconLike on"></button>
+ <button className="iconMypage"></button>
+ </div>
+ </nav>
+ <div className="contentsWrap">
+ <div className="feeds">
+ <article>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img alt="๊ณ์ ํ๋กํ ์ฌ์ง" src="/images/jisun/img_profile.png" />
+ </a>
+ <a className="accountName">hanccino</a>
+ <a className="moreMenu">
+ <img alt="๋๋ณด๊ธฐ ์์ด์ฝ" src="../../../../images/jisun/icon_more.png" />
+ </a>
+ </div>
+ <div className="image">
+ <img alt="์ฐ์์ฝ๊ธฐ ํ๊ฐ" src="../../../../images/jisun/img_feed.png" />
+ </div>
+ <div className="text">
+ <div className="buttons">
+ <span className="like on"></span>
+ <span className="dm"></span>
+ <span className="share"></span>
+ <span className="bookMark"></span>
+ </div>
+ <div className="likedStatus">
+ <a className="accountPicture">
+ <img
+ alt="์์ฝ๋ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_wecode.png"
+ />
+ </a>
+ <a className="accountName">wecode_life</a>๋ <a>์ธ 10๋ช
</a>์ด ์ข์ํฉ๋๋ค.
+ </div>
+ <div className="mention">
+ <a className="accountName mr5">hanccino</a>
+ ์ฐ๋ฆฌ์ง ๊ฐ์์ง ์ธ๋ฅด๋ฅผ ์ข์ํด...
+ <span className="viewMore">๋ ๋ณด๊ธฐ</span>
+ </div>
+ <div className="currentComments">
+ <a className="accountName mr5">wecode_bootcamp</a>์กธ๊ทํฑ!
+ </div>
+ <div className="addComments">
+ <textarea aria-label="๋๊ธ ๋ฌ๊ธฐ..." placeholder="๋๊ธ ๋ฌ๊ธฐ..."></textarea>
+ </div>
+ </div>
+ </article>
+ </div>
+ <div className="mainRight">
+ <div className="myAccount accountWrap">
+ <a className="accountPicture">
+ <img alt="๊ณ์ ํ๋กํ ์ฌ์ง" src="../../../../images/jisun/img_profile.png" />
+ </a>
+ <span>
+ <a className="accountName">hanccino</a>
+ Jisun lives with a corgi
+ </span>
+ </div>
+ <div className="recommandList">
+ <div>
+ <strong>ํ์๋์ ์ํ ์ถ์ฒ</strong>
+ <span className="viewAll">๋ชจ๋ ๋ณด๊ธฐ</span>
+ </div>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img
+ alt="์์ํฌ ๊ณ์ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_wework.jpeg"
+ />
+ </a>
+ <span>
+ <a className="accountName">wework</a>
+ wecode_bootcamp๋ ์ธ 3๋ช
์ด ํ๋ก์ฐํฉ๋๋ค
+ </span>
+ <span className="follow">ํ๋ก์ฐ</span>
+ </div>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img
+ alt="๋ทํ๋ฆญ์ค ๊ณ์ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_netflix.jpeg"
+ />
+ </a>
+ <span>
+ <a className="accountName">netflixkr</a>
+ wecode_premium๋ ์ธ 6๋ช
์ด ํ๋ก์ฐํฉ๋๋ค
+ </span>
+ <span className="follow">ํ๋ก์ฐ</span>
+ </div>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img
+ alt="๊ฐฑ๋์ฝ๊ธฐ ๊ณ์ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_corgi.jpeg"
+ />
+ </a>
+ <span>
+ <a className="accountName">gang_the_corgi</a>
+ ํ์๋์ ํ๋ก์ฐํฉ๋๋ค
+ </span>
+ <span className="follow">ํ๋ก์ฐ</span>
+ </div>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img
+ alt="๋ฐค๋น ๊ณ์ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_bambi.jpeg"
+ />
+ </a>
+ <span>
+ <a className="accountName">bambi__jeju</a>
+ gdragon๋ ์ธ 4๋ช
์ด ํ๋ก์ฐํฉ๋๋ค
+ </span>
+ <span className="follow">ํ๋ก์ฐ</span>
+ </div>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img
+ alt="ํผ์๋ํ ๊ณ์ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_psickuniv.jpeg"
+ />
+ </a>
+ <span>
+ <a className="accountName">psickuniv</a>
+ dev_gag๋ ์ธ 6๋ช
์ด ํ๋ก์ฐํฉ๋๋ค
+ </span>
+ <span className="follow">ํ๋ก์ฐ</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ );
+};
+
+export default Main; | Unknown | ํด๋น ์๋๊ฒฝ๋ก๊ฐ publicํด๋๋ฅผ ์ฐธ๊ณ ํ๋๊ฑฐ๋ผ๋ฉด
```suggestion
<img alt="๊ณ์ ํ๋กํ ์ฌ์ง" src="/images/jisun/img_profile.png" />
```
์ด๋ ๊ฒ ํํํ ์ ์์ต๋๋ค |
@@ -0,0 +1,160 @@
+import React from "react";
+import "./Main.scss";
+import { Link, useNavigate } from "react-router-dom";
+
+const Main = () => {
+ const navigate = useNavigate();
+
+ const goToMain = () => {
+ navigate("/jisun-main");
+ };
+
+ return (
+ <div className="main">
+ <nav>
+ <Link to="/jisun-main" className="goHome">
+ <span className="logo"></span>
+ <p>Westagram</p>
+ </Link>
+ <div className="inputWrap">
+ <input type="search" placeholder="๊ฒ์" />
+ </div>
+ <div className="icons">
+ <button className="iconCompass"></button>
+ <button className="iconLike on"></button>
+ <button className="iconMypage"></button>
+ </div>
+ </nav>
+ <div className="contentsWrap">
+ <div className="feeds">
+ <article>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img alt="๊ณ์ ํ๋กํ ์ฌ์ง" src="/images/jisun/img_profile.png" />
+ </a>
+ <a className="accountName">hanccino</a>
+ <a className="moreMenu">
+ <img alt="๋๋ณด๊ธฐ ์์ด์ฝ" src="../../../../images/jisun/icon_more.png" />
+ </a>
+ </div>
+ <div className="image">
+ <img alt="์ฐ์์ฝ๊ธฐ ํ๊ฐ" src="../../../../images/jisun/img_feed.png" />
+ </div>
+ <div className="text">
+ <div className="buttons">
+ <span className="like on"></span>
+ <span className="dm"></span>
+ <span className="share"></span>
+ <span className="bookMark"></span>
+ </div>
+ <div className="likedStatus">
+ <a className="accountPicture">
+ <img
+ alt="์์ฝ๋ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_wecode.png"
+ />
+ </a>
+ <a className="accountName">wecode_life</a>๋ <a>์ธ 10๋ช
</a>์ด ์ข์ํฉ๋๋ค.
+ </div>
+ <div className="mention">
+ <a className="accountName mr5">hanccino</a>
+ ์ฐ๋ฆฌ์ง ๊ฐ์์ง ์ธ๋ฅด๋ฅผ ์ข์ํด...
+ <span className="viewMore">๋ ๋ณด๊ธฐ</span>
+ </div>
+ <div className="currentComments">
+ <a className="accountName mr5">wecode_bootcamp</a>์กธ๊ทํฑ!
+ </div>
+ <div className="addComments">
+ <textarea aria-label="๋๊ธ ๋ฌ๊ธฐ..." placeholder="๋๊ธ ๋ฌ๊ธฐ..."></textarea>
+ </div>
+ </div>
+ </article>
+ </div>
+ <div className="mainRight">
+ <div className="myAccount accountWrap">
+ <a className="accountPicture">
+ <img alt="๊ณ์ ํ๋กํ ์ฌ์ง" src="../../../../images/jisun/img_profile.png" />
+ </a>
+ <span>
+ <a className="accountName">hanccino</a>
+ Jisun lives with a corgi
+ </span>
+ </div>
+ <div className="recommandList">
+ <div>
+ <strong>ํ์๋์ ์ํ ์ถ์ฒ</strong>
+ <span className="viewAll">๋ชจ๋ ๋ณด๊ธฐ</span>
+ </div>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img
+ alt="์์ํฌ ๊ณ์ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_wework.jpeg"
+ />
+ </a>
+ <span>
+ <a className="accountName">wework</a>
+ wecode_bootcamp๋ ์ธ 3๋ช
์ด ํ๋ก์ฐํฉ๋๋ค
+ </span>
+ <span className="follow">ํ๋ก์ฐ</span>
+ </div>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img
+ alt="๋ทํ๋ฆญ์ค ๊ณ์ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_netflix.jpeg"
+ />
+ </a>
+ <span>
+ <a className="accountName">netflixkr</a>
+ wecode_premium๋ ์ธ 6๋ช
์ด ํ๋ก์ฐํฉ๋๋ค
+ </span>
+ <span className="follow">ํ๋ก์ฐ</span>
+ </div>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img
+ alt="๊ฐฑ๋์ฝ๊ธฐ ๊ณ์ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_corgi.jpeg"
+ />
+ </a>
+ <span>
+ <a className="accountName">gang_the_corgi</a>
+ ํ์๋์ ํ๋ก์ฐํฉ๋๋ค
+ </span>
+ <span className="follow">ํ๋ก์ฐ</span>
+ </div>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img
+ alt="๋ฐค๋น ๊ณ์ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_bambi.jpeg"
+ />
+ </a>
+ <span>
+ <a className="accountName">bambi__jeju</a>
+ gdragon๋ ์ธ 4๋ช
์ด ํ๋ก์ฐํฉ๋๋ค
+ </span>
+ <span className="follow">ํ๋ก์ฐ</span>
+ </div>
+ <div className="accountWrap">
+ <a className="accountPicture">
+ <img
+ alt="ํผ์๋ํ ๊ณ์ ํ๋กํ ์ฌ์ง"
+ src="../../../../images/jisun/img_profile_psickuniv.jpeg"
+ />
+ </a>
+ <span>
+ <a className="accountName">psickuniv</a>
+ dev_gag๋ ์ธ 6๋ช
์ด ํ๋ก์ฐํฉ๋๋ค
+ </span>
+ <span className="follow">ํ๋ก์ฐ</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ );
+};
+
+export default Main; | Unknown | className์ด ๋๋ฌด ๋ชจํธํฉ๋๋ค!! ์ด๋ค ์์ด์ฝ์ธ์ง ์๋ ค์ฃผ์ธ์ |
@@ -78,6 +78,7 @@ public List<ReviewPhoto> createReviewPhoto(Long reviewId, List<MultipartFile> re
List<ReviewPhoto> reviewPhotoList = new ArrayList<>();
List<String> photoUrls = new ArrayList<>();
+ if(reviewPhotos == null) return reviewPhotoList;
reviewPhotos.forEach(multipartFile -> {
try {
photoUrls.add(s3Util.upload(multipartFile));
@@ -87,7 +88,6 @@ public List<ReviewPhoto> createReviewPhoto(Long reviewId, List<MultipartFile> re
});
photoUrls.forEach(photoUrl -> reviewPhotoList.add(reviewPhotoPort.save(new ReviewPhoto(reviewId, photoUrl))));
-
return reviewPhotoList;
}
| Java | ์ด ๋ถ๋ถ์ ์ด๋ค ์๋ฏธ์ธ๊ฐ์? |
@@ -78,6 +78,7 @@ public List<ReviewPhoto> createReviewPhoto(Long reviewId, List<MultipartFile> re
List<ReviewPhoto> reviewPhotoList = new ArrayList<>();
List<String> photoUrls = new ArrayList<>();
+ if(reviewPhotos == null) return reviewPhotoList;
reviewPhotos.forEach(multipartFile -> {
try {
photoUrls.add(s3Util.upload(multipartFile));
@@ -87,7 +88,6 @@ public List<ReviewPhoto> createReviewPhoto(Long reviewId, List<MultipartFile> re
});
photoUrls.forEach(photoUrl -> reviewPhotoList.add(reviewPhotoPort.save(new ReviewPhoto(reviewId, photoUrl))));
-
return reviewPhotoList;
}
| Java | ์ด ๋ถ๋ถ์ ์ด๋ค ์๋ฏธ์ธ๊ฐ์? |
@@ -0,0 +1,34 @@
+package com.luckytree.shop.utils;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Type;
+
+@Component
+public class MultipartJackson2HttpMessageConverter extends AbstractJackson2HttpMessageConverter {
+
+ /**
+ * Converter for support http request with header Content-Type: multipart/form-data
+ */
+ public MultipartJackson2HttpMessageConverter(ObjectMapper objectMapper) {
+ super(objectMapper, MediaType.APPLICATION_OCTET_STREAM);
+ }
+
+ @Override
+ public boolean canWrite(Class<?> clazz, MediaType mediaType) {
+ return false;
+ }
+
+ @Override
+ public boolean canWrite(Type type, Class<?> clazz, MediaType mediaType) {
+ return false;
+ }
+
+ @Override
+ protected boolean canWrite(MediaType mediaType) {
+ return false;
+ }
+} | Java | ์ด ํด๋์ค๋ฅผ ์ฌ์ฉํ๋ ๊ณณ์ด ์ด๋๊ฐ์? |
@@ -32,12 +32,11 @@ public class ReviewController {
private final ReviewUseCase reviewUseCase;
@Operation(summary = "๋ฆฌ๋ทฐ ๋ฑ๋ก")
- @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ @PostMapping(consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE})
public ResponseEntity<CreateReviewResponse> createReview(
- @RequestBody @Valid CreateReviewRequest createReviewRequest,
- @RequestPart("reviewPhotos") @Valid List<MultipartFile> reviewPhotos) {
+ @RequestPart("createReviewRequest") @Valid CreateReviewRequest createReviewRequest,
+ @RequestPart(value = "reviewPhotos", required = false) @Valid List<MultipartFile> reviewPhotos) {
Review review = reviewUseCase.create(createReviewRequest.toDomain(Long.valueOf(SecurityContextHolder.getContext().getAuthentication().getPrincipal().toString())));
-
List<ReviewPhoto> reviewPhotoList = reviewUseCase.createReviewPhoto(review.getId(), reviewPhotos);
return ResponseEntity.ok(new CreateReviewResponse(review, reviewPhotoList)); | Java | ๋ฆฌํ์คํธ๋ฐ๋๊ฐ ์ฌ๋ผ์ก๋๋ฐ, ์ด ๊ฒฝ์ฐ์๋ ํด๋ผ์ด์ธํธ์์ JSON ํ์์ Body ํ๊ทธ ๋ฐ์ดํฐ๋ฅผ ๋ฐ์์ค๋ ๋ฐ์ ๋ฌธ์ ๊ฐ ์๋์? |
@@ -78,6 +78,7 @@ public List<ReviewPhoto> createReviewPhoto(Long reviewId, List<MultipartFile> re
List<ReviewPhoto> reviewPhotoList = new ArrayList<>();
List<String> photoUrls = new ArrayList<>();
+ if(reviewPhotos == null) return reviewPhotoList;
reviewPhotos.forEach(multipartFile -> {
try {
photoUrls.add(s3Util.upload(multipartFile));
@@ -87,7 +88,6 @@ public List<ReviewPhoto> createReviewPhoto(Long reviewId, List<MultipartFile> re
});
photoUrls.forEach(photoUrl -> reviewPhotoList.add(reviewPhotoPort.save(new ReviewPhoto(reviewId, photoUrl))));
-
return reviewPhotoList;
}
| Java | ๋ฆฌ๋ทฐ ์์ฑ ์ ํฌํ ๋ฅผ ์ ํํ์ง ์์๋ ์ด ์๋น์ค๊ฐ ์คํ๋์ด์ ์ ํ๋์ง ์์์ ๋ ๋ฐ๋ก ๋น ์ ธ๋๊ฐ๊ฒ ํ๊ฒ๋๋ค |
@@ -0,0 +1,34 @@
+package com.luckytree.shop.utils;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Type;
+
+@Component
+public class MultipartJackson2HttpMessageConverter extends AbstractJackson2HttpMessageConverter {
+
+ /**
+ * Converter for support http request with header Content-Type: multipart/form-data
+ */
+ public MultipartJackson2HttpMessageConverter(ObjectMapper objectMapper) {
+ super(objectMapper, MediaType.APPLICATION_OCTET_STREAM);
+ }
+
+ @Override
+ public boolean canWrite(Class<?> clazz, MediaType mediaType) {
+ return false;
+ }
+
+ @Override
+ public boolean canWrite(Type type, Class<?> clazz, MediaType mediaType) {
+ return false;
+ }
+
+ @Override
+ protected boolean canWrite(MediaType mediaType) {
+ return false;
+ }
+} | Java | swagger์์ ๋ฆฌ๋ทฐ ์์ฑ API์ multipartfile์ ์ฌ์ฉํด์ ๊ทธ๊ฑฐ ์ฌ์ฉํ๊ฒ ๋ง๋ค์ด์ฃผ๋ ํด๋์ค์
๋๋ค |
@@ -32,12 +32,11 @@ public class ReviewController {
private final ReviewUseCase reviewUseCase;
@Operation(summary = "๋ฆฌ๋ทฐ ๋ฑ๋ก")
- @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ @PostMapping(consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE})
public ResponseEntity<CreateReviewResponse> createReview(
- @RequestBody @Valid CreateReviewRequest createReviewRequest,
- @RequestPart("reviewPhotos") @Valid List<MultipartFile> reviewPhotos) {
+ @RequestPart("createReviewRequest") @Valid CreateReviewRequest createReviewRequest,
+ @RequestPart(value = "reviewPhotos", required = false) @Valid List<MultipartFile> reviewPhotos) {
Review review = reviewUseCase.create(createReviewRequest.toDomain(Long.valueOf(SecurityContextHolder.getContext().getAuthentication().getPrincipal().toString())));
-
List<ReviewPhoto> reviewPhotoList = reviewUseCase.createReviewPhoto(review.getId(), reviewPhotos);
return ResponseEntity.ok(new CreateReviewResponse(review, reviewPhotoList)); | Java | swagger๋ postman์์ ํ์ธํ๊ณ ์คํ๋ ค ๋ฆฌํ์คํธ๋ฐ๋๋ฅผ ์ผ์ ๋ ์๋ผ์ ๋ฐ๊ฟจ์ต๋๋ค. ์ด์ ๋ ์ฐพ์๋ณด๊ฒ ์ต๋๋ค |
@@ -0,0 +1,43 @@
+//
+// PopcornOrangeButton.swift
+// Popcorn-iOS
+//
+// Created by ์ ๋ฏผ์ฐ on 1/12/25.
+//
+
+import UIKit
+
+final class PopcornOrangeButton: UIButton {
+ init(text: String, isEnabled: Bool) {
+ super.init(frame: .zero)
+ configureInitialSetting(isEnabled: isEnabled)
+ configureButtonUI(text: text)
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+}
+
+// MARK: - Configure Initial Setting
+extension PopcornOrangeButton {
+ private func configureInitialSetting(isEnabled: Bool) {
+ self.isEnabled = isEnabled
+ self.cornerRadius(radius: 10)
+ }
+
+ private func configureButtonUI(text: String) {
+ var config = UIButton.Configuration.filled()
+ config.baseBackgroundColor = isEnabled == true
+ ? UIColor(resource: .popcornOrange)
+ : UIColor(resource: .popcornGray2)
+ config.attributedTitle = AttributedString(
+ text,
+ attributes: AttributeContainer([
+ .font: UIFont(name: RobotoFontName.robotoSemiBold, size: 15)!,
+ .foregroundColor: UIColor(.white)
+ ])
+ )
+ configuration = config
+ }
+} | Swift | ์ ๋ ์กฐ๋ง๊ฐ ์ด๊ฑธ๋ก ๋ฆฌํฉํ ๋งํ๊ฒ ์ต๋๋ค!! |
@@ -0,0 +1,425 @@
+//
+// WriteReviewViewController.swift
+// Popcorn-iOS
+//
+// Created by ์ ๋ฏผ์ฐ on 1/12/25.
+//
+
+import PhotosUI
+import UIKit
+
+final class WriteReviewViewController: UIViewController {
+ private let viewModel = WriteReviewViewModel()
+
+ private let popupMainImageView: UIImageView = {
+ let imageView = UIImageView()
+ imageView.image = UIImage(resource: .imagePlaceHolder)
+ imageView.contentMode = .scaleAspectFill
+ imageView.clipsToBounds = true
+ return imageView
+ }()
+
+ private let popupTitleLabel: UILabel = {
+ let label = UILabel()
+ label.popcornSemiBold(text: "ํ์
์ ๋ชฉ", size: 15)
+ label.numberOfLines = 0
+ return label
+ }()
+
+ private let popupPeriodLabel: UILabel = {
+ let label = UILabel()
+ label.popcornMedium(text: "00.00.00~00.00.00", size: 10)
+ return label
+ }()
+
+ private let userSatisfactionTitleLabel: UILabel = {
+ let label = UILabel()
+ label.popcornSemiBold(text: "ํ์
์คํ ์ด ๋ง์กฑ๋", size: 15)
+ return label
+ }()
+
+ private let userStatisfactionRatingView = StarRatingView(starSpacing: 11.63, isUserInteractionEnabled: true)
+
+ private let writeReviewTitleLabel: UILabel = {
+ let label = UILabel()
+ label.popcornSemiBold(text: "๋ฆฌ๋ทฐ ์์ฑ", size: 15)
+ return label
+ }()
+
+ private let reviewConstraintTitleLabel: UILabel = {
+ let label = UILabel()
+ label.popcornMedium(text: "0์ / ์ต์ 10์", size: 13)
+ label.textColor = UIColor(resource: .popcornDarkBlueGray)
+ return label
+ }()
+
+ private lazy var reviewTextView: UITextView = {
+ let textView = UITextView()
+ textView.text = viewModel.reviewTextViewPlaceHolderText
+ textView.textColor = UIColor(resource: .popcornDarkBlueGray)
+ textView.font = UIFont(name: RobotoFontName.robotoMedium, size: 15)
+ textView.textContainerInset = UIEdgeInsets(top: 15, left: 10, bottom: 15, right: 10)
+ textView.autocapitalizationType = .none
+ textView.autocorrectionType = .no // ์๋ ์์ ๋นํ์ฑํ
+ textView.spellCheckingType = .no // ๋ง์ถค๋ฒ ๊ฒ์ฌ ๋นํ์ฑํ
+ textView.smartQuotesType = .no // ์ค๋งํธ ๋ฐ์ดํ ๋นํ์ฑํ
+ textView.smartDashesType = .no // ์ค๋งํธ ๋์ ๋นํ์ฑํ
+ textView.smartInsertDeleteType = .no // ์ค๋งํธ ์ฝ์
/์ญ์ ๋นํ์ฑํ
+
+ textView.backgroundColor = UIColor(resource: .popcornGray4)
+ textView.layer.borderWidth = 1
+ textView.layer.borderColor = UIColor(resource: .popcornGray2).cgColor
+ textView.cornerRadius(radius: 10)
+ return textView
+ }()
+
+ private let uploadImageTitleLabel: UILabel = {
+ let label = UILabel()
+ label.popcornSemiBold(text: "์ฌ์ง ๋ฑ๋ก", size: 15)
+ return label
+ }()
+
+ private let uploadImageConstraintTitleLabel: UILabel = {
+ let label = UILabel()
+ label.popcornMedium(text: "0์ฅ / ์ต๋ 10์ฅ", size: 13)
+ label.textColor = UIColor(resource: .popcornDarkBlueGray)
+ return label
+ }()
+
+ private let uploadImageCollectionView: UICollectionView = {
+ let layout = UICollectionViewFlowLayout()
+ layout.scrollDirection = .horizontal
+ layout.minimumInteritemSpacing = 10
+
+ let collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
+ collectionView.showsHorizontalScrollIndicator = false
+ return collectionView
+ }()
+
+ private let reviewCompleteButton = PopcornOrangeButton(text: "๋ฆฌ๋ทฐ ๋ฑ๋กํ๊ธฐ", isEnabled: false)
+
+ // MARK: - Stack View
+ private lazy var popupTitlePeriodStackView: UIStackView = {
+ let stackView = UIStackView(arrangedSubviews: [popupTitleLabel, popupPeriodLabel])
+ stackView.axis = .vertical
+ stackView.spacing = 5
+ stackView.alignment = .leading
+ stackView.distribution = .fillProportionally
+ return stackView
+ }()
+
+ init(image: UIImage, title: String, period: String) {
+ super.init(nibName: nil, bundle: nil)
+ popupMainImageView.image = image
+ popupTitleLabel.text = title
+ popupPeriodLabel.text = period
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+
+ override func viewDidLoad() {
+ super.viewDidLoad()
+ configureInitialSetting()
+ configureSubviews()
+ configureLayout()
+ configureAction()
+ bind(to: viewModel)
+ }
+
+ func bind(to viewModel: WriteReviewViewModel) {
+ viewModel.reviewTextPublisher = { [weak self] textCount in
+ guard let self else { return }
+ DispatchQueue.main.async {
+ self.reviewConstraintTitleLabel.text = "\(textCount)์ / ์ต์ 10์"
+ }
+ }
+
+ viewModel.reviewImagesPublisher = { [weak self] imageCount in
+ guard let self else { return }
+ DispatchQueue.main.async {
+ self.uploadImageConstraintTitleLabel.text = "\(imageCount)์ฅ / ์ต๋ 10์ฅ"
+ self.uploadImageCollectionView.reloadData()
+ }
+ }
+
+ viewModel.isSubmitEnabledPublisher = { [weak self] isSubmitEnable in
+ guard let self else { return }
+
+ DispatchQueue.main.async {
+ self.reviewCompleteButton.isEnabled = isSubmitEnable
+ self.reviewCompleteButton.configuration?.baseBackgroundColor = isSubmitEnable
+ ? UIColor(resource: .popcornOrange)
+ : UIColor(resource: .popcornGray2)
+ }
+ }
+ }
+}
+
+// MARK: - Initial Setting
+extension WriteReviewViewController {
+ private func configureInitialSetting() {
+ view.backgroundColor = .white
+
+ configureGestureRecognizer()
+ configureCollectionView()
+ reviewTextView.delegate = self
+ userStatisfactionRatingView.delegate = self
+ }
+
+ private func configureCollectionView() {
+ uploadImageCollectionView.dataSource = self
+ uploadImageCollectionView.delegate = self
+
+ uploadImageCollectionView.register(
+ UploadImageCollectionViewCell.self,
+ forCellWithReuseIdentifier: UploadImageCollectionViewCell.reuseIdentifier
+ )
+ }
+
+ private func configureGestureRecognizer() {
+ let panGesture = UIPanGestureRecognizer(
+ target: userStatisfactionRatingView,
+ action: #selector(userStatisfactionRatingView.handlePanGesture(_:))
+ )
+ let tapGesture = UITapGestureRecognizer(
+ target: userStatisfactionRatingView,
+ action: #selector(userStatisfactionRatingView.handleTapGesture(_:))
+ )
+ [panGesture, tapGesture].forEach { userStatisfactionRatingView.addGestureRecognizer($0) }
+ }
+}
+
+// MARK: - Configure Action
+extension WriteReviewViewController {
+ private func configureAction() {
+ reviewCompleteButton.addAction(UIAction { [weak self] _ in
+ guard let self else { return }
+ self.didTapReviewCompleteButton()
+ }, for: .touchUpInside)
+ }
+
+ private func didTapReviewCompleteButton() {
+ viewModel.postReviewData()
+ self.navigationController?.popViewController(animated: true)
+ }
+}
+
+// MARK: - Implement StarRatingView Delegate
+extension WriteReviewViewController: StarRatingViewDelegate {
+ func didChangeRating(to rating: Float) {
+ viewModel.updateRating(rating)
+ }
+}
+
+// MARK: - Implement UITextView Delegate
+extension WriteReviewViewController: UITextViewDelegate {
+ func textViewDidChange(_ textView: UITextView) {
+ viewModel.updateReviewText(textView.text)
+ }
+
+ func textViewDidBeginEditing(_ textView: UITextView) {
+ if textView.text == viewModel.reviewTextViewPlaceHolderText {
+ textView.text = nil
+ textView.textColor = UIColor.black
+ }
+ }
+
+ func textViewDidEndEditing(_ textView: UITextView) {
+ if textView.text.isEmpty {
+ textView.text = viewModel.reviewTextViewPlaceHolderText
+ textView.textColor = UIColor(resource: .popcornDarkBlueGray)
+ }
+ }
+
+ override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
+ view.endEditing(true)
+ }
+}
+
+// MARK: - Configure PHPicker
+extension WriteReviewViewController: PHPickerViewControllerDelegate {
+ private func configurePHPicker(selectionLimit: Int) {
+ var config = PHPickerConfiguration()
+ config.selectionLimit = selectionLimit
+ config.filter = .images
+
+ let phPickerViewController = PHPickerViewController(configuration: config)
+ phPickerViewController.delegate = self
+ self.present(phPickerViewController, animated: true)
+ }
+
+ func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) {
+ picker.dismiss(animated: true)
+
+ results.forEach { [weak self] result in
+ guard let self else { return }
+ guard viewModel.provideReviewImagesCount() <= 10 else { return }
+
+ let itemProvider = result.itemProvider
+ if itemProvider.canLoadObject(ofClass: UIImage.self) {
+ itemProvider.loadObject(ofClass: UIImage.self) { image, error in
+ if error != nil {
+ return
+ }
+
+ if let image = image as? UIImage {
+ self.viewModel.addImage(image)
+ }
+ }
+ }
+ }
+ }
+
+ private func presentResetAlert(for index: Int) {
+ let alert = UIAlertController(title: "์ด๋ฏธ์ง ์ด๊ธฐํ", message: "ํด๋น ์ด๋ฏธ์ง๋ฅผ ์ด๊ธฐํ ํ์๊ฒ ์ต๋๊น?", preferredStyle: .alert)
+ alert.addAction(UIAlertAction(title: "์ทจ์", style: .cancel, handler: nil))
+ alert.addAction(UIAlertAction(title: "์ด๊ธฐํ", style: .destructive) { [weak self] _ in
+ guard let self else { return }
+ self.viewModel.resetImage(at: index)
+ })
+ present(alert, animated: true)
+ }
+}
+
+// MARK: - Implement UICollectionView DataSource
+extension WriteReviewViewController: UICollectionViewDataSource {
+ func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+ return 10
+ }
+
+ func collectionView(
+ _ collectionView: UICollectionView,
+ cellForItemAt indexPath: IndexPath
+ ) -> UICollectionViewCell {
+ guard let cell = collectionView.dequeueReusableCell(
+ withReuseIdentifier: UploadImageCollectionViewCell.reuseIdentifier,
+ for: indexPath
+ ) as? UploadImageCollectionViewCell else {
+ return UICollectionViewCell()
+ }
+
+ let reviewImage = viewModel.provideReviewImages(at: indexPath.item)
+ cell.configureContents(image: reviewImage)
+
+ return cell
+ }
+}
+
+// MARK: - Implement UICollectionView DelegateFlowLayout
+extension WriteReviewViewController: UICollectionViewDelegateFlowLayout {
+ func collectionView(
+ _ collectionView: UICollectionView,
+ layout collectionViewLayout: UICollectionViewLayout,
+ sizeForItemAt indexPath: IndexPath
+ ) -> CGSize {
+ let height = view.bounds.height * 70 / 852
+ let width = height
+
+ return CGSize(width: width, height: height)
+ }
+
+ func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+ let image = viewModel.provideReviewImages(at: indexPath.item)
+
+ if image != UIImage(resource: .uploadImagePlaceholder) {
+ presentResetAlert(for: indexPath.item)
+ } else {
+ let selectionLimit = 10 - viewModel.provideReviewImagesCount()
+ configurePHPicker(selectionLimit: selectionLimit)
+ }
+ }
+}
+
+// MARK: - Configure UI
+extension WriteReviewViewController {
+ private func configureSubviews() {
+ [
+ popupMainImageView,
+ popupTitlePeriodStackView,
+ userSatisfactionTitleLabel,
+ userStatisfactionRatingView,
+ writeReviewTitleLabel,
+ reviewConstraintTitleLabel,
+ reviewTextView,
+ uploadImageTitleLabel,
+ uploadImageConstraintTitleLabel,
+ uploadImageCollectionView,
+ reviewCompleteButton
+ ].forEach {
+ view.addSubview($0)
+ $0.translatesAutoresizingMaskIntoConstraints = false
+ }
+ }
+
+ private func configureLayout() {
+ let safeArea = view.safeAreaLayoutGuide
+ let reviewCompleteButtonTopConstraint = reviewCompleteButton.topAnchor.constraint(
+ greaterThanOrEqualTo: uploadImageCollectionView.bottomAnchor,
+ constant: 64
+ )
+ let screenHeight = view.bounds.height
+ let verticalSpacing = screenHeight >= 800 ? CGFloat(45) : CGFloat(30)
+
+ reviewCompleteButtonTopConstraint.priority = .defaultLow
+ NSLayoutConstraint.activate([
+ popupMainImageView.topAnchor.constraint(equalTo: safeArea.topAnchor, constant: 30),
+ popupMainImageView.leadingAnchor.constraint(equalTo: safeArea.leadingAnchor, constant: 26),
+ popupMainImageView.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 50/393),
+ popupMainImageView.heightAnchor.constraint(equalTo: popupMainImageView.widthAnchor),
+
+ popupTitlePeriodStackView.leadingAnchor.constraint(
+ equalTo: popupMainImageView.trailingAnchor,
+ constant: 10
+ ),
+ popupTitlePeriodStackView.centerYAnchor.constraint(equalTo: popupMainImageView.centerYAnchor),
+
+ userSatisfactionTitleLabel.topAnchor.constraint(
+ equalTo: popupMainImageView.bottomAnchor,
+ constant: verticalSpacing
+ ),
+ userSatisfactionTitleLabel.leadingAnchor.constraint(equalTo: popupMainImageView.leadingAnchor),
+
+ userStatisfactionRatingView.topAnchor.constraint(
+ equalTo: userSatisfactionTitleLabel.bottomAnchor,
+ constant: 20
+ ),
+ userStatisfactionRatingView.centerXAnchor.constraint(equalTo: safeArea.centerXAnchor),
+
+ writeReviewTitleLabel.topAnchor.constraint(
+ equalTo: userStatisfactionRatingView.bottomAnchor,
+ constant: verticalSpacing
+ ),
+ writeReviewTitleLabel.leadingAnchor.constraint(equalTo: popupMainImageView.leadingAnchor),
+ writeReviewTitleLabel.centerXAnchor.constraint(equalTo: safeArea.centerXAnchor),
+
+ reviewConstraintTitleLabel.centerYAnchor.constraint(equalTo: writeReviewTitleLabel.centerYAnchor),
+ reviewConstraintTitleLabel.trailingAnchor.constraint(equalTo: safeArea.trailingAnchor, constant: -27),
+
+ reviewTextView.topAnchor.constraint(equalTo: writeReviewTitleLabel.bottomAnchor, constant: 20),
+ reviewTextView.leadingAnchor.constraint(equalTo: popupMainImageView.leadingAnchor),
+ reviewTextView.centerXAnchor.constraint(equalTo: safeArea.centerXAnchor),
+ reviewTextView.heightAnchor.constraint(equalTo: view.heightAnchor, multiplier: 104/852),
+
+ uploadImageTitleLabel.topAnchor.constraint(equalTo: reviewTextView.bottomAnchor, constant: verticalSpacing),
+ uploadImageTitleLabel.leadingAnchor.constraint(equalTo: popupMainImageView.leadingAnchor),
+ uploadImageConstraintTitleLabel.trailingAnchor.constraint(
+ equalTo: reviewConstraintTitleLabel.trailingAnchor
+ ),
+
+ uploadImageConstraintTitleLabel.centerYAnchor.constraint(equalTo: uploadImageTitleLabel.centerYAnchor),
+
+ uploadImageCollectionView.topAnchor.constraint(equalTo: uploadImageTitleLabel.bottomAnchor, constant: 20),
+ uploadImageCollectionView.leadingAnchor.constraint(equalTo: popupMainImageView.leadingAnchor),
+ uploadImageCollectionView.trailingAnchor.constraint(equalTo: safeArea.trailingAnchor, constant: -27),
+ uploadImageCollectionView.heightAnchor.constraint(equalTo: view.heightAnchor, multiplier: 70/852),
+
+ reviewCompleteButtonTopConstraint,
+ reviewCompleteButton.leadingAnchor.constraint(equalTo: popupMainImageView.leadingAnchor),
+ reviewCompleteButton.bottomAnchor.constraint(equalTo: safeArea.bottomAnchor, constant: -51),
+ reviewCompleteButton.centerXAnchor.constraint(equalTo: safeArea.centerXAnchor),
+ reviewCompleteButton.heightAnchor.constraint(equalTo: view.heightAnchor, multiplier: 55/852)
+ ])
+ }
+} | Swift | ๋์์ธ์ด ์ถ๊ฐ๋์ด์ผํ์ง๋ง.. ์ผ๋ฟ์ผ๋ก ํ์๋๋๊ฑฐ๋ณด๋ค x๋ฒํผ์ด ์๋๊ฒ ์ด๋จ๊น์?
์ฌ์ฉ์ ์
์ฅ์์ ์ด๋ฏธ์ง๋ฅผ ์ด๊ธฐํ ํ๊ณ ์ถ์ ๋ ์ฌ์ง์ ํฐ์นํ๋ฉด ์ด๋ฏธ์ง ์ด๊ธฐํ๋ฅผ ํ๋ค๋๊ฑธ ๋ ์ฌ๋ฆฌ๊ธฐ๊ฐ ์ด๋ ค์ธ๊ฑฐ ๊ฐ์์์! |
@@ -0,0 +1,43 @@
+//
+// PopcornOrangeButton.swift
+// Popcorn-iOS
+//
+// Created by ์ ๋ฏผ์ฐ on 1/12/25.
+//
+
+import UIKit
+
+final class PopcornOrangeButton: UIButton {
+ init(text: String, isEnabled: Bool) {
+ super.init(frame: .zero)
+ configureInitialSetting(isEnabled: isEnabled)
+ configureButtonUI(text: text)
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+}
+
+// MARK: - Configure Initial Setting
+extension PopcornOrangeButton {
+ private func configureInitialSetting(isEnabled: Bool) {
+ self.isEnabled = isEnabled
+ self.cornerRadius(radius: 10)
+ }
+
+ private func configureButtonUI(text: String) {
+ var config = UIButton.Configuration.filled()
+ config.baseBackgroundColor = isEnabled == true
+ ? UIColor(resource: .popcornOrange)
+ : UIColor(resource: .popcornGray2)
+ config.attributedTitle = AttributedString(
+ text,
+ attributes: AttributeContainer([
+ .font: UIFont(name: RobotoFontName.robotoSemiBold, size: 15)!,
+ .foregroundColor: UIColor(.white)
+ ])
+ )
+ configuration = config
+ }
+} | Swift | ๋ต! ๋์ค์ ํ๋ฉด ์ฐ๊ฒฐ ์ ๋ด๋น๊ฒ์ด์
๋ฐ ๊ตฌํํ๋ ค๊ณ ํ์์ต๋๋ค! |
@@ -0,0 +1,425 @@
+//
+// WriteReviewViewController.swift
+// Popcorn-iOS
+//
+// Created by ์ ๋ฏผ์ฐ on 1/12/25.
+//
+
+import PhotosUI
+import UIKit
+
+final class WriteReviewViewController: UIViewController {
+ private let viewModel = WriteReviewViewModel()
+
+ private let popupMainImageView: UIImageView = {
+ let imageView = UIImageView()
+ imageView.image = UIImage(resource: .imagePlaceHolder)
+ imageView.contentMode = .scaleAspectFill
+ imageView.clipsToBounds = true
+ return imageView
+ }()
+
+ private let popupTitleLabel: UILabel = {
+ let label = UILabel()
+ label.popcornSemiBold(text: "ํ์
์ ๋ชฉ", size: 15)
+ label.numberOfLines = 0
+ return label
+ }()
+
+ private let popupPeriodLabel: UILabel = {
+ let label = UILabel()
+ label.popcornMedium(text: "00.00.00~00.00.00", size: 10)
+ return label
+ }()
+
+ private let userSatisfactionTitleLabel: UILabel = {
+ let label = UILabel()
+ label.popcornSemiBold(text: "ํ์
์คํ ์ด ๋ง์กฑ๋", size: 15)
+ return label
+ }()
+
+ private let userStatisfactionRatingView = StarRatingView(starSpacing: 11.63, isUserInteractionEnabled: true)
+
+ private let writeReviewTitleLabel: UILabel = {
+ let label = UILabel()
+ label.popcornSemiBold(text: "๋ฆฌ๋ทฐ ์์ฑ", size: 15)
+ return label
+ }()
+
+ private let reviewConstraintTitleLabel: UILabel = {
+ let label = UILabel()
+ label.popcornMedium(text: "0์ / ์ต์ 10์", size: 13)
+ label.textColor = UIColor(resource: .popcornDarkBlueGray)
+ return label
+ }()
+
+ private lazy var reviewTextView: UITextView = {
+ let textView = UITextView()
+ textView.text = viewModel.reviewTextViewPlaceHolderText
+ textView.textColor = UIColor(resource: .popcornDarkBlueGray)
+ textView.font = UIFont(name: RobotoFontName.robotoMedium, size: 15)
+ textView.textContainerInset = UIEdgeInsets(top: 15, left: 10, bottom: 15, right: 10)
+ textView.autocapitalizationType = .none
+ textView.autocorrectionType = .no // ์๋ ์์ ๋นํ์ฑํ
+ textView.spellCheckingType = .no // ๋ง์ถค๋ฒ ๊ฒ์ฌ ๋นํ์ฑํ
+ textView.smartQuotesType = .no // ์ค๋งํธ ๋ฐ์ดํ ๋นํ์ฑํ
+ textView.smartDashesType = .no // ์ค๋งํธ ๋์ ๋นํ์ฑํ
+ textView.smartInsertDeleteType = .no // ์ค๋งํธ ์ฝ์
/์ญ์ ๋นํ์ฑํ
+
+ textView.backgroundColor = UIColor(resource: .popcornGray4)
+ textView.layer.borderWidth = 1
+ textView.layer.borderColor = UIColor(resource: .popcornGray2).cgColor
+ textView.cornerRadius(radius: 10)
+ return textView
+ }()
+
+ private let uploadImageTitleLabel: UILabel = {
+ let label = UILabel()
+ label.popcornSemiBold(text: "์ฌ์ง ๋ฑ๋ก", size: 15)
+ return label
+ }()
+
+ private let uploadImageConstraintTitleLabel: UILabel = {
+ let label = UILabel()
+ label.popcornMedium(text: "0์ฅ / ์ต๋ 10์ฅ", size: 13)
+ label.textColor = UIColor(resource: .popcornDarkBlueGray)
+ return label
+ }()
+
+ private let uploadImageCollectionView: UICollectionView = {
+ let layout = UICollectionViewFlowLayout()
+ layout.scrollDirection = .horizontal
+ layout.minimumInteritemSpacing = 10
+
+ let collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
+ collectionView.showsHorizontalScrollIndicator = false
+ return collectionView
+ }()
+
+ private let reviewCompleteButton = PopcornOrangeButton(text: "๋ฆฌ๋ทฐ ๋ฑ๋กํ๊ธฐ", isEnabled: false)
+
+ // MARK: - Stack View
+ private lazy var popupTitlePeriodStackView: UIStackView = {
+ let stackView = UIStackView(arrangedSubviews: [popupTitleLabel, popupPeriodLabel])
+ stackView.axis = .vertical
+ stackView.spacing = 5
+ stackView.alignment = .leading
+ stackView.distribution = .fillProportionally
+ return stackView
+ }()
+
+ init(image: UIImage, title: String, period: String) {
+ super.init(nibName: nil, bundle: nil)
+ popupMainImageView.image = image
+ popupTitleLabel.text = title
+ popupPeriodLabel.text = period
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+
+ override func viewDidLoad() {
+ super.viewDidLoad()
+ configureInitialSetting()
+ configureSubviews()
+ configureLayout()
+ configureAction()
+ bind(to: viewModel)
+ }
+
+ func bind(to viewModel: WriteReviewViewModel) {
+ viewModel.reviewTextPublisher = { [weak self] textCount in
+ guard let self else { return }
+ DispatchQueue.main.async {
+ self.reviewConstraintTitleLabel.text = "\(textCount)์ / ์ต์ 10์"
+ }
+ }
+
+ viewModel.reviewImagesPublisher = { [weak self] imageCount in
+ guard let self else { return }
+ DispatchQueue.main.async {
+ self.uploadImageConstraintTitleLabel.text = "\(imageCount)์ฅ / ์ต๋ 10์ฅ"
+ self.uploadImageCollectionView.reloadData()
+ }
+ }
+
+ viewModel.isSubmitEnabledPublisher = { [weak self] isSubmitEnable in
+ guard let self else { return }
+
+ DispatchQueue.main.async {
+ self.reviewCompleteButton.isEnabled = isSubmitEnable
+ self.reviewCompleteButton.configuration?.baseBackgroundColor = isSubmitEnable
+ ? UIColor(resource: .popcornOrange)
+ : UIColor(resource: .popcornGray2)
+ }
+ }
+ }
+}
+
+// MARK: - Initial Setting
+extension WriteReviewViewController {
+ private func configureInitialSetting() {
+ view.backgroundColor = .white
+
+ configureGestureRecognizer()
+ configureCollectionView()
+ reviewTextView.delegate = self
+ userStatisfactionRatingView.delegate = self
+ }
+
+ private func configureCollectionView() {
+ uploadImageCollectionView.dataSource = self
+ uploadImageCollectionView.delegate = self
+
+ uploadImageCollectionView.register(
+ UploadImageCollectionViewCell.self,
+ forCellWithReuseIdentifier: UploadImageCollectionViewCell.reuseIdentifier
+ )
+ }
+
+ private func configureGestureRecognizer() {
+ let panGesture = UIPanGestureRecognizer(
+ target: userStatisfactionRatingView,
+ action: #selector(userStatisfactionRatingView.handlePanGesture(_:))
+ )
+ let tapGesture = UITapGestureRecognizer(
+ target: userStatisfactionRatingView,
+ action: #selector(userStatisfactionRatingView.handleTapGesture(_:))
+ )
+ [panGesture, tapGesture].forEach { userStatisfactionRatingView.addGestureRecognizer($0) }
+ }
+}
+
+// MARK: - Configure Action
+extension WriteReviewViewController {
+ private func configureAction() {
+ reviewCompleteButton.addAction(UIAction { [weak self] _ in
+ guard let self else { return }
+ self.didTapReviewCompleteButton()
+ }, for: .touchUpInside)
+ }
+
+ private func didTapReviewCompleteButton() {
+ viewModel.postReviewData()
+ self.navigationController?.popViewController(animated: true)
+ }
+}
+
+// MARK: - Implement StarRatingView Delegate
+extension WriteReviewViewController: StarRatingViewDelegate {
+ func didChangeRating(to rating: Float) {
+ viewModel.updateRating(rating)
+ }
+}
+
+// MARK: - Implement UITextView Delegate
+extension WriteReviewViewController: UITextViewDelegate {
+ func textViewDidChange(_ textView: UITextView) {
+ viewModel.updateReviewText(textView.text)
+ }
+
+ func textViewDidBeginEditing(_ textView: UITextView) {
+ if textView.text == viewModel.reviewTextViewPlaceHolderText {
+ textView.text = nil
+ textView.textColor = UIColor.black
+ }
+ }
+
+ func textViewDidEndEditing(_ textView: UITextView) {
+ if textView.text.isEmpty {
+ textView.text = viewModel.reviewTextViewPlaceHolderText
+ textView.textColor = UIColor(resource: .popcornDarkBlueGray)
+ }
+ }
+
+ override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
+ view.endEditing(true)
+ }
+}
+
+// MARK: - Configure PHPicker
+extension WriteReviewViewController: PHPickerViewControllerDelegate {
+ private func configurePHPicker(selectionLimit: Int) {
+ var config = PHPickerConfiguration()
+ config.selectionLimit = selectionLimit
+ config.filter = .images
+
+ let phPickerViewController = PHPickerViewController(configuration: config)
+ phPickerViewController.delegate = self
+ self.present(phPickerViewController, animated: true)
+ }
+
+ func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) {
+ picker.dismiss(animated: true)
+
+ results.forEach { [weak self] result in
+ guard let self else { return }
+ guard viewModel.provideReviewImagesCount() <= 10 else { return }
+
+ let itemProvider = result.itemProvider
+ if itemProvider.canLoadObject(ofClass: UIImage.self) {
+ itemProvider.loadObject(ofClass: UIImage.self) { image, error in
+ if error != nil {
+ return
+ }
+
+ if let image = image as? UIImage {
+ self.viewModel.addImage(image)
+ }
+ }
+ }
+ }
+ }
+
+ private func presentResetAlert(for index: Int) {
+ let alert = UIAlertController(title: "์ด๋ฏธ์ง ์ด๊ธฐํ", message: "ํด๋น ์ด๋ฏธ์ง๋ฅผ ์ด๊ธฐํ ํ์๊ฒ ์ต๋๊น?", preferredStyle: .alert)
+ alert.addAction(UIAlertAction(title: "์ทจ์", style: .cancel, handler: nil))
+ alert.addAction(UIAlertAction(title: "์ด๊ธฐํ", style: .destructive) { [weak self] _ in
+ guard let self else { return }
+ self.viewModel.resetImage(at: index)
+ })
+ present(alert, animated: true)
+ }
+}
+
+// MARK: - Implement UICollectionView DataSource
+extension WriteReviewViewController: UICollectionViewDataSource {
+ func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+ return 10
+ }
+
+ func collectionView(
+ _ collectionView: UICollectionView,
+ cellForItemAt indexPath: IndexPath
+ ) -> UICollectionViewCell {
+ guard let cell = collectionView.dequeueReusableCell(
+ withReuseIdentifier: UploadImageCollectionViewCell.reuseIdentifier,
+ for: indexPath
+ ) as? UploadImageCollectionViewCell else {
+ return UICollectionViewCell()
+ }
+
+ let reviewImage = viewModel.provideReviewImages(at: indexPath.item)
+ cell.configureContents(image: reviewImage)
+
+ return cell
+ }
+}
+
+// MARK: - Implement UICollectionView DelegateFlowLayout
+extension WriteReviewViewController: UICollectionViewDelegateFlowLayout {
+ func collectionView(
+ _ collectionView: UICollectionView,
+ layout collectionViewLayout: UICollectionViewLayout,
+ sizeForItemAt indexPath: IndexPath
+ ) -> CGSize {
+ let height = view.bounds.height * 70 / 852
+ let width = height
+
+ return CGSize(width: width, height: height)
+ }
+
+ func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+ let image = viewModel.provideReviewImages(at: indexPath.item)
+
+ if image != UIImage(resource: .uploadImagePlaceholder) {
+ presentResetAlert(for: indexPath.item)
+ } else {
+ let selectionLimit = 10 - viewModel.provideReviewImagesCount()
+ configurePHPicker(selectionLimit: selectionLimit)
+ }
+ }
+}
+
+// MARK: - Configure UI
+extension WriteReviewViewController {
+ private func configureSubviews() {
+ [
+ popupMainImageView,
+ popupTitlePeriodStackView,
+ userSatisfactionTitleLabel,
+ userStatisfactionRatingView,
+ writeReviewTitleLabel,
+ reviewConstraintTitleLabel,
+ reviewTextView,
+ uploadImageTitleLabel,
+ uploadImageConstraintTitleLabel,
+ uploadImageCollectionView,
+ reviewCompleteButton
+ ].forEach {
+ view.addSubview($0)
+ $0.translatesAutoresizingMaskIntoConstraints = false
+ }
+ }
+
+ private func configureLayout() {
+ let safeArea = view.safeAreaLayoutGuide
+ let reviewCompleteButtonTopConstraint = reviewCompleteButton.topAnchor.constraint(
+ greaterThanOrEqualTo: uploadImageCollectionView.bottomAnchor,
+ constant: 64
+ )
+ let screenHeight = view.bounds.height
+ let verticalSpacing = screenHeight >= 800 ? CGFloat(45) : CGFloat(30)
+
+ reviewCompleteButtonTopConstraint.priority = .defaultLow
+ NSLayoutConstraint.activate([
+ popupMainImageView.topAnchor.constraint(equalTo: safeArea.topAnchor, constant: 30),
+ popupMainImageView.leadingAnchor.constraint(equalTo: safeArea.leadingAnchor, constant: 26),
+ popupMainImageView.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 50/393),
+ popupMainImageView.heightAnchor.constraint(equalTo: popupMainImageView.widthAnchor),
+
+ popupTitlePeriodStackView.leadingAnchor.constraint(
+ equalTo: popupMainImageView.trailingAnchor,
+ constant: 10
+ ),
+ popupTitlePeriodStackView.centerYAnchor.constraint(equalTo: popupMainImageView.centerYAnchor),
+
+ userSatisfactionTitleLabel.topAnchor.constraint(
+ equalTo: popupMainImageView.bottomAnchor,
+ constant: verticalSpacing
+ ),
+ userSatisfactionTitleLabel.leadingAnchor.constraint(equalTo: popupMainImageView.leadingAnchor),
+
+ userStatisfactionRatingView.topAnchor.constraint(
+ equalTo: userSatisfactionTitleLabel.bottomAnchor,
+ constant: 20
+ ),
+ userStatisfactionRatingView.centerXAnchor.constraint(equalTo: safeArea.centerXAnchor),
+
+ writeReviewTitleLabel.topAnchor.constraint(
+ equalTo: userStatisfactionRatingView.bottomAnchor,
+ constant: verticalSpacing
+ ),
+ writeReviewTitleLabel.leadingAnchor.constraint(equalTo: popupMainImageView.leadingAnchor),
+ writeReviewTitleLabel.centerXAnchor.constraint(equalTo: safeArea.centerXAnchor),
+
+ reviewConstraintTitleLabel.centerYAnchor.constraint(equalTo: writeReviewTitleLabel.centerYAnchor),
+ reviewConstraintTitleLabel.trailingAnchor.constraint(equalTo: safeArea.trailingAnchor, constant: -27),
+
+ reviewTextView.topAnchor.constraint(equalTo: writeReviewTitleLabel.bottomAnchor, constant: 20),
+ reviewTextView.leadingAnchor.constraint(equalTo: popupMainImageView.leadingAnchor),
+ reviewTextView.centerXAnchor.constraint(equalTo: safeArea.centerXAnchor),
+ reviewTextView.heightAnchor.constraint(equalTo: view.heightAnchor, multiplier: 104/852),
+
+ uploadImageTitleLabel.topAnchor.constraint(equalTo: reviewTextView.bottomAnchor, constant: verticalSpacing),
+ uploadImageTitleLabel.leadingAnchor.constraint(equalTo: popupMainImageView.leadingAnchor),
+ uploadImageConstraintTitleLabel.trailingAnchor.constraint(
+ equalTo: reviewConstraintTitleLabel.trailingAnchor
+ ),
+
+ uploadImageConstraintTitleLabel.centerYAnchor.constraint(equalTo: uploadImageTitleLabel.centerYAnchor),
+
+ uploadImageCollectionView.topAnchor.constraint(equalTo: uploadImageTitleLabel.bottomAnchor, constant: 20),
+ uploadImageCollectionView.leadingAnchor.constraint(equalTo: popupMainImageView.leadingAnchor),
+ uploadImageCollectionView.trailingAnchor.constraint(equalTo: safeArea.trailingAnchor, constant: -27),
+ uploadImageCollectionView.heightAnchor.constraint(equalTo: view.heightAnchor, multiplier: 70/852),
+
+ reviewCompleteButtonTopConstraint,
+ reviewCompleteButton.leadingAnchor.constraint(equalTo: popupMainImageView.leadingAnchor),
+ reviewCompleteButton.bottomAnchor.constraint(equalTo: safeArea.bottomAnchor, constant: -51),
+ reviewCompleteButton.centerXAnchor.constraint(equalTo: safeArea.centerXAnchor),
+ reviewCompleteButton.heightAnchor.constraint(equalTo: view.heightAnchor, multiplier: 55/852)
+ ])
+ }
+} | Swift | ์ค์๋ก ์ธํด ์ฌ์ง์ด ์ญ์ ๋๋ ๊ฒ์ ๋ฐฉ์งํ๊ธฐ ์ํด ์ผ๋ฟ์ผ๋ก ํ์ํ์ฌ ํ์ธ์ ๋ค์ ํ ์ ์๋๋ก ์๋ํ์์ต๋๋ค!
๋์์ด๋๋๊ณผ ๋ค์ ํ ๋ฒ ์์ํด๋ด์ผ๊ฒ ๋ค์!! |
@@ -0,0 +1,15 @@
+import { useQuery } from '@tanstack/react-query';
+
+import getTempleReviews from './axios';
+import { ReviewsResponse } from './type';
+
+const useGetTempleReviews = (templestayId: string, page: number) => {
+ const { data, isLoading, isError } = useQuery<ReviewsResponse>({
+ queryKey: ['reviews', templestayId, page],
+ queryFn: () => getTempleReviews(templestayId, page),
+ });
+
+ return { data, isLoading, isError };
+};
+
+export default useGetTempleReviews; | TypeScript | ํ์ฌ ์ฟผ๋ฆฌํค๊ฐ reviews์ page๋ก๋ง ์ ํด์ ธ ์์ด์ ๋ชจ๋ ํ
ํ์คํ
์ด ๋ฆฌ๋ทฐ๊ฐ ๊ฐ์ ์ฟผ๋ฆฌํค๋ฅผ ๊ณต์ ํ๊ณ ์์ด์ queryKey: ['reviews', templestayId, page],๋ก templestayId๋ฅผ ์ฟผ๋ฆฌํค์ ์ถ๊ฐํด์ฃผ์๋ฉด ๊ฐ ํ
ํ์คํ
์ด ๋ฆฌ๋ทฐ๋ฅผ ๊ตฌ๋ณํ ์ ์์ ๊ฒ ๊ฐ์ต๋๋ค. |
@@ -0,0 +1,15 @@
+import { useQuery } from '@tanstack/react-query';
+
+import getTempleReviews from './axios';
+import { ReviewsResponse } from './type';
+
+const useGetTempleReviews = (templestayId: string, page: number) => {
+ const { data, isLoading, isError } = useQuery<ReviewsResponse>({
+ queryKey: ['reviews', templestayId, page],
+ queryFn: () => getTempleReviews(templestayId, page),
+ });
+
+ return { data, isLoading, isError };
+};
+
+export default useGetTempleReviews; | TypeScript | ๋ต ๋ฐ์ํ๊ฒ ์ต๋๋ค |
@@ -0,0 +1,36 @@
+package me.misik.api.infra
+
+import me.misik.api.core.Chatbot
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.http.HttpHeaders
+import org.springframework.http.MediaType
+import org.springframework.web.reactive.function.client.WebClient
+import org.springframework.web.reactive.function.client.support.WebClientAdapter
+import org.springframework.web.service.invoker.HttpServiceProxyFactory
+
+@Configuration
+class ClovaChatbotConfiguration(
+ @Value("\${me.misik.chatbot.clova.url:https://clovastudio.stream.ntruss.com/}") private val chatbotUrl: String,
+ @Value("\${me.misik.chatbot.clova.authorization}") private val authorization: String,
+) {
+
+ @Bean
+ fun clovaChatbot(): Chatbot {
+ val webClient = WebClient.builder()
+ .baseUrl(chatbotUrl)
+ .defaultHeaders { headers ->
+ headers.add(HttpHeaders.AUTHORIZATION, "Bearer $authorization")
+ headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+ headers.add(HttpHeaders.ACCEPT, MediaType.TEXT_EVENT_STREAM_VALUE)
+ }
+ .build()
+
+ val httpServiceProxyFactory = HttpServiceProxyFactory
+ .builderFor(WebClientAdapter.create(webClient))
+ .build()
+
+ return httpServiceProxyFactory.createClient(Chatbot::class.java)
+ }
+} | Kotlin | hoxy ํ๊ฒฝ๋ณ์ ๋ฑ๋กํ๋๊ฑฐ๋ฉด @Value ์ฌ์ฉํด๋ ๋ ๊น์? ํน์ @Qualifier๋ ์ฌ์ฉํ ๋น ๊ฐ์ฒด ์ ํ ์ ์ฐ๋๊ฑธ๋ก ์๊ณ ์๋๋ฐ ํ๊ฒฝ๋ณ์ ๋ฑ๋กํ ๋๋ ์ธ ์ ์๋ ๋ฐฉ๋ฒ์ด ์๋์ง์ฉ? ๐ |
@@ -0,0 +1,17 @@
+package me.misik.api.api
+
+import me.misik.api.app.ReCreateReviewFacade
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+class ReviewController(
+ private val reCreateReviewFacade: ReCreateReviewFacade,
+) {
+
+ @PostMapping("reviews/{id}/re-create")
+ fun reCreateReview(
+ @PathVariable("id") id: Long,
+ ) = reCreateReviewFacade.reCreateReviewInBackground(id)
+} | Kotlin | ์ฌ์์ฑ๋ ๋ฆฌ๋ทฐ๋ ์บ์ฑ์ ํ์ฉํ๋ฉด ์ข์ ๊ฒ ๊ฐ์๋ฐ ์ ๊ฐ #5 ํ ๋ ์ถ๊ฐํด๋ด๋ ๋ ๊น์?
1) ์ฌ์ฌ์ฉ์ ์ํด DB์ ์ ์ฅ
2) ์ด๋ฏธ ๊ฐ์ ์ ์ ์๊ฒ ์ ๊ณต๋ ๋ฆฌ๋ทฐ๋ ๋ ์ ๊ณต X
์๋ฅผ ์ํด์ device id ํค๋๋ฅผ ๋ฐ์์ค๋ ค๊ณ ํฉ๋๋น! |
@@ -0,0 +1,24 @@
+# ๋ฆฌ๋ทฐ ์์ฑ
+
+๋ฆฌ๋ทฐ๋ฅผ ์์ฑํฉ๋๋ค.
+
+## Request
+
+### HTTP METHOD : `GET`
+
+### url : `https://api.misik.me/reviews/{id}`
+### Http Headers
+- device-id: ์๋ณํ ์ ์๋ ๊ฐ
+ `๋ฏธ๋์๋ ๋ณํ์ง ์์์ผํจ ์ฑ์ ์ญ์ ํ๋ค ๋ค์ ๊น์๋ ์๋ณํ๋ ๊ฐ์ผ๋ก ์ค ์ ์๋์ง`
+
+### Response
+
+#### `Response Status 200 OK`
+
+```json
+{
+ "isSuccess": true, // ๋ฆฌ๋ทฐ๊ฐ ์์ฑ๋์ง ์์์ผ๋ฉด false, ์ ์ฒด๊ฐ ์ฑ๊ณต๋๋ฉด true
+ "id": "123456789",
+ "review": "์นด์ผํ ์ค๋ ์จ๊ฒจ์ ธ ์๋ ์นด์ผ์ผ๊ณผ ๋ฒํฐ๊ฐ ํ์คํ ๊ฐ๋ํฉ๋๋ค. ๋ํ, ๊ฐ๊ฒ์ ๋ถ์๊ธฐ๋ ์๋ํ๊ณ ํธ์ํ๊ณ ๋ฐ๊นฅ์ชฝ์ ์๊ณ ์ฌ๋ํ๋ ์๊ฐ์ ๋ณด๋ผ ์ ์๋ ๊ณต๊ฐ์
๋๋ค. ๋ฌด์๋ณด๋ค ๊ฐ๊ฒฉ์ ๋นํด ์์์ ํ์ง์ด ์ ๋ง ํ๋ฅญํด์, ๋ง์์ ๋ค์์ต๋๋ค."
+}
+``` | Unknown | ์ด ๋ถ๋ถ ๋ค์ ์์ง๋์ด ํ์ ๋ ํด๋ผ์ด์ธํธ ๋ถ๋ค๊ณผ ์ด์ผ๊ธฐ ํด๋ณด๋ฉด ์ด๋จ๊น์? ๐
์์ผ๋ก๋ ๋น์ทํ ์กฐํ ๋ก์ง์ ์ํด ํฉ์ํด๋๋ฉด ์ข์๋ฏ์!
์ง๊ธ์ฒ๋ผ ์กฐํํ ๋ ๊ฐ์ด ์์ผ๋ฉด 200์ ์ฃผ๊ณ ํ๋๋ก ๊ตฌ๋ถํ๊ฒ ํ ๊ฒ์ธ์ง, ์๋๋ฉด 400์ ๋ด๋ ค์ค์ง์ ๋ํด์์ฉ! |
@@ -0,0 +1,17 @@
+package me.misik.api.api
+
+import me.misik.api.app.ReCreateReviewFacade
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+class ReviewController(
+ private val reCreateReviewFacade: ReCreateReviewFacade,
+) {
+
+ @PostMapping("reviews/{id}/re-create")
+ fun reCreateReview(
+ @PathVariable("id") id: Long,
+ ) = reCreateReviewFacade.reCreateReviewInBackground(id)
+} | Kotlin | hoxy ์ฌ๊ธฐ ๋ฉ์๋๋ช
์ด reCreateReview๊ฐ ์๋ createReview์ธ๋ฐ ์๋ํ์ ๊ฑธ๊น์? ๐ฅณ |
@@ -0,0 +1,24 @@
+# ๋ฆฌ๋ทฐ ์์ฑ
+
+๋ฆฌ๋ทฐ๋ฅผ ์์ฑํฉ๋๋ค.
+
+## Request
+
+### HTTP METHOD : `GET`
+
+### url : `https://api.misik.me/reviews/{id}`
+### Http Headers
+- device-id: ์๋ณํ ์ ์๋ ๊ฐ
+ `๋ฏธ๋์๋ ๋ณํ์ง ์์์ผํจ ์ฑ์ ์ญ์ ํ๋ค ๋ค์ ๊น์๋ ์๋ณํ๋ ๊ฐ์ผ๋ก ์ค ์ ์๋์ง`
+
+### Response
+
+#### `Response Status 200 OK`
+
+```json
+{
+ "isSuccess": true, // ๋ฆฌ๋ทฐ๊ฐ ์์ฑ๋์ง ์์์ผ๋ฉด false, ์ ์ฒด๊ฐ ์ฑ๊ณต๋๋ฉด true
+ "id": "123456789",
+ "review": "์นด์ผํ ์ค๋ ์จ๊ฒจ์ ธ ์๋ ์นด์ผ์ผ๊ณผ ๋ฒํฐ๊ฐ ํ์คํ ๊ฐ๋ํฉ๋๋ค. ๋ํ, ๊ฐ๊ฒ์ ๋ถ์๊ธฐ๋ ์๋ํ๊ณ ํธ์ํ๊ณ ๋ฐ๊นฅ์ชฝ์ ์๊ณ ์ฌ๋ํ๋ ์๊ฐ์ ๋ณด๋ผ ์ ์๋ ๊ณต๊ฐ์
๋๋ค. ๋ฌด์๋ณด๋ค ๊ฐ๊ฒฉ์ ๋นํด ์์์ ํ์ง์ด ์ ๋ง ํ๋ฅญํด์, ๋ง์์ ๋ค์์ต๋๋ค."
+}
+``` | Unknown | ๐ ๋ ์ข์์! streaming ๋ฐฉ์ ์ง์ํ ๊ฑฐ๋ผ์ ์์ฑ์ ๋ฆฌ๋ทฐ id๋ง ๋ฐํํ๊ณ , id๋ก ์ฌ๋ฌ ๋ฒ ์กฐํํด์ค๊ฒ ํ๊ธฐ!! ์ข์ต๋๋น!! |
@@ -0,0 +1,65 @@
+package me.misik.api.core
+
+import kotlinx.coroutines.flow.Flow
+import me.misik.api.domain.Review
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.service.annotation.PostExchange
+
+fun interface Chatbot {
+
+ @PostExchange("/testapp/v1/chat-completions/HCX-003")
+ fun createReviewWithModelName(@RequestBody request: Request): Flow<Response>
+
+ data class Request(
+ val messages: List<Message>,
+ val includeAiFilters: Boolean = true,
+ ) {
+ data class Message(
+ val role: String,
+ val content: String,
+ ) {
+
+ companion object {
+
+ fun createSystem(content: String) = Message(
+ role = "system",
+ content = content,
+ )
+
+ fun createUser(content: String) = Message(
+ role = "user",
+ content = content,
+ )
+ }
+ }
+
+ companion object {
+ private val cachedSystemMessage = Message.createSystem(
+ """
+ ๋๋ ์ง๊ธ๋ถํฐ ์์์ ๋ํ ๋ฆฌ๋ทฐ๋ฅผ ํ๋ ๊ณ ๋
ํ ๋ฏธ์๊ฐ์ผ.
+ ๋ต๋ณ์๋ ๋ฆฌ๋ทฐ์ ๋ํ ๋ด์ฉ๋ง ํฌํจํด.
+ ๋ํ, ์๋ต ๋ฉ์์ง๋ ๊ณต๋ฐฑ์ ํฌํจํด์ 300์๊ฐ ๋์ผ๋ฉด ์ ๋๋ก ์๋ผ.
+ """
+ )
+
+ fun from(review: Review): Request {
+ return Request(
+ messages = listOf(
+ cachedSystemMessage,
+ Message.createUser(review.requestPrompt.text)
+ )
+ )
+ }
+ }
+ }
+
+ data class Response(
+ val stopReason: String?,
+ val message: Message?,
+ ) {
+ data class Message(
+ val role: String,
+ val content: String,
+ )
+ }
+} | Kotlin | HTTP Interface ๐ ๊ฐ๋
์ฑ ์งฑ์ด๋ค์ฉ |
@@ -0,0 +1,24 @@
+# ๋ฆฌ๋ทฐ ์์ฑ
+
+๋ฆฌ๋ทฐ๋ฅผ ์์ฑํฉ๋๋ค.
+
+## Request
+
+### HTTP METHOD : `GET`
+
+### url : `https://api.misik.me/reviews/{id}`
+### Http Headers
+- device-id: ์๋ณํ ์ ์๋ ๊ฐ
+ `๋ฏธ๋์๋ ๋ณํ์ง ์์์ผํจ ์ฑ์ ์ญ์ ํ๋ค ๋ค์ ๊น์๋ ์๋ณํ๋ ๊ฐ์ผ๋ก ์ค ์ ์๋์ง`
+
+### Response
+
+#### `Response Status 200 OK`
+
+```json
+{
+ "isSuccess": true, // ๋ฆฌ๋ทฐ๊ฐ ์์ฑ๋์ง ์์์ผ๋ฉด false, ์ ์ฒด๊ฐ ์ฑ๊ณต๋๋ฉด true
+ "id": "123456789",
+ "review": "์นด์ผํ ์ค๋ ์จ๊ฒจ์ ธ ์๋ ์นด์ผ์ผ๊ณผ ๋ฒํฐ๊ฐ ํ์คํ ๊ฐ๋ํฉ๋๋ค. ๋ํ, ๊ฐ๊ฒ์ ๋ถ์๊ธฐ๋ ์๋ํ๊ณ ํธ์ํ๊ณ ๋ฐ๊นฅ์ชฝ์ ์๊ณ ์ฌ๋ํ๋ ์๊ฐ์ ๋ณด๋ผ ์ ์๋ ๊ณต๊ฐ์
๋๋ค. ๋ฌด์๋ณด๋ค ๊ฐ๊ฒฉ์ ๋นํด ์์์ ํ์ง์ด ์ ๋ง ํ๋ฅญํด์, ๋ง์์ ๋ค์์ต๋๋ค."
+}
+``` | Unknown | ์ ์ด๊ฒ 60์ด ๋๊ธฐ๋๋ฌธ์ ์ถ๊ฐ๋๊ฑฐ๊ตฐ์!
1. ๋ฆฌ๋ทฐ ์์ฑ ์ค, ์์ง ๋ ์์ฑ๋จ
2. ์์ ์๋ ๋ฆฌ๋ทฐid๋ฅผ ์กฐํํ๋ ค๊ณ ํจ
3. ๋ฆฌ๋ทฐ ์์ฑ๋จ, ์กฐํ ๊ฐ๋ฅ
์ด๋ ๊ฒ 3๊ฐ์ง ๊ฒฝ์ฐ๊ฐ ์์ด๋ณด์ฌ์! |
@@ -0,0 +1,36 @@
+package me.misik.api.infra
+
+import me.misik.api.core.Chatbot
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.http.HttpHeaders
+import org.springframework.http.MediaType
+import org.springframework.web.reactive.function.client.WebClient
+import org.springframework.web.reactive.function.client.support.WebClientAdapter
+import org.springframework.web.service.invoker.HttpServiceProxyFactory
+
+@Configuration
+class ClovaChatbotConfiguration(
+ @Value("\${me.misik.chatbot.clova.url:https://clovastudio.stream.ntruss.com/}") private val chatbotUrl: String,
+ @Value("\${me.misik.chatbot.clova.authorization}") private val authorization: String,
+) {
+
+ @Bean
+ fun clovaChatbot(): Chatbot {
+ val webClient = WebClient.builder()
+ .baseUrl(chatbotUrl)
+ .defaultHeaders { headers ->
+ headers.add(HttpHeaders.AUTHORIZATION, "Bearer $authorization")
+ headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+ headers.add(HttpHeaders.ACCEPT, MediaType.TEXT_EVENT_STREAM_VALUE)
+ }
+ .build()
+
+ val httpServiceProxyFactory = HttpServiceProxyFactory
+ .builderFor(WebClientAdapter.create(webClient))
+ .build()
+
+ return httpServiceProxyFactory.createClient(Chatbot::class.java)
+ }
+} | Kotlin | ์ค ์คํ์
๋๋ค! ใ
ใ
ใ
ใ
์์ ํ์ต๋๋ค [b838a91](https://github.com/Nexters/misik-api/pull/7/commits/b838a916d60cf5b000f306c15caf7652e9ee0082) |
@@ -0,0 +1,17 @@
+package me.misik.api.api
+
+import me.misik.api.app.ReCreateReviewFacade
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+class ReviewController(
+ private val reCreateReviewFacade: ReCreateReviewFacade,
+) {
+
+ @PostMapping("reviews/{id}/re-create")
+ fun reCreateReview(
+ @PathVariable("id") id: Long,
+ ) = reCreateReviewFacade.reCreateReviewInBackground(id)
+} | Kotlin | ๋ต ๋น์ฐํ์ฃต ์์ ํด์ฃผ์
๋ ๋ฉ๋๋ค!
์ถ๊ฐ๋ก, ๊ตฌํํ๋ฉด์ ์ถ์์ ์ ํด์ผํ ๊ฑฐ ๊ฐ์ ์บ์ฑ์ ๋ฐ๊ฒฌํ๋๋ฐ์.
ํ์ฌ๋ ๋ฆฌ๋ทฐ๋ฅผ ์์ฑํ ๋, streaming๋ฐฉ์์ผ๋ก DB์ ํ๋์ฉ ์ ์ฌ๋ฅผ ํ๋ ๋ฐฉ์์ ์ฌ์ฉํ๊ณ ์์ต๋๋ค.
์ฆ, ์ฟผ๋ฆฌ๊ฐ streaming์ ์๋ต๊ฐฏ์ ๋งํผ ๋๊ฐ๊ณ , ์ ์ฌ์ง์์๋ ์ด 77๋ฒ ์ฟผ๋ฆฌ๊ฐ ์ํ๋์์ต๋๋ค.
์ด๋ ๊ฒ ๋ก์ง์ ์ง๋๊ฑด DB์ ๋ถ๋ด์ด ๋๊ณ , ์ฑ๋ฅ๋ ๋์ค๊ธฐ ํ๋๋
์ฐ๊ธฐ ์บ์ฑ์ ํด์ผํ ๊ฑฐ ๊ฐ์์.
๋๊ฐ์ง ํ๋ก์ฐ์ ๋ ๋์ค ํน์ ์ธ๋ฉ๋ชจ๋ฆฌ๋ก ์บ์ฑ์ ์ถ๊ฐํด์ผํ ๊ฑฐ ๊ฐ์๋ฐ์.
1. ์ค์๊ฐ ํด๋ง ๋ฆฌ๋ทฐ ์กฐํ (1์ฐจ MVP์์๋ ์์) -> redis์์ ์์ฑ์ค์ธ ๋ฆฌ๋ทฐ๋ฅผ ๋จผ์ ์กฐํํ๊ณ ์๋ค๋ฉด DB๋ฅผ ์กฐํํ๋ ๋ฐฉํฅ์ผ๋ก ์์
2. ๋ฆฌ๋ทฐ ์์ฑ ๋ฐ ์ฌ์์ฑ -> DB์ ๋ฆฌ๋ทฐ๋ฅผ ์ ์ฅํ๊ธฐ ์ ์ redis์ ์ ๋ถ๋ค ์ ์ฅํด๋๊ณ , ๋ฆฌ๋ทฐ ์์ฑ์ด ๋ค ๋๋ฉด DB์ flush (77๋ฒ ์ฟผ๋ฆฌ๋ฅผ 1๋ฒ์ผ๋ก ์์ ) |
@@ -0,0 +1,24 @@
+# ๋ฆฌ๋ทฐ ์์ฑ
+
+๋ฆฌ๋ทฐ๋ฅผ ์์ฑํฉ๋๋ค.
+
+## Request
+
+### HTTP METHOD : `GET`
+
+### url : `https://api.misik.me/reviews/{id}`
+### Http Headers
+- device-id: ์๋ณํ ์ ์๋ ๊ฐ
+ `๋ฏธ๋์๋ ๋ณํ์ง ์์์ผํจ ์ฑ์ ์ญ์ ํ๋ค ๋ค์ ๊น์๋ ์๋ณํ๋ ๊ฐ์ผ๋ก ์ค ์ ์๋์ง`
+
+### Response
+
+#### `Response Status 200 OK`
+
+```json
+{
+ "isSuccess": true, // ๋ฆฌ๋ทฐ๊ฐ ์์ฑ๋์ง ์์์ผ๋ฉด false, ์ ์ฒด๊ฐ ์ฑ๊ณต๋๋ฉด true
+ "id": "123456789",
+ "review": "์นด์ผํ ์ค๋ ์จ๊ฒจ์ ธ ์๋ ์นด์ผ์ผ๊ณผ ๋ฒํฐ๊ฐ ํ์คํ ๊ฐ๋ํฉ๋๋ค. ๋ํ, ๊ฐ๊ฒ์ ๋ถ์๊ธฐ๋ ์๋ํ๊ณ ํธ์ํ๊ณ ๋ฐ๊นฅ์ชฝ์ ์๊ณ ์ฌ๋ํ๋ ์๊ฐ์ ๋ณด๋ผ ์ ์๋ ๊ณต๊ฐ์
๋๋ค. ๋ฌด์๋ณด๋ค ๊ฐ๊ฒฉ์ ๋นํด ์์์ ํ์ง์ด ์ ๋ง ํ๋ฅญํด์, ๋ง์์ ๋ค์์ต๋๋ค."
+}
+``` | Unknown | ๋ต๋ต ์๋ฒ์ฌ์ด๋ ํด๋ง (60์ด ๋๊ธฐ) ๋๋ฌธ์ ์ถ๊ฐ๋ ๋ถ๋ถ์
๋๋ค!
๋ฆฌ๋ทฐ๊ฐ ์์ฑ์ค์ด๋ฉด false, ๋ฆฌ๋ทฐ๊ฐ ์์ฑ๋์์ผ๋ฉด true๋ฅผ ์๋ตํด์ฃผ๋ ค๊ณ ํด์.
> ์์ ์๋ ๋ฆฌ๋ทฐid๋ฅผ ์กฐํํ๋ ค๊ณ ํจ
์๋ฌ ์๋ต์ด๋์ ๋ค๋ฅธ๋ด์ฉ๊ฐ์์, ์๋ฌ ์๋ตํ
ํ๋ฆฟ์ ๋ฐ๋ก ์ ์ํด๋ณด๋ฉด ๋ ๊ฒ ๊ฐ์ต๋๋ค!
ํ์ฌ๋ ์๋ ๋ฆฌ๋ทฐ๋ฅผ ์กฐํํ๋ ค๊ณ ํ๋ฉด 400 BadRequest๋ก ์๋ตํ๊ณ ์์๋๋ค. |
@@ -0,0 +1,17 @@
+package me.misik.api.api
+
+import me.misik.api.app.ReCreateReviewFacade
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+class ReviewController(
+ private val reCreateReviewFacade: ReCreateReviewFacade,
+) {
+
+ @PostMapping("reviews/{id}/re-create")
+ fun reCreateReview(
+ @PathVariable("id") id: Long,
+ ) = reCreateReviewFacade.reCreateReviewInBackground(id)
+} | Kotlin | ์คํ์
๋๋ค! ์์ ํ์ต๋๋ค ๐ฅณ |
@@ -0,0 +1,17 @@
+package me.misik.api.api
+
+import me.misik.api.app.ReCreateReviewFacade
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+class ReviewController(
+ private val reCreateReviewFacade: ReCreateReviewFacade,
+) {
+
+ @PostMapping("reviews/{id}/re-create")
+ fun reCreateReview(
+ @PathVariable("id") id: Long,
+ ) = reCreateReviewFacade.reCreateReviewInBackground(id)
+} | Kotlin | ์กฐํ, ์์ฑ(๋ฐ ์ฌ์์ฑ) ๋ ์ผ์ด์ค ๋ค ์บ์ฑ ๊ฐ์์ฃ ! ๐ |
@@ -0,0 +1,57 @@
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class Lotto {
+ private final static int LOTTO_NUM_SIZE = 6;
+ private final List<LottoNo> lottoNums;
+
+ public Lotto(List<LottoNo> lottoNums) {
+ checkSizeValid(lottoNums);
+ checkNumbersValid(lottoNums);
+ checkDuplicated(lottoNums);
+
+ this.lottoNums = lottoNums;
+ }
+
+ public List<Integer> getNums() {
+ List<Integer> lottoNumbers = new ArrayList<>();
+
+ for (LottoNo lottoNo : lottoNums) {
+ lottoNumbers.add(lottoNo.getLottoNumber());
+ }
+
+ return lottoNumbers;
+ }
+
+ public List<LottoNo> getLottoNums() {
+ return lottoNums;
+ }
+
+ public void checkSizeValid(List<LottoNo> lotto) {
+ if (!isValidLottoSize(lotto)) {
+ throw new IllegalArgumentException("6๊ฐ์ ๋ก๋ ๋ฒํธ๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.");
+ }
+ }
+
+ public void checkNumbersValid(List<LottoNo> lotto) {
+ if (lotto.contains(LottoNo.INVALID_LOTTO_NO)) {
+ throw new IllegalArgumentException("1 ~ 45 ์์ ์ ์๋ฅผ ์
๋ ฅํ์ธ์.");
+ }
+ }
+
+ public void checkDuplicated(List<LottoNo> lotto) {
+ if (!isValidLottoSize(new HashSet<>(lotto))) {
+ throw new IllegalArgumentException("๋ก๋ ๋ฒํธ๋ ์ค๋ณต๋ ์ ์์ต๋๋ค.");
+ }
+ }
+
+ boolean isValidLottoSize(List<LottoNo> lotto) {
+ return lotto.size() == LOTTO_NUM_SIZE;
+ }
+
+ boolean isValidLottoSize(Set<LottoNo> lotto) {
+ return lotto.size() == LOTTO_NUM_SIZE;
+ }
+} | Java | final ๋ก ์ ์ธํ์ ์ด์ ๊ฐ ๊ถ๊ธํฉ๋๋ค~ |
@@ -0,0 +1,57 @@
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class Lotto {
+ private final static int LOTTO_NUM_SIZE = 6;
+ private final List<LottoNo> lottoNums;
+
+ public Lotto(List<LottoNo> lottoNums) {
+ checkSizeValid(lottoNums);
+ checkNumbersValid(lottoNums);
+ checkDuplicated(lottoNums);
+
+ this.lottoNums = lottoNums;
+ }
+
+ public List<Integer> getNums() {
+ List<Integer> lottoNumbers = new ArrayList<>();
+
+ for (LottoNo lottoNo : lottoNums) {
+ lottoNumbers.add(lottoNo.getLottoNumber());
+ }
+
+ return lottoNumbers;
+ }
+
+ public List<LottoNo> getLottoNums() {
+ return lottoNums;
+ }
+
+ public void checkSizeValid(List<LottoNo> lotto) {
+ if (!isValidLottoSize(lotto)) {
+ throw new IllegalArgumentException("6๊ฐ์ ๋ก๋ ๋ฒํธ๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.");
+ }
+ }
+
+ public void checkNumbersValid(List<LottoNo> lotto) {
+ if (lotto.contains(LottoNo.INVALID_LOTTO_NO)) {
+ throw new IllegalArgumentException("1 ~ 45 ์์ ์ ์๋ฅผ ์
๋ ฅํ์ธ์.");
+ }
+ }
+
+ public void checkDuplicated(List<LottoNo> lotto) {
+ if (!isValidLottoSize(new HashSet<>(lotto))) {
+ throw new IllegalArgumentException("๋ก๋ ๋ฒํธ๋ ์ค๋ณต๋ ์ ์์ต๋๋ค.");
+ }
+ }
+
+ boolean isValidLottoSize(List<LottoNo> lotto) {
+ return lotto.size() == LOTTO_NUM_SIZE;
+ }
+
+ boolean isValidLottoSize(Set<LottoNo> lotto) {
+ return lotto.size() == LOTTO_NUM_SIZE;
+ }
+} | Java | check ๋ฉ์๋๋ค์ด public ์ธ ์ด์ ๊ฐ ์๋์~? |
@@ -0,0 +1,57 @@
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class Lotto {
+ private final static int LOTTO_NUM_SIZE = 6;
+ private final List<LottoNo> lottoNums;
+
+ public Lotto(List<LottoNo> lottoNums) {
+ checkSizeValid(lottoNums);
+ checkNumbersValid(lottoNums);
+ checkDuplicated(lottoNums);
+
+ this.lottoNums = lottoNums;
+ }
+
+ public List<Integer> getNums() {
+ List<Integer> lottoNumbers = new ArrayList<>();
+
+ for (LottoNo lottoNo : lottoNums) {
+ lottoNumbers.add(lottoNo.getLottoNumber());
+ }
+
+ return lottoNumbers;
+ }
+
+ public List<LottoNo> getLottoNums() {
+ return lottoNums;
+ }
+
+ public void checkSizeValid(List<LottoNo> lotto) {
+ if (!isValidLottoSize(lotto)) {
+ throw new IllegalArgumentException("6๊ฐ์ ๋ก๋ ๋ฒํธ๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.");
+ }
+ }
+
+ public void checkNumbersValid(List<LottoNo> lotto) {
+ if (lotto.contains(LottoNo.INVALID_LOTTO_NO)) {
+ throw new IllegalArgumentException("1 ~ 45 ์์ ์ ์๋ฅผ ์
๋ ฅํ์ธ์.");
+ }
+ }
+
+ public void checkDuplicated(List<LottoNo> lotto) {
+ if (!isValidLottoSize(new HashSet<>(lotto))) {
+ throw new IllegalArgumentException("๋ก๋ ๋ฒํธ๋ ์ค๋ณต๋ ์ ์์ต๋๋ค.");
+ }
+ }
+
+ boolean isValidLottoSize(List<LottoNo> lotto) {
+ return lotto.size() == LOTTO_NUM_SIZE;
+ }
+
+ boolean isValidLottoSize(Set<LottoNo> lotto) {
+ return lotto.size() == LOTTO_NUM_SIZE;
+ }
+} | Java | java 8 ์ stream map ์ ์จ๋ณด๋ฉด ์ด๋จ๊น์? |
@@ -0,0 +1,57 @@
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class Lotto {
+ private final static int LOTTO_NUM_SIZE = 6;
+ private final List<LottoNo> lottoNums;
+
+ public Lotto(List<LottoNo> lottoNums) {
+ checkSizeValid(lottoNums);
+ checkNumbersValid(lottoNums);
+ checkDuplicated(lottoNums);
+
+ this.lottoNums = lottoNums;
+ }
+
+ public List<Integer> getNums() {
+ List<Integer> lottoNumbers = new ArrayList<>();
+
+ for (LottoNo lottoNo : lottoNums) {
+ lottoNumbers.add(lottoNo.getLottoNumber());
+ }
+
+ return lottoNumbers;
+ }
+
+ public List<LottoNo> getLottoNums() {
+ return lottoNums;
+ }
+
+ public void checkSizeValid(List<LottoNo> lotto) {
+ if (!isValidLottoSize(lotto)) {
+ throw new IllegalArgumentException("6๊ฐ์ ๋ก๋ ๋ฒํธ๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.");
+ }
+ }
+
+ public void checkNumbersValid(List<LottoNo> lotto) {
+ if (lotto.contains(LottoNo.INVALID_LOTTO_NO)) {
+ throw new IllegalArgumentException("1 ~ 45 ์์ ์ ์๋ฅผ ์
๋ ฅํ์ธ์.");
+ }
+ }
+
+ public void checkDuplicated(List<LottoNo> lotto) {
+ if (!isValidLottoSize(new HashSet<>(lotto))) {
+ throw new IllegalArgumentException("๋ก๋ ๋ฒํธ๋ ์ค๋ณต๋ ์ ์์ต๋๋ค.");
+ }
+ }
+
+ boolean isValidLottoSize(List<LottoNo> lotto) {
+ return lotto.size() == LOTTO_NUM_SIZE;
+ }
+
+ boolean isValidLottoSize(Set<LottoNo> lotto) {
+ return lotto.size() == LOTTO_NUM_SIZE;
+ }
+} | Java | ์ ๊ทผ์ ์ด์๋ฅผ package-private ์ผ๋ก ํ์ ์ด์ ๊ฐ ์์๊น์? |
@@ -0,0 +1,57 @@
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class Lotto {
+ private final static int LOTTO_NUM_SIZE = 6;
+ private final List<LottoNo> lottoNums;
+
+ public Lotto(List<LottoNo> lottoNums) {
+ checkSizeValid(lottoNums);
+ checkNumbersValid(lottoNums);
+ checkDuplicated(lottoNums);
+
+ this.lottoNums = lottoNums;
+ }
+
+ public List<Integer> getNums() {
+ List<Integer> lottoNumbers = new ArrayList<>();
+
+ for (LottoNo lottoNo : lottoNums) {
+ lottoNumbers.add(lottoNo.getLottoNumber());
+ }
+
+ return lottoNumbers;
+ }
+
+ public List<LottoNo> getLottoNums() {
+ return lottoNums;
+ }
+
+ public void checkSizeValid(List<LottoNo> lotto) {
+ if (!isValidLottoSize(lotto)) {
+ throw new IllegalArgumentException("6๊ฐ์ ๋ก๋ ๋ฒํธ๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.");
+ }
+ }
+
+ public void checkNumbersValid(List<LottoNo> lotto) {
+ if (lotto.contains(LottoNo.INVALID_LOTTO_NO)) {
+ throw new IllegalArgumentException("1 ~ 45 ์์ ์ ์๋ฅผ ์
๋ ฅํ์ธ์.");
+ }
+ }
+
+ public void checkDuplicated(List<LottoNo> lotto) {
+ if (!isValidLottoSize(new HashSet<>(lotto))) {
+ throw new IllegalArgumentException("๋ก๋ ๋ฒํธ๋ ์ค๋ณต๋ ์ ์์ต๋๋ค.");
+ }
+ }
+
+ boolean isValidLottoSize(List<LottoNo> lotto) {
+ return lotto.size() == LOTTO_NUM_SIZE;
+ }
+
+ boolean isValidLottoSize(Set<LottoNo> lotto) {
+ return lotto.size() == LOTTO_NUM_SIZE;
+ }
+} | Java | Set<LottoNo> ๋ก ์ ์ธํ๋ ๊ฒ์ ์ด๋ป๊ฒ ์๊ฐํ์๋์~ |
@@ -0,0 +1,46 @@
+import java.util.Objects;
+
+public class LottoNo implements Comparable<LottoNo> {
+ private final static int INVALID_NUM = 0;
+ public final static LottoNo INVALID_LOTTO_NO = new LottoNo(INVALID_NUM);
+
+ private int lottoNumber;
+
+ public LottoNo(int lottoNumber) {
+ try {
+ this.lottoNumber = validateLottoNo(lottoNumber);
+ } catch (IllegalArgumentException e) {
+ this.lottoNumber = INVALID_NUM;
+ }
+ }
+
+ public int getLottoNumber() {
+ return lottoNumber;
+ }
+
+ private int validateLottoNo(int lottoNumber) {
+ if (lottoNumber < 1 || lottoNumber > 45) {
+ throw new IllegalArgumentException();
+ }
+
+ return lottoNumber;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(lottoNumber);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (lottoNumber == ((LottoNo)obj).lottoNumber)
+ return true;
+
+ return false;
+ }
+
+ @Override
+ public int compareTo(LottoNo o) {
+ return lottoNumber - o.lottoNumber;
+ }
+} | Java | LottoNo ๋ ๋ณ๊ฒฝ๋์ง ์๋ lottoNumber ํ๋๋ฅผ ๊ฐ์ง๊ณ ์์ด์ผํ๋ฏ๋ก
final ํค์๋๋ฅผ ๋ฃ์ด๋ ๋ ๊ฒ ๊ฐ๋ค์ ใ
ใ
|
@@ -0,0 +1,46 @@
+import java.util.Objects;
+
+public class LottoNo implements Comparable<LottoNo> {
+ private final static int INVALID_NUM = 0;
+ public final static LottoNo INVALID_LOTTO_NO = new LottoNo(INVALID_NUM);
+
+ private int lottoNumber;
+
+ public LottoNo(int lottoNumber) {
+ try {
+ this.lottoNumber = validateLottoNo(lottoNumber);
+ } catch (IllegalArgumentException e) {
+ this.lottoNumber = INVALID_NUM;
+ }
+ }
+
+ public int getLottoNumber() {
+ return lottoNumber;
+ }
+
+ private int validateLottoNo(int lottoNumber) {
+ if (lottoNumber < 1 || lottoNumber > 45) {
+ throw new IllegalArgumentException();
+ }
+
+ return lottoNumber;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(lottoNumber);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (lottoNumber == ((LottoNo)obj).lottoNumber)
+ return true;
+
+ return false;
+ }
+
+ @Override
+ public int compareTo(LottoNo o) {
+ return lottoNumber - o.lottoNumber;
+ }
+} | Java | ์.. RuntimeException ์ ๋ฐ์์ํค๊ณ catch ๋ฅผ ๊ตณ์ด ํ๋ ์ด์ ๊ฐ ์์๊น์?
checkedException ๊ณผ uncheckedException ์ ๋ํด์ ๊ณต๋ถํด๋ณด์๋ฉด ์ข์ ๊ฒ ๊ฐ์ต๋๋ค~ |
@@ -0,0 +1,46 @@
+import java.util.Objects;
+
+public class LottoNo implements Comparable<LottoNo> {
+ private final static int INVALID_NUM = 0;
+ public final static LottoNo INVALID_LOTTO_NO = new LottoNo(INVALID_NUM);
+
+ private int lottoNumber;
+
+ public LottoNo(int lottoNumber) {
+ try {
+ this.lottoNumber = validateLottoNo(lottoNumber);
+ } catch (IllegalArgumentException e) {
+ this.lottoNumber = INVALID_NUM;
+ }
+ }
+
+ public int getLottoNumber() {
+ return lottoNumber;
+ }
+
+ private int validateLottoNo(int lottoNumber) {
+ if (lottoNumber < 1 || lottoNumber > 45) {
+ throw new IllegalArgumentException();
+ }
+
+ return lottoNumber;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(lottoNumber);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (lottoNumber == ((LottoNo)obj).lottoNumber)
+ return true;
+
+ return false;
+ }
+
+ @Override
+ public int compareTo(LottoNo o) {
+ return lottoNumber - o.lottoNumber;
+ }
+} | Java | ๊ตณ์ด ๋ฉ์๋๋ก ๋นผ์ง ์์๋ ๋ ๊ฒ ๊ฐ์์ |
@@ -0,0 +1,40 @@
+import java.util.ArrayList;
+import java.util.List;
+
+public class LottoRankResult {
+ private List<Rank> ranks;
+
+ public LottoRankResult(WinningLotto winningLotto, LottoTicket lottoTicket) {
+ this.ranks = new ArrayList<>();
+
+ for (Lotto lotto : lottoTicket.getAllLottoGames()) {
+ ranks.add(
+ Rank.valueOf(
+ winningLotto.getCountOfSameNumber(lotto),
+ winningLotto.isWinningBonus(lotto)
+ )
+ );
+ }
+ }
+
+ public int getCount(Rank rank) {
+ return (int) ranks.stream().filter(t -> t.equals(rank)).count();
+ }
+
+ public Money getTotalWinningMoney() {
+ Money earnings = Money.ZERO;
+
+ for (Rank rank : ranks) {
+ earnings = earnings.add(rank.getWinningMoney());
+ }
+
+ return earnings;
+ }
+
+ public double getEarningsRate(Money invest) {
+ Money earnings = getTotalWinningMoney();
+
+ return (double)(earnings.intValue()) / invest.intValue() * 100.0;
+ }
+
+}
\ No newline at end of file | Java | ๋ญ๊ฐ ์ด๋ฆ์ด ๊ฒฐ๊ณผ๋ฅผ ๋ด๋ ๋ฐ์ดํฐ ๊ทธ๋ฆ ๊ฐ์ ๋๋์ด๋ผ
LottoCalculator
LottoResultCalculator
LottoRankCalculator
๊ฐ์ ๋ค์ด๋ฐ์ผ๋ก ๋ณ๊ฒฝํด๋ณด๋ฉด ์ด๋จ๊น์?
๊ทธ์ ๋ง์ถฐ์ ๋ฉ์๋ ๋ค์ด๋ฐ๋ ๋ณ๊ฒฝํ๋ฉด ๋จ์ํ set ๋ ๋ฐ์ดํฐ๋ฅผ get ํ๋ ๊ฒ๋ณด๋ค
์ํ์ ํ์๋ฅผ ๊ฐ๋ ๊ฐ์ฒด์งํฅ์ ์ธ ๋ค์ด๋ฐ์ด ๋ ๊ฒ ๊ฐ๋ค๋ ์๊ฐ์ด ๋ญ๋๋ค |
@@ -0,0 +1,22 @@
+import java.util.ArrayList;
+import java.util.List;
+
+public class Lottos {
+ private List<Lotto> lottos;
+
+ public Lottos() {
+ this.lottos = new ArrayList<>();
+ }
+
+ public List<Lotto> getLottos() {
+ return lottos;
+ }
+
+ public void addLotto(Lotto lotto) {
+ lottos.add(lotto);
+ }
+
+ public int getSize() {
+ return lottos.size();
+ }
+} | Java | Lottos ๊ฐ ๊ฐ์ง๋ ํ์๊ฐ ํ๋๋ ์๋๋ฐ์,
๋ค๋ฅธ ๊ฐ์ฒด์์ ์์ํ ๋งํ๊ฒ ์์๊น์?
get์ด ์ฌ์ฉ๋๊ณ ์๋ค๋ ๊ฒ์ Lottos ์ tell dont ask ์์น์ด ์์ง์ผ์ง๊ณ ์๋ค๋ ๋ป์ด๊ณ ,
์ฌ๊ธฐ๋ก ์์ํ ๋งํ ์ฑ
์์ด ์ฐ์ฌํด ์๋ค๋ ๋ป์ด๊ธฐ๋ ํฉ๋๋ค. |
@@ -0,0 +1,29 @@
+import java.util.List;
+
+public class WinningLotto {
+ private Lotto winningLotto;
+ private LottoNo bonusNo;
+
+ public WinningLotto(List<LottoNo> winningLottoNumbers, LottoNo lottoNo) {
+ if (winningLottoNumbers == null) {
+ throw new IllegalArgumentException("'lotto' must not be null");
+ }
+ if (lottoNo == null) {
+ throw new IllegalArgumentException("'lottoNo' must not be null");
+ }
+
+ this.winningLotto = new Lotto(winningLottoNumbers);
+ this.bonusNo = lottoNo;
+ }
+
+ public int getCountOfSameNumber(Lotto purchasedLotto) {
+ return (int) winningLotto.getLottoNums()
+ .stream()
+ .filter(purchasedLotto.getLottoNums()::contains)
+ .count();
+ }
+
+ public boolean isWinningBonus(Lotto purchasedLotto) {
+ return purchasedLotto.getLottoNums().contains(bonusNo);
+ }
+} | Java | Lotto๋ฅผ ์์ ๋ฐ์ ์๋ ์์๋๋ฐ ์ด๋ ๊ฒ ํฉ์ฑ์ ์ฌ์ฉํ์
จ๋ค์. ๐
ํน์๋ผ๋ ์ฐ์ฐํ ์ด๋ ๊ฒ ๊ตฌํํ์ ๊ฑฐ๋ผ๋ฉด,
์์๊ณผ ํฉ์ฑ์ ๊ตฌ๊ธ๋ง ํด๋ณด์๋ฉด ๊ด๋ จ ์๋ฃ๋ฅผ ์ฐพ์ผ์ค ์ ์์๊ฒ๋๋ค ~ |
@@ -0,0 +1,43 @@
+import java.util.Scanner;
+
+public class LottoApplication {
+ private static boolean APP_SUCCESS = false;
+
+ public static void main(String[] args) {
+ runUntilAppSuccess();
+ }
+
+ public static void runUntilAppSuccess() {
+ while (!APP_SUCCESS) {
+ run();
+ }
+ }
+
+ public static void run() {
+ final Scanner scanner = new Scanner(System.in);
+ int countOfManualLotto;
+
+ try {
+ LottoService lottoService = new LottoService(
+ InputView.scanMoney(scanner),
+ countOfManualLotto = InputView.scanCountOfManualLotto(scanner),
+ InputView.scanNumbersOfManualLotto(scanner, countOfManualLotto),
+ new LottoSeller()
+ );
+
+ lottoService.purchaseLottoTicket();
+ lottoService.printPurchaseResult();
+
+ lottoService.setWinningLotto(
+ InputView.scanWinningLotto(scanner),
+ InputView.scanBonusNo(scanner)
+ );
+
+ lottoService.printWinningResult();
+
+ APP_SUCCESS = true;
+ } catch (OutOfConditionException | IllegalArgumentException e) {
+ e.printStackTrace();
+ }
+ }
+} | Java | LottoGame ์ด๋ผ๋ ๋ค์ด๋ฐ์ ์ด๋จ๊น์ |
@@ -0,0 +1,43 @@
+import java.util.Scanner;
+
+public class LottoApplication {
+ private static boolean APP_SUCCESS = false;
+
+ public static void main(String[] args) {
+ runUntilAppSuccess();
+ }
+
+ public static void runUntilAppSuccess() {
+ while (!APP_SUCCESS) {
+ run();
+ }
+ }
+
+ public static void run() {
+ final Scanner scanner = new Scanner(System.in);
+ int countOfManualLotto;
+
+ try {
+ LottoService lottoService = new LottoService(
+ InputView.scanMoney(scanner),
+ countOfManualLotto = InputView.scanCountOfManualLotto(scanner),
+ InputView.scanNumbersOfManualLotto(scanner, countOfManualLotto),
+ new LottoSeller()
+ );
+
+ lottoService.purchaseLottoTicket();
+ lottoService.printPurchaseResult();
+
+ lottoService.setWinningLotto(
+ InputView.scanWinningLotto(scanner),
+ InputView.scanBonusNo(scanner)
+ );
+
+ lottoService.printWinningResult();
+
+ APP_SUCCESS = true;
+ } catch (OutOfConditionException | IllegalArgumentException e) {
+ e.printStackTrace();
+ }
+ }
+} | Java | lottoService ์ set ํ๊ณ get ํ๊ณ ์ ์ฐจ์งํฅ์ ์ธ ๋ฐฉ์์ผ๋ก ์ฝ๋๊ฐ ์ง์ฌ์ ธ ์์ต๋๋ค.
๋ชจ๋ ๋ก์ง์ด lottoService ๋ฅผ ํตํ๋ฉด์ ๊ฒฐ๊ตญ ์ด ํด๋์ค๋ ์ ์ ๋น๋ํด์งํ
๋ฐ์
์ข์ ๊ฐ์ ๋ฐฉ๋ฒ์ด ์์๊น์~? |
@@ -0,0 +1,48 @@
+import java.util.Arrays;
+
+public enum Rank {
+ FIRST(6, 2000000000),
+ SECOND(5, 30000000),
+ THIRD(5, 1500000),
+ FOURTH(4, 50000),
+ FIFTH(3, 5000),
+ MISS(0, 0);
+
+ private int countOfMatch;
+ private Money winningMoney;
+
+ Rank(int countOfMatch, int winningMoney) {
+ this.countOfMatch = countOfMatch;
+ this.winningMoney = Money.valueOf(winningMoney);
+ }
+
+ public static Rank valueOf(int countOfGame, boolean matchBonus) {
+ if (countOfGame == SECOND.getCountOfMatch()) {
+ return getSecondOrThird(matchBonus);
+ }
+
+ return Arrays.stream(values())
+ .filter(r -> countOfGame == r.countOfMatch)
+ .findFirst()
+ .orElse(MISS);
+ }
+
+ public static Rank[] valuesNotMiss() {
+ return new Rank[]{FIRST, SECOND, THIRD, FOURTH, FIFTH};
+ }
+
+ private static Rank getSecondOrThird(boolean matchBonus) {
+ if (matchBonus)
+ return SECOND;
+ return THIRD;
+ }
+
+ public int getCountOfMatch() {
+ return countOfMatch;
+ }
+
+ public Money getWinningMoney() {
+ return winningMoney;
+ }
+
+} | Java | ์ค๊ดํธ๊ฐ ๋น ์ก์ต๋๋ค |
@@ -0,0 +1,21 @@
+public class RankResult {
+ private Rank rank;
+ private int countOfRank;
+
+ RankResult(Rank rank) {
+ this.rank = rank;
+ this.countOfRank = 0;
+ }
+
+ public Rank getRank() {
+ return rank;
+ }
+
+ public int getCountOfRank() {
+ return countOfRank;
+ }
+
+ public void countUp(int count) {
+ countOfRank += count;
+ }
+} | Java | ๋ฐ์ดํฐ๋ค์ ํด๋์ค๋ก ๋ฌถ๋ ๊ฒ์ด ๊ฐ์ฒด์งํฅ์ ์๋๋๋ค~
RankResult ๋ ๊ฒฐ๊ตญ ๋ฐ์ดํฐ์ get ๋ง ๊ฐ์ง๊ณ ์๊ณ ,
์ ์๋ฏธํ ํ์๊ฐ ์์ต๋๋ค ใ
ใ
๋ถํ์ํ ๊ฐ์ฒด๊ฐ ์๋์ง, ์ ์๋ฏธํ ํ์๋ฅผ ๊ฐ์ง ๊ฐ์ฒด๋ก ๋ง๋ค๋ ค๋ฉด ์ด๋ค ํ์๋ฅผ ๋ถ์ฌํด์ผํ๋์ง
๊ณ ๋ฏผํด๋ณด์๋ฉด ์ข์ ๊ฒ ๊ฐ์์~ |
@@ -0,0 +1,50 @@
+import java.util.List;
+
+public class LottoSeller {
+ private LottoPurchaseService lottoPurchaseService;
+ private Money change;
+
+ public LottoSeller() {
+ change = Money.ZERO;
+ lottoPurchaseService = new LottoPurchaseService();
+ }
+
+ public LottoTicket sellTicketTo(LottoUser lottoUser) throws OutOfConditionException {
+ Money investMoney = LottoPurchaseService
+ .validatePurchase(
+ lottoUser.getInvestMoney(),
+ lottoUser.getCountOfManualLotto()
+ );
+
+ this.change = LottoPurchaseService
+ .calculateChange(investMoney);
+
+ return lottoPurchaseService
+ .createLottoTicket(
+ investMoney,
+ getCountOfAutoGame(investMoney, lottoUser.getCountOfManualLotto()),
+ changeToLottos(lottoUser.getNumbersOfManualLottos())
+ );
+ }
+
+ public int getCountOfAutoGame(Money investMoney, int countOfManualLotto) {
+ return investMoney.divideBy(LottoPurchaseService.LOTTO_PRICE).intValue()
+ - countOfManualLotto;
+ }
+
+ private Lottos changeToLottos(List<List<LottoNo>> numbers0fManualLottos) {
+ Lottos manualLottos = new Lottos();
+
+ for (List<LottoNo> lottoNums : numbers0fManualLottos) {
+ manualLottos.addLotto(
+ lottoPurchaseService.createManualLotto(lottoNums)
+ );
+ }
+
+ return manualLottos;
+ }
+
+ public Money getChange() {
+ return change;
+ }
+} | Java | Service ๋ผ๋ ๋ค์ด๋ฐ์ ์ฐ์๋๊ฑธ๋ก ๋ด์
์น ์ชฝ ์๋ฃ๋ฅผ ๋ณด์ ๊ฒ ๊ฐ์๋ฐ,
controller, service, repository
์ด๋ฐ layered architecture ๋ ์ง๊ธ ์ ํฌ๊ฐ ํ๊ณ ์๋ ๊ฐ์ฒด์งํฅ๊ณผ ๊ฑฐ๋ฆฌ๊ฐ ์ข ์์ต๋๋ค ~
service ๋ผ๋ ๋ค์ด๋ฐ์ ์ฌ์ฉํ๊ธฐ๋ณด๋ค๋ ์ข ๋ ๊ตฌ์ฒด์ ์ด๊ณ ๋๊ตฌ๋ ๊ธ ์ฝ๋ฏ์ด ๋ณผ ์ ์๋ ๋ค์ด๋ฐ์ ํ์๋ฉด
ํด๋น ๊ฐ์ฒด์ ๋ถ์ฌํ๋ ์ฑ
์๊ณผ ํ์๋ค๋ ๋ฌ๋ผ์ง๊ฒ ๋ฉ๋๋ค ~
๋ค์ด๋ฐ์ ๋จ์ํ ์๊ฐ์ ์ธ ํจ๊ณผ ๊ทธ ์ด์์ ๊ฐ์น๋ฅผ ๊ฐ์ง๊ณ ์์ต๋๋ค |
@@ -0,0 +1,50 @@
+import java.util.List;
+
+public class LottoSeller {
+ private LottoPurchaseService lottoPurchaseService;
+ private Money change;
+
+ public LottoSeller() {
+ change = Money.ZERO;
+ lottoPurchaseService = new LottoPurchaseService();
+ }
+
+ public LottoTicket sellTicketTo(LottoUser lottoUser) throws OutOfConditionException {
+ Money investMoney = LottoPurchaseService
+ .validatePurchase(
+ lottoUser.getInvestMoney(),
+ lottoUser.getCountOfManualLotto()
+ );
+
+ this.change = LottoPurchaseService
+ .calculateChange(investMoney);
+
+ return lottoPurchaseService
+ .createLottoTicket(
+ investMoney,
+ getCountOfAutoGame(investMoney, lottoUser.getCountOfManualLotto()),
+ changeToLottos(lottoUser.getNumbersOfManualLottos())
+ );
+ }
+
+ public int getCountOfAutoGame(Money investMoney, int countOfManualLotto) {
+ return investMoney.divideBy(LottoPurchaseService.LOTTO_PRICE).intValue()
+ - countOfManualLotto;
+ }
+
+ private Lottos changeToLottos(List<List<LottoNo>> numbers0fManualLottos) {
+ Lottos manualLottos = new Lottos();
+
+ for (List<LottoNo> lottoNums : numbers0fManualLottos) {
+ manualLottos.addLotto(
+ lottoPurchaseService.createManualLotto(lottoNums)
+ );
+ }
+
+ return manualLottos;
+ }
+
+ public Money getChange() {
+ return change;
+ }
+} | Java | ์ ํ๋ ์ฐ์ ๋๋ ์ค๋ฐ๊ฟ์ ์ํ์๋๊ฒ ์ผ๋ฐ์ ์
๋๋ค.
๋ฉ์๋ ํ๋ผ๋ฏธํฐ๋ 3๊ฐ ์ด์๋ถํฐ ์ํฐ๋ฅผ ์น์๋๊ฒ ์ด๋จ๊น์? |
@@ -0,0 +1,42 @@
+import java.util.List;
+
+public class LottoService {
+ LottoUser lottoUser;
+ LottoSeller lottoSeller;
+ LottoTicket purchasedLottoTicket = null;
+ WinningLotto winningLotto = null;
+ PurchaseResultView purchaseResultView = null;
+ WinningResultView winningResultView = null;
+
+ public LottoService(Money investMoney, int countOfManualLotto, List<List<LottoNo>> numbersOfManualLotto,
+ LottoSeller lottoSeller) {
+ this.lottoUser = new LottoUser(investMoney, countOfManualLotto, numbersOfManualLotto);
+ this.lottoSeller = lottoSeller;
+ }
+
+ public LottoTicket purchaseLottoTicket() throws OutOfConditionException {
+ purchasedLottoTicket = lottoSeller.sellTicketTo(lottoUser);
+ lottoUser.setLottoTicket(purchasedLottoTicket);
+
+ return purchasedLottoTicket;
+ }
+
+ public void printPurchaseResult() {
+ purchaseResultView = new PurchaseResultView();
+
+ purchaseResultView.notifyIfChangeLeft(lottoSeller);
+ purchaseResultView.printPurchasedTicket(lottoUser);
+ }
+
+ public void setWinningLotto(List<LottoNo> winningLottoNumbers, LottoNo bonusNo) {
+ winningLotto = new WinningLotto(winningLottoNumbers, bonusNo);
+ }
+
+ public void printWinningResult() {
+ winningResultView = new WinningResultView();
+
+ winningResultView.printWinningResult(winningLotto, purchasedLottoTicket);
+ winningResultView.printEarningsRate(winningLotto, purchasedLottoTicket);
+ }
+
+} | Java | set์ ์ฌ์ฉํ์ง ์๋๋ค๋ ๊ฐ์ฒด์งํฅ ์ํ์ฒด์กฐ ๊ท์น์ ์ ์ฉํด๋ณด์๋ฉด
์ฝ๋์ ์ค๊ณ๊ฐ ๋ฌ๋ผ์ง ๊ฒ ๊ฐ์ต๋๋ค |
@@ -0,0 +1,43 @@
+import java.util.ArrayList;
+import java.util.List;
+
+public class LottoTicket {
+ private Money ticketPrice;
+ private Lottos autoLottos;
+ private Lottos manualLottos;
+
+ public LottoTicket(Money ticketPrice, Lottos autoLottos, Lottos manualLottos) {
+ this.ticketPrice = ticketPrice;
+ this.autoLottos = autoLottos;
+ this.manualLottos = manualLottos;
+ }
+
+ public List<Lotto> getAllLottoGames() {
+ List<Lotto> lottos = new ArrayList<>();
+
+ lottos.addAll(getManualLottos());
+ lottos.addAll(getAutoLottos());
+
+ return lottos;
+ }
+
+ public List<Lotto> getAutoLottos() {
+ return autoLottos.getLottos();
+ }
+
+ public List<Lotto> getManualLottos() {
+ return manualLottos.getLottos();
+ }
+
+ public int getCountOfAutoLotto() {
+ return autoLottos.getSize();
+ }
+
+ public int getCountOfManualLotto() {
+ return manualLottos.getSize();
+ }
+
+ public Money getTicketPrice() {
+ return ticketPrice;
+ }
+} | Java | ์ฌ๊ธฐ๋ ํ์๊ฐ ์๊ณ ๋ฐ์ดํฐ + getter ๋ฟ์ด๋ค์.
๊ทธ๋ฐ๋ฐ ์ด๋ ๊ฒ ํด๋์ค๋ฅผ ๋๋ ๋ณด๋ ค๊ณ ์ต๋ํ ์๋ํ์ ์ ๐ |
@@ -0,0 +1,35 @@
+import java.util.List;
+
+public class LottoUser {
+ private Money investMoney;
+ private int countOfManualLotto;
+ private List<List<LottoNo>> numbersOfManualLottos;
+
+ private LottoTicket lottoTicket;
+
+ public LottoUser(Money investMoney, int countOfManualLotto, List<List<LottoNo>> numbersOfManualLottos) {
+ this.investMoney = investMoney;
+ this.countOfManualLotto = countOfManualLotto;
+ this.numbersOfManualLottos = numbersOfManualLottos;
+ }
+
+ public void setLottoTicket(LottoTicket lottoTicket) {
+ this.lottoTicket = lottoTicket;
+ }
+
+ public LottoTicket getLottoTicket() {
+ return lottoTicket;
+ }
+
+ public int getCountOfManualLotto() {
+ return countOfManualLotto;
+ }
+
+ public List<List<LottoNo>> getNumbersOfManualLottos() {
+ return numbersOfManualLottos;
+ }
+
+ public Money getInvestMoney() {
+ return investMoney;
+ }
+} | Java | ์ฌ๊ธฐ๋ setter getter ๋ฟ ์ด๋ค์ ใ
|
@@ -0,0 +1,65 @@
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public final class LottoPurchaseService {
+ public final static Money LOTTO_PRICE = Money.valueOf(1000);
+
+ public static Money validatePurchase(Money inputMoney, int countOfManualLotto) throws OutOfConditionException {
+ if (inputMoney.intValue() < LOTTO_PRICE.intValue()) {
+ throw new OutOfConditionException(LOTTO_PRICE + "์ ์ด์์ด ํ์ํฉ๋๋ค.");
+ }
+
+ if (countOfManualLotto * LOTTO_PRICE.intValue() > inputMoney.intValue()) {
+ throw new IllegalArgumentException("๊ธ์ก์ด ์์ ์ํ๋ ๋งํผ ์๋ ๋ก๋๋ฅผ ์ด ์ ์์ต๋๋ค.");
+ }
+
+ return inputMoney;
+ }
+
+ public static Money calculateChange(Money inputMoney) {
+ return Money.valueOf(inputMoney.intValue() % LOTTO_PRICE.intValue());
+ }
+
+ public Lotto createManualLotto(List<LottoNo> lottoNums) {
+ Collections.sort(lottoNums);
+ return new Lotto(lottoNums);
+ }
+
+ public Lotto createAutoLotto() {
+ List<LottoNo> auto = new ArrayList<>(shuffleAllLottoNo().subList(0, 6));
+ Collections.sort(auto);
+
+ return new Lotto(auto);
+ }
+
+ public Lottos createAutoLottos(int countOfAutoLotto) {
+ Lottos autoLottos = new Lottos();
+
+ for (int i = 0; i < countOfAutoLotto; i++) {
+ autoLottos.addLotto(
+ createAutoLotto()
+ );
+ }
+
+ return autoLottos;
+ }
+
+ public LottoTicket createLottoTicket(Money ticketPrice, int countOfAutoLotto, Lottos manualLottos) {
+ return new LottoTicket(
+ ticketPrice,
+ createAutoLottos(countOfAutoLotto),
+ manualLottos);
+ }
+
+ private List<LottoNo> shuffleAllLottoNo() {
+ List<LottoNo> lottoNums = new ArrayList<>();
+
+ for (int i = 1; i <= 45; i++) {
+ lottoNums.add(new LottoNo(i));
+ }
+ Collections.shuffle(lottoNums);
+
+ return lottoNums;
+ }
+} | Java | ๋ฐ์ดํฐ์ ํ๋ก์ธ์ค๊ฐ ๋ฐ๋ก ์๋ ๊ฒ == ์ ์ฐจ์งํฅ ํ๋ก๊ทธ๋๋ฐ
ํ ์ํฉ :
๋ฐ์ดํฐ = LottoSeller, Ticket, User ๋ฑ (๋ฐ์ดํฐ + getter)
ํ๋ก์ธ์ค = Service (๋ฐ์ดํฐ get ํด์ ๋ก์ง ์ฒ๋ฆฌ)
๋ต : MVC์ layered architecture๋ฅผ ์๊ณ view ์ ๋น์ฆ๋์ค ๋ก์ง์ ๋ถ๋ฆฌํ๋ ๊ฒ๋ง ๊ธฐ์ตํ๊ณ ์ง๋ณด๊ธฐ |
@@ -0,0 +1,65 @@
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Scanner;
+import java.util.stream.Collectors;
+
+public final class InputView {
+
+ public static Money scanMoney(Scanner scanner) {
+ System.out.println("\n๊ตฌ์
๊ธ์ก์ ์
๋ ฅํด ์ฃผ์ธ์.");
+
+ return Money.valueOf(Integer.parseInt(scanner.nextLine()));
+ }
+
+ public static int scanCountOfManualLotto(Scanner scanner) {
+ System.out.println("\n์๋์ผ๋ก ๊ตฌ๋งคํ ๋ก๋ ์๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.");
+
+ return Integer.parseInt(scanner.nextLine());
+ }
+
+ public static List<List<LottoNo>> scanNumbersOfManualLotto(Scanner scanner, int countOfManualGame) {
+ System.out.println("\n์๋์ผ๋ก ๊ตฌ๋งคํ ๋ฒํธ๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.");
+
+ List<List<LottoNo>> manualLotto = new ArrayList<>();
+ String input = scanner.nextLine();
+ int count = countOfManualGame;
+
+ while (!input.isEmpty() && count != 0) {
+ count--;
+ addScannedNumbers(manualLotto, input);
+ input = scanner.nextLine();
+ }
+
+ return manualLotto;
+ }
+
+ private static void addScannedNumbers(List<List<LottoNo>> manualLotto, String input) {
+ manualLotto.add(
+ Arrays.asList(input.replaceAll(" ", "").split(","))
+ .stream()
+ .map(Integer::parseInt)
+ .map(LottoNo::new)
+ .collect(Collectors.toList())
+ );
+ }
+
+ public static List<LottoNo> scanWinningLotto(Scanner scanner) {
+ System.out.println("\n์ง๋ ์ฃผ ๋น์ฒจ ๋ฒํธ๋ฅผ ์
๋ ฅํด ์ฃผ์ธ์.");
+
+ return Arrays.asList(scanner.nextLine()
+ .replaceAll(" ", "")
+ .split(","))
+ .stream()
+ .map(Integer::parseInt)
+ .map(LottoNo::new)
+ .collect(Collectors.toList());
+ }
+
+ public static LottoNo scanBonusNo(Scanner scanner) {
+ System.out.println("๋ณด๋์ค ๋ณผ์ ์
๋ ฅํด ์ฃผ์ธ์.");
+
+ return new LottoNo(Integer.parseInt(scanner.nextLine()));
+ }
+
+} | Java | view ์์๋ ๋ฐ์ดํฐ๋ฅผ scan ํด์ค๋ ์ฑ
์๋ง ์์ต๋๋ค.
์ง๊ธ์ ๋ณํ ๋ก์ง๊น์ง ์ฌ๊ธฐ์ ์ฒ๋ฆฌํ๊ณ ์๋ค์~! |
@@ -0,0 +1,29 @@
+public final class PurchaseResultView {
+ public void notifyIfChangeLeft(LottoSeller seller) {
+ if (!seller.getChange().equals(Money.ZERO)) {
+ System.out.println("์๋ " + seller.getChange() + "์์ด ๋จ์์ต๋๋ค.");
+ System.out.println();
+ }
+ }
+
+ public void printPurchasedTicket(LottoUser lottoUser) {
+ LottoTicket lottoTicket = lottoUser.getLottoTicket();
+
+ System.out.println(
+ "์๋์ผ๋ก " + lottoTicket.getCountOfManualLotto() +
+ "์ฅ, ์๋์ผ๋ก " + lottoTicket.getCountOfAutoLotto() +
+ "๊ฐ๋ฅผ ๊ตฌ๋งคํ์ต๋๋ค."
+ );
+
+ for (Lotto manualGame : lottoTicket.getManualLottos()) {
+ System.out.println(manualGame.getNums());
+ }
+
+ for (Lotto autoGame : lottoTicket.getAutoLottos()) {
+ System.out.println(autoGame.getNums());
+ }
+
+ System.out.println();
+ }
+
+} | Java | finall class ๋ก ํ์ ์ด์ ๊ฐ ๊ถ๊ธํฉ๋๋ค~ |
@@ -1,23 +1,20 @@
<template>
- <button
- @click="
- () => {
- if (!props.disabled) props.onClick();
- }
- "
- :class="getNextButtonStyle()"
- >
- <slot></slot>
+ <button @click="handleNextButtonClick" :class="getNextButtonStyle()">
+ <slot />
</button>
</template>
<script setup lang="ts">
const props = defineProps<{
- isPrimary?: boolean;
+ isPrimary?: boolean | undefined;
onClick: () => void;
- disabled?: boolean;
+ disabled?: boolean | undefined;
}>();
+const handleNextButtonClick = () => {
+ if (!props.disabled) props.onClick();
+};
+
const getNextButtonStyle = () => ({
'h-fit w-[340px] rounded-2xl border-0 p-6 text-large font-bold mb-6': true,
'bg-primary-light dark:bg-primary-dark': props.isPrimary, | Unknown | ๋จ์ ๊ถ๊ธ์ฆ์ผ๋ก ์ง๋ฌธ๋๋ฆฝ๋๋ค.
undefined๋ฅผ ํ์
์ผ๋ก ์ง์ ํ์ ์ด์ ๊ฐ ์์๊น์?
NextButton.vue์ ๋ถ๋ชจ ์ปดํฌ๋ํธ์์ isPrimary ๊ฐ์ ๋ถ์ฌํ์ง ์์ ๋๊ฐ ์์ด undefined๋ฅผ ํฌํจํ ๊ฒ์ผ๋ก ๋ณด์ด๋๋ฐ,
์ด ๊ฒฝ์ฐ๋ ? ๋ง์ผ๋ก๋ ์ถฉ๋ถํ ํํ์ด ๋ ๊ฒ ๊ฐ์ต๋๋ค.
ํนํ boolean์ด๊ธฐ๋๋ฌธ์ undefined์ผ ๋ falsyํ๊ฒ ์ธ์์ด ๋ ๊ฒ ๊ฐ์๋ฐ
์ถ๊ฐํ์ ์ด์ ๊ฐ ๊ถ๊ธํฉ๋๋ค~ |
@@ -3,8 +3,8 @@
<p class="text-medium font-semi_bold">{{ title }}</p>
<div class="flex gap-x-3">
<button
- v-for="size in sizes"
- :key="size.id"
+ v-for="(size, index) in sizes"
+ :key="getButtonKey(size, index)"
class="flex flex-col items-center justify-between gap-y-[10px]"
@click="handleSizeClick(size)"
>
@@ -23,9 +23,10 @@
</template>
<script setup lang="ts">
-import { Size } from '@interface/goods';
+import { Size } from '@interface/sizes';
import { useUserSelectStore } from '@store/storeUserSelect';
import { PLACE_HOLD_IMAGE_URL } from '@constants';
+import { storeToRefs } from 'pinia';
defineProps<{
title: string;
@@ -38,11 +39,12 @@ const getImageWidth = (size: Size) => {
return 74;
};
-const { userSelect, setUserSelectSizeId, setUserSelectSizeValue } =
- useUserSelectStore();
+const store = useUserSelectStore();
+const { userSelect } = storeToRefs(store);
+const { setUserSelectSizeId, setUserSelectSizeValue } = store;
const handleSizeClick = (size: Size) => {
- if (userSelect.sizeId === size.id) {
+ if (userSelect.value.sizeId === size.id) {
setUserSelectSizeId(0);
setUserSelectSizeValue(0);
return;
@@ -51,11 +53,13 @@ const handleSizeClick = (size: Size) => {
setUserSelectSizeValue(size.value);
};
+const getButtonKey = (size: Size, index: number) => `size-${size.id}-${index}`;
+
const getUserSelectStyle = (size: Size) => ({
'flex h-[74px] w-[74px] items-center justify-center rounded-2xl border-[3px] bg-gray_01-light dark:bg-gray_01-dark':
true,
- 'border-secondary-light': userSelect.sizeId === size.id,
+ 'border-secondary-light': userSelect.value.sizeId === size.id,
'border-gray_01-light dark:border-gray_01-dark':
- userSelect.sizeId !== size.id,
+ userSelect.value.sizeId !== size.id,
});
</script> | Unknown | storeToRefs ๋ฅผ ์ฌ์ฉํด์ ๋ฐ์์ฑ์ ์ด๋ฆฌ์
จ๋ค์ ๐ |
@@ -3,16 +3,12 @@
<section
class="mx-auto flex h-full flex-col items-center justify-between bg-gray_00-light text-gray_05-light dark:bg-gray_00-dark dark:text-gray_05-dark sm:w-screen md:w-96"
>
- <ProgressNavBar prevPage="/size" pageName="ingredient" />
- <div v-if="isLoading">๋ก๋ฉ์ค์
๋๋ค.</div>
+ <ProgressNavBar prevPage="size" pageName="ingredient" />
+ <Loading v-if="isLoading" />
<IngredientBoard :ingredients="data?.ingredients ?? []" v-else />
<div v-if="!isAbleToRecommend">์ฌ๋ฃ๋ฅผ ์กฐ๊ธ ๋ ๊ณจ๋ผ๋ณผ๊น์?</div>
<NextButton
- :onClick="
- () => {
- mutation.mutate(userItem);
- }
- "
+ :onClick="postUserItem"
isPrimary
:disabled="!isAbleToRecommend || !userSelect.sizeValue"
>
@@ -29,6 +25,7 @@ import { storeToRefs } from 'pinia';
import ProgressNavBar from '@containers/ProgressNavBar.vue';
import IngredientBoard from '@containers/IngredientBoard.vue';
import NextButton from '@components/NextButton.vue';
+import Loading from '@src/components/Loading.vue';
import { useUserSelectStore } from '@store/storeUserSelect';
import { useGetIngredients } from '@apis/ingredients';
import { usePostRecipe } from '@apis/recipes';
@@ -38,6 +35,9 @@ const { userSelect, userItem } = storeToRefs(store);
const { data, isLoading } = useGetIngredients();
const mutation = usePostRecipe();
+const postUserItem = () => {
+ mutation.mutate(userItem.value);
+};
const allFlavorIdList = computed(
() => | Unknown | ์๋ฒ ์ํ๊ด๋ฆฌ์ ํด๋ผ์ด์ธํธ ์ํ๊ด๋ฆฌ๋ฅผ ๋ถ๋ฆฌํ์ฌ ๊ด๋ฆฌํ์
จ๊ตฐ์ ๐ |
@@ -1,23 +1,20 @@
<template>
- <button
- @click="
- () => {
- if (!props.disabled) props.onClick();
- }
- "
- :class="getNextButtonStyle()"
- >
- <slot></slot>
+ <button @click="handleNextButtonClick" :class="getNextButtonStyle()">
+ <slot />
</button>
</template>
<script setup lang="ts">
const props = defineProps<{
- isPrimary?: boolean;
+ isPrimary?: boolean | undefined;
onClick: () => void;
- disabled?: boolean;
+ disabled?: boolean | undefined;
}>();
+const handleNextButtonClick = () => {
+ if (!props.disabled) props.onClick();
+};
+
const getNextButtonStyle = () => ({
'h-fit w-[340px] rounded-2xl border-0 p-6 text-large font-bold mb-6': true,
'bg-primary-light dark:bg-primary-dark': props.isPrimary, | Unknown | ์ฌ์ค ์ ๋ ์ถ๊ฐํ์ง ์์๋ค๊ฐ, ์ข๋ ๊ฐ์์ ์ผ๋ก ํํํ๋ ค๊ณ ์์ฑ์ ํ์ด์! ์, ๋ฉ์ด๋ธ๋ ๋ง์๋ฃ๊ณ ๋ค์ ์๊ฐํด๋ณด๋ ๊ฐ์์ฑ๋ง์ผ๋ก ์ถ๊ฐํ๋ ๊ฑด ์ข ์๋ฏธ๊ฐ ์๋ ๊ฒ ๊ฐ๊ธดํ๋ค์!! |
@@ -3,20 +3,18 @@
class="text-gray_05-light dark:text-gray_05-dark w-6 h-6"
@click="goBack"
>
- <slot></slot>
+ <slot />
</button>
</template>
<script setup lang="ts">
-import { useRouter } from 'vue-router';
+import { pushPage } from '@router/route.helper';
const props = defineProps<{
prevPage: string;
}>();
-const router = useRouter();
-
function goBack() {
- router.push(props.prevPage);
+ pushPage(props.prevPage);
}
</script> | Unknown | ํ์ดํ ํจ์๋ก ํด์ฃผ์ธ์~ |
@@ -0,0 +1,91 @@
+package christmas.Controller;
+
+import christmas.Domain.EventBenefitSettler;
+import christmas.Domain.EventPlanner;
+import christmas.Event.EventBadge;
+import christmas.View.InputView;
+import christmas.View.OutputView;
+import java.util.Map;
+
+public class EventController {
+ public EventPlanner eventPlanner;
+ public EventBenefitSettler eventBenefitSettler;
+
+ public void eventStart() {
+ OutputView.printWelcomeMessage();
+ takeVisitDate();
+
+ takeOrder();
+
+ int preDiscountTotalOrderPrice = handlePreDiscountTotalOrderPrice();
+
+ handleBenefit(preDiscountTotalOrderPrice);
+ }
+
+ public void takeVisitDate() {
+ try {
+ String visitDate = InputView.readVisitDate();
+ eventBenefitSettler = new EventBenefitSettler(visitDate);
+ } catch (NumberFormatException e) {
+ OutputView.printException(e);
+ takeVisitDate();
+ } catch (IllegalArgumentException e) {
+ OutputView.printException(e);
+ takeVisitDate();
+ }
+ }
+
+ public void takeOrder() {
+ try {
+ String orderMenu = InputView.readMenuOrder();
+ eventPlanner = new EventPlanner(orderMenu);
+ OutputView.printOrderMenu(orderMenu);
+ } catch (NumberFormatException e) {
+ OutputView.printException(e);
+ takeOrder();
+ } catch (IllegalArgumentException e) {
+ OutputView.printException(e);
+ takeOrder();
+ }
+ }
+
+ public void handleBenefit(int preDiscountTotalOrderPrice) {
+ Map<String, Integer> categoryCount = eventPlanner.calculateCategoryCount();
+
+ Map<String, Integer> receivedBenefits = handleReceivedBenefits(categoryCount, preDiscountTotalOrderPrice);
+ int benefitsTotalAmount = handlebenefitsTotalAmount(receivedBenefits);
+ handleDiscountedTotalAmount(receivedBenefits, preDiscountTotalOrderPrice);
+ handleEventBadge(benefitsTotalAmount);
+ }
+
+ public Map<String, Integer> handleReceivedBenefits(Map<String, Integer> categoryCount, int preDiscountTotalOrderPrice){
+ Map<String, Integer> receivedBenefits = eventBenefitSettler.calculateReceivedBenefits(categoryCount,
+ preDiscountTotalOrderPrice);
+ OutputView.printReceivedBenefits(receivedBenefits);
+ return receivedBenefits;
+ }
+
+ public int handlebenefitsTotalAmount(Map<String, Integer> receivedBenefits){
+ int benefitsTotalAmount = eventBenefitSettler.caculateBenefitsTotalAmount(receivedBenefits);
+ OutputView.printBenefitsTotalAmount(benefitsTotalAmount);
+ return benefitsTotalAmount;
+ }
+
+ public void handleDiscountedTotalAmount(Map<String, Integer> receivedBenefits, int preDiscountTotalOrderPrice){
+ int discountedTotalAmount = eventBenefitSettler.calculateDiscountedTotalAmount(receivedBenefits,
+ preDiscountTotalOrderPrice);
+ OutputView.printDiscountedTotalAmount(discountedTotalAmount);
+ }
+
+ public void handleEventBadge(int benefitsTotalAmount){
+ String eventBadgeType = EventBadge.findMyEventBadgeType(benefitsTotalAmount);
+ OutputView.printEventBadgeType(eventBadgeType);
+ }
+
+ public int handlePreDiscountTotalOrderPrice() {
+ int preDiscountTotalOrderPrice = eventPlanner.calculatePreDiscountTotalOrderPrice();
+ OutputView.printPreDicountTotalOrderPrice(preDiscountTotalOrderPrice);
+ OutputView.printGiftMenu(preDiscountTotalOrderPrice);
+ return preDiscountTotalOrderPrice;
+ }
+} | Java | ```suggestion
public void takeVisitDate() {
try {
String visitDate = InputView.readVisitDate();
eventBenefitSettler = new EventBenefitSettler(visitDate);
} catch (IllegalArgumentException e) {
OutputView.printException(e);
takeVisitDate();
}
}
```
์ ๋ ๋ฐฉ๊ธ ์ฐพ์์ ์๊ฒ ๋์๋๋ฐ `NumberFormatException` ์ ๋ถ๋ชจ ์์ธ๊ฐ `IllegalArgumentException` ์ด๋๋ผ๊ณ ์! ๊ทธ๋์ ๊ตณ์ด ๋์ ์์ธ๋ฅผ ๋๋์ง ์๊ณ `IllegalArgumentException` ๋ง ์ก์์ค๋ ๊ฐ์ด ์กํ ๊ฒ ๊ฐ์ต๋๋ค! ใ
ใ
|
@@ -0,0 +1,92 @@
+package christmas.Util;
+
+import static christmas.Event.EventOption.EVENT_END_DATE;
+import static christmas.Event.EventOption.EVENT_START_DATE;
+import static christmas.Event.EventOption.MAX_ORDER_QUANTITY;
+import static christmas.Message.OutputMessage.NOT_A_VALID_DATE;
+
+import christmas.Domain.MenuBoard;
+import christmas.Message.OutputMessage;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class OrderMenuValidator {
+ public static void validateDate(String input) {
+ int number = Integer.parseInt(input);
+ if (number < EVENT_START_DATE || number > EVENT_END_DATE) {
+ throw new IllegalArgumentException(NOT_A_VALID_DATE);
+ }
+ }
+
+ public static void checkValidOrderForm(String input) {
+ String pattern = "^[๊ฐ-ํฃ]+-[0-9]+(,\\s*[๊ฐ-ํฃ]+-[0-9]+)*$"; // ๋ฉ๋ด ์
๋ ฅ ํ์
+ if (!input.matches(pattern)) {
+ throw new IllegalArgumentException(OutputMessage.INVALID_ORDER_FORM_ERROR);
+ }
+ }
+
+ public static void checkDuplicateMenu(String input) {
+ // ์ ๊ทํํ์ ํจํด
+ String pattern = "([๊ฐ-ํฃ]+)-([1-9]\\d*|0*[1-9]\\d+)(?:,|$)";
+
+ // ์ ๊ทํํ์์ ๋ง๋ ํจํด์ ์์ฑ
+ Pattern regexPattern = Pattern.compile(pattern);
+ Matcher matcher = regexPattern.matcher(input);
+
+ Set<String> menuSet = new HashSet<>();
+ // ๋งค์นญ๋ ๊ฒฐ๊ณผ๋ฅผ ์ถ๋ ฅ
+ while (matcher.find()) {
+ String menuName = matcher.group(1);
+ if (!menuSet.add(menuName)) {
+ throw new IllegalArgumentException(OutputMessage.INVALID_ORDER_FORM_ERROR);
+ }
+ }
+ }
+
+ public static void checkMaxOrderQuantity(String input) {
+ String pattern = "([๊ฐ-ํฃ]+)-([1-9]\\d*|0*[1-9]\\d+)(?:,|$)";
+ // ์ ๊ทํํ์์ ๋ง๋ ํจํด์ ์์ฑ
+ Pattern regexPattern = Pattern.compile(pattern);
+ Matcher matcher = regexPattern.matcher(input);
+ int menuQuantity = 0;
+ // ๋งค์นญ๋ ๊ฒฐ๊ณผ๋ฅผ ์ถ๋ ฅ
+ while (matcher.find()) {
+ menuQuantity += Integer.parseInt(matcher.group(2));
+ }
+ if (menuQuantity > MAX_ORDER_QUANTITY) {
+ throw new IllegalArgumentException(OutputMessage.INVALID_MAX_ORDER_QAUNTITY_ERROR);
+ }
+ }
+
+ public static void checkMenuContainsOnlyDrink(String input) {
+ String pattern = "([๊ฐ-ํฃ]+)-([1-9]\\d*|0*[1-9]\\d+)(?:,|$)";
+
+ Pattern regexPattern = Pattern.compile(pattern);
+ Matcher matcher = regexPattern.matcher(input);
+ int menuNum = 0;
+ int drinkNum = 0;
+
+ while (matcher.find()) {
+ if (isDrinkMenu(matcher.group(1))) {
+ drinkNum++;
+ }
+ menuNum++;
+ }
+ if (drinkNum == menuNum) {
+ throw new IllegalArgumentException(OutputMessage.MENU_CONTAIN_ONLY_DRINK_ERROR);
+ }
+ }
+
+ public static boolean isDrinkMenu(String orderMenu) {
+ for (MenuBoard menu : MenuBoard.values()) {
+ if (orderMenu.equals(menu.getMenuName()) && menu.getMenuCategory().equals("์๋ฃ")) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+} | Java | ์ ๊ทํํ์์ ์ ๋ง ์ ํ์ฉํ์๋๊ตฐ์!๐๐
๊ทธ๋ฐ๋ฐ `(?:,|$)` ๋ ์ด๋ค ์ญํ ์ ํ๋์ง ๊ถ๊ธํฉ๋๋ค! |
@@ -0,0 +1,92 @@
+package christmas.Util;
+
+import static christmas.Event.EventOption.EVENT_END_DATE;
+import static christmas.Event.EventOption.EVENT_START_DATE;
+import static christmas.Event.EventOption.MAX_ORDER_QUANTITY;
+import static christmas.Message.OutputMessage.NOT_A_VALID_DATE;
+
+import christmas.Domain.MenuBoard;
+import christmas.Message.OutputMessage;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class OrderMenuValidator {
+ public static void validateDate(String input) {
+ int number = Integer.parseInt(input);
+ if (number < EVENT_START_DATE || number > EVENT_END_DATE) {
+ throw new IllegalArgumentException(NOT_A_VALID_DATE);
+ }
+ }
+
+ public static void checkValidOrderForm(String input) {
+ String pattern = "^[๊ฐ-ํฃ]+-[0-9]+(,\\s*[๊ฐ-ํฃ]+-[0-9]+)*$"; // ๋ฉ๋ด ์
๋ ฅ ํ์
+ if (!input.matches(pattern)) {
+ throw new IllegalArgumentException(OutputMessage.INVALID_ORDER_FORM_ERROR);
+ }
+ }
+
+ public static void checkDuplicateMenu(String input) {
+ // ์ ๊ทํํ์ ํจํด
+ String pattern = "([๊ฐ-ํฃ]+)-([1-9]\\d*|0*[1-9]\\d+)(?:,|$)";
+
+ // ์ ๊ทํํ์์ ๋ง๋ ํจํด์ ์์ฑ
+ Pattern regexPattern = Pattern.compile(pattern);
+ Matcher matcher = regexPattern.matcher(input);
+
+ Set<String> menuSet = new HashSet<>();
+ // ๋งค์นญ๋ ๊ฒฐ๊ณผ๋ฅผ ์ถ๋ ฅ
+ while (matcher.find()) {
+ String menuName = matcher.group(1);
+ if (!menuSet.add(menuName)) {
+ throw new IllegalArgumentException(OutputMessage.INVALID_ORDER_FORM_ERROR);
+ }
+ }
+ }
+
+ public static void checkMaxOrderQuantity(String input) {
+ String pattern = "([๊ฐ-ํฃ]+)-([1-9]\\d*|0*[1-9]\\d+)(?:,|$)";
+ // ์ ๊ทํํ์์ ๋ง๋ ํจํด์ ์์ฑ
+ Pattern regexPattern = Pattern.compile(pattern);
+ Matcher matcher = regexPattern.matcher(input);
+ int menuQuantity = 0;
+ // ๋งค์นญ๋ ๊ฒฐ๊ณผ๋ฅผ ์ถ๋ ฅ
+ while (matcher.find()) {
+ menuQuantity += Integer.parseInt(matcher.group(2));
+ }
+ if (menuQuantity > MAX_ORDER_QUANTITY) {
+ throw new IllegalArgumentException(OutputMessage.INVALID_MAX_ORDER_QAUNTITY_ERROR);
+ }
+ }
+
+ public static void checkMenuContainsOnlyDrink(String input) {
+ String pattern = "([๊ฐ-ํฃ]+)-([1-9]\\d*|0*[1-9]\\d+)(?:,|$)";
+
+ Pattern regexPattern = Pattern.compile(pattern);
+ Matcher matcher = regexPattern.matcher(input);
+ int menuNum = 0;
+ int drinkNum = 0;
+
+ while (matcher.find()) {
+ if (isDrinkMenu(matcher.group(1))) {
+ drinkNum++;
+ }
+ menuNum++;
+ }
+ if (drinkNum == menuNum) {
+ throw new IllegalArgumentException(OutputMessage.MENU_CONTAIN_ONLY_DRINK_ERROR);
+ }
+ }
+
+ public static boolean isDrinkMenu(String orderMenu) {
+ for (MenuBoard menu : MenuBoard.values()) {
+ if (orderMenu.equals(menu.getMenuName()) && menu.getMenuCategory().equals("์๋ฃ")) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+} | Java | `isDrinkMenu` ๋ `MenuBoard` ์๊ฒ ๋๊ฒจ์ฃผ๋ฉด ์ด๋จ๊น์??
์๋ฃ๋ฅผ ํ์ธํ๋ ์ฑ
์์ `MenuBoard` ๊ฐ ๊ฐ์ง๊ณ ์๋๊ฒ ๋ ์ด์ธ๋ฆด ๊ฒ ๊ฐ์์! ๐ |
@@ -0,0 +1,92 @@
+package christmas.Util;
+
+import static christmas.Event.EventOption.EVENT_END_DATE;
+import static christmas.Event.EventOption.EVENT_START_DATE;
+import static christmas.Event.EventOption.MAX_ORDER_QUANTITY;
+import static christmas.Message.OutputMessage.NOT_A_VALID_DATE;
+
+import christmas.Domain.MenuBoard;
+import christmas.Message.OutputMessage;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class OrderMenuValidator {
+ public static void validateDate(String input) {
+ int number = Integer.parseInt(input);
+ if (number < EVENT_START_DATE || number > EVENT_END_DATE) {
+ throw new IllegalArgumentException(NOT_A_VALID_DATE);
+ }
+ }
+
+ public static void checkValidOrderForm(String input) {
+ String pattern = "^[๊ฐ-ํฃ]+-[0-9]+(,\\s*[๊ฐ-ํฃ]+-[0-9]+)*$"; // ๋ฉ๋ด ์
๋ ฅ ํ์
+ if (!input.matches(pattern)) {
+ throw new IllegalArgumentException(OutputMessage.INVALID_ORDER_FORM_ERROR);
+ }
+ }
+
+ public static void checkDuplicateMenu(String input) {
+ // ์ ๊ทํํ์ ํจํด
+ String pattern = "([๊ฐ-ํฃ]+)-([1-9]\\d*|0*[1-9]\\d+)(?:,|$)";
+
+ // ์ ๊ทํํ์์ ๋ง๋ ํจํด์ ์์ฑ
+ Pattern regexPattern = Pattern.compile(pattern);
+ Matcher matcher = regexPattern.matcher(input);
+
+ Set<String> menuSet = new HashSet<>();
+ // ๋งค์นญ๋ ๊ฒฐ๊ณผ๋ฅผ ์ถ๋ ฅ
+ while (matcher.find()) {
+ String menuName = matcher.group(1);
+ if (!menuSet.add(menuName)) {
+ throw new IllegalArgumentException(OutputMessage.INVALID_ORDER_FORM_ERROR);
+ }
+ }
+ }
+
+ public static void checkMaxOrderQuantity(String input) {
+ String pattern = "([๊ฐ-ํฃ]+)-([1-9]\\d*|0*[1-9]\\d+)(?:,|$)";
+ // ์ ๊ทํํ์์ ๋ง๋ ํจํด์ ์์ฑ
+ Pattern regexPattern = Pattern.compile(pattern);
+ Matcher matcher = regexPattern.matcher(input);
+ int menuQuantity = 0;
+ // ๋งค์นญ๋ ๊ฒฐ๊ณผ๋ฅผ ์ถ๋ ฅ
+ while (matcher.find()) {
+ menuQuantity += Integer.parseInt(matcher.group(2));
+ }
+ if (menuQuantity > MAX_ORDER_QUANTITY) {
+ throw new IllegalArgumentException(OutputMessage.INVALID_MAX_ORDER_QAUNTITY_ERROR);
+ }
+ }
+
+ public static void checkMenuContainsOnlyDrink(String input) {
+ String pattern = "([๊ฐ-ํฃ]+)-([1-9]\\d*|0*[1-9]\\d+)(?:,|$)";
+
+ Pattern regexPattern = Pattern.compile(pattern);
+ Matcher matcher = regexPattern.matcher(input);
+ int menuNum = 0;
+ int drinkNum = 0;
+
+ while (matcher.find()) {
+ if (isDrinkMenu(matcher.group(1))) {
+ drinkNum++;
+ }
+ menuNum++;
+ }
+ if (drinkNum == menuNum) {
+ throw new IllegalArgumentException(OutputMessage.MENU_CONTAIN_ONLY_DRINK_ERROR);
+ }
+ }
+
+ public static boolean isDrinkMenu(String orderMenu) {
+ for (MenuBoard menu : MenuBoard.values()) {
+ if (orderMenu.equals(menu.getMenuName()) && menu.getMenuCategory().equals("์๋ฃ")) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+} | Java | ํด๋น ์ ๊ทํํ์์ด ๋ฐ๋ณต๋๋ ๊ฒ ๊ฐ์์! ๊ทธ๋ ๋ค๋ฉด Pattern ๊ฐ์ฒด๋ฅผ ์บ์ฑํด์ฃผ๋ฉด ์ด๋จ๊น์??
๋์ค์ฝ๋ ํจ๊ป ๋๋๊ธฐ์ ํ์ง๋์ด[ ๊ณต์ ํ์ ๊ธ](https://velog.io/@dlguswl936/%EA%B3%B5%EB%B6%80%ED%95%9C-%EA%B2%83-String.matches%EB%8A%94-%EC%99%9C-%EC%84%B1%EB%8A%A5%EC%97%90-%EC%95%88-%EC%A2%8B%EC%9D%84%EA%B9%8C#%EA%B2%B0%EB%A1%A0-pattern-%EA%B0%9D%EC%B2%B4%EB%A5%BC-%EC%BA%90%EC%8B%B1%ED%95%B4%EB%91%90%EA%B8%B0)์ด ๋์์ด ๋์ค ๊ฒ ๊ฐ์์ ๊ณต์ ํฉ๋๋ค! |
@@ -0,0 +1,30 @@
+package christmas.Util;
+
+public class CommaFormatter {
+ public static String formatWithComma(int number) {
+ String numberStr = Integer.toString(number);
+ int length = numberStr.length();
+
+ if (length <= 3) {
+ return numberStr;
+ }
+ String result = insertComma(numberStr, length);
+
+ return result;
+ }
+
+ private static String insertComma(String number, int length) {
+ int count = 0;
+ StringBuilder result = new StringBuilder();
+ for (int i = length - 1; i >= 0; i--) {
+ result.insert(0, number.charAt(i));
+ count++;
+
+ if (count == 3 && i != 0) {
+ result.insert(0, ',');
+ count = 0;
+ }
+ }
+ return result.toString();
+ }
+} | Java | ์ฝค๋ง๋ฅผ ์ํด ์ ์ฉ ๊ฐ์ฒด๋ฅผ ๋ง๋ค์ด์ฃผ์
จ๊ตฐ์! ์ง์ ๋ง๋ค์ด์ฃผ๋ ๊ฒ๋ ์ข๋ค์!
๊ทธ๋ฐ๋ฐ ๋ ๋จ์๋ฅผ ์ํ ์ฝค๋ง๋ฅผ ๋ฃ์ด์ฃผ๋ ๊ธฐ๋ฅ์ ์๋ฐ์์ ์ ๊ณตํ๊ณ ์๋ต๋๋ค! ใ
ใ
DecimalFormat ์ ๋ํด์ ์์๋ณด์๋ฉด ์ข์ ๊ฒ ๊ฐ์์! ์ ๊ฐ [์ฐธ๊ณ ํ๋ ๊ธ](https://jamesdreaming.tistory.com/203)์ ๊ณต์ ํฉ๋๋ค! |
@@ -0,0 +1,67 @@
+package christmas.Domain;
+
+import christmas.Util.OrderMenuValidator;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class EventPlanner {
+ private final List<Menu> orderMenu;
+
+ public EventPlanner(String menu) {
+ validateOrderMenuForm(menu);
+ List<Menu> orderMenu = createOrderMenuRepository(menu);
+ this.orderMenu = orderMenu;
+ }
+
+ public int calculatePreDiscountTotalOrderPrice() {
+ int totalOrderPrice = 0;
+ for (Menu menu : orderMenu) {
+ totalOrderPrice += menu.getMenuTotalPrice();
+ }
+ return totalOrderPrice;
+ }
+
+ public Map<String, Integer> calculateCategoryCount() {
+ Map<String, Integer> categoryCount = new HashMap<>();
+ int count = 0;
+ for (Menu menu : orderMenu) {
+ String menuCategory = menu.getMenuCategory();
+ if (categoryCount.containsKey(menuCategory)) {
+ count = categoryCount.get(menuCategory) + menu.getMenuQuantity();
+ categoryCount.put(menuCategory, count);
+ }
+ if (!categoryCount.containsKey(menuCategory)) {
+ categoryCount.put(menuCategory, menu.getMenuQuantity());
+ }
+ }
+ return categoryCount;
+ }
+
+ private List<Menu> createOrderMenuRepository(String orderMenu) {
+ List<Menu> menuList = new ArrayList<>();
+ String pattern = "([๊ฐ-ํฃ]+)-([1-9]\\d*|0*[1-9]\\d+)(?:,|$)";
+
+ // ์ ๊ทํํ์์ ๋ง๋ ํจํด์ ์์ฑ
+ Pattern regexPattern = Pattern.compile(pattern);
+ Matcher matcher = regexPattern.matcher(orderMenu);
+
+ // ๋งค์นญ๋ ๊ฒฐ๊ณผ๋ฅผ ์ถ๋ ฅ
+ while (matcher.find()) {
+ String menuName = matcher.group(1);
+ String menuQuantity = matcher.group(2);
+ menuList.add(new Menu(menuName, menuQuantity));
+ }
+ return menuList;
+ }
+
+ private void validateOrderMenuForm(String orderedMenu) {
+ OrderMenuValidator.checkValidOrderForm(orderedMenu);
+ OrderMenuValidator.checkDuplicateMenu(orderedMenu);
+ OrderMenuValidator.checkMaxOrderQuantity(orderedMenu);
+ OrderMenuValidator.checkMenuContainsOnlyDrink(orderedMenu);
+ }
+} | Java | ```suggestion
public Map<String, Integer> calculateCategoryCount() {
Map<String, Integer> categoryCount = new HashMap<>();
int count = 0;
for (Menu menu : orderMenu) {
String menuCategory = menu.getMenuCategory();
categoryCount.put(menuCategory, categoryCount.getOrDefault(menuCategory, 0) + 1)
}
return categoryCount;
}
```
`getOrDefault` ๋ฅผ ์ฌ์ฉํ๋ค๋ฉด ๊ฐ๋จํ๊ฒ ๋ฐ๊ฟ์ค ์ ์๋ต๋๋ค! ใ
ใ
๊ฐ์ด ์๋ค๋ฉด ํด๋น ๊ฐ์ ๊ฐ์ ธ์ค๊ณ ์์ผ๋ฉด default ๋ก ์ง์ ํด์ค ๊ฐ(์ฌ๊ธฐ์ 0)์ ๊ฐ์ ธ์ค๋ ๊ธฐ๋ฅ์
๋๋ค! |
@@ -0,0 +1,102 @@
+package christmas.Domain;
+
+import christmas.Event.EventBenefit;
+import christmas.Event.EventOption;
+import christmas.Event.SpecialDiscountDay;
+import christmas.Util.OrderMenuValidator;
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.util.HashMap;
+import java.util.Map;
+
+public class EventBenefitSettler {
+ private final int visitDate;
+
+ public EventBenefitSettler(String visitDate) {
+ OrderMenuValidator.validateDate(visitDate);
+ this.visitDate = Integer.parseInt(visitDate);
+ }
+
+ public Map<String, Integer> calculateReceivedBenefits(Map<String, Integer> categoryCount,
+ int preDiscountTotalOrderPrice) {
+ Map<String, Integer> receivedBenefits = new HashMap<>();
+ if (preDiscountTotalOrderPrice >= EventOption.MINIMUM_ORDER_PRICE_TO_GET_DISCOUNT) {
+ caculateChristmasDDayDiscount(receivedBenefits);
+ caculateWeekdayDiscount(receivedBenefits, categoryCount);
+ caculateWeekendDiscount(receivedBenefits, categoryCount);
+ caculateSpecialDiscount(receivedBenefits);
+ checkGiftMenu(receivedBenefits, preDiscountTotalOrderPrice);
+ }
+ return receivedBenefits;
+ }
+
+ public int caculateBenefitsTotalAmount(Map<String, Integer> receivedBenefits) {
+ int benefitsTotalAmount = 0;
+ for (Map.Entry<String, Integer> benefit : receivedBenefits.entrySet()) {
+ benefitsTotalAmount += benefit.getValue();
+ }
+ return benefitsTotalAmount;
+ }
+
+ public int calculateDiscountedTotalAmount(Map<String, Integer> receivedBenefits, int preDiscountTotalOrderPrice) {
+ int discountedTotalAmount = preDiscountTotalOrderPrice;
+ for (Map.Entry<String, Integer> benefit : receivedBenefits.entrySet()) {
+ if (benefit.getKey() != EventBenefit.GIFT_MENU.getEventType()) {
+ discountedTotalAmount -= benefit.getValue();
+ }
+ }
+ return discountedTotalAmount;
+ }
+
+ private void caculateSpecialDiscount(Map<String, Integer> receivedBenefits) {
+ if (SpecialDiscountDay.isSpecialDay(this.visitDate)) {
+ receivedBenefits.put(EventBenefit.SPECIAL_DISCOUNT.getEventType(),
+ EventBenefit.SPECIAL_DISCOUNT.getBenefitAmount());
+ }
+ }
+
+ private void checkGiftMenu(Map<String, Integer> receivedBenefits, int preDiscountTotalOrderPrice) {
+ if (preDiscountTotalOrderPrice >= EventOption.MINIMUM_ORDER_PRICE_TO_GET_GIFT_MENU) {
+ receivedBenefits.put(EventBenefit.GIFT_MENU.getEventType(), EventBenefit.GIFT_MENU.getBenefitAmount());
+ }
+ }
+
+ private void caculateChristmasDDayDiscount(Map<String, Integer> receivedBenefits) {
+ int discount = 0;
+ if (this.visitDate <= EventOption.CHRISTMAS_D_DAY_EVENT_END_DATE) {
+ discount = EventOption.CHRISTMAS_D_DAY_START_DISCOUNT_AMOUNT;
+ discount += EventBenefit.CHRISTMAS_D_DAY_DISCOUNT.getBenefitTotalAmount(this.visitDate - 1);
+ receivedBenefits.put(EventBenefit.CHRISTMAS_D_DAY_DISCOUNT.getEventType(), discount);
+ }
+ }
+
+ private void caculateWeekdayDiscount(Map<String, Integer> receivedBenefits, Map<String, Integer> categoryCount) {
+ int discount = 0;
+ if (!isWeekend()) {
+ try {
+ int countDessert = categoryCount.get(EventBenefit.WEEKDAY_DISCOUNT.getEventTarget()); // ์๋์ง๋ฅผ ์ฒดํฌ
+ discount += EventBenefit.WEEKDAY_DISCOUNT.getBenefitTotalAmount(countDessert);
+ receivedBenefits.put(EventBenefit.WEEKDAY_DISCOUNT.getEventType(), discount);
+ } catch (NullPointerException e) {
+ }
+ }
+ }
+
+ private void caculateWeekendDiscount(Map<String, Integer> receivedBenefits, Map<String, Integer> categoryCount) {
+ int discount = 0;
+ if (isWeekend()) {
+ try {
+ int countMain = categoryCount.get(EventBenefit.WEEKEND_DISCOUNT.getEventTarget()); // ์๋์ง๋ฅผ ์ฒดํฌ
+ discount += EventBenefit.WEEKEND_DISCOUNT.getBenefitTotalAmount(countMain);
+ receivedBenefits.put(EventBenefit.WEEKDAY_DISCOUNT.getEventType(), discount);
+ } catch (NullPointerException e) {
+ }
+ }
+ }
+
+ private boolean isWeekend() {
+ LocalDate date = LocalDate.of(EventOption.EVENT_YEAR, EventOption.EVENT_MONTH, this.visitDate);
+ DayOfWeek dayOfWeek = date.getDayOfWeek();
+ return dayOfWeek == DayOfWeek.FRIDAY || dayOfWeek == DayOfWeek.SATURDAY;
+ }
+} | Java | `LocalDate` ๋ฅผ ํ์ฉํ๋ฉด ์์ผ์ ํ์
ํ ์ ์๊ตฐ์! ๋ฐฐ์๊ฐ๋๋ค! ๐ |
@@ -47,4 +47,13 @@ final class SettingViewModel {
seconds: 0,
identifier: "SelectedTimeNotification")
}
+
+ // URL ์ด๊ธฐ ๋ฉ์๋
+ func openURL(_ urlString: String) {
+ guard let url = URL(string: urlString), UIApplication.shared.canOpenURL(url) else {
+ print("์ ํจํ์ง ์์ URL์
๋๋ค: \(urlString)")
+ return
+ }
+ UIApplication.shared.open(url, options: [:], completionHandler: nil)
+ }
} | Swift | url ์ด๋์ด ์ด๋ ๊ฒ ๊ตฌํํ๋ ๊ฑฐ๊ตฐ์ |
@@ -0,0 +1,209 @@
+import styled from '@emotion/styled';
+import { colors } from '@sopt-makers/colors';
+import { fonts } from '@sopt-makers/fonts';
+import { IconCheck, IconChevronDown } from '@sopt-makers/icons';
+import { Button } from '@sopt-makers/ui';
+import { ReactNode, useEffect, useState } from 'react';
+
+import Portal from '@/components/common/Portal';
+import { zIndex } from '@/styles/zIndex';
+
+interface Option {
+ label: string;
+ value: number | undefined;
+ description?: string;
+}
+
+interface BottomSheetSelectProps {
+ options: Option[];
+ defaultOption?: Option;
+ value: string | null | undefined;
+ placeholder: string;
+ onChange: (value: string) => void;
+ icon?: ReactNode;
+ className?: string;
+}
+
+const BottomSheetMDS = ({
+ options,
+ defaultOption,
+ value,
+ placeholder,
+ onChange,
+ icon,
+ className,
+}: BottomSheetSelectProps) => {
+ const [open, setOpen] = useState(false);
+ const [selectedValue, setSelectedValue] = useState(value);
+ const [temporaryValue, setTemporaryValue] = useState(value);
+
+ const handleOpen = () => setOpen(true);
+ const handleClose = () => setOpen(false);
+
+ const handleOptionSelect = (value: string) => {
+ setTemporaryValue(value);
+ };
+
+ const handleConfirm = () => {
+ setSelectedValue(temporaryValue);
+ onChange(temporaryValue as string);
+
+ handleClose();
+ };
+
+ useEffect(() => {
+ if (open) {
+ document.body.style.overflow = 'hidden';
+ } else {
+ document.body.style.overflow = '';
+ }
+
+ return () => {
+ document.body.style.overflow = '';
+ };
+ }, [open]);
+
+ const getSelectedLabel = (value: string) => {
+ return options.find((option) => Number(option.value) === Number(value))?.label;
+ };
+
+ return (
+ <Container>
+ <InputField onClick={handleOpen} className={className}>
+ {selectedValue ? (
+ <p>{getSelectedLabel(selectedValue)}</p>
+ ) : (
+ <p style={{ color: '#808087', whiteSpace: 'pre-wrap' }}>{placeholder}</p>
+ )}
+
+ {icon || (
+ <IconChevronDown
+ style={{
+ width: 20,
+ minWidth: 20,
+ height: 20,
+ minHeight: 20,
+ transform: open ? 'rotate(-180deg)' : '',
+ transition: 'all 0.5s',
+ }}
+ />
+ )}
+ </InputField>
+
+ {open && (
+ <Portal portalId='bottomsheet'>
+ <Overlay />
+ <BottomSheet>
+ <OptionList>
+ {defaultOption && (
+ <OptionItem onClick={() => handleOptionSelect(String(defaultOption.value))}>
+ {defaultOption.label}
+ {temporaryValue === defaultOption.value && <CheckedIcon />}
+ </OptionItem>
+ )}
+ {options.map((option) => (
+ <OptionItem key={option.value} onClick={() => handleOptionSelect(String(option.value))}>
+ <StItemDiv>
+ {option.label}
+ <OptionSubItem>{option.description}</OptionSubItem>
+ </StItemDiv>
+ {temporaryValue === option.value && <CheckedIcon />}
+ </OptionItem>
+ ))}
+ </OptionList>
+ <Button size='lg' style={{ width: '100%' }} onClick={handleConfirm}>
+ ํ์ธ
+ </Button>
+ </BottomSheet>
+ </Portal>
+ )}
+ </Container>
+ );
+};
+export default BottomSheetMDS;
+
+const Container = styled.div`
+ position: relative;
+ width: 100%;
+`;
+
+const InputField = styled.div`
+ display: flex;
+ gap: 12px;
+ align-items: center;
+ justify-content: space-between;
+ border-radius: 10px;
+ background-color: ${colors.gray800};
+ cursor: pointer;
+ padding: 11px 16px;
+ ${fonts.BODY_16_M};
+
+ max-width: calc(100vw - 40px);
+
+ p {
+ width: 100%;
+ overflow: hidden; /* ๋์น๋ ํ
์คํธ ์จ๊น */
+ text-overflow: ellipsis;
+ white-space: nowrap; /* ํ
์คํธ ์ค ๋ฐ๊ฟ ๋ฐฉ์ง */
+ }
+`;
+
+const Overlay = styled.div`
+ position: fixed;
+ top: 0;
+ left: 0;
+ z-index: ${zIndex.ํค๋};
+ background-color: rgb(15 15 18 / 80%);
+ width: 100%;
+ height: 100%;
+`;
+
+const BottomSheet = styled.section`
+ position: fixed;
+ bottom: 0;
+ left: 20px;
+ z-index: ${zIndex.ํค๋};
+ margin-bottom: 12px;
+ border-radius: 16px;
+ background-color: ${colors.gray800};
+ padding: 16px;
+ width: calc(100% - 40px);
+`;
+
+const OptionList = styled.ul`
+ margin: 0 0 16px;
+ padding: 0;
+ max-height: 300px;
+ overflow-y: auto;
+ list-style: none;
+`;
+
+const OptionItem = styled.li`
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ border-radius: 8px;
+ cursor: pointer;
+ padding: 10px;
+ height: 66px;
+ ${fonts.BODY_14_M}
+
+ &:hover {
+ background-color: ${colors.gray700};
+ }
+`;
+const OptionSubItem = styled.div`
+ margin-top: 2px;
+ ${fonts.BODY_13_R}
+
+ color:${colors.gray200}
+`;
+
+const CheckedIcon = styled(IconCheck)`
+ width: 24px;
+ height: 24px;
+ color: ${colors.success};
+`;
+const StItemDiv = styled.div`
+ width: 100%;
+`; | Unknown | ๊ทธ `BottomSheetSelect`์ปดํฌ๋ํธ๋ฅผ ์ด์ ์ ๋์์ด๊ฐ ๊ตฌํํด์คฌ์๋๋ฐ ์๊ฒ ๋์ผํ ๋ชฉ์ ์ ๊ฐ์ง ์ปดํฌ๋ํธ์ธ๊ฑธ๋ก ๋ณด์ฌ์์..!!! ํน์ ๋ฐ๋ก ๊ตฌํํ์ ์ด์ ๊ฐ ์์๊น์??
ํน์ ์กด์ฌํ๋์ง ๋ชฐ๋๋๊ฑธ๊น ์ฃผ๋ฅต.. ๋ง์ฝ์ ๊ทธ๋ฐ๊ฒ์ด๋ผ๋ฉด ์ด์ฐจํผ mds๋ก ๋์ฒด๋์ด์ผํ ๋ถ๋ถ์ด๋, ์ ์๋ํ๋ค๋ฉด ์์ ํ ํ์๋ ์์๊ฑฐ๊ฐ์ต๋๋ค!!!! |
@@ -0,0 +1,328 @@
+import styled from '@emotion/styled';
+import { colors } from '@sopt-makers/colors';
+import { fonts } from '@sopt-makers/fonts';
+import { Button, Callout, SelectV2, Tag, TextArea, useDialog, useToast } from '@sopt-makers/ui';
+import { useMutation } from '@tanstack/react-query';
+import { useRouter } from 'next/router';
+import { playgroundLink } from 'playground-common/export';
+import { useState } from 'react';
+
+import { useGetCoffeechatHistory } from '@/api/endpoint/coffeechat/getCoffeechatHistory';
+import { postCoffeechatReview } from '@/api/endpoint/coffeechat/postCoffeechatReview';
+import AuthRequired from '@/components/auth/AuthRequired';
+import BottomSheetMDS from '@/components/coffeechat/CoffeeChatReveiw/BottomSheetMDS';
+import useCustomConfirm from '@/components/common/Modal/useCustomConfirm';
+import Responsive from '@/components/common/Responsive';
+import useEventLogger from '@/components/eventLogger/hooks/useEventLogger';
+import { MB_BIG_MEDIA_QUERY, MOBILE_MEDIA_QUERY } from '@/styles/mediaQuery';
+import { setLayout } from '@/utils/layout';
+
+const CoffeeChatReviewUpload = () => {
+ const [nickname, setNickname] = useState('');
+ const [content, setContent] = useState('');
+ const [isChecked, setIsChecked] = useState(false);
+
+ const { open } = useDialog();
+ const { confirm } = useCustomConfirm();
+ const [coffeechat, setCoffeechat] = useState<number>(0);
+
+ const { open: toastOpen } = useToast();
+ const { data, isLoading } = useGetCoffeechatHistory();
+ const router = useRouter();
+ const { logSubmitEvent } = useEventLogger();
+ const { mutate } = useMutation({
+ mutationFn: () => postCoffeechatReview.request(coffeechat, nickname, content),
+ onSuccess: () => {
+ toastOpen({
+ icon: 'success',
+ content: 'ํ๊ธฐ๊ฐ ๋ฑ๋ก๋์ด์! ๊ฒฝํ์ ๋๋ ์ฃผ์
์ ๊ฐ์ฌํด์.',
+ style: {
+ content: {
+ whiteSpace: 'pre-wrap',
+ },
+ },
+ });
+ logSubmitEvent('coffeechatReview');
+ router.push(playgroundLink.coffeechat());
+ },
+ onError: () => {
+ toastOpen({
+ icon: 'error',
+ content: '๋ฌธ์ ๊ฐ ๋ฐ์ํ์ด์.',
+ style: {
+ content: {
+ whiteSpace: 'pre-wrap',
+ },
+ },
+ });
+ },
+ });
+ const selectOptions = data?.coffeeChatHistories.map((item) => ({
+ label: item.coffeeChatBio || '',
+ value: item.id ?? undefined,
+ description: item.name + ' | ' + item.career || '',
+ }));
+
+ const handleEnroll = async () => {
+ if (nickname.length <= 0 || content.length <= 0) {
+ setIsChecked(true);
+ } else if (coffeechat === 0) {
+ open({
+ title: `์ปคํผ์ฑ์ ์ ํํด์ฃผ์ธ์.`,
+ description: <StDescription>์ปคํผ์ฑ ๋ฆฌ๋ทฐ๋ ์ปคํผ์ฑ ์์ฑ ํ์๋ง ์์ฑ ๊ฐ๋ฅํฉ๋๋ค.</StDescription>,
+ type: 'single',
+ typeOptions: {
+ approveButtonText: 'ํ์ธ',
+ },
+ });
+ } else {
+ open({
+ title: 'ํ๊ธฐ๋ฅผ ๋ฑ๋กํ๊ธฐ ์ , ํ์ธํด์ฃผ์ธ์!',
+ description: (
+ <StDescription>
+ ํ ๋ฒ ๋ฑ๋กํ ํ๊ธฐ๋ ์์ ํ ์ ์์ด์. ์์ ๋ฐ ์ญ์ ๋ฅผ ์ํ์ ๋ค๋ฉด ๋ฉ์ด์ปค์ค ์นด์นด์ค ์ฑ๋๋ก ๋ฌธ์ํด ์ฃผ์ธ์.
+ </StDescription>
+ ),
+ type: 'default',
+ typeOptions: {
+ cancelButtonText: '๋ซ๊ธฐ',
+ approveButtonText: '๋ฑ๋กํ๊ธฐ',
+ buttonFunction: async () => {
+ await mutate();
+ },
+ },
+ });
+ }
+ };
+ return (
+ <AuthRequired>
+ <StMainSection>
+ <StReviewSection>
+ <StTitle>์ปคํผ์ฑ ํ๊ธฐ ์์ฑํ๊ธฐ</StTitle>
+ <Callout type='information'>
+ ์ปคํผ์์์ ์ ์ตํ ์๊ฐ ๋ณด๋ด์
จ๋์? ์ปคํผ์์์ ๋ ๋ง์ ์ปคํผ์ฑ์ด ์ค๊ฐ ์ ์๋๋ก ์์คํ ํ๊ธฐ๋ฅผ ๋ถํ๋๋ ค์!
+ </Callout>
+ <StInfo>
+ ํ๊ธฐ๋ฅผ ์์ฑํ ์ปคํผ์ฑ <span style={{ color: 'rgb(247 114 52 / 100%)' }}>*</span>
+ </StInfo>
+ <StSubInfo>์ปคํผ์ฑ์ ์งํํ ํ์์ธ์ง ํ์ธ์ด ํ์ํด์. ์ด๋ค ์ปคํผ์ฑ์ ์งํํ๋์ง๋ ๊ณต๊ฐ๋์ง ์์์</StSubInfo>
+ <Responsive only='desktop'>
+ <SelectV2.Root
+ type='textDesc'
+ className='coffechat-select'
+ visibleOptions={3}
+ onChange={(e) => setCoffeechat(Number(e))}
+ >
+ <SelectV2.Trigger>
+ <SelectV2.TriggerContent placeholder={'์งํํ ์ปคํผ์ฑ์ ์ ๋ชฉ์ด ๋ฌด์์ธ๊ฐ์?'} />
+ </SelectV2.Trigger>
+ <StSelectV2Menu className='coffeechat-ul'>
+ {selectOptions?.map((option) => (
+ <StSelectV2MenuItem key={option.value} option={option} />
+ ))}
+ </StSelectV2Menu>
+ </SelectV2.Root>
+ </Responsive>
+ <Responsive only='mobile'>
+ <div style={{ marginTop: '8px' }}>
+ <BottomSheetMDS
+ placeholder='์งํํ ์ปคํผ์ฑ์ ์ ๋ชฉ์ ๋ฌด์์ธ๊ฐ์?'
+ options={selectOptions || []}
+ value={undefined}
+ onChange={(value) => {
+ setCoffeechat(Number(value));
+ }}
+ />
+ </div>
+ </Responsive>
+ {coffeechat > 0 && (
+ <>
+ {' '}
+ <StInfo>์ ํํ ์ปคํผ์ฑ์ ์ฃผ์ </StInfo>
+ <StLabelWrapper>
+ {data?.coffeeChatHistories
+ .find((item) => item.id === coffeechat) // id๊ฐ coffeechat์ธ ๊ฐ์ฒด ์ฐพ๊ธฐ
+ ?.coffeeChatTopicType?.map((tag, index) => (
+ <Tag key={index} type='solid' size='md' variant='default'>
+ {tag}
+ </Tag>
+ ))}
+ </StLabelWrapper>
+ </>
+ )}
+
+ <StInfo>
+ ๋์ ๋๋ค์ <span style={{ color: 'rgb(247 114 52 / 100%)' }}>*</span>
+ </StInfo>
+ <StSubInfo>ํ๊ธฐ๋ ์ปคํผ์ ํ์ ์ต๋ช
์ผ๋ก ๋ฑ๋ก๋ผ์! ์ํ๋ ๋๋ค์์ ์
๋ ฅํด์ฃผ์ธ์</StSubInfo>
+ <div style={{ position: 'relative' }}>
+ <StTextArea
+ errorMessage='๋๋ค์์ ์
๋ ฅํด์ฃผ์ธ์'
+ isError={isChecked && nickname.length <= 0}
+ maxLength={10}
+ placeholder='ex. ์นดํ์ธ ์ค๋
์'
+ onChange={(e) => setNickname(e.target.value)}
+ value={nickname}
+ />
+ <TextCountWrapper>{nickname.length < 10 ? nickname.length : 10}/10</TextCountWrapper>
+ <StInfo>
+ ์์ธ ํ๊ธฐ <span style={{ color: 'rgb(247 114 52 / 100%)' }}>*</span>
+ </StInfo>
+ </div>
+ <div style={{ position: 'relative', height: 'auto' }}>
+ <StTextArea
+ errorMessage='์์ธ ํ๊ธฐ๋ฅผ ์
๋ ฅํด์ฃผ์ธ์'
+ placeholder={`ex.
+โข ๊ถ๊ธํ๋ ๋ด์ฉ์ A-Z๊น์ง ์น์ ํ๊ฒ ์๋ ค์ฃผ์
์ ์ ์ตํ์ด์.
+โข ์ด๋ฐ ๋ด์ฉ์ ๋๋ ์ ์์ด์ ๋ป ๊น์์ด์.`}
+ fixedHeight={130}
+ maxLength={500}
+ onChange={(e) => setContent(e.target.value)}
+ isError={isChecked && content.length <= 0}
+ value={content}
+ ></StTextArea>
+ <TextCountWrapper style={{ top: '160px' }}>{content.length}/500</TextCountWrapper>
+ </div>
+ <StButtonWrapper>
+ <StButton onClick={() => handleEnroll()}>ํ๊ธฐ ๋ฑ๋กํ๊ธฐ</StButton>
+ </StButtonWrapper>
+ </StReviewSection>
+ </StMainSection>
+ </AuthRequired>
+ );
+};
+setLayout(CoffeeChatReviewUpload, 'headerFooter');
+export default CoffeeChatReviewUpload;
+const StMainSection = styled.div`
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-top: 48px;
+ margin-bottom: 142px;
+ width: 100%;
+ height: 100%;
+
+ .coffechat-select {
+ margin-top: 8px;
+ width: 100%;
+
+ button {
+ width: 100%;
+
+ div {
+ width: 100%;
+ }
+ }
+ }
+
+ @media ${MOBILE_MEDIA_QUERY} {
+ margin-top: 0;
+ }
+ @media ${MB_BIG_MEDIA_QUERY} {
+ margin-bottom: 84px;
+ }
+`;
+const StReviewSection = styled.div`
+ padding: 40px;
+ padding-right: 30px;
+ padding-left: 30px;
+ width: 1260px;
+
+ @media ${MB_BIG_MEDIA_QUERY} {
+ padding: 30px;
+ padding-right: 20px;
+ padding-left: 20px;
+ }
+`;
+const StTitle = styled.div`
+ margin-bottom: 20px;
+ width: 100%;
+ height: 48px;
+ ${fonts.HEADING_32_B}
+ @media ${MB_BIG_MEDIA_QUERY} {
+ ${fonts.HEADING_24_B}
+
+ margin-bottom:16px;
+ }
+`;
+const StInfo = styled.div`
+ ${fonts.LABEL_16_SB}
+
+ margin-top:40px;
+ @media ${MB_BIG_MEDIA_QUERY} {
+ ${fonts.LABEL_14_SB};
+ }
+`;
+const StSubInfo = styled.div`
+ ${fonts.LABEL_14_SB}
+
+ margin-top:8px;
+ letter-spacing: -0.32px;
+ color: ${colors.gray300};
+
+ @media ${MB_BIG_MEDIA_QUERY} {
+ ${fonts.LABEL_12_SB};
+ }
+`;
+
+const StTextArea = styled(TextArea)`
+ margin-top: 8px;
+`;
+const StButtonWrapper = styled.div`
+ display: flex;
+ justify-content: flex-end;
+ margin-top: 70px;
+ width: 100%;
+`;
+const TextCountWrapper = styled.div`
+ position: absolute;
+ top: 56px;
+ width: 100%;
+ text-align: right;
+ color: ${colors.gray300};
+ ${fonts.LABEL_12_SB};
+`;
+const StButton = styled(Button)`
+ @media ${MB_BIG_MEDIA_QUERY} {
+ width: 100%;
+ height: 42px;
+ ${fonts.LABEL_16_SB}
+ }
+`;
+
+const StLabelWrapper = styled.div`
+ display: flex;
+ gap: 8px;
+ margin-top: 8px;
+
+ div {
+ border-radius: 100px;
+ padding: 3px 9px;
+ }
+`;
+const StSelectV2Menu = styled(SelectV2.Menu)`
+ width: calc(100vw - 60px);
+ max-width: 1200px;
+ white-space: nowrap;
+
+ li {
+ width: calc(100vw - 60px);
+ max-width: 1200px;
+
+ button {
+ width: calc(100vw - 60px);
+ max-width: 1200px;
+ }
+ }
+`;
+const StSelectV2MenuItem = styled(SelectV2.MenuItem)`
+ li {
+ width: calc(100% - 60px);
+ }
+`;
+const StDescription = styled.div`
+ margin-top: 12px;
+ @media ${MOBILE_MEDIA_QUERY} {
+ margin-top: 8px;
+ }
+`; | Unknown | mutation ์คํจ์ ์๋ฌ์ฒ๋ฆฌ๋ ๋ฃ์ด์ฃผ๋ฉด ์ข์๊ฑฐ๊ฐ์์!! onError ์ต์
์ ์ถ๊ฐํด์ '๋ฌธ์ ๊ฐ ๋ฐ์ํ์ด์.' ์ ๊ฐ์ toast๋ฅผ ์ถ๊ฐํด์ฃผ์ด๋ ์ข์๊ฑฐ๊ฐ์์! |
@@ -0,0 +1,209 @@
+import styled from '@emotion/styled';
+import { colors } from '@sopt-makers/colors';
+import { fonts } from '@sopt-makers/fonts';
+import { IconCheck, IconChevronDown } from '@sopt-makers/icons';
+import { Button } from '@sopt-makers/ui';
+import { ReactNode, useEffect, useState } from 'react';
+
+import Portal from '@/components/common/Portal';
+import { zIndex } from '@/styles/zIndex';
+
+interface Option {
+ label: string;
+ value: number | undefined;
+ description?: string;
+}
+
+interface BottomSheetSelectProps {
+ options: Option[];
+ defaultOption?: Option;
+ value: string | null | undefined;
+ placeholder: string;
+ onChange: (value: string) => void;
+ icon?: ReactNode;
+ className?: string;
+}
+
+const BottomSheetMDS = ({
+ options,
+ defaultOption,
+ value,
+ placeholder,
+ onChange,
+ icon,
+ className,
+}: BottomSheetSelectProps) => {
+ const [open, setOpen] = useState(false);
+ const [selectedValue, setSelectedValue] = useState(value);
+ const [temporaryValue, setTemporaryValue] = useState(value);
+
+ const handleOpen = () => setOpen(true);
+ const handleClose = () => setOpen(false);
+
+ const handleOptionSelect = (value: string) => {
+ setTemporaryValue(value);
+ };
+
+ const handleConfirm = () => {
+ setSelectedValue(temporaryValue);
+ onChange(temporaryValue as string);
+
+ handleClose();
+ };
+
+ useEffect(() => {
+ if (open) {
+ document.body.style.overflow = 'hidden';
+ } else {
+ document.body.style.overflow = '';
+ }
+
+ return () => {
+ document.body.style.overflow = '';
+ };
+ }, [open]);
+
+ const getSelectedLabel = (value: string) => {
+ return options.find((option) => Number(option.value) === Number(value))?.label;
+ };
+
+ return (
+ <Container>
+ <InputField onClick={handleOpen} className={className}>
+ {selectedValue ? (
+ <p>{getSelectedLabel(selectedValue)}</p>
+ ) : (
+ <p style={{ color: '#808087', whiteSpace: 'pre-wrap' }}>{placeholder}</p>
+ )}
+
+ {icon || (
+ <IconChevronDown
+ style={{
+ width: 20,
+ minWidth: 20,
+ height: 20,
+ minHeight: 20,
+ transform: open ? 'rotate(-180deg)' : '',
+ transition: 'all 0.5s',
+ }}
+ />
+ )}
+ </InputField>
+
+ {open && (
+ <Portal portalId='bottomsheet'>
+ <Overlay />
+ <BottomSheet>
+ <OptionList>
+ {defaultOption && (
+ <OptionItem onClick={() => handleOptionSelect(String(defaultOption.value))}>
+ {defaultOption.label}
+ {temporaryValue === defaultOption.value && <CheckedIcon />}
+ </OptionItem>
+ )}
+ {options.map((option) => (
+ <OptionItem key={option.value} onClick={() => handleOptionSelect(String(option.value))}>
+ <StItemDiv>
+ {option.label}
+ <OptionSubItem>{option.description}</OptionSubItem>
+ </StItemDiv>
+ {temporaryValue === option.value && <CheckedIcon />}
+ </OptionItem>
+ ))}
+ </OptionList>
+ <Button size='lg' style={{ width: '100%' }} onClick={handleConfirm}>
+ ํ์ธ
+ </Button>
+ </BottomSheet>
+ </Portal>
+ )}
+ </Container>
+ );
+};
+export default BottomSheetMDS;
+
+const Container = styled.div`
+ position: relative;
+ width: 100%;
+`;
+
+const InputField = styled.div`
+ display: flex;
+ gap: 12px;
+ align-items: center;
+ justify-content: space-between;
+ border-radius: 10px;
+ background-color: ${colors.gray800};
+ cursor: pointer;
+ padding: 11px 16px;
+ ${fonts.BODY_16_M};
+
+ max-width: calc(100vw - 40px);
+
+ p {
+ width: 100%;
+ overflow: hidden; /* ๋์น๋ ํ
์คํธ ์จ๊น */
+ text-overflow: ellipsis;
+ white-space: nowrap; /* ํ
์คํธ ์ค ๋ฐ๊ฟ ๋ฐฉ์ง */
+ }
+`;
+
+const Overlay = styled.div`
+ position: fixed;
+ top: 0;
+ left: 0;
+ z-index: ${zIndex.ํค๋};
+ background-color: rgb(15 15 18 / 80%);
+ width: 100%;
+ height: 100%;
+`;
+
+const BottomSheet = styled.section`
+ position: fixed;
+ bottom: 0;
+ left: 20px;
+ z-index: ${zIndex.ํค๋};
+ margin-bottom: 12px;
+ border-radius: 16px;
+ background-color: ${colors.gray800};
+ padding: 16px;
+ width: calc(100% - 40px);
+`;
+
+const OptionList = styled.ul`
+ margin: 0 0 16px;
+ padding: 0;
+ max-height: 300px;
+ overflow-y: auto;
+ list-style: none;
+`;
+
+const OptionItem = styled.li`
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ border-radius: 8px;
+ cursor: pointer;
+ padding: 10px;
+ height: 66px;
+ ${fonts.BODY_14_M}
+
+ &:hover {
+ background-color: ${colors.gray700};
+ }
+`;
+const OptionSubItem = styled.div`
+ margin-top: 2px;
+ ${fonts.BODY_13_R}
+
+ color:${colors.gray200}
+`;
+
+const CheckedIcon = styled(IconCheck)`
+ width: 24px;
+ height: 24px;
+ color: ${colors.success};
+`;
+const StItemDiv = styled.div`
+ width: 100%;
+`; | Unknown | ์ ์ด๊ฑฐ ์ฝ๋ ์์ฒด๊ฐ ๋์์ด๊ฐ ๋ง๋ ๊ฑฐ ๊ธฐ๋ฐ์ด ๋ง์ต๋๋ค ใ
ใ
! ๋จ, ์ด๋ฒ์ mds ๋์์ธ์ด ์
๋ฐ์ดํธ ๋๋ฉด์ ๊ธฐ์กด ๋ฐํ
์ํธ ๋์์ธ์ด ์๋๋ผ.. description ๋ถ๋ถ์ด ์ถ๊ฐ๋์ด๊ฐ์ง๊ณ , ๋์์ด๊ฐ ๋ง๋ค์ด์ค ์น๊ตฌ๋ ์กฐ๊ธ ๋ค๋ฅด๊ฒ ์๋ํด์ผ ํ์ต๋๋ค..! ๊ธฐ์กด์ ์ฐ์ด๋ ๋ฐํ
์ํธ๋ฅผ ์์ ํ๋ฉด ์ฌ์ด๋์ดํํธ๊ฐ ์ข ๋ง์ด ์๊ธธ ๊ฒ ๊ฐ์์ ์ผ๋จ์ ํ์ฌ ์ปค์คํ
์ผ๋ก ๊ตฌํํด๋๊ฑฐ๋ผ, Mds๋ก ๋์ฒดํ๋ฉด ๋ ๊ฒ๊ฐ์์! |
@@ -0,0 +1,328 @@
+import styled from '@emotion/styled';
+import { colors } from '@sopt-makers/colors';
+import { fonts } from '@sopt-makers/fonts';
+import { Button, Callout, SelectV2, Tag, TextArea, useDialog, useToast } from '@sopt-makers/ui';
+import { useMutation } from '@tanstack/react-query';
+import { useRouter } from 'next/router';
+import { playgroundLink } from 'playground-common/export';
+import { useState } from 'react';
+
+import { useGetCoffeechatHistory } from '@/api/endpoint/coffeechat/getCoffeechatHistory';
+import { postCoffeechatReview } from '@/api/endpoint/coffeechat/postCoffeechatReview';
+import AuthRequired from '@/components/auth/AuthRequired';
+import BottomSheetMDS from '@/components/coffeechat/CoffeeChatReveiw/BottomSheetMDS';
+import useCustomConfirm from '@/components/common/Modal/useCustomConfirm';
+import Responsive from '@/components/common/Responsive';
+import useEventLogger from '@/components/eventLogger/hooks/useEventLogger';
+import { MB_BIG_MEDIA_QUERY, MOBILE_MEDIA_QUERY } from '@/styles/mediaQuery';
+import { setLayout } from '@/utils/layout';
+
+const CoffeeChatReviewUpload = () => {
+ const [nickname, setNickname] = useState('');
+ const [content, setContent] = useState('');
+ const [isChecked, setIsChecked] = useState(false);
+
+ const { open } = useDialog();
+ const { confirm } = useCustomConfirm();
+ const [coffeechat, setCoffeechat] = useState<number>(0);
+
+ const { open: toastOpen } = useToast();
+ const { data, isLoading } = useGetCoffeechatHistory();
+ const router = useRouter();
+ const { logSubmitEvent } = useEventLogger();
+ const { mutate } = useMutation({
+ mutationFn: () => postCoffeechatReview.request(coffeechat, nickname, content),
+ onSuccess: () => {
+ toastOpen({
+ icon: 'success',
+ content: 'ํ๊ธฐ๊ฐ ๋ฑ๋ก๋์ด์! ๊ฒฝํ์ ๋๋ ์ฃผ์
์ ๊ฐ์ฌํด์.',
+ style: {
+ content: {
+ whiteSpace: 'pre-wrap',
+ },
+ },
+ });
+ logSubmitEvent('coffeechatReview');
+ router.push(playgroundLink.coffeechat());
+ },
+ onError: () => {
+ toastOpen({
+ icon: 'error',
+ content: '๋ฌธ์ ๊ฐ ๋ฐ์ํ์ด์.',
+ style: {
+ content: {
+ whiteSpace: 'pre-wrap',
+ },
+ },
+ });
+ },
+ });
+ const selectOptions = data?.coffeeChatHistories.map((item) => ({
+ label: item.coffeeChatBio || '',
+ value: item.id ?? undefined,
+ description: item.name + ' | ' + item.career || '',
+ }));
+
+ const handleEnroll = async () => {
+ if (nickname.length <= 0 || content.length <= 0) {
+ setIsChecked(true);
+ } else if (coffeechat === 0) {
+ open({
+ title: `์ปคํผ์ฑ์ ์ ํํด์ฃผ์ธ์.`,
+ description: <StDescription>์ปคํผ์ฑ ๋ฆฌ๋ทฐ๋ ์ปคํผ์ฑ ์์ฑ ํ์๋ง ์์ฑ ๊ฐ๋ฅํฉ๋๋ค.</StDescription>,
+ type: 'single',
+ typeOptions: {
+ approveButtonText: 'ํ์ธ',
+ },
+ });
+ } else {
+ open({
+ title: 'ํ๊ธฐ๋ฅผ ๋ฑ๋กํ๊ธฐ ์ , ํ์ธํด์ฃผ์ธ์!',
+ description: (
+ <StDescription>
+ ํ ๋ฒ ๋ฑ๋กํ ํ๊ธฐ๋ ์์ ํ ์ ์์ด์. ์์ ๋ฐ ์ญ์ ๋ฅผ ์ํ์ ๋ค๋ฉด ๋ฉ์ด์ปค์ค ์นด์นด์ค ์ฑ๋๋ก ๋ฌธ์ํด ์ฃผ์ธ์.
+ </StDescription>
+ ),
+ type: 'default',
+ typeOptions: {
+ cancelButtonText: '๋ซ๊ธฐ',
+ approveButtonText: '๋ฑ๋กํ๊ธฐ',
+ buttonFunction: async () => {
+ await mutate();
+ },
+ },
+ });
+ }
+ };
+ return (
+ <AuthRequired>
+ <StMainSection>
+ <StReviewSection>
+ <StTitle>์ปคํผ์ฑ ํ๊ธฐ ์์ฑํ๊ธฐ</StTitle>
+ <Callout type='information'>
+ ์ปคํผ์์์ ์ ์ตํ ์๊ฐ ๋ณด๋ด์
จ๋์? ์ปคํผ์์์ ๋ ๋ง์ ์ปคํผ์ฑ์ด ์ค๊ฐ ์ ์๋๋ก ์์คํ ํ๊ธฐ๋ฅผ ๋ถํ๋๋ ค์!
+ </Callout>
+ <StInfo>
+ ํ๊ธฐ๋ฅผ ์์ฑํ ์ปคํผ์ฑ <span style={{ color: 'rgb(247 114 52 / 100%)' }}>*</span>
+ </StInfo>
+ <StSubInfo>์ปคํผ์ฑ์ ์งํํ ํ์์ธ์ง ํ์ธ์ด ํ์ํด์. ์ด๋ค ์ปคํผ์ฑ์ ์งํํ๋์ง๋ ๊ณต๊ฐ๋์ง ์์์</StSubInfo>
+ <Responsive only='desktop'>
+ <SelectV2.Root
+ type='textDesc'
+ className='coffechat-select'
+ visibleOptions={3}
+ onChange={(e) => setCoffeechat(Number(e))}
+ >
+ <SelectV2.Trigger>
+ <SelectV2.TriggerContent placeholder={'์งํํ ์ปคํผ์ฑ์ ์ ๋ชฉ์ด ๋ฌด์์ธ๊ฐ์?'} />
+ </SelectV2.Trigger>
+ <StSelectV2Menu className='coffeechat-ul'>
+ {selectOptions?.map((option) => (
+ <StSelectV2MenuItem key={option.value} option={option} />
+ ))}
+ </StSelectV2Menu>
+ </SelectV2.Root>
+ </Responsive>
+ <Responsive only='mobile'>
+ <div style={{ marginTop: '8px' }}>
+ <BottomSheetMDS
+ placeholder='์งํํ ์ปคํผ์ฑ์ ์ ๋ชฉ์ ๋ฌด์์ธ๊ฐ์?'
+ options={selectOptions || []}
+ value={undefined}
+ onChange={(value) => {
+ setCoffeechat(Number(value));
+ }}
+ />
+ </div>
+ </Responsive>
+ {coffeechat > 0 && (
+ <>
+ {' '}
+ <StInfo>์ ํํ ์ปคํผ์ฑ์ ์ฃผ์ </StInfo>
+ <StLabelWrapper>
+ {data?.coffeeChatHistories
+ .find((item) => item.id === coffeechat) // id๊ฐ coffeechat์ธ ๊ฐ์ฒด ์ฐพ๊ธฐ
+ ?.coffeeChatTopicType?.map((tag, index) => (
+ <Tag key={index} type='solid' size='md' variant='default'>
+ {tag}
+ </Tag>
+ ))}
+ </StLabelWrapper>
+ </>
+ )}
+
+ <StInfo>
+ ๋์ ๋๋ค์ <span style={{ color: 'rgb(247 114 52 / 100%)' }}>*</span>
+ </StInfo>
+ <StSubInfo>ํ๊ธฐ๋ ์ปคํผ์ ํ์ ์ต๋ช
์ผ๋ก ๋ฑ๋ก๋ผ์! ์ํ๋ ๋๋ค์์ ์
๋ ฅํด์ฃผ์ธ์</StSubInfo>
+ <div style={{ position: 'relative' }}>
+ <StTextArea
+ errorMessage='๋๋ค์์ ์
๋ ฅํด์ฃผ์ธ์'
+ isError={isChecked && nickname.length <= 0}
+ maxLength={10}
+ placeholder='ex. ์นดํ์ธ ์ค๋
์'
+ onChange={(e) => setNickname(e.target.value)}
+ value={nickname}
+ />
+ <TextCountWrapper>{nickname.length < 10 ? nickname.length : 10}/10</TextCountWrapper>
+ <StInfo>
+ ์์ธ ํ๊ธฐ <span style={{ color: 'rgb(247 114 52 / 100%)' }}>*</span>
+ </StInfo>
+ </div>
+ <div style={{ position: 'relative', height: 'auto' }}>
+ <StTextArea
+ errorMessage='์์ธ ํ๊ธฐ๋ฅผ ์
๋ ฅํด์ฃผ์ธ์'
+ placeholder={`ex.
+โข ๊ถ๊ธํ๋ ๋ด์ฉ์ A-Z๊น์ง ์น์ ํ๊ฒ ์๋ ค์ฃผ์
์ ์ ์ตํ์ด์.
+โข ์ด๋ฐ ๋ด์ฉ์ ๋๋ ์ ์์ด์ ๋ป ๊น์์ด์.`}
+ fixedHeight={130}
+ maxLength={500}
+ onChange={(e) => setContent(e.target.value)}
+ isError={isChecked && content.length <= 0}
+ value={content}
+ ></StTextArea>
+ <TextCountWrapper style={{ top: '160px' }}>{content.length}/500</TextCountWrapper>
+ </div>
+ <StButtonWrapper>
+ <StButton onClick={() => handleEnroll()}>ํ๊ธฐ ๋ฑ๋กํ๊ธฐ</StButton>
+ </StButtonWrapper>
+ </StReviewSection>
+ </StMainSection>
+ </AuthRequired>
+ );
+};
+setLayout(CoffeeChatReviewUpload, 'headerFooter');
+export default CoffeeChatReviewUpload;
+const StMainSection = styled.div`
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-top: 48px;
+ margin-bottom: 142px;
+ width: 100%;
+ height: 100%;
+
+ .coffechat-select {
+ margin-top: 8px;
+ width: 100%;
+
+ button {
+ width: 100%;
+
+ div {
+ width: 100%;
+ }
+ }
+ }
+
+ @media ${MOBILE_MEDIA_QUERY} {
+ margin-top: 0;
+ }
+ @media ${MB_BIG_MEDIA_QUERY} {
+ margin-bottom: 84px;
+ }
+`;
+const StReviewSection = styled.div`
+ padding: 40px;
+ padding-right: 30px;
+ padding-left: 30px;
+ width: 1260px;
+
+ @media ${MB_BIG_MEDIA_QUERY} {
+ padding: 30px;
+ padding-right: 20px;
+ padding-left: 20px;
+ }
+`;
+const StTitle = styled.div`
+ margin-bottom: 20px;
+ width: 100%;
+ height: 48px;
+ ${fonts.HEADING_32_B}
+ @media ${MB_BIG_MEDIA_QUERY} {
+ ${fonts.HEADING_24_B}
+
+ margin-bottom:16px;
+ }
+`;
+const StInfo = styled.div`
+ ${fonts.LABEL_16_SB}
+
+ margin-top:40px;
+ @media ${MB_BIG_MEDIA_QUERY} {
+ ${fonts.LABEL_14_SB};
+ }
+`;
+const StSubInfo = styled.div`
+ ${fonts.LABEL_14_SB}
+
+ margin-top:8px;
+ letter-spacing: -0.32px;
+ color: ${colors.gray300};
+
+ @media ${MB_BIG_MEDIA_QUERY} {
+ ${fonts.LABEL_12_SB};
+ }
+`;
+
+const StTextArea = styled(TextArea)`
+ margin-top: 8px;
+`;
+const StButtonWrapper = styled.div`
+ display: flex;
+ justify-content: flex-end;
+ margin-top: 70px;
+ width: 100%;
+`;
+const TextCountWrapper = styled.div`
+ position: absolute;
+ top: 56px;
+ width: 100%;
+ text-align: right;
+ color: ${colors.gray300};
+ ${fonts.LABEL_12_SB};
+`;
+const StButton = styled(Button)`
+ @media ${MB_BIG_MEDIA_QUERY} {
+ width: 100%;
+ height: 42px;
+ ${fonts.LABEL_16_SB}
+ }
+`;
+
+const StLabelWrapper = styled.div`
+ display: flex;
+ gap: 8px;
+ margin-top: 8px;
+
+ div {
+ border-radius: 100px;
+ padding: 3px 9px;
+ }
+`;
+const StSelectV2Menu = styled(SelectV2.Menu)`
+ width: calc(100vw - 60px);
+ max-width: 1200px;
+ white-space: nowrap;
+
+ li {
+ width: calc(100vw - 60px);
+ max-width: 1200px;
+
+ button {
+ width: calc(100vw - 60px);
+ max-width: 1200px;
+ }
+ }
+`;
+const StSelectV2MenuItem = styled(SelectV2.MenuItem)`
+ li {
+ width: calc(100% - 60px);
+ }
+`;
+const StDescription = styled.div`
+ margin-top: 12px;
+ @media ${MOBILE_MEDIA_QUERY} {
+ margin-top: 8px;
+ }
+`; | Unknown | ์์ ๋๋ฌด ์ข์ต๋๋ค! |
@@ -0,0 +1,209 @@
+import styled from '@emotion/styled';
+import { colors } from '@sopt-makers/colors';
+import { fonts } from '@sopt-makers/fonts';
+import { IconCheck, IconChevronDown } from '@sopt-makers/icons';
+import { Button } from '@sopt-makers/ui';
+import { ReactNode, useEffect, useState } from 'react';
+
+import Portal from '@/components/common/Portal';
+import { zIndex } from '@/styles/zIndex';
+
+interface Option {
+ label: string;
+ value: number | undefined;
+ description?: string;
+}
+
+interface BottomSheetSelectProps {
+ options: Option[];
+ defaultOption?: Option;
+ value: string | null | undefined;
+ placeholder: string;
+ onChange: (value: string) => void;
+ icon?: ReactNode;
+ className?: string;
+}
+
+const BottomSheetMDS = ({
+ options,
+ defaultOption,
+ value,
+ placeholder,
+ onChange,
+ icon,
+ className,
+}: BottomSheetSelectProps) => {
+ const [open, setOpen] = useState(false);
+ const [selectedValue, setSelectedValue] = useState(value);
+ const [temporaryValue, setTemporaryValue] = useState(value);
+
+ const handleOpen = () => setOpen(true);
+ const handleClose = () => setOpen(false);
+
+ const handleOptionSelect = (value: string) => {
+ setTemporaryValue(value);
+ };
+
+ const handleConfirm = () => {
+ setSelectedValue(temporaryValue);
+ onChange(temporaryValue as string);
+
+ handleClose();
+ };
+
+ useEffect(() => {
+ if (open) {
+ document.body.style.overflow = 'hidden';
+ } else {
+ document.body.style.overflow = '';
+ }
+
+ return () => {
+ document.body.style.overflow = '';
+ };
+ }, [open]);
+
+ const getSelectedLabel = (value: string) => {
+ return options.find((option) => Number(option.value) === Number(value))?.label;
+ };
+
+ return (
+ <Container>
+ <InputField onClick={handleOpen} className={className}>
+ {selectedValue ? (
+ <p>{getSelectedLabel(selectedValue)}</p>
+ ) : (
+ <p style={{ color: '#808087', whiteSpace: 'pre-wrap' }}>{placeholder}</p>
+ )}
+
+ {icon || (
+ <IconChevronDown
+ style={{
+ width: 20,
+ minWidth: 20,
+ height: 20,
+ minHeight: 20,
+ transform: open ? 'rotate(-180deg)' : '',
+ transition: 'all 0.5s',
+ }}
+ />
+ )}
+ </InputField>
+
+ {open && (
+ <Portal portalId='bottomsheet'>
+ <Overlay />
+ <BottomSheet>
+ <OptionList>
+ {defaultOption && (
+ <OptionItem onClick={() => handleOptionSelect(String(defaultOption.value))}>
+ {defaultOption.label}
+ {temporaryValue === defaultOption.value && <CheckedIcon />}
+ </OptionItem>
+ )}
+ {options.map((option) => (
+ <OptionItem key={option.value} onClick={() => handleOptionSelect(String(option.value))}>
+ <StItemDiv>
+ {option.label}
+ <OptionSubItem>{option.description}</OptionSubItem>
+ </StItemDiv>
+ {temporaryValue === option.value && <CheckedIcon />}
+ </OptionItem>
+ ))}
+ </OptionList>
+ <Button size='lg' style={{ width: '100%' }} onClick={handleConfirm}>
+ ํ์ธ
+ </Button>
+ </BottomSheet>
+ </Portal>
+ )}
+ </Container>
+ );
+};
+export default BottomSheetMDS;
+
+const Container = styled.div`
+ position: relative;
+ width: 100%;
+`;
+
+const InputField = styled.div`
+ display: flex;
+ gap: 12px;
+ align-items: center;
+ justify-content: space-between;
+ border-radius: 10px;
+ background-color: ${colors.gray800};
+ cursor: pointer;
+ padding: 11px 16px;
+ ${fonts.BODY_16_M};
+
+ max-width: calc(100vw - 40px);
+
+ p {
+ width: 100%;
+ overflow: hidden; /* ๋์น๋ ํ
์คํธ ์จ๊น */
+ text-overflow: ellipsis;
+ white-space: nowrap; /* ํ
์คํธ ์ค ๋ฐ๊ฟ ๋ฐฉ์ง */
+ }
+`;
+
+const Overlay = styled.div`
+ position: fixed;
+ top: 0;
+ left: 0;
+ z-index: ${zIndex.ํค๋};
+ background-color: rgb(15 15 18 / 80%);
+ width: 100%;
+ height: 100%;
+`;
+
+const BottomSheet = styled.section`
+ position: fixed;
+ bottom: 0;
+ left: 20px;
+ z-index: ${zIndex.ํค๋};
+ margin-bottom: 12px;
+ border-radius: 16px;
+ background-color: ${colors.gray800};
+ padding: 16px;
+ width: calc(100% - 40px);
+`;
+
+const OptionList = styled.ul`
+ margin: 0 0 16px;
+ padding: 0;
+ max-height: 300px;
+ overflow-y: auto;
+ list-style: none;
+`;
+
+const OptionItem = styled.li`
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ border-radius: 8px;
+ cursor: pointer;
+ padding: 10px;
+ height: 66px;
+ ${fonts.BODY_14_M}
+
+ &:hover {
+ background-color: ${colors.gray700};
+ }
+`;
+const OptionSubItem = styled.div`
+ margin-top: 2px;
+ ${fonts.BODY_13_R}
+
+ color:${colors.gray200}
+`;
+
+const CheckedIcon = styled(IconCheck)`
+ width: 24px;
+ height: 24px;
+ color: ${colors.success};
+`;
+const StItemDiv = styled.div`
+ width: 100%;
+`; | Unknown | ์ UI๊ฐ ์ข ๋ฌ๋๊ตฐ์~!!! ํ์ธํ์ต๋๋ค ใ
ใ
ใ
|
@@ -0,0 +1,31 @@
+package com.spoteditor.backend.domain.user.controller;
+
+import com.spoteditor.backend.common.exceptions.user.UserException;
+import com.spoteditor.backend.common.exceptions.user.UserErrorCode;
+import com.spoteditor.backend.domain.user.service.UserTokenService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api")
+@RequiredArgsConstructor
+public class AuthController {
+
+ private final UserTokenService userTokenService;
+
+ @PostMapping("/auth/refresh")
+ public ResponseEntity<Void> refreshAccessToken (HttpServletRequest request, HttpServletResponse response) throws Exception {
+ userTokenService.refreshAccessToken(request, response);
+
+ return new ResponseEntity<>(HttpStatus.OK);
+ }
+} | Java | BaseException์ด RuntimeException์ ์์๋ฐ๋ ์ ํฌ ํ๋ก์ ํธ์ ์ต์์ ์์ธ๊ฐ ๋ง๋ค๋ฉด ์ง์ ๋
ธ์ถ์ ํ ํ์๊ฐ ์์ด๋ณด์
๋๋ค.
์ต์์ ์ธ์ฒดํฌ ์์ธ๋ฅผ ๊ฐ๋ฐ ํ ๊ทธ ์ธ์ฒดํฌ ์์ธ๋ฅผ ์์๋ฐ๊ณ ๊ฐ๊ฐ์ ์ปค์คํ
์ค๋ฅ ์ฝ๋๋ฅผ ๋ฑ๋กํ๋ค๋ฉด ๋ ๊ฒ ๊ฐ์ต๋๋ค.
์์ธ ์ฒ๋ฆฌ๋ ์ธ๋ฐํ๊ฒ ํ๋ ๊ฒ์ด ์ข์ต๋๋ค. |
@@ -0,0 +1,41 @@
+package com.spoteditor.backend.domain.user.service;
+
+import com.spoteditor.backend.common.exceptions.user.UserErrorCode;
+import com.spoteditor.backend.common.exceptions.user.UserException;
+import com.spoteditor.backend.common.util.CookieUtils;
+import com.spoteditor.backend.domain.user.common.dto.UserIdDto;
+import com.spoteditor.backend.security.jwt.JwtConstants;
+import com.spoteditor.backend.security.jwt.JwtUtils;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class UserTokenService {
+
+ private final JwtUtils jwtUtils;
+ private final CookieUtils cookieUtils;
+
+ public void refreshAccessToken(HttpServletRequest request, HttpServletResponse response) throws Exception {
+ String refreshToken = cookieUtils.getRefreshToken(request);
+
+ if(refreshToken == null) {
+ throw new UserException(UserErrorCode.REFRESH_TOKEN_NOT_IN_COOKIE);
+ }
+
+ try {
+ // RefreshToken ๊ฒ์ฆ
+ UsernamePasswordAuthenticationToken authentication = jwtUtils.setAuthentication(refreshToken);
+ UserIdDto userIdDto = (UserIdDto) authentication.getPrincipal();
+
+ // ๊ฒ์ฆ ์ฑ๊ณต -> accessToken ๋ฐ๊ธ
+ String accessToken = jwtUtils.createAccessToken(userIdDto.getId());
+ cookieUtils.setAccessTokenCookie(response, JwtConstants.ACCESS_TOKEN, accessToken);
+ } catch (UserException e) {
+ throw new UserException(UserErrorCode.REFRESH_TOKEN_INVALID);
+ }
+ }
+} | Java | ์ด ๋ถ๋ถ๋ ๋์ผํ ๋งฅ๋ฝ์
๋๋ค. |
@@ -0,0 +1,43 @@
+package com.spoteditor.backend.security.oauth.handler;
+
+import com.spoteditor.backend.common.util.CookieUtils;
+import com.spoteditor.backend.security.jwt.JwtConstants;
+import com.spoteditor.backend.security.jwt.JwtUtils;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.oauth2.core.user.OAuth2User;
+import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.Map;
+
+@Component
+@RequiredArgsConstructor
+public class OauthSuccessHandler implements AuthenticationSuccessHandler {
+
+ private final JwtUtils jwtUtils;
+ private final CookieUtils cookieUtils;
+
+ @Override
+ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException {
+ OAuth2User oauthUser = (OAuth2User) authentication.getPrincipal();
+
+ Map<String, Object> attributesMap = oauthUser.getAttributes();
+
+ Long id = (Long) attributesMap.get("id");
+ String name = (String) attributesMap.get("name");
+
+ String accessToken = jwtUtils.createAccessToken(id);
+ String refreshToken = jwtUtils.createRefreshToken(id);
+
+ cookieUtils.setAccessTokenCookie(response, JwtConstants.ACCESS_TOKEN, accessToken);
+ cookieUtils.setRefreshTokenCookie(response, JwtConstants.REFRESH_TOKEN, refreshToken);
+
+// redirect
+ response.sendRedirect("/success");
+ }
+} | Java | `/success` ๊ฒฝ๋ก๊ฐ ์ฝ๋ฐฑ ์ฒ๋ฆฌ์ธ๊ฐ์? |
@@ -0,0 +1,43 @@
+package com.spoteditor.backend.security.oauth.handler;
+
+import com.spoteditor.backend.common.util.CookieUtils;
+import com.spoteditor.backend.security.jwt.JwtConstants;
+import com.spoteditor.backend.security.jwt.JwtUtils;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.oauth2.core.user.OAuth2User;
+import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.Map;
+
+@Component
+@RequiredArgsConstructor
+public class OauthSuccessHandler implements AuthenticationSuccessHandler {
+
+ private final JwtUtils jwtUtils;
+ private final CookieUtils cookieUtils;
+
+ @Override
+ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException {
+ OAuth2User oauthUser = (OAuth2User) authentication.getPrincipal();
+
+ Map<String, Object> attributesMap = oauthUser.getAttributes();
+
+ Long id = (Long) attributesMap.get("id");
+ String name = (String) attributesMap.get("name");
+
+ String accessToken = jwtUtils.createAccessToken(id);
+ String refreshToken = jwtUtils.createRefreshToken(id);
+
+ cookieUtils.setAccessTokenCookie(response, JwtConstants.ACCESS_TOKEN, accessToken);
+ cookieUtils.setRefreshTokenCookie(response, JwtConstants.REFRESH_TOKEN, refreshToken);
+
+// redirect
+ response.sendRedirect("/success");
+ }
+} | Java | ๋ค ๋ง์ต๋๋ค |
@@ -0,0 +1,31 @@
+package com.spoteditor.backend.domain.user.controller;
+
+import com.spoteditor.backend.common.exceptions.user.UserException;
+import com.spoteditor.backend.common.exceptions.user.UserErrorCode;
+import com.spoteditor.backend.domain.user.service.UserTokenService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api")
+@RequiredArgsConstructor
+public class AuthController {
+
+ private final UserTokenService userTokenService;
+
+ @PostMapping("/auth/refresh")
+ public ResponseEntity<Void> refreshAccessToken (HttpServletRequest request, HttpServletResponse response) throws Exception {
+ userTokenService.refreshAccessToken(request, response);
+
+ return new ResponseEntity<>(HttpStatus.OK);
+ }
+} | Java | ๋ต๋ณ์ฃผ์ ๋ด์ฉ์ด BaseException์ ์์๋ฐ๋ ๊ฐ๊ฐ์ ์ปค์คํ
์ค๋ฅ ํด๋์ค๋ฅผ ์์ฑํด์ ๋ ์๋ฏธ๋ฅผ ๋ช
ํํ๊ฒ ํ๋ผ๋ ๋ง์์ด์ ๊ฐ์? |
@@ -0,0 +1,31 @@
+package com.spoteditor.backend.domain.user.controller;
+
+import com.spoteditor.backend.common.exceptions.user.UserException;
+import com.spoteditor.backend.common.exceptions.user.UserErrorCode;
+import com.spoteditor.backend.domain.user.service.UserTokenService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api")
+@RequiredArgsConstructor
+public class AuthController {
+
+ private final UserTokenService userTokenService;
+
+ @PostMapping("/auth/refresh")
+ public ResponseEntity<Void> refreshAccessToken (HttpServletRequest request, HttpServletResponse response) throws Exception {
+ userTokenService.refreshAccessToken(request, response);
+
+ return new ResponseEntity<>(HttpStatus.OK);
+ }
+} | Java | ๋ค, ์ง๊ธ ์ฝ๋๋ฅผ ๋ณด์๋ฉด BaseException์ ๊ทธ๋๋ก ๋ฐํํ๋๋ก ๋์ด ์๋๋ฐ ์ถ๊ฐ ์๊ตฌ์ฌํญ ์ ์์ ์ ์ง๋ณด์๊ฐ ์ด๋ ค์ธ ์ ์์ต๋๋ค. |
@@ -0,0 +1,31 @@
+package com.spoteditor.backend.domain.user.controller;
+
+import com.spoteditor.backend.common.exceptions.user.UserException;
+import com.spoteditor.backend.common.exceptions.user.UserErrorCode;
+import com.spoteditor.backend.domain.user.service.UserTokenService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api")
+@RequiredArgsConstructor
+public class AuthController {
+
+ private final UserTokenService userTokenService;
+
+ @PostMapping("/auth/refresh")
+ public ResponseEntity<Void> refreshAccessToken (HttpServletRequest request, HttpServletResponse response) throws Exception {
+ userTokenService.refreshAccessToken(request, response);
+
+ return new ResponseEntity<>(HttpStatus.OK);
+ }
+} | Java | ๊ทธ๋ฆฌ๊ณ ์ถ๊ฐ์ ์ผ๋ก ๋ง์์ ๋๋ฆฌ๋๊ฑด ์ ํฌ ๊ฐํธ ์ฐจํธ์ ์๋ ๊ท์ฝ์ ๋ค์ ํ ๋ฒ ์ดํด๋ฅผ ํ์
์ผ ํ ๊ฒ ๊ฐ์ต๋๋ค
POST ์์ฒญ์ธ ๊ฒฝ์ฐ์๋ ๋ถ๋ช
๋ฐ๋๊ฐ ์์ด HTTP Status Code๋ฅผ ๋ช
ํํ๊ฒ ๋ณด๋ด์ค์ผํ๋๋ฐ ์คํ๋ ค List ์ปฌ๋ ์
์ ๋ฐํํ๊ณ ์์ต๋๋ค |
@@ -0,0 +1,41 @@
+package com.spoteditor.backend.domain.user.service;
+
+import com.spoteditor.backend.common.exceptions.user.UserErrorCode;
+import com.spoteditor.backend.common.exceptions.user.UserException;
+import com.spoteditor.backend.common.util.CookieUtils;
+import com.spoteditor.backend.domain.user.common.dto.UserIdDto;
+import com.spoteditor.backend.security.jwt.JwtConstants;
+import com.spoteditor.backend.security.jwt.JwtUtils;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class UserTokenService {
+
+ private final JwtUtils jwtUtils;
+ private final CookieUtils cookieUtils;
+
+ public void refreshAccessToken(HttpServletRequest request, HttpServletResponse response) throws Exception {
+ String refreshToken = cookieUtils.getRefreshToken(request);
+
+ if(refreshToken == null) {
+ throw new UserException(UserErrorCode.REFRESH_TOKEN_NOT_IN_COOKIE);
+ }
+
+ try {
+ // RefreshToken ๊ฒ์ฆ
+ UsernamePasswordAuthenticationToken authentication = jwtUtils.setAuthentication(refreshToken);
+ UserIdDto userIdDto = (UserIdDto) authentication.getPrincipal();
+
+ // ๊ฒ์ฆ ์ฑ๊ณต -> accessToken ๋ฐ๊ธ
+ String accessToken = jwtUtils.createAccessToken(userIdDto.getId());
+ cookieUtils.setAccessTokenCookie(response, JwtConstants.ACCESS_TOKEN, accessToken);
+ } catch (UserException e) {
+ throw new UserException(UserErrorCode.REFRESH_TOKEN_INVALID);
+ }
+ }
+} | Java | ์ด UserIdDto๋ฅผ ์ปจํธ๋กค๋ฌ์์ ์ด๋ป๊ฒ ํ์ฉํ ์ ์๋์ง๋ฅผ ๋ฌธ์ํํด์ฃผ์๋ฉด ์ฝ์ด๋ณด๊ณ ๊ณต๊ฐ ์ธก์ ์ ์ฉํ๊ฒ ์ต๋๋ค. |
@@ -1,8 +1,79 @@
import React, { Component } from 'react';
+import { Link } from 'react-router-dom';
+
+import './Login.scss';
class Login extends Component {
+ constructor() {
+ super();
+ this.state = {
+ id: '',
+ pw: '',
+ };
+ }
+
+ handleInput = event => {
+ const { name, value } = event.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ goToMain = () => {
+ this.props.history.push('/main-Soojeong#');
+ };
+
render() {
- return <div>๋ก๊ทธ์ธ</div>;
+ const isValid =
+ this.state.id.includes('@') &&
+ this.state.id.length >= 5 &&
+ this.state.pw.length >= 8;
+
+ return (
+ <div className="Login">
+ <main>
+ <header>
+ <h1>Westagram</h1>
+ </header>
+
+ <section className="loginInputBox">
+ <h2 className="sr-only">login page</h2>
+ <form>
+ <input
+ name="id"
+ autoComplete="off"
+ onChange={this.handleInput}
+ type="text"
+ id="loginId"
+ value={this.state.id}
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ />
+ <input
+ name="pw"
+ onChange={this.handleInput}
+ type="password"
+ value={this.state.pw}
+ placeholder="๋น๋ฐ๋ฒํธ"
+ />
+ <button
+ onClick={this.goToMain}
+ type="button"
+ className="loginBtn"
+ disabled={!isValid}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ </form>
+ </section>
+
+ <footer>
+ <Link to="" className="findPassword">
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </Link>
+ </footer>
+ </main>
+ </div>
+ );
}
}
| JavaScript | ์ค ๊ตฌ์กฐ๋ถํด ํ ๋น~ |
@@ -1,8 +1,79 @@
import React, { Component } from 'react';
+import { Link } from 'react-router-dom';
+
+import './Login.scss';
class Login extends Component {
+ constructor() {
+ super();
+ this.state = {
+ id: '',
+ pw: '',
+ };
+ }
+
+ handleInput = event => {
+ const { name, value } = event.target;
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ goToMain = () => {
+ this.props.history.push('/main-Soojeong#');
+ };
+
render() {
- return <div>๋ก๊ทธ์ธ</div>;
+ const isValid =
+ this.state.id.includes('@') &&
+ this.state.id.length >= 5 &&
+ this.state.pw.length >= 8;
+
+ return (
+ <div className="Login">
+ <main>
+ <header>
+ <h1>Westagram</h1>
+ </header>
+
+ <section className="loginInputBox">
+ <h2 className="sr-only">login page</h2>
+ <form>
+ <input
+ name="id"
+ autoComplete="off"
+ onChange={this.handleInput}
+ type="text"
+ id="loginId"
+ value={this.state.id}
+ placeholder="์ ํ๋ฒํธ, ์ฌ์ฉ์ ์ด๋ฆ ๋๋ ์ด๋ฉ์ผ"
+ />
+ <input
+ name="pw"
+ onChange={this.handleInput}
+ type="password"
+ value={this.state.pw}
+ placeholder="๋น๋ฐ๋ฒํธ"
+ />
+ <button
+ onClick={this.goToMain}
+ type="button"
+ className="loginBtn"
+ disabled={!isValid}
+ >
+ ๋ก๊ทธ์ธ
+ </button>
+ </form>
+ </section>
+
+ <footer>
+ <Link to="" className="findPassword">
+ ๋น๋ฐ๋ฒํธ๋ฅผ ์์ผ์
จ๋์?
+ </Link>
+ </footer>
+ </main>
+ </div>
+ );
}
}
| JavaScript | this.state.id.includes('@') &&
this.state.id.length >= 5 &&
this.state.pw.length >= 8 ์ด๊ฑธ true/false Boolean?? ์ด๊ฐ์ ์ฌ์ฉํด์ ์ผํญ์ฐ์ฐ์๋ก ํด๋ ๋์ง ์์๊น์ ์์ ๋์ ์ํ์๋ ์๋ง๊ฐ๋ฅํ์ค๋ฏ! |
@@ -0,0 +1,61 @@
+.Login {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 100vh;
+
+ main {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+ width: 350px;
+ height: 380px;
+ padding: 40px;
+ border: 1px solid #ccc;
+
+ header {
+ h1 {
+ font-family: 'Lobster', cursive;
+ text-align: center;
+ }
+ }
+
+ .loginInputBox {
+ form {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+
+ input {
+ margin-bottom: 5px;
+ padding: 9px 8px 7px;
+ background-color: rgb(250, 250, 250);
+ border: 1px solid rgb(38, 38, 38);
+ border-radius: 3px;
+ }
+
+ .loginBtn {
+ margin-top: 10px;
+ padding: 9px 8px 7px;
+ border: none;
+ border-radius: 3px;
+ color: #fff;
+ background-color: #0096f6;
+ &:disabled {
+ background-color: #c0dffd;
+ }
+ }
+ }
+ }
+
+ footer {
+ .findPassword {
+ display: block;
+ margin-top: 50px;
+ text-align: center;
+ color: #00376b;
+ font-size: 14px;
+ }
+ }
+ }
+} | Unknown | ์ด๊ฑด ์ ์ฃผ์์ผ๋ก ๋์๋์??? |
@@ -0,0 +1,134 @@
+[
+ {
+ "id": 1,
+ "userName": "eessoo__",
+ "src": "../images/soojeongLee/user2.jpg",
+ "feedText": "๐",
+ "commentData": [
+ {
+ "id": 1,
+ "userName": "wecode",
+ "content": "Welcome to world best coding bootcamp!",
+ "commnetLike": false
+ },
+ {
+ "id": 2,
+ "userName": "soojeonglee",
+ "content": "Hi there.",
+ "commnetLike": false
+ },
+ {
+ "id": 3,
+ "userName": "jaehyunlee",
+ "content": "Hey.",
+ "commnetLike": false
+ },
+ {
+ "id": 4,
+ "userName": "gyeongminlee",
+ "content": "Hi.",
+ "commnetLike": true
+ }
+ ],
+ "isLike": false
+ },
+ {
+ "id": 2,
+ "userName": "zz_ing94",
+ "src": "../../images/soojeongLee/user3.jpg",
+ "feedText": "Toy story ๐",
+ "commentData": [
+ {
+ "id": 1,
+ "userName": "wecode",
+ "content": "Welcome to world best coding bootcamp!",
+ "commnetLike": false
+ },
+ {
+ "id": 2,
+ "userName": "jisuoh",
+ "content": "โจ",
+ "commnetLike": true
+ },
+ {
+ "id": 3,
+ "userName": "jungjunsung",
+ "content": "coffee",
+ "commnetLike": false
+ },
+ {
+ "id": 4,
+ "userName": "somihwang",
+ "content": "ํฌํค",
+ "commnetLike": true
+ }
+ ],
+ "isLike": false
+ },
+ {
+ "id": 3,
+ "userName": "hwayoonci",
+ "src": "../../images/soojeongLee/user4.jpg",
+ "feedText": "์ค๋์ ์ผ๊ธฐ",
+ "commentData": [
+ {
+ "id": 1,
+ "userName": "wecode",
+ "content": "Welcome to world best coding bootcamp!",
+ "commnetLike": false
+ },
+ {
+ "id": 2,
+ "userName": "yunkyunglee",
+ "content": "๊ท์ฌ์ด ์คํฐ์ปค",
+ "commnetLike": true
+ },
+ {
+ "id": 3,
+ "userName": "summer",
+ "content": "๐ถ",
+ "commnetLike": false
+ },
+ {
+ "id": 4,
+ "userName": "uiyeonlee",
+ "content": "๐๐ป",
+ "commnetLike": true
+ }
+ ],
+ "isLike": true
+ },
+ {
+ "id": 4,
+ "userName": "cosz_zy",
+ "src": "../../images/soojeongLee/user5.jpg",
+ "feedText": "1์ผ ํ๊ฐ ๐จ ",
+ "commentData": [
+ {
+ "id": 1,
+ "userName": "wecode",
+ "content": "Welcome to world best coding bootcamp!",
+ "commnetLike": false
+ },
+ {
+ "id": 2,
+ "userName": "soojeonglee",
+ "content": "Hi there.",
+ "commnetLike": false
+ },
+ {
+ "id": 3,
+ "userName": "jaehyunlee",
+ "content": "Hey.",
+ "commnetLike": true
+ },
+ {
+ "id": 4,
+ "userName": "gyeongminlee",
+ "content": "Hi.",
+ "commnetLike": true
+ }
+ ],
+ "isLike": false
+ }
+] | Unknown | ์ ์ด์จ ํ์ผ๋ ์์๊ตฐ์! |
@@ -0,0 +1,175 @@
+import React, { Component } from 'react';
+import { Link } from 'react-router-dom';
+
+import Comment from './Comment/Comment';
+
+import '../Feed/Feed.scss';
+
+export class Feed extends Component {
+ constructor() {
+ super();
+ this.state = {
+ comment: '',
+ // commentList: [],
+ // isLike: false,
+ };
+ }
+
+ // componentDidMount() {
+ // this.setState({
+ // commentList: this.props.commentData,
+ // isLike: this.props.isLike,
+ // });
+ // }
+
+ hadComment = event => {
+ this.setState({
+ comment: event.target.value,
+ });
+ };
+
+ // ํด๋ฆญํจ์
+ submitComent = () => {
+ // this.setState({
+ // commentList: this.state.commentList.concat([
+ // {
+ // id: this.state.commentList.length + 1,
+ // userName: 'eessoo__',
+ // content: this.state.comment,
+ // commentLike: false,
+ // },
+ // ]),
+ // comment: '',
+ // });
+ };
+
+ handleKeyPress = event => {
+ if (event.key === 'Enter') {
+ event.preventDefault();
+ this.submitComent();
+ }
+ };
+
+ handleLike = () => {
+ this.setState({
+ isLike: !this.state.isLike,
+ });
+ };
+
+ // ์ถ๊ฐ ๊ธฐ๋ฅ ๊ตฌํ ์ค
+ // handleCommnetDelete = id => {
+ // const newCommentList = this.state.commentList.filter(comment => {
+ // return comment.id !== id;
+ // });
+
+ // this.setState({
+ // commentList: newCommentList,
+ // });
+ // };
+
+ render() {
+ return (
+ <article>
+ <header>
+ <h1>
+ <Link className="contentHeader"></Link>
+ <Link className="userName">{this.props.userName}</Link>
+ </h1>
+ <button className="ellipsis" type="button">
+ <i className="fas fa-ellipsis-h ellipsisIcon"></i>
+ </button>
+ </header>
+ <section className="feedContent">
+ <img alt="feedImage" src={this.props.src} />
+ <ul className="reactionsBox">
+ <li className="reactionsLeft">
+ <button
+ className="leftButton"
+ type="button"
+ onClick={this.handleLike}
+ >
+ {this.state.isLike ? (
+ <i className="fas fa-heart" />
+ ) : (
+ <i className="far fa-heart" />
+ )}
+ </button>
+ <button className="leftButton" type="button">
+ <i className="far fa-comment" />
+ </button>
+ <button className="leftButton" type="button">
+ <i className="fas fa-external-link-alt" />
+ </button>
+ </li>
+ <li className="reactionsRight">
+ <button className="rightButton">
+ <i className="far fa-bookmark" />
+ </button>
+ </li>
+ </ul>
+ <h2>
+ <Link className="userProfile feedConUser"></Link>
+ <b>eessoo__</b>๋ ์ธ
+ <button className="likeCount">
+ <b> 7๋ช
</b>
+ </button>
+ ์ด ์ข์ํฉ๋๋ค.
+ </h2>
+ <p className="feedText">
+ {this.props.feedText}
+ <span className="postTime">54๋ถ ์ </span>
+ </p>
+ <ul id="commnetBox">
+ {/* {this.state.commentList.map(comment => {
+ return (
+ <Comment
+ key={comment.id}
+ userName={comment.userName}
+ content={comment.content}
+ commnetLike={comment.commnetLike}
+ // ์ถ๊ฐ ๊ธฐ๋ฅ ๊ตฌํ ์ค
+ // handleCommnetDelete={this.handleCommnetDelete}
+ // id={comment.id}
+ />
+ );
+ })} */}
+ {this.props.commentData.map(comment => {
+ return (
+ <Comment
+ key={comment.id}
+ userName={comment.userName}
+ content={comment.content}
+ commnetLike={comment.commnetLike}
+ // ์ถ๊ฐ ๊ธฐ๋ฅ ๊ตฌํ ์ค
+ // handleCommnetDelete={this.handleCommnetDelete}
+ // id={comment.id}
+ />
+ );
+ })}
+ </ul>
+ </section>
+ <footer className="feedFooter">
+ <form className="inputBox" onKeyPress={this.handleKeyPress}>
+ <input
+ autoComplete="off"
+ onChange={this.hadComment}
+ className="comment"
+ value={this.state.comment}
+ type="text"
+ placeholder="๋๊ธ ๋ฌ๊ธฐ..."
+ />
+ <button
+ onClick={this.submitComent}
+ className="commentSubmit"
+ type="button"
+ >
+ ๊ฒ์
+ </button>
+ </form>
+ </footer>
+ </article>
+ );
+ }
+}
+
+export default Feed; | JavaScript | ์ค ์ด๋ ๊ฒ ๋ค์ ๋ณผ ์ ์๋ ๋ฐฉ๋ฒ๋ ๋์์ง ์์ ๋ฏ ?
๋์ค์ ๊ฐ์๋ ์ง์์ผ ๋ ์๋ ์์ง๋ง...? |
@@ -0,0 +1,175 @@
+import React, { Component } from 'react';
+import { Link } from 'react-router-dom';
+
+import Comment from './Comment/Comment';
+
+import '../Feed/Feed.scss';
+
+export class Feed extends Component {
+ constructor() {
+ super();
+ this.state = {
+ comment: '',
+ // commentList: [],
+ // isLike: false,
+ };
+ }
+
+ // componentDidMount() {
+ // this.setState({
+ // commentList: this.props.commentData,
+ // isLike: this.props.isLike,
+ // });
+ // }
+
+ hadComment = event => {
+ this.setState({
+ comment: event.target.value,
+ });
+ };
+
+ // ํด๋ฆญํจ์
+ submitComent = () => {
+ // this.setState({
+ // commentList: this.state.commentList.concat([
+ // {
+ // id: this.state.commentList.length + 1,
+ // userName: 'eessoo__',
+ // content: this.state.comment,
+ // commentLike: false,
+ // },
+ // ]),
+ // comment: '',
+ // });
+ };
+
+ handleKeyPress = event => {
+ if (event.key === 'Enter') {
+ event.preventDefault();
+ this.submitComent();
+ }
+ };
+
+ handleLike = () => {
+ this.setState({
+ isLike: !this.state.isLike,
+ });
+ };
+
+ // ์ถ๊ฐ ๊ธฐ๋ฅ ๊ตฌํ ์ค
+ // handleCommnetDelete = id => {
+ // const newCommentList = this.state.commentList.filter(comment => {
+ // return comment.id !== id;
+ // });
+
+ // this.setState({
+ // commentList: newCommentList,
+ // });
+ // };
+
+ render() {
+ return (
+ <article>
+ <header>
+ <h1>
+ <Link className="contentHeader"></Link>
+ <Link className="userName">{this.props.userName}</Link>
+ </h1>
+ <button className="ellipsis" type="button">
+ <i className="fas fa-ellipsis-h ellipsisIcon"></i>
+ </button>
+ </header>
+ <section className="feedContent">
+ <img alt="feedImage" src={this.props.src} />
+ <ul className="reactionsBox">
+ <li className="reactionsLeft">
+ <button
+ className="leftButton"
+ type="button"
+ onClick={this.handleLike}
+ >
+ {this.state.isLike ? (
+ <i className="fas fa-heart" />
+ ) : (
+ <i className="far fa-heart" />
+ )}
+ </button>
+ <button className="leftButton" type="button">
+ <i className="far fa-comment" />
+ </button>
+ <button className="leftButton" type="button">
+ <i className="fas fa-external-link-alt" />
+ </button>
+ </li>
+ <li className="reactionsRight">
+ <button className="rightButton">
+ <i className="far fa-bookmark" />
+ </button>
+ </li>
+ </ul>
+ <h2>
+ <Link className="userProfile feedConUser"></Link>
+ <b>eessoo__</b>๋ ์ธ
+ <button className="likeCount">
+ <b> 7๋ช
</b>
+ </button>
+ ์ด ์ข์ํฉ๋๋ค.
+ </h2>
+ <p className="feedText">
+ {this.props.feedText}
+ <span className="postTime">54๋ถ ์ </span>
+ </p>
+ <ul id="commnetBox">
+ {/* {this.state.commentList.map(comment => {
+ return (
+ <Comment
+ key={comment.id}
+ userName={comment.userName}
+ content={comment.content}
+ commnetLike={comment.commnetLike}
+ // ์ถ๊ฐ ๊ธฐ๋ฅ ๊ตฌํ ์ค
+ // handleCommnetDelete={this.handleCommnetDelete}
+ // id={comment.id}
+ />
+ );
+ })} */}
+ {this.props.commentData.map(comment => {
+ return (
+ <Comment
+ key={comment.id}
+ userName={comment.userName}
+ content={comment.content}
+ commnetLike={comment.commnetLike}
+ // ์ถ๊ฐ ๊ธฐ๋ฅ ๊ตฌํ ์ค
+ // handleCommnetDelete={this.handleCommnetDelete}
+ // id={comment.id}
+ />
+ );
+ })}
+ </ul>
+ </section>
+ <footer className="feedFooter">
+ <form className="inputBox" onKeyPress={this.handleKeyPress}>
+ <input
+ autoComplete="off"
+ onChange={this.hadComment}
+ className="comment"
+ value={this.state.comment}
+ type="text"
+ placeholder="๋๊ธ ๋ฌ๊ธฐ..."
+ />
+ <button
+ onClick={this.submitComent}
+ className="commentSubmit"
+ type="button"
+ >
+ ๊ฒ์
+ </button>
+ </form>
+ </footer>
+ </article>
+ );
+ }
+}
+
+export default Feed; | JavaScript | ๋ฒํผ์ผ๋ก ํ ์ด์ ๊ฐ ์๋์? ๊ถ๊ธ |
@@ -0,0 +1,175 @@
+import React, { Component } from 'react';
+import { Link } from 'react-router-dom';
+
+import Comment from './Comment/Comment';
+
+import '../Feed/Feed.scss';
+
+export class Feed extends Component {
+ constructor() {
+ super();
+ this.state = {
+ comment: '',
+ // commentList: [],
+ // isLike: false,
+ };
+ }
+
+ // componentDidMount() {
+ // this.setState({
+ // commentList: this.props.commentData,
+ // isLike: this.props.isLike,
+ // });
+ // }
+
+ hadComment = event => {
+ this.setState({
+ comment: event.target.value,
+ });
+ };
+
+ // ํด๋ฆญํจ์
+ submitComent = () => {
+ // this.setState({
+ // commentList: this.state.commentList.concat([
+ // {
+ // id: this.state.commentList.length + 1,
+ // userName: 'eessoo__',
+ // content: this.state.comment,
+ // commentLike: false,
+ // },
+ // ]),
+ // comment: '',
+ // });
+ };
+
+ handleKeyPress = event => {
+ if (event.key === 'Enter') {
+ event.preventDefault();
+ this.submitComent();
+ }
+ };
+
+ handleLike = () => {
+ this.setState({
+ isLike: !this.state.isLike,
+ });
+ };
+
+ // ์ถ๊ฐ ๊ธฐ๋ฅ ๊ตฌํ ์ค
+ // handleCommnetDelete = id => {
+ // const newCommentList = this.state.commentList.filter(comment => {
+ // return comment.id !== id;
+ // });
+
+ // this.setState({
+ // commentList: newCommentList,
+ // });
+ // };
+
+ render() {
+ return (
+ <article>
+ <header>
+ <h1>
+ <Link className="contentHeader"></Link>
+ <Link className="userName">{this.props.userName}</Link>
+ </h1>
+ <button className="ellipsis" type="button">
+ <i className="fas fa-ellipsis-h ellipsisIcon"></i>
+ </button>
+ </header>
+ <section className="feedContent">
+ <img alt="feedImage" src={this.props.src} />
+ <ul className="reactionsBox">
+ <li className="reactionsLeft">
+ <button
+ className="leftButton"
+ type="button"
+ onClick={this.handleLike}
+ >
+ {this.state.isLike ? (
+ <i className="fas fa-heart" />
+ ) : (
+ <i className="far fa-heart" />
+ )}
+ </button>
+ <button className="leftButton" type="button">
+ <i className="far fa-comment" />
+ </button>
+ <button className="leftButton" type="button">
+ <i className="fas fa-external-link-alt" />
+ </button>
+ </li>
+ <li className="reactionsRight">
+ <button className="rightButton">
+ <i className="far fa-bookmark" />
+ </button>
+ </li>
+ </ul>
+ <h2>
+ <Link className="userProfile feedConUser"></Link>
+ <b>eessoo__</b>๋ ์ธ
+ <button className="likeCount">
+ <b> 7๋ช
</b>
+ </button>
+ ์ด ์ข์ํฉ๋๋ค.
+ </h2>
+ <p className="feedText">
+ {this.props.feedText}
+ <span className="postTime">54๋ถ ์ </span>
+ </p>
+ <ul id="commnetBox">
+ {/* {this.state.commentList.map(comment => {
+ return (
+ <Comment
+ key={comment.id}
+ userName={comment.userName}
+ content={comment.content}
+ commnetLike={comment.commnetLike}
+ // ์ถ๊ฐ ๊ธฐ๋ฅ ๊ตฌํ ์ค
+ // handleCommnetDelete={this.handleCommnetDelete}
+ // id={comment.id}
+ />
+ );
+ })} */}
+ {this.props.commentData.map(comment => {
+ return (
+ <Comment
+ key={comment.id}
+ userName={comment.userName}
+ content={comment.content}
+ commnetLike={comment.commnetLike}
+ // ์ถ๊ฐ ๊ธฐ๋ฅ ๊ตฌํ ์ค
+ // handleCommnetDelete={this.handleCommnetDelete}
+ // id={comment.id}
+ />
+ );
+ })}
+ </ul>
+ </section>
+ <footer className="feedFooter">
+ <form className="inputBox" onKeyPress={this.handleKeyPress}>
+ <input
+ autoComplete="off"
+ onChange={this.hadComment}
+ className="comment"
+ value={this.state.comment}
+ type="text"
+ placeholder="๋๊ธ ๋ฌ๊ธฐ..."
+ />
+ <button
+ onClick={this.submitComent}
+ className="commentSubmit"
+ type="button"
+ >
+ ๊ฒ์
+ </button>
+ </form>
+ </footer>
+ </article>
+ );
+ }
+}
+
+export default Feed; | JavaScript | autoComplete ์ด๊ฑฐ๋ ๋ญ๊ฐ์? ๊ถ๊ธ~ |
@@ -0,0 +1,128 @@
+@import '../../../../styles/variables.scss';
+
+article {
+ margin-bottom: 20px;
+ background-color: #fff;
+ border-radius: 3px;
+ border: 1px solid $border-color;
+
+ header {
+ @include flex-center;
+ justify-content: space-between;
+ align-content: center;
+ padding: 10px;
+
+ h1 {
+ @include flex-center;
+
+ .contentHeader {
+ @include userProfile;
+ margin-right: 10px;
+ background-image: url('http://localhost:3000/images/soojeongLee/userImage.jpg');
+ background-size: cover;
+ }
+ .userName {
+ font-size: 16px;
+ font-weight: 600;
+ }
+ }
+
+ .ellipsis {
+ @include button;
+ font-size: 22px;
+ .ellipsisIcon {
+ font-weight: 400;
+ }
+ }
+ }
+
+ .feedContent {
+ img {
+ width: 100%;
+ }
+
+ .reactionsBox {
+ @include flex-center;
+ justify-content: space-between;
+ padding: 5px 10px;
+
+ .reactionsLeft {
+ display: flex;
+
+ .leftButton {
+ @include button;
+ font-size: 22px;
+ margin-right: 10px;
+
+ .fa-external-link-alt {
+ font-size: 20px;
+ }
+ }
+ }
+
+ .reactionsRight {
+ .rightButton {
+ @include button;
+ font-size: 22px;
+ }
+ }
+ }
+
+ h2 {
+ display: flex;
+ align-items: center;
+ padding: 0 10px 10px;
+ font-size: 16px;
+ font-weight: normal;
+
+ .feedConUser {
+ @include userProfile;
+ margin-right: 5px;
+ background-image: url('http://localhost:3000/images/soojeongLee/user7.jpg');
+ background-size: cover;
+ }
+
+ .likeCount {
+ @include button;
+ margin-left: 4px;
+ font-size: 16px;
+ }
+ }
+
+ .feedText {
+ margin-bottom: 10px;
+ padding: 0 10px;
+
+ .postTime {
+ @include postTime;
+ margin-top: 5px;
+ font-size: 14px;
+ font-weight: bold;
+ }
+ }
+ }
+
+ .feedFooter {
+ background-color: #fff;
+ border-top: 1px solid $border-color;
+
+ .inputBox {
+ display: flex;
+ padding: 10px;
+
+ .comment {
+ flex: 9;
+ border: none;
+ outline: none;
+ }
+
+ .commentSubmit {
+ @include button;
+ flex: 1;
+ &:hover {
+ color: $summit-color;
+ }
+ }
+ }
+ }
+} | Unknown | ์ด๋ฐ scss ๊ธฐ๋ฅ ์ ๋ ํท๊ฐ๋ ค์ ์ ๋ชปํ๊ฒ ๋๋ฐ ์ํ์๋ค์.. |
@@ -0,0 +1,23 @@
+//๋ผ์ด๋ธ๋ฌ๋ฆฌ
+import React, { Component } from 'react';
+import { Link } from 'react-router-dom';
+
+//์ปดํฌ๋ํธ
+import { FOOTLIST } from '../FootLists/footData';
+
+// css
+import './FootLists.scss';
+
+export class FootLists extends Component {
+ render() {
+ return FOOTLIST.map(footlists => {
+ return (
+ <Link to="" className="listDot" key={footlists.id}>
+ {footlists.footlist}
+ </Link>
+ );
+ });
+ }
+}
+
+export default FootLists; | JavaScript | ๋๊ธ ํ๋์ค! |
@@ -0,0 +1,46 @@
+export const FOOTLIST = [
+ {
+ id: 1,
+ footlist: '์๊ฐ',
+ },
+ {
+ id: 2,
+ footlist: '๋์๋ง',
+ },
+ {
+ id: 3,
+ footlist: 'ํ๋ณด ์ผํฐ',
+ },
+ {
+ id: 4,
+ footlist: 'API',
+ },
+ {
+ id: 5,
+ footlist: '์ฑ์ฉ ์ ๋ณด',
+ },
+ {
+ id: 6,
+ footlist: '๊ฐ์ธ์ ๋ณด์ฒ๋ฆฌ๋ฐฉ์นจ',
+ },
+ {
+ id: 7,
+ footlist: '์ฝ๊ด',
+ },
+ {
+ id: 8,
+ footlist: '์์น',
+ },
+ {
+ id: 9,
+ footlist: '์ธ๊ธฐ ๊ณ์ ',
+ },
+ {
+ id: 10,
+ footlist: 'ํด์ํ๊ทธ',
+ },
+ {
+ id: 11,
+ footlist: '์ธ์ด',
+ },
+]; | JavaScript | ํ์ดํ
ํธํฐ ๋ง๋ค์ด์ ๊ฐ์ ๋ถํ๋๋ ค์ |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.