Skip to content

Commit 281fb57

Browse files
authored
release1.2.1
๋ฒ„๊ทธ ์ˆ˜์ •
2 parents 9767b12 + ec84f6e commit 281fb57

File tree

13 files changed

+60
-37
lines changed

13 files changed

+60
-37
lines changed

โ€Žindex.htmlโ€Ž

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,20 @@
77
<link rel="apple-touch-icon" href="/tutice.png" />
88
<link rel="shortcut icon" href="/tutice.png" />
99
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
10-
<meta name=" apple-mobile-web-app-capable" content="yes" />
10+
<meta name="apple-mobile-web-app-capable" content="yes" />
1111
<meta name="mobile-web-app-capable" content="yes" />
12+
<meta name="theme-color" content="#ffffff" />
13+
<meta name="description" content="๊ณผ์™ธ ๊ด€๋ฆฌ์˜ ์ƒˆ๋กœ์šด ํ‘œ์ค€ Tutice๋ฅผ ๊ฒฝํ—˜ํ•ด๋ณด์„ธ์š”" />
1214
<meta property="og:title" content="Tutice: ์‰ฌ์šด ์ˆ˜์—… ๊ด€๋ฆฌ๋กœ ์—ด๋ฆฌ๋Š” ์ •ํ™•ํ•œ ๋‚˜์˜ ๊ฒฐ์‹ค" />
1315
<meta property="og:description" content="๊ณผ์™ธ ๊ด€๋ฆฌ์˜ ์ƒˆ๋กœ์šด ํ‘œ์ค€ Tutice๋ฅผ ๊ฒฝํ—˜ํ•ด๋ณด์„ธ์š”" />
1416
<meta property="og:image" content="/og_img.png" />
17+
<meta property="og:url" content="https://www.tutice.com" />
18+
<meta name="twitter:card" content="summary_large_image" />
19+
<meta name="twitter:title" content="Tutice: ์‰ฌ์šด ์ˆ˜์—… ๊ด€๋ฆฌ๋กœ ์—ด๋ฆฌ๋Š” ์ •ํ™•ํ•œ ๋‚˜์˜ ๊ฒฐ์‹ค" />
20+
<meta name="twitter:description" content="๊ณผ์™ธ ๊ด€๋ฆฌ์˜ ์ƒˆ๋กœ์šด ํ‘œ์ค€ Tutice๋ฅผ ๊ฒฝํ—˜ํ•ด๋ณด์„ธ์š”" />
21+
<meta name="twitter:image" content="/og_img.png" />
1522

16-
<link rel="/manifest" href="js13kpwa.webmanifest" />
23+
<!-- <link rel="/manifest" href="js13kpwa.webmanifest" /> -->
1724
<link rel="manifest" href="manifest.json" />
1825
<link rel="stylesheet" as="style" crossorigin
1926
href="https://cdn.jsdelivr.net/gh/orioncactus/[email protected]/dist/web/static/pretendard.css" />
@@ -88,6 +95,20 @@
8895
}
8996
}
9097
});
98+
99+
// ์„œ๋น„์Šค ์›Œ์ปค ๋“ฑ๋ก
100+
if ('serviceWorker' in navigator) {
101+
window.addEventListener('load', function () {
102+
navigator.serviceWorker
103+
.register("firebase-messaging-sw.js")
104+
.then(function (registration) {
105+
console.log("Service Worker ๋“ฑ๋ก ์„ฑ๊ณต:", registration);
106+
})
107+
.catch(function (error) {
108+
console.log("Service Worker ๋“ฑ๋ก ์‹คํŒจ:", error);
109+
});
110+
});
111+
}
91112
</script>
92113

93114
<title>Tutice</title>

