diff --git a/README.md b/README.md
index abe3db5d7..eed80a468 100644
--- a/README.md
+++ b/README.md
@@ -27,4 +27,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://venher-v.github.io/react_movies-list-add-form/) and add it to the PR description.
diff --git a/src/App.tsx b/src/App.tsx
index 34be670b0..3b8c8b954 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -2,15 +2,22 @@ import './App.scss';
 import { MoviesList } from './components/MoviesList';
 import { NewMovie } from './components/NewMovie';
 import moviesFromServer from './api/movies.json';
+import { Movie } from './types/Movie';
+import { useState } from 'react';
 
 export const App = () => {
+  const [movies, setMovies] = useState(moviesFromServer);
+  const handleMovie = (newMovie: Movie) => {
+    setMovies(prevMovies => [...prevMovies, newMovie]);
+  };
+
   return (
     <div className="page">
       <div className="page-content">
-        <MoviesList movies={moviesFromServer} />
+        <MoviesList movies={movies} />
       </div>
       <div className="sidebar">
-        <NewMovie /* onAdd={(movie) => {}} */ />
+        <NewMovie onAdd={handleMovie} />
       </div>
     </div>
   );
diff --git a/src/components/NewMovie/NewMovie.tsx b/src/components/NewMovie/NewMovie.tsx
index 85bace9dd..2a56ef291 100644
--- a/src/components/NewMovie/NewMovie.tsx
+++ b/src/components/NewMovie/NewMovie.tsx
@@ -1,30 +1,112 @@
 import { useState } from 'react';
 import { TextField } from '../TextField';
+import { Movie } from '../../types/Movie';
+type Props = {
+  onAdd: (movie: Movie) => void;
+};
 
-export const NewMovie = () => {
+export const NewMovie: React.FC<Props> = ({ onAdd }) => {
   // Increase the count after successful form submission
   // to reset touched status of all the `Field`s
-  const [count] = useState(0);
+  const [count, setCount] = useState(0);
+  const [title, setTitle] = useState('');
+  const [description, setDescription] = useState('');
+  const [imgUrl, setImgUrl] = useState('');
+  const [imdbUrl, setImdbUrl] = useState('');
+  const [imdbId, setImdbId] = useState('');
+  // const [hasError, setError] = useState(false);
+
+  const handleTitle = (val: string) => {
+    setTitle(val);
+  };
+
+  const handleDescription = (val: string) => {
+    setDescription(val);
+  };
+
+  const handleImgUrl = (val: string) => {
+    setImgUrl(val);
+  };
+
+  const handleImdbUrl = (val: string) => {
+    setImdbUrl(val);
+  };
+
+  const handleImdbId = (val: string) => {
+    setImdbId(val);
+  };
+
+  const trimmedTitle = title.trim();
+  const trimmedDescription = description.trim();
+  const trimmedImgUrl = imgUrl.trim();
+  const trimmedImdbUrl = imdbUrl.trim();
+  const trimmedImdbId = imdbId.trim();
+
+  const newMovie = {
+    title: trimmedTitle,
+    description: trimmedDescription,
+    imgUrl: trimmedImgUrl,
+    imdbUrl: trimmedImdbUrl,
+    imdbId: trimmedImdbId,
+  };
+
+  const handleSubmit = (event: React.FormEvent) => {
+    event.preventDefault();
+
+    if (trimmedTitle && trimmedImgUrl && trimmedImdbUrl && trimmedImdbId) {
+      onAdd(newMovie);
+    }
+
+    setTitle('');
+    setDescription('');
+    setImgUrl('');
+    setImdbUrl('');
+    setImdbId('');
+    setCount(prev => prev + 1);
+  };
 
   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={handleTitle}
         required
       />
 
-      <TextField name="description" label="Description" value="" />
+      <TextField
+        name="description"
+        label="Description"
+        value={description}
+        onChange={handleDescription}
+      />
 
-      <TextField name="imgUrl" label="Image URL" value="" />
+      <TextField
+        name="imgUrl"
+        label="Image URL"
+        value={imgUrl}
+        onChange={handleImgUrl}
+        required
+      />
 
-      <TextField name="imdbUrl" label="Imdb URL" value="" />
+      <TextField
+        name="imdbUrl"
+        label="Imdb URL"
+        value={imdbUrl}
+        onChange={handleImdbUrl}
+        required
+      />
 
-      <TextField name="imdbId" label="Imdb ID" value="" />
+      <TextField
+        name="imdbId"
+        label="Imdb ID"
+        value={imdbId}
+        onChange={handleImdbId}
+        required
+      />
 
       <div className="field is-grouped">
         <div className="control">
@@ -32,6 +114,9 @@ export const NewMovie = () => {
             type="submit"
             data-cy="submit-button"
             className="button is-link"
+            disabled={
+              !trimedTitle || !trimedImgUrl || !trimmedImdbUrl || !trimmedImdbId
+            }
           >
             Add
           </button>