Skip to content

Commit

Permalink
Merge branch 'develop' into feature/currency-change-bug
Browse files Browse the repository at this point in the history
  • Loading branch information
prachigarg19 authored Jan 17, 2023
2 parents a8882e7 + b2f6430 commit 5b0ca60
Show file tree
Hide file tree
Showing 117 changed files with 1,391 additions and 931 deletions.
13 changes: 8 additions & 5 deletions pages/404.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import React, { ReactElement } from "react";
import { serverSideTranslations } from "next-i18next/serverSideTranslations";
import { useRouter } from "next/router";
import { GetStaticProps } from "next/types";

interface Props {}

function Custom404({}: Props): ReactElement {
function Custom404(): ReactElement {
const router = useRouter();
if (typeof window !== "undefined") {
router.push("/");
Expand All @@ -14,8 +13,12 @@ function Custom404({}: Props): ReactElement {

export default Custom404;

export const getStaticProps = async ({ locale }) => ({
export const getStaticProps: GetStaticProps = async ({ locale }) => ({
props: {
...(await serverSideTranslations(locale, ["common", "country", "donate"])),
...(await serverSideTranslations(locale || "en", [
"common",
"country",
"donate",
])),
},
});
9 changes: 6 additions & 3 deletions pages/_app.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { AppProps /*, AppContext */ } from "next/app";
import type { AppProps } from "next/app";
import Layout from "../src/Layout";
import ThemeProvider, { useTheme } from "../styles/themeContext";
import ThemeProvider from "../styles/themeContext";
import getConfig from "next/config";
import * as Sentry from "@sentry/node";
import { RewriteFrames } from "@sentry/integrations";
Expand All @@ -18,6 +18,7 @@ import { useRouter } from "next/router";
import React from "react";
import { browserNotCompatible } from "../src/Utils/browsercheck";
import BrowserNotSupported from "./../src/Common/ContentLoaders/BrowserNotSupported";
import MisconfiguredEnvironment from "src/Common/ContentLoaders/MisconfiguredEnvironment";
if (process.env.NEXT_PUBLIC_SENTRY_DSN) {
const config = getConfig();
const distDir = `${config.serverRuntimeConfig.rootDir}/.next`;
Expand Down Expand Up @@ -57,7 +58,7 @@ if (process.env.NEXT_PUBLIC_SENTRY_DSN) {
/window\._sharedData\.entry_data/,
/ztePageScrollModule/,
],
denyUrls: [],
// denyUrls: [], //commented out as this option is currently not utilized
});
}

Expand All @@ -81,6 +82,8 @@ function MyApp({ Component, pageProps }: AppProps) {

if (browserIncompatible) {
return <BrowserNotSupported />;
} else if (!process.env.AUTH0_CUSTOM_DOMAIN || !process.env.AUTH0_CLIENT_ID) {
return <MisconfiguredEnvironment />;
} else {
return (
<Auth0Provider
Expand Down
30 changes: 19 additions & 11 deletions pages/_document.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
import { ServerStyleSheets } from '@material-ui/core/styles';
import { ServerStyleSheets } from "@material-ui/core/styles";
import Document, {
Head, Html, Main, NextScript,
} from 'next/document';
import React from 'react';
Head,
Html,
Main,
NextScript,
DocumentContext,
DocumentInitialProps,
} from "next/document";
import React from "react";

class MyDocument extends Document {
static async getInitialProps(ctx: any) {
static async getInitialProps(
ctx: DocumentContext
): Promise<DocumentInitialProps> {
const initialProps = await Document.getInitialProps(ctx);
return { ...initialProps };
}

render() {
render(): JSX.Element {
return (
<Html lang="en">
<Head/>
<body style={{ overscrollBehavior: 'contain' }}>
<Head />
<body style={{ overscrollBehavior: "contain" }}>
<Main />
<NextScript />
</body>
Expand All @@ -27,9 +34,10 @@ MyDocument.getInitialProps = async (ctx) => {
const sheets = new ServerStyleSheets();
const originalRenderPage = ctx.renderPage;

ctx.renderPage = () => originalRenderPage({
enhanceApp: (App: any) => (props: any) => sheets.collect(<App {...props} />),
});
ctx.renderPage = () =>
originalRenderPage({
enhanceApp: (App) => (props) => sheets.collect(<App {...props} />),
});

const initialProps = await Document.getInitialProps(ctx);

Expand Down
43 changes: 23 additions & 20 deletions pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import nextI18NextConfig from "../next-i18next.config.js";
import { apiRequest } from "../src/Utils/api";
import Head from "next/head";
import { QueryParamContext } from "../src/Layout/QueryParamContext";
import { getCountryDataBy } from "../src/Utils/countryUtils";
import locales from "../public/static/localeList.json";
import { useRouter } from "next/router";
import countriesData from "./../src/Utils/countriesData.json";
Expand All @@ -19,25 +18,26 @@ import {
PlanetCashSignupDetails,
} from "src/Common/Types";
import { Donation } from "src/Common/Types/donation";
import { GetServerSideProps } from "next/types";

interface Props {
projectDetails?: FetchedProjectDetails | PlanetCashSignupDetails;
donationStep: any;
donationStep: number | null;
giftDetails: GiftDetails | null;
isGift: boolean;
resolvedUrl?: any;
resolvedUrl?: string;
isDirectDonation: boolean;
hideTaxDeduction: boolean;
isTaxDeductible: boolean;
donationID: any;
donationID: string | null;
shouldCreateDonation: boolean;
country: any;
country: string;
contactDetails: ContactDetails;
allowTaxDeductionChange: boolean;
currency: any;
currency: string;
paymentSetup: PaymentOptions;
treecount?: any;
amount: any;
treecount?: number;
amount: number;
meta: { title: string; description: string; image: string; url: string };
frequency: string;
tenant: string;
Expand Down Expand Up @@ -206,7 +206,7 @@ function index({

export default index;

export async function getServerSideProps(context: any) {
export const getServerSideProps: GetServerSideProps = async (context) => {
let donationStep = 0;
let showErrorCard = false;
let projectDetails: FetchedProjectDetails | null = null;
Expand Down Expand Up @@ -236,28 +236,29 @@ export async function getServerSideProps(context: any) {
function setshowErrorCard() {
showErrorCard = true;
}
if (context.query.tenant) {
if (typeof context.query.tenant === "string") {
tenant = context.query.tenant;
}

// Country = country => This can be received from the URL, can also be set by the user, can be extracted from browser location (config API)
if (context.query.country) {
if (typeof context.query.country === "string") {
const queryCountry = context.query.country;
const found = countriesData.some(
(country) =>
country.countryCode?.toUpperCase() ===
context.query.country?.toUpperCase()
country.countryCode?.toUpperCase() === queryCountry.toUpperCase()
);
if (found) {
country = context.query.country.toUpperCase();
country = queryCountry.toUpperCase();
}
}
if (context.query.locale) {
if (typeof context.query.locale === "string") {
locale = context.query.locale;
}
// Set project details if there is to (project slug) in the query params
if (
(context.query.to && !context.query.context) ||
context.query.step === DONATE
((context.query.to && !context.query.context) ||
context.query.step === DONATE) &&
typeof context.query.to === "string"
) {
const to = context.query?.to?.replace(/\//g, "") || "";
donationStep = 1;
Expand Down Expand Up @@ -384,6 +385,8 @@ export async function getServerSideProps(context: any) {
// Check if the donation status is paid or successful - if yes directly show thank you page
// other payment statuses paymentStatus = 'refunded'; 'referred'; 'in-dispute'; 'dispute-lost';
if (
typeof context.query.method === "string" &&
typeof context.query.redirect_status === "string" &&
queryMethodForStep4.includes(context.query.method) &&
queryRedirectStatus.includes(context.query.redirect_status) &&
context.query.payment_intent
Expand Down Expand Up @@ -484,7 +487,7 @@ export async function getServerSideProps(context: any) {
return {
props: {
...(await serverSideTranslations(
context.locale,
context.locale || "en",
["common", "country", "donate"],
nextI18NextConfig
)),
Expand Down Expand Up @@ -512,6 +515,6 @@ export async function getServerSideProps(context: any) {
tenant,
callbackMethod,
callbackUrl,
}, // will be passed to the page component as props
}, // will be passed to the page component as props */
};
}
};
4 changes: 2 additions & 2 deletions public/assets/icons/AppleMailIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import React, { ReactElement } from "react";

function AppleMailIcon() {
function AppleMailIcon(): ReactElement {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
Expand Down
4 changes: 2 additions & 2 deletions public/assets/icons/BackButton.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, { ReactElement } from "react";

interface Props {
color:any
color: string;
}

function BackButton({color}: Props): ReactElement {
function BackButton({ color }: Props): ReactElement {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
Expand Down
10 changes: 7 additions & 3 deletions public/assets/icons/CloseIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import React from "react";
import React, { ReactElement } from "react";

function CloseIcon(props) {
interface Props {
color: string;
}

function CloseIcon({ color }: Props): ReactElement {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
Expand All @@ -9,7 +13,7 @@ function CloseIcon(props) {
viewBox="0 0 16.097 16.093"
>
<path
fill={props.color ? props.color : "#fff"}
fill={color ? color : "#fff"}
d="M19.36 17.454l5.749-5.754A1.347 1.347 0 1023.2 9.8l-5.749 5.749L11.706 9.8A1.347 1.347 0 109.8 11.7l5.749 5.749L9.8 23.2a1.347 1.347 0 101.905 1.905l5.749-5.749 5.746 5.752a1.347 1.347 0 101.909-1.908z"
data-name="Icon ionic-ios-close"
transform="translate(-9.404 -9.407)"
Expand Down
4 changes: 0 additions & 4 deletions public/assets/icons/CopyIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import React, { ReactElement } from "react";

interface Props {
color: any;
}

function CopyIcon(): ReactElement {
return (
<svg
Expand Down
10 changes: 7 additions & 3 deletions public/assets/icons/CreditCardIcons/AmexIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import React from 'react';
import React, { ReactElement } from "react";

function AmexIcon(props: any) {
interface Props {
color: string;
}

function AmexIcon({ color }: Props): ReactElement {
return (
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512">
<path
fill={props.color}
fill={color}
d="M325.1 167.8c0-16.4-14.1-18.4-27.4-18.4l-39.1-.3v69.3H275v-25.1h18c18.4 0 14.5 10.3 14.8 25.1h16.6v-13.5c0-9.2-1.5-15.1-11-18.4 7.4-3 11.8-10.7 11.7-18.7zm-29.4 11.3H275v-15.3h21c5.1 0 10.7 1 10.7 7.4 0 6.6-5.3 7.9-11 7.9zM279 268.6h-52.7l-21 22.8-20.5-22.8h-66.5l-.1 69.3h65.4l21.3-23 20.4 23h32.2l.1-23.3c18.9 0 49.3 4.6 49.3-23.3 0-17.3-12.3-22.7-27.9-22.7zm-103.8 54.7h-40.6v-13.8h36.3v-14.1h-36.3v-12.5h41.7l17.9 20.2zm65.8 8.2l-25.3-28.1L241 276zm37.8-31h-21.2v-17.6h21.5c5.6 0 10.2 2.3 10.2 8.4 0 6.4-4.6 9.2-10.5 9.2zm-31.6-136.7v-14.6h-55.5v69.3h55.5v-14.3h-38.9v-13.8h37.8v-14.1h-37.8v-12.5zM576 255.4h-.2zm-194.6 31.9c0-16.4-14.1-18.7-27.1-18.7h-39.4l-.1 69.3h16.6l.1-25.3h17.6c11 0 14.8 2 14.8 13.8l-.1 11.5h16.6l.1-13.8c0-8.9-1.8-15.1-11-18.4 7.7-3.1 11.8-10.8 11.9-18.4zm-29.2 11.2h-20.7v-15.6h21c5.1 0 10.7 1 10.7 7.4 0 6.9-5.4 8.2-11 8.2zm-172.8-80v-69.3h-27.6l-19.7 47-21.7-47H83.3v65.7l-28.1-65.7H30.7L1 218.5h17.9l6.4-15.3h34.5l6.4 15.3H100v-54.2l24 54.2h14.6l24-54.2v54.2zM31.2 188.8l11.2-27.6 11.5 27.6zm477.4 158.9v-4.5c-10.8 5.6-3.9 4.5-156.7 4.5 0-25.2.1-23.9 0-25.2-1.7-.1-3.2-.1-9.4-.1 0 17.9-.1 6.8-.1 25.3h-39.6c0-12.1.1-15.3.1-29.2-10 6-22.8 6.4-34.3 6.2 0 14.7-.1 8.3-.1 23h-48.9c-5.1-5.7-2.7-3.1-15.4-17.4-3.2 3.5-12.8 13.9-16.1 17.4h-82v-92.3h83.1c5 5.6 2.8 3.1 15.5 17.2 3.2-3.5 12.2-13.4 15.7-17.2h58c9.8 0 18 1.9 24.3 5.6v-5.6c54.3 0 64.3-1.4 75.7 5.1v-5.1h78.2v5.2c11.4-6.9 19.6-5.2 64.9-5.2v5c10.3-5.9 16.6-5.2 54.3-5V80c0-26.5-21.5-48-48-48h-480c-26.5 0-48 21.5-48 48v109.8c9.4-21.9 19.7-46 23.1-53.9h39.7c4.3 10.1 1.6 3.7 9 21.1v-21.1h46c2.9 6.2 11.1 24 13.9 30 5.8-13.6 10.1-23.9 12.6-30h103c0-.1 11.5 0 11.6 0 43.7.2 53.6-.8 64.4 5.3v-5.3H363v9.3c7.6-6.1 17.9-9.3 30.7-9.3h27.6c0 .5 1.9.3 2.3.3H456c4.2 9.8 2.6 6 8.8 20.6v-20.6h43.3c4.9 8-1-1.8 11.2 18.4v-18.4h39.9v92h-41.6c-5.4-9-1.4-2.2-13.2-21.9v21.9h-52.8c-6.4-14.8-.1-.3-6.6-15.3h-19c-4.2 10-2.2 5.2-6.4 15.3h-26.8c-12.3 0-22.3-3-29.7-8.9v8.9h-66.5c-.3-13.9-.1-24.8-.1-24.8-1.8-.3-3.4-.2-9.8-.2v25.1H151.2v-11.4c-2.5 5.6-2.7 5.9-5.1 11.4h-29.5c-4-8.9-2.9-6.4-5.1-11.4v11.4H58.6c-4.2-10.1-2.2-5.3-6.4-15.3H33c-4.2 10-2.2 5.2-6.4 15.3H0V432c0 26.5 21.5 48 48 48h480.1c26.5 0 48-21.5 48-48v-90.4c-12.7 8.3-32.7 6.1-67.5 6.1zm36.3-64.5H575v-14.6h-32.9c-12.8 0-23.8 6.6-23.8 20.7 0 33 42.7 12.8 42.7 27.4 0 5.1-4.3 6.4-8.4 6.4h-32l-.1 14.8h32c8.4 0 17.6-1.8 22.5-8.9v-25.8c-10.5-13.8-39.3-1.3-39.3-13.5 0-5.8 4.6-6.5 9.2-6.5zm-57 39.8h-32.2l-.1 14.8h32.2c14.8 0 26.2-5.6 26.2-22 0-33.2-42.9-11.2-42.9-26.3 0-5.6 4.9-6.4 9.2-6.4h30.4v-14.6h-33.2c-12.8 0-23.5 6.6-23.5 20.7 0 33 42.7 12.5 42.7 27.4-.1 5.4-4.7 6.4-8.8 6.4zm-42.2-40.1v-14.3h-55.2l-.1 69.3h55.2l.1-14.3-38.6-.3v-13.8H445v-14.1h-37.8v-12.5zm-56.3-108.1c-.3.2-1.4 2.2-1.4 7.6 0 6 .9 7.7 1.1 7.9.2.1 1.1.5 3.4.5l7.3-16.9c-1.1 0-2.1-.1-3.1-.1-5.6 0-7 .7-7.3 1zm20.4-10.5h-.1zm-16.2-15.2c-23.5 0-34 12-34 35.3 0 22.2 10.2 34 33 34h19.2l6.4-15.3h34.3l6.6 15.3h33.7v-51.9l31.2 51.9h23.6v-69h-16.9v48.1l-29.1-48.1h-25.3v65.4l-27.9-65.4h-24.8l-23.5 54.5h-7.4c-13.3 0-16.1-8.1-16.1-19.9 0-23.8 15.7-20 33.1-19.7v-15.2zm42.1 12.1l11.2 27.6h-22.8zm-101.1-12v69.3h16.9v-69.3z"
/>
</svg>
Expand Down
9 changes: 6 additions & 3 deletions public/assets/icons/CreditCardIcons/DinersClub.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import React from 'react';
import React, { ReactElement } from "react";
interface Props {
color: string;
}

function DinerClub(props: any) {
function DinerClub({ color }: Props): ReactElement {
return (
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512">
<path
fill={props.color}
fill={color}
d="M239.7 79.9c-96.9 0-175.8 78.6-175.8 175.8 0 96.9 78.9 175.8 175.8 175.8 97.2 0 175.8-78.9 175.8-175.8 0-97.2-78.6-175.8-175.8-175.8zm-39.9 279.6c-41.7-15.9-71.4-56.4-71.4-103.8s29.7-87.9 71.4-104.1v207.9zm79.8.3V151.6c41.7 16.2 71.4 56.7 71.4 104.1s-29.7 87.9-71.4 104.1zM528 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h480c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zM329.7 448h-90.3c-106.2 0-193.8-85.5-193.8-190.2C45.6 143.2 133.2 64 239.4 64h90.3c105 0 200.7 79.2 200.7 193.8 0 104.7-95.7 190.2-200.7 190.2z"
/>
</svg>
Expand Down
9 changes: 6 additions & 3 deletions public/assets/icons/CreditCardIcons/DiscoverIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import React from 'react';
import React, { ReactElement } from "react";
interface Props {
color: string;
}

function DiscoverIcon(props: any) {
function DiscoverIcon({ color }: Props): ReactElement {
return (
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512">
<path
fill={props.color}
fill={color}
d="M520.4 196.1c0-7.9-5.5-12.1-15.6-12.1h-4.9v24.9h4.7c10.3 0 15.8-4.4 15.8-12.8zM528 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h480c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zm-44.1 138.9c22.6 0 52.9-4.1 52.9 24.4 0 12.6-6.6 20.7-18.7 23.2l25.8 34.4h-19.6l-22.2-32.8h-2.2v32.8h-16zm-55.9.1h45.3v14H444v18.2h28.3V217H444v22.2h29.3V253H428zm-68.7 0l21.9 55.2 22.2-55.2h17.5l-35.5 84.2h-8.6l-35-84.2zm-55.9-3c24.7 0 44.6 20 44.6 44.6 0 24.7-20 44.6-44.6 44.6-24.7 0-44.6-20-44.6-44.6 0-24.7 20-44.6 44.6-44.6zm-49.3 6.1v19c-20.1-20.1-46.8-4.7-46.8 19 0 25 27.5 38.5 46.8 19.2v19c-29.7 14.3-63.3-5.7-63.3-38.2 0-31.2 33.1-53 63.3-38zm-97.2 66.3c11.4 0 22.4-15.3-3.3-24.4-15-5.5-20.2-11.4-20.2-22.7 0-23.2 30.6-31.4 49.7-14.3l-8.4 10.8c-10.4-11.6-24.9-6.2-24.9 2.5 0 4.4 2.7 6.9 12.3 10.3 18.2 6.6 23.6 12.5 23.6 25.6 0 29.5-38.8 37.4-56.6 11.3l10.3-9.9c3.7 7.1 9.9 10.8 17.5 10.8zM55.4 253H32v-82h23.4c26.1 0 44.1 17 44.1 41.1 0 18.5-13.2 40.9-44.1 40.9zm67.5 0h-16v-82h16zM544 433c0 8.2-6.8 15-15 15H128c189.6-35.6 382.7-139.2 416-160zM74.1 191.6c-5.2-4.9-11.6-6.6-21.9-6.6H48v54.2h4.2c10.3 0 17-2 21.9-6.4 5.7-5.2 8.9-12.8 8.9-20.7s-3.2-15.5-8.9-20.5z"
/>
</svg>
Expand Down
9 changes: 6 additions & 3 deletions public/assets/icons/CreditCardIcons/JcbIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import React from 'react';
import React, { ReactElement } from "react";
interface Props {
color: string;
}

function JcbIcon(props: any) {
function JcbIcon({ color }: Props): ReactElement {
return (
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512">
<path
fill={props.color}
fill={color}
d="M431.5 244.3V212c41.2 0 38.5.2 38.5.2 7.3 1.3 13.3 7.3 13.3 16 0 8.8-6 14.5-13.3 15.8-1.2.4-3.3.3-38.5.3zm42.8 20.2c-2.8-.7-3.3-.5-42.8-.5v35c39.6 0 40 .2 42.8-.5 7.5-1.5 13.5-8 13.5-17 0-8.7-6-15.5-13.5-17zM576 80v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V80c0-26.5 21.5-48 48-48h480c26.5 0 48 21.5 48 48zM182 192.3h-57c0 67.1 10.7 109.7-35.8 109.7-19.5 0-38.8-5.7-57.2-14.8v28c30 8.3 68 8.3 68 8.3 97.9 0 82-47.7 82-131.2zm178.5 4.5c-63.4-16-165-14.9-165 59.3 0 77.1 108.2 73.6 165 59.2V287C312.9 311.7 253 309 253 256s59.8-55.6 107.5-31.2v-28zM544 286.5c0-18.5-16.5-30.5-38-32v-.8c19.5-2.7 30.3-15.5 30.3-30.2 0-19-15.7-30-37-31 0 0 6.3-.3-120.3-.3v127.5h122.7c24.3.1 42.3-12.9 42.3-33.2z"
/>
</svg>
Expand Down
9 changes: 6 additions & 3 deletions public/assets/icons/CreditCardIcons/Mastercard.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import React from 'react';
import React, { ReactElement } from "react";
interface Props {
color: string;
}

function Mastercard(props: any) {
function Mastercard({ color }: Props): ReactElement {
return (
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512">
<path
fill={props.color}
fill={color}
d="M482.9 410.3c0 6.8-4.6 11.7-11.2 11.7-6.8 0-11.2-5.2-11.2-11.7 0-6.5 4.4-11.7 11.2-11.7 6.6 0 11.2 5.2 11.2 11.7zm-310.8-11.7c-7.1 0-11.2 5.2-11.2 11.7 0 6.5 4.1 11.7 11.2 11.7 6.5 0 10.9-4.9 10.9-11.7-.1-6.5-4.4-11.7-10.9-11.7zm117.5-.3c-5.4 0-8.7 3.5-9.5 8.7h19.1c-.9-5.7-4.4-8.7-9.6-8.7zm107.8.3c-6.8 0-10.9 5.2-10.9 11.7 0 6.5 4.1 11.7 10.9 11.7 6.8 0 11.2-4.9 11.2-11.7 0-6.5-4.4-11.7-11.2-11.7zm105.9 26.1c0 .3.3.5.3 1.1 0 .3-.3.5-.3 1.1-.3.3-.3.5-.5.8-.3.3-.5.5-1.1.5-.3.3-.5.3-1.1.3-.3 0-.5 0-1.1-.3-.3 0-.5-.3-.8-.5-.3-.3-.5-.5-.5-.8-.3-.5-.3-.8-.3-1.1 0-.5 0-.8.3-1.1 0-.5.3-.8.5-1.1.3-.3.5-.3.8-.5.5-.3.8-.3 1.1-.3.5 0 .8 0 1.1.3.5.3.8.3 1.1.5s.2.6.5 1.1zm-2.2 1.4c.5 0 .5-.3.8-.3.3-.3.3-.5.3-.8 0-.3 0-.5-.3-.8-.3 0-.5-.3-1.1-.3h-1.6v3.5h.8V426h.3l1.1 1.4h.8l-1.1-1.3zM576 81v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V81c0-26.5 21.5-48 48-48h480c26.5 0 48 21.5 48 48zM64 220.6c0 76.5 62.1 138.5 138.5 138.5 27.2 0 53.9-8.2 76.5-23.1-72.9-59.3-72.4-171.2 0-230.5-22.6-15-49.3-23.1-76.5-23.1-76.4-.1-138.5 62-138.5 138.2zm224 108.8c70.5-55 70.2-162.2 0-217.5-70.2 55.3-70.5 162.6 0 217.5zm-142.3 76.3c0-8.7-5.7-14.4-14.7-14.7-4.6 0-9.5 1.4-12.8 6.5-2.4-4.1-6.5-6.5-12.2-6.5-3.8 0-7.6 1.4-10.6 5.4V392h-8.2v36.7h8.2c0-18.9-2.5-30.2 9-30.2 10.2 0 8.2 10.2 8.2 30.2h7.9c0-18.3-2.5-30.2 9-30.2 10.2 0 8.2 10 8.2 30.2h8.2v-23zm44.9-13.7h-7.9v4.4c-2.7-3.3-6.5-5.4-11.7-5.4-10.3 0-18.2 8.2-18.2 19.3 0 11.2 7.9 19.3 18.2 19.3 5.2 0 9-1.9 11.7-5.4v4.6h7.9V392zm40.5 25.6c0-15-22.9-8.2-22.9-15.2 0-5.7 11.9-4.8 18.5-1.1l3.3-6.5c-9.4-6.1-30.2-6-30.2 8.2 0 14.3 22.9 8.3 22.9 15 0 6.3-13.5 5.8-20.7.8l-3.5 6.3c11.2 7.6 32.6 6 32.6-7.5zm35.4 9.3l-2.2-6.8c-3.8 2.1-12.2 4.4-12.2-4.1v-16.6h13.1V392h-13.1v-11.2h-8.2V392h-7.6v7.3h7.6V416c0 17.6 17.3 14.4 22.6 10.9zm13.3-13.4h27.5c0-16.2-7.4-22.6-17.4-22.6-10.6 0-18.2 7.9-18.2 19.3 0 20.5 22.6 23.9 33.8 14.2l-3.8-6c-7.8 6.4-19.6 5.8-21.9-4.9zm59.1-21.5c-4.6-2-11.6-1.8-15.2 4.4V392h-8.2v36.7h8.2V408c0-11.6 9.5-10.1 12.8-8.4l2.4-7.6zm10.6 18.3c0-11.4 11.6-15.1 20.7-8.4l3.8-6.5c-11.6-9.1-32.7-4.1-32.7 15 0 19.8 22.4 23.8 32.7 15l-3.8-6.5c-9.2 6.5-20.7 2.6-20.7-8.6zm66.7-18.3H408v4.4c-8.3-11-29.9-4.8-29.9 13.9 0 19.2 22.4 24.7 29.9 13.9v4.6h8.2V392zm33.7 0c-2.4-1.2-11-2.9-15.2 4.4V392h-7.9v36.7h7.9V408c0-11 9-10.3 12.8-8.4l2.4-7.6zm40.3-14.9h-7.9v19.3c-8.2-10.9-29.9-5.1-29.9 13.9 0 19.4 22.5 24.6 29.9 13.9v4.6h7.9v-51.7zm7.6-75.1v4.6h.8V302h1.9v-.8h-4.6v.8h1.9zm6.6 123.8c0-.5 0-1.1-.3-1.6-.3-.3-.5-.8-.8-1.1-.3-.3-.8-.5-1.1-.8-.5 0-1.1-.3-1.6-.3-.3 0-.8.3-1.4.3-.5.3-.8.5-1.1.8-.5.3-.8.8-.8 1.1-.3.5-.3 1.1-.3 1.6 0 .3 0 .8.3 1.4 0 .3.3.8.8 1.1.3.3.5.5 1.1.8.5.3 1.1.3 1.4.3.5 0 1.1 0 1.6-.3.3-.3.8-.5 1.1-.8.3-.3.5-.8.8-1.1.3-.6.3-1.1.3-1.4zm3.2-124.7h-1.4l-1.6 3.5-1.6-3.5h-1.4v5.4h.8v-4.1l1.6 3.5h1.1l1.4-3.5v4.1h1.1v-5.4zm4.4-80.5c0-76.2-62.1-138.3-138.5-138.3-27.2 0-53.9 8.2-76.5 23.1 72.1 59.3 73.2 171.5 0 230.5 22.6 15 49.5 23.1 76.5 23.1 76.4.1 138.5-61.9 138.5-138.4z"
/>
</svg>
Expand Down
Loading

0 comments on commit 5b0ca60

Please sign in to comment.