diff --git a/src/Components/Buttons/CommanderDamage.tsx b/src/Components/Buttons/CommanderDamage.tsx index 16077eb..3333a15 100644 --- a/src/Components/Buttons/CommanderDamage.tsx +++ b/src/Components/Buttons/CommanderDamage.tsx @@ -1,7 +1,7 @@ import styled, { css } from 'styled-components/macro'; import { Player, Rotation } from '../../Types/Player'; import { useRef, useState } from 'react'; -import { OutlinedText } from '../Text/OutlinedText'; +import { OutlinedText } from '../Misc/OutlinedText'; const CommanderDamageContainer = styled.div<{ rotation: number; diff --git a/src/Components/Buttons/ExtraCounter.tsx b/src/Components/Buttons/ExtraCounter.tsx index bf5f141..39fe32e 100644 --- a/src/Components/Buttons/ExtraCounter.tsx +++ b/src/Components/Buttons/ExtraCounter.tsx @@ -1,7 +1,7 @@ import { ReactNode, useRef, useState } from 'react'; import styled, { css } from 'styled-components/macro'; import { CounterType, Rotation } from '../../Types/Player'; -import { OutlinedText } from '../Text/OutlinedText'; +import { OutlinedText } from '../Misc/OutlinedText'; const ExtraCounterContainer = styled.div` display: flex; diff --git a/src/Components/LifeCounter/LifeCounter.tsx b/src/Components/LifeCounter/LifeCounter.tsx index 4f3e5a9..32efc11 100644 --- a/src/Components/LifeCounter/LifeCounter.tsx +++ b/src/Components/LifeCounter/LifeCounter.tsx @@ -6,7 +6,7 @@ import SettingsButton from '../Buttons/SettingsButton'; import CommanderDamageBar from '../Counters/CommanderDamageBar'; import ExtraCountersBar from '../Counters/ExtraCountersBar'; import PlayerMenu from '../PlayerMenu/PlayerMenu'; -import { OutlinedText } from '../Text/OutlinedText'; +import { OutlinedText } from '../Misc/OutlinedText'; const LifeCounterContentWrapper = styled.div<{ backgroundColor: string; diff --git a/src/Components/Text/OutlinedText.tsx b/src/Components/Misc/OutlinedText.tsx similarity index 100% rename from src/Components/Text/OutlinedText.tsx rename to src/Components/Misc/OutlinedText.tsx diff --git a/src/Components/Misc/SupportMe.tsx b/src/Components/Misc/SupportMe.tsx index 04a8441..1116591 100644 --- a/src/Components/Misc/SupportMe.tsx +++ b/src/Components/Misc/SupportMe.tsx @@ -1,23 +1,65 @@ import styled from 'styled-components'; -import { theme } from '../../Data/theme'; import { Paragraph } from './TextComponents'; +import { BuyMeCoffee, KoFi } from '../../Icons/generated/Support'; +import { theme } from '../../Data/theme'; +import { ButtonBase } from '@mui/material'; -const Footer = styled.div` - position: absolute; - bottom: 0; - width: 100%; - height: 58px; - background-color: ${theme.palette.primary.main}; +const SupportContainer = styled.div` display: flex; + flex-direction: row; align-items: center; justify-content: center; - padding: 0 16px; + margin: 16px 0; +`; + +const SupportButton = styled.button` + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + border: none; + background-color: transparent; + cursor: pointer; + padding: 0; + margin: 0; + background-color: ${theme.palette.primary.main}; + border-radius: 4px; + margin: 0 1rem; + padding: 0 1rem; + transition: background-color 0.2s ease-in-out; + box-shadow: 1px 2px 4px 0px rgba(0, 0, 0, 0.3); + &:hover { + background-color: ${theme.palette.primary.dark}; + } `; export const SupportMe = () => { + const handleOpenBuyMeCoffee = () => { + window.open('https://www.buymeacoffee.com/vikeo'); + }; + + const handleOpenKoFi = () => { + window.open('https://ko-fi.com/vikeo'); + }; + return ( - + + + + Buy me a tea + + + + Buy me a ko-fi + + ); }; diff --git a/src/Components/Views/StartMenu/StartMenu.tsx b/src/Components/Views/StartMenu/StartMenu.tsx index eee8c19..956c50c 100644 --- a/src/Components/Views/StartMenu/StartMenu.tsx +++ b/src/Components/Views/StartMenu/StartMenu.tsx @@ -206,7 +206,7 @@ const Start = ({ Start Game - {/* */} + ); }; diff --git a/src/Icons/generated/Support/BmcLogo.tsx b/src/Icons/generated/Support/BuyMeCoffee.tsx similarity index 98% rename from src/Icons/generated/Support/BmcLogo.tsx rename to src/Icons/generated/Support/BuyMeCoffee.tsx index 59148eb..5cbb6ad 100644 --- a/src/Icons/generated/Support/BmcLogo.tsx +++ b/src/Icons/generated/Support/BuyMeCoffee.tsx @@ -6,7 +6,7 @@ interface SVGRProps { titleId?: string; size?: string; } -const BmcLogo = ({ +const BuyMeCoffee = ({ title, titleId, ...props @@ -17,6 +17,7 @@ const BmcLogo = ({ width={props.size || 16} height={props.size || 16} fill="none" + viewBox="0 0 884 1279" aria-labelledby={titleId} {...props} > @@ -44,7 +45,7 @@ const BmcLogo = ({ ); }; -BmcLogo.propTypes = { +BuyMeCoffee.propTypes = { title: PropTypes.string, }; -export default BmcLogo; +export default BuyMeCoffee; diff --git a/src/Icons/generated/Support/KoFi.tsx b/src/Icons/generated/Support/KoFi.tsx new file mode 100644 index 0000000..245030c --- /dev/null +++ b/src/Icons/generated/Support/KoFi.tsx @@ -0,0 +1,36 @@ +import * as React from 'react'; +import type { SVGProps } from 'react'; +import PropTypes from 'prop-types'; +interface SVGRProps { + title?: string; + titleId?: string; + size?: string; +} +const KoFi = ({ + title, + titleId, + ...props +}: SVGProps & SVGRProps) => { + return ( + + {title ? {title} : null} + + + + + ); +}; +KoFi.propTypes = { + title: PropTypes.string, +}; +export default KoFi; diff --git a/src/Icons/generated/Support/index.ts b/src/Icons/generated/Support/index.ts index 6a74678..0cca453 100644 --- a/src/Icons/generated/Support/index.ts +++ b/src/Icons/generated/Support/index.ts @@ -1 +1,2 @@ -export { default as BmcLogo } from './BmcLogo'; +export { default as BuyMeCoffee } from './BuyMeCoffee'; +export { default as KoFi } from './KoFi'; diff --git a/src/Icons/svgs/Support/bmc-logo.svg b/src/Icons/svgs/Support/BuyMeCoffee.svg similarity index 98% rename from src/Icons/svgs/Support/bmc-logo.svg rename to src/Icons/svgs/Support/BuyMeCoffee.svg index 5ba6db9..5e75247 100644 --- a/src/Icons/svgs/Support/bmc-logo.svg +++ b/src/Icons/svgs/Support/BuyMeCoffee.svg @@ -1,4 +1,4 @@ - + diff --git a/src/Icons/svgs/Support/KoFi.svg b/src/Icons/svgs/Support/KoFi.svg new file mode 100644 index 0000000..51ee306 --- /dev/null +++ b/src/Icons/svgs/Support/KoFi.svg @@ -0,0 +1,39 @@ + + + + + + + + + + diff --git a/svgr.config.js b/svgr.config.js index f5df7bf..b451414 100644 --- a/svgr.config.js +++ b/svgr.config.js @@ -15,7 +15,8 @@ module.exports = { onlyMatchedOnce: false, }, removeDoctype: false, - removeViewBox: true, + removeViewBox: false, + mergePaths: true, }, }, },