diff --git a/build/assets/notifications/alert.svg b/build/assets/notifications/alert.svg new file mode 100644 index 0000000..c6823f1 --- /dev/null +++ b/build/assets/notifications/alert.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/build/assets/notifications/fact.svg b/build/assets/notifications/fact.svg new file mode 100644 index 0000000..1c538ad --- /dev/null +++ b/build/assets/notifications/fact.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/build/assets/notifications/info.svg b/build/assets/notifications/info.svg new file mode 100644 index 0000000..1c538ad --- /dev/null +++ b/build/assets/notifications/info.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/build/assets/notifications/warning.svg b/build/assets/notifications/warning.svg new file mode 100644 index 0000000..0090f6a --- /dev/null +++ b/build/assets/notifications/warning.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/build/assets/sponsor/money.jpg b/build/assets/sponsor/money.jpg index 731b08b..f648d3c 100644 Binary files a/build/assets/sponsor/money.jpg and b/build/assets/sponsor/money.jpg differ diff --git a/public/assets/games/gameconsole.jpg b/public/assets/games/gameconsole.jpg deleted file mode 100644 index 4eb1321..0000000 Binary files a/public/assets/games/gameconsole.jpg and /dev/null differ diff --git a/public/assets/games/quize.png b/public/assets/games/quize.png deleted file mode 100644 index 2eb3941..0000000 Binary files a/public/assets/games/quize.png and /dev/null differ diff --git a/public/assets/games/races.jpg b/public/assets/games/races.jpg deleted file mode 100644 index 586aafc..0000000 Binary files a/public/assets/games/races.jpg and /dev/null differ diff --git a/public/assets/games/wheel.jpg b/public/assets/games/wheel.jpg deleted file mode 100644 index b7046f4..0000000 Binary files a/public/assets/games/wheel.jpg and /dev/null differ diff --git a/public/assets/sponsor/money.jpg b/public/assets/sponsor/money.jpg index 731b08b..f648d3c 100644 Binary files a/public/assets/sponsor/money.jpg and b/public/assets/sponsor/money.jpg differ diff --git a/scripts/add-analytics.js b/scripts/add-analytics.js index 550dec8..ab1c850 100644 --- a/scripts/add-analytics.js +++ b/scripts/add-analytics.js @@ -18,7 +18,18 @@ const YandexMetrika = ` `; +const GoogleAnalytics = ` + + +`; + const html = fs.readFileSync('../build/index.html', 'utf8'); const text = html - .replace(/<\/body>/gim, `\n${YandexMetrika}\n`); + .replace(/<\/body>/gim, `\n${YandexMetrika}\n${GoogleAnalytics}\n`); fs.writeFileSync('../build/index.html', text); diff --git a/src/ts/components/Sponsor/components/money.tsx b/src/ts/components/Sponsor/components/money.tsx index f4ae7ea..bca5b01 100644 --- a/src/ts/components/Sponsor/components/money.tsx +++ b/src/ts/components/Sponsor/components/money.tsx @@ -1,4 +1,5 @@ import React from 'react'; +import { useTranslation } from 'react-i18next'; import { observer } from 'mobx-react-lite'; import UiKitButton from 'ts/components/UiKit/components/Button'; @@ -8,19 +9,22 @@ import sponsorStore from '../store'; import style from '../styles/index.module.scss'; const Money = observer((): React.ReactElement | null => { + const { t } = useTranslation(); + return ( { sponsorStore.close(); }} >
- Поддержите проект + {t('page.sponsor.title')}

- Мы будем рады, если вы поддержите нас любой суммой! Все средства пойдут на дальнейшее развитие проекта. + {t('page.sponsor.money.description')}

{
diff --git a/src/ts/components/Sponsor/components/share.tsx b/src/ts/components/Sponsor/components/share.tsx index 9c3d159..b29854b 100644 --- a/src/ts/components/Sponsor/components/share.tsx +++ b/src/ts/components/Sponsor/components/share.tsx @@ -27,7 +27,7 @@ const Share = observer((): React.ReactElement | null => { }} >
- {t('page.sponsor.share.title')} + {t('page.sponsor.title')}

diff --git a/src/ts/components/Sponsor/store/index.ts b/src/ts/components/Sponsor/store/index.ts index 83e3280..3661efc 100644 --- a/src/ts/components/Sponsor/store/index.ts +++ b/src/ts/components/Sponsor/store/index.ts @@ -30,7 +30,7 @@ class SponsorStore { setInterval(() => { if (this.type) return; this.type = Math.random() > 0.5 - ? MODAL_TYPE.SHARE + ? MODAL_TYPE.MONEY : MODAL_TYPE.SHARE; }, 10 * ONE_MINUTE); } diff --git a/src/ts/components/Sponsor/styles/index.module.scss b/src/ts/components/Sponsor/styles/index.module.scss index 8e0a67d..f83afd1 100644 --- a/src/ts/components/Sponsor/styles/index.module.scss +++ b/src/ts/components/Sponsor/styles/index.module.scss @@ -11,6 +11,14 @@ padding: 0; } + &_cover { + display: block; + width: 50%; + height: auto; + padding: 0; + margin: 0 auto; + } + &_text { font-size: var(--space-l); font-weight: 100; diff --git a/src/ts/components/SwimmingPool/components/Track.tsx b/src/ts/components/SwimmingPool/components/Track.tsx index 0ce98b9..89f39eb 100644 --- a/src/ts/components/SwimmingPool/components/Track.tsx +++ b/src/ts/components/SwimmingPool/components/Track.tsx @@ -27,7 +27,7 @@ function Track({ maxValue, }: ITrackProps): React.ReactElement | null { if (!title) return null; - console.log(maxValue); + const percent = (maxValue * 1.1) / 100; const width = Math.ceil(value / percent); @@ -37,10 +37,10 @@ function Track({ text={title} length={10} /> -

+
{value}
-
+
- +
{lines}
diff --git a/src/ts/components/SwimmingPool/styles/track.module.scss b/src/ts/components/SwimmingPool/styles/track.module.scss index ba9236b..bf06495 100644 --- a/src/ts/components/SwimmingPool/styles/track.module.scss +++ b/src/ts/components/SwimmingPool/styles/track.module.scss @@ -19,10 +19,11 @@ height: 100%; text-decoration: none; vertical-align: middle; + background-size: auto 100%; } &_value { - width: 80px; + width: 85px; line-height: 80px; text-align: center; color: var(--color-black); @@ -30,25 +31,25 @@ } &_line { - width: calc(100% - 505px); - border-left: 16px solid var(--color-12); - border-right: 16px solid var(--color-12); - border-bottom: 6px dashed white; + overflow: hidden; + width: calc(100% - 459px); background-color: var(--color-31); } &_chart { width: 50%; text-align: right; - background-color: var(--color-button-2); + background-color: rgba(0, 0, 55, 0.4); } &_man { position: relative; - top: 15px; - left: 25px; - width: 50px; - height: 50px; - background-color: red; + top: 20px; + left: 30px; + height: 40px; } } + +.swimming_pool_track + .swimming_pool_track .swimming_pool_track_line { + border-top: 4px dashed red; +} diff --git a/src/ts/translations/de/pages.ts b/src/ts/translations/de/pages.ts index 2dd74d9..1cacc1f 100644 --- a/src/ts/translations/de/pages.ts +++ b/src/ts/translations/de/pages.ts @@ -229,7 +229,10 @@ will be marked as a jump in "deleted" and "added" lines. § page.person.week.days: days § page.person.week.workDay: weekdays § page.person.week.weekends: weekends -§ page.sponsor.share.title: Please, support this project +§ page.sponsor.title: Please, support this project § page.sponsor.share.description: Tell about our [project|https://github.com/bakhirev/assayo] on social networks! You can share [article|https://habr.com/ru/articles/763342/], [post|https://www.reddit.com/r/github/comments/1bvtsl3/how_i_parsed_git_statistics/] or make a video review. § page.sponsor.share.button: Copy the link +§ page.sponsor.money.description: We will be glad if you support us with any amount! All funds will be used for the further development of the project. +§ page.sponsor.money.qr: One-time payment (only Russia) +§ page.sponsor.money.github: GitHub Sponsor `; diff --git a/src/ts/translations/en/pages.ts b/src/ts/translations/en/pages.ts index 9800b74..5fb793b 100644 --- a/src/ts/translations/en/pages.ts +++ b/src/ts/translations/en/pages.ts @@ -229,7 +229,10 @@ will be marked as a jump in "deleted" and "added" lines. § page.person.week.days: days § page.person.week.workDay: weekdays § page.person.week.weekends: weekends -§ page.sponsor.share.title: Please, support this project +§ page.sponsor.title: Please, support this project § page.sponsor.share.description: Tell about our [project|https://github.com/bakhirev/assayo] on social networks! You can share [article|https://habr.com/ru/articles/763342/], [post|https://www.reddit.com/r/github/comments/1bvtsl3/how_i_parsed_git_statistics/] or make a video review. § page.sponsor.share.button: Copy the link +§ page.sponsor.money.description: We will be glad if you support us with any amount! All funds will be used for the further development of the project. +§ page.sponsor.money.qr: One-time payment (only Russia) +§ page.sponsor.money.github: GitHub Sponsor `; diff --git a/src/ts/translations/es/pages.ts b/src/ts/translations/es/pages.ts index ffc71ff..bdac7fb 100644 --- a/src/ts/translations/es/pages.ts +++ b/src/ts/translations/es/pages.ts @@ -227,7 +227,10 @@ git puede Mostrar una pequeña cantidad de cambios en las estadísticas, y el re § page.person.week.days: days § page.person.week.workDay: entresemana § page.person.week.weekends: día de descanso -§ page.sponsor.share.title: Please, support this project +§ page.sponsor.title: Please, support this project § page.sponsor.share.description: Tell about our [project|https://github.com/bakhirev/assayo] on social networks! You can share [article|https://habr.com/ru/articles/763342/], [post|https://www.reddit.com/r/github/comments/1bvtsl3/how_i_parsed_git_statistics/] or make a video review. § page.sponsor.share.button: Copy the link +§ page.sponsor.money.description: We will be glad if you support us with any amount! All funds will be used for the further development of the project. +§ page.sponsor.money.qr: One-time payment (only Russia) +§ page.sponsor.money.github: GitHub Sponsor `; diff --git a/src/ts/translations/fr/pages.ts b/src/ts/translations/fr/pages.ts index 1e2e4af..1dd1e23 100644 --- a/src/ts/translations/fr/pages.ts +++ b/src/ts/translations/fr/pages.ts @@ -226,7 +226,10 @@ export default ` § page.person.week.days: jours § page.person.week.workDay: jours de semaine § page.person.week.weekends: congés -§ page.sponsor.share.title: Please, support this project +§ page.sponsor.title: Please, support this project § page.sponsor.share.description: Tell about our [project|https://github.com/bakhirev/assayo] on social networks! You can share [article|https://habr.com/ru/articles/763342/], [post|https://www.reddit.com/r/github/comments/1bvtsl3/how_i_parsed_git_statistics/] or make a video review. § page.sponsor.share.button: Copy the link +§ page.sponsor.money.description: We will be glad if you support us with any amount! All funds will be used for the further development of the project. +§ page.sponsor.money.qr: One-time payment (only Russia) +§ page.sponsor.money.github: GitHub Sponsor `; diff --git a/src/ts/translations/ja/pages.ts b/src/ts/translations/ja/pages.ts index 9800b74..5fb793b 100644 --- a/src/ts/translations/ja/pages.ts +++ b/src/ts/translations/ja/pages.ts @@ -229,7 +229,10 @@ will be marked as a jump in "deleted" and "added" lines. § page.person.week.days: days § page.person.week.workDay: weekdays § page.person.week.weekends: weekends -§ page.sponsor.share.title: Please, support this project +§ page.sponsor.title: Please, support this project § page.sponsor.share.description: Tell about our [project|https://github.com/bakhirev/assayo] on social networks! You can share [article|https://habr.com/ru/articles/763342/], [post|https://www.reddit.com/r/github/comments/1bvtsl3/how_i_parsed_git_statistics/] or make a video review. § page.sponsor.share.button: Copy the link +§ page.sponsor.money.description: We will be glad if you support us with any amount! All funds will be used for the further development of the project. +§ page.sponsor.money.qr: One-time payment (only Russia) +§ page.sponsor.money.github: GitHub Sponsor `; diff --git a/src/ts/translations/pt/pages.ts b/src/ts/translations/pt/pages.ts index 9800b74..5fb793b 100644 --- a/src/ts/translations/pt/pages.ts +++ b/src/ts/translations/pt/pages.ts @@ -229,7 +229,10 @@ will be marked as a jump in "deleted" and "added" lines. § page.person.week.days: days § page.person.week.workDay: weekdays § page.person.week.weekends: weekends -§ page.sponsor.share.title: Please, support this project +§ page.sponsor.title: Please, support this project § page.sponsor.share.description: Tell about our [project|https://github.com/bakhirev/assayo] on social networks! You can share [article|https://habr.com/ru/articles/763342/], [post|https://www.reddit.com/r/github/comments/1bvtsl3/how_i_parsed_git_statistics/] or make a video review. § page.sponsor.share.button: Copy the link +§ page.sponsor.money.description: We will be glad if you support us with any amount! All funds will be used for the further development of the project. +§ page.sponsor.money.qr: One-time payment (only Russia) +§ page.sponsor.money.github: GitHub Sponsor `; diff --git a/src/ts/translations/ru/pages.ts b/src/ts/translations/ru/pages.ts index 9c06a1b..8c2d370 100644 --- a/src/ts/translations/ru/pages.ts +++ b/src/ts/translations/ru/pages.ts @@ -229,7 +229,10 @@ git может показать малое количество изменени § page.person.week.days: дней § page.person.week.workDay: будни § page.person.week.weekends: выходные -§ page.sponsor.share.title: Поддержите проект +§ page.sponsor.title: Поддержите проект § page.sponsor.share.description: Расскажите о нашем [проекте|https://github.com/bakhirev/assayo] в соцсетях! Можно поделиться [статьей|https://habr.com/ru/articles/763342/], [постом|https://www.reddit.com/r/github/comments/1bvtsl3/how_i_parsed_git_statistics/] или сделать видео-обзор. § page.sponsor.share.button: Копировать ссылку +§ page.sponsor.money.description: Мы будем рады, если вы поддержите нас любой суммой! Все средства пойдут на дальнейшее развитие проекта. +§ page.sponsor.money.qr: Разовый платёж (СБП) +§ page.sponsor.money.github: Подписка GitHub Sponsor `;