Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

co.kr로 도메인 변경 #495

Merged
merged 3 commits into from
Aug 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,21 @@

<br/>

## 1. 📝 프로젝트 소개
## 1. 📝 프로젝트 소개

다라쓰는 스크립트 코드를 웹 페이지에 붙여넣는 것만으로 간편하게 댓글 기능을 추가할 수 있는 댓글 모듈 서비스 입니다.

사용자에게 필요한 댓글 기능과 함께 운영에 필요한 댓글 통계 및 관리 기능도 제공합니다.


- [다라쓰 체험해보기](https://darass-test.tistory.com/1)

- [다라쓰 시작하기](https://darass.o-r.kr)
- [다라쓰 시작하기](https://darass.co.kr)

<br/>

## 2. 🙋‍♂️ 팀원

| Backend | Backend | Backend | Backend | Frontend | Frontend |
| :--------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------: |
| Backend | Backend | Backend | Backend | Frontend | Frontend |
| :----------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------: | -------------------------------------------------------------------------------------- |
| <img src="https://avatars.githubusercontent.com/u/56083021?v=4" width=400px alt="제이온"/> | <img src="https://avatars.githubusercontent.com/u/37281119?v=4" width=400px alt="우기"/> | <img src="https://avatars.githubusercontent.com/u/68985748?v=4" width=400px alt="아론"/> | <img src="https://avatars.githubusercontent.com/u/41244373?v=4" width=400px alt="제리"> | <img src="https://avatars.githubusercontent.com/u/42544600?v=4" width=400px alt="도비"> | <img src="https://avatars.githubusercontent.com/u/59409762?v=4" width=400px alt="rhsdl"> | <img src="https://avatars.githubusercontent.com/u/2542730?v=4" width=400px alt="곤이"> |
| [제이온](https://github.com/pjy1368) | [우기](https://github.com/jujubebat) | [아론](https://github.com/Sehwan-Jang) | [제리](https://github.com/jaeseongDev) | [도비](https://github.com/zereight) | [곤이](https://github.com/yungo1846) |

| [제이온](https://github.com/pjy1368) | [우기](https://github.com/jujubebat) | [아론](https://github.com/Sehwan-Jang) | [제리](https://github.com/jaeseongDev) | [도비](https://github.com/zereight) | [곤이](https://github.com/yungo1846) |
2 changes: 1 addition & 1 deletion frontend/deploy-script/src/constants.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const DEVELOP_END_POINT = "https://dorvcm7xtbd6v.cloudfront.net";
const PRODUCTION_END_POINT = "https://reply-darass.o-r.kr";
const PRODUCTION_END_POINT = "https://reply-module.darass.co.kr";

export const END_POINT = process.env.BUILD_MODE === "development" ? DEVELOP_END_POINT : PRODUCTION_END_POINT;

Expand Down
4 changes: 2 additions & 2 deletions frontend/manage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
"@testing-library/react": "^12.0.0",
"@types/chart.js": "^2.9.34",
"@types/jest": "^26.0.24",
"@types/loadable__component": "^5.13.4",
"@types/react": "^17.0.13",
"@types/react-dom": "^17.0.8",
"@types/react-loadable": "^5.5.6",
"@types/react-router-dom": "^5.1.7",
"@types/styled-components": "^5.1.11",
"babel-loader": "^8.2.2",
Expand All @@ -50,6 +50,7 @@
"webpack-dotenv": "^0.0.2"
},
"dependencies": {
"@loadable/component": "^5.15.0",
"@sentry/react": "^6.11.0",
"@sentry/tracing": "^6.11.0",
"axios": "^0.21.1",
Expand All @@ -58,7 +59,6 @@
"react": "^17.0.2",
"react-chartjs-2": "^2.9.4",
"react-dom": "^17.0.2",
"react-loadable": "^5.5.0",
"react-query": "^3.18.1",
"react-router-dom": "^5.2.0",
"react-syntax-highlighter": "^15.4.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ import { myProject3 } from "../fixture/project";
import { socialLoginUser2 } from "../fixture/user";
import { createMemoryHistory } from "history";
import ScriptPublishing from "../../components/pages/ScriptPublishing";
import Loadable from "react-loadable";

Loadable.preloadAll();

jest.mock("react-router-dom", () => {
return {
Expand Down
12 changes: 3 additions & 9 deletions frontend/manage/src/components/pages/Loadable/index.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
import Loadable from "react-loadable";
import loadable from "@loadable/component";
import LoadingPage from "../LoadingPage";

export const LoadableScriptPublishing = Loadable({
loader: () => import("../ScriptPublishing"),
loading: () => <LoadingPage />
});
export const LoadableScriptPublishing = loadable(() => import("../ScriptPublishing"), { fallback: <LoadingPage /> });

export const LoadableStatistics = Loadable({
loader: () => import("../Statistics"),
loading: () => <LoadingPage />
});
export const LoadableStatistics = loadable(() => import("../Statistics"), { fallback: <LoadingPage /> });
2 changes: 1 addition & 1 deletion frontend/manage/src/constants/api.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const PRODUCTION_BASE_URL = "https://api.darass.o-r.kr";
const PRODUCTION_BASE_URL = "https://api.darass.co.kr";
const DEVELOPMENT_BASE_URL = "https://www.darass-develop.o-r.kr";
const BASE_URL = process.env.BUILD_MODE === "development" ? DEVELOPMENT_BASE_URL : PRODUCTION_BASE_URL;
const QUERY = {
Expand Down
2 changes: 1 addition & 1 deletion frontend/manage/src/constants/domain.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const REPLY_MODULE_BASE_URL_DEVELOPMENT = "https://dorvcm7xtbd6v.cloudfront.net";
const REPLY_MODULE_BASE_URL_PRODUCTION = "https://reply-darass.o-r.kr";
const REPLY_MODULE_BASE_URL_PRODUCTION = "https://reply-module.darass.co.kr";

export const CLIENT_ASSET_BASE_URL = "https://d257w05ca5bz5h.cloudfront.net";

Expand Down
46 changes: 27 additions & 19 deletions frontend/manage/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1100,6 +1100,13 @@
dependencies:
regenerator-runtime "^0.13.4"

"@babel/runtime@^7.7.7":
version "7.15.3"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b"
integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==
dependencies:
regenerator-runtime "^0.13.4"

"@babel/runtime@^7.9.2":
version "7.14.8"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.8.tgz#7119a56f421018852694290b9f9148097391b446"
Expand Down Expand Up @@ -1510,6 +1517,15 @@
"@types/yargs" "^16.0.0"
chalk "^4.0.0"

"@loadable/component@^5.15.0":
version "5.15.0"
resolved "https://registry.yarnpkg.com/@loadable/component/-/component-5.15.0.tgz#48b9524237be553f48b158f8c9152593f3f3fded"
integrity sha512-g63rQzypPOZi0BeGsK4ST2MYhsFR+i7bhL8k/McUoWDNMDuTTdUlQ2GACKxqh5sI/dNC/6nVoPrycMnSylnAgQ==
dependencies:
"@babel/runtime" "^7.7.7"
hoist-non-react-statics "^3.3.1"
react-is "^16.12.0"

"@mdx-js/loader@^1.6.22":
version "1.6.22"
resolved "https://registry.yarnpkg.com/@mdx-js/loader/-/loader-1.6.22.tgz#d9e8fe7f8185ff13c9c8639c048b123e30d322c4"
Expand Down Expand Up @@ -2674,6 +2690,13 @@
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz#edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818"
integrity sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==

"@types/loadable__component@^5.13.4":
version "5.13.4"
resolved "https://registry.yarnpkg.com/@types/loadable__component/-/loadable__component-5.13.4.tgz#a4646b2406b1283efac1a9d9485824a905b33d4a"
integrity sha512-YhoCCxyuvP2XeZNbHbi8Wb9EMaUJuA2VGHxJffcQYrJKIKSkymJrhbzsf9y4zpTmr5pExAAEh5hbF628PAZ8Dg==
dependencies:
"@types/react" "*"

"@types/markdown-to-jsx@^6.11.3":
version "6.11.3"
resolved "https://registry.yarnpkg.com/@types/markdown-to-jsx/-/markdown-to-jsx-6.11.3.tgz#cdd1619308fecbc8be7e6a26f3751260249b020e"
Expand Down Expand Up @@ -2777,14 +2800,6 @@
dependencies:
"@types/react" "*"

"@types/react-loadable@^5.5.6":
version "5.5.6"
resolved "https://registry.yarnpkg.com/@types/react-loadable/-/react-loadable-5.5.6.tgz#fcf6493d5015a4602672f3773a32032ce77fedea"
integrity sha512-2M7xH/wawZxNybbs/a76JkpUsMk4z6AxBh92cUtIBy2vK7EYYuitQbC4laY0hGz0e05R+mQ44YeHMtH2U+gMsw==
dependencies:
"@types/react" "*"
"@types/webpack" "^4"

"@types/react-router-dom@^5.1.7":
version "5.1.7"
resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.1.7.tgz#a126d9ea76079ffbbdb0d9225073eb5797ab7271"
Expand Down Expand Up @@ -2880,7 +2895,7 @@
"@types/source-list-map" "*"
source-map "^0.7.3"

"@types/webpack@^4", "@types/webpack@^4.41.26", "@types/webpack@^4.41.8":
"@types/webpack@^4.41.26", "@types/webpack@^4.41.8":
version "4.41.30"
resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.30.tgz#fd3db6d0d41e145a8eeeafcd3c4a7ccde9068ddc"
integrity sha512-GUHyY+pfuQ6haAfzu4S14F+R5iGRwN6b2FRNJY7U0NilmFAqbsOfK6j1HwuLBAqwRIT+pVdNDJGJ6e8rpp0KHA==
Expand Down Expand Up @@ -6728,7 +6743,7 @@ hmac-drbg@^1.0.1:
minimalistic-assert "^1.0.0"
minimalistic-crypto-utils "^1.0.1"

hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
Expand Down Expand Up @@ -9738,7 +9753,7 @@ prompts@^2.0.1, prompts@^2.4.0:
kleur "^3.0.3"
sisteransi "^1.0.5"

prop-types@^15.0.0, prop-types@^15.5.0, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
prop-types@^15.0.0, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
version "15.7.2"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
Expand Down Expand Up @@ -10023,7 +10038,7 @@ react-inspector@^5.1.0:
is-dom "^1.0.0"
prop-types "^15.0.0"

react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1:
react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
Expand All @@ -10038,13 +10053,6 @@ react-lifecycles-compat@^3.0.4:
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==

react-loadable@^5.5.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/react-loadable/-/react-loadable-5.5.0.tgz#582251679d3da86c32aae2c8e689c59f1196d8c4"
integrity sha512-C8Aui0ZpMd4KokxRdVAm2bQtI03k2RMRNzOB+IipV3yxFTSVICv7WoUr5L9ALB5BmKO1iHgZtWM8EvYG83otdg==
dependencies:
prop-types "^15.5.0"

react-popper-tooltip@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/react-popper-tooltip/-/react-popper-tooltip-3.1.1.tgz#329569eb7b287008f04fcbddb6370452ad3f9eac"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { PALETTE } from "../../../../styles/palette";

export const Button = styled.button`
width: fit-content;
min-height: 3.6rem;
background-color: ${PALETTE.GRAY_200};
border: 1px solid ${PALETTE.GRAY_500};
color: ${PALETTE.RED_800};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import styled from "styled-components";

export const Button = styled.button`
width: fit-content;
min-height: 3.6rem;
background-color: ${PALETTE.SECONDARY};
color: ${PALETTE.WHITE};
font-size: 1.4rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ export const Text = styled.div<{ isSubComment: boolean; contentEditable: boolean

export const ButtonWrapper = styled.div`
display: flex;
margin-bottom: 0.5rem;
margin-left: auto;

& > button {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export const CommentOption = styled(CommentOptionComponent)`
export const PasswordForm = styled.form<{ isSubComment: boolean }>`
display: flex;
align-items: center;
margin-left: ${props => props.isSubComment && "calc(2.5rem + 0.6rem + 2.1rem)"};
margin-left: ${props => (props.isSubComment ? "calc(2.5rem + 0.6rem + 2.1rem)" : "3rem")};

@media all and (max-width: 780px) {
width: 17rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const CommentInput = ({ className, innerRef, user, parentCommentId, onClose }: P
};

return (
<Form onSubmit={onSubmit} className={className}>
<Form onSubmit={onSubmit} className={className} isSubCommentInput={isSubCommentInput}>
<TextBoxWrapper>
<TextBox
ref={(element: HTMLDivElement) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ import styled, { css } from "styled-components";
import { InputCSS } from "../../../styles/css";
import DeleteButton from "../../atoms/Buttons/DeleteButton";

export const Form = styled.form`
export const Form = styled.form<{ isSubCommentInput: boolean }>`
display: flex;
flex-direction: column;
margin-bottom: 1rem;
margin-bottom: ${props => (props.isSubCommentInput ? "2rem" : "1rem")};
`;

export const TextBoxWrapper = styled.div`
display: flex;
flex-direction: column;
align-items: center;
margin-bottom: 1.6rem;
margin-bottom: 1rem;
`;

export const TextBox = styled.div<{ isValidInput: boolean }>`
Expand Down Expand Up @@ -78,8 +78,6 @@ export const GuestInfo = styled.input<{ isValidInput: boolean; isSubCommentInput
${props =>
props.isSubCommentInput &&
css`
font-size: 1rem;
line-height: 1.5rem;
padding: 0.3rem 1rem;
height: 4rem;

Expand All @@ -99,6 +97,7 @@ export const ButtonWrapper = styled.div<{ isSubCommentInput: boolean }>`
margin-left: auto;

& > button {
height: 3.6rem;
${props =>
props.isSubCommentInput &&
css`
Expand Down
4 changes: 2 additions & 2 deletions frontend/reply-module/src/constants/api.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { GetCommentsRequestParams, GuestUserConfirmInfo } from "../types/comment";

const MANAGE_PAGE_BASE_URL_DEVELOPMENT = "https://d3oy1fczrkrons.cloudfront.net";
const MANAGE_PAGE_BASE_URL_PRODUCTION = "https://darass.o-r.kr";
const MANAGE_PAGE_BASE_URL_PRODUCTION = "https://darass.co.kr";
export const MANAGE_PAGE_BASE_URL =
process.env.BUILD_MODE === "development" ? MANAGE_PAGE_BASE_URL_DEVELOPMENT : MANAGE_PAGE_BASE_URL_PRODUCTION;

const DEVELOPMENT_BASE_URL = "https://www.darass-develop.o-r.kr";
const PRODUCTION_BASE_URL = "https://api.darass.o-r.kr";
const PRODUCTION_BASE_URL = "https://api.darass.co.kr";
export const BASE_URL = process.env.BUILD_MODE === "development" ? DEVELOPMENT_BASE_URL : PRODUCTION_BASE_URL;

export const QUERY = {
Expand Down