Merge pull request #5 from LexaFrontDev/NewEngineBranch

New engine branch

Author: LexaFrontDev

.gitignore

@@ -37,4 +37,5 @@ phpstan.neon
 ###> friendsofphp/php-cs-fixer ###
 /.php-cs-fixer.php
 /.php-cs-fixer.cache
+package-lock.json
 ###< friendsofphp/php-cs-fixer ###

assets/react/Aplication/UseCases/Tasks/TasksService.tsx

@@ -3,6 +3,7 @@ import {TaskUpdate} from "../../../ui/props/Tasks/TaskUpdate";
 import {Task} from "../../../ui/props/Tasks/Task";
 import {TaskResponse} from "../../../ui/props/Tasks/TaskResponse";
 import {SaveTasksDto} from "../../../ui/props/Tasks/SaveTasksDto";
+import {ListTasks} from "../../../ui/props/Tasks/ListTasks/ListTasks";
 
 export class TasksService {
     constructor(private readonly tasksApi: TasksReqInterface) {}
@@ -15,6 +16,10 @@ export class TasksService {
         return await this.tasksApi.getTasksAll();
     }
 
+    async getListTasks(): Promise<ListTasks[] | false>{
+        return await this.tasksApi.getListTasks()
+    }
+
     async createTask(task: Partial<SaveTasksDto>): Promise<TaskResponse> {
         try {
             const response = await this.tasksApi.saveTask(task);

assets/react/Domain/request/Tasks/TasksReqInterface.tsx

@@ -1,5 +1,6 @@
 import {Task} from "../../../ui/props/Tasks/Task";
 import {TaskUpdate} from "../../../ui/props/Tasks/TaskUpdate";
+import {ListTasks} from "../../../ui/props/Tasks/ListTasks/ListTasks";
 
 export interface TasksReqInterface{
      getTasksByDate(date: string): Promise<Task[]>;
@@ -8,4 +9,5 @@ export interface TasksReqInterface{
      updateTask(task: TaskUpdate): Promise<any>
      deleteTask(taskId: string | number): Promise<any>
      toggleWontDo(taskId: number | string): Promise<any>
+     getListTasks(): Promise<ListTasks[] | false>
 }

assets/react/Infrastructure/request/tasks/TasksApi.tsx

@@ -1,6 +1,7 @@
 import {Task} from "../../../ui/props/Tasks/Task";
 import {TaskUpdate} from "../../../ui/props/Tasks/TaskUpdate";
 import {TasksReqInterface} from "../../../Domain/request/Tasks/TasksReqInterface";
+import {ListTasks} from "../../../ui/props/Tasks/ListTasks/ListTasks";
 
 export class TasksApi implements TasksReqInterface{
     async getTasksByDate(date: string): Promise<Task[]> {
@@ -22,6 +23,20 @@ export class TasksApi implements TasksReqInterface{
     }
 
 
+
+    async getListTasks(): Promise<ListTasks[] | false> {
+        const res = await fetch(`/api/list/tasks/all`);
+
+        if (!res.ok) {
+            const error = await res.json().catch(() => ({}));
+            throw new Error(error.message || 'Ошибка получения задач');
+        }
+
+        return await res.json();
+    }
+
+
+
     async saveTask(task: Partial<Task>): Promise<any> {
         const res = await fetch('/api/tasks/save', {
             method: 'POST',

assets/react/Router.tsx

@@ -99,14 +99,7 @@ const RouterDom = () => {
                 }
             />
 
-            <Route
-                path="/matric"
-                element={
-                    <AuthCheck isAuthenticated={isAuthenticated}>
-                        <MatricPage />
-                    </AuthCheck>
-                }
-            />
+
 
             <Route
                 path="/premium"

assets/react/pages/Tasks/TasksPage.tsx

@@ -2,19 +2,15 @@ import React, { useState, useEffect, useRef } from 'react';
 import Sidebar from '../chunk/SideBar';
 import DataChunk from "../chunk/DataSelectChunk/DataChunk";
 import Loading from "../chunk/LoadingChunk/Loading";
-import SidePanel from "../chunk/Tasks/TasksAside";
 import { Task } from "../../ui/props/Tasks/Task";
-import { TimeData } from "../../ui/props/Tasks/TimeData";
 import {ListTypeDTO} from "../../Aplication/Dto/ArrayDto/ListType/ListTypeDTO";
 import {TasksService} from "../../Aplication/UseCases/Tasks/TasksService";
 import {TasksApi} from "../../Infrastructure/request/tasks/TasksApi";
 import { Messages, ErrorAlert, SuccessAlert, IsDoneAlert } from '../chunk/MessageAlertChunk';
-import {TaskDelete} from "../../ui/props/Tasks/TaskDelete";
 import {TaskUpdate} from "../../ui/props/Tasks/TaskUpdate";
 import {SaveTasksDto} from "../../ui/props/Tasks/SaveTasksDto";
 import {TasksDateDto} from "../../ui/props/Tasks/TasksDateDto";
 import {Period} from "../../ui/props/Tasks/type/periodType";
-import ResizablePanel from "../../ui/organism/Aside/ResizablePanel";
 import {ImperativePanelGroupHandle, Panel, PanelGroup, PanelResizeHandle} from "react-resizable-panels";
 import {Button} from "../../ui/atoms/button/Button";
 import TextArea from "../../ui/atoms/TextArea/TextArea";
@@ -24,6 +20,7 @@ import {useTranslation} from "react-i18next";
 import {LanguageRequestUseCase} from "../../Aplication/UseCases/language/LanguageRequestUseCase";
 import {LanguageApi} from "../../Infrastructure/request/Language/LanguageApi";
 import {formatTaskDateTime} from "../../Domain/Services/Tasks/taskDateFormatter";
+import {ListTasks} from "../../ui/props/Tasks/ListTasks/ListTasks";
 
 const tasksService = new TasksService(new TasksApi());
 const LangUseCase = new LanguageRequestUseCase(new LanguageApi());
@@ -49,9 +46,7 @@ const TasksPage: React.FC = () => {
     });
     const [tasks, setTasks] = useState<Task[]>([]);
     const [editingTask, setEditingTask] = useState<Task | null>(null);
-    const [infoTasks, setInfoTasks] = useState<Task | null>(null);
     const [showEditModal, setShowEditModal] = useState<boolean>(false);
-    const [showInfoTasks, setShowInfoTasks] = useState<boolean>(false);
     const [loading, setLoading] = useState<boolean>(false);
     const [error, setError] = useState<string | null>(null);
     const [showEditDateModal, setShowEditDateModal] = useState<boolean>(false);
@@ -66,7 +61,7 @@ const TasksPage: React.FC = () => {
     const [langCode, setLangCode] = useState('en');
     const { t, i18n } = useTranslation('translation');
     const [translationsLoaded, setTranslationsLoaded] = useState<boolean>(false);
-
+    const [ListTasks, SetListTasks] = useState<ListTasks[] | []>([])
 
 
     useEffect(() => {
@@ -86,6 +81,27 @@ const TasksPage: React.FC = () => {
         detectLang();
     }, []);
 
+
+    useEffect(() => {
+        const fetchListTasks = async () => {
+            try {
+                let result = await tasksService.getListTasks();
+                if (!result) {
+                    SetListTasks([]);
+                    return;
+                }
+                SetListTasks(result);
+            } catch (error) {
+                console.error("Ошибка при загрузке задач:", error);
+                SetListTasks([]);
+            }
+        };
+
+        fetchListTasks();
+    }, []);
+
+
+
     const formatDate = (date: Date): string => {
         const year = date.getFullYear();
         const month = String(date.getMonth() + 1).padStart(2, '0');
@@ -348,7 +364,6 @@ const TasksPage: React.FC = () => {
 
     const renderTaskDateTime = (task: Task) => {
         const lines = formatTaskDateTime(task);
-        console.log(task);
         return (
             <div>
                 {lines.map((line, index) => (
@@ -379,6 +394,13 @@ const TasksPage: React.FC = () => {
                                     <Button key={5} variant="listButton"  isActive={activeId === 5}  onClick={() => handlePeriodChange('nextMonth', 5)} className="day handl">{t('buttons.MonthButton')}</Button>
                                 </div>
                             </div>
+
+                            <div className="list-tasks">
+                                <button className="triger" onClick={() => setAddList(true)}>Добавить список</button>
+                                {ListTasks.map((task) => (
+                                    <button>task.label</button>
+                                ))}
+                            </div>
                         </div>
                     </div>
                 </Panel>

assets/react/pages/main/pages/Premium.tsx

@@ -123,7 +123,7 @@ const PremiumPage: React.FC<PremiumPageProps> = ({ isAuthenticated }) => {
         {
             question: 'Как отменить подписку?',
             answer:
-                'Если вы оформили подписку через Google Play или App Store — откройте соответствующее приложение, перейдите в раздел "Подписки" и отмените TaskFlow Premium. Если подписка оформлена напрямую, просто напишите нам через "Обратную связь".',
+                'Если вы оформили подписку через Google Play или App Store — откройте соответствующее приложение, перейдите в раздел "Подписки" и отмените TaskFlow PremiumUseCases. Если подписка оформлена напрямую, просто напишите нам через "Обратную связь".',
         },
         {
             question: 'Что делать, если остались вопросы?',
@@ -172,7 +172,7 @@ const PremiumPage: React.FC<PremiumPageProps> = ({ isAuthenticated }) => {
             {/* хедер */}
             <header className="premium-header text-center py-5">
                 <TextBlock variant="h1" align="center" weight="bold" size="display-4" className="mb-3">
-                    {t('HeadText') || 'Увеличьте вашу продуктивность с TaskFlow Premium'}
+                    {t('HeadText') || 'Увеличьте вашу продуктивность с TaskFlow PremiumUseCases'}
                 </TextBlock>
                 <TextBlock variant="p" align="center" color="text-muted" size="lead" className="mb-4">
                     {t('DescText') || 'Разблокируйте все премиум-функции на всех платформах. Наслаждайтесь организованной жизнью в полной мере.'}
@@ -215,7 +215,7 @@ const PremiumPage: React.FC<PremiumPageProps> = ({ isAuthenticated }) => {
             <section className="premium-begin-section text-center py-5 bg-dark">
                 <div className="container">
                     <h2 className="display-6 fw-semibold mb-4">
-                        {t('readyQuestion') || 'Готовы ли вы достичь большего с Premium?'}
+                        {t('readyQuestion') || 'Готовы ли вы достичь большего с PremiumUseCases?'}
                     </h2>
                     <Button as="link" to="/users/register" variant="subscribe">
                         {t('readyButton') || 'Вперёд'}

assets/react/ui/props/Tasks/ListTasks/ListTasks.tsx

@@ -0,0 +1,5 @@
+export type ListTasks = {
+    label: string;
+    priority: string;
+    list_type: string;
+};

src/Aplication/Dto/BenefistDto/BenefitsDtoRes.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Aplication\Dto\BenefistDto;
+
+final class BenefitsDtoRes
+{
+    public function __construct(
+        public readonly string $title,
+        public readonly string $desc,
+        public readonly string $icon_path,
+    ) {
+    }
+
+
+
+}

src/Aplication/Dto/FaqsDto/FaqDtoRes.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Aplication\Dto\FaqsDto;
+
+final class FaqDtoRes
+{
+    public function __construct(
+        public readonly string $question,
+        public readonly string $answer,
+    ) {
+    }
+
+
+}