Merge pull request #53 from MalakhN/test

Test

README.md

@@ -3,4 +3,4 @@
 * Frontend: https://movies-explorer.nomoredomains.rocks
 * Backend: https://api.movies-explorer.nomoredomains.rocks
 ***
-* Pull Request: https://github.com/MalakhN/movies-explorer-frontend/pull/51
+* Pull Request: https://github.com/MalakhN/movies-explorer-frontend/pull/52

src/components/Movies/Movies.js

@@ -101,14 +101,14 @@ function Movies({ movies, moviesError, savedMovies, onToggleLike }) {
   }, []);
 
   const renderMovies = React.useMemo(() => {
-    const cardsCounter = screenWidth < 768 ? 5 : screenWidth < 1280 ? 8 : 12;
+    const cardsCounter = screenWidth < 808 ? 5 : screenWidth < 1195 ? 8 : 12;
     return filteredMovies.slice(0, cardsCounter + nextMovies);
   }, [nextMovies, screenWidth, filteredMovies]);
 
   const handleClickButtonMore = () => {
-    if (screenWidth < 1280) {
+    if (screenWidth < 1195) {
       setNextMovies((prev) => prev + 2);
-    } else if (screenWidth >= 1280) {
+    } else if (screenWidth >= 1195) {
       setNextMovies((prev) => prev + 3);
     }
   };

src/components/Movies/MoviesCard/MoviesCard.js

@@ -1,5 +1,6 @@
 import React from "react";
 import { useLocation, Link } from "react-router-dom";
+import { movieLengthConv } from "../../../utils/movieLengthConv";
 import "./MoviesCard.css";
 
 function MoviesCard({ movie, savedMovies, onToggleLike, onRemoveMovie }) {
@@ -29,7 +30,7 @@ function MoviesCard({ movie, savedMovies, onToggleLike, onRemoveMovie }) {
     <article className="movies-card">
       <div className="movies-card__title-container">
         <span className="movies-card__name">{movie.nameRU}</span>
-        <span className="movies-card__duration">{movie.duration} минут</span>
+        <span className="movies-card__duration">{movieLengthConv(movie.duration)}</span>
       </div>
       <Link
         className="movies-card__trailer-link"

src/components/NotFound/NotFound.js

@@ -1,11 +1,12 @@
+import React from "react";
 import "./NotFound.css";
-import {useNavigate} from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 
-function NotFound() {
+function NotFound({ loggedIn }) {
   const navigate = useNavigate();
 
   function handleBackButtonClick() {
-    navigate(-1);
+    loggedIn ? navigate(-2) : navigate('/');
   }
 
   return (
@@ -21,4 +22,7 @@ function NotFound() {
   );
 }
 
-export default NotFound;
+export default NotFound;
+
+
+

src/components/Profile/Profile.js

@@ -20,7 +20,7 @@ function Profile(props) {
           <div className="profile__container">
             <h1 className="profile__title">Привет, {currentUser.name}!</h1>
             <ProfileForm onUpdateProfile={props.onUpdateProfile} serverError={props.serverError} isRequestSuccessful={props.isRequestSuccessful} />
-            <Link to="/signin" className="profile__exit-button" onClick={props.onSignOut}>
+            <Link to="/" className="profile__exit-button" onClick={props.onSignOut}>
               Выйти из аккаунта
             </Link>
           </div>

src/utils/movieLengthConv.js

@@ -0,0 +1,16 @@
+export function movieLengthConv(mins) {
+  const hours = Math.floor(mins / 60);
+  const minutes = mins % 60;
+
+  if (mins < 60) {
+    return `${mins} минут`
+  } else if (minutes > 0) {
+    return `${hours}ч ${minutes}м`;
+  } else if (hours = 1) {
+    return `${hours} час`;
+  } else if (hours != 1 && hours <= 4) {
+    return `${hours} часа`;
+  } else {
+    return `${hours} часов`;
+  }
+}