reactMoviesListAddFormCopy1

README.md

@@ -30,4 +30,4 @@ const pattern = /^((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=+$,\w]+@)?[A-Za-z0-9.-]+|(
 - Implement a solution following the [React task guideline](https://github.com/mate-academy/react_task-guideline#react-tasks-guideline).
 - Use the [React TypeScript cheat sheet](https://mate-academy.github.io/fe-program/js/extra/react-typescript).
 - Open one more terminal and run tests with `npm test` to ensure your solution is correct.
-- Replace `<your_account>` with your Github username in the [DEMO LINK](https://<your_account>.github.io/react_movies-list-add-form/) and add it to the PR description.
+- Replace `<your_account>` with your Github username in the [DEMO LINK](https://SerhiiSemennikov.github.io/react_movies-list-add-form/) and add it to the PR description.

src/App.tsx

@@ -2,15 +2,31 @@ import './App.scss';
 import { MoviesList } from './components/MoviesList';
 import { NewMovie } from './components/NewMovie';
 import moviesFromServer from './api/movies.json';
+import React, { useState, useCallback } from 'react';
+import { Movie } from './types/Movie';
 
 export const App = () => {
+  const visibleMovies = [...moviesFromServer];
+  const [movies, setMovies] = useState<Movie[]>(visibleMovies);
+
+  const addMovie = useCallback((newMovie: Movie) => {
+    setMovies(currentMovies => {
+      return [...currentMovies, newMovie];
+    });
+  }, []);
+
   return (
     <div className="page">
       <div className="page-content">
-        <MoviesList movies={moviesFromServer} />
+        <MoviesList movies={movies} />
       </div>
       <div className="sidebar">
-        <NewMovie /* onAdd={(movie) => {}} */ />
+        <NewMovie
+          onAdd={addMovie}
+          movies={movies}
+          errorMessage={''}
+          titleErrorMessage={''}
+        />
       </div>
     </div>
   );

src/components/MovieCard/MovieCard.tsx

@@ -24,7 +24,9 @@ export const MovieCard: React.FC<Props> = ({ movie }) => (
           <p className="title is-8">{movie.title}</p>
         </div>
       </div>
-
+      <div className="media-content">
+        <p className="title is-8"></p>
+      </div>
       <div className="content">
         {movie.description}
         <br />

src/components/NewMovie/NewMovie.tsx

@@ -1,30 +1,126 @@
 import { useState } from 'react';
 import { TextField } from '../TextField';
+import React from 'react';
+import { Movie } from '../../types/Movie';
 
-export const NewMovie = () => {
+type Props = {
+  onAdd: (newMovie: Movie) => void;
+  //getMaxId: (movies: Movie[]) => number | (() => number);
+  movies: Movie[];
+  errorMessage: string;
+  titleErrorMessage: string;
+};
+function getMaxId(movies: Movie[]) {
+  return Math.max(...movies.map(m => movies.indexOf(m)));
+}
+
+export const NewMovie: React.FC<Props> = ({ onAdd, movies }) => {
   // Increase the count after successful form submission
   // to reset touched status of all the `Field`s
-  const [count] = useState(0);
+
+  const [count, setCount] = useState(getMaxId(movies) + 1);
+
+  const [title, setTitle] = useState('');
+  const [description, setDescription] = useState('');
+  const [imgUrl, setImgUrl] = useState('');
+  const [imdbUrl, setImdbUrl] = useState('');
+  const [imdbId, setImdbId] = useState('');
+  const [errorMessage, setErrorMessage] = useState('');
+  const [titleErrorMessage, setTitleErrorMessage] = useState('');
+  const pattern =
+    // eslint-disable-next-line max-len
+    /^((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=+$,\w]+@)?[A-Za-z0-9.-]+|(?:www\.|[-;:&=+$,\w]+@)[A-Za-z0-9.-]+)((?:\/[+~%/.\w-_]*)?\??(?:[-+=&;%@,.\w_]*)#?(?:[,.!/\\\w]*))?)$/;
+  const reset = () => {
+    setTitle('');
+    setImgUrl('');
+    setImdbUrl('');
+    setImdbId('');
+    setDescription('');
+    setTitleErrorMessage('');
+    setErrorMessage('');
+  };
+
+  const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    const movie = {
+      title: title,
+      description: description,
+      imgUrl: imgUrl,
+      imdbUrl: imdbUrl,
+      imdbId: imdbId,
+      count: count,
+    };
+
+    //if (!title || !imdbUrl || !imgUrl) {
+    // return;
+    //}
+    if (!title) {
+      setTitleErrorMessage('should have some text');
+    } else if (title.length < 5) {
+      setTitleErrorMessage('should have at least 5 chars');
+    }
+
+    if (!pattern.test(imgUrl) || !pattern.test(imdbUrl)) {
+      setErrorMessage('not valid');
+
+      return;
+    }
+
+    if (!title || !imdbUrl || !imgUrl || title.length < 5) {
+      return;
+    }
+
+    onAdd(movie);
+    setCount(currentCount => currentCount + 1);
+    reset();
+  };
 
   return (
-    <form className="NewMovie" key={count}>
+    <form className="NewMovie" key={count} onSubmit={handleSubmit}>
       <h2 className="title">Add a movie</h2>
 
       <TextField
         name="title"
         label="Title"
-        value=""
-        onChange={() => {}}
+        value={title}
+        onChange={setTitle}
         required
+        errorMessage={titleErrorMessage}
       />
 
-      <TextField name="description" label="Description" value="" />
+      <TextField
+        name="description"
+        label="Description"
+        value={description}
+        onChange={setDescription}
+        errorMessage=""
+      />
 
-      <TextField name="imgUrl" label="Image URL" value="" />
+      <TextField
+        name="imgUrl"
+        label="Image URL"
+        value={imgUrl}
+        onChange={setImgUrl}
+        required
+        errorMessage={errorMessage}
+      />
 
-      <TextField name="imdbUrl" label="Imdb URL" value="" />
+      <TextField
+        name="imdbUrl"
+        label="Imdb URL"
+        value={imdbUrl}
+        onChange={setImdbUrl}
+        required
+        errorMessage={errorMessage}
+      />
 
-      <TextField name="imdbId" label="Imdb ID" value="" />
+      <TextField
+        name="imdbId"
+        label="Imdb ID"
+        value={imdbId}
+        onChange={setImdbId}
+        errorMessage=""
+      />
 
       <div className="field is-grouped">
         <div className="control">

src/components/TextField/TextField.tsx

@@ -7,6 +7,8 @@ type Props = {
   label?: string;
   placeholder?: string;
   required?: boolean;
+  errorMessage: string;
+
   onChange?: (newValue: string) => void;
 };
 
@@ -18,6 +20,7 @@ export const TextField: React.FC<Props> = ({
   name,
   value,
   label = name,
+  errorMessage,
   placeholder = `Enter ${label}`,
   required = false,
   onChange = () => {},
@@ -27,14 +30,14 @@ export const TextField: React.FC<Props> = ({
 
   // To show errors only if the field was touched (onBlur)
   const [touched, setTouched] = useState(false);
-  const hasError = touched && required && !value;
+
+  let hasError = touched && required && !value;
 
   return (
     <div className="field">
       <label className="label" htmlFor={id}>
         {label}
       </label>
-
       <div className="control">
         <input
           type="text"
@@ -49,8 +52,11 @@ export const TextField: React.FC<Props> = ({
           onBlur={() => setTouched(true)}
         />
       </div>
-
+      {errorMessage && (hasError = false)}
       {hasError && <p className="help is-danger">{`${label} is required`}</p>}
+      {errorMessage && (
+        <p className="help is-danger">{`${label} ${errorMessage}`}</p>
+      )}
     </div>
   );
 };