โ€Žmanifest.jsonโ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
{
1414
"src": "/tutice.png",
1515
"type": "image/x-icon",
16-
"sizes": "512x512",
17-
"purpose": "any maskable"
16+
"sizes": "512x512"
1817
},
1918
{
2019
"src": "/tutice.png",
2120
"type": "image/png",
22-
"sizes": "512x512"
21+
"sizes": "512x512",
22+
"purpose": "maskable"
2323
},
2424
{
2525
"src": "/tutice.png",

โ€Žsrc/components/LessonConnect/LessonConnectNumber.tsxโ€Ž

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,17 @@
11
import { useState } from "react";
22
import { useMutation } from "react-query";
33
import { useNavigate } from "react-router-dom";
4-
import { useRecoilState, useRecoilValue, useSetRecoilState } from "recoil";
4+
import { useRecoilState, useRecoilValue } from "recoil";
55
import { styled } from "styled-components";
6-
import { createLesson } from "../../api/createLesson";
7-
import { studentNameState, subjectNameState } from "../../atom/common/datePicker";
6+
import { updateLessonParents } from "../../api/manageLesson/updateLessonParents";
87
import { parentsPhoneState } from "../../atom/registerLesson/registerLesson";
9-
import { cycleNumberState, dateState, dayState } from "../../atom/timePicker/timePicker";
10-
import {
11-
accountNumber,
12-
bankName,
13-
lessonCodeAndPaymentId,
14-
moneyAmount,
15-
paymentOrder,
16-
} from "../../atom/tuitionPayment/tuitionPayment";
8+
import { lessonCodeAndPaymentId } from "../../atom/tuitionPayment/tuitionPayment";
179
import { BUTTON_TEXT } from "../../core/signup/signUpTextLabels";
1810
import useFormattedPhoneNumber from "../../hooks/signupLogin/usePhoneNumberFormat";
1911
import useModal from "../../hooks/useModal";
2012
import { BasicDoubleModal, BottomButton, CommonBackButton, ProgressBar } from "../common";
2113
import InputLayout from "../signup/InputLayout";
2214
import SignupTitleLayout from "../signup/SignupTitleLayout";
23-
import { updateLessonParents } from "../../api/manageLesson/updateLessonParents";
2415

2516
interface scheduleListProps {
2617
dayOfWeek: string;

โ€Žsrc/components/RegisterLessonPage/Header.tsxโ€Ž

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import { studentNameState, subjectNameState } from "../../atom/common/datePicker";
22

3-
import ProgressBar from "../common/ProgressBar";
4-
import React from "react";
5-
import { RegisterLessonHeaderIc } from "../../assets";
6-
import styled from "styled-components";
73
import { useNavigate } from "react-router-dom";
84
import { useRecoilState } from "recoil";
5+
import styled from "styled-components";
96
import CustomBackButton from "../common/CustomBackButton";
7+
import ProgressBar from "../common/ProgressBar";
108

119
export default function Header() {
1210
const navigate = useNavigate();
@@ -23,7 +21,7 @@ export default function Header() {
2321
return (
2422
<HeaderWrapper>
2523
<CustomBackButton onClick={handleMoveToBack} />
26-
<ProgressBar progress={16.6} />
24+
<ProgressBar progress={0} />
2725
<InputHeader>
2826
ํ•™์ƒ์˜ ์ด๋ฆ„๊ณผ <br /> ๊ณผ๋ชฉ์„ ์ž…๋ ฅํ•ด์ฃผ์„ธ์š”. <Emphasis> * </Emphasis>
2927
</InputHeader>

โ€Žsrc/components/RegularLesson/Header.tsxโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default function Header() {
2424
return (
2525
<HeaderWrapper>
2626
<CustomBackButton onClick={handleMoveToBack} />
27-
<ProgressBar progress={66.4} />
27+
<ProgressBar progress={75} />
2828
<InputHeader>์ •๊ธฐ์ ์ธ ์ˆ˜์—… ์ผ์ •์„ ์•Œ๋ ค์ฃผ์„ธ์š”!</InputHeader>
2929
<InputNotice>์ฒซ ์ˆ˜์—…์ผ์„ ๊ธฐ์ค€์œผ๋กœ ์ˆ˜์—… ์ผ์ •์„ ์บ˜๋ฆฐ๋”์— ํ‘œ์‹œํ•ด ๋“œ๋ฆด๊ฒŒ์š”</InputNotice>
3030
</HeaderWrapper>

โ€Žsrc/components/common/ProgressBar.tsxโ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default function ProgressBar({ progress }: ProgressBarProps) {
88

99
return (
1010
<ProgressBarWrapper>
11-
<Progress width = {progress}/>
11+
<Progress width = {`${progress}%`}/>
1212
</ProgressBarWrapper>
1313
)
1414
}
@@ -18,7 +18,7 @@ const ProgressBarWrapper = styled.div`
1818
background-color: ${({ theme }) => theme.colors.grey20};
1919
`
2020

21-
const Progress = styled.div<{width: number}>`
21+
const Progress = styled.div<{width: string}>`
2222
width: ${(props) => props.width};
2323
height: 100%;
2424

โ€Žsrc/components/lessonRecord/LessonInfoList.tsxโ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ export default function LessonInfoList(props: LessonInfoListProp) {
5252
)}
5353

5454
<LessonInfoMainCategory>์€ํ–‰</LessonInfoMainCategory>
55-
{[accountInfo?.name, accountInfo?.bank, accountInfo?.number]?.map((info: string, idx: number) => {
55+
{[accountInfo?.bank, accountInfo?.number]?.map((info: string, idx: number) => {
5656
return (
57-
<LessonInfoItemLayout isBankAccount={idx === 2} key={idx} detailCategory={BANK_INFO[idx]} content={info} />
57+
<LessonInfoItemLayout isBankAccount={idx === 1} key={idx} detailCategory={BANK_INFO[idx]} content={info} />
5858
);
5959
})}
6060
<LessonInfoMainCategory>์ˆ˜์—…์ง„ํ–‰</LessonInfoMainCategory>

โ€Žsrc/components/lessonShare/ShareMain.tsxโ€Ž

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export default function ShareMain({ handleMoveToPage }: handleMoveToPageProps) {
3434
icon: ShareViaMessage,
3535
text: "๋ฉ”์‹œ์ง€",
3636
onClick: () => {
37-
alert("์ค€๋น„ ์ค‘์ธ ๊ธฐ๋Šฅ์ž…๋‹ˆ๋‹ค.");
37+
handleShareViaMessage();
3838
},
3939
},
4040
{
@@ -67,6 +67,12 @@ export default function ShareMain({ handleMoveToPage }: handleMoveToPageProps) {
6767
}
6868
}
6969

70+
function handleShareViaMessage() {
71+
const message = `์•ˆ๋…•ํ•˜์„ธ์š”, ๊ณผ์™ธ ์ˆ˜์—… ๊ด€๋ฆฌ ํ•„์ˆ˜ ์•ฑ Tutice ์ž…๋‹ˆ๋‹ค. \n\n[${userName}]์„ ์ƒ๋‹˜์ด [${studentName}]ํ•™์ƒ์˜\nTutice ์ดˆ๋Œ€์žฅ์„ ๋ณด๋ƒˆ์Šต๋‹ˆ๋‹ค.\n\nTutice ๋งํฌ \n ${URL}`;
72+
const smsLink = `sms:?body=${encodeURIComponent(message)}`;
73+
window.location.href = smsLink;
74+
}
75+
7076
function handleCopyLink() {
7177
try {
7278
navigator.clipboard.writeText(URL).then(() => {

โ€Žsrc/components/regularLessonCycle/Header.tsxโ€Ž

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { useNavigate } from "react-router-dom";
22
import { useRecoilState } from "recoil";
33
import styled from "styled-components";
4-
import { RegisterLessonHeaderIc } from "../../assets";
54
import { cycleNumberState } from "../../atom/timePicker/timePicker";
6-
import ProgressBar from "../common/ProgressBar";
75
import CustomBackButton from "../common/CustomBackButton";
6+
import ProgressBar from "../common/ProgressBar";
87

98
export default function Header() {
109
const navigate = useNavigate();
@@ -18,7 +17,7 @@ export default function Header() {
1817
return (
1918
<HeaderWrapper>
2019
<CustomBackButton onClick={handleMoveToBack} />
21-
<ProgressBar progress={33.2} />
20+
<ProgressBar progress={25} />
2221
<InputHeader>
2322
์ด ๋ช‡ ํšŒ์ฐจ๋กœ ์ด๋ฃจ์–ด์ง„ <br /> ์ˆ˜์—…์ธ๊ฐ€์š”?
2423
</InputHeader>

โ€Žsrc/components/regularLessonDate/Header.tsxโ€Ž

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ import { dateState, firstLessonDay } from "../../atom/timePicker/timePicker";
33
import { useNavigate } from "react-router-dom";
44
import { useRecoilState } from "recoil";
55
import styled from "styled-components";
6-
import { RegisterLessonHeaderIc } from "../../assets";
7-
import ProgressBar from "../common/ProgressBar";
86
import CustomBackButton from "../common/CustomBackButton";
7+
import ProgressBar from "../common/ProgressBar";
98

109
export default function Header() {
1110
const navigate = useNavigate();
@@ -22,7 +21,7 @@ export default function Header() {
2221
return (
2322
<HeaderWrapper>
2423
<CustomBackButton onClick={handleMoveToBack} />
25-
<ProgressBar progress={49.8} />
24+
<ProgressBar progress={50} />
2625
<InputHeader> ๋ช‡์›” ๋ช‡์ผ์˜ ์ˆ˜์—…๋ถ€ํ„ฐ ๊ด€๋ฆฌํ• ๊นŒ์š”? </InputHeader>
2726
<InputNotice>
2827
์ฒซ ์ˆ˜์—…์ผ์„ ๊ธฐ์ค€์œผ๋กœ ์ˆ˜์—… ์ผ์ •์„ <br /> ์บ˜๋ฆฐ๋”์— ํ‘œ์‹œํ•ด ๋“œ๋ฆด๊ฒŒ์š”{" "}

0 commit comments

Comments
ย (0)