update

build/assets/notifications/alert.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48" fill="#FFFFFF"><path d="M2 42 24 4l22 38Zm5.2-3h33.6L24 10Zm17-2.85q.65 0 1.075-.425.425-.425.425-1.075 0-.65-.425-1.075-.425-.425-1.075-.425-.65 0-1.075.425Q22.7 34 22.7 34.65q0 .65.425 1.075.425.425 1.075.425Zm-1.5-5.55h3V19.4h-3Zm1.3-6.1Z"/></svg>

build/assets/notifications/fact.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48" fill="#FFFFFF"><path d="M22.65 34h3V22h-3ZM24 18.3q.7 0 1.175-.45.475-.45.475-1.15t-.475-1.2Q24.7 15 24 15q-.7 0-1.175.5-.475.5-.475 1.2t.475 1.15q.475.45 1.175.45ZM24 44q-4.1 0-7.75-1.575-3.65-1.575-6.375-4.3-2.725-2.725-4.3-6.375Q4 28.1 4 23.95q0-4.1 1.575-7.75 1.575-3.65 4.3-6.35 2.725-2.7 6.375-4.275Q19.9 4 24.05 4q4.1 0 7.75 1.575 3.65 1.575 6.35 4.275 2.7 2.7 4.275 6.35Q44 19.85 44 24q0 4.1-1.575 7.75-1.575 3.65-4.275 6.375t-6.35 4.3Q28.15 44 24 44Zm.05-3q7.05 0 12-4.975T41 23.95q0-7.05-4.95-12T24 7q-7.05 0-12.025 4.95Q7 16.9 7 24q0 7.05 4.975 12.025Q16.95 41 24.05 41ZM24 24Z"/></svg>

build/assets/notifications/info.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48" fill="#FFFFFF"><path d="M22.65 34h3V22h-3ZM24 18.3q.7 0 1.175-.45.475-.45.475-1.15t-.475-1.2Q24.7 15 24 15q-.7 0-1.175.5-.475.5-.475 1.2t.475 1.15q.475.45 1.175.45ZM24 44q-4.1 0-7.75-1.575-3.65-1.575-6.375-4.3-2.725-2.725-4.3-6.375Q4 28.1 4 23.95q0-4.1 1.575-7.75 1.575-3.65 4.3-6.35 2.725-2.7 6.375-4.275Q19.9 4 24.05 4q4.1 0 7.75 1.575 3.65 1.575 6.35 4.275 2.7 2.7 4.275 6.35Q44 19.85 44 24q0 4.1-1.575 7.75-1.575 3.65-4.275 6.375t-6.35 4.3Q28.15 44 24 44Zm.05-3q7.05 0 12-4.975T41 23.95q0-7.05-4.95-12T24 7q-7.05 0-12.025 4.95Q7 16.9 7 24q0 7.05 4.975 12.025Q16.95 41 24.05 41ZM24 24Z"/></svg>

build/assets/notifications/warning.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48" fill="#FFFFFF"><path d="M31.3 21.35q1.15 0 1.925-.8.775-.8.775-1.9 0-1.15-.775-1.925-.775-.775-1.925-.775-1.1 0-1.9.775-.8.775-.8 1.925 0 1.1.8 1.9.8.8 1.9.8Zm-14.6 0q1.15 0 1.925-.8.775-.8.775-1.9 0-1.15-.775-1.925-.775-.775-1.925-.775-1.1 0-1.9.775-.8.775-.8 1.925 0 1.1.8 1.9.8.8 1.9.8Zm7.3 5.8q-3.35 0-6.075 1.875T13.9 34h2.65q1.1-2.1 3.1-3.25t4.4-1.15q2.35 0 4.325 1.175T31.5 34h2.6q-1.25-3.15-4-5T24 27.15ZM24 44q-4.15 0-7.8-1.575-3.65-1.575-6.35-4.275-2.7-2.7-4.275-6.35Q4 28.15 4 24t1.575-7.8Q7.15 12.55 9.85 9.85q2.7-2.7 6.35-4.275Q19.85 4 24 4t7.8 1.575q3.65 1.575 6.35 4.275 2.7 2.7 4.275 6.35Q44 19.85 44 24t-1.575 7.8q-1.575 3.65-4.275 6.35-2.7 2.7-6.35 4.275Q28.15 44 24 44Zm0-20Zm0 17q7.1 0 12.05-4.95Q41 31.1 41 24q0-7.1-4.95-12.05Q31.1 7 24 7q-7.1 0-12.05 4.95Q7 16.9 7 24q0 7.1 4.95 12.05Q16.9 41 24 41Z"/></svg>

