계약종료일
@@ -461,7 +461,7 @@ const Bottom = styled.div`
}
}
- .계약종료주차 {
+ .계약종료일 {
width: 66.6%;
height: 70px;
display: flex;
From afc7da59f50f10a527d2c8b5903b18f30cfd478a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=8B=A0=EC=84=B1=EC=9A=B0?= <24siefil@gmail.com>
Date: Fri, 5 Aug 2022 14:30:22 +0900
Subject: [PATCH 03/13] =?UTF-8?q?fix:=20=EC=98=81=EC=88=98=EC=A6=9D=20UI?=
=?UTF-8?q?=20=ED=83=9C=EA=B7=B8=EA=B0=84=20=EA=B0=88=EB=A6=AC=EC=A7=90=20?=
=?UTF-8?q?=ED=95=B4=EC=86=8C=EB=A5=BC=20=EC=9C=84=ED=95=B4=20overlapping?=
=?UTF-8?q?=20pixel=EA=B0=92=20=EC=A1=B0=EC=A0=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.tsx | 16 +++++-----
src/components/common/Receipt.tsx | 2 +-
src/components/common/modals/QuinaryModal.tsx | 4 +--
src/components/common/modals/SenaryModal.tsx | 4 +--
.../quaternaryModal/PerforatedLineBottom.tsx | 2 +-
.../quaternaryModal/PerforatedLineTop.tsx | 2 +-
.../quaternaryModal/QuaternaryModal.tsx | 4 +--
src/pages/SungwooTestPage.tsx | 32 ++-----------------
8 files changed, 19 insertions(+), 47 deletions(-)
diff --git a/src/App.tsx b/src/App.tsx
index 49171732..0afa1d68 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -20,14 +20,14 @@ function App() {
} />
} />
{/* }> */}
- }>
- } />
- } />
- } />
- } />
- } />
- } />
-
+ {/* }> */}
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ {/* */}
{/* */}
diff --git a/src/components/common/Receipt.tsx b/src/components/common/Receipt.tsx
index 9a16db2a..8c9f5ce1 100644
--- a/src/components/common/Receipt.tsx
+++ b/src/components/common/Receipt.tsx
@@ -151,7 +151,7 @@ const Wrapper = styled.div`
`;
const Content = styled.div`
- margin: -1px 0; // overlaps 1px
+ margin: -2px 0; // overlaps 2px
background: ${({ theme }) => theme.palette.greyScale.grey100};
width: 100%;
height: 360px;
diff --git a/src/components/common/modals/QuinaryModal.tsx b/src/components/common/modals/QuinaryModal.tsx
index 490ae999..82228d38 100644
--- a/src/components/common/modals/QuinaryModal.tsx
+++ b/src/components/common/modals/QuinaryModal.tsx
@@ -252,7 +252,7 @@ const Content = styled.div`
`;
const Top = styled.div`
- margin: -1px 0; // overlaps 1px
+ margin: -2px 0; // overlaps 2px
background: ${({ theme }) => theme.palette.greyScale.white};
height: 116px; // 10px decreased
width: 100%;
@@ -273,7 +273,7 @@ const Top = styled.div`
`;
const Bottom = styled.div`
- margin-bottom: -1px; // overlaps 1px
+ margin-bottom: -2px; // overlaps 2px
background: ${({ theme }) => theme.palette.greyScale.white};
width: 100%;
height: 360px; // 10px decreased
diff --git a/src/components/common/modals/SenaryModal.tsx b/src/components/common/modals/SenaryModal.tsx
index 63dfc733..ba4f76c5 100644
--- a/src/components/common/modals/SenaryModal.tsx
+++ b/src/components/common/modals/SenaryModal.tsx
@@ -282,7 +282,7 @@ const Content = styled.div`
`;
const Top = styled.div`
- margin: -1px 0; // overlaps 1px
+ margin: -2px 0; // overlaps 2px
background: ${({ theme }) => theme.palette.greyScale.white};
height: 116px; // 10px decreased
width: 100%;
@@ -303,7 +303,7 @@ const Top = styled.div`
`;
const Bottom = styled.div`
- margin-bottom: -1px; // overlaps 1px
+ margin-bottom: -2px; // overlaps 2px
background: ${({ theme }) => theme.palette.greyScale.white};
width: 100%;
height: 350px; // 10px decreased
diff --git a/src/components/common/modals/quaternaryModal/PerforatedLineBottom.tsx b/src/components/common/modals/quaternaryModal/PerforatedLineBottom.tsx
index a9ad0ee5..ed2d52e6 100644
--- a/src/components/common/modals/quaternaryModal/PerforatedLineBottom.tsx
+++ b/src/components/common/modals/quaternaryModal/PerforatedLineBottom.tsx
@@ -37,7 +37,7 @@ const Wrapper = styled.div`
outline: none;
.shape {
- margin: 0 -1px;
+ margin: 0 -1.5px;
flex: 1;
border: none;
outline: none;
diff --git a/src/components/common/modals/quaternaryModal/PerforatedLineTop.tsx b/src/components/common/modals/quaternaryModal/PerforatedLineTop.tsx
index 65e69cec..c597ebbf 100644
--- a/src/components/common/modals/quaternaryModal/PerforatedLineTop.tsx
+++ b/src/components/common/modals/quaternaryModal/PerforatedLineTop.tsx
@@ -37,7 +37,7 @@ const Wrapper = styled.div`
outline: none;
.shape {
- margin: 0 -1px;
+ margin: 0 -1.5px;
flex: 1;
border: none;
outline: none;
diff --git a/src/components/common/modals/quaternaryModal/QuaternaryModal.tsx b/src/components/common/modals/quaternaryModal/QuaternaryModal.tsx
index 618d78ad..95f8bb5c 100644
--- a/src/components/common/modals/quaternaryModal/QuaternaryModal.tsx
+++ b/src/components/common/modals/quaternaryModal/QuaternaryModal.tsx
@@ -289,7 +289,7 @@ const Content = styled.div`
`;
const Top = styled.div`
- margin: -1px 0; // overlaps 1px
+ margin: -2px 0; // overlaps 2px
background: ${({ theme }) => theme.palette.greyScale.white};
height: 100px;
width: 100%;
@@ -314,7 +314,7 @@ const Top = styled.div`
`;
const Bottom = styled.div`
- margin-bottom: -1px; // overlaps 1px
+ margin-bottom: -2px; // overlaps 2px
background: ${({ theme }) => theme.palette.greyScale.white};
width: 100%;
height: 360px;
diff --git a/src/pages/SungwooTestPage.tsx b/src/pages/SungwooTestPage.tsx
index 54d9e512..565112a9 100644
--- a/src/pages/SungwooTestPage.tsx
+++ b/src/pages/SungwooTestPage.tsx
@@ -1,18 +1,7 @@
import styled from 'styled-components';
import useModals from '@lib/hooks/useModals';
-import MarginTemplate from '@components/layout/MarginTemplate';
-import { useAppSelector } from '@store/app/hooks';
-import useRefreshToken from '@lib/hooks/auth/useRefreshToken';
-import useAxiosPrivate from '@lib/hooks/auth/useAxiosPrivate';
-import { selectAuth } from '@store/slices/authSlice';
import Modals, { modals } from '@components/common/modals/Modals';
-import Summary from '@components/home/Summary';
import BackgroundTemplate from '@components/layout/BackgroundTemplate';
-import ProposedDongilList from '@components/home/proposed/ProposedDongilList';
-import { dummyDongils } from '@lib/mocks/dongils';
-import SkeletonDongilList, {
- TSkeletonDongilListUsage,
-} from '@components/home/SkeletonDongilList';
function SungwooTestPage() {
const { openModal } = useModals();
@@ -23,24 +12,14 @@ function SungwooTestPage() {
onSubmit: () => {
console.log('비즈니스 로직 처리...');
},
- onExtraSubmit: () => {
- console.log('handle accept button click');
- },
- isKid: false,
});
}
return (
- {/*
- */}
-
- {/*
-
- */}
-
-
+
+
);
@@ -50,13 +29,6 @@ export default SungwooTestPage;
const Temp = styled.div`
height: 1000px;
- /* display: flex;
- flex-direction: column;
- justify-content: flex-start;
- align-items: flex-start;
- button + button {
- margin-top: 10px;
- } */
background: grey;
`;
From f5b5a0544829b122123e02b06459850f79114f75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=8B=A0=EC=84=B1=EC=9A=B0?= <24siefil@gmail.com>
Date: Fri, 5 Aug 2022 14:34:55 +0900
Subject: [PATCH 04/13] chore
---
src/components/home/SkeletonDongilList.tsx | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/components/home/SkeletonDongilList.tsx b/src/components/home/SkeletonDongilList.tsx
index c6b4962c..252d2c47 100644
--- a/src/components/home/SkeletonDongilList.tsx
+++ b/src/components/home/SkeletonDongilList.tsx
@@ -1,12 +1,8 @@
import styled, { css } from 'styled-components';
-export type TSkeletonDongilListUsage =
- | 'walking'
- | 'pending'
- | 'proposed'
- | 'thisWeekS';
+type TUsage = 'walking' | 'pending' | 'proposed' | 'thisWeekS';
-function SkeletonDongilList({ usage }: { usage: TSkeletonDongilListUsage }) {
+function SkeletonDongilList({ usage }: { usage: TUsage }) {
return (
@@ -18,7 +14,7 @@ function SkeletonDongilList({ usage }: { usage: TSkeletonDongilListUsage }) {
export default SkeletonDongilList;
-const Wrapper = styled.div<{ usage: TSkeletonDongilListUsage }>`
+const Wrapper = styled.div<{ usage: TUsage }>`
width: 100%;
display: flex;
flex-direction: column;
@@ -26,7 +22,7 @@ const Wrapper = styled.div<{ usage: TSkeletonDongilListUsage }>`
align-items: center;
`;
-const Item = styled.div<{ usage: TSkeletonDongilListUsage }>`
+const Item = styled.div<{ usage: TUsage }>`
width: 100%;
background: ${({ theme }) => theme.palette.greyScale.white};
border-radius: ${({ theme }) => theme.radius.medium};
From dbe212e863e7b7d84326d2f0c4eb99fb66dac962 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=8B=A0=EC=84=B1=EC=9A=B0?= <24siefil@gmail.com>
Date: Fri, 5 Aug 2022 15:29:58 +0900
Subject: [PATCH 05/13] =?UTF-8?q?fix:=20=EC=8B=A4=ED=8C=A8=ED=95=9C=20?=
=?UTF-8?q?=EB=8F=88=EA=B8=B8=20/Detail=20=ED=95=98=EB=8B=A8=20=EB=8F=88?=
=?UTF-8?q?=EA=B8=B8=20=ED=8F=AC=EA=B8=B0=ED=95=98=EA=B8=B0=20=EB=B2=84?=
=?UTF-8?q?=ED=8A=BC=20=EC=A0=9C=EC=99=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.tsx | 16 ++++----
src/pages/Home/Detail.tsx | 5 ++-
src/pages/SungwooTestPage.tsx | 67 ----------------------------------
src/store/slices/authSlice.tsx | 1 +
4 files changed, 12 insertions(+), 77 deletions(-)
delete mode 100644 src/pages/SungwooTestPage.tsx
diff --git a/src/App.tsx b/src/App.tsx
index 0afa1d68..56224fe4 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -9,7 +9,6 @@ import FinancialRouter from './pages/Financial';
import NotFound from './pages/NotFound';
import RequireAuth from '@components/auth/RequireAuth';
import PersistLogin from '@components/auth/PersistLogin';
-import SungwooTestPage from './pages/SungwooTestPage';
import WalkRouter from './pages/Walk';
function App() {
@@ -20,14 +19,13 @@ function App() {
} />
} />
{/* }> */}
- {/* }> */}
- } />
- } />
- } />
- } />
- } />
- } />
- {/* */}
+ }>
+ } />
+ } />
+ } />
+ } />
+ } />
+
{/* */}
diff --git a/src/pages/Home/Detail.tsx b/src/pages/Home/Detail.tsx
index caa05d4e..33fb6644 100644
--- a/src/pages/Home/Detail.tsx
+++ b/src/pages/Home/Detail.tsx
@@ -67,6 +67,7 @@ function Detail() {
return found?.challengeList;
}
+ console.log('targetDongil: ', targetDongil!);
const {
isMom,
title,
@@ -77,6 +78,8 @@ function Detail() {
weeks,
progressList,
successWeeks,
+ isAchieved,
+ status,
} = targetDongil!;
const percent = Math.ceil((successWeeks / weeks / 10) * 100) * 10;
@@ -183,7 +186,7 @@ function Detail() {
)}
- {isKid === true && (
+ {isKid === true && !(isAchieved === 0 && status === 0) && (
돈길 포기하기
diff --git a/src/pages/SungwooTestPage.tsx b/src/pages/SungwooTestPage.tsx
deleted file mode 100644
index 565112a9..00000000
--- a/src/pages/SungwooTestPage.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import styled from 'styled-components';
-import useModals from '@lib/hooks/useModals';
-import Modals, { modals } from '@components/common/modals/Modals';
-import BackgroundTemplate from '@components/layout/BackgroundTemplate';
-
-function SungwooTestPage() {
- const { openModal } = useModals();
- function handleClick() {
- // modals.myModal: 열고자 하는 모달
- // {...}: submit 시 처리되는 비즈니스 로직
- openModal(modals.quaternaryModal, {
- onSubmit: () => {
- console.log('비즈니스 로직 처리...');
- },
- });
- }
-
- return (
-
-
-
-
-
-
- );
-}
-
-export default SungwooTestPage;
-
-const Temp = styled.div`
- height: 1000px;
- background: grey;
-`;
-
-// https://joyful-development.tistory.com/35
-// https://velog.io/@sohee-k/React-TypeScript-%ED%99%98%EA%B2%BD%EC%97%90%EC%84%9C-Swiper-%EC%82%AC%EC%9A%A9%ED%95%98%EA%B8%B0image-slider-library
-
-// // JWT test code
-// const refresh = useRefreshToken();
-// async function handleRefresh() {
-// const newAccessToken = await refresh();
-// console.log('newAccessToken in handleRefresh: ', newAccessToken);
-// }
-// const axiosPrivate = useAxiosPrivate();
-// async function handleRequestWithAT() {
-// const response = await axiosPrivate.get('/user');
-// console.log('response.data in handleRequest: ', response); // response.status 401 인지 확인
-// console.log('response.data in handleRequest: ', response.status); // response.status 401 인지 확인
-// }
-// const auth = useAppSelector(selectAuth);
-// function handlePrint() {
-// console.log('=======================');
-// console.log(auth);
-// console.log('=======================');
-// }
-// async function handleFetchWalkingDongils() {
-// const response = await axiosPrivate.get('/challenge/?status=accept');
-// console.log('response in fetch walking roads: ', response);
-// console.log('response.data in fetch walking roads: ', response.data);
-// }
-
-//
-//
-//
-//
diff --git a/src/store/slices/authSlice.tsx b/src/store/slices/authSlice.tsx
index a54d2cb1..61f1a38c 100644
--- a/src/store/slices/authSlice.tsx
+++ b/src/store/slices/authSlice.tsx
@@ -26,6 +26,7 @@ export type TAuthState = {
const initialState: TAuthState = {
auth: {
accessToken: null,
+ // 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJiYW5raWRzIiwiaWF0IjoxNjU4OTE0NzY1LCJzdWIiOiIyIiwiZXhwIjoxNjYxMzMzOTY1LCJpZCI6Miwicm9sZXMiOiJVU0VSIn0.f2B_gezGmD6uKh2Js3Y_blrLJGOFyWXzqva5MAXmbqc',
isKid: null,
level: null,
birthday: null,
From ca81b1d7e9d65cfc2e1e632bb5b860b26b56838c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=8B=A0=EC=84=B1=EC=9A=B0?= <24siefil@gmail.com>
Date: Fri, 5 Aug 2022 15:33:14 +0900
Subject: [PATCH 06/13] =?UTF-8?q?fix:=20=EC=98=A8=EB=B3=B4=EB=94=A9=20?=
=?UTF-8?q?=ED=9B=84=20=ED=99=88=20=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90?=
=?UTF-8?q?=EC=84=9C=20=EB=92=A4=EB=A1=9C=EA=B0=80=EA=B8=B0=20=EC=B0=A8?=
=?UTF-8?q?=EB=8B=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/home/HomeTemplate.tsx | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/components/home/HomeTemplate.tsx b/src/components/home/HomeTemplate.tsx
index 59a57059..d0336c7b 100644
--- a/src/components/home/HomeTemplate.tsx
+++ b/src/components/home/HomeTemplate.tsx
@@ -51,6 +51,18 @@ function HomeTemplate({ children, usage }: HomeTemplateProps) {
// 부모 -> 주어진
headerText = `자녀가 저축에 실패하지\n않도록 격려해주세요`;
}
+
+ // 온보딩으로 뒤로가기 차단
+ const preventGoBack = () => {
+ history.pushState(null, '', location.href);
+ };
+ useEffect(() => {
+ history.pushState(null, '', location.href);
+ window.addEventListener('popstate', preventGoBack);
+ return () => {
+ window.removeEventListener('popstate', preventGoBack);
+ };
+ }, []);
return (
From 600c2190f2e888f422ffa928bc3ccf08173dff66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=ED=95=9C=EA=B7=9C=EC=A7=84?=
Date: Fri, 5 Aug 2022 17:19:33 +0900
Subject: [PATCH 07/13] =?UTF-8?q?fix=20:=20=EB=8F=88=EA=B8=B8=20=EB=A6=AC?=
=?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=B2=84=ED=8A=BC=20=EA=B0=84=EA=B2=A9=20?=
=?UTF-8?q?=EC=9D=BC=EC=B9=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/home/SkeletonDongilList.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/home/SkeletonDongilList.tsx b/src/components/home/SkeletonDongilList.tsx
index c6b4962c..6dfbee74 100644
--- a/src/components/home/SkeletonDongilList.tsx
+++ b/src/components/home/SkeletonDongilList.tsx
@@ -41,7 +41,7 @@ const Item = styled.div<{ usage: TSkeletonDongilListUsage }>`
usage === 'pending' &&
css`
height: 68px;
- margin-bottom: 12px;
+ margin-bottom: 8px;
`}
${({ usage }) =>
usage === 'proposed' &&
From ff7c0246398e0b10f735323e426deba057db83c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=ED=95=9C=EA=B7=9C=EC=A7=84?=
Date: Fri, 5 Aug 2022 17:30:00 +0900
Subject: [PATCH 08/13] =?UTF-8?q?fix=20:=20=EA=B1=B8=EC=9D=84=EC=88=98=20?=
=?UTF-8?q?=EC=9E=88=EB=8A=94=20=EB=8F=88=EA=B8=B8=EB=A7=8C=20=EA=B1=B8?=
=?UTF-8?q?=EC=9D=84=EC=88=98=EC=9E=88=EB=8F=84=EB=A1=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/Mypage/Mypage.tsx | 4 ++--
src/pages/Walk/Walk.tsx | 8 ++++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/pages/Mypage/Mypage.tsx b/src/pages/Mypage/Mypage.tsx
index ce902ca3..8c152a18 100644
--- a/src/pages/Mypage/Mypage.tsx
+++ b/src/pages/Mypage/Mypage.tsx
@@ -25,8 +25,8 @@ const DemoKidsRecordData = [
{
username: '주어진',
acceptRate: 80,
- acceptRequest: 4,
- achieveRate: 25,
+ acceptRequest: 5,
+ achieveRate: 20,
},
{
username: '한규진',
diff --git a/src/pages/Walk/Walk.tsx b/src/pages/Walk/Walk.tsx
index a97261f7..d2007d43 100644
--- a/src/pages/Walk/Walk.tsx
+++ b/src/pages/Walk/Walk.tsx
@@ -22,6 +22,10 @@ function Walk() {
const dispatch = useAppDispatch();
const axiosPrivate = useAxiosPrivate();
+ const walkAbledDongils = walkingDongils?.filter(
+ (dongil) => dongil.status == 2 && dongil.isAchieved === 1,
+ );
+
useEffect(() => {
// @ts-expect-error
dispatch(dispatchResetIsPatched({}));
@@ -35,9 +39,9 @@ function Walk() {
return (
- {walkingDongils ? (
+ {walkAbledDongils ? (
<>
-
+
>
) : (
From 13f0ee52b8ed629520e0d276e3cdf27355ab7187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=8B=A0=EC=84=B1=EC=9A=B0?= <24siefil@gmail.com>
Date: Fri, 5 Aug 2022 17:35:05 +0900
Subject: [PATCH 09/13] reset
---
src/components/home/HomeTemplate.tsx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/components/home/HomeTemplate.tsx b/src/components/home/HomeTemplate.tsx
index d0336c7b..921a54fd 100644
--- a/src/components/home/HomeTemplate.tsx
+++ b/src/components/home/HomeTemplate.tsx
@@ -206,8 +206,7 @@ const Background = styled.div<{ colorByLevel: string }>`
height: 288px;
width: 100%;
- /* background-color: ${({ colorByLevel }) => colorByLevel}; */
- background: red;
+ background-color: ${({ colorByLevel }) => colorByLevel};
&:after {
width: ${calcRatio(530, 360)};
From d64efd674870c0193e0ea570723b434b7817aad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=8B=A0=EC=84=B1=EC=9A=B0?= <24siefil@gmail.com>
Date: Fri, 5 Aug 2022 17:36:34 +0900
Subject: [PATCH 10/13] chore
---
src/components/home/HomeTemplate.tsx | 42 ++++++++++++++--------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/components/home/HomeTemplate.tsx b/src/components/home/HomeTemplate.tsx
index 921a54fd..34cb0b8f 100644
--- a/src/components/home/HomeTemplate.tsx
+++ b/src/components/home/HomeTemplate.tsx
@@ -197,29 +197,29 @@ const BackgroundBox = styled.div<{
transition: ${({ theme }) => theme.transition.onFocus};
`;
-const Background = styled.div<{ colorByLevel: string }>`
- position: absolute;
- top: 0;
- left: 50%;
- z-index: 1;
- transform: translate3d(-50%, 0, 0);
+// const Background = styled.div<{ colorByLevel: string }>`
+// position: absolute;
+// top: 0;
+// left: 50%;
+// z-index: 1;
+// transform: translate3d(-50%, 0, 0);
- height: 288px;
- width: 100%;
- background-color: ${({ colorByLevel }) => colorByLevel};
+// height: 288px;
+// width: 100%;
+// background-color: ${({ colorByLevel }) => colorByLevel};
- &:after {
- width: ${calcRatio(530, 360)};
- margin: 0 auto;
- height: 230px;
- background-color: ${({ theme }) => theme.palette.greyScale.white};
- border-radius: 50%;
- position: absolute;
- top: 257px;
- left: calc(-${calcRatio(530, 360)} / 2 + 50%);
- content: '';
- }
-`;
+// &:after {
+// width: ${calcRatio(530, 360)};
+// margin: 0 auto;
+// height: 230px;
+// background-color: ${({ theme }) => theme.palette.greyScale.white};
+// border-radius: 50%;
+// position: absolute;
+// top: 257px;
+// left: calc(-${calcRatio(530, 360)} / 2 + 50%);
+// content: '';
+// }
+// `;
const BackgroundEllipse = styled.div<{
colorByLevel: string;
From 58f694f9f9dae9f6ea01ee1a8af443d7933c6289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=8B=A0=EC=84=B1=EC=9A=B0?= <24siefil@gmail.com>
Date: Fri, 5 Aug 2022 17:37:10 +0900
Subject: [PATCH 11/13] =?UTF-8?q?chore:=20dummy=20file=20=EC=82=AD?=
=?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
dummy | 0
1 file changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 dummy
diff --git a/dummy b/dummy
deleted file mode 100644
index e69de29b..00000000
From 3bf15289ca7e32b6d841d68bd4ba57b2b4bff8a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=8B=A0=EC=84=B1=EC=9A=B0?= <24siefil@gmail.com>
Date: Fri, 5 Aug 2022 17:42:10 +0900
Subject: [PATCH 12/13] chore
---
src/store/slices/authSlice.tsx | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/store/slices/authSlice.tsx b/src/store/slices/authSlice.tsx
index 61f1a38c..a54d2cb1 100644
--- a/src/store/slices/authSlice.tsx
+++ b/src/store/slices/authSlice.tsx
@@ -26,7 +26,6 @@ export type TAuthState = {
const initialState: TAuthState = {
auth: {
accessToken: null,
- // 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJiYW5raWRzIiwiaWF0IjoxNjU4OTE0NzY1LCJzdWIiOiIyIiwiZXhwIjoxNjYxMzMzOTY1LCJpZCI6Miwicm9sZXMiOiJVU0VSIn0.f2B_gezGmD6uKh2Js3Y_blrLJGOFyWXzqva5MAXmbqc',
isKid: null,
level: null,
birthday: null,
From c9a1e33e6071125bf5161429f8c0960430222682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=ED=95=9C=EA=B7=9C=EC=A7=84?=
Date: Fri, 5 Aug 2022 17:42:52 +0900
Subject: [PATCH 13/13] feat : og image
---
public/index.html | 1 +
public/og.png | Bin 0 -> 190933 bytes
2 files changed, 1 insertion(+)
create mode 100644 public/og.png
diff --git a/public/index.html b/public/index.html
index 3430a3da..7b725143 100644
--- a/public/index.html
+++ b/public/index.html
@@ -16,6 +16,7 @@
property="og:description"
content="뱅키와 함께하는 재미있는 어린이 금융경험"
/>
+
bo!BNKvQ5^O5qQbg#^gkaKmAqXHB#uBvfk
z1DPk_`>|MpPT`Bkz4Or}ZY9#r_EjV14MeTZ1fAMF=qqns^c#kMRny?3QWl%vy7(@z
zx2OV|FJ5NA)tS4*uY5`PbHq
zl%IKGg2}=^M%6e}yS`PZR=`XJ3#+Ke3fQPe$pN1+1{{HU%zkV|KQ2%UcASOMr*GUW
zS9dl^_Vd?vdSg0=WRkInzG98W?k2ua|^8YxuQJnll
zHhZ%L3Sn=y_s$`(C+}+FzDdCz%4jB#3FlvrBxa-NVx6q}P4=12=qW}<1Z$3^sfTlt
z=?3IZO69OJ+8Eg#Slu=w5ym=BkdN6n4xV(N&e2n+U2EKv!w8N4`z}E~>p*>3^0&Mj
zaclT&SRsG%?xY@B%QS8ya#btXC}<`Br-XR<*g1R|;;3QygM_hw3-2|yIX!Xun$Y;X
zWQWV(OOhz0O!0R`YJ_6!O;Qz1b>?tPnkBuX%br0Z~VbjeydXl&C@g=L`XQCW&dy~!OH
zUODwGAvSkFKlPJVlPWMI8}Id2S^D=g-BI4gw(r`=Y$|y*W9zscN&hfXo}0gP=f@X!
z$AF)@wiJAMvl+WPKj`f$rC7J4NooAITT|ajF(0&JCz(|Zmmv<0M(tRStueg|
zuSq)EK9Vzk{=Db?z)9=ex?yY^lVjbGT?6hbgTxxGStS(#p?13irpCgH;EK}fKVJQF
zmkekkLLa`uM!gS=Z>}~-o~mDQ=2x(4{**U&&CkRM%gv&mvthmN`%00EB2=q(jq^IM
z`^pUJh{HH`k+gq~rieG45CQ*i;xH=zI+JZPt=Js9w$D7P*T@=|GWs_rC7^4BIB348
zOoMPBFwx-n80!Tyl1r@XcQ6Lbi>3;6UoX@Lww|B`!8Hvc%vxr>(S{{yY3CRm5Vsx_
zy%!b@c4a?XRpGjTz6?MbCitNtYAv<*bMvpOT0-@z=i3HZd2`ljJ>11SmUn%nT94W->fb$+k#0}v-Bih2rj^7XB
zYcQ#Br=}Y=hCZt0)q@TpU4|`lpWghRY#0Pu?19s7=4aGiN+Nd4lHjZh*fx2Nx{BEv
zlO+`Vmi*0WJ?Fd3~izk2LyS{5?_w05x`d^qSHPa9qis
z?!@Dtm1rmhk6Caq_&V&)9CKI}cunR)R6nst2k|acZn-$fQdfcDn|0#HEadW!A0uTe
zc1Tb4nRUwrXWouNs7y|ghxw>ntmIl)&8ZEeyP3PzUCOujYFk%jluz
zO4qy$Vz81e_TfQ@uhWU#Sm*GC0M^59hmR#F)EIvurUpOCIA0GsBEFN=zIHk|Og+o`
zK1O9(+w9hSNAUyX!A_lsyo_l~GbbixQLDziRhdU(RDAHrD~3
z|HJ#3Ew_U|BitC%`<)PV(Nm@|hF;HYQb|Qgdexv&2TaSKyO-B84L!Y9olu*OIwxku
z&fzNoT`t}72fc{KLz64MR9#}OCT2jFvN5YFWE=d|yhRuarIfq#KyX27aq2~_*?~q{
zjd(KlZg16x6Al&nnqP1Ne~mnw@;r-f`GXw>!`%dI(c~k$5wX0FukKdL_wIU-`EgjP
zDo?VINmKf8=DGj0#U^ZpT=bm9oGwty3W6g{c(P8
z_DP&mnIrHZLd@aD?bquAL$n^O?UE=eOmd~nRQqQZ=1cHO-M@D41?`hCF&EP_G^{c!
zF+j;*%ATtTDp*;uH98&57o8b?D`P))vSu00FuPZ(62-@TDY!Hg0zm)RGsKWNW5^Q4
zVdm;-LA`U?B6GD!%9jLVbDsN7+hl(4mtXu_CYg1i&pQS(`UYXD@}e`1<+B+{&keGK^>%NtJJQAMw;Zyw(dpV&Ibs`E=Zl3CG
zu)H+eh`m*zTEN!%PWgy;ru~YjWYV-|tFhDBgz<_^l+ACO8Sl&6W(EzuK+HuLgjFnz
zgX2zS0&85|jv(pS`%uVsHHA7rQRpr9dF2rAa`$d@<%R^t7M=D-%WX5X4m~DG-1`;;
zHbyOOwfLCk8l)9N*#3BlTBbx#n-
z`;tVIOaq1@ngSwVp0!^@amz$@z9vG_-+Ibd&Yn3eGp%ay_k
z_|Wx)R;~9k`)7TIY?SHFa3I{@@}CZCQ>y&Iy15HsdWQ^>x^ahc%zzF&h5wMu*tbyJ
zknd=K`HqNG@adlI%BDqZE8pabE{p&3C(1K1OV6k^#wg3Tu&blLka_){wQmh>57GcuTR7
zDYHmcnh-;In;pz%M5tV;hs|adZq0PG$e&9v;^I5x)@szC?np{mCKu`RyVOs`{++cz
zze70u42KlK@@9r4eLo=vyDzKIIm@3;Rji|`f2zQ1e1b#irU+97Av~XboS8|lZd(w0
zwfJWc96gb@OUt@}>=C!CPb`9b9dv;N=0h6o5_JV5MQZ8g!nz>Z^!T*5UZTbdK|m#|
z^ix_;75S&Nb24MOQ@SukPh&oBg18%U``(RchFdHgvST}u&n$pqNW(_WMO>AtDTRK>
zCt`@#nIRvG8S}?mxBvsPv&Fz330x=Cwj-_#xBjz?=SxEGubgj+*Gc6@C^nN}(zM^X
z%`f;!7609b1A$zD7Om;%5YD%Nj~&P>t%pen!(LnrRouF31SRwtYbaM3#{H@?x4T{_
z{XP`@r}!j&NMdm~xsQ9q?5K9**p-6`=#dsX@jO&U)4!Q6NZ0$
zjub50S5a!=jvG71xS1zU#vj@d_0B-a?!S-*qgqTA^ZQ@ae%CzKg=3y($dJg
zP1N+vIN1yvJ~ni3O+CpN!j3-{$bM&2lRbG7yAEMX&%S4y@qSKT#uX>M5pMpDn7hpa
z%C(MHaG!IiADrF!aI~-eK?$72Sr^nj3c9o3AN%kascyKj`O?lyrSEEgO*c{-^*JVO)bBwZ)afD;?ze2RO
z%Yf!dZLY50#`INhJGrqKX1#8=Q|}#x{QO+x{APR{kF`=+g#%ICXf>*XuJG2Dtae<^
z0{NwNI3WTu?0Jv6GP82KzjxA}nm?w9a(=$5C2z;JF
z*To>-MK&_*S)rZ=zqvZ`yAi%(DMTH}oa-un|8~Vvd&0k6709aYjq>hHtS#)7s@LnJ7rY;V4%ysf-EC~AK7l>oTae4HOVbAHDr6)cT)E>26
zK@6-zu92O*K*&te;&}#UjbxSzHa}QCJrr4c(0o|D&m9*wmyf70)2rNRKyKPIlisYm
zE%{Il-%PfJ(r!>!Pcd#6U5yA8ceG0+lP7PUfA4fIu!fFA-Q2A`ZQI(>@pUs^
z-N5Wa$uIDzKdHf&gfv{7Z~vT%uKn`2w@@YjjzqG|*n?lMcFA~hip5O!#p;ott8O?9
zC>3Y;%Xj?v{BL0mn3>J&a)5)u20ho~u4CaZYxKIx$2)t0-MU1Hw}?A?vWW60RSJZu
zvyu08qPqGa^s~^@F}Ccy1mwYX!k9JU@`AaVcP|idi(C0Uu`tvbaIq?YMGfE&E#J>D)_N}DB
zi{Cl0-9T*kUq6pHyN;<-=2AHxuz@h?;XYgL^7sI)1Fmw*eRKUIO_X_35~A#h^eKap
z@!sLMBCW9M5q4dMCXf>WmOCjK+vbUkCR5+OBlZ?-&(R;;YBJ0}KUm_%;jk&tu}cTX
z9%)WGH|$%9)-3WgnCZf|)r%}l
zcRZPYo-?|(o6BsWu&3+Q#TfBxIP@-T{au=``IYuQVyUC&)cRlIH`7i{1S&6Xv2ZRk
zfFuH#Bgy20imoP>o6!g7d@{JMb({}T-_Kok1Kz$
z;4ip-ymCMR5h@w$(X(^Ll&yhV@bxo$pMO_Y704sA0Z`7UF|Oryqbbsvtm<1L4)%K6
z)QyJ*pHf(w8%oDp=UvUxPcFZCk2}2dQTQLu}uy;YJu>3qr%RmkBo_Z
z+!6oO=uwr5&&|UQvOB&Tm>^Hv(Yb{B%DZ(j`!_(wY3n0c~r0zx8
zBIvry%0ea+KRNOV(}k3A)z3`-dx+)j?bE2u2qaB+5#0a0@M-)z_ibn3hX}2Gqghlv
z#el(eU8BFg#{zVdl)M_R3BN^XT!j&gWHOKEIN^57muU7L5M~A4N6Won@-jze9y?Qf
zcIa#f`g_k7pdXR2=4Nz|{B-jD;HWHAJF-@8%E3*tsW?=Afb2S#FKHUs^e=XNrW7Bl
z7;n*QcDoLqVnYI^wHc^Lw+CFoMc_>h4LNcB+EYTXEzZ{j8QPE7A@3(f+5Y)rGfX3O
z-&~#*44$NWIBhTgsD(?^juBrDlUF~dnyrlvM1h_evRwX(OwQrcaLjC@Yjo}*KO4t?;H1%fKxitY%1x9^
z3Ko_)JnPMiGXGF6H$CS=u9B-la4uUoJ+(r1kI`t~ebN#b+cJxC{_bENi-%5c9W#w?
zSZ1Yg!ScM3Ihx%tbahZD4NfjBuO0L1Rs=c!D*vL0)Y}2LT)E*yNipKU-EoJDe-_lY
z`mwf|cXj0Ci~ExUBh-OL9vba@o_^$y@3?EIV>|#8aQ^|(o_AXD;-2m#N;jKQ0y}N`
z4{$mVU6n4e*z!9y`KA+7Zn6YY_16FeShes_{$zuq!NP!7mxYyj$HCSA{v06}b;E`3
zcynD)GtZv%?_ZwTvxE`X-}!g7b}#obd?hcc#QLRp+RjYR7)
znH>%&!*+ROIUQ5}`(0z*ZztZn>VmCpjC{8Zkj@--hA?ekG)jdiE_ddolqib$_M6zp
z@RgoPLHGF8z1_TldUcIyJ&3fJAgvwg6!lMpdk))b&ya?az+}~2{$|N=H#=VZ9l3l^
z6%`>|>-bdwOY`#*%s1zDlBZR#rLd!o^bQ#AI8RMlm37pQufoHs%A$(kDNww!WJ1>^
zBF3E;_H|Jc(5cBOY*@{@RJP6C51@cW2U3O3tF%~$kKJA1wXEN#FV4Em*#4aiKreKV
zy89Pged*_PM9$BRll2k5AkY1k=X~TY8m=~*v%}@taa&_mv=UYlfa(Pg&~kLOri9q^
zaD^}}jb4<%AlBv~2Za6~>)z^L+X;iyRThfc6!W$p>MRWVegZujB-iy<8&E9Ajxx}v
z$W0`C5pa8|C!#6LU1+tWm>Nlb0Sl_pXs}zX(oB1w32aYPidzCGu>--94CU8N
zXt>k6Ot6v1o71QZuYzR;hlR6c14^Pi;rp0?pbwHp78lRP_2Yc+QAg{tvTQFt)480n
z`B)bw5WvChYQJUC%du%YZ$0H(!#iU$?-1zqIH`c9X83?y1U(eY$y&X;E`_W_^(a
z?{(1aj_sR9@`v4>T&K|(k_*x6Us)R~my|{FmqP0zeq3zbHMHMyWZ&P?+5=R1?~)e4
z8dKA{#b&zx%Zi>~BEp^uj+5_R15v%W?7DhQs5ZJ{6flyC^LZl~T!p)8zU}w7+oLY7
zFIw8%8%W2kD`r%KdMDvm>#W^7gTMqk$b;(r+jbT@zq6dNt-5VxKdK}nR@T!hyebul
z+boGV9Z=rCxh^o+1c9(eBff?Zm~O58+}fz<^6>Pz3_HzA!qu#Jan?n{g-rm&gnzHPlr^kduUEbFqU}3*YU9VAk1xyn
zY3Vz5|DagJF9>(x;G^QW%rZ6>VVI(k-(z|HiH3hSi9sNoaG{C5%gT`=S2cMo;$l5L
z971n&VV;+azg5KA^)l=36xNas{K9>gtG0geFiMf!5WI3etQ^g`Qw=0D1=bF9@(=r`
z?yIntR`iz%Q_Uu+gSriADDQ~I?5otV!p~NgUZTnifrfkx@Hw;rM9~*>OG{%IceJ{jJl!rTN0=?V
zP5Nmmsp9Ugz-W6G4|CZs~nG
zZxNe6lhOw9Qk9rTK@5X(UTpQ!WazxoG>;=!NvoJvLz2cf9QaOU
zc$Sxl?T8>)NQ+Linbf6(k6n+B0Indfa)+nU!IRP83lI(c>9QfuzdJ)9kbE&z2(bU?
z>21!`XsHlj!@sWlUQtGK^BllBx#LP@Fg8aXPNvy7p6}c3J{vR#q3*(1g(ZQOddXFN
z%8*xj#YBvW;mkk2T)x9wzTaC`=HAIgSAsv?@feZNaU1(#c6sNJ>=Hncy+@}x$Z+I^QgB8{l+bVHq{B4`VFtxNrN3^qlaZBZpgE?R~MdEbs
z>nvc_D@P~v5*S(L=hW|C;gDlhIkWcf6=TU8>f{GjZ?>GXVmxP1vT{jg)>PHj5Yp^W
z8tMTh_2-pul%Y;Vnxd7P<{_rBid1#?N_6*Q$q=To50((u9rmiR9u8_yrMWh4x^!K0
znl5_OyY}lwaRUW7d@Vy)w5Mz-T-NcFaw?h~MO0T|*^{;y&EjIc5UxP4N!&ddTNW%ocze>|q1o?;+*&
zgAZ?%nSD$$XTDSV=dcu7ECd73Z(V|AE+JAco`X~8Lm0*t{-wt!#r-P0zlC}k|VEtcZe2`
z#VbzmD>A9pL!o`=d{@#Kt9fvs2wRT8w3K+ssgUb}if1{N4pJAg{Na=JRow7^7qNKO
z<76D8s>^Pm_{XHAr76VLTm6t`l)2MG4!Ta~{6n`1$~(u?6YkMlxN
zR7m+}jNb_*089X6r1Cnp@%v+v6Mf2R;a5_@hg)?ODyJx5wk4CDb3N%71Rn$ImIK9c
zn!toIumW|h{X#1L1cxU}6h&O7?|vK^$qamWTUPL4!xzvr&I1nXC5Ah*^q3gb=|@(v
zVy8)6JGq-LMzRxte4B3Pd%!Hj9d{T6{{^j1t8lKD+HY##nue=69WHdr89vuQ8`Y*f
zmW>c0d5%Z*ew2=`3=e(aS^g-H!J+IOa)yVvn%~f;c*}+9?<-^0N9S)wWjx!MFUYyg
z*oP?N64cweDH(GdwF%wefN+J%SC=QA#BL3%C9-h$ZsRdi1-bvsIg0?uANKe7R;))a>){0lBb%)Z!I6$6Y69jh6(kMA<8Skb6Qq
zlX>ZKf3B_Pbb*EmK_#Mf5T4GVTRWkUPILW4`-be14(*aM2=e6XdL>y1NOg<8KKP0Q
zB@keJh5W$zJuT-EibMV36|3o-`b*>wf)>(Xi1h|#**dturIY(1X}HXQCq*Vyx1#>O
zKafh{qVE120c@)Y?rWH9u5BpSoz%hmXCv`F
z9rXB~joTa1ngpvn{^P4OfhNYf{`k*hjKXm3-D4G`Osu`brfTKF+r%}oA}AmpN;Ft|
zyvXhTwNu*f`>5MKvLPeE6BR+M$cHqKMO2VLji84ol+zpL+c$fFpubE&7VjSXK^d*Z*=
zxt#-)mR}LZ$sxp5kJ(zZxG;%R#PSp`{QCaak|TSH($Hq#;j^Y3#6Ar~nr
zEP1$rclyJrhvSaDhn)w6RL2dPe$NE{3PNfH1^*V?a?qw+Jr0V0MG~{H9X00
zMCJW}YKdK+vL2mb18w-7pXO=6b4{*%N_r}{__po477dwA#}{XRbs0>q`)>cqkVDpo
zUWlma0kWsWob8T{hnmx?rvUu^yG)dc=z!98(bih^u?gTQ{v{aG$Ns>{VB$ldj_vX#
z<}Ls^JoL!pZakrYmQ{?U$lP(kE<#E~&)L?@^$LO(wy5h>&3a#*K4!)X3fcyS_6vlF
zPB!S8V;^1NRay_?fUEuos|Lw11FeCWIkTI+i%t>8Ly_*Uom_wp&&~Qm(P3*8ukFbC
z(|dzP8=QL$AdW&AR2ls5U$B4rFm>OUQ-p~Kpsq++i4|IZ0!zF)l9I{!^`3d?YaStt
zs^&EU`4V3~mtL+ZW9wX_HzTEk{3c}jB|iw|{`eFLVNb3)Fy+1;$}s+3?nbx8wq;TM
z1{WfOijBrCiw=KMY<})-uq^eTAD5Z=
z0;FU2I7Sfu+RDH37X`Yzq9L4LjA&G6$g2-Oj+iW+HlV-bzgetR|NYZJ3nj?z&=C1U
zJK;6?o+<>NyXC?6F`&IF=Y)tw|Bx`>Gm2VSkAt%w`|SP^8Uk9YB-n97?i-Pi$T%R6
z*;nj2&qZ+2RkE6b5K&+NHWC)@V=M^#TxT^u7hinO!^Sa!QI+crAWejp-n3h$Sx&z-
zXdoP|mJ@rAA&_?H0(x5YdciNECG75uZ$E)MSGwiWHZ#VeFL6El7j?Jw@mJ`Jwj$s{
z{4;Zw?Py$R`)hPWLx2*rcTpkr@A@qW6ruIq+B{BV{N~eD>9+`iKjfzS>vQCo7tFNj
z&BeQ4TZZ7JDZZ>>6CWc$8<>6%VOa7bhbxPYmu3o!GuU%^D`|E6fAIf6eAT=CZh&FG
zR{bk>S%J^WTBS*+=px-;n)+LkVOZ~R(s>jbMWzJwGCsp99kE$8u(l#ULUT$N*J$Y6O3p4J3==v;T4H`gxaAbl
zquJgoCem7{r15!2YWIsmUVG8fREGK_U(<&-Fo?M5qcW}zbAQFTn5=`pOcltb&}I93
zxAoYPE4P5-=i#yB@lVH-o&2QoGBqdu8^(yGy@Jotvl0ychC=tQdYyJvsB%=$_!m|S
z0V?$9ryAA*NEwGl{CtjffX!C^h*J6SuM~K$m>&_N5@qh2UKQL^SJihePmP9WJ02}1
z516e3=7wVv!9!_};>;Dm4Nan&PtWCE{(#DOVZRgyAyKplck5Wrw(@%chD+8nLWkGi
zKixsGUbv{3sH71QCgB$+3M;Nv3hP}3SoBhVt7!*-@3qXRos6jw6l>oqM!Z9a1SeKJ
z=B{knG10EPU{;8WL|ii?WB}7JK@RKrcVYx}7u+Ti;*P@#(y1)Rq6vkMUW}|(;ObGL
z{GpP7YbpmsOwak2*HegSx_9ZhFB<_qwpc$>u-%S0Pad5fXPZds(B8;J^*E}Ei`p)#FA+NNP>z-gagD+Dj93Ca!Bqi
zui)e1^Tv}-KQJGk)KnsYLyQ~fy^LD_&*e&A2rX_ud*|{~akaZBBOy%dmi8Y+BrsFX
zhaR5tTuZ{dcaFo6sQiJ5|JL(#D1&XrN7%7c-UquZip_gXi4WP+l5WpBg6uM>ay=3N
z5G~?zgXzu#)lm)4bm-L$@jlD-8vYLt@H@X_v>r|+$*JIHdrFNbFGh*H1N;o%2}EK?vMY87<4}CBL9gvA{m^n
zArA+p%E?pG5Gas{t^N{W`lR+8urM9l5Wv2PLnS#8664A%$yVDF6fc0_qT8&*SFZrX
z8{00B_mFTCxItr3YP*w(8k4E0e$4o?f`?5lCk_XA#l+qVocO~_-DHt`jRC$Uj^WTU
z_HtdP>*PhwYRHO^Kn4!dYhNHcp9s)6AD6=+i0D+0=`1Dg~;WPuo=D8k{vSXGg
zNvKAnITYe>`m_cgG2KB<^}~L+yQ4cF9?$$|40Lg3C2qoLHXTy+(5wb(9?OW|EWi>f$^koCUZ{MUO!2gNa%ok-uJ!K;_Sy>KpK@MHBG?O2Swe8l6dP5bgrQ3pF;%(|>O(yi>f=@&eWaUxw6*|ztBVSh-4mO@D^HQrCQCBxmU}@H
z0m$-n-s!GqVL3Pf;gBc{WMg5H=Y>avl1|_xkAva4_kr`)3)68r1QNc34UxS)Z>XK*
znDDs2=Qv>dO%2z3et}0P(6$@6eMEw1c@a-=0`NX>XcBTq@{{2xF+{<9TBEsdYxMqb
zVnH6zL^T$8!7|&PjViG6Rsl6do3ItDo=3zjN0Nd4t%N9Ry>i9-&53`*B*onVuDl0~
zp^(zSY$n#9mEz%(d$r?WtL5;4FK*7ZV)I`*kyWNZhUGFx%X?qg;q!=aWAlUm&B*Ix5wz+
ztuie~`;ORgt`9>5NbUheh$IUi))KZ#;Jt?VFg0CKIyM%N1Av|l2`qMQi+c`_|6DC1
zUtsgj)?%uDEZmkPFYVk-RJGdK<>@Oy5iRvI8BlOA-^N3N{8hmsp6Gp*u6}ELwGnN+
zqe0%J2ul!|^tPw4*ZsH*{y4nebsgM1iT?*fcXTRTd;PS=(;kcBd|&G+zV?UlICokG
zIS?ApU!qA~9jNL9B^5{W`MY{NpyObdW=l7c?c0~;%lEzec13Ka>2f+hw&6eZcFdYd
zwK)L+PV5Q!+=zZ(dstU^)n<#r3-5SVD{ze=G$1A9~ae%1KuYEFZ
z7Hw$GZ6Af6S-&wbLbf0Iys#pE#t~Gw!bEW-%=n)janLcKXVd_OU1DS6s03%!>pS>$HYAm9xD;L16kRbLE|>
z+jIU`Fb@JfGdc08si`8BB;r1_bzXoE?IkZ`LPhnGbrBaWLZjE8F-adooRArCv_v)i}mKm%ySYA>UV_xd`6wSAlhkh>RmltzR^cGFIlvWt;b?
zsuvzlENTweq~#>!rhLx2QiYtL*YI}%ZPNe@USz?|h{1?_t(xxHae2l=s#A+3(*!iI
zC~Ae(&)2Rre~Y?CwjnH`(|qjTdrbO$AqtGhS(bjFvd&vtMukFzmt4f^B!d~s
z0~9D)==2+8oDaaHV-53l-~7nA4sT#NoXqq9L(wHs#0>-K+?R#zB^LwZI1b_>XfeKL
zd{Y1bun)<7$NvjQ${RRxese&SSe!=@Uno~%`N*ap@=WHqewJKzvNSx)S&$41dpbNF
z8+O|JNNYSZw+#xYcRrY1DB9B9sfksO#TC0>xN<*c1#L`wrd}5W7KOQKgFgGq2i65W
zVOgTGax(;YZk5tWt30*Jtc9O6G_uUvJc8qzl&dol0C;}p0@e0;DaLPN;t_=JM;bk%
z44l7dNGOLNWe<;))jsF_Z=4+n+}lZXP=PDgHNE`I5MAaX3%TM=ZQDP59@6D?9~UAc
zd0VXZH3W3|y=I6ec)uJXAV-kim{P7A>{MZZ8T$V20`{c)79#D0g;IrVK)D^B?o;H4
zuK)uH`jS}wu-txnB{G2glUJ$iLE7GW$JbmUE@~}?SuV#~v;>p4xUe$Qjj4K>$CSBZp_=T*
z=XO3WQzr4cufLgl+HG7Btl5Iv2w>
zl9@{%@MQ`*`o(l=O6_3-HH%x!GKt23Uxz>R>8uaMRfpM+(H^1Ns%td+@`AG4Dc1U0eZ~77$n2t(?UdGhoiad>^(lWdx`J1&R(J7GOO^E)
zM&4+|nOq@vP1w`to|M!>pfx?ZX5WnNIvsPq3{3CAP2RtDh0+=Im3~)bS?<2O%2-Rm
zz+aCe;9&!%$fO`*J0>5}aEu8zZXh;|shzM{L3OtDxT+d}`ROU>SvzLhOsxx;Z|0ph
z7JulvE)}Md2l%jYY8s|f)4+B0Wf}Oc0SX!Xf#8$F&FN73GhCWx?)CSYl>M6sP@idM
zM>U4z6>7Vql5QjjTxWD_(*l{9TDWH@GsE?kL)7!jecSPjD@o)s!mq1F6zT?pLp;^x
z$!QirW0h4*p{4*Hd`S_E>rE9iYvHV?duc{Z0e5<-2CN0!MpZU!ga5(
z;=Q}LNT=oy(K|~5r3y8ef^QO~Ef@#*KC|KX$yHru`VArj_P++Q08t|AIP$gR!xLueVfw18#N-X_QeLHvT|Bl#tCE)0(*_X%BNoQo*IHd
z2v`v@)AL7vs_*2o91lmma%_3Wx9p6}y!L3JRY>Yiv4yWFb#U(Nljk9rzxrknD7V7*
zIa&k3D~0JOq$BMMtVCO*OH?XsR)VHzm_b#)VxFe4?lyk*$$Hn-bC)aQ9ec(95{I@*;FL5U#Wz4l?^M1VNzwV;I*{l=;I(FFF
zEQ_5qY9~VIp->}wFsYMk>g>`(xCu*c;kN%5P(qzto#AClgvi5
z^6=wkGK62xh(q9)BsD9@j<4~ct3rYy5OClGGdZHh_g`N*x&K65nvXM1H>IzBlma3w
zx0(!0&Qu%>YLvXL0B&Lt?4=l)C<>FvD=W24S)G*%`%FiJ(=8rqbFVFF7rJqs%RvY4
z{0JkR+}2D%Mt@2`?mC1c-Sg+f%GjUPwq3R5*OE^!_ul}G@uv+w{9Gs3A3ffAMb@vZ
ztYsb8Yd@s89N1i~L87YBOc(f(f->+pVKUG0;fG0I#s{xepi1a8bNx!Z>6*g#S*V*NJ2b!V%T+BOE+v5pK)*p1)-}0H(-6>08#$;si(EDr}TX+j(<>NQm0S#u$@|bjgor_V_M*yCg@1myz
ztMP!w$TOWpu021uXLyM~-yfr_*`u
zhqVZJ>_d?IRIO!4NAz}kL=8x_KS=%WTL6K4o&k{PoNcG_Bp=bc1EfLa85MBRUv=_I
zcT-NKgS+U;z}nA!HN+kjlq9ECAP3gaJRE-0oo6k;(vH9LPyDZ~`DO>>+CP!tz;0%Y
z<_`_Xh4GjY7eA%jGj?Sf|MFp#11UE8#Wvqr$cW!QX{%|Xrvr>)*=s47M0+cY46u?<
zlhr0s{aow^$Z?I0r$@~$0q)(al`>YR1@{6C<7~xxzzo&40BPVRq>g+gFD}D9{j~V)
ziL*ulp&a5LD}gTm?e{-TWbN5n4%{Gt)U70FCyLs$;(IiZOTX4K`5d@nRyM>xyM2`E
z;_|tl^1_&kDGQj1BFT1`-_bOCKmX6S6mX-GmC^Vg{V~i4kYPqB10eB0#@Sj4eoM5s
zVm94m}X!h2hfg>#y$#+dHUJ+fzh@bu(wHQ(Vv`lG_G|`s2%4G1NB{+?@68C
zifUW9X|!ZrmaSVm&adOjm7B4)k3A%)hCz^Nj_M_L5Y8`x-9{puMZhOD05>?7
zaSdiB3lgCdlmsX&4wPP{znas}1vhIsRoLF*Gk^3|LaU2=A&+BB^}fZI_)@?N<91cc2m}V`619%G>1=S{1cua|$IwS;KED~rGkKFp42U6T0ky;%
zukj$9-^quZVe5`~2U7Xnk{H>C)M9r`pZfw!q7%_CDGn<61H
zN#&>c(#6J8`b@o^>i4;QYD@of@b{B|osa2|@kH6D8D65H``WN|5rG45iL36m-YN
zUqf|fh~>Y>wq=__A?TY{2+2iYKGxF;sR1Z=r09k1QhDAK{3!rM>s&gMB
zs-)wDZT67DyUmUbZ=H&ARwOHFwTf<-_=D>C`8uoeFs1O#AQKZhABs{
zWXb`Jl@&LmHBrpdk0#96`&aNYvr$3PvangS`7{Z4FSh-gsj+UQi$dG0<@e&bF1i}Z
zK02DvHqW!Q;V(M&C&6G~@caj8sb1pJdigE8zUX4}E`Bg@ihfmi>3N7yn~SX6sr-7;
zzA3wWJS$`Mf1YpYOHkR~O+#$%{}9BFz=DGd1r1CXesf;`vfj-R@b3-Qo;Coo-|aZz
zsE~qW+zSBsVyS0{uR$MJjYM`I4sYLVsuLxq@wqqC37u4n>l(7=j(Z-vM{!@~Gh@po
z(yDK%%73<~XG?@yVb`KEE)#<>fTIF#_QEwTl*V3RYw&t7sr+I-64-cR4~#p&!3`X=
zpA|H(C;KupDzqDpI9h9VJlY$t?D5DunuNU*OpU9DP+=>(*_X|-hWd~O+e?NVQ)3>JTAuo4SGG+qUDKx0u;}@3TNN1w
zrd;GNTM9oxLLwz7eNRSzZ3!dxPxf9ETCdnMAKs6=_kMoi`dEd`Rdd7Z)W-7j7pX4E
z_G}$DXrMEmb^zxR?A|rx9A)~e&X%UFt!1D-_uqk-K1FUz@!ZFPyaGUBq84o}Ir0om3AwqPaAb+>$}+>tZ5*S}
z$oZ-ULaDFp#rey4e6yy*0?WAo<;pqYu!th(fM8Gj@xfMk0RX
z0SPaqh0h`-lI{dw$bhVZJ<865Q$LZ|qwDpj<%@7f$HBZxU@wOdMf&EJo85R*0gdFV
zu#6S`q|SjlGY1I|PIls1Urpa%1%RudrVQ>hdnCLrNSHtY6klb+!`C*t=<_#n4E3DM
z+l%{RxlXN<)K&_NG@xhS1|$KCx7_pR{AGrM^s&o>
zXG7Yq#dOs4!_w0csz|dWKn4tCQjUZh(`0ad8zL-)=j26{fh8Y8lvdQDa>Yo%Lz0Dg
zTW%#9ou~2t&;ev2p=2td)J!agiS;L
z(@AHf9v>eq&67dF|HsvP$5Z+L@&CsjhbWTmh>#T-k#G>%L}c&HvC58PQ`SjY*`X+V
z9Gi^H%yJx#P4*tgIL7bl^ZmZx?|xtZyWP%pU9b6kJ|6c64^`1P0FWUGD)=7bre$hG
zx+K*)bAI1$`6E?h+3@^9CLQzkBA#{RVY8GG|UI(fSe)#Xl45
z2eP2M04UgB-`o_?g}85tJf*hTv;>FTYM425+Bx|r;ogaDP6F^oYl(QtnoGAP_C7u
zeo=n2Q?QlP62S;4zz8>LX?a0v=L7!z{!N6l&bTLp6+eG|Er?@#esv
z|BAJlf3JW1)|zG>&zc)ABukQ>`1R{)SH&?8aI{!3gkcK#*JF2fghHH=0NP_OeCmgm
z3Q#tetU0oxUnfg9tNg~rcaI!wFIwf_>C4ZQ??!-0VB~QNJ1il}SEeLoS@q^O^Svxe
zlTUDLRN%uyc*Q-tw1&uLvOI+uNXe9l&k0Y(MHpV+5ALxX5?*eWhm|J+RnfF
zA#Oh5b`-hPw5DT`vbx<&{$G!t0}YL{?@;_rW=f*Rh)kWF7HputTi|;m_ZeLz8uq0H{0o`@gZ&u>b^IQIYS}K7WAEH>p$xuvhru&
zm-}&*k)4N%pw1hQ#ecR?S}B5E+~Hr7q-^ma0u^>QofGTa9;LG*0_r)Kb%Jn1RK$QzANy%_v~n{P_ZyrMyl0_z(}G`yW(zNk=W@
z_>CFmcyX8qX7G)@+U9-0htum1C1l}y1?q$q_cpf}6!VtkPXu4;lk{Wee4SMaf0t9<
zhIuy%!X5+rz+Kw5r(5hk&Y}*Y$Rs7@rMcs6JIh2opOYOg+-&Vu+1^gR>$sA!@(npU
zaA67m-Be3t@T1CLOWAO62ka&G{p8JJxba{sS?CEG_E)VRG