Skip to content

Commit f909eb8

Browse files
authored
Merge pull request #423 from depromeet/chore/420/announce1109
공지사항 이메일 -> 채널톡으로 변경
2 parents 5a6f728 + aa286fe commit f909eb8

File tree

2 files changed

+27
-37
lines changed

2 files changed

+27
-37
lines changed

apps/web/src/component/BottomSheet/BottomSheet.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export function BottomSheet({ id, title, contents, handler = false, quitButton =
6464
border-top-right-radius: 1.6rem;
6565
box-shadow: 0 4rem 4rem rgba(0, 0, 0, 0.25);
6666
transition: transform 200ms ease-out;
67-
z-index: 10001;
67+
z-index: 100000000;
6868
padding: 2rem;
6969
box-sizing: border-box;
7070
background-color: #fff;

apps/web/src/layout/GlobalLayout.tsx

+26-36
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { css } from "@emotion/react";
22
import Hotjar from "@hotjar/browser";
3-
import { PATHS } from "@layer/shared";
3+
// import { PATHS } from "@layer/shared";
44
import { useEffect } from "react";
5-
import { Outlet, useLocation } from "react-router-dom";
5+
import { Outlet } from "react-router-dom";
6+
// import { useLocation } from "react-router-dom";
67

78
import { Announcement } from "@/component/announcement/Announcement";
89
import { Modal } from "@/component/common/Modal";
910
import { Typography } from "@/component/common/typography";
1011
import { PreventExternalBrowser } from "@/helper/preventExternalBrowser.tsx";
1112
import { useBottomSheet } from "@/hooks/useBottomSheet";
12-
import { useToast } from "@/hooks/useToast";
13-
import ChannelService from "@/lib/channel-talk/service";
13+
// import ChannelService from "@/lib/channel-talk/service";
1414
import { useBridge } from "@/lib/provider/bridge-provider";
1515

1616
const siteId = import.meta.env.VITE_HOTJAR_KEY as number;
@@ -19,22 +19,21 @@ const SHEET_ID = "announcement";
1919

2020
export default function GlobalLayout() {
2121
const { safeAreaHeight } = useBridge();
22-
const location = useLocation();
2322
const { openBottomSheet, closeBottomSheet } = useBottomSheet();
24-
const { toast } = useToast();
2523

2624
useEffect(() => {
2725
Hotjar.init(siteId, hotjarVersion);
2826
openBottomSheet({ id: SHEET_ID });
2927
}, []);
3028

31-
useEffect(() => {
32-
if (location.pathname.startsWith(PATHS.myInfo())) {
33-
ChannelService.showChannelButton();
34-
} else {
35-
ChannelService.hideChannelButton();
36-
}
37-
}, [location]);
29+
/* NOTE - 인프라 이전 기간동안 채널톡 모든 페이지 노출 */
30+
// useEffect(() => {
31+
// if (location.pathname.startsWith(PATHS.myInfo())) {
32+
// ChannelService.showChannelButton();
33+
// } else {
34+
// ChannelService.hideChannelButton();
35+
// }
36+
// }, [location]);
3837

3938
return (
4039
<div
@@ -62,7 +61,6 @@ export default function GlobalLayout() {
6261
content={
6362
<>
6463
<Typography
65-
as="p"
6664
variant={"body16Medium"}
6765
color={"gray600"}
6866
css={css`
@@ -77,43 +75,35 @@ export default function GlobalLayout() {
7775
7876
1. 점검 시간
7977
80-
2024년 11월 10일(일) 13:00 ~ 22:00
78+
`}
79+
</Typography>
80+
<Typography variant={"subtitle16SemiBold"}>2024년 11월 10일(일) 13:00 ~ 22:00</Typography>
81+
<Typography
82+
variant={"body16Medium"}
83+
color={"gray600"}
84+
css={css`
85+
white-space: pre-wrap;
86+
`}
87+
>
88+
{`
8189
※ 모든 시간은 한국시간 기준입니다.
8290
※ 작업 진행상황에 따라 일정은 변경될 수 있습니다.
8391
8492
2. 대상 서비스
8593
8694
레이어 서비스
8795
88-
해당 기간동안 궁금하신 점은`}
89-
</Typography>
90-
<Typography
91-
variant={"body16Medium"}
92-
color={"blue500"}
93-
css={css`
94-
text-decoration: underline;
95-
cursor: pointer;
96-
`}
97-
onClick={async () => {
98-
try {
99-
await navigator.clipboard.writeText("gentlemonster77@likelion.org");
100-
toast.success("이메일이 클립보드에 복사되었습니다");
101-
} catch (e) {
102-
toast.success("다시 시도해주세요");
103-
}
104-
}}
105-
>
106-
gentlemonster77@likelion.org
96+
해당 기간동안 궁금하신 점은 `}
10797
</Typography>
98+
<Typography variant={"subtitle16SemiBold"}>페이지 하단의 문의하기</Typography>
10899
<Typography
109-
as="p"
110100
variant={"body16Medium"}
111101
color={"gray600"}
112102
css={css`
113103
white-space: pre-wrap;
114104
`}
115105
>
116-
{`로 문의를 주시면 빠르게 확인 후 순차적으로 답변 드리겠습니다.
106+
{`를 통해 채팅 남겨주시면 빠르게 확인 후 순차적으로 답변 드리겠습니다.
117107
118108
이용에 불편을 드려 죄송합니다.
119109
보다 안정적인 서비스를 제공하기 위해 노력하는 레이어가 되겠습니다.

0 commit comments

Comments
 (0)