Skip to content

Commit

Permalink
Merge pull request #423 from depromeet/chore/420/announce1109
Browse files Browse the repository at this point in the history
공지사항 이메일 -> 채널톡으로 변경
  • Loading branch information
leeminhee119 authored Nov 9, 2024
2 parents 5a6f728 + aa286fe commit f909eb8
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 37 deletions.
2 changes: 1 addition & 1 deletion apps/web/src/component/BottomSheet/BottomSheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export function BottomSheet({ id, title, contents, handler = false, quitButton =
border-top-right-radius: 1.6rem;
box-shadow: 0 4rem 4rem rgba(0, 0, 0, 0.25);
transition: transform 200ms ease-out;
z-index: 10001;
z-index: 100000000;
padding: 2rem;
box-sizing: border-box;
background-color: #fff;
Expand Down
62 changes: 26 additions & 36 deletions apps/web/src/layout/GlobalLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import { css } from "@emotion/react";
import Hotjar from "@hotjar/browser";
import { PATHS } from "@layer/shared";
// import { PATHS } from "@layer/shared";
import { useEffect } from "react";
import { Outlet, useLocation } from "react-router-dom";
import { Outlet } from "react-router-dom";
// import { useLocation } from "react-router-dom";

import { Announcement } from "@/component/announcement/Announcement";
import { Modal } from "@/component/common/Modal";
import { Typography } from "@/component/common/typography";
import { PreventExternalBrowser } from "@/helper/preventExternalBrowser.tsx";
import { useBottomSheet } from "@/hooks/useBottomSheet";
import { useToast } from "@/hooks/useToast";
import ChannelService from "@/lib/channel-talk/service";
// import ChannelService from "@/lib/channel-talk/service";
import { useBridge } from "@/lib/provider/bridge-provider";

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

export default function GlobalLayout() {
const { safeAreaHeight } = useBridge();
const location = useLocation();
const { openBottomSheet, closeBottomSheet } = useBottomSheet();
const { toast } = useToast();

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

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

return (
<div
Expand Down Expand Up @@ -62,7 +61,6 @@ export default function GlobalLayout() {
content={
<>
<Typography
as="p"
variant={"body16Medium"}
color={"gray600"}
css={css`
Expand All @@ -77,43 +75,35 @@ export default function GlobalLayout() {
1. 점검 시간
2024년 11월 10일(일) 13:00 ~ 22:00
`}
</Typography>
<Typography variant={"subtitle16SemiBold"}>2024년 11월 10일(일) 13:00 ~ 22:00</Typography>
<Typography
variant={"body16Medium"}
color={"gray600"}
css={css`
white-space: pre-wrap;
`}
>
{`
※ 모든 시간은 한국시간 기준입니다.
※ 작업 진행상황에 따라 일정은 변경될 수 있습니다.
2. 대상 서비스
레이어 서비스
해당 기간동안 궁금하신 점은`}
</Typography>
<Typography
variant={"body16Medium"}
color={"blue500"}
css={css`
text-decoration: underline;
cursor: pointer;
`}
onClick={async () => {
try {
await navigator.clipboard.writeText("[email protected]");
toast.success("이메일이 클립보드에 복사되었습니다");
} catch (e) {
toast.success("다시 시도해주세요");
}
}}
>
[email protected]
해당 기간동안 궁금하신 점은 `}
</Typography>
<Typography variant={"subtitle16SemiBold"}>페이지 하단의 문의하기</Typography>
<Typography
as="p"
variant={"body16Medium"}
color={"gray600"}
css={css`
white-space: pre-wrap;
`}
>
{`로 문의를 주시면 빠르게 확인 후 순차적으로 답변 드리겠습니다.
{`를 통해 채팅 남겨주시면 빠르게 확인 후 순차적으로 답변 드리겠습니다.
이용에 불편을 드려 죄송합니다.
보다 안정적인 서비스를 제공하기 위해 노력하는 레이어가 되겠습니다.
Expand Down

0 comments on commit f909eb8

Please sign in to comment.