diff --git a/package.json b/package.json index 25b459ee..b68861c8 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "axios": "^1.6.8", "date-fns": "^3.6.0", "firebase": "^10.12.4", - "lottie-react": "^2.4.0", + "lottie-web": "^5.12.2", "nanoid": "^5.0.7", "react": "^18.2.0", "react-daum-postcode": "^3.1.3", @@ -58,6 +58,7 @@ "eslint-plugin-vitest": "^0.5.4", "jsdom": "^25.0.0", "prettier": "^3.2.5", + "rollup-plugin-visualizer": "^5.12.0", "typescript": "^5.2.2", "vite": "^5.2.0", "vitest": "^2.0.5" diff --git a/src/App.tsx b/src/App.tsx index 7f3a6b92..1b4f138f 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -3,7 +3,7 @@ import { sessionReplayPlugin } from '@amplitude/plugin-session-replay-browser'; import { MutationCache, QueryCache, QueryClient, QueryClientProvider } from '@tanstack/react-query'; import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; import { AxiosError } from 'axios'; -import { useEffect, useRef, useState } from 'react'; +import { lazy, Suspense, useEffect, useRef, useState } from 'react'; import { RouterProvider, createBrowserRouter } from 'react-router-dom'; import Layout from '@components/Layout'; @@ -11,16 +11,20 @@ import DeviceTypeProvider from 'contexts/DeviceTypeProvider'; import RecruitingInfoProvider from 'contexts/RecruitingInfoProvider'; import ThemeProvider, { useTheme } from 'contexts/ThemeProvider'; import { dark, light } from 'styles/theme.css'; -import { SessionExpiredDialog } from 'views/dialogs'; -import ErrorPage from 'views/ErrorPage'; -import MainPage from 'views/MainPage'; -import PasswordPage from 'views/PasswordPage'; -import ResultPage from 'views/ResultPage'; -import ReviewPage from 'views/ReviewPage'; -import SignupPage from 'views/SignupPage'; +import BigLoading from 'views/loadings/BigLoding'; import 'styles/reset.css'; +const SessionExpiredDialog = lazy(() => + import('views/dialogs').then(({ SessionExpiredDialog }) => ({ default: SessionExpiredDialog })), +); +const MainPage = lazy(() => import('views/MainPage')); +const PasswordPage = lazy(() => import('views/PasswordPage')); +const ResultPage = lazy(() => import('views/ResultPage')); +const ReviewPage = lazy(() => import('views/ReviewPage')); +const SignupPage = lazy(() => import('views/SignupPage')); +const ErrorPage = lazy(() => import('views/ErrorPage')); + const router = createBrowserRouter([ { path: '/', @@ -113,7 +117,9 @@ const App = () => {
- + }> + +
diff --git a/src/common/apis/tokenInstance.ts b/src/common/apis/tokenInstance.ts index 92ed2687..2b1e6c16 100644 --- a/src/common/apis/tokenInstance.ts +++ b/src/common/apis/tokenInstance.ts @@ -1,5 +1,5 @@ import axios from 'axios'; -import { isBefore } from 'date-fns'; +import { isBefore } from 'date-fns/isBefore'; const tokenInstance = axios.create({ baseURL: import.meta.env.VITE_BASE_URL, diff --git a/src/common/components/Input/components/Timer/index.tsx b/src/common/components/Input/components/Timer/index.tsx index d9dd6599..2fa854f7 100644 --- a/src/common/components/Input/components/Timer/index.tsx +++ b/src/common/components/Input/components/Timer/index.tsx @@ -1,4 +1,4 @@ -import { differenceInSeconds } from 'date-fns'; +import { differenceInSeconds } from 'date-fns/differenceInSeconds'; import { useEffect, useState } from 'react'; import { useDeviceType } from 'contexts/DeviceTypeProvider'; diff --git a/src/common/hooks/useDate.tsx b/src/common/hooks/useDate.tsx index 4fcc39df..88245903 100644 --- a/src/common/hooks/useDate.tsx +++ b/src/common/hooks/useDate.tsx @@ -1,4 +1,5 @@ -import { isAfter, isBefore } from 'date-fns'; +import { isAfter } from 'date-fns/isAfter'; +import { isBefore } from 'date-fns/isBefore'; import { useEffect } from 'react'; import { useRecruitingInfo } from 'contexts/RecruitingInfoProvider'; diff --git a/src/views/ApplyPage/components/ApplyInfo/index.tsx b/src/views/ApplyPage/components/ApplyInfo/index.tsx index b111dabd..e6e0851f 100644 --- a/src/views/ApplyPage/components/ApplyInfo/index.tsx +++ b/src/views/ApplyPage/components/ApplyInfo/index.tsx @@ -1,5 +1,6 @@ -import { format, subMinutes } from 'date-fns'; -import { ko } from 'date-fns/locale'; +import { format } from 'date-fns/format'; +import { ko } from 'date-fns/locale/ko'; +import { subMinutes } from 'date-fns/subMinutes'; import { memo } from 'react'; import Callout from '@components/Callout'; diff --git a/src/views/ApplyPage/index.tsx b/src/views/ApplyPage/index.tsx index fca7b4e9..45add81a 100644 --- a/src/views/ApplyPage/index.tsx +++ b/src/views/ApplyPage/index.tsx @@ -1,5 +1,5 @@ import { track } from '@amplitude/analytics-browser'; -import { useCallback, useEffect, useRef, useState } from 'react'; +import { lazy, useCallback, useEffect, useRef, useState } from 'react'; import { FormProvider, useForm } from 'react-hook-form'; import { useNavigate } from 'react-router-dom'; @@ -9,8 +9,6 @@ import useCheckBrowser from '@hooks/useCheckBrowser'; import useDate from '@hooks/useDate'; import useScrollToHash from '@hooks/useScrollToHash'; import { useDeviceType } from 'contexts/DeviceTypeProvider'; -import { DraftDialog, PreventApplyDialog, SubmitDialog } from 'views/dialogs'; -import NoMore from 'views/ErrorPage/components/NoMore'; import BigLoading from 'views/loadings/BigLoding'; import ApplyCategory from './components/ApplyCategory'; @@ -29,6 +27,13 @@ import { buttonWrapper, container, formContainerVar } from './style.css'; import type { ApplyRequest } from './types'; +const DraftDialog = lazy(() => import('views/dialogs').then(({ DraftDialog }) => ({ default: DraftDialog }))); +const PreventApplyDialog = lazy(() => + import('views/dialogs').then(({ PreventApplyDialog }) => ({ default: PreventApplyDialog })), +); +const SubmitDialog = lazy(() => import('views/dialogs').then(({ SubmitDialog }) => ({ default: SubmitDialog }))); +const NoMore = lazy(() => import('views/ErrorPage/components/NoMore')); + interface ApplyPageProps { onSetComplete?: () => void; } diff --git a/src/views/MyPage/index.tsx b/src/views/MyPage/index.tsx index 9c3831de..3d1a8399 100644 --- a/src/views/MyPage/index.tsx +++ b/src/views/MyPage/index.tsx @@ -1,4 +1,5 @@ import { track } from '@amplitude/analytics-browser'; +import { lazy } from 'react'; import Button from '@components/Button'; import Callout from '@components/Callout'; @@ -6,7 +7,6 @@ import Title from '@components/Title'; import useDate from '@hooks/useDate'; import { useDeviceType } from 'contexts/DeviceTypeProvider'; import { useRecruitingInfo } from 'contexts/RecruitingInfoProvider'; -import NoMore from 'views/ErrorPage/components/NoMore'; import BigLoading from 'views/loadings/BigLoding'; import { @@ -19,6 +19,8 @@ import { buttonWidthVar, } from './style.css'; +const NoMore = lazy(() => import('views/ErrorPage/components/NoMore')); + const MyInfoItem = ({ label, value }: { label: string; value?: string | number | boolean }) => { const { deviceType } = useDeviceType(); const isMasking = label !== '지원서'; diff --git a/src/views/PasswordPage/components/PasswordForm/index.tsx b/src/views/PasswordPage/components/PasswordForm/index.tsx index 95578add..4b45499e 100644 --- a/src/views/PasswordPage/components/PasswordForm/index.tsx +++ b/src/views/PasswordPage/components/PasswordForm/index.tsx @@ -1,5 +1,5 @@ import { track } from '@amplitude/analytics-browser'; -import { useRef } from 'react'; +import { lazy, useRef } from 'react'; import { FormProvider, useForm, type FieldValues } from 'react-hook-form'; import Button from '@components/Button'; @@ -7,11 +7,12 @@ import { TextBox비밀번호, TextBox이름, TextBox이메일 } from '@component import { VALIDATION_CHECK } from '@constants/validationCheck'; import useVerificationStatus from '@hooks/useVerificationStatus'; import { useRecruitingInfo } from 'contexts/RecruitingInfoProvider'; -import { CompleteDialog } from 'views/dialogs'; import useMutateChangePassword from 'views/PasswordPage/hooks/useMutateChangePassword'; import { formWrapper } from './style.css'; +const CompleteDialog = lazy(() => import('views/dialogs').then(({ CompleteDialog }) => ({ default: CompleteDialog }))); + const PasswordForm = () => { const completeDialog = useRef(null); const { diff --git a/src/views/PasswordPage/index.tsx b/src/views/PasswordPage/index.tsx index 7c34ad82..8959e0d8 100644 --- a/src/views/PasswordPage/index.tsx +++ b/src/views/PasswordPage/index.tsx @@ -1,12 +1,15 @@ +import { lazy } from 'react'; + import Title from '@components/Title'; import useDate from '@hooks/useDate'; import { useDeviceType } from 'contexts/DeviceTypeProvider'; -import NoMore from 'views/ErrorPage/components/NoMore'; import BigLoading from 'views/loadings/BigLoding'; import PasswordForm from './components/PasswordForm'; import { containerVar } from './style.css'; +const NoMore = lazy(() => import('views/ErrorPage/components/NoMore')); + const PasswordPage = () => { const { deviceType } = useDeviceType(); const { NoMoreRecruit, isLoading, isMakers } = useDate(); diff --git a/src/views/ResultPage/components/FinalResult.tsx b/src/views/ResultPage/components/FinalResult.tsx index 72880508..0424de81 100644 --- a/src/views/ResultPage/components/FinalResult.tsx +++ b/src/views/ResultPage/components/FinalResult.tsx @@ -1,6 +1,6 @@ import { track } from '@amplitude/analytics-browser'; -import { format } from 'date-fns'; -import { ko } from 'date-fns/locale'; +import { format } from 'date-fns/format'; +import { ko } from 'date-fns/locale/ko'; import { useEffect } from 'react'; import Title from '@components/Title'; diff --git a/src/views/ResultPage/components/ScreeningResult.tsx b/src/views/ResultPage/components/ScreeningResult.tsx index 93b6e535..fdbeab74 100644 --- a/src/views/ResultPage/components/ScreeningResult.tsx +++ b/src/views/ResultPage/components/ScreeningResult.tsx @@ -1,6 +1,6 @@ import { track } from '@amplitude/analytics-browser'; -import { format } from 'date-fns'; -import { ko } from 'date-fns/locale'; +import { format } from 'date-fns/format'; +import { ko } from 'date-fns/locale/ko'; import { useEffect } from 'react'; import Title from '@components/Title'; diff --git a/src/views/ResultPage/index.tsx b/src/views/ResultPage/index.tsx index e36211ce..3d5db6db 100644 --- a/src/views/ResultPage/index.tsx +++ b/src/views/ResultPage/index.tsx @@ -1,14 +1,15 @@ -import { useEffect } from 'react'; +import { useEffect, lazy } from 'react'; import useDate from '@hooks/useDate'; import { useTheme } from 'contexts/ThemeProvider'; -import NoMore from 'views/ErrorPage/components/NoMore'; import BigLoading from 'views/loadings/BigLoding'; import useGetMyInfo from 'views/SignedInPage/hooks/useGetMyInfo'; import FinalResult from './components/FinalResult'; import ScreeningResult from './components/ScreeningResult'; +const NoMore = lazy(() => import('views/ErrorPage/components/NoMore')); + const ResultPage = () => { const { handleChangeMode } = useTheme(); const { myInfoData, myInfoIsLoading } = useGetMyInfo(); diff --git a/src/views/ReviewPage/index.tsx b/src/views/ReviewPage/index.tsx index 4a794713..87e4a406 100644 --- a/src/views/ReviewPage/index.tsx +++ b/src/views/ReviewPage/index.tsx @@ -1,4 +1,4 @@ -import { useCallback, useEffect, useRef, useState } from 'react'; +import { lazy, useCallback, useEffect, useRef, useState } from 'react'; import { FormProvider, useForm } from 'react-hook-form'; import useDate from '@hooks/useDate'; @@ -15,10 +15,13 @@ import PartSection from 'views/ApplyPage/components/PartSection'; import useGetDraft from 'views/ApplyPage/hooks/useGetDraft'; import useGetQuestions from 'views/ApplyPage/hooks/useGetQuestions'; import { container, formContainerVar } from 'views/ApplyPage/style.css'; -import { PreventReviewDialog } from 'views/dialogs'; -import NoMore from 'views/ErrorPage/components/NoMore'; import BigLoading from 'views/loadings/BigLoding'; +const PreventReviewDialog = lazy(() => + import('views/dialogs').then(({ PreventReviewDialog }) => ({ default: PreventReviewDialog })), +); +const NoMore = lazy(() => import('views/ErrorPage/components/NoMore')); + const ReviewPage = () => { const { deviceType } = useDeviceType(); const preventReviewDialog = useRef(null); diff --git a/src/views/SignInPage/index.tsx b/src/views/SignInPage/index.tsx index 95058526..dae11867 100644 --- a/src/views/SignInPage/index.tsx +++ b/src/views/SignInPage/index.tsx @@ -1,12 +1,15 @@ +import { lazy } from 'react'; + import useDate from '@hooks/useDate'; import { useDeviceType } from 'contexts/DeviceTypeProvider'; -import NoMore from 'views/ErrorPage/components/NoMore'; import BigLoading from 'views/loadings/BigLoding'; import SignInForm from './components/SignInForm'; import SignInInfo from './components/SignInInfo'; import { containerVar } from './style.css'; +const NoMore = lazy(() => import('views/ErrorPage/components/NoMore')); + const SignInPage = () => { const { deviceType } = useDeviceType(); const { isLoading, NoMoreRecruit, isMakers } = useDate(); diff --git a/src/views/SignupPage/components/SignupForm/index.tsx b/src/views/SignupPage/components/SignupForm/index.tsx index 8ee7d6b3..89d9d78e 100644 --- a/src/views/SignupPage/components/SignupForm/index.tsx +++ b/src/views/SignupPage/components/SignupForm/index.tsx @@ -1,5 +1,5 @@ import { track } from '@amplitude/analytics-browser'; -import { useEffect, useRef } from 'react'; +import { lazy, useEffect, useRef } from 'react'; import { type FieldValues, FormProvider, useForm } from 'react-hook-form'; import Button from '@components/Button'; @@ -11,11 +11,14 @@ import { PRIVACY_POLICY } from '@constants/policy'; import { VALIDATION_CHECK } from '@constants/validationCheck'; import useVerificationStatus from '@hooks/useVerificationStatus'; import { useRecruitingInfo } from 'contexts/RecruitingInfoProvider'; -import { ExistingApplicantDialog } from 'views/dialogs'; import useMutateSignUp from 'views/SignupPage/hooks/useMutateSignUp'; import { formWrapper } from './style.css'; +const ExistingApplicantDialog = lazy(() => + import('views/dialogs').then(({ ExistingApplicantDialog }) => ({ default: ExistingApplicantDialog })), +); + const SignupForm = () => { const { recruitingInfo: { season, group }, diff --git a/src/views/SignupPage/index.tsx b/src/views/SignupPage/index.tsx index 18c271de..b7098b2f 100644 --- a/src/views/SignupPage/index.tsx +++ b/src/views/SignupPage/index.tsx @@ -1,12 +1,15 @@ +import { lazy } from 'react'; + import Title from '@components/Title'; import useDate from '@hooks/useDate'; import { useDeviceType } from 'contexts/DeviceTypeProvider'; -import NoMore from 'views/ErrorPage/components/NoMore'; import BigLoading from 'views/loadings/BigLoding'; import SignupForm from './components/SignupForm'; import { containerVar } from './style.css'; +const NoMore = lazy(() => import('views/ErrorPage/components/NoMore')); + const SignupPage = () => { const { deviceType } = useDeviceType(); const { NoMoreRecruit, NoMoreApply, isLoading, isMakers } = useDate(); diff --git a/src/views/loadings/BigLoding/index.tsx b/src/views/loadings/BigLoding/index.tsx index 6071ea8d..0c3b29aa 100644 --- a/src/views/loadings/BigLoding/index.tsx +++ b/src/views/loadings/BigLoding/index.tsx @@ -1,6 +1,5 @@ -import Lottie from 'lottie-react'; - import { container, loadingText, wrapper } from './style.css'; +import Lottie from '../Lottie'; import mainLoading from '../lotties/mainLoading.json'; const BigLoading = () => { diff --git a/src/views/loadings/ButtonLoading/index.tsx b/src/views/loadings/ButtonLoading/index.tsx index 7fc88803..392c90b7 100644 --- a/src/views/loadings/ButtonLoading/index.tsx +++ b/src/views/loadings/ButtonLoading/index.tsx @@ -1,9 +1,8 @@ -import Lottie from 'lottie-react'; - +import Lottie from '../Lottie'; import buttonLoadingWhite from '../lotties/buttonLoadingWhite.json'; const ButtonLoading = ({ width, height = 28 }: { width: number | undefined; height?: number }) => { - return ; + return ; }; export default ButtonLoading; diff --git a/src/views/loadings/Lottie/index.tsx b/src/views/loadings/Lottie/index.tsx new file mode 100644 index 00000000..8ecac4d0 --- /dev/null +++ b/src/views/loadings/Lottie/index.tsx @@ -0,0 +1,45 @@ +import { type AnimationConfigWithData, type AnimationItem } from 'lottie-web'; +import lottie from 'lottie-web/build/player/lottie_light'; +import { type CSSProperties, useEffect, useRef } from 'react'; + +const Lottie = ({ animationData, style }: { animationData: unknown; style?: CSSProperties }) => { + const animationInstanceRef = useRef(); + const animationContainer = useRef(null); + + const loadAnimation = () => { + // Return if the container ref is null + if (!animationContainer.current) { + return; + } + + // Destroy any previous instance + animationInstanceRef.current?.destroy(); + + // Build the animation configuration + const config: AnimationConfigWithData = { + animationData, + container: animationContainer.current, + }; + + // Save the animation instance + animationInstanceRef.current = lottie.loadAnimation(config); + + // Return a function that will clean up + return () => { + animationInstanceRef.current?.destroy(); + animationInstanceRef.current = undefined; + }; + }; + + useEffect(() => { + const onUnmount = loadAnimation(); + + // Clean up on unmount + return () => onUnmount?.(); + // eslint-disable-next-line + }, [animationData]); + + return
; +}; + +export default Lottie; diff --git a/src/views/loadings/SmallLoading/index.tsx b/src/views/loadings/SmallLoading/index.tsx index dac25c9d..fbe97d0d 100644 --- a/src/views/loadings/SmallLoading/index.tsx +++ b/src/views/loadings/SmallLoading/index.tsx @@ -1,6 +1,5 @@ -import Lottie from 'lottie-react'; - import { container, loadingText, wrapper } from './style.css'; +import Lottie from '../Lottie'; import mainLoading from '../lotties/mainLoading.json'; const SmallLoading = () => { diff --git a/src/views/loadings/lotties/mainLoading.json b/src/views/loadings/lotties/mainLoading.json index f9ffa94d..227f10ae 100644 --- a/src/views/loadings/lotties/mainLoading.json +++ b/src/views/loadings/lotties/mainLoading.json @@ -1,5 +1,4 @@ { - "nm": "Comp 1", "ddd": 0, "h": 900, "w": 1200, @@ -9,12 +8,10 @@ "layers": [ { "ty": 0, - "nm": "Masked Group 1", "sr": 1, "st": 0, "op": 401, "ip": 0, - "hd": false, "ddd": 0, "bm": 0, "hasMask": false, @@ -25,44 +22,37 @@ "k": [ 10000, 10000 - ], - "ix": 2 + ] }, "s": { "a": 0, "k": [ 100, 100 - ], - "ix": 2 + ] }, "sk": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "p": { "a": 0, "k": [ - 610.4069061279297, - 415.1792602539062 - ], - "ix": 2 + 610.41, + 415.18 + ] }, "r": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "sa": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } }, "ef": [], @@ -78,17 +68,14 @@ "ip": 0, "assets": [ { - "nm": "", "id": "0", "layers": [ { "ty": 4, - "nm": "Shape Layer 1", "sr": 1, "st": 0, "op": 401, "ip": 0, - "hd": false, "ddd": 0, "bm": 0, "hasMask": false, @@ -99,44 +86,37 @@ "k": [ 0, 0 - ], - "ix": 2 + ] }, "s": { "a": 0, "k": [ 100, 100 - ], - "ix": 2 + ] }, "sk": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "p": { "a": 0, "k": [ 10000, 10000 - ], - "ix": 2 + ] }, "r": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "sa": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } }, "ef": [], @@ -144,26 +124,22 @@ { "ty": "gr", "bm": 0, - "hd": false, - "nm": "", "it": [ { "ty": "sh", "bm": 0, - "hd": false, - "nm": "", "d": 1, "ks": { "a": 1, "k": [ { "o": { - "x": 0.167, - "y": 0.167 + "x": 0.17, + "y": 0.17 }, "i": { - "x": 0.833, - "y": 0.833 + "x": 0.83, + "y": 0.83 }, "s": [ { @@ -182,23 +158,23 @@ 0 ], [ - 6.396759033203125, - 9.841171264648438 + 6.4, + 9.84 ], [ 0, 0 ], [ - -6.396760940551758, + -6.4, 0 ], [ - -4.635403409234519, + -4.64, 0 ], [ - -19.93594982572876, + -19.94, 0 ], [ @@ -284,19 +260,19 @@ 0 ], [ - -6.396759033203125, - -9.841171264648438 + -6.4, + -9.84 ], [ 0, 0 ], [ - 0.9466622313741766, + 0.95, 0 ], [ - 21.61248115926822, + 21.61, 0 ], [ @@ -374,104 +350,104 @@ ], "v": [ [ - -331.2053527832031, - 133.0563049316406 + -331.21, + 133.06 ], [ - -285.8681335449219, - 94.76681518554688 + -285.87, + 94.77 ], [ - -135.8598327636719, - 94.76681518554688 + -135.86, + 94.77 ], [ - -126.4090881347656, - 77.54476928710938 + -126.41, + 77.54 ], [ - -215.9637451171875, - -9.549652099609375 + -215.96, + -9.55 ], [ - -222.7738647460938, - -38.68634414672852 + -222.77, + -38.69 ], [ - -207.258119013612, - -28.36317598268284 + -207.26, + -28.36 ], [ - -111.2316601122227, - -28.36317598268284 + -111.23, + -28.36 ], [ - -102.5145492553711, - -28.73989868164062 + -102.51, + -28.74 ], [ - 12.35140991210938, - -25.29547119140625 + 12.35, + -25.3 ], [ - 12.35140991210938, - 94.76681518554688 + 12.35, + 94.77 ], [ - -76.2191162109375, - 94.76681518554688 + -76.22, + 94.77 ], [ - -76.2191162109375, - -0.20050048828125 + -76.22, + -0.2 ], [ - -76.2191162109375, - -133.0563049316406 + -76.22, + -133.06 ], [ - 49.25582885742188, - -28.73989868164062 + 49.26, + -28.74 ], [ - 155.5404357910156, - -28.73989868164062 + 155.54, + -28.74 ], [ - 155.5404357910156, - 39.1641845703125 + 155.54, + 39.16 ], [ - 68.44607543945312, - 39.1641845703125 + 68.45, + 39.16 ], [ - 68.44607543945312, - -0.20050048828125 + 68.45, + -0.2 ], [ - 68.44607543945312, - 125.7665100097656 + 68.45, + 125.77 ], [ - 181.1274719238281, - 125.7665100097656 + 181.13, + 125.77 ], [ - 181.1274719238281, - -25.29547119140625 + 181.13, + -25.3 ], [ - 331.2053527832031, - -25.29547119140625 + 331.21, + -25.3 ], [ - 247.5820617675781, - -23.93475341796875 + 247.58, + -23.93 ], [ - 247.6548156738281, - 129.4666442871094 + 247.65, + 129.47 ] ] } @@ -480,12 +456,12 @@ }, { "o": { - "x": 0.167, - "y": 0.167 + "x": 0.17, + "y": 0.17 }, "i": { - "x": 0.833, - "y": 0.833 + "x": 0.83, + "y": 0.83 }, "s": [ { @@ -504,23 +480,23 @@ 0 ], [ - 6.396759033203125, - 9.841171264648438 + 6.4, + 9.84 ], [ 0, 0 ], [ - -6.396760940551758, + -6.4, 0 ], [ - -4.635403409234519, + -4.64, 0 ], [ - -19.93594982572876, + -19.94, 0 ], [ @@ -606,19 +582,19 @@ 0 ], [ - -6.396759033203125, - -9.841171264648438 + -6.4, + -9.84 ], [ 0, 0 ], [ - 0.9466622313741766, + 0.95, 0 ], [ - 21.61248115926822, + 21.61, 0 ], [ @@ -696,104 +672,104 @@ ], "v": [ [ - -331.2053527832031, - 133.0563049316406 + -331.21, + 133.06 ], [ - -285.8681335449219, - 94.76681518554688 + -285.87, + 94.77 ], [ - -135.8598327636719, - 94.76681518554688 + -135.86, + 94.77 ], [ - -126.4090881347656, - 77.54476928710938 + -126.41, + 77.54 ], [ - -215.9637451171875, - -9.549652099609375 + -215.96, + -9.55 ], [ - -227.4279172459164, - -52.83690967943781 + -227.43, + -52.84 ], [ - -207.258119013612, - -28.36317598268284 + -207.26, + -28.36 ], [ - -111.2316601122227, - -28.36317598268284 + -111.23, + -28.36 ], [ - -102.5145492553711, - -28.73989868164062 + -102.51, + -28.74 ], [ - 12.35140991210938, - -25.29547119140625 + 12.35, + -25.3 ], [ - 12.35140991210938, - 94.76681518554688 + 12.35, + 94.77 ], [ - -76.2191162109375, - 94.76681518554688 + -76.22, + 94.77 ], [ - -76.2191162109375, - -0.20050048828125 + -76.22, + -0.2 ], [ - -76.2191162109375, - -133.0563049316406 + -76.22, + -133.06 ], [ - 49.25582885742188, - -28.73989868164062 + 49.26, + -28.74 ], [ - 155.5404357910156, - -28.73989868164062 + 155.54, + -28.74 ], [ - 155.5404357910156, - 39.1641845703125 + 155.54, + 39.16 ], [ - 91.9609375, - 39.1641845703125 + 91.96, + 39.16 ], [ - 68.44607543945312, - -0.20050048828125 + 68.45, + -0.2 ], [ - 68.44607543945312, - 125.7665100097656 + 68.45, + 125.77 ], [ - 181.1274719238281, - 125.7665100097656 + 181.13, + 125.77 ], [ - 181.1274434682485, - -29.59544540095974 + 181.13, + -29.6 ], [ - 331.2053243276235, - -29.59544540095974 + 331.21, + -29.6 ], [ - 247.5820617675781, - -23.93475341796875 + 247.58, + -23.93 ], [ - 247.6548156738281, - 129.4666442871094 + 247.65, + 129.47 ] ] } @@ -818,23 +794,23 @@ 0 ], [ - 6.396759033203125, - 9.841171264648438 + 6.4, + 9.84 ], [ 0, 0 ], [ - -6.396760940551758, + -6.4, 0 ], [ - -4.635403409234519, + -4.64, 0 ], [ - -19.93594982572876, + -19.94, 0 ], [ @@ -920,19 +896,19 @@ 0 ], [ - -6.396759033203125, - -9.841171264648438 + -6.4, + -9.84 ], [ 0, 0 ], [ - 0.9466622313741766, + 0.95, 0 ], [ - 21.61248115926822, + 21.61, 0 ], [ @@ -1010,131 +986,126 @@ ], "v": [ [ - -331.2053527832031, - 133.0563049316406 + -331.21, + 133.06 ], [ - -285.8681335449219, - 94.76681518554688 + -285.87, + 94.77 ], [ - -135.8598327636719, - 94.76681518554688 + -135.86, + 94.77 ], [ - -126.4090881347656, - 77.54476928710938 + -126.41, + 77.54 ], [ - -215.9637451171875, - -9.549652099609375 + -215.96, + -9.55 ], [ - -227.765167427063, - -53.8623129789095 + -227.77, + -53.86 ], [ - -207.258119013612, - -28.36317598268284 + -207.26, + -28.36 ], [ - -111.2316601122227, - -28.36317598268284 + -111.23, + -28.36 ], [ - -102.5145492553711, - -28.73989868164062 + -102.51, + -28.74 ], [ - 12.35140991210938, - -25.29547119140625 + 12.35, + -25.3 ], [ - 12.35140991210938, - 94.76681518554688 + 12.35, + 94.77 ], [ - -76.2191162109375, - 94.76681518554688 + -76.22, + 94.77 ], [ - -76.2191162109375, - -0.20050048828125 + -76.22, + -0.2 ], [ - -76.2191162109375, - -133.0563049316406 + -76.22, + -133.06 ], [ - 49.25582885742188, - -28.73989868164062 + 49.26, + -28.74 ], [ - 155.5404357910156, - -28.73989868164062 + 155.54, + -28.74 ], [ - 155.5404357910156, - 39.1641845703125 + 155.54, + 39.16 ], [ - 68.44607543945312, - 39.1641845703125 + 68.45, + 39.16 ], [ - 68.44607543945312, - -0.20050048828125 + 68.45, + -0.2 ], [ - 68.44607543945312, - 125.7665100097656 + 68.45, + 125.77 ], [ - 181.1274719238281, - 125.7665100097656 + 181.13, + 125.77 ], [ - 181.12744140625, - -29.90703773498535 + 181.13, + -29.91 ], [ - 331.205322265625, - -29.90703773498535 + 331.21, + -29.91 ], [ - 247.5820617675781, - -23.93475341796875 + 247.58, + -23.93 ], [ - 247.6548156738281, - 129.4666442871094 + 247.65, + 129.47 ] ] } ], "t": 296 } - ], - "ix": 2 + ] } }, { "ty": "st", "bm": 0, - "hd": false, - "nm": "", "lc": 1, "lj": 2, "ml": 4, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 }, "w": { "a": 0, - "k": 46, - "ix": 2 + "k": 46 }, "c": { "a": 0, @@ -1142,15 +1113,12 @@ 0.8118, 0.8118, 0.8118 - ], - "ix": 2 + ] } }, { "ty": "tm", "bm": 0, - "hd": false, - "nm": "", "e": { "a": 1, "k": [ @@ -1160,7 +1128,7 @@ "y": 0 }, "i": { - "x": 0.8275862068965517, + "x": 0.83, "y": 1 }, "s": [ @@ -1174,18 +1142,15 @@ ], "t": 400 } - ], - "ix": 2 + ] }, "o": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "s": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "m": 1 }, @@ -1196,44 +1161,37 @@ "k": [ 0, 0 - ], - "ix": 2 + ] }, "s": { "a": 0, "k": [ 100, 100 - ], - "ix": 2 + ] }, "sk": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "p": { "a": 0, "k": [ - -42.62127685546875, - 1.794830322265625 - ], - "ix": 2 + -42.62, + 1.79 + ] }, "r": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "sa": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } } ] @@ -1244,17 +1202,14 @@ ] }, { - "nm": "", "id": "1", "layers": [ { "ty": 0, - "nm": "SOPT.svg 1", "sr": 1, "st": 0, "op": 401, "ip": 0, - "hd": false, "ddd": 0, "bm": 0, "hasMask": false, @@ -1266,44 +1221,37 @@ "k": [ 10000, 10000 - ], - "ix": 2 + ] }, "s": { "a": 0, "k": [ 100, 100 - ], - "ix": 2 + ] }, "sk": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "p": { "a": 0, "k": [ 10000, 10000 - ], - "ix": 2 + ] }, "r": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "sa": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } }, "ef": [], @@ -1314,12 +1262,10 @@ }, { "ty": 0, - "nm": "Masked Group 1", "sr": 1, "st": 0, "op": 401, "ip": 0, - "hd": false, "ddd": 0, "bm": 0, "tt": 1, @@ -1331,44 +1277,37 @@ "k": [ 10000, 10000 - ], - "ix": 2 + ] }, "s": { "a": 0, "k": [ 100, 100 - ], - "ix": 2 + ] }, "sk": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "p": { "a": 0, "k": [ 10000, 10000 - ], - "ix": 2 + ] }, "r": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "sa": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } }, "ef": [], @@ -1380,17 +1319,14 @@ ] }, { - "nm": "", "id": "2", "layers": [ { "ty": 3, - "nm": "SOPT.svg 1", "sr": 1, "st": 0, "op": 401, "ip": 0, - "hd": false, "ddd": 0, "bm": 0, "hasMask": false, @@ -1399,46 +1335,39 @@ "a": { "a": 0, "k": [ - 43.49636083375663, - 12.02382261119783 - ], - "ix": 2 + 43.5, + 12.02 + ] }, "s": { "a": 0, "k": [ - 658.8152408599855, - 658.8152408599855 - ], - "ix": 2 + 658.82, + 658.82 + ] }, "sk": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "p": { "a": 0, "k": [ - 9997.82859826088, - 10034.80782699585 - ], - "ix": 2 + 9997.83, + 10034.81 + ] }, "r": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "sa": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } }, "ef": [], @@ -1446,12 +1375,10 @@ }, { "ty": 4, - "nm": "Path", "sr": 1, "st": 0, "op": 401, "ip": 0, - "hd": false, "ddd": 0, "bm": 0, "hasMask": false, @@ -1462,44 +1389,37 @@ "k": [ 0, 0 - ], - "ix": 2 + ] }, "s": { "a": 0, "k": [ 100, 100 - ], - "ix": 2 + ] }, "sk": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "p": { "a": 0, "k": [ 0, 0 - ], - "ix": 2 + ] }, "r": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "sa": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } }, "ef": [], @@ -1507,14 +1427,10 @@ { "ty": "gr", "bm": 0, - "hd": false, - "nm": "", "it": [ { "ty": "sh", "bm": 0, - "hd": false, - "nm": "", "d": 1, "ks": { "a": 0, @@ -1527,315 +1443,315 @@ ], [ 0, - 0.06650000000000134 + 0.07 ], [ - 0.01120000000000232, - 0.09779999999999944 + 0.01, + 0.1 ], [ - 0.003800000000001802, - 0.04690000000000083 + 0, + 0.05 ], [ 0, - 0.01170000000000115 + 0.01 ], [ - 0.007500000000000284, - 0.04689999999999728 + 0.01, + 0.05 ], [ - 0.003799999999998249, - 0.01170000000000115 + 0, + 0.01 ], [ - 0.007500000000000284, - 0.03910000000000124 + 0.01, + 0.04 ], [ - 0.003800000000001802, - 0.01170000000000115 + 0, + 0.01 ], [ - 0.007500000000000284, - 0.03920000000000101 + 0.01, + 0.04 ], [ - 0.003799999999998249, - 0.01569999999999894 + 0, + 0.02 ], [ - 0.01129999999999853, - 0.03910000000000124 + 0.01, + 0.04 ], [ 0, - 0.003900000000001569 + 0 ], [ - 0.003799999999998249, - 0.01959999999999695 + 0, + 0.02 ], [ - 0.01129999999999853, - 0.02740000000000009 + 0.01, + 0.03 ], [ - 0.007500000000000284, - 0.01569999999999894 + 0.01, + 0.02 ], [ - 0.01500000000000057, - 0.03910000000000124 + 0.02, + 0.04 ], [ - 0.003800000000001802, - 0.01570000000000249 + 0, + 0.02 ], [ - 0.01130000000000209, - 0.03129999999999811 + 0.01, + 0.03 ], [ - 0.003799999999998249, - 0.01570000000000249 + 0, + 0.02 ], [ - 0.01129999999999853, - 0.03519999999999968 + 0.01, + 0.04 ], [ - 0.007500000000000284, - 0.01569999999999894 + 0.01, + 0.02 ], [ - 0.01510000000000034, - 0.03910000000000124 + 0.02, + 0.04 ], [ - 0.007500000000000284, - 0.01559999999999917 + 0.01, + 0.02 ], [ - 0.01879999999999882, - 0.03129999999999811 + 0.02, + 0.03 ], [ - 0.007500000000000284, - 0.01180000000000092 + 0.01, + 0.01 ], [ - 0.02260000000000062, - 0.04300000000000281 + 0.02, + 0.04 ], [ - 0.003800000000001802, - 0.01170000000000115 + 0, + 0.01 ], [ - 0.01879999999999882, - 0.03130000000000166 + 0.02, + 0.03 ], [ - 0.003700000000002035, - 0.01170000000000115 + 0, + 0.01 ], [ - 0.0262999999999991, - 0.04299999999999926 + 0.03, + 0.04 ], [ - 0.003699999999998482, - 0.007799999999999585 + 0, + 0.01 ], [ - 0.0224999999999973, - 0.03129999999999811 + 0.02, + 0.03 ], [ - 0.007600000000000051, - 0.01179999999999737 + 0.01, + 0.01 ], [ - 0.0301000000000009, - 0.03910000000000124 + 0.03, + 0.04 ], [ - 0.03000000000000114, - 0.04309999999999903 + 0.03, + 0.04 ], [ - 0.01879999999999882, - 0.02349999999999852 + 0.02, + 0.02 ], [ - 0.0525999999999982, - 0.06649999999999778 + 0.05, + 0.07 ], [ - 0.04509999999999792, - 0.0586999999999982 + 0.05, + 0.06 ], [ - 0.04139999999999944, - 0.04690000000000083 + 0.04, + 0.05 ], [ - 0.04510000000000147, - 0.05080000000000062 + 0.05, + 0.05 ], [ - 0.06770000000000209, - 0.07429999999999914 + 0.07, + 0.07 ], [ - 0.04889999999999972, - 0.04699999999999882 + 0.05, + 0.05 ], [ - 0.09029999999999916, - 0.09779999999999944 + 0.09, + 0.1 ], [ - 0.04510000000000147, - 0.05079999999999885 + 0.05, + 0.05 ], [ - 0.09399999999999764, - 0.1015999999999995 + 0.09, + 0.1 ], [ - 0.1428000000000011, - 0.1563999999999997 + 0.14, + 0.16 ], [ - 0.7442000000000029, - 0.7744 + 0.74, + 0.77 ], [ - 0.218, - 0.222900000000001 + 0.22, + 0.22 ], [ - 0.08649999999999913, - 0.08990000000000009 + 0.09, + 0.09 ], [ - 0.04130000000000145, - 0.04689999999999905 + 0.04, + 0.05 ], [ - 0.08650000000000091, - 0.08610000000000007 + 0.09, + 0.09 ], [ - 0.4474, - 0.45756 + 0.45, + 0.46 ], [ - 0.0262999999999991, - 0.01956000000000024 + 0.03, + 0.02 ], [ - 0.08269999999999911, + 0.08, 0 ], [ - 2.735243333333334, + 2.74, 0 ], [ - -0.03758000000000017, - -0.03910999999999998 + -0.04, + -0.04 ], [ - -0.1917066666666667, - -0.2020600000000004 + -0.19, + -0.2 ], [ - -0.04761333333333306, - -0.04953666666666656 + -0.05, + -0.05 ], [ - -1.043723333333333, - -1.104163333333334 + -1.04, + -1.1 ], [ - -2.086203333333334, - -2.209633333333333 + -2.09, + -2.21 ], [ - 0.1240000000000006, - -0.04300000000000281 + 0.12, + -0.04 ], [ - 0.02249999999999908, + 0.02, 0 ], [ - 4.113516333333335, + 4.11, 0 ], [ - 0.0563835, - -0.07819999999999894 + 0.06, + -0.08 ], [ - 0.0112767, - -0.03519999999999968 + 0.01, + -0.04 ], [ - 0.003758900000000003, - -0.01170000000000115 + 0, + -0.01 ], [ 0, - -0.02349999999999852 + -0.02 ], [ 0, - -1.561700000000002 + -1.56 ], [ 0, - -0.1538333333333313 + -0.15 ], [ 0, - -0.007799999999999585 + -0.01 ], [ - -0.04134790000000001, - -0.04689999999999728 + -0.04, + -0.05 ], [ - -0.007517999999999997, - -0.007799999999999585 + -0.01, + -0.01 ], [ - -0.041348, - -0.01570000000000249 + -0.04, + -0.02 ], [ - -0.03759000000000001, + -0.04, 0 ], [ - -5.48424966666667, + -5.48, 0 ], [ - -0.8080999999999996, - 0.8876999999999988 + -0.81, + 0.89 ], [ - -0.007499999999996732, - 0.9346999999999994 + -0.01, + 0.93 ], [ 0, - 0.001300000000000523 + 0 ], [ 0, @@ -1849,315 +1765,315 @@ "o": [ [ 0, - -0.06649999999999778 + -0.07 ], [ 0, - -0.10170000000000101 + -0.1 ], [ - -0.003799999999998249, - -0.05079999999999885 + 0, + -0.05 ], [ 0, - -0.0116999999999976 + -0.01 ], [ - -0.007500000000000284, - -0.04690000000000083 + -0.01, + -0.05 ], [ 0, - -0.01170000000000115 + -0.01 ], [ - -0.007500000000000284, - -0.04299999999999926 + -0.01, + -0.04 ], [ 0, - -0.01179999999999737 + -0.01 ], [ - -0.007500000000000284, - -0.03910000000000124 + -0.01, + -0.04 ], [ 0, - -0.01559999999999917 + -0.02 ], [ - -0.007500000000000284, - -0.03910000000000124 + -0.01, + -0.04 ], [ 0, 0 ], [ - -0.003800000000001802, - -0.01959999999999695 + 0, + -0.02 ], [ - -0.007500000000000284, - -0.03130000000000166 + -0.01, + -0.03 ], [ - -0.003700000000002035, - -0.01960000000000051 + 0, + -0.02 ], [ - -0.01499999999999702, - -0.04299999999999926 + -0.01, + -0.04 ], [ - -0.003799999999998249, - -0.01569999999999894 + 0, + -0.02 ], [ - -0.01119999999999877, - -0.03119999999999834 + -0.01, + -0.03 ], [ - -0.007500000000000284, - -0.01960000000000051 + -0.01, + -0.02 ], [ - -0.01500000000000057, - -0.03519999999999968 + -0.02, + -0.04 ], [ - -0.007500000000000284, - -0.01569999999999894 + -0.01, + -0.02 ], [ - -0.01509999999999678, - -0.03910000000000124 + -0.02, + -0.04 ], [ - -0.007500000000000284, - -0.01559999999999917 + -0.01, + -0.02 ], [ - -0.01510000000000034, - -0.03130000000000166 + -0.02, + -0.03 ], [ - -0.007500000000000284, - -0.01170000000000115 + -0.01, + -0.01 ], [ - -0.02260000000000062, - -0.04299999999999926 + -0.02, + -0.04 ], [ - -0.007500000000000284, - -0.01179999999999737 + -0.01, + -0.01 ], [ - -0.01869999999999905, - -0.03129999999999811 + -0.02, + -0.03 ], [ - -0.007600000000000051, - -0.01170000000000115 + -0.01, + -0.01 ], [ - -0.0262999999999991, - -0.04299999999999926 + -0.03, + -0.04 ], [ - -0.003800000000001802, - -0.007899999999999352 + 0, + -0.01 ], [ - -0.02260000000000062, - -0.03520000000000323 + -0.02, + -0.04 ], [ - -0.007500000000000284, - -0.01170000000000115 + -0.01, + -0.01 ], [ - -0.0262999999999991, - -0.03910000000000124 + -0.03, + -0.04 ], [ - -0.0301000000000009, - -0.03909999999999769 + -0.03, + -0.04 ], [ - -0.01879999999999882, - -0.02730000000000032 + -0.02, + -0.03 ], [ - -0.05260000000000176, - -0.07039999999999935 + -0.05, + -0.07 ], [ - -0.04520000000000124, - -0.05870000000000175 + -0.05, + -0.06 ], [ - -0.04139999999999944, - -0.0508000000000024 + -0.04, + -0.05 ], [ - -0.04509999999999792, - -0.05479999999999841 + -0.05, + -0.05 ], [ - -0.06769999999999854, - -0.07429999999999914 + -0.07, + -0.07 ], [ - -0.04509999999999792, - -0.05080000000000062 + -0.05, + -0.05 ], [ - -0.09019999999999939, - -0.09770000000000145 + -0.09, + -0.1 ], [ - -0.04879999999999995, - -0.05080000000000062 + -0.05, + -0.05 ], [ - -0.09399999999999764, - -0.10170000000000101 + -0.09, + -0.1 ], [ - -0.1428000000000011, - -0.1526000000000014 + -0.14, + -0.15 ], [ - -0.4510999999999967, - -0.492799999999999 + -0.45, + -0.49 ], [ - -0.2068000000000012, - -0.2150999999999996 + -0.21, + -0.22 ], [ - -0.08649999999999913, - -0.08990000000000009 + -0.09, + -0.09 ], [ - -0.0450999999999997, - -0.04699999999999882 + -0.05, + -0.05 ], [ - -0.08649999999999913, - -0.08999999999999986 + -0.09, + -0.09 ], [ - -1.5711999999999993, - -1.61904 + -1.57, + -1.62 ], [ - -0.02249999999999908, - -0.02347000000000055 + -0.02, + -0.02 ], [ - -0.06770000000000032, - -0.04301999999999939 + -0.07, + -0.04 ], [ - -2.735243333333333, + -2.74, 0 ], [ - -0.05637999999999987, + -0.06, 0 ], [ - 0.1917066666666667, - 0.2020600000000004 + 0.19, + 0.2 ], [ - 0.04761333333333306, - 0.04953666666666656 + 0.05, + 0.05 ], [ - 1.043723333333334, - 1.104163333333333 + 1.04, + 1.1 ], [ - 2.086203333333332, - 2.209633333333333 + 2.09, + 2.21 ], [ - 0.1014999999999997, - 0.1054999999999993 + 0.1, + 0.11 ], [ - -0.01879999999999882, - 0.007899999999999352 + -0.02, + 0.01 ], [ - -4.113516333333333, + -4.11, 0 ], [ - -0.10525, + -0.11, 0 ], [ - -0.018794499999999992, - 0.02740000000000009 + -0.02, + 0.03 ], [ 0, - 0.01170000000000115 + 0.01 ], [ - -0.003758999999999998, - 0.01949999999999719 + 0, + 0.02 ], [ 0, - 1.561700000000002 + 1.56 ], [ 0, - 0.1538333333333313 + 0.15 ], [ 0, 0 ], [ - 0.007517900000000001, - 0.07039999999999935 + 0.01, + 0.07 ], [ - 0.007517999999999997, - 0.007800000000003138 + 0.01, + 0.01 ], [ - 0.030070999999999987, - 0.03129999999999811 + 0.03, + 0.03 ], [ - 0.030071000000000014, - 0.0116999999999976 + 0.03, + 0.01 ], [ - 5.484249666666665, + 5.48, 0 ], [ - 1.172800000000002, + 1.17, 0 ], [ - 0.9322000000000017, - -1.0208000000000013 + 0.93, + -1.02 ], [ 0, - -0.001300000000000523 + 0 ], [ 0, @@ -2174,328 +2090,328 @@ ], "v": [ [ - 21.1062391, - 12.51468 + 21.11, + 12.51 ], [ - 21.1062391, - 12.31128 + 21.11, + 12.31 ], [ - 21.0875391, - 12.01408 + 21.09, + 12.01 ], [ - 21.0724391, - 11.86548 + 21.07, + 11.87 ], [ - 21.0724391, - 11.83418 + 21.07, + 11.83 ], [ - 21.0536391, - 11.69338 + 21.05, + 11.69 ], [ - 21.0461391, - 11.65818 + 21.05, + 11.66 ], [ - 21.0236391, - 11.53308 + 21.02, + 11.53 ], [ - 21.0160391, - 11.50178 + 21.02, + 11.5 ], [ - 20.9897391, - 11.38048 + 20.99, + 11.38 ], [ - 20.9784391, - 11.33358 + 20.98, + 11.33 ], [ - 20.9484391, - 11.22018 + 20.95, + 11.22 ], [ - 20.9484391, - 11.20848 + 20.95, + 11.21 ], [ - 20.9333391, - 11.15368 + 20.93, + 11.15 ], [ - 20.9070391, - 11.06768 + 20.91, + 11.07 ], [ - 20.8882391, - 11.01288 + 20.89, + 11.01 ], [ - 20.8469391, - 10.88778 + 20.85, + 10.89 ], [ - 20.8318391, - 10.84078 + 20.83, + 10.84 ], [ - 20.7980391, - 10.74698 + 20.8, + 10.75 ], [ - 20.7792391, - 10.69608 + 20.78, + 10.7 ], [ - 20.7379391, - 10.59058 + 20.74, + 10.59 ], [ - 20.7191391, - 10.54748 + 20.72, + 10.55 ], [ - 20.6702391, - 10.43408 + 20.67, + 10.43 ], [ - 20.6477391, - 10.38718 + 20.65, + 10.39 ], [ - 20.5988391, - 10.28938 + 20.6, + 10.29 ], [ - 20.5800391, - 10.25418 + 20.58, + 10.25 ], [ - 20.5123391, - 10.12908 + 20.51, + 10.13 ], [ - 20.4935391, - 10.09388 + 20.49, + 10.09 ], [ - 20.4372391, - 9.99608 + 20.44, + 10 ], [ - 20.4184391, - 9.96088 + 20.42, + 9.96 ], [ - 20.3432391, - 9.83578 + 20.34, + 9.84 ], [ - 20.3282391, - 9.812280000000001 + 20.33, + 9.81 ], [ - 20.2605391, - 9.71058 + 20.26, + 9.71 ], [ - 20.2379391, - 9.67538 + 20.24, + 9.68 ], [ - 20.1515391, - 9.554179999999999 + 20.15, + 9.55 ], [ - 20.0613391, - 9.43288 + 20.06, + 9.43 ], [ - 20.0049391, - 9.35858 + 20, + 9.36 ], [ - 19.8433391, - 9.155280000000001 + 19.84, + 9.16 ], [ - 19.7042391, - 8.98318 + 19.7, + 8.98 ], [ - 19.5801391, - 8.838479999999999 + 19.58, + 8.84 ], [ - 19.4411391, - 8.67818 + 19.44, + 8.68 ], [ - 19.2418391, - 8.45518 + 19.24, + 8.46 ], [ - 19.1027391, - 8.30658 + 19.1, + 8.31 ], [ - 18.8283391, - 8.01328 + 18.83, + 8.01 ], [ - 18.6855391, - 7.86078 + 18.69, + 7.86 ], [ - 18.4036391, - 7.55968 + 18.4, + 7.56 ], [ - 17.9751391, - 7.098179999999999 + 17.98, + 7.1 ], [ - 16.1107391, - 5.127079999999999 + 16.11, + 5.13 ], [ - 15.4754391, - 4.470079999999999 + 15.48, + 4.47 ], [ - 15.2160391, - 4.204179999999999 + 15.22, + 4.2 ], [ - 15.0845391, - 4.06728 + 15.08, + 4.07 ], [ - 14.8251391, - 3.80128 + 14.83, + 3.8 ], [ - 11.2353391, - 0.12906 + 11.24, + 0.13 ], [ - 11.1602391, - 0.06647999999999943 + 11.16, + 0.07 ], [ - 10.9309391, + 10.93, 0 ], [ - 2.7252091, + 2.73, 0 ], [ - 2.6800991, - 0.1094999999999997 + 2.68, + 0.11 ], [ - 3.2552191, - 0.7156799999999999 + 3.26, + 0.72 ], [ - 3.3980591, - 0.8642899999999996 + 3.4, + 0.86 ], [ - 6.5292291, - 4.176779999999999 + 6.53, + 4.18 ], [ - 12.7878391, - 10.80568 + 12.79, + 10.81 ], [ - 12.7164391, - 11.12628 + 12.72, + 11.13 ], [ - 12.6525391, - 11.13808 + 12.65, + 11.14 ], [ - 0.3119901, - 11.13808 + 0.31, + 11.14 ], [ - 0.0601426, - 11.27098 + 0.06, + 11.27 ], [ - 0.0150357, - 11.36488 + 0.02, + 11.36 ], [ - 0.007517900000000001, - 11.39618 + 0.01, + 11.4 ], [ 0, - 11.46268 + 11.46 ], [ 0, - 16.14778 + 16.15 ], [ 0, - 16.60928 + 16.61 ], [ 0, - 16.64058 + 16.64 ], [ - 0.07893710000000001, - 16.82438 + 0.08, + 16.82 ], [ - 0.1014911, - 16.84788 + 0.1, + 16.85 ], [ - 0.2104991, - 16.91438 + 0.21, + 16.91 ], [ - 0.3119901, - 16.92998 + 0.31, + 16.93 ], [ - 16.7647391, - 16.92998 + 16.76, + 16.93 ], [ - 19.8921391, - 15.57688 + 19.89, + 15.58 ], [ - 21.1062391, - 12.51858 + 21.11, + 12.52 ], [ - 21.1062391, - 12.51468 + 21.11, + 12.51 ], [ - 21.1062391, - 12.51468 + 21.11, + 12.51 ], [ - 21.1062391, - 12.51468 + 21.11, + 12.51 ] ] } @@ -2504,43 +2420,34 @@ { "ty": "fl", "bm": 0, - "hd": false, - "nm": "", "c": { "a": 0, "k": [ 0.1529, 0.1529, 0.1529 - ], - "ix": 2 + ] }, "r": 1, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } }, { "ty": "tm", "bm": 0, - "hd": false, - "nm": "", "e": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 }, "o": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "s": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "m": 1 }, @@ -2549,46 +2456,39 @@ "a": { "a": 0, "k": [ - 10.55311955, - 8.46499 - ], - "ix": 2 + 10.55, + 8.46 + ] }, "s": { "a": 0, "k": [ 100, 100 - ], - "ix": 2 + ] }, "sk": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "p": { "a": 0, "k": [ - 10.57558059692383, - 15.53920745849609 - ], - "ix": 2 + 10.58, + 15.54 + ] }, "r": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "sa": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } } ] @@ -2599,12 +2499,10 @@ }, { "ty": 4, - "nm": "Path", "sr": 1, "st": 0, "op": 401, "ip": 0, - "hd": false, "ddd": 0, "bm": 0, "hasMask": false, @@ -2615,44 +2513,37 @@ "k": [ 0, 0 - ], - "ix": 2 + ] }, "s": { "a": 0, "k": [ 100, 100 - ], - "ix": 2 + ] }, "sk": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "p": { "a": 0, "k": [ 0, 0 - ], - "ix": 2 + ] }, "r": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "sa": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } }, "ef": [], @@ -2660,14 +2551,10 @@ { "ty": "gr", "bm": 0, - "hd": false, - "nm": "", "it": [ { "ty": "sh", "bm": 0, - "hd": false, - "nm": "", "d": 1, "ks": { "a": 0, @@ -2679,91 +2566,91 @@ 0 ], [ - 3.925566666666668, + 3.93, 0 ], [ - 0.03379999999999939, - -0.011732499999999993 + 0.03, + -0.01 ], [ - 0.01129999999999143, - -0.007821599999999998 + 0.01, + -0.01 ], [ 0, - -0.121236 + -0.12 ], [ 0, - -1.7377140000000009 + -1.74 ], [ - -0.1728999999999985, + -0.17, 0 ], [ - -1.829333333333338, + -1.83, 0 ], [ - -0.02259999999999707, - -0.007819999999999716 + -0.02, + -0.01 ], [ - -0.01879999999999882, - -0.05866999999999933 + -0.02, + -0.06 ], [ 0, - -0.01564000000000032 + -0.02 ], [ 0, - -0.007820000000000604 + -0.01 ], [ 0, - -5.583349999999999 + -5.58 ], [ 0, - -0.21640000000000015 + -0.22 ], [ 0, - -0.05996666666666783 + -0.06 ], [ - -0.00750000000000739, - -0.02340000000000231 + -0.01, + -0.02 ], [ - -0.00750000000000739, - -0.01960000000000051 + -0.01, + -0.02 ], [ - -0.07150000000000034, - -0.03519999999999968 + -0.07, + -0.04 ], [ - -0.04879999999999995, + -0.05, 0 ], [ - -1.825599999999994, + -1.83, 0 ], [ 0, - 0.17989999999999995 + 0.18 ], [ 0, - 7.880343733333334 + 7.88 ], [ - 0.001233333333331643, + 0, 0 ], [ @@ -2777,91 +2664,91 @@ ], "o": [ [ - -3.925566666666668, + -3.93, 0 ], [ - -0.03759999999999764, + -0.04, 0 ], [ - -0.01510000000000389, - 0.003910800000000006 + -0.02, + 0 ], [ - -0.09770000000000323, - 0.0547518 + -0.1, + 0.05 ], [ 0, - 1.737714 + 1.74 ], [ 0, - 0.17989999999999995 + 0.18 ], [ - 1.829333333333338, + 1.83, 0 ], [ - 0.02260000000001128, + 0.02, 0 ], [ - 0.0525999999999982, - 0.01954999999999973 + 0.05, + 0.02 ], [ 0, - 0.01173000000000002 + 0.01 ], [ 0, - 0.007830000000000226 + 0.01 ], [ 0, - 5.583349999999999 + 5.58 ], [ 0, - 0.21640000000000015 + 0.22 ], [ 0, - 0.05996666666666783 + 0.06 ], [ 0, - 0.02349999999999852 + 0.02 ], [ - 0.007499999999993179, - 0.02349999999999852 + 0.01, + 0.02 ], [ - 0.03009999999999025, - 0.07430000000000092 + 0.03, + 0.07 ], [ - 0.04129999999999256, - 0.01950000000000074 + 0.04, + 0.02 ], [ - 1.825599999999994, + 1.83, 0 ], [ - 0.1728999999999985, + 0.17, 0 ], [ 0, - -7.880343733333333 + -7.88 ], [ - -0.001233333333331643, + 0, 0 ], [ @@ -2879,103 +2766,103 @@ ], "v": [ [ - 12.0887, + 12.09, 0 ], [ - 0.3119999999999976, + 0.31, 0 ], [ - 0.2068000000000012, - 0.019554199999999994 + 0.21, + 0.02 ], [ - 0.1654000000000053, - 0.0391084 + 0.17, + 0.04 ], [ 0, - 0.3245992 + 0.32 ], [ 0, - 5.5377412 + 5.54 ], [ - 0.3119999999999976, - 5.8623412 + 0.31, + 5.86 ], [ - 5.799999999999997, - 5.8623412 + 5.8, + 5.86 ], [ - 5.867699999999999, - 5.8740712 + 5.87, + 5.87 ], [ - 5.980500000000006, - 5.9992212 + 5.98, + 6 ], [ - 5.988, - 6.0383212 + 5.99, + 6.04 ], [ - 5.988, - 6.057881200000001 + 5.99, + 6.06 ], [ - 5.988, - 22.8079312 + 5.99, + 22.81 ], [ - 5.988, - 23.4571312 + 5.99, + 23.46 ], [ - 5.988, - 23.6370312 + 5.99, + 23.64 ], [ - 5.995500000000007, - 23.7035312 + 6, + 23.7 ], [ - 6.014300000000006, - 23.7661312 + 6.01, + 23.77 ], [ - 6.172200000000004, - 23.9343312 + 6.17, + 23.93 ], [ - 6.303700000000006, - 23.9656312 + 6.3, + 23.97 ], [ - 11.7805, - 23.9656312 + 11.78, + 23.97 ], [ - 12.0924, - 23.6410312 + 12.09, + 23.64 ], [ - 12.0924, + 12.09, 0 ], [ - 12.0887, + 12.09, 0 ], [ - 12.0887, + 12.09, 0 ], [ - 12.0887, + 12.09, 0 ] ] @@ -2985,43 +2872,34 @@ { "ty": "fl", "bm": 0, - "hd": false, - "nm": "", "c": { "a": 0, "k": [ 0.1529, 0.1529, 0.1529 - ], - "ix": 2 + ] }, "r": 1, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } }, { "ty": "tm", "bm": 0, - "hd": false, - "nm": "", "e": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 }, "o": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "s": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "m": 1 }, @@ -3030,46 +2908,39 @@ "a": { "a": 0, "k": [ - 6.046199999999999, - 11.9828156 - ], - "ix": 2 + 6.05, + 11.98 + ] }, "s": { "a": 0, "k": [ 100, 100 - ], - "ix": 2 + ] }, "sk": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "p": { "a": 0, "k": [ - 71.46609497070312, - 12.02578449249268 - ], - "ix": 2 + 71.47, + 12.03 + ] }, "r": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "sa": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } } ] @@ -3080,12 +2951,10 @@ }, { "ty": 4, - "nm": "Path", "sr": 1, "st": 0, "op": 401, "ip": 0, - "hd": false, "ddd": 0, "bm": 0, "hasMask": false, @@ -3096,44 +2965,37 @@ "k": [ 0, 0 - ], - "ix": 2 + ] }, "s": { "a": 0, "k": [ 100, 100 - ], - "ix": 2 + ] }, "sk": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "p": { "a": 0, "k": [ 0, 0 - ], - "ix": 2 + ] }, "r": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "sa": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } }, "ef": [], @@ -3141,14 +3003,10 @@ { "ty": "gr", "bm": 0, - "hd": false, - "nm": "", "it": [ { "ty": "sh", "bm": 0, - "hd": false, - "nm": "", "d": 1, "ks": { "a": 0, @@ -3160,228 +3018,228 @@ 0 ], [ - 0.6540999999999997, - 0.492767 + 0.65, + 0.49 ], [ - 0.01879999999999882, - 0.01564300000000007 + 0.02, + 0.02 ], [ - 0.0262999999999991, - 0.01955400000000007 + 0.03, + 0.02 ], [ - 0.007499999999993179, - 0.003910999999999998 + 0.01, + 0 ], [ - 0.06390000000000384, - 0.03519800000000001 + 0.06, + 0.04 ], [ - 0.5714000000000041, + 0.57, 0 ], [ - 4.377866666666666, + 4.38, 0 ], [ - 0.5300000000000011, - -0.42237 + 0.53, + -0.42 ], [ - 0.02260000000000062, - -0.01955399999999996 + 0.02, + -0.02 ], [ - 0.03379999999999939, - -0.03128699999999995 + 0.03, + -0.03 ], [ - 0.0301000000000009, - -0.03128700000000006 + 0.03, + -0.03 ], [ - 0.06020000000000181, - -0.72742 + 0.06, + -0.73 ], [ 0, - -0.01563999999999988 + -0.02 ], [ 0, - -1.015513333333333 + -1.02 ], [ - -4.506933333333336, + -4.51, 0 ], [ - -0.02249999999999375, - -0.01173000000000002 + -0.02, + -0.01 ], [ - -0.003799999999998249, - -0.003909999999999414 + 0, + 0 ], [ - -0.007500000000000284, - -0.003909999999999414 + -0.01, + 0 ], [ 0, - -0.06648000000000032 + -0.07 ], [ 0, - -3.96949 + -3.97 ], [ - 0.03379999999999939, - -0.03519999999999968 + 0.03, + -0.04 ], [ - 0.05260000000000531, + 0.05, 0 ], [ - 2.602433333333334, + 2.6, 0 ], [ - 0.0262999999999991, - 0.01560000000000272 + 0.03, + 0.02 ], [ - 0.003800000000001802, + 0, 0 ], [ - 0.01129999999999853, - 0.0116999999999976 + 0.01, + 0.01 ], [ - 0.01130000000000209, - 0.02740000000000009 + 0.01, + 0.03 ], [ 0, - 0.02350000000000207 + 0.02 ], [ 0, - 3.5406 + 3.54 ], [ - 0.01879999999999882, - 0.04302000000000028 + 0.02, + 0.04 ], [ - 0.0262999999999991, - 0.02737000000000034 + 0.03, + 0.03 ], [ - 0.007500000000000284, - 0.003910000000000302 + 0.01, + 0 ], [ - 0.07519999999999882, + 0.08, 0 ], [ - 1.744133333333334, + 1.74, 0 ], [ 0, - -4.5444 + -4.54 ], [ - -0.04129999999999967, - -0.2189999999999976 + -0.04, + -0.22 ], [ - -0.003800000000001802, - -0.0116999999999976 + 0, + -0.01 ], [ - -0.007500000000000284, - -0.03909999999999769 + -0.01, + -0.04 ], [ - -0.003699999999998482, - -0.01570000000000249 + 0, + -0.02 ], [ - -0.01129999999999853, - -0.03519999999999968 + -0.01, + -0.04 ], [ - -0.003800000000001802, - -0.01949999999999719 + 0, + -0.02 ], [ - -0.02260000000000062, - -0.05860000000000198 + -0.02, + -0.06 ], [ - -0.04510000000000147, - -0.09380000000000166 + -0.05, + -0.09 ], [ - -0.01130000000000209, - -0.01950000000000074 + -0.01, + -0.02 ], [ - -0.01500000000000057, - -0.02340000000000231 + -0.02, + -0.02 ], [ - -0.01119999999999877, - -0.01960000000000051 + -0.01, + -0.02 ], [ - -0.07150000000000034, - -0.09390000000000143 + -0.07, + -0.09 ], [ - -0.0224999999999973, - -0.03120000000000189 + -0.02, + -0.03 ], [ - -0.9923000000000002, - 0.0116999999999976 + -0.99, + 0.01 ], [ - -4.277633333333334, + -4.28, 0 ], [ - 0.01879999999999882, - 1.892799999999998 + 0.02, + 1.89 ], [ 0, - 3.359400000000001 + 3.36 ], [ 0, - 1.877216666666667 + 1.88 ], [ 0, - 0.7078600000000002 + 0.71 ], [ 0, - 0.01955000000000018 + 0.02 ], [ - -0.003766666666663809, - -0.001303333333333434 + 0, + 0 ], [ 0, @@ -3394,99 +3252,99 @@ ], "o": [ [ - -0.07519999999999527, - -0.8994900000000001 + -0.08, + -0.9 ], [ - -0.01500000000000057, - -0.011732999999999993 + -0.02, + -0.01 ], [ - -0.0262999999999991, - -0.01955399999999996 + -0.03, + -0.02 ], [ - -0.007500000000000284, - -0.003910999999999998 + -0.01, + 0 ], [ - -0.06020000000000181, - -0.03910799999999992 + -0.06, + -0.04 ], [ - -0.4547999999999988, - -0.258115 + -0.45, + -0.26 ], [ - -4.377866666666662, + -4.38, 0 ], [ - -0.7479999999999976, + -0.75, 0 ], [ - -0.0262999999999991, - 0.01955399999999996 + -0.03, + 0.02 ], [ - -0.03759999999999764, - 0.03128699999999995 + -0.04, + 0.03 ], [ - -0.0301000000000009, - 0.03128700000000006 + -0.03, + 0.03 ], [ - -0.46229999999999905, - 0.4771239999999999 + -0.46, + 0.48 ], [ 0, - 0.01955000000000018 + 0.02 ], [ 0, - 1.015513333333333 + 1.02 ], [ - 4.506933333333333, + 4.51, 0 ], [ - 0.0262999999999991, + 0.03, 0 ], [ - 0.003800000000005355, + 0, 0 ], [ - 0.007500000000000284, - 0.003910000000000302 + 0.01, + 0 ], [ - 0.04509999999999792, - 0.03520000000000056 + 0.05, + 0.04 ], [ 0, - 3.96949 + 3.97 ], [ 0, - 0.05480000000000018 + 0.05 ], [ - -0.03379999999999939, - 0.03519999999999968 + -0.03, + 0.04 ], [ - -2.60243333333333, + -2.6, 0 ], [ - -0.03379999999999939, + -0.03, 0 ], [ @@ -3494,128 +3352,128 @@ 0 ], [ - -0.01499999999999702, - -0.007799999999999585 + -0.01, + -0.01 ], [ - -0.01880000000000237, - -0.01950000000000074 + -0.02, + -0.02 ], [ - -0.007500000000000284, - -0.01960000000000051 + -0.01, + -0.02 ], [ 0, - -3.5406 + -3.54 ], [ 0, - -0.04692999999999969 + -0.05 ], [ - -0.01510000000000034, - -0.03519000000000005 + -0.02, + -0.04 ], [ - -0.007500000000000284, - -0.007830000000000226 + -0.01, + -0.01 ], [ - -0.0525999999999982, - -0.04692999999999969 + -0.05, + -0.05 ], [ - -1.744133333333334, + -1.74, 0 ], [ 0, - 4.5444 + 4.54 ], [ 0, - 0.2306999999999988 + 0.23 ], [ 0, - 0.01180000000000092 + 0.01 ], [ - 0.007500000000000284, - 0.04299999999999926 + 0.01, + 0.04 ], [ 0, - 0.01560000000000272 + 0.02 ], [ - 0.01130000000000209, - 0.03909999999999769 + 0.01, + 0.04 ], [ - 0.003799999999998249, - 0.01559999999999917 + 0, + 0.02 ], [ - 0.01869999999999905, - 0.05870000000000175 + 0.02, + 0.06 ], [ - 0.03760000000000119, - 0.09779999999999944 + 0.04, + 0.1 ], [ - 0.01129999999999853, - 0.02349999999999852 + 0.01, + 0.02 ], [ - 0.01500000000000057, - 0.02740000000000009 + 0.02, + 0.03 ], [ - 0.01129999999999853, - 0.01959999999999695 + 0.01, + 0.02 ], [ - 0.06020000000000181, - 0.10170000000000101 + 0.06, + 0.1 ], [ - 0.02250000000000085, - 0.03129999999999811 + 0.02, + 0.03 ], [ - 0.6014000000000017, - 0.7626999999999988 + 0.6, + 0.76 ], [ - 4.277633333333331, + 4.28, 0 ], [ - 1.7254, - 0.02349999999999852 + 1.73, + 0.02 ], [ 0, - -3.359400000000001 + -3.36 ], [ 0, - -1.877216666666666 + -1.88 ], [ 0, - -0.7078600000000002 + -0.71 ], [ 0, 0 ], [ - 0.003766666666663809, - 0.001303333333333434 + 0, + 0 ], [ 0, @@ -3632,240 +3490,240 @@ ], "v": [ [ - 19.2795, - 2.76887 + 19.28, + 2.77 ], [ - 18.1104, - 0.621823 + 18.11, + 0.62 ], [ - 18.0578, - 0.582714 + 18.06, + 0.58 ], [ - 17.9789, - 0.527963 + 17.98, + 0.53 ], [ - 17.9601, - 0.51623 + 17.96, + 0.52 ], [ - 17.7759, - 0.402816 + 17.78, + 0.4 ], [ - 16.2159, + 16.22, 0 ], [ - 3.0823, + 3.08, 0 ], [ - 1.123899999999999, - 0.672663 + 1.12, + 0.67 ], [ - 1.0487, - 0.735236 + 1.05, + 0.74 ], [ - 0.9435000000000002, - 0.829097 + 0.94, + 0.83 ], [ - 0.849499999999999, - 0.919046 + 0.85, + 0.92 ], [ - 0.0262999999999991, - 2.76105 + 0.03, + 2.76 ], [ - 0.0262999999999991, - 2.8158 + 0.03, + 2.82 ], [ - 0.0262999999999991, - 5.86234 + 0.03, + 5.86 ], [ - 13.5471, - 5.86234 + 13.55, + 5.86 ], [ - 13.6185, - 5.87798 + 13.62, + 5.88 ], [ - 13.6336, - 5.8858 + 13.63, + 5.89 ], [ - 13.6561, - 5.90145 + 13.66, + 5.9 ], [ - 13.7313, - 6.05788 + 13.73, + 6.06 ], [ - 13.7313, - 17.96635 + 13.73, + 17.97 ], [ - 13.6749, - 18.10325 + 13.67, + 18.1 ], [ - 13.5434, - 18.16195 + 13.54, + 18.16 ], [ - 5.7361, - 18.16195 + 5.74, + 18.16 ], [ - 5.645900000000001, - 18.13845 + 5.65, + 18.14 ], [ - 5.642099999999999, - 18.13845 + 5.64, + 18.14 ], [ - 5.604500000000002, - 18.10715 + 5.6, + 18.11 ], [ - 5.5594, - 18.03285 + 5.56, + 18.03 ], [ - 5.548200000000001, - 17.96635 + 5.55, + 17.97 ], [ - 5.548200000000001, - 7.34455 + 5.55, + 7.34 ], [ - 5.5181, - 7.20766 + 5.52, + 7.21 ], [ - 5.4542, - 7.11381 + 5.45, + 7.11 ], [ - 5.4316, - 7.09425 + 5.43, + 7.09 ], [ - 5.232400000000002, - 7.01995 + 5.23, + 7.02 ], [ 0, - 7.01995 + 7.02 ], [ 0, - 20.65315 + 20.65 ], [ - 0.06010000000000204, - 21.32575 + 0.06, + 21.33 ], [ - 0.06770000000000209, - 21.36095 + 0.07, + 21.36 ], [ - 0.0940000000000012, - 21.48615 + 0.09, + 21.49 ], [ - 0.1052, - 21.52915 + 0.11, + 21.53 ], [ - 0.1353000000000009, - 21.64255 + 0.14, + 21.64 ], [ - 0.1504000000000012, - 21.69335 + 0.15, + 21.69 ], [ - 0.2104999999999997, - 21.86935 + 0.21, + 21.87 ], [ - 0.334500000000002, - 22.15875 + 0.33, + 22.16 ], [ - 0.3684000000000012, - 22.22525 + 0.37, + 22.23 ], [ - 0.4097000000000008, - 22.30345 + 0.41, + 22.3 ], [ - 0.4435000000000002, - 22.36215 + 0.44, + 22.36 ], [ - 0.6353000000000009, - 22.65155 + 0.64, + 22.65 ], [ - 0.7028999999999996, - 22.74145 + 0.7, + 22.74 ], [ - 3.217600000000001, - 23.95775 + 3.22, + 23.96 ], [ - 16.0505, - 23.95775 + 16.05, + 23.96 ], [ - 19.2682, - 20.65705 + 19.27, + 20.66 ], [ - 19.2682, - 10.57885 + 19.27, + 10.58 ], [ - 19.2682, - 4.9472 + 19.27, + 4.95 ], [ - 19.2682, - 2.82362 + 19.27, + 2.82 ], [ - 19.2682, - 2.76496 + 19.27, + 2.76 ], [ - 19.2795, - 2.76887 + 19.28, + 2.77 ], [ - 19.2795, - 2.76887 + 19.28, + 2.77 ], [ - 19.2795, - 2.76887 + 19.28, + 2.77 ] ] } @@ -3874,43 +3732,34 @@ { "ty": "fl", "bm": 0, - "hd": false, - "nm": "", "c": { "a": 0, "k": [ 0.1529, 0.1529, 0.1529 - ], - "ix": 2 + ] }, "r": 1, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } }, { "ty": "tm", "bm": 0, - "hd": false, - "nm": "", "e": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 }, "o": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "s": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "m": 1 }, @@ -3919,46 +3768,39 @@ "a": { "a": 0, "k": [ - 9.63975, - 11.97901760501438 - ], - "ix": 2 + 9.64, + 11.98 + ] }, "s": { "a": 0, "k": [ 100, 100 - ], - "ix": 2 + ] }, "sk": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "p": { "a": 0, "k": [ - 32.60655212402344, - 12.0102653503418 - ], - "ix": 2 + 32.61, + 12.01 + ] }, "r": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "sa": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } } ] @@ -3969,12 +3811,10 @@ }, { "ty": 4, - "nm": "Path", "sr": 1, "st": 0, "op": 401, "ip": 0, - "hd": false, "ddd": 0, "bm": 0, "hasMask": false, @@ -3985,44 +3825,37 @@ "k": [ 0, 0 - ], - "ix": 2 + ] }, "s": { "a": 0, "k": [ 100, 100 - ], - "ix": 2 + ] }, "sk": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "p": { "a": 0, "k": [ 0, 0 - ], - "ix": 2 + ] }, "r": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "sa": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } }, "ef": [], @@ -4030,14 +3863,10 @@ { "ty": "gr", "bm": 0, - "hd": false, - "nm": "", "it": [ { "ty": "sh", "bm": 0, - "hd": false, - "nm": "", "d": 1, "ks": { "a": 0, @@ -4050,223 +3879,223 @@ ], [ 0, - 1.735106666666667 + 1.74 ], [ - 0.7593000000000032, - 0.7743480000000003 + 0.76, + 0.77 ], [ - 1.300600000000003, + 1.3, 0 ], [ - 5.1372, + 5.14, 0 ], [ - 0.04889999999999617, - -0.117325 + 0.05, + -0.12 ], [ - 0.003800000000005355, - -0.023464999999999986 + 0, + -0.02 ], [ 0, - -0.02346499999999996 + -0.02 ], [ 0, - -0.06778766666666669 + -0.07 ], [ 0, - -0.08603833333333333 + -0.09 ], [ 0, - -1.427454333333333 + -1.43 ], [ 0, - -0.08864666666666654 + -0.09 ], [ 0, - -0.1759866666666667 + -0.18 ], [ - -4.18116666666667, + -4.18, 0 ], [ - -0.01879999999999882, - -0.01173000000000002 + -0.02, + -0.01 ], [ - -0.01509999999999678, - -0.007829999999999337 + -0.02, + -0.01 ], [ - -0.003799999999998249, - -0.003910000000000302 + 0, + 0 ], [ - -0.01129999999999853, - -0.04302000000000028 + -0.01, + -0.04 ], [ 0, - -0.01564999999999994 + -0.02 ], [ 0, - -0.007819999999999716 + -0.01 ], [ 0, - -0.2411666666666665 + -0.24 ], [ 0, - -1.080680000000001 + -1.08 ], [ 0, - -0.1655666666666669 + -0.17 ], [ - 0.1052000000000035, + 0.11, 0 ], [ - 2.084966666666666, + 2.08, 0 ], [ 0, - 0.1095000000000006 + 0.11 ], [ 0, - 0.1147000000000009 + 0.11 ], [ 0, - 0.6778899999999997 + 0.68 ], [ 0, - 0.2633299999999998 + 0.26 ], [ - 0.01879999999999882, - 0.04302000000000028 + 0.02, + 0.04 ], [ - 0.1240999999999985, + 0.12, 0 ], [ - 1.929566666666666, + 1.93, 0 ], [ 0, - -5.263983333333336 + -5.26 ], [ 0, - -0.2411666666666683 + -0.24 ], [ 0, - -0.03259999999999863 + -0.03 ], [ - -0.007500000000000284, - -0.02340000000000231 + -0.01, + -0.02 ], [ - -0.007500000000000284, - -0.01950000000000074 + -0.01, + -0.02 ], [ - -0.07140000000000413, - -0.03519999999999968 + -0.07, + -0.04 ], [ - -0.04879999999999995, + -0.05, 0 ], [ - -1.8256000000000014, + -1.83, 0 ], [ - -0.04130000000000678, - 0.01950000000000074 + -0.04, + 0.02 ], [ - -0.03010000000000446, - 0.07430000000000092 + -0.03, + 0.07 ], [ - -0.003799999999998249, - 0.02349999999999852 + 0, + 0.02 ], [ 0, - 0.02340000000000231 + 0.02 ], [ 0, - 0.03259999999999863 + 0.03 ], [ 0, - 0.3063666666666656 + 0.31 ], [ 0, - 2.050566666666668 + 2.05 ], [ - -3.277766666666665, + -3.28, 0 ], [ - -0.02260000000000417, + -0.02, 0 ], [ - -0.5150000000000006, - 0.3832000000000004 + -0.52, + 0.38 ], [ - -0.04129999999999967, - 0.03129999999999988 + -0.04, + 0.03 ], [ - -0.04129999999999967, - 0.03519999999999968 + -0.04, + 0.04 ], [ - -0.05270000000000152, - 0.05470000000000041 + -0.05, + 0.05 ], [ - 0.01129999999999853, - 0.7586999999999993 + 0.01, + 0.76 ], [ 0, - 1.839383333333333 + 1.84 ], [ - 0.002499999999997726, - 0.005213333333333736 + 0, + 0.01 ], [ 0, @@ -4280,223 +4109,223 @@ "o": [ [ 0, - -1.735106666666666 + -1.74 ], [ 0, 0 ], [ - -0.4885999999999981, - -0.4966759999999999 + -0.49, + -0.5 ], [ - -5.1372, + -5.14, 0 ], [ - -0.1277999999999935, + -0.13, 0 ], [ - -0.007500000000000284, - 0.01955400000000002 + -0.01, + 0.02 ], [ - -0.003799999999998249, - 0.02346499999999996 + 0, + 0.02 ], [ 0, - 0.06778766666666669 + 0.07 ], [ 0, - 0.08603833333333333 + 0.09 ], [ 0, - 1.427454333333333 + 1.43 ], [ 0, - 0.08864666666666654 + 0.09 ], [ 0, - 0.1759866666666667 + 0.18 ], [ - 4.18116666666667, + 4.18, 0 ], [ - 0.02250000000000085, + 0.02, 0 ], [ - 0.01510000000000389, - 0.003909999999999414 + 0.02, + 0 ], [ 0, 0 ], [ - 0.03379999999999939, - 0.02346000000000004 + 0.03, + 0.02 ], [ 0, - 0.01173000000000002 + 0.01 ], [ 0, - 0.007819999999999716 + 0.01 ], [ 0, - 0.2411666666666665 + 0.24 ], [ 0, - 1.0806799999999992 + 1.08 ], [ 0, - 0.1655666666666669 + 0.17 ], [ 0, - 0.1095000000000006 + 0.11 ], [ - -2.084966666666666, + -2.08, 0 ], [ - -0.1051999999999964, + -0.11, 0 ], [ 0, - -0.1147000000000009 + -0.11 ], [ 0, - -0.6778899999999997 + -0.68 ], [ 0, - -0.26332999999999895 + -0.26 ], [ 0, - -0.04692999999999969 + -0.05 ], [ - -0.04879999999999995, - -0.1134199999999996 + -0.05, + -0.11 ], [ - -1.929566666666666, + -1.93, 0 ], [ 0, - 5.263983333333331 + 5.26 ], [ 0, - 0.2411666666666683 + 0.24 ], [ 0, - 0.03259999999999863 + 0.03 ], [ 0, - 0.02340000000000231 + 0.02 ], [ - 0.007500000000000284, - 0.02349999999999852 + 0.01, + 0.02 ], [ - 0.03009999999999735, - 0.07430000000000092 + 0.03, + 0.07 ], [ - 0.04129999999999967, - 0.01950000000000074 + 0.04, + 0.02 ], [ - 1.8256000000000014, + 1.83, 0 ], [ - 0.04509999999999792, + 0.05, 0 ], [ - 0.07139999999999702, - -0.03519999999999968 + 0.07, + -0.04 ], [ - 0.007500000000000284, - -0.01950000000000074 + 0.01, + -0.02 ], [ - 0.003799999999998249, - -0.02340000000000231 + 0, + -0.02 ], [ 0, - -0.03259999999999863 + -0.03 ], [ 0, - -0.3063666666666656 + -0.31 ], [ 0, - -2.050566666666665 + -2.05 ], [ - 3.277766666666665, + 3.28, 0 ], [ - 0.02259999999999707, + 0.02, 0 ], [ - 0.5975999999999999, - -0.007799999999999585 + 0.6, + -0.01 ], [ - 0.04129999999999967, - -0.03129999999999988 + 0.04, + -0.03 ], [ - 0.04139999999999588, - -0.03129999999999988 + 0.04, + -0.03 ], [ - 0.05639999999999645, - -0.05080000000000062 + 0.06, + -0.05 ], [ - 0.5675999999999988, - -0.5670999999999999 + 0.57, + -0.57 ], [ 0, - -1.839383333333334 + -1.84 ], [ - -0.002499999999997726, - -0.005213333333333736 + 0, + -0.01 ], [ 0, @@ -4513,236 +4342,236 @@ ], "v": [ [ - 19.0765, - 7.8842412 + 19.08, + 7.88 ], [ - 19.0765, - 2.6789212 + 19.08, + 2.68 ], [ - 18.3096, - 0.9073131999999999 + 18.31, + 0.91 ], [ - 15.7273, + 15.73, 0 ], [ - 0.3156999999999996, + 0.32, 0 ], [ - 0.02630000000000621, - 0.1994522 + 0.03, + 0.2 ], [ - 0.007500000000000284, - 0.2620262 + 0.01, + 0.26 ], [ 0, - 0.3285102 + 0.33 ], [ 0, - 0.5318731999999999 + 0.53 ], [ 0, - 0.7899881999999999 + 0.79 ], [ 0, - 5.0723512 + 5.07 ], [ 0, - 5.3382912 + 5.34 ], [ 0, - 5.866251200000001 + 5.87 ], [ - 12.5435, - 5.866251200000001 + 12.54, + 5.87 ], [ - 12.6036, - 5.877981200000001 + 12.6, + 5.88 ], [ - 12.645, - 5.8975412 + 12.65, + 5.9 ], [ - 12.6525, - 5.9014512 + 12.65, + 5.9 ], [ - 12.7239, - 6.0031312 + 12.72, + 6 ], [ - 12.7314, - 6.0422412 + 12.73, + 6.04 ], [ - 12.7314, - 6.0617912 + 12.73, + 6.06 ], [ - 12.7314, - 6.7852912000000005 + 12.73, + 6.79 ], [ - 12.7314, - 10.0273312 + 12.73, + 10.03 ], [ - 12.7314, - 10.5240312 + 12.73, + 10.52 ], [ - 12.5435, - 10.7196312 + 12.54, + 10.72 ], [ - 6.288600000000002, - 10.7196312 + 6.29, + 10.72 ], [ - 6.100700000000003, - 10.5240312 + 6.1, + 10.52 ], [ - 6.100700000000003, - 10.1799312 + 6.1, + 10.18 ], [ - 6.100700000000003, - 8.1462612 + 6.1, + 8.15 ], [ - 6.100700000000003, - 7.3562712 + 6.1, + 7.36 ], [ - 6.070600000000006, - 7.2194012 + 6.07, + 7.22 ], [ - 5.788700000000006, - 7.0316812 + 5.79, + 7.03 ], [ 0, - 7.0316812 + 7.03 ], [ 0, - 22.8236312 + 22.82 ], [ 0, - 23.5471312 + 23.55 ], [ 0, - 23.6449312 + 23.64 ], [ - 0.007500000000000284, - 23.7113312 + 0.01, + 23.71 ], [ - 0.02630000000000621, - 23.7739312 + 0.03, + 23.77 ], [ - 0.1842000000000041, - 23.9421312 + 0.18, + 23.94 ], [ - 0.3156999999999996, - 23.9734312 + 0.32, + 23.97 ], [ - 5.792500000000004, - 23.9734312 + 5.79, + 23.97 ], [ - 5.924000000000007, - 23.9421312 + 5.92, + 23.94 ], [ - 6.081900000000005, - 23.7739312 + 6.08, + 23.77 ], [ - 6.100700000000003, - 23.7113312 + 6.1, + 23.71 ], [ - 6.108200000000004, - 23.6449312 + 6.11, + 23.64 ], [ - 6.108200000000004, - 23.5471312 + 6.11, + 23.55 ], [ - 6.108200000000004, - 22.6280312 + 6.11, + 22.63 ], [ - 6.108200000000004, - 16.4763312 + 6.11, + 16.48 ], [ - 15.9415, - 16.4763312 + 15.94, + 16.48 ], [ - 16.013000000000005, - 16.4763312 + 16.01, + 16.48 ], [ - 17.7383, - 15.8467312 + 17.74, + 15.85 ], [ - 17.8623, - 15.7528312 + 17.86, + 15.75 ], [ - 17.982600000000005, - 15.6511312 + 17.98, + 15.65 ], [ - 18.1518, - 15.4908312 + 18.15, + 15.49 ], [ - 19.084, - 13.4180312 + 19.08, + 13.42 ], [ - 19.084, - 7.8998812 + 19.08, + 7.9 ], [ - 19.0765, - 7.8842412 + 19.08, + 7.88 ], [ - 19.0765, - 7.8842412 + 19.08, + 7.88 ], [ - 19.0765, - 7.8842412 + 19.08, + 7.88 ] ] } @@ -4751,43 +4580,34 @@ { "ty": "fl", "bm": 0, - "hd": false, - "nm": "", "c": { "a": 0, "k": [ 0.1529, 0.1529, 0.1529 - ], - "ix": 2 + ] }, "r": 1, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } }, { "ty": "tm", "bm": 0, - "hd": false, - "nm": "", "e": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 }, "o": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "s": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "m": 1 }, @@ -4796,46 +4616,39 @@ "a": { "a": 0, "k": [ - 9.542123972108259, - 11.9867156 - ], - "ix": 2 + 9.54, + 11.99 + ] }, "s": { "a": 0, "k": [ 100, 100 - ], - "ix": 2 + ] }, "sk": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "p": { "a": 0, "k": [ - 54.28432464599609, - 12.02968215942383 - ], - "ix": 2 + 54.28, + 12.03 + ] }, "r": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "sa": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } } ] @@ -4846,12 +4659,10 @@ }, { "ty": 4, - "nm": "Path", "sr": 1, "st": 0, "op": 401, "ip": 0, - "hd": false, "ddd": 0, "bm": 0, "hasMask": false, @@ -4862,44 +4673,37 @@ "k": [ 0, 0 - ], - "ix": 2 + ] }, "s": { "a": 0, "k": [ 100, 100 - ], - "ix": 2 + ] }, "sk": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "p": { "a": 0, "k": [ 0, 0 - ], - "ix": 2 + ] }, "r": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "sa": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } }, "ef": [], @@ -4907,14 +4711,10 @@ { "ty": "gr", "bm": 0, - "hd": false, - "nm": "", "it": [ { "ty": "sh", "bm": 0, - "hd": false, - "nm": "", "d": 1, "ks": { "a": 0, @@ -4926,36 +4726,36 @@ 0 ], [ - 2.718933333333339, + 2.72, 0 ], [ 0, - -1.954113733333334 + -1.95 ], [ - -1.388300000000001, + -1.39, 0 ], [ - -0.1954999999999956, - 0.2854900000000002 + -0.2, + 0.29 ], [ - -1.131433333333334, - 1.706427666666666 + -1.13, + 1.71 ], [ - -0.01380000000000337, - 0.01955399999999996 + -0.01, + 0.02 ], [ - 0.154200000000003, + 0.15, 0 ], [ 0, - 0.001303633333333332 + 0 ], [ 0, @@ -4968,36 +4768,36 @@ ], "o": [ [ - -2.718933333333339, + -2.72, 0 ], [ 0, - 1.954113733333333 + 1.95 ], [ - 1.388300000000001, + 1.39, 0 ], [ - 0.345799999999997, + 0.35, 0 ], [ - 1.131433333333334, - -1.706427666666667 + 1.13, + -1.71 ], [ - 0.01380000000000337, - -0.01955400000000007 + 0.01, + -0.02 ], [ - 0.08639999999999759, - -0.129058 + 0.09, + -0.13 ], [ 0, - -0.001303633333333332 + 0 ], [ 0, @@ -5014,7 +4814,7 @@ ], "v": [ [ - 8.156800000000004, + 8.16, 0 ], [ @@ -5023,38 +4823,38 @@ ], [ 0, - 5.8623412 + 5.86 ], [ - 4.164900000000003, - 5.8623412 + 4.16, + 5.86 ], [ - 4.875299999999996, - 5.4869012 + 4.88, + 5.49 ], [ - 8.269599999999997, - 0.3676182 + 8.27, + 0.37 ], [ - 8.311000000000007, - 0.3089562 + 8.31, + 0.31 ], [ - 8.156800000000004, - 0.003910900000000002 + 8.16, + 0 ], [ - 8.156800000000004, + 8.16, 0 ], [ - 8.156800000000004, + 8.16, 0 ], [ - 8.156800000000004, + 8.16, 0 ] ] @@ -5064,43 +4864,34 @@ { "ty": "fl", "bm": 0, - "hd": false, - "nm": "", "c": { "a": 0, "k": [ 0.1529, 0.1529, 0.1529 - ], - "ix": 2 + ] }, "r": 1, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } }, { "ty": "tm", "bm": 0, - "hd": false, - "nm": "", "e": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 }, "o": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "s": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "m": 1 }, @@ -5109,46 +4900,39 @@ "a": { "a": 0, "k": [ - 4.172631109613312, - 2.9311706 - ], - "ix": 2 + 4.17, + 2.93 + ] }, "s": { "a": 0, "k": [ 100, 100 - ], - "ix": 2 + ] }, "sk": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "p": { "a": 0, "k": [ - 82.7976303100586, - 2.974139928817749 - ], - "ix": 2 + 82.8, + 2.97 + ] }, "r": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "sa": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } } ] @@ -5159,12 +4943,10 @@ }, { "ty": 4, - "nm": "Path", "sr": 1, "st": 0, "op": 401, "ip": 0, - "hd": false, "ddd": 0, "bm": 0, "hasMask": false, @@ -5175,44 +4957,37 @@ "k": [ 0, 0 - ], - "ix": 2 + ] }, "s": { "a": 0, "k": [ 100, 100 - ], - "ix": 2 + ] }, "sk": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "p": { "a": 0, "k": [ 0, 0 - ], - "ix": 2 + ] }, "r": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "sa": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } }, "ef": [], @@ -5220,14 +4995,10 @@ { "ty": "gr", "bm": 0, - "hd": false, - "nm": "", "it": [ { "ty": "sh", "bm": 0, - "hd": false, - "nm": "", "d": 1, "ks": { "a": 0, @@ -5239,40 +5010,40 @@ 0 ], [ - 1.264266666666668, - 1.753356666666667 + 1.26, + 1.75 ], [ - 0.09769999999999968, + 0.1, 0 ], [ - 4.012023333333334, + 4.01, 0 ], [ 0, - -1.57215 + -1.57 ], [ 0, - -1.059836666666667 + -1.06 ], [ - -6.318723333333335, + -6.32, 0 ], [ - 0.09389999999999787, - 0.12906 + 0.09, + 0.13 ], [ - 0.03886666666666727, - 0.0547500000000003 + 0.04, + 0.05 ], [ - 0.001233333333331643, - -0.001303333333333434 + 0, + 0 ], [ 0, @@ -5285,40 +5056,40 @@ ], "o": [ [ - -1.264266666666668, - -1.753356666666666 + -1.26, + -1.75 ], [ - -0.06010000000000204, - -0.0821272 + -0.06, + -0.08 ], [ - -4.012023333333332, + -4.01, 0 ], [ - -1.74414, - 0.0117325 + -1.74, + 0.01 ], [ 0, - 1.059836666666667 + 1.06 ], [ - 6.318723333333334, + 6.32, 0 ], [ - 0.1540999999999997, + 0.15, 0 ], [ - -0.03886666666666727, - -0.0547500000000003 + -0.04, + -0.05 ], [ - -0.001233333333331643, - 0.001303333333333434 + 0, + 0 ], [ 0, @@ -5335,52 +5106,52 @@ ], "v": [ [ - 18.98627, - 5.3891275 + 18.99, + 5.39 ], [ - 15.19347, - 0.1290575 + 15.19, + 0.13 ], [ - 14.94547, + 14.95, 0 ], [ - 2.9094, + 2.91, 0 ], [ 0, - 2.6828275 + 2.68 ], [ 0, - 5.8623375 + 5.86 ], [ - 18.95617, - 5.8623375 + 18.96, + 5.86 ], [ - 19.10657, - 5.5494675 + 19.11, + 5.55 ], [ - 18.98997, - 5.3852175 + 18.99, + 5.39 ], [ - 18.98627, - 5.3891275 + 18.99, + 5.39 ], [ - 18.98627, - 5.3891275 + 18.99, + 5.39 ], [ - 18.98627, - 5.3891275 + 18.99, + 5.39 ] ] } @@ -5389,43 +5160,34 @@ { "ty": "fl", "bm": 0, - "hd": false, - "nm": "", "c": { "a": 0, "k": [ 0.1529, 0.1529, 0.1529 - ], - "ix": 2 + ] }, "r": 1, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } }, { "ty": "tm", "bm": 0, - "hd": false, - "nm": "", "e": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 }, "o": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "s": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "m": 1 }, @@ -5434,46 +5196,39 @@ "a": { "a": 0, "k": [ - 9.572392284439037, - 2.93116875 - ], - "ix": 2 + 9.57, + 2.93 + ] }, "s": { "a": 0, "k": [ 100, 100 - ], - "ix": 2 + ] }, "sk": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "p": { "a": 0, "k": [ - 11.5753231048584, - 2.970231294631958 - ], - "ix": 2 + 11.58, + 2.97 + ] }, "r": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "sa": { "a": 0, - "k": 0, - "ix": 2 + "k": 0 }, "o": { "a": 0, - "k": 100, - "ix": 2 + "k": 100 } } ] diff --git a/vite.config.ts b/vite.config.ts index 7165b86c..6ac1dcb5 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -3,11 +3,29 @@ import path from 'path'; import { vanillaExtractPlugin } from '@vanilla-extract/vite-plugin'; import react from '@vitejs/plugin-react'; -import { defineConfig } from 'vite'; +import { visualizer } from 'rollup-plugin-visualizer'; +import { defineConfig, type PluginOption } from 'vite'; // https://vitejs.dev/config/ export default defineConfig({ - plugins: [react(), vanillaExtractPlugin()], + plugins: [ + react(), + vanillaExtractPlugin(), + visualizer({ + filename: './dist/report.html', + gzipSize: true, + brotliSize: true, + }) as PluginOption, + ], + build: { + rollupOptions: { + output: { + manualChunks: (id) => { + if (id.includes('firebase')) return 'firebase'; + }, + }, + }, + }, resolve: { alias: [ { find: '@apis', replacement: path.resolve(__dirname, 'src/common/apis') }, diff --git a/yarn.lock b/yarn.lock index 19283aeb..906565cc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2536,6 +2536,11 @@ define-data-property@^1.0.1, define-data-property@^1.1.4: es-errors "^1.3.0" gopd "^1.0.1" +define-lazy-prop@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" + integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== + define-properties@^1.2.0, define-properties@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" @@ -3575,6 +3580,11 @@ is-date-object@^1.0.1, is-date-object@^1.0.5: dependencies: has-tostringtag "^1.0.0" +is-docker@^2.0.0, is-docker@^2.1.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== + is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -3704,6 +3714,13 @@ is-weakset@^2.0.3: call-bind "^1.0.7" get-intrinsic "^1.2.4" +is-wsl@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + isarray@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" @@ -3875,14 +3892,7 @@ loose-envify@^1.1.0, loose-envify@^1.4.0: dependencies: js-tokens "^3.0.0 || ^4.0.0" -lottie-react@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/lottie-react/-/lottie-react-2.4.0.tgz#f7249eee2b1deee70457a2d142194fdf2456e4bd" - integrity sha512-pDJGj+AQlnlyHvOHFK7vLdsDcvbuqvwPZdMlJ360wrzGFurXeKPr8SiRCjLf3LrNYKANQtSsh5dz9UYQHuqx4w== - dependencies: - lottie-web "^5.10.2" - -lottie-web@^5.10.2: +lottie-web@^5.12.2: version "5.12.2" resolved "https://registry.yarnpkg.com/lottie-web/-/lottie-web-5.12.2.tgz#579ca9fe6d3fd9e352571edd3c0be162492f68e5" integrity sha512-uvhvYPC8kGPjXT3MyKMrL3JitEAmDMp30lVkuq/590Mw9ok6pWcFCwXJveo0t5uqYw1UREQHofD+jVpdjBv8wg== @@ -4140,6 +4150,15 @@ onetime@^6.0.0: dependencies: mimic-fn "^4.0.0" +open@^8.4.0: + version "8.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9" + integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ== + dependencies: + define-lazy-prop "^2.0.0" + is-docker "^2.1.1" + is-wsl "^2.2.0" + optionator@^0.9.3: version "0.9.4" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734" @@ -4507,6 +4526,16 @@ rimraf@^3.0.2: dependencies: glob "^7.1.3" +rollup-plugin-visualizer@^5.12.0: + version "5.12.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.12.0.tgz#661542191ce78ee4f378995297260d0c1efb1302" + integrity sha512-8/NU9jXcHRs7Nnj07PF2o4gjxmm9lXIrZ8r175bT9dK8qoLlvKTwRMArRCMgpMGlq8CTLugRvEmyMeMXIU2pNQ== + dependencies: + open "^8.4.0" + picomatch "^2.3.1" + source-map "^0.7.4" + yargs "^17.5.1" + rollup@^4.13.0: version "4.17.2" resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.17.2.tgz#26d1785d0144122277fdb20ab3a24729ae68301f" @@ -4686,6 +4715,11 @@ source-map@^0.5.7: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== +source-map@^0.7.4: + version "0.7.4" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" + integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== + stackback@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/stackback/-/stackback-0.0.2.tgz#1ac8a0d9483848d1695e418b6d031a3c3ce68e3b" @@ -5265,7 +5299,7 @@ yargs-parser@^21.1.1: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs@^17.7.2: +yargs@^17.5.1, yargs@^17.7.2: version "17.7.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==