Fix features bugs

frontend-park-mail-ru · Dec 16, 2024 · d57cf09 · d57cf09
1 parent 0844231
commit d57cf09
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 38 deletions.
diff --git a/public/assets/icons/sendMessageIcon.svg b/public/assets/icons/sendMessageIcon.svg
diff --git a/public/components/Slider/Slider.scss b/public/components/Slider/Slider.scss
@@ -12,7 +12,6 @@
   &__track {
     display: flex;
     height: auto;
-    align-items: center;
 
     gap: 50px;
     transition: transform 0.5s ease;

diff --git a/public/pages/MoviePage/MoviePage.ts b/public/pages/MoviePage/MoviePage.ts
@@ -210,15 +210,17 @@ export class MoviePage {
     season?: number,
     series?: number,
   ) {
-    if (timeCode > duration * 0.95 || timeCode < duration * 0.05) {
-      Actions.deleteLastMovie();
-      return;
-    }
+    if (duration) {
+      if (timeCode > duration * 0.95 || timeCode < duration * 0.05) {
+        Actions.deleteLastMovie();
+        return;
+      }
 
-    if (!this.#movie?.isSerial) {
-      Actions.setLastMovies(timeCode, duration);
-    } else {
-      Actions.setLastMovies(timeCode, duration, season, series);
+      if (!this.#movie?.isSerial) {
+        Actions.setLastMovies(timeCode, duration);
+      } else {
+        Actions.setLastMovies(timeCode, duration, season, series);
+      }
     }
   }
 

diff --git a/public/pages/RoomPage/RoomPage.scss b/public/pages/RoomPage/RoomPage.scss
@@ -85,8 +85,8 @@
 
       &_button {
         cursor: pointer;
-        width: 36px;
-        height: 36px;
+        width: 37px;
+        height: 37px;
       }
 
       &_block {

diff --git a/public/pages/RoomPage/RoomPage.ts b/public/pages/RoomPage/RoomPage.ts
@@ -358,6 +358,25 @@ export class RoomPage {
         ) as HTMLButtonElement;
         sendMessageButton.addEventListener('click', () => this.sendMessage());
         this.handleChangeMovieClick();
+
+        const messageInput = document.getElementById(
+          'messages-input',
+        ) as HTMLInputElement;
+
+        const handleEnterKey = (event: KeyboardEvent) => {
+          if (event.key === 'Enter') {
+            event.preventDefault();
+            this.sendMessage();
+          }
+        };
+
+        messageInput.addEventListener('focus', () => {
+          messageInput.addEventListener('keydown', handleEnterKey);
+        });
+
+        messageInput.addEventListener('blur', () => {
+          messageInput.removeEventListener('keydown', handleEnterKey);
+        });
       } else {
         this.#loader.render();
       }

diff --git a/public/store/MoviePageStore.ts b/public/store/MoviePageStore.ts
@@ -184,6 +184,7 @@ class MoviePageStore {
           foundMovie.season = season;
           foundMovie.series = series;
           foundMovie.albumImage = seriesImage as string;
+          foundMovie.savingSeconds = Date.now();
         } else {
           this.#lastMovies.push({
             id: this.#movie.id,
@@ -313,35 +314,35 @@ class MoviePageStore {
         }
         break;
       case ActionTypes.SET_LAST_MOVIES:
-        if (userStore.getUser().username) {
-          // TODO: Расскомментировать после мержа
-          // this.setLastMoviesRequest({
-          //   ...action.payload,
-          //   id: this.#movie?.id,
-          //   title: this.#movie?.title,
-          //   albumImage: this.#movie?.albumImage,
-          //   savingSeconds: Date.now(),
-          // });
-        } else {
-          this.setLastMoviesToLocalStorage(
-            action.payload.timeCode,
-            action.payload.duration,
-            action.payload.season,
-            action.payload.series,
-          );
-        }
+        // if (userStore.getUser().username) {
+        // TODO: Расскомментировать после мержа
+        // this.setLastMoviesRequest({
+        //   ...action.payload,
+        //   id: this.#movie?.id,
+        //   title: this.#movie?.title,
+        //   albumImage: this.#movie?.albumImage,
+        //   savingSeconds: Date.now(),
+        // });
+        // } else {
+        this.setLastMoviesToLocalStorage(
+          action.payload.timeCode,
+          action.payload.duration,
+          action.payload.season,
+          action.payload.series,
+        );
+        // }
         break;
       case ActionTypes.COPY_LAST_MOVIES:
         // TODO: Расскомментировать после мержа
         // this.setLastMoviesRequest();
         break;
       case ActionTypes.DELETE_LAST_MOVIE:
-        if (userStore.getUser().username) {
-          // TODO: Расскомментировать после мержа
-          // this.deleteLastMovieRequest();
-        } else {
-          this.deleteLastMovieFromLocalStorage();
-        }
+        // if (userStore.getUser().username) {
+        // TODO: Расскомментировать после мержа
+        // this.deleteLastMovieRequest();
+        // } else {
+        this.deleteLastMovieFromLocalStorage();
+        // }
         break;
       case ActionTypes.RATE_MOVIE:
         this.rateMovieRequest(action.payload.rating);