Errors fix

src/API/userWordAPI.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import { host, path } from '../constants';
 import { ExtendUserWord, UserWord } from '../Interfaces';
 

src/pages/eBook/controller/musicController.ts

@@ -29,8 +29,6 @@ const playSound = () => {
           audioArray = Object.values(audioObj) as Array<string>;
         }
         onStart();
-        // eslint-disable-next-line no-console
-        console.log(audioArray);
       }
     });
   });

src/pages/games/index.ts

@@ -98,6 +98,7 @@ export const renderSprint = (group: number, page: number) => {
             if (userWord.status === 404) {
               wordBase.optional.attemp = 1;
               wordBase.optional.isNewWord = true;
+              wordBase.optional.sprintNew = true;
               createUserWord({
                 userId,
                 wordId,
@@ -170,7 +171,7 @@ export const renderSprint = (group: number, page: number) => {
         && !flag
       ) {
         flag = true;
-        count = 1;
+        // count = 1;
       } else if (
         allResultsArray[i].classList.contains(
           'sprint-container__view-element-false',
@@ -182,6 +183,7 @@ export const renderSprint = (group: number, page: number) => {
     }
 
     if (localStorage.getItem('user_id')) {
+      localStorage.setItem('bestScore', bestScore.toString());
       const userId = <string>localStorage.getItem('user_id');
       const token = <string>localStorage.getItem('token');
       getUserStatistics({ userId, token }).then((response) => {

src/pages/statistics/statisticsController.ts

@@ -1,14 +1,14 @@
 import { Chart, registerables } from 'chart.js';
-import { getUserStatistics } from '../../API/userStatustics';
+// import { getUserStatistics } from '../../API/userStatustics';
 import { getAllUserWords } from '../../API/userWordAPI';
 import strings, { statsStrings } from '../../constants';
 import createElement, { removeAllChildNodes } from '../../helpers';
 import { ExtendUserWord } from '../../Interfaces';
 
 const MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
 
-const userId = String(localStorage.getItem('user_id'));
-const token = String(localStorage.getItem('token'));
+const userId = localStorage.getItem('user_id');
+const token = localStorage.getItem('token');
 
 const filterWordsByDate = (
   date: string,
@@ -57,31 +57,21 @@ const updateGameStatistics = (userWords: ExtendUserWord[]) => {
     const gameRightWords = game.querySelector('[data-id="right-words"]') as HTMLElement;
     let gameRightWordsNumber = 0;
 
-    try {
-      gameRightWordsNumber = await getUserStatistics({ userId, token });
-    } catch {
-      gameRightWordsNumber = 0;
-    }
+    // try {
+    //   gameRightWordsNumber = await getUserStatistics({ userId, token });
+    // } catch {
+    //   gameRightWordsNumber = 0;
+    // }
 
     const now = Date.now();
     const dayBefore = now - 24 * 60 * 60 * 1000;
 
     if ((game as HTMLElement).dataset.game === 'Спринт') {
-      userWords.forEach((word) => {
-        if (word.optional.sprintNew) {
-          const { dateSprintNew } = word.optional;
-          if (dayBefore <= Number(dateSprintNew)) {
-            gameNewWordsNumber += 1;
-          }
-
-          if (word.optional.sprintLearned) {
-            const { dateSprintLearned } = word.optional;
-            if (dayBefore <= Number(dateSprintLearned)) {
-              gameLearnedWordsNumber += 1;
-            }
-          }
-        }
-      });
+      gameNewWordsNumber = userWords.filter((gameWord) => gameWord.optional.sprintNew && filterWordsByDate(gameWord.optional.dateSprintNew)).length;
+      gameLearnedWordsNumber = userWords.filter((gameWord) => gameWord.optional.sprintLearned && filterWordsByDate(gameWord.optional.dateSprintLearned)).length;
+      if (localStorage.getItem('bestScore')) {
+        gameRightWordsNumber = Number(localStorage.getItem('bestScore') as string);
+      }
     }
 
     if ((game as HTMLElement).dataset.game === 'Аудиовызов') {
@@ -172,20 +162,28 @@ const updateAllTimeStatistics = (userWords: ExtendUserWord[]) => {
   }
 };
 
+const showErrorMessage = () => {
+  const errorMessage = createElement('div', 'stats__error-message');
+  errorMessage.textContent = strings.needLogin;
+  const allStatsContainer = document.querySelector('.canvas-container') as HTMLElement;
+  removeAllChildNodes(allStatsContainer);
+  allStatsContainer?.append(errorMessage);
+};
+
 const updateStatistics = async () => {
   let userWords: ExtendUserWord[] = [];
-  try {
-    userWords = await getAllUserWords({ userId, token });
-  } catch (error) {
-    const errorMessage = createElement('div', 'stats__error-message');
-    errorMessage.textContent = strings.needLogin;
-    const allStatsContainer = document.querySelector('.canvas-container') as HTMLElement;
-    removeAllChildNodes(allStatsContainer);
-    allStatsContainer?.append(errorMessage);
+  if (userId && token) {
+    try {
+      userWords = await getAllUserWords({ userId, token });
+      updateWordsStatistics(userWords);
+      updateGameStatistics(userWords);
+      updateAllTimeStatistics(userWords);
+    } catch {
+      showErrorMessage();
+    }
+  } else {
+    showErrorMessage();
   }
-  updateWordsStatistics(userWords);
-  updateGameStatistics(userWords);
-  updateAllTimeStatistics(userWords);
 };
 
 export default updateStatistics;

tsconfig.json

@@ -11,7 +11,7 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
+    "target": "es2017" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */