fix

add search
small fix
2023-12-27 17:09:58 +04:00 · 2023-12-26 18:10:59 +04:00 · 2023-12-25 01:03:00 +04:00 · 2023-12-25 00:37:54 +04:00 · 2023-12-19 14:33:55 +04:00 · 2023-12-18 21:05:53 +04:00
72 changed files with 7775 additions and 13 deletions
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@ -0,0 +1,24 @@
+module.exports = {
+  root: true,
+  env: { browser: true, es2020: true },
+  extends: [
+    'eslint:recommended',
+    'plugin:react/recommended',
+    'plugin:react/jsx-runtime',
+    'plugin:react-hooks/recommended',
+  ],
+  ignorePatterns: ['dist', '.eslintrc.cjs'],
+  parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
+  settings: { react: { version: '18.2' } },
+  plugins: ['react-refresh'],
+  rules: {
+    'react-refresh/only-export-components': [
+      'warn',
+      { allowConstantExport: true },
+    ],
+    'indent': 'off',
+    'no-console': 'off',
+    'arrow-body-style': 'off',
+    'implicit-arrow-linebreak': 'off',
+  },
+}
--- a/.gitignore
+++ b/.gitignore
@ -1,14 +1,24 @@
-# ---> VisualStudioCode
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
 .vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
 !.vscode/extensions.json