scripts/add-analytics.js

@@ -18,7 +18,18 @@ const YandexMetrika = `
 <noscript><div><img src="https://mc.yandex.ru/watch/94903985" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
 `;
 
+const GoogleAnalytics = `
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-MRZGLE32FG"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'G-MRZGLE32FG');
+</script>
+`;
+
 const html = fs.readFileSync('../build/index.html', 'utf8');
 const text = html
-  .replace(/<\/body>/gim, `\n${YandexMetrika}\n</body>`);
+  .replace(/<\/body>/gim, `\n${YandexMetrika}\n${GoogleAnalytics}\n</body>`);
 fs.writeFileSync('../build/index.html', text);

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 (
     <Modal
       mode="halo"
+      delay={10}
       onClose={() => {
         sponsorStore.close();
       }}
     >
       <Header className={style.sponsor_title}>
-        Поддержите проект
+        {t('page.sponsor.title')}
       </Header>
       <Body className={style.sponsor_body}>
         <p className={style.sponsor_text}>
-          Мы будем рады, если вы поддержите нас любой суммой! Все средства пойдут на дальнейшее развитие проекта.
+          {t('page.sponsor.money.description')}
         </p>
         <img
           className={style.sponsor_cover}
@@ -29,20 +33,22 @@ const Money = observer((): React.ReactElement | null  => {
       </Body>
       <Footer className={style.sponsor_footer}>
         <UiKitButton
-          mode={['primary', 'full_size']}
+          mode={['border', 'full_size']}
           onClick={() => {
+            window.open('https://www.sberbank.com/sms/pbpn?requisiteNumber=79818413061', '_blank');
             sponsorStore.close();
           }}
         >
-          Разовый платёж (СБП)
+          {t('page.sponsor.money.qr')}
         </UiKitButton>
         <UiKitButton
           mode={['border', 'full_size']}
           onClick={() => {
+            window.open('https://github.com/sponsors/bakhirev', '_blank');
             sponsorStore.close();
           }}
         >
-          Подписка GitHub Sponsor
+          {t('page.sponsor.money.github')}
         </UiKitButton>
       </Footer>
     </Modal>

src/ts/components/Sponsor/components/share.tsx

@@ -27,7 +27,7 @@ const Share = observer((): React.ReactElement | null  => {
       }}
     >
       <Header className={style.sponsor_title}>
-        {t('page.sponsor.share.title')}
+        {t('page.sponsor.title')}
       </Header>
       <Body className={style.sponsor_body}>
         <p className={style.sponsor_text}>

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);
   }

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;

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}
       />
-      <div {...getProps(style.swimming_pool_track_value)}>
+      <div {...getProps(style.swimming_pool_track_value, './assets/games/swimmingPool/block.png')}>
         {value}
       </div>
-      <div {...getProps(style.swimming_pool_track_line)}>
+      <div {...getProps(style.swimming_pool_track_line, './assets/games/swimmingPool/water.png')}>
         <div
           className={style.swimming_pool_track_chart}
           style={{ width: `${width}%` }}

src/ts/components/SwimmingPool/index.tsx

@@ -31,18 +31,18 @@ function SwimmingPool({
 
   return (
     <>
-      <GameBanner src="./assets/games/races/bg.png" />
+      <GameBanner src="./assets/games/swimmingPool/bg.png" />
       <div
         className={style.swimming_pool_top_border}
         style={{
-          backgroundImage: 'url(./assets/games/swimmingPool/track_title.png)',
+          backgroundImage: 'url(./assets/games/swimmingPool/block2.png)',
         }}
       />
       {lines}
       <div
         className={style.swimming_pool_bottom_border}
         style={{
-          backgroundImage: 'url(./assets/games/swimmingPool/track_title.png)',
+          backgroundImage: 'url(./assets/games/swimmingPool/block2.png)',
         }}
       />
     </>

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);
+    overflow: hidden;
-    border-left: 16px solid var(--color-12);
+    width: calc(100% - 459px);
-    border-right: 16px solid var(--color-12);
-    border-bottom: 6px dashed white;
     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;
+    top: 20px;
-    left: 25px;
+    left: 30px;
-    width: 50px;
+    height: 40px;
-    height: 50px;
-    background-color: red;
   }
 }
+
+.swimming_pool_track + .swimming_pool_track .swimming_pool_track_line {
+  border-top: 4px dashed red;
+}

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
 `;

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
 `;

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
 `;

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
 `;

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
 `;

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
 `;

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
 `;