-!.vscode/*.code-snippets
-
-# Local History for Visual Studio Code
-.history/
-
-# Built Visual Studio Code Extensions
-*.vsix
-
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
--- a/README.md
+++ b/README.md
@ -1,2 +1,29 @@
-# Internet-programming-Pibd-23-Tikhonenkov-Alexey-ULSTU
+#### Окружение:
+- nodejs 18;
+- VSCode;
+- ESLint плагин для VSCode;
+- для отладки необходимы бразузеры Chrome или Edge.

+#### Создание пустого проекта:
+
+```commandline
+npm create vite@latest ./ -- --template react 
+```
+
+#### Установка зависимостей:
+
+```commandline
+npm install
+```
+
+#### Запуск проекта:
+
+```commandline
+npm run dev
+```
+
+#### Сборка проекта:
+
+```commandline
+npm run build
+```
--- a/data.json
+++ b/data.json
--- a/icon.png
+++ b/icon.png
--- a/index.html
+++ b/index.html
@ -0,0 +1,14 @@
+<html lang="ru">
+
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>Фильмы онлайн</title>
+</head>
+
+<body>
+  <div id="root" class="h-100 d-flex flex-column"></div>
+  <script type="module" src="/src/main.jsx"></script>
+</body>
+
+</html>
--- a/jsconfig.json
+++ b/jsconfig.json
@ -0,0 +1,14 @@
+{
+    "compilerOptions": {
+        "module": "ESNext",
+        "moduleResolution": "Node",
+        "target": "ES2020",
+        "jsx": "react",
+        "strictNullChecks": true,
+        "strictFunctionTypes": true
+    },
+    "exclude": [
+        "node_modules",
+        "**/node_modules/*"
+    ]
+}
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -0,0 +1,38 @@
+{
+  "name": "lec4",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
+    "rest": "json-server data.json --port 8081",
+    "vite": "vite",
+    "dev": "npm-run-all --parallel rest vite",
+    "prod": "npm-run-all lint 'vite build' --parallel rest 'vite preview'"
+  },
+  "dependencies": {
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-router-dom": "^6.18.0",
+    "react-hot-toast": "^2.4.1",
+    "axios": "^1.6.1",
+    "bootstrap": "^5.3.2",
+    "react-bootstrap": "^2.9.1",
+    "react-bootstrap-icons": "^1.10.3",
+    "prop-types": "^15.8.1"
+  },
+  "devDependencies": {
+    "@types/react": "^18.2.15",
+    "@types/react-dom": "^18.2.15",
+    "@vitejs/plugin-react": "^4.0.3",
+    "eslint": "^8.45.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-react-refresh": "^0.4.3",
+    "json-server": "^0.17.4",
+    "npm-run-all": "^4.1.5",
+    "vite": "^4.4.5"
+  }
+}
--- a/src/App.css
+++ b/src/App.css
--- a/src/App.jsx
+++ b/src/App.jsx
@ -0,0 +1,24 @@
+import PropTypes from 'prop-types';
+import { Container } from 'react-bootstrap';
+import { Outlet } from 'react-router-dom';
+import './App.css';
+import Footer from './components/footer/Footer.jsx';
+import Navigation from './components/navigation/Navigation.jsx';
+
+const App = ({ routes }) => {
+  return (
+    <>
+      <Navigation routes={routes}></Navigation>
+      <Container className='p-2' as="main" fluid>
+        <Outlet />
+      </Container>
+      <Footer />
+    </>
+  );
+};
+
+App.propTypes = {
+  routes: PropTypes.array,
+};
+
+export default App;
--- a/src/Moviecard/MovieCard.jsx
+++ b/src/Moviecard/MovieCard.jsx
@ -0,0 +1,21 @@
+import PropTypes from 'prop-types';
+
+const MovieCard = ({ name, rating, image }) => {
+  return (
+    <div className="movie-card">
+      <img src={image || "https://via.placeholder.com/300x400"} alt="Movie Image" />
+      <div className="movie-card-content">
+        <h2>{name}</h2>
+        <p>Рейтинг: {rating}</p>
+      </div>
+    </div>
+  );
+};
+
+MovieCard.propTypes = {
+    name: PropTypes.string.isRequired,
+    rating: PropTypes.string.isRequired,
+    image: PropTypes.string,
+  };
+
+export default MovieCard;
--- a/src/Moviecard/MovieList.jsx
+++ b/src/Moviecard/MovieList.jsx
@ -0,0 +1,25 @@
+// MovieList.jsx
+
+import MovieCard from './MovieCard.jsx';
+import useLines from '../components/lines/hooks/LinesHook.js';
+
+const MovieList = () => {
+    // Вызовите useLines без фильтра, чтобы получить все фильмы
+    const { lines } = useLines();
+
+    
+
+    return (
+        <div>
+            
+                {lines.map((movieData) => (
+                    <MovieCard key={movieData.id} {...movieData} />
+                ))}
+            
+
+            
+        </div>
+    );
+};
+
+export default MovieList;
--- a/src/Moviecard/useMovieFilter.jsx
+++ b/src/Moviecard/useMovieFilter.jsx
@ -0,0 +1,33 @@
+import MovieCard from './MovieCard.jsx';
+import useTypes from '../components/types/hooks/TypesHook.js'; 
+import useLines from '../components/lines/hooks/LinesHook.js';
+
+const useMovieFilter = () => {
+    const { types } = useTypes();
+    const { lines } = useLines();
+
+    console.log("All lines:", lines);
+
+    const filterMoviesByType = (typeId) => {
+        const filteredMovies = lines.filter((line) => line.typeId === typeId);
+        console.log(`Type ID: ${typeId}, Filtered Movies:`, filteredMovies);
+        return filteredMovies;
+    };
+
+    return (
+        <>
+            {types.map((type) => (
+                <div className="movie-container" key={type.id}>
+                    <h1>{type.name}</h1>
+                    {filterMoviesByType(type.id.toString()).map((filteredMovie) => (
+                        <MovieCard key={filteredMovie.id} {...filteredMovie} />
+                    ))}
+                </div>
+            ))}
+        </>
+    );
+};
+
+
+
+export default useMovieFilter;
--- a/src/Moviecard/useMovieFilterByName.jsx
+++ b/src/Moviecard/useMovieFilterByName.jsx
@ -0,0 +1,46 @@
+import { useState } from 'react';
+import axios from 'axios';
+import MovieCard from './MovieCard.jsx';
+//import Input from '../components/input/Input.jsx'; // Замените на фактический путь
+import { Button } from 'react-bootstrap';
+
+const useMovieFilter = () => {
+    const [searchText, setSearchText] = useState('');
+    const [searchResult, setSearchResult] = useState([]);
+
+    const handleSearchChange = (e) => {
+        setSearchText(e.target.value);
+    };
+
+    const handleSearch = async () => {
+        try {
+            const response = await axios.get(`http://localhost:8081/lines?name_like=${searchText}`);
+            setSearchResult(response.data);
+        } catch (error) {
+            console.error('Error fetching movies:', error);
+        }
+    };
+    const handleKeyPress = (e) => {
+        if (e.key === 'Enter') {
+            handleSearch();
+        }
+    };
+    return (
+        <>
+            
+            <div class="input-group mb-3">
+                <input name="search "type="text" value={searchText} onChange={handleSearchChange} className="form-control" placeholder="Введите название фильма" aria-label="Search movies..."  aria-describedby="button-addon2" onKeyUp={handleKeyPress}/>
+                <button class="btn btn-outline-secondary" type="button" id="button-addon2" onClick={handleSearch}>Поиск</button>
+            </div>
+            
+            
+            <div className="movie-container">
+                {searchResult.map((movie) => (
+                    <MovieCard key={movie.id} {...movie} />
+                ))}
+            </div>
+        </>
+    );
+};
+
+export default useMovieFilter;
--- a/src/assets/1.jpg
+++ b/src/assets/1.jpg
--- a/src/assets/2.jpg
+++ b/src/assets/2.jpg
--- a/src/assets/3.jpg
+++ b/src/assets/3.jpg
--- a/src/assets/300x400.png
+++ b/src/assets/300x400.png
--- a/src/assets/react.svg
+++ b/src/assets/react.svg
@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
--- a/src/components/api/ApiClient.js
+++ b/src/components/api/ApiClient.js
@ -0,0 +1,40 @@
+import axios from 'axios';
+import toast from 'react-hot-toast';
+
+export class HttpError extends Error {
+    constructor(message = '') {
+        super(message);
+        this.name = 'HttpError';
+        Object.setPrototypeOf(this, new.target.prototype);
+        toast.error(message, { id: 'HttpError' });
+    }
+}
+
+function responseHandler(response) {
+    if (response.status === 200 || response.status === 201) {
+        const data = response?.data;
+        if (!data) {
+            throw new HttpError('API Error. No data!');
+        }
+        return data;
+    }
+    throw new HttpError(`API Error! Invalid status code ${response.status}!`);
+}
+
+function responseErrorHandler(error) {
+    if (error === null) {
+        throw new Error('Unrecoverable error!! Error is null!');
+    }
+    toast.error(error.message, { id: 'AxiosError' });
+    return Promise.reject(error.message);
+}
+
+export const ApiClient = axios.create({
+    baseURL: 'http://localhost:8081/',
+    timeout: '3000',
+    headers: {
+        Accept: 'application/json',
+    },
+});
+
+ApiClient.interceptors.response.use(responseHandler, responseErrorHandler);
--- a/src/components/api/ApiService.js
+++ b/src/components/api/ApiService.js
@ -0,0 +1,29 @@
+import { ApiClient } from './ApiClient';
+
+class ApiService {
+    constructor(url) {
+        this.url = url;
+    }
+
+    async getAll(expand) {
+        return ApiClient.get(`${this.url}${expand || ''}`);
+    }
+
+    async get(id, expand) {
+        return ApiClient.get(`${this.url}/${id}${expand || ''}`);
+    }
+
+    async create(body) {
+        return ApiClient.post(this.url, body);
+    }
+
+    async update(id, body) {
+        return ApiClient.put(`${this.url}/${id}`, body);
+    }
+
+    async delete(id) {
+        return ApiClient.delete(`${this.url}/${id}`);
+    }
+}
+
+export default ApiService;
--- a/src/components/banner/Banner.css
+++ b/src/components/banner/Banner.css
@ -0,0 +1,29 @@
+#banner {
+    margin: 5px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    height: 400px;
+    overflow: hidden;
+}
+
+#banner img {
+    border: 1px solid #3c3c3f;
+    border-radius: 5px;
+    height: 100%;
+    object-fit: cover;
+}
+
+#banner img.banner-show {
+    width: 100%;
+    opacity: 1;
+    transition: opacity 1s, visibility 0s;
+}
+
+#banner img.banner-hide {
+    height: 0;
+    width: 0;
+    opacity: 0;
+    visibility: hidden;
+    transition: opacity 1s, visibility 0s 1s;
+}
--- a/src/components/banner/Banner.jsx
+++ b/src/components/banner/Banner.jsx
@ -0,0 +1,40 @@
+import { useEffect, useState } from 'react';
+import banner1 from '../../assets/1.jpg';
+import banner2 from '../../assets/2.jpg';
+import banner3 from '../../assets/3.jpg';
+import './Banner.css';
+
+const Banner = () => {
+    const [currentBanner, setCurrentBanner] = useState(0);
+    const banners = [banner1, banner2, banner3];
+
+    const getBannerClass = (index) => {
+        return currentBanner === index ? 'banner-show' : 'banner-hide';
+    };
+
+    useEffect(() => {
+        const bannerInterval = setInterval(
+            () => {
+                console.info('Banner changed');
+                let current = currentBanner + 1;
+                if (current === banners.length) {
+                    current = 0;
+                }
+                setCurrentBanner(current);
+            },
+            5000,
+        );
+        return () => clearInterval(bannerInterval);
+    });
+
+    return (
+        <div id="banner" >
+            {
+                banners.map((banner, index) =>
+                    <img key={index} className={getBannerClass(index)} src={banner} alt={`banner${index}`} />)
+            }
+        </div >
+    );
+};
+
+export default Banner;
--- a/src/components/footer/Footer.css
+++ b/src/components/footer/Footer.css
@ -0,0 +1,5 @@
+.my-footer {
+    background-color: #9c9c9c;
+    height: 32px;
+    color: #fff;
+}
--- a/src/components/footer/Footer.jsx
+++ b/src/components/footer/Footer.jsx
@ -0,0 +1,18 @@
+import './Footer.css';
+import { Link } from 'react-router-dom'; // Импортируйте Link из библиотеки react-router-dom
+
+const Footer = () => {
+    const year = new Date().getFullYear();
+
+    return (
+        <>
+            <footer className="footer mt-auto d-flex justify-content-center align-items-center">
+                <div className="container-fluid">
+                    <p>© {year} Просмотр фильмов. <Link to="/adminpage">Администратор</Link></p>
+                </div>
+            </footer>
+        </>
+    );
+};
+
+export default Footer;
--- a/src/components/input/Input.jsx
+++ b/src/components/input/Input.jsx
@ -0,0 +1,26 @@
+import PropTypes from 'prop-types';
+import { Form } from 'react-bootstrap';
+
+const Input = ({
+    name, label, value, onChange, className, ...rest
+}) => {
+    
+    return (
+        <Form.Group className={`mb-2 ${className || ''}`} controlId={name}>
+            <Form.Label>{label}</Form.Label>
+            <Form.Control name={name || ''} value={value || ''} onChange={onChange} {...rest} />
+        </Form.Group>
+    );
+};
+
+Input.propTypes = {
+    name: PropTypes.string,
+    label: PropTypes.string,
+    value: PropTypes.string,
+    onChange: PropTypes.func,
+    type: PropTypes.string,
+    className: PropTypes.string,
+    
+};
+
+export default Input;
--- a/src/components/input/Select.jsx
+++ b/src/components/input/Select.jsx
@ -0,0 +1,29 @@
+import PropTypes from 'prop-types';
+import { Form } from 'react-bootstrap';
+
+const Select = ({
+    values, name, label, value, onChange, className, ...rest
+}) => {
+    return (
+        <Form.Group className={`mb-2 ${className || ''}`} controlId={name}>
+            <Form.Label className='form-label'>{label}</Form.Label>
+            <Form.Select name={name || ''} value={value || ''} onChange={onChange} {...rest}>
+                <option value=''>Выберите значение</option>
+                {
+                    values.map((type) => <option key={type.id} value={type.id}>{type.name}</option>)
+                }
+            </Form.Select>
+        </Form.Group>
+    );
+};
+
+Select.propTypes = {
+    values: PropTypes.array,
+    name: PropTypes.string,
+    label: PropTypes.string,
+    value: PropTypes.string,
+    onChange: PropTypes.func,
+    className: PropTypes.string,
+};
+
+export default Select;
--- a/src/components/lines/form/LinesForm.jsx
+++ b/src/components/lines/form/LinesForm.jsx
@ -0,0 +1,48 @@
+import PropTypes from 'prop-types';
+import { Button, Form } from 'react-bootstrap';
+import { useNavigate } from 'react-router-dom';
+import useLinesItemForm from '../hooks/LinesItemFormHook';
+import LinesItemForm from './LinesItemForm.jsx';
+
+const LinesForm = ({ id }) => {
+    const navigate = useNavigate();
+
+    const {
+        item,
+        validated,
+        handleSubmit,
+        handleChange,
+    } = useLinesItemForm(id);
+
+    const onBack = () => {
+        navigate(-1);
+    };
+
+    const onSubmit = async (event) => {
+        if (await handleSubmit(event)) {
+            onBack();
+        }
+    };
+
+    return (
+        <>
+            <Form className='m-0 p-2' noValidate validated={validated} onSubmit={onSubmit}>
+                <LinesItemForm item={item} handleChange={handleChange} />
+                <Form.Group className='row justify-content-center m-0 mt-3'>
+                    <Button className='col-5 col-lg-2 m-0 me-2' variant='secondary' onClick={() => onBack()}>
+                        Назад
+                    </Button>
+                    <Button className='col-5 col-lg-2 m-0 ms-2' type='submit' variant='primary'>
+                        Сохранить
+                    </Button>
+                </Form.Group>
+            </Form>
+        </>
+    );
+};
+
+LinesForm.propTypes = {
+    id: PropTypes.string,
+};
+
+export default LinesForm;
--- a/src/components/lines/form/LinesItemForm.css
+++ b/src/components/lines/form/LinesItemForm.css
@ -0,0 +1,3 @@
+#image-preview {
+    width: 200px;
+}
--- a/src/components/lines/form/LinesItemForm.jsx
+++ b/src/components/lines/form/LinesItemForm.jsx
@ -0,0 +1,40 @@
+import PropTypes from 'prop-types';
+import imgPlaceholder from '../../../assets/300x400.png';
+import Input from '../../input/Input.jsx';
+import Select from '../../input/Select.jsx';
+import useTypes from '../../types/hooks/TypesHook';
+import './LinesItemForm.css';
+
+const LinesItemForm = ({ item, handleChange }) => {
+    const { types } = useTypes();
+
+    return (
+        <>
+            <div className='text-center'>
+                <img id='image-preview' className='rounded' alt='placeholder'
+                    src={item.image || imgPlaceholder} />
+            </div>
+            <Select values={types} name='typeId' label='Жанр' value={item.typeId} onChange={handleChange}
+                required />
+            <Input name='name' label='Название фильма' value={item.name} onChange={handleChange}
+                type='text'  required />
+            <Input name='rating' label='Рейтинг' value={item.rating} onChange={handleChange}
+                type='number' min="0" max="10"  required />  
+            <Input name='release_date' label='Дата производства' value={item.release_date} onChange={handleChange}
+             type='date' required />
+
+            <Input name='director' label='Режиссер' value={item.director} onChange={handleChange}
+                type='text'  required />    
+            <Input name='image' label='Изображение' onChange={handleChange}
+                type='file' accept='image/*' />
+                
+        </>
+    );
+};
+
+LinesItemForm.propTypes = {
+    item: PropTypes.object,
+    handleChange: PropTypes.func,
+};
+
+export default LinesItemForm;
--- a/src/components/lines/hooks/LinesDeleteModalHook.js
+++ b/src/components/lines/hooks/LinesDeleteModalHook.js
@ -0,0 +1,34 @@
+import { useState } from 'react';
+import toast from 'react-hot-toast';
+import useModal from '../../modal/ModalHook';
+import LinesApiService from '../service/LinesApiService';
+
+const useLinesDeleteModal = (linesChangeHandle) => {
+    const { isModalShow, showModal, hideModal } = useModal();
+    const [currentId, setCurrentId] = useState(0);
+
+    const showModalDialog = (id) => {
+        showModal();
+        setCurrentId(id);
+    };
+
+    const onClose = () => {
+        hideModal();
+    };
+
+    const onDelete = async () => {
+        await LinesApiService.delete(currentId);
+        linesChangeHandle();
+        toast.success('Элемент успешно удален', { id: 'LinesTable' });
+        onClose();
+    };
+
+    return {
+        isDeleteModalShow: isModalShow,
+        showDeleteModal: showModalDialog,
+        handleDeleteConfirm: onDelete,
+        handleDeleteCancel: onClose,
+    };
+};
+
+export default useLinesDeleteModal;
--- a/src/components/lines/hooks/LinesFilterHook.js
+++ b/src/components/lines/hooks/LinesFilterHook.js
@ -0,0 +1,28 @@
+import { useSearchParams } from 'react-router-dom';
+import useTypes from '../../types/hooks/TypesHook';
+
+const useTypeFilter = () => {
+    const filterName = 'type';
+
+    const [searchParams, setSearchParams] = useSearchParams();
+
+    const { types } = useTypes();
+
+    const handleFilterChange = (event) => {
+        const type = event.target.value;
+        if (type) {
+            searchParams.set(filterName, event.target.value);
+        } else {
+            searchParams.delete(filterName);
+        }
+        setSearchParams(searchParams);
+    };
+
+    return {
+        types,
+        currentFilter: searchParams.get(filterName) || '',
+        handleFilterChange,
+    };
+};
+
+export default useTypeFilter;
--- a/src/components/lines/hooks/LinesFormModalHook.js
+++ b/src/components/lines/hooks/LinesFormModalHook.js
@ -0,0 +1,45 @@
+import { useState } from 'react';
+import useModal from '../../modal/ModalHook';
+import useLinesItemForm from './LinesItemFormHook';
+
+const useLinesFormModal = (linesChangeHandle) => {
+    const { isModalShow, showModal, hideModal } = useModal();
+    const [currentId, setCurrentId] = useState(0);
+
+    const {
+        item,
+        validated,
+        handleSubmit,
+        handleChange,
+        resetValidity,
+    } = useLinesItemForm(currentId, linesChangeHandle);
+
+    const showModalDialog = (id) => {
+        setCurrentId(id);
+        resetValidity();
+        showModal();
+    };
+
+    const onClose = () => {
+        setCurrentId(-1);
+        hideModal();
+    };
+
+    const onSubmit = async (event) => {
+        if (await handleSubmit(event)) {
+            onClose();
+        }
+    };
+
+    return {
+        isFormModalShow: isModalShow,
+        isFormValidated: validated,
+        showFormModal: showModalDialog,
+        currentItem: item,
+        handleItemChange: handleChange,
+        handleFormSubmit: onSubmit,
+        handleFormClose: onClose,
+    };
+};
+
+export default useLinesFormModal;
--- a/src/components/lines/hooks/LinesHook.js
+++ b/src/components/lines/hooks/LinesHook.js
@ -0,0 +1,29 @@
+import { useEffect, useState } from 'react';
+import LinesApiService from '../service/LinesApiService';
+
+const useLines = (typeFilter) => {
+    const [linesRefresh, setLinesRefresh] = useState(false);
+    const [lines, setLines] = useState([]);
+    const handleLinesChange = () => setLinesRefresh(!linesRefresh);
+
+    const getLines = async () => {
+        let expand = '?_expand=type';
+        if (typeFilter) {
+            expand = `${expand}&typeId=${typeFilter}`;
+        }
+        const data = await LinesApiService.getAll(expand);
+        setLines(data ?? []);
+    };
+
+    useEffect(() => {
+        getLines();
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [linesRefresh, typeFilter]);
+
+    return {
+        lines,
+        handleLinesChange,
+    };
+};
+
+export default useLines;
--- a/src/components/lines/hooks/LinesItemFormHook.js
+++ b/src/components/lines/hooks/LinesItemFormHook.js
@ -0,0 +1,91 @@
+import { useState } from 'react';
+import toast from 'react-hot-toast';
+import getBase64FromFile from '../../utils/Base64';
+import LinesApiService from '../service/LinesApiService';
+import useLinesItem from './LinesItemHook';
+
+const useLinesItemForm = (id, linesChangeHandle) => {
+    const { item, setItem } = useLinesItem(id);
+
+    const [validated, setValidated] = useState(false);
+
+    const resetValidity = () => {
+        setValidated(false);
+    };
+
+    const getLineObject = (formData) => {
+        const typeId = formData.typeId;
+        const name = formData.name;
+        const rating = formData.rating;
+        const release_date = formData.release_date;
+        const director = formData.director;
+        const image = formData.image.startsWith('data:image') ? formData.image : '';
+        return {
+            typeId: typeId,
+            name: name,
+            rating: rating,
+            release_date: release_date,
+            director: director,
+            image,
+        };
+    };
+
+    const handleImageChange = async (event) => {
+        const { files } = event.target;
+        const file = await getBase64FromFile(files.item(0));
+        setItem({
+            ...item,
+            image: file,
+        });
+    };
+
+    const handleChange = (event) => {
+        
+        if (event.target.type === 'file') {
+            handleImageChange(event);
+            return;
+        }
+        const inputName = event.target.name;
+        let inputValue = event.target.type === 'checkbox' ? event.target.checked : event.target.value;
+        console.log(inputName, inputValue);
+        
+
+        setItem({
+            ...item,
+            [inputName]: inputValue,
+        });
+    };
+
+    
+
+    
+
+    const handleSubmit = async (event) => {
+        const form = event.currentTarget;
+        event.preventDefault();
+        event.stopPropagation();
+        const body = getLineObject(item);
+        if (form.checkValidity()) {
+            if (id === undefined) {
+                await LinesApiService.create(body);
+            } else {
+                await LinesApiService.update(id, body);
+            }
+            if (linesChangeHandle) linesChangeHandle();
+            toast.success('Элемент успешно сохранен', { id: 'LinesTable' });
+            return true;
+        }
+        setValidated(true);
+        return false;
+    };
+
+    return {
+        item,
+        validated,
+        handleSubmit,
+        handleChange,
+        resetValidity,
+    };
+};
+
+export default useLinesItemForm;
--- a/src/components/lines/hooks/LinesItemHook.js
+++ b/src/components/lines/hooks/LinesItemHook.js
@ -0,0 +1,36 @@
+import { useEffect, useState } from 'react';
+import LinesApiService from '../service/LinesApiService';
+
+const useLinesItem = (id) => {
+    const emptyItem = {
+        itemsId: "",
+        name: '',
+        rating: '',
+        release_date: '',
+        director: '',
+        image: '',
+        id: '',
+    };
+    const [item, setItem] = useState({ ...emptyItem });
+
+    const getItem = async (itemId = undefined) => {
+        if (itemId && itemId > 0) {
+            const data = await LinesApiService.get(itemId);
+            setItem(data);
+        } else {
+            setItem({ ...emptyItem });
+        }
+    };
+
+    useEffect(() => {
+        getItem(id);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [id]);
+
+    return {
+        item,
+        setItem,
+    };
+};
+
+export default useLinesItem;
--- a/src/components/lines/service/LinesApiService.js
+++ b/src/components/lines/service/LinesApiService.js
@ -0,0 +1,5 @@
+import ApiService from '../../api/ApiService';
+
+const LinesApiService = new ApiService('lines');
+
+export default LinesApiService;
--- a/src/components/lines/table/Lines.jsx
+++ b/src/components/lines/table/Lines.jsx
@ -0,0 +1,75 @@
+import { Button } from 'react-bootstrap';
+import { Link, useNavigate } from 'react-router-dom';
+import Select from '../../input/Select.jsx';
+import ModalConfirm from '../../modal/ModalConfirm.jsx';
+import ModalForm from '../../modal/ModalForm.jsx';
+import LinesItemForm from '../form/LinesItemForm.jsx';
+import useLinesDeleteModal from '../hooks/LinesDeleteModalHook';
+import useTypeFilter from '../hooks/LinesFilterHook';
+import useLinesFormModal from '../hooks/LinesFormModalHook';
+import useLines from '../hooks/LinesHook';
+import LinesTable from './LinesTable.jsx';
+import LinesTableRow from './LinesTableRow.jsx';
+
+const Lines = () => {
+    const { types, currentFilter, handleFilterChange } = useTypeFilter();
+
+    const { lines, handleLinesChange } = useLines(currentFilter);
+
+    const {
+        isDeleteModalShow,
+        showDeleteModal,
+        handleDeleteConfirm,
+        handleDeleteCancel,
+    } = useLinesDeleteModal(handleLinesChange);
+
+    const {
+        isFormModalShow,
+        isFormValidated,
+        showFormModal,
+        currentItem,
+        handleItemChange,
+        handleFormSubmit,
+        handleFormClose,
+    } = useLinesFormModal(handleLinesChange);
+
+    const navigate = useNavigate();
+
+    const showEditPage = (id) => {
+        navigate(`/page-edit/${id}`);
+    };
+
+    return (
+        <>
+            <Button variant='info' onClick={() => showFormModal()}>
+                Добавить товар (диалог)
+            </Button> 
+            <Button as={Link} to='/page-edit' variant='success'>
+                Добавить фильм
+            </Button>   
+            <Select className='mt-2' values={types} label='Фильтр по жанрам'
+                value={currentFilter} onChange={handleFilterChange} />
+            <LinesTable>
+                {
+                    lines.map((line, index) =>
+                        <LinesTableRow key={line.id}
+                            index={index} line={line}
+                            onDelete={() => showDeleteModal(line.id)}
+                            onEdit={() => showFormModal(line.id)}
+                            onEditInPage={() => showEditPage(line.id)}
+                        />)
+                }
+            </LinesTable>
+            <ModalConfirm show={isDeleteModalShow}
+                onConfirm={handleDeleteConfirm} onClose={handleDeleteCancel}
+                title='Удаление' message='Удалить элемент?' />
+            <ModalForm show={isFormModalShow} validated={isFormValidated}
+                onSubmit={handleFormSubmit} onClose={handleFormClose}
+                title='Редактирование'>
+                <LinesItemForm item={currentItem} handleChange={handleItemChange} />
+            </ModalForm>
+        </>
+    );
+};
+
+export default Lines;
--- a/src/components/lines/table/LinesTable.jsx
+++ b/src/components/lines/table/LinesTable.jsx
@ -0,0 +1,30 @@
+import PropTypes from 'prop-types';
+import { Table } from 'react-bootstrap';
+
+const LinesTable = ({ children }) => {
+    return (
+        <Table className='mt-2' striped responsive>
+            <thead>
+                <tr>
+                    <th scope="col">№</th>
+                    <th scope="col" className="w-25">Фильм</th>
+                    <th scope="col" className="w-25">Жанр</th>
+                    <th scope="col" className="w-15">Рейтинг</th>
+                    <th scope="col" className="w-25">Дата производства</th>
+                    <th scope="col" className="w-25">Режиссер</th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                </tr>
+            </thead>
+            <tbody>
+                {children}
+            </tbody >
+        </Table >
+    );
+};
+
+LinesTable.propTypes = {
+    children: PropTypes.node,
+};
+
+export default LinesTable;
--- a/src/components/lines/table/LinesTableRow.jsx
+++ b/src/components/lines/table/LinesTableRow.jsx
@ -0,0 +1,36 @@
+import PropTypes from 'prop-types';
+import { PencilFill, PencilSquare, Trash3 } from 'react-bootstrap-icons';
+
+const LinesTableRow = ({
+    index, line, onDelete, onEdit, onEditInPage,
+}) => {
+    const handleAnchorClick = (event, action) => {
+        event.preventDefault();
+        action();
+    };
+
+    return (
+        <tr>
+            <th scope="row">{index + 1}</th>
+            <td>{line.name}</td>
+            <td>{line.type.name}</td>
+            <td>{parseInt(line.rating)}</td>
+            <td>{line.release_date}</td>
+            <td>{line.director}</td>
+            
+            <td><a href="#" onClick={(event) => handleAnchorClick(event, onEdit)}><PencilFill /></a></td>
+            <td><a href="#" onClick={(event) => handleAnchorClick(event, onEditInPage)}><PencilSquare /></a></td>
+            <td><a href="#" onClick={(event) => handleAnchorClick(event, onDelete)}><Trash3 /></a></td>
+        </tr>
+    );
+};
+
+LinesTableRow.propTypes = {
+    index: PropTypes.number,
+    line: PropTypes.object,
+    onDelete: PropTypes.func,
+    onEdit: PropTypes.func,
+    onEditInPage: PropTypes.func,
+};
+
+export default LinesTableRow;
--- a/src/components/modal/Modal.css
+++ b/src/components/modal/Modal.css
@ -0,0 +1,3 @@
+.modal-title {
+    font-size: 1.2rem;
+}
--- a/src/components/modal/ModalConfirm.jsx
+++ b/src/components/modal/ModalConfirm.jsx
@ -0,0 +1,42 @@
+import PropTypes from 'prop-types';
+import { Button, Modal } from 'react-bootstrap';
+import { createPortal } from 'react-dom';
+import './Modal.css';
+
+const ModalConfirm = ({
+    show, title, message, onConfirm, onClose,
+}) => {
+    return createPortal(
+        <Modal show={show} backdrop='static' onHide={() => onClose()}>
+            <Modal.Header className='pt-2 pb-2 ps-3 pe-3' closeButton>
+                <Modal.Title>{title}</Modal.Title>
+            </Modal.Header>
+
+            <Modal.Body>
+                {message}
+            </Modal.Body>
+
+            <Modal.Footer className='m-0 pt-2 pb-2 ps-3 pe-3 row justify-content-center'>
+                <Button variant='secondary' className='col-5 m-0 me-2'
+                    onClick={() => onClose()}>
+                    Нет
+                </Button>
+                <Button variant='primary' className='col-5 m-0 ms-2'
+                    onClick={() => onConfirm()}>
+                    Да
+                </Button>
+            </Modal.Footer>
+        </Modal>,
+        document.body,
+    );
+};
+
+ModalConfirm.propTypes = {
+    show: PropTypes.bool,
+    title: PropTypes.string,
+    message: PropTypes.string,
+    onConfirm: PropTypes.func,
+    onClose: PropTypes.func,
+};
+
+export default ModalConfirm;
--- a/src/components/modal/ModalForm.jsx
+++ b/src/components/modal/ModalForm.jsx
@ -0,0 +1,43 @@
+import PropTypes from 'prop-types';
+import { Button, Form, Modal } from 'react-bootstrap';
+import { createPortal } from 'react-dom';
+import './Modal.css';
+
+const ModalForm = ({
+    show, title, validated, onSubmit, onClose, children,
+}) => {
+    return createPortal(
+        <Modal show={show} backdrop='static' onHide={() => onClose()}>
+            <Modal.Header className='pt-2 pb-2 ps-3 pe-3' closeButton>
+                <Modal.Title>{title}</Modal.Title>
+            </Modal.Header>
+            <Form className='m-0' noValidate validated={validated} onSubmit={onSubmit}>
+                <Modal.Body>
+                    {children}
+                </Modal.Body>
+
+                <Modal.Footer className='m-0 pt-2 pb-2 ps-3 pe-3 row justify-content-center'>
+                    <Button variant='secondary' className='col-5 m-0 me-2'
+                        onClick={() => onClose()}>
+                        Отмена
+                    </Button>
+                    <Button variant='primary' className='col-5 m-0 ms-2' type='submit'>
+                        Сохранить
+                    </Button>
+                </Modal.Footer>
+            </Form>
+        </Modal>,
+        document.body,
+    );
+};
+
+ModalForm.propTypes = {
+    show: PropTypes.bool,
+    title: PropTypes.string,
+    validated: PropTypes.bool,
+    onSubmit: PropTypes.func,
+    onClose: PropTypes.func,
+    children: PropTypes.node,
+};
+
+export default ModalForm;
--- a/src/components/modal/ModalHook.js
+++ b/src/components/modal/ModalHook.js
@ -0,0 +1,21 @@
+import { useState } from 'react';
+
+const useModal = () => {
+    const [showModal, setShowModal] = useState(false);
+
+    const showModalDialog = () => {
+        setShowModal(true);
+    };
+
+    const hideModalDialog = () => {
+        setShowModal(false);
+    };
+
+    return {
+        isModalShow: showModal,
+        showModal: showModalDialog,
+        hideModal: hideModalDialog,
+    };
+};
+
+export default useModal;
--- a/src/components/navigation/Navigation.css
+++ b/src/components/navigation/Navigation.css
@ -0,0 +1,37 @@
+/* Navigation.css */
+
+.header {
+    background-color: #343a40; /* Цвет фона шапки */
+    color: white; /* Цвет текста */
+  }
+  
+  .header-logo {
+    display: flex;
+    align-items: center;
+  }
+  
+  .header-logo img {
+    width: 30px; /* Задайте желаемую ширину для иконки */
+    margin-right: 10px; /* Расстояние между иконкой и текстом */
+  }
+  
+  .header-logo h2 {
+    margin: 0; /* Убираем отступы у заголовка */
+  }
+  
+  /* Размещаем иконку и заголовок слева */
+  .navbar-brand {
+    display: flex;
+    align-items: center;
+  }
+  
+  /* Размещаем ссылки справа */
+  .ml-auto {
+    margin-left: auto;
+  }
+  
+  /* Убираем отступы у ссылок */
+  .nav-link {
+    margin: 0;
+  }
+  
--- a/src/components/navigation/Navigation.jsx
+++ b/src/components/navigation/Navigation.jsx
@ -0,0 +1,43 @@
+
+import PropTypes from 'prop-types';
+import { Container, Nav, Navbar } from 'react-bootstrap';
+import { Link, useLocation } from 'react-router-dom';
+import './Navigation.css';
+
+const Navigation = ({ routes }) => {
+    const location = useLocation();
+    const pages = routes.filter((route) => Object.prototype.hasOwnProperty.call(route, 'title'));
+
+  return (
+    <div className="header">
+      <Navbar expand="md" variant="dark">
+        <Container fluid>
+          <Link to="/" className="navbar-brand">
+            <div className="header-logo">
+              <img src="icon.png" alt="Logo" />
+              <h2>Фильмы онлайн</h2>
+            </div>
+          </Link>
+          <Navbar.Toggle aria-controls='main-navbar' />
+          <Navbar.Collapse id='main-navbar'>
+            <Nav className='link ml-auto' activeKey={location.pathname}>
+              {
+                pages.map((page) => (
+                  <Nav.Link as={Link} key={page.path} eventKey={page.path} to={page.path ?? '/'}>
+                    {page.title}
+                  </Nav.Link>
+                ))
+              }
+            </Nav>
+          </Navbar.Collapse>
+        </Container>
+      </Navbar>
+    </div>
+  );
+};
+
+Navigation.propTypes = {
+  routes: PropTypes.array,
+};
+
+export default Navigation;
--- a/src/components/types/hooks/TypesHook.js
+++ b/src/components/types/hooks/TypesHook.js
@ -0,0 +1,21 @@
+import { useEffect, useState } from 'react';
+import TypesApiService from '../service/TypesApiService';
+
+const useTypes = () => {
+    const [types, setTypes] = useState([]);
+
+    const getTypes = async () => {
+        const data = await TypesApiService.getAll();
+        setTypes(data ?? []);
+    };
+
+    useEffect(() => {
+        getTypes();
+    }, []);
+
+    return {
+        types,
+    };
+};
+
+export default useTypes;
--- a/src/components/types/service/TypesApiService.js
+++ b/src/components/types/service/TypesApiService.js
@ -0,0 +1,5 @@
+import ApiService from '../../api/ApiService';
+
+const TypesApiService = new ApiService('types');
+
+export default TypesApiService;
--- a/src/components/utils/Base64.js
+++ b/src/components/utils/Base64.js
@ -0,0 +1,15 @@
+const getBase64FromFile = async (file) => {
+    const reader = new FileReader();
+    return new Promise((resolve, reject) => {
+        reader.onloadend = () => {
+            const fileContent = reader.result;
+            resolve(fileContent);
+        };
+        reader.onerror = () => {
+            reject(new Error('Oops, something went wrong with the file reader.'));
+        };
+        reader.readAsDataURL(file);
+    });
+};
+
+export default getBase64FromFile;
--- a/src/index.css
+++ b/src/index.css
@ -0,0 +1,116 @@
+body {
+  font-family: Arial, sans-serif;
+  background-color: #f2f2f2;
+  margin: 0;
+  padding: 0;
+  
+  min-height: 150vh;
+}
+
+.header {
+  background: linear-gradient(to right, #000000, #434343);
+  padding: 20px;
+  color: #ffffff;
+  text-align: justify;
+  letter-spacing: 1px;
+  
+  width: auto;
+}
+.header-logo img {
+  width: 100px; 
+  height: auto; 
+  margin-right: 10px;
+  background-color: transparent;
+}
+.navbar-nav .nav-link {
+  color: #ffffff;
+  text-decoration: none;
+  margin-left: 20px;
+  transition: color 0.3s;
+  font-size: 24px;
+  font-family: 'Arial Black', sans-serif;
+}
+.header-logo {
+  display: flex;
+  align-items: center;
+  font-family: 'Arial Black', sans-serif;
+}
+
+.header-links a {
+  color: #ffffff;
+  text-decoration: none;
+  margin-left: 20px;
+  transition: color 0.3s;
+  font-size: 24px;
+  font-family: 'Arial Black', sans-serif;
+}
+
+.header-links a:hover {
+  color: #ff4500;
+}
+
+.movie-container {
+  width: 80%;
+  
+  margin: 0 auto;
+  overflow-x: auto;
+  white-space: nowrap;
+  gap: 20px;
+  
+}
+
+.movie-card {
+  width: 300px;
+  height: 600px;
+  display: inline-block;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  margin: 0 auto;
+  margin-right: 20px;
+  border-radius: 5px;
+  background-color: #ffffff;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+}
+
+.movie-card img {
+  width: 100%;
+  border-top-left-radius: 5px;
+  border-top-right-radius: 5px;
+}
+
+.movie-card-content {
+  padding: 20px;
+}
+
+.movie-card-content h2 {
+  white-space: normal;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+h1 {
+  margin-left: 10px;
+  font-weight: bold;
+}
+h2 {
+  color: #333333;
+  margin-bottom: 10px;
+}
+
+p {
+  color: #666666;
+  font-size: 24px;
+  padding: 20px;
+}
+
+footer {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  background-color: #333;
+  color: white;
+  text-align: center;
+  padding: 10px;
+}
+
+
--- a/src/main.jsx
+++ b/src/main.jsx
@ -0,0 +1,72 @@
+import 'bootstrap/dist/css/bootstrap.min.css';
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import { RouterProvider, createBrowserRouter } from 'react-router-dom';
+import App from './App.jsx';
+import './index.css';
+import ErrorPage from './pages/ErrorPage.jsx';
+import MainPage from './pages/MainPage.jsx';
+import AdminPage from './pages/AdminPage.jsx';
+import Page1 from './pages/Page1.jsx';
+import Page2 from './pages/Page2.jsx';
+import Page3 from './pages/Page3.jsx';
+import Page4 from './pages/Page4.jsx';
+import PageEdit from './pages/PageEdit.jsx';
+import SearchPage from './pages/SearchPage.jsx';
+
+const routes = [
+  {
+    index: true,
+    path: '/',
+    element: <MainPage />,
+    title: 'Главная страница',
+  },
+  {
+    path: '/page1',
+    element: <Page1 />,
+    title: 'Каталог',
+  },
+  {
+    path: '/page2',
+    element: <Page2 />,
+    title: 'Категории',
+  },
+  {
+    path: '/page3',
+    element: <Page3 />,
+    title: 'Информация',
+  },
+  {
+    path: '/page4',
+    element: <Page4 />,
+    title: 'Лучшие фильмы',
+  },
+  {
+    path: '/adminpage',
+    element: <AdminPage />,
+  },
+  {
+    path: '/page-edit/:id?',
+    element: <PageEdit />,
+  },
+  {
+    path: '/searchPage',
+    element: <SearchPage />,
+    title: 'Поиск',
+  },
+];
+
+const router = createBrowserRouter([
+  {
+    path: '/',
+    element: <App routes={routes} />,
+    children: routes,
+    errorElement: <ErrorPage />,
+  },
+]);
+
+ReactDOM.createRoot(document.getElementById('root')).render(
+  <React.StrictMode>
+    <RouterProvider router={router} />
+  </React.StrictMode>,
+);
--- a/src/pages/AdminPage.jsx
+++ b/src/pages/AdminPage.jsx
@ -0,0 +1,12 @@
+
+import Lines from '../components/lines/table/Lines.jsx';
+const AdminPage = () => {
+    return (
+        <>
+           
+            <Lines />
+        </>
+    );
+};
+
+export default AdminPage;
--- a/src/pages/ErrorPage.jsx
+++ b/src/pages/ErrorPage.jsx
@ -0,0 +1,19 @@
+import { Alert, Button, Container } from 'react-bootstrap';
+import { useNavigate } from 'react-router-dom';
+
+const ErrorPage = () => {
+    const navigate = useNavigate();
+
+    return (
+        <Container fluid className="p-2 row justify-content-center">
+            <Container className='col-md-6'>
+                <Alert variant="danger">
+                    Страница не найдена
+                </Alert>
+                <Button className="w-25 mt-2" variant="primary" onClick={() => navigate(-1)}>Назад</Button>
+            </Container>
+        </Container>
+    );
+};
+
+export default ErrorPage;
--- a/src/pages/MainPage.jsx
+++ b/src/pages/MainPage.jsx
@ -0,0 +1,28 @@
+import MovieList from '../Moviecard/MovieList.jsx';
+import Banner from '../components/banner/Banner.jsx';
+
+const MainPage = () => {
+    return (
+        <>
+            <Banner />
+            <h1>Популярное</h1>
+            <div className="movie-container">
+                    <MovieList />
+            </div>
+            <h1>Может быть интересно</h1>
+            <div className="movie-container">
+                    <MovieList />
+            </div>
+
+            <h1>Лучшие отзывы</h1>
+            <div className="movie-container">
+                    <MovieList />   
+            </div>
+            
+            
+            
+        </>
+    );
+};
+
+export default MainPage;
--- a/src/pages/Page1.jsx
+++ b/src/pages/Page1.jsx
@ -0,0 +1,16 @@
+import MovieList from '../Moviecard/MovieList.jsx';
+
+const Page1 = () => {
+    
+    return (
+            <>
+            <h1>Каталог</h1>
+    
+            <div id="movie-container">
+              <MovieList />
+            </div>
+            </>
+    );
+};
+
+export default Page1;
--- a/src/pages/Page2.jsx
+++ b/src/pages/Page2.jsx
@ -0,0 +1,16 @@
+import MovieList from '../Moviecard/useMovieFilter.jsx';
+
+const Page1 = () => {
+    
+    return (
+            <>
+            <h1>Категории</h1>
+    
+            <div id="movie-container">
+              <MovieList />
+            </div>
+            </>
+    );
+};
+
+export default Page1;
--- a/src/pages/Page3.jsx
+++ b/src/pages/Page3.jsx
@ -0,0 +1,58 @@
+
+
+const Page3 = () => {
+    
+
+    return (
+        <>
+      <h1>Информация</h1>
+      <p>
+        Добро пожаловать на наш сайт для просмотра фильмов! Здесь вы найдете все
+        необходимые сведения для насыщенного и удобного кинематографического опыта.
+        Пожалуйста, ознакомьтесь с полезной информацией ниже:
+        <br />
+        <br />
+        <strong>О нас:</strong>
+        <br />
+        Мы предоставляем уникальную платформу для онлайн-просмотра широкого
+        ассортимента фильмов различных жанров. Наша команда стремится создать место,
+        где каждый кинолюбитель найдет что-то по своему вкусу.
+        <br />
+        <br />
+        <strong>Как пользоваться сайтом:</strong>
+        <br />
+        - Поиск и Фильтрация: Воспользуйтесь удобным поиском, чтобы быстро найти
+        нужный фильм. Фильтры по жанру, году выпуска и рейтингу помогут уточнить ваш
+        выбор.
+        <br />
+        - Рейтинг и Обзоры: У нас есть система рейтингов, созданная пользователями, а
+        также обзоры, чтобы вы могли сделать информированный выбор.
+        <br />
+        <br />
+        <strong>Партнерство и Реклама:</strong>
+        <br />
+        Если у вас есть интересные предложения по партнерству или рекламе на нашем
+        сайте, свяжитесь с нами через контактную форму. Мы всегда открыты к новым
+        идеям и сотрудничеству.
+        <br />
+        <br />
+        <strong>Поддержка:</strong>
+        <br />
+        В случае возникновения вопросов, проблем или предложений по улучшению
+        сервиса, обращайтесь в нашу службу поддержки. Мы готовы вам помочь 24/7.
+        <br />
+        <br />
+        <strong>Правила и Условия:</strong>
+        <br />
+        Пожалуйста, ознакомьтесь с нашими правилами использования сайта и политикой
+        конфиденциальности, чтобы быть в курсе важных моментов.
+        <br />
+        <br />
+        Благодарим вас за выбор нашего сайта для вашего кинематографического опыта.
+        Наслаждайтесь просмотром!
+      </p>
+    </>
+    );
+};
+
+export default Page3;
--- a/src/pages/Page4.jsx
+++ b/src/pages/Page4.jsx
@ -0,0 +1,15 @@
+import MovieList from '../Moviecard/MovieList.jsx';
+
+const Page4 = () => {
+    
+    return (
+        <>
+            <h1>Топ фильмов</h1>
+            <div id="movie-container">
+            <MovieList /> 
+            </div>
+        </>
+    );
+};
+
+export default Page4;
--- a/src/pages/PageEdit.jsx
+++ b/src/pages/PageEdit.jsx
@ -0,0 +1,12 @@
+import { useParams } from 'react-router-dom';
+import LinesForm from '../components/lines/form/LinesForm.jsx';
+
+const PageEdit = () => {
+    const { id } = useParams();
+
+    return (
+        <LinesForm id={id} />
+    );
+};
+
+export default PageEdit;
--- a/src/pages/SearchPage.jsx
+++ b/src/pages/SearchPage.jsx
@ -0,0 +1,16 @@
+import MovieList from '../Moviecard/useMovieFilterByName.jsx';
+
+const SearchPage = () => {
+    
+    return (
+            <>
+            <h1>Поиск</h1>
+    
+            
+              <MovieList />
+            
+            </>
+    );
+};
+
+export default SearchPage;
--- a/vite.config.js
+++ b/vite.config.js
@ -0,0 +1,12 @@
+import { defineConfig } from 'vite'
+import react from '@vitejs/plugin-react'
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [react()],
+  build: {
+    sourcemap: true,
+    chunkSizeWarningLimit: 1024,
+    emptyOutDir: true,
+  },
+})
--- a/макет/maketcatalog.png
+++ b/макет/maketcatalog.png
--- a/макет/maketcatalog.xcf
+++ b/макет/maketcatalog.xcf
--- a/макет/maketcategories.png
+++ b/макет/maketcategories.png
--- a/макет/maketcategories.xcf
+++ b/макет/maketcategories.xcf
--- a/макет/maketindex.png
+++ b/макет/maketindex.png
--- a/макет/maketindex.xcf
+++ b/макет/maketindex.xcf
--- a/макет/maketinfo.png
+++ b/макет/maketinfo.png
--- a/макет/maketinfo.xcf
+++ b/макет/maketinfo.xcf
--- a/макет/maketpopular.png
+++ b/макет/maketpopular.png
--- a/макет/maketpopular.xcf
+++ b/макет/maketpopular.xcf
Author	SHA1	Message	Date
devil_1nc	b5ebef6654	fix	2023-12-27 17:09:58 +04:00
leoevgeniy	d64caec228	add search	2023-12-26 18:10:59 +04:00
leoevgeniy	0cd75c3660	small fix	2023-12-25 01:03:00 +04:00
leoevgeniy	c5a6b732e3	Lab5 thinks done	2023-12-25 00:37:54 +04:00
Your Name~	f1f2120b97	fix lab4	2023-12-19 14:33:55 +04:00
leoevgeniy	c6f96fed5b	Lab4 thinks done	2023-12-18 21:05:53 +04:00
leoevgeniy	0e5d2349fd	fix lab3	2023-12-17 22:07:22 +04:00
leoevgeniy	8cd466c170	fix lab3	2023-12-14 20:59:43 +04:00
leoevgeniy	764f79b2a8	reload site	2023-12-08 01:57:42 +04:00
leoevgeniy	709c6bd5c7	lab3 done	2023-12-07 22:24:21 +04:00
Yourdax	4e50fba8f2	lab2 done	2023-12-01 11:17:36 +04:00
Yourdax	3c2b589c75	Lab1 done	2023-12-01 11:02:31 +04:00
				`@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>