From 5737e3738629b5cd1758a36cfc1fd9495557b10d Mon Sep 17 00:00:00 2001
From: tlartem <tlartem@ya.ru>
Date: Mon, 21 Jul 2025 17:07:03 +0300
Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.js                                  |   8 +-
 shared/types.ts                               |   1 +
 src/app/App.tsx                               |  53 ++--
 .../BasicElements/ButtonGroupElement.tsx      |   4 +-
 .../CalibrationConditionsElement.tsx          |  52 ++--
 src/component/BasicElements/DateElement.tsx   |   6 +-
 src/component/BasicElements/NumberElement.tsx |   4 +-
 src/component/BasicElements/RadioElement.tsx  |   4 +-
 src/component/BasicElements/SelectElement.tsx |   6 +-
 src/component/BasicElements/TextElement.tsx   |   4 +-
 .../BasicElements/TextareaElement.tsx         |   4 +-
 .../StandardsElement/StandardsDialog.tsx      |  18 +-
 .../StandardsElement/StandardsEditor.tsx      |   6 +-
 .../StandardsElement/StandardsPreview.tsx     |  38 +--
 .../StandardsElement/StandardsSelector.tsx    | 253 +++++++++---------
 .../{TemplateManager => }/TemplateCard.tsx    |   8 +-
 .../TemplateManager/ExcelUploadPanel.tsx      |   2 +-
 .../TemplateManager/FormattingToolbar.tsx     |   4 +-
 src/component/TemplateManager/HeaderBar.tsx   |   2 +-
 .../TemplateManager/SpreadsheetViewer.tsx     |   2 +-
 .../TemplateManager/TemplateEditor.tsx        |   2 +-
 .../TemplateManager/TemplateManager.tsx       |  96 +++----
 src/context/TemplateContext.tsx               | 235 ----------------
 .../template/api}/templateApiService.ts       |  18 +-
 .../template/model/TemplateContext.tsx        | 143 ++++++++++
 src/lib/element-registry-init.ts              |   4 +-
 src/page/ElementsCreation/Page.tsx            |   6 +-
 src/page/ProtocolCreation/Page.tsx            |  22 +-
 src/page/TemplateEditPage.tsx                 |  17 ++
 src/page/TemplateSetup/Page.tsx               |  20 --
 src/page/TemplateSetup/index.ts               |   1 -
 src/page/TemplatesOverviewPage.tsx            |  46 ++++
 src/page/index.ts                             |   2 +-
 src/type/imports.d.ts                         |   6 +-
 tsconfig.json                                 |   8 +-
 35 files changed, 526 insertions(+), 579 deletions(-)
 create mode 100644 shared/types.ts
 rename src/component/{TemplateManager => }/TemplateCard.tsx (92%)
 delete mode 100644 src/context/TemplateContext.tsx
 rename src/{service => entitiy/template/api}/templateApiService.ts (94%)
 create mode 100644 src/entitiy/template/model/TemplateContext.tsx
 create mode 100644 src/page/TemplateEditPage.tsx
 delete mode 100644 src/page/TemplateSetup/Page.tsx
 delete mode 100644 src/page/TemplateSetup/index.ts
 create mode 100644 src/page/TemplatesOverviewPage.tsx

diff --git a/.eslintrc.js b/.eslintrc.js
index bcc3420..b744197 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -31,10 +31,10 @@ module.exports = {
         pathGroups: [
           { pattern: 'react', group: 'builtin' },
           { pattern: '~shared/**', group: 'internal', position: 'before' },
-          { pattern: '~entities/**', group: 'internal', position: 'before' },
-          { pattern: '~features/**', group: 'internal', position: 'before' },
-          { pattern: '~widgets/**', group: 'internal', position: 'before' },
-          { pattern: '~pages/**', group: 'internal', position: 'before' },
+          { pattern: '~entitiy/**', group: 'internal', position: 'before' },
+          { pattern: '~feature/**', group: 'internal', position: 'before' },
+          { pattern: '~widget/**', group: 'internal', position: 'before' },
+          { pattern: '~page/**', group: 'internal', position: 'before' },
         ],
         pathGroupsExcludedImportTypes: ['builtin'],
         groups: [
diff --git a/shared/types.ts b/shared/types.ts
new file mode 100644
index 0000000..84ddb97
--- /dev/null
+++ b/shared/types.ts
@@ -0,0 +1 @@
+type UUID = string
diff --git a/src/app/App.tsx b/src/app/App.tsx
index d5a9368..7ae64f3 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -2,34 +2,39 @@ import { FC } from 'react'
 
 import { Navigate, Route, Routes } from 'react-router-dom'
 
-import { TemplateProvider } from '../context/TemplateContext'
-import { ElementsCreation } from '../page/ElementsCreation'
-import { ProtocolCreation } from '../page/ProtocolCreation'
-import { TemplateSetup } from '../page/TemplateSetup'
+import { TemplateProvider } from '@/entitiy/template/model/TemplateContext'
+import { ElementsCreation } from '@/page/ElementsCreation'
+import { ProtocolCreation } from '@/page/ProtocolCreation'
+import { TemplateEditPage } from '@/page/TemplateEditPage'
+import { TemplatesOverviewPage } from '@/page/TemplatesOverviewPage'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { Layout } from './Layout'
 
+const queryClient = new QueryClient()
 const App: FC = () => {
   return (
-    <TemplateProvider>
-      <Routes>
-        <Route path="/" element={<Layout />}>
-          <Route index element={<Navigate to="/templates" replace />} />
-          <Route path="templates/" element={<TemplateSetup />} />
-          <Route
-            path="templates/:templateId/edit"
-            element={<TemplateSetup />}
-          />
-          <Route
-            path="templates/:templateId/elements"
-            element={<ElementsCreation />}
-          />
-          <Route
-            path="templates/:templateId/protocols"
-            element={<ProtocolCreation />}
-          />
-        </Route>
-      </Routes>
-    </TemplateProvider>
+    <QueryClientProvider client={queryClient}>
+      <TemplateProvider>
+        <Routes>
+          <Route path="/" element={<Layout />}>
+            <Route index element={<Navigate to="/templates" replace />} />
+            <Route path="templates/" element={<TemplatesOverviewPage />} />
+            <Route
+              path="templates/:templateId/edit"
+              element={<TemplateEditPage />}
+            />
+            <Route
+              path="templates/:templateId/elements"
+              element={<ElementsCreation />}
+            />
+            <Route
+              path="templates/:templateId/protocols"
+              element={<ProtocolCreation />}
+            />
+          </Route>
+        </Routes>
+      </TemplateProvider>
+    </QueryClientProvider>
   )
 }
 
diff --git a/src/component/BasicElements/ButtonGroupElement.tsx b/src/component/BasicElements/ButtonGroupElement.tsx
index 40c1464..90a2453 100644
--- a/src/component/BasicElements/ButtonGroupElement.tsx
+++ b/src/component/BasicElements/ButtonGroupElement.tsx
@@ -1,5 +1,5 @@
-import { Button } from '@/components/ui/button'
-import { Input } from '@/components/ui/input'
+import { Button } from '@/component/ui/button'
+import { Input } from '@/component/ui/input'
 import { ElementDefinition } from '@/lib/element-registry'
 import { ElementOption } from '@/type/template'
 import { Plus, Square, Trash2 } from 'lucide-react'
diff --git a/src/component/BasicElements/CalibrationConditionsElement.tsx b/src/component/BasicElements/CalibrationConditionsElement.tsx
index 62bebcb..7d7cbc1 100644
--- a/src/component/BasicElements/CalibrationConditionsElement.tsx
+++ b/src/component/BasicElements/CalibrationConditionsElement.tsx
@@ -1,8 +1,8 @@
-import { Badge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import { Input } from '@/components/ui/input'
-import { Label } from '@/components/ui/label'
+import { Badge } from '@/component/ui/badge'
+import { Button } from '@/component/ui/button'
+import { Card, CardContent, CardHeader, CardTitle } from '@/component/ui/card'
+import { Input } from '@/component/ui/input'
+import { Label } from '@/component/ui/label'
 import { ElementDefinition } from '@/lib/element-registry'
 import {
   AlertCircle,
@@ -91,7 +91,7 @@ const formatLastUpdated = (dateString: string) => {
   const monthShortRu = date
     .toLocaleString('ru-RU', { month: 'short' })
     .replace(/\./, '')
-    .replace(/^./, (s) => s.toUpperCase())
+    .replace(/^./, s => s.toUpperCase())
   const day = date.getDate()
   const time: string = date.toLocaleString('ru-RU', {
     hour: '2-digit',
@@ -103,8 +103,8 @@ const formatLastUpdated = (dateString: string) => {
   } else if (date.toDateString() === yesterday.toDateString()) {
     return `Вчера в ${time}`
   } else {
-    return `${weekdayRu.replace(/^./, (s) =>
-      s.toUpperCase(),
+    return `${weekdayRu.replace(/^./, s =>
+      s.toUpperCase()
     )} ${day} ${monthShortRu} ${time}`
   }
 }
@@ -136,10 +136,10 @@ function CalibrationCondInfo({
       'frequency',
     ]
 
-    fields.forEach((field) => {
+    fields.forEach(field => {
       const validation = validateField(
         field,
-        tempConditions[field as keyof CalibrationConditions] as string,
+        tempConditions[field as keyof CalibrationConditions] as string
       )
       if (!validation.isValid && validation.message) {
         errors[field] = validation.message
@@ -151,11 +151,11 @@ function CalibrationCondInfo({
   }
 
   const handleFieldChange = (field: string, value: string) => {
-    setTempConditions((prev) => ({ ...prev, [field]: value }))
+    setTempConditions(prev => ({ ...prev, [field]: value }))
 
     // Валидация в реальном времени
     const validation = validateField(field, value)
-    setValidationErrors((prev) => ({
+    setValidationErrors(prev => ({
       ...prev,
       [field]: validation.isValid ? '' : validation.message || '',
     }))
@@ -187,7 +187,7 @@ function CalibrationCondInfo({
     // Устанавливаем фокус на первое поле через небольшую задержку
     setTimeout(() => {
       const firstInput = document.getElementById(
-        'modal-temperature',
+        'modal-temperature'
       ) as HTMLInputElement
       if (firstInput) {
         firstInput.focus()
@@ -199,7 +199,7 @@ function CalibrationCondInfo({
   const handleKeyDown = (e: React.KeyboardEvent) => {
     if (
       e.key === 'Enter' &&
-      !Object.keys(validationErrors).some((key) => validationErrors[key])
+      !Object.keys(validationErrors).some(key => validationErrors[key])
     ) {
       handleSave()
     }
@@ -321,10 +321,10 @@ function CalibrationCondInfo({
                                     key as keyof CalibrationConditions
                                   ] as string
                                 }
-                                onChange={(e) =>
+                                onChange={e =>
                                   handleFieldChange(key, e.target.value)
                                 }
-                                onKeyDown={(e) => {
+                                onKeyDown={e => {
                                   if (e.key === 'Enter') {
                                     e.preventDefault()
                                     handleSave()
@@ -334,8 +334,8 @@ function CalibrationCondInfo({
                                   hasError
                                     ? 'border-destructive focus-visible:ring-destructive'
                                     : isValid
-                                    ? 'border-green-500 focus-visible:ring-green-500'
-                                    : ''
+                                      ? 'border-green-500 focus-visible:ring-green-500'
+                                      : ''
                                 }`}
                                 placeholder={placeholder}
                                 type="number"
@@ -361,7 +361,7 @@ function CalibrationCondInfo({
                           </div>
                         </div>
                       )
-                    },
+                    }
                   )}
                 </div>
 
@@ -385,7 +385,7 @@ function CalibrationCondInfo({
                     disabled={
                       isLoading ||
                       Object.keys(validationErrors).some(
-                        (key) => validationErrors[key],
+                        key => validationErrors[key]
                       )
                     }
                   >
@@ -463,7 +463,7 @@ export const calibrationConditionsDefinition: ElementDefinition<
             <Input
               type="number"
               value={config.defaultConditions?.temperature || '20'}
-              onChange={(e) =>
+              onChange={e =>
                 onChange({
                   ...config,
                   defaultConditions: {
@@ -489,7 +489,7 @@ export const calibrationConditionsDefinition: ElementDefinition<
             <Input
               type="number"
               value={config.defaultConditions?.humidity || '65'}
-              onChange={(e) =>
+              onChange={e =>
                 onChange({
                   ...config,
                   defaultConditions: {
@@ -515,7 +515,7 @@ export const calibrationConditionsDefinition: ElementDefinition<
             <Input
               type="number"
               value={config.defaultConditions?.pressure || '101.3'}
-              onChange={(e) =>
+              onChange={e =>
                 onChange({
                   ...config,
                   defaultConditions: {
@@ -541,7 +541,7 @@ export const calibrationConditionsDefinition: ElementDefinition<
             <Input
               type="number"
               value={config.defaultConditions?.voltage || '220'}
-              onChange={(e) =>
+              onChange={e =>
                 onChange({
                   ...config,
                   defaultConditions: {
@@ -567,7 +567,7 @@ export const calibrationConditionsDefinition: ElementDefinition<
             <Input
               type="number"
               value={config.defaultConditions?.frequency || '50'}
-              onChange={(e) =>
+              onChange={e =>
                 onChange({
                   ...config,
                   defaultConditions: {
@@ -632,7 +632,7 @@ export const calibrationConditionsDefinition: ElementDefinition<
       <CalibrationCondInfo
         conditions={conditions}
         isOutdated={isOutdated}
-        onUpdate={async (newConditions) => {
+        onUpdate={async newConditions => {
           onChange?.(newConditions)
           return true
         }}
diff --git a/src/component/BasicElements/DateElement.tsx b/src/component/BasicElements/DateElement.tsx
index 69c21b7..b0bab50 100644
--- a/src/component/BasicElements/DateElement.tsx
+++ b/src/component/BasicElements/DateElement.tsx
@@ -1,4 +1,4 @@
-import { Input } from '@/components/ui/input'
+import { Input } from '@/component/ui/input'
 import { ElementDefinition } from '@/lib/element-registry'
 import { Calendar } from 'lucide-react'
 
@@ -22,7 +22,7 @@ export const dateDefinition: ElementDefinition<DateConfig, string> = {
           type="checkbox"
           id="required"
           checked={config.required}
-          onChange={(e) => onChange({ ...config, required: e.target.checked })}
+          onChange={e => onChange({ ...config, required: e.target.checked })}
         />
         <label htmlFor="required" className="text-sm font-medium">
           Обязательное поле
@@ -42,7 +42,7 @@ export const dateDefinition: ElementDefinition<DateConfig, string> = {
     <Input
       type="date"
       value={value || ''}
-      onChange={(e) => onChange?.(e.target.value)}
+      onChange={e => onChange?.(e.target.value)}
       required={config.required}
     />
   ),
diff --git a/src/component/BasicElements/NumberElement.tsx b/src/component/BasicElements/NumberElement.tsx
index ead0b39..b23b1cb 100644
--- a/src/component/BasicElements/NumberElement.tsx
+++ b/src/component/BasicElements/NumberElement.tsx
@@ -1,4 +1,4 @@
-import { Input } from '@/components/ui/input'
+import { Input } from '@/component/ui/input'
 import { ElementDefinition } from '@/lib/element-registry'
 import { Hash } from 'lucide-react'
 
@@ -40,7 +40,7 @@ export const numberDefinition: ElementDefinition<NumberConfig, number> = {
       type="number"
       placeholder={config.placeholder || '0'}
       value={value || ''}
-      onChange={(e) => onChange?.(parseFloat(e.target.value) || 0)}
+      onChange={e => onChange?.(parseFloat(e.target.value) || 0)}
       required={config.required}
     />
   ),
diff --git a/src/component/BasicElements/RadioElement.tsx b/src/component/BasicElements/RadioElement.tsx
index 7abd1c2..15d2598 100644
--- a/src/component/BasicElements/RadioElement.tsx
+++ b/src/component/BasicElements/RadioElement.tsx
@@ -1,5 +1,5 @@
-import { Button } from '@/components/ui/button'
-import { Input } from '@/components/ui/input'
+import { Button } from '@/component/ui/button'
+import { Input } from '@/component/ui/input'
 import { ElementDefinition } from '@/lib/element-registry'
 import { ElementOption } from '@/type/template'
 import { CheckSquare, Plus, Trash2 } from 'lucide-react'
diff --git a/src/component/BasicElements/SelectElement.tsx b/src/component/BasicElements/SelectElement.tsx
index 80b9325..c2c76ad 100644
--- a/src/component/BasicElements/SelectElement.tsx
+++ b/src/component/BasicElements/SelectElement.tsx
@@ -1,12 +1,12 @@
-import { Button } from '@/components/ui/button'
-import { Input } from '@/components/ui/input'
+import { Button } from '@/component/ui/button'
+import { Input } from '@/component/ui/input'
 import {
   Select,
   SelectContent,
   SelectItem,
   SelectTrigger,
   SelectValue,
-} from '@/components/ui/select'
+} from '@/component/ui/select'
 import { ElementDefinition } from '@/lib/element-registry'
 import { ElementOption } from '@/type/template'
 import { ChevronDown, Plus, Trash2 } from 'lucide-react'
diff --git a/src/component/BasicElements/TextElement.tsx b/src/component/BasicElements/TextElement.tsx
index 6733ad5..e8b8364 100644
--- a/src/component/BasicElements/TextElement.tsx
+++ b/src/component/BasicElements/TextElement.tsx
@@ -1,4 +1,4 @@
-import { Input } from '@/components/ui/input'
+import { Input } from '@/component/ui/input'
 import { ElementDefinition } from '@/lib/element-registry'
 import { Type } from 'lucide-react'
 
@@ -38,7 +38,7 @@ export const textDefinition: ElementDefinition<TextConfig, string> = {
     <Input
       placeholder={config.placeholder || 'Введите текст'}
       value={value || ''}
-      onChange={(e) => onChange?.(e.target.value)}
+      onChange={e => onChange?.(e.target.value)}
       required={config.required}
     />
   ),
diff --git a/src/component/BasicElements/TextareaElement.tsx b/src/component/BasicElements/TextareaElement.tsx
index 2506f68..3f8575d 100644
--- a/src/component/BasicElements/TextareaElement.tsx
+++ b/src/component/BasicElements/TextareaElement.tsx
@@ -1,4 +1,4 @@
-import { Textarea } from '@/components/ui/textarea'
+import { Textarea } from '@/component/ui/textarea'
 import { ElementDefinition } from '@/lib/element-registry'
 import { FileText } from 'lucide-react'
 
@@ -39,7 +39,7 @@ export const textareaDefinition: ElementDefinition<TextareaConfig, string> = {
     <Textarea
       placeholder={config.placeholder || 'Введите текст'}
       value={value || ''}
-      onChange={(e) => onChange?.(e.target.value)}
+      onChange={e => onChange?.(e.target.value)}
       required={config.required}
       rows={3}
       className="w-full resize-none"
diff --git a/src/component/StandardsElement/StandardsDialog.tsx b/src/component/StandardsElement/StandardsDialog.tsx
index 15750e2..2b79ae7 100644
--- a/src/component/StandardsElement/StandardsDialog.tsx
+++ b/src/component/StandardsElement/StandardsDialog.tsx
@@ -1,7 +1,7 @@
-import { Badge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import { Separator } from '@/components/ui/separator'
+import { Badge } from '@/component/ui/badge'
+import { Button } from '@/component/ui/button'
+import { Card, CardContent, CardHeader, CardTitle } from '@/component/ui/card'
+import { Separator } from '@/component/ui/separator'
 import { Calendar, Check, FileText, Settings } from 'lucide-react'
 import { useState } from 'react'
 
@@ -41,15 +41,15 @@ export function StandardsDialog({
   registryNumber,
 }: StandardsDialogProps) {
   const [selectedStandards, setSelectedStandards] = useState<string[]>(
-    config.selectedStandards,
+    config.selectedStandards
   )
 
   if (!isOpen) return null
 
   const toggleStandard = (standardId: string) => {
-    setSelectedStandards((prev) => {
+    setSelectedStandards(prev => {
       if (prev.includes(standardId)) {
-        return prev.filter((id) => id !== standardId)
+        return prev.filter(id => id !== standardId)
       } else if (prev.length < 7) {
         return [...prev, standardId]
       }
@@ -93,7 +93,7 @@ export function StandardsDialog({
 
         <CardContent className="space-y-4">
           <div className="scrollbar-thin scrollbar-thumb-gray-300 dark:scrollbar-thumb-gray-600 scrollbar-track-transparent grid max-h-96 grid-cols-1 gap-3 overflow-y-auto md:grid-cols-2">
-            {standards.map((standard) => {
+            {standards.map(standard => {
               const isSelected = selectedStandards.includes(standard.id)
               const isExpiring = isExpiringSoon(standard.validUntil)
 
@@ -155,7 +155,7 @@ export function StandardsDialog({
                         <div className="text-xs text-muted-foreground">
                           Действует до:{' '}
                           {new Date(standard.validUntil).toLocaleDateString(
-                            'ru-RU',
+                            'ru-RU'
                           )}
                         </div>
                       </div>
diff --git a/src/component/StandardsElement/StandardsEditor.tsx b/src/component/StandardsElement/StandardsEditor.tsx
index a58f70d..b6b8894 100644
--- a/src/component/StandardsElement/StandardsEditor.tsx
+++ b/src/component/StandardsElement/StandardsEditor.tsx
@@ -1,12 +1,12 @@
-import { Button } from '@/components/ui/button'
-import { Input } from '@/components/ui/input'
+import { Button } from '@/component/ui/button'
+import { Input } from '@/component/ui/input'
 import {
   Select,
   SelectContent,
   SelectItem,
   SelectTrigger,
   SelectValue,
-} from '@/components/ui/select'
+} from '@/component/ui/select'
 import { CellTarget } from '@/type/template'
 import { Calendar, Settings, Trash2 } from 'lucide-react'
 
diff --git a/src/component/StandardsElement/StandardsPreview.tsx b/src/component/StandardsElement/StandardsPreview.tsx
index 5ec3bad..31e0e07 100644
--- a/src/component/StandardsElement/StandardsPreview.tsx
+++ b/src/component/StandardsElement/StandardsPreview.tsx
@@ -1,33 +1,35 @@
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { Calendar, Settings } from "lucide-react";
+import { Badge } from '@/component/ui/badge'
+import { Button } from '@/component/ui/button'
+import { Calendar, Settings } from 'lucide-react'
 
 interface StandardsConfig {
-  registryNumber: string;
-  sheet: string;
-  startCell: string;
-  maxItems: number;
-  targetCells: any[];
+  registryNumber: string
+  sheet: string
+  startCell: string
+  maxItems: number
+  targetCells: any[]
 }
 
 interface StandardsPreviewProps {
-  config: StandardsConfig;
+  config: StandardsConfig
 }
 
-export const StandardsPreview: React.FC<StandardsPreviewProps> = ({ config }) => {
+export const StandardsPreview: React.FC<StandardsPreviewProps> = ({
+  config,
+}) => {
   return (
     <div className="space-y-3">
       <div className="text-sm font-medium text-gray-700">Предпросмотр</div>
-      <div className="p-4 border border-gray-200 rounded-lg bg-white">
+      <div className="rounded-lg border border-gray-200 bg-white p-4">
         <div className="space-y-3">
           <div className="flex items-center gap-2">
             <Settings className="h-4 w-4 text-gray-500" />
             <span className="text-sm font-medium">Измерительные эталоны</span>
           </div>
-          
+
           <div className="space-y-2">
             <div className="text-xs text-gray-500">
-              ГРСИ: {config.registryNumber || "Не указан"}
+              ГРСИ: {config.registryNumber || 'Не указан'}
             </div>
             <div className="text-xs text-gray-500">
               Максимум: {config.maxItems} эталонов
@@ -36,7 +38,7 @@ export const StandardsPreview: React.FC<StandardsPreviewProps> = ({ config }) =>
 
           <div className="flex items-center gap-2">
             <Button variant="outline" size="sm" disabled className="text-xs">
-              <Calendar className="h-3 w-3 mr-1" />
+              <Calendar className="mr-1 h-3 w-3" />
               Выбрать эталоны
             </Button>
             <Badge variant="secondary" className="text-xs">
@@ -45,11 +47,11 @@ export const StandardsPreview: React.FC<StandardsPreviewProps> = ({ config }) =>
           </div>
 
           {config.targetCells && config.targetCells.length > 0 && (
-            <div className="flex flex-wrap gap-1 mt-2">
+            <div className="mt-2 flex flex-wrap gap-1">
               {config.targetCells.map((target, index) => (
                 <span
                   key={index}
-                  className="inline-block px-1.5 py-0.5 bg-blue-100 text-blue-700 text-xs rounded"
+                  className="inline-block rounded bg-blue-100 px-1.5 py-0.5 text-xs text-blue-700"
                   title={target.displayName}
                 >
                   {target.sheet}!{target.cell}
@@ -60,5 +62,5 @@ export const StandardsPreview: React.FC<StandardsPreviewProps> = ({ config }) =>
         </div>
       </div>
     </div>
-  );
-}; 
\ No newline at end of file
+  )
+}
diff --git a/src/component/StandardsElement/StandardsSelector.tsx b/src/component/StandardsElement/StandardsSelector.tsx
index 54f17d8..7056c8e 100644
--- a/src/component/StandardsElement/StandardsSelector.tsx
+++ b/src/component/StandardsElement/StandardsSelector.tsx
@@ -1,214 +1,227 @@
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
-import { Calendar, Check, FileText, Settings, X } from "lucide-react";
-import { useState } from "react";
+import { Badge } from '@/component/ui/badge'
+import { Button } from '@/component/ui/button'
+import {
+  Dialog,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+} from '@/component/ui/dialog'
+import { Calendar, Check, FileText, Settings, X } from 'lucide-react'
+import { useState } from 'react'
 
 interface MeasurementStandard {
-  id: string;
-  name: string;
-  shortName: string;
-  type: string;
-  registryNumber: string;
-  range: string;
-  accuracy: string;
-  certificateNumber: string;
-  validUntil: string;
+  id: string
+  name: string
+  shortName: string
+  type: string
+  registryNumber: string
+  range: string
+  accuracy: string
+  certificateNumber: string
+  validUntil: string
 }
 
 interface StandardsSelectorProps {
-  isOpen: boolean;
-  onClose: () => void;
-  value: string[];
-  onChange: (value: string[]) => void;
-  registryNumber?: string;
+  isOpen: boolean
+  onClose: () => void
+  value: string[]
+  onChange: (value: string[]) => void
+  registryNumber?: string
 }
 
 // Моковые данные для эталонов
 const mockStandards: MeasurementStandard[] = [
   {
-    id: "1",
-    name: "Эталон массы 1 кг",
-    shortName: "ЭМ-1кг",
-    type: "Масса",
-    registryNumber: "ГРСИ 12345-01",
-    range: "0.5-2 кг",
-    accuracy: "±0.001 г",
-    certificateNumber: "СИ-2024-001",
-    validUntil: "2025-12-31",
+    id: '1',
+    name: 'Эталон массы 1 кг',
+    shortName: 'ЭМ-1кг',
+    type: 'Масса',
+    registryNumber: 'ГРСИ 12345-01',
+    range: '0.5-2 кг',
+    accuracy: '±0.001 г',
+    certificateNumber: 'СИ-2024-001',
+    validUntil: '2025-12-31',
   },
   {
-    id: "2",
-    name: "Эталон длины 1 м",
-    shortName: "ЭД-1м",
-    type: "Длина",
-    registryNumber: "ГРСИ 12345-02",
-    range: "0.5-2 м",
-    accuracy: "±0.001 мм",
-    certificateNumber: "СИ-2024-002",
-    validUntil: "2025-06-30",
+    id: '2',
+    name: 'Эталон длины 1 м',
+    shortName: 'ЭД-1м',
+    type: 'Длина',
+    registryNumber: 'ГРСИ 12345-02',
+    range: '0.5-2 м',
+    accuracy: '±0.001 мм',
+    certificateNumber: 'СИ-2024-002',
+    validUntil: '2025-06-30',
   },
   {
-    id: "3",
-    name: "Эталон температуры 20°C",
-    shortName: "ЭТ-20°C",
-    type: "Температура",
-    registryNumber: "ГРСИ 12345-03",
-    range: "15-25°C",
-    accuracy: "±0.01°C",
-    certificateNumber: "СИ-2024-003",
-    validUntil: "2025-03-15",
+    id: '3',
+    name: 'Эталон температуры 20°C',
+    shortName: 'ЭТ-20°C',
+    type: 'Температура',
+    registryNumber: 'ГРСИ 12345-03',
+    range: '15-25°C',
+    accuracy: '±0.01°C',
+    certificateNumber: 'СИ-2024-003',
+    validUntil: '2025-03-15',
   },
   {
-    id: "4",
-    name: "Эталон давления 1 Па",
-    shortName: "ЭД-1Па",
-    type: "Давление",
-    registryNumber: "ГРСИ 12345-04",
-    range: "0.5-2 Па",
-    accuracy: "±0.001 Па",
-    certificateNumber: "СИ-2024-004",
-    validUntil: "2025-09-20",
+    id: '4',
+    name: 'Эталон давления 1 Па',
+    shortName: 'ЭД-1Па',
+    type: 'Давление',
+    registryNumber: 'ГРСИ 12345-04',
+    range: '0.5-2 Па',
+    accuracy: '±0.001 Па',
+    certificateNumber: 'СИ-2024-004',
+    validUntil: '2025-09-20',
   },
   {
-    id: "5",
-    name: "Эталон времени 1 с",
-    shortName: "ЭВ-1с",
-    type: "Время",
-    registryNumber: "ГРСИ 12345-05",
-    range: "0.5-2 с",
-    accuracy: "±0.000001 с",
-    certificateNumber: "СИ-2024-005",
-    validUntil: "2025-12-01",
+    id: '5',
+    name: 'Эталон времени 1 с',
+    shortName: 'ЭВ-1с',
+    type: 'Время',
+    registryNumber: 'ГРСИ 12345-05',
+    range: '0.5-2 с',
+    accuracy: '±0.000001 с',
+    certificateNumber: 'СИ-2024-005',
+    validUntil: '2025-12-01',
   },
-];
+]
 
 export function StandardsSelector({
   isOpen,
   onClose,
   value = [],
   onChange,
-  registryNumber = "ГРСИ 12345"
+  registryNumber = 'ГРСИ 12345',
 }: StandardsSelectorProps) {
-  const [selectedStandards, setSelectedStandards] = useState<string[]>(value);
+  const [selectedStandards, setSelectedStandards] = useState<string[]>(value)
 
   const toggleStandard = (standardId: string) => {
     setSelectedStandards(prev => {
       if (prev.includes(standardId)) {
-        return prev.filter(id => id !== standardId);
+        return prev.filter(id => id !== standardId)
       } else if (prev.length < 7) {
-        return [...prev, standardId];
+        return [...prev, standardId]
       }
-      return prev;
-    });
-  };
+      return prev
+    })
+  }
 
   const handleSave = () => {
-    onChange(selectedStandards);
-    onClose();
-  };
+    onChange(selectedStandards)
+    onClose()
+  }
 
   const handleClose = () => {
-    setSelectedStandards(value); // Сбрасываем к исходному значению
-    onClose();
-  };
+    setSelectedStandards(value) // Сбрасываем к исходному значению
+    onClose()
+  }
 
   const isExpiringSoon = (validUntil: string) => {
-    const expiryDate = new Date(validUntil);
-    const now = new Date();
-    const monthsUntilExpiry = (expiryDate.getTime() - now.getTime()) / (1000 * 60 * 60 * 24 * 30);
-    return monthsUntilExpiry <= 3;
-  };
+    const expiryDate = new Date(validUntil)
+    const now = new Date()
+    const monthsUntilExpiry =
+      (expiryDate.getTime() - now.getTime()) / (1000 * 60 * 60 * 24 * 30)
+    return monthsUntilExpiry <= 3
+  }
 
   return (
     <Dialog open={isOpen} onOpenChange={handleClose}>
-      <DialogContent className="max-w-4xl max-h-[90vh] overflow-hidden">
+      <DialogContent className="max-h-[90vh] max-w-4xl overflow-hidden">
         <DialogHeader>
           <div className="flex items-center justify-between">
             <div>
-              <DialogTitle className="text-lg flex items-center gap-2">
-                <Settings className="w-5 h-5" />
+              <DialogTitle className="flex items-center gap-2 text-lg">
+                <Settings className="h-5 w-5" />
                 Измерительные эталоны
               </DialogTitle>
-              <p className="text-sm text-muted-foreground mt-1">
+              <p className="mt-1 text-sm text-muted-foreground">
                 ГРСИ: {registryNumber} • Выбрано: {selectedStandards.length}/7
               </p>
             </div>
             <Button variant="ghost" size="sm" onClick={handleClose}>
-              <X className="w-4 h-4" />
+              <X className="h-4 w-4" />
             </Button>
           </div>
         </DialogHeader>
-        
+
         <div className="space-y-4">
-          <div className="grid grid-cols-1 md:grid-cols-2 gap-3 max-h-96 overflow-y-auto">
-            {mockStandards.map((standard) => {
-              const isSelected = selectedStandards.includes(standard.id);
-              const isExpiring = isExpiringSoon(standard.validUntil);
-              
+          <div className="grid max-h-96 grid-cols-1 gap-3 overflow-y-auto md:grid-cols-2">
+            {mockStandards.map(standard => {
+              const isSelected = selectedStandards.includes(standard.id)
+              const isExpiring = isExpiringSoon(standard.validUntil)
+
               return (
                 <div
                   key={standard.id}
                   onClick={() => toggleStandard(standard.id)}
-                  className={`p-3 rounded-lg border cursor-pointer transition-all duration-200 ${
+                  className={`cursor-pointer rounded-lg border p-3 transition-all duration-200 ${
                     isSelected
-                      ? "border-primary bg-primary/10 shadow-sm"
-                      : "border-border hover:border-primary/50 hover:bg-primary/5"
+                      ? 'border-primary bg-primary/10 shadow-sm'
+                      : 'border-border hover:border-primary/50 hover:bg-primary/5'
                   }`}
                 >
                   <div className="flex items-start gap-3">
-                    <div className={`mt-1 w-5 h-5 rounded-full border-2 flex items-center justify-center transition-colors ${
-                      isSelected 
-                        ? "border-primary bg-primary" 
-                        : "border-border"
-                    }`}>
-                      {isSelected && <Check className="w-3 h-3 text-primary-foreground" />}
+                    <div
+                      className={`mt-1 flex h-5 w-5 items-center justify-center rounded-full border-2 transition-colors ${
+                        isSelected
+                          ? 'border-primary bg-primary'
+                          : 'border-border'
+                      }`}
+                    >
+                      {isSelected && (
+                        <Check className="h-3 w-3 text-primary-foreground" />
+                      )}
                     </div>
-                    
-                    <div className="flex-1 min-w-0">
+
+                    <div className="min-w-0 flex-1">
                       <div className="flex items-start justify-between gap-2">
                         <div className="flex-1">
-                          <div className="font-medium text-sm text-foreground leading-tight">
+                          <div className="text-sm font-medium leading-tight text-foreground">
                             {standard.shortName}
                           </div>
-                          <div className="text-xs text-muted-foreground mt-1 line-clamp-2">
+                          <div className="mt-1 line-clamp-2 text-xs text-muted-foreground">
                             {standard.name}
                           </div>
                         </div>
-                        
-                        <div className="flex flex-col gap-1 shrink-0">
+
+                        <div className="flex shrink-0 flex-col gap-1">
                           <Badge variant="secondary" className="text-xs">
                             {standard.accuracy}
                           </Badge>
                           {isExpiring && (
                             <Badge variant="destructive" className="text-xs">
-                              <Calendar className="w-3 h-3 mr-1" />
+                              <Calendar className="mr-1 h-3 w-3" />
                               Истекает
                             </Badge>
                           )}
                         </div>
                       </div>
-                      
+
                       <div className="mt-2 space-y-1">
                         <div className="flex items-center gap-1 text-xs text-muted-foreground">
-                          <FileText className="w-3 h-3" />
+                          <FileText className="h-3 w-3" />
                           {standard.registryNumber}
                         </div>
                         <div className="text-xs text-muted-foreground">
                           Диапазон: {standard.range}
                         </div>
                         <div className="text-xs text-muted-foreground">
-                          Действует до: {new Date(standard.validUntil).toLocaleDateString('ru-RU')}
+                          Действует до:{' '}
+                          {new Date(standard.validUntil).toLocaleDateString(
+                            'ru-RU'
+                          )}
                         </div>
                       </div>
                     </div>
                   </div>
                 </div>
-              );
+              )
             })}
           </div>
-          
-          <div className="flex items-center justify-between pt-4 border-t">
+
+          <div className="flex items-center justify-between border-t pt-4">
             <div className="text-sm text-muted-foreground">
               Максимум 7 эталонов. Выбрано: {selectedStandards.length}
             </div>
@@ -216,13 +229,11 @@ export function StandardsSelector({
               <Button variant="outline" onClick={handleClose}>
                 Отмена
               </Button>
-              <Button onClick={handleSave}>
-                Сохранить
-              </Button>
+              <Button onClick={handleSave}>Сохранить</Button>
             </div>
           </div>
         </div>
       </DialogContent>
     </Dialog>
-  );
-} 
\ No newline at end of file
+  )
+}
diff --git a/src/component/TemplateManager/TemplateCard.tsx b/src/component/TemplateCard.tsx
similarity index 92%
rename from src/component/TemplateManager/TemplateCard.tsx
rename to src/component/TemplateCard.tsx
index 6c82a1b..f5f5b08 100644
--- a/src/component/TemplateManager/TemplateCard.tsx
+++ b/src/component/TemplateCard.tsx
@@ -1,19 +1,17 @@
 import { FileText, Settings, Wrench } from 'lucide-react'
 import React from 'react'
 import { useNavigate } from 'react-router-dom'
-import { Template } from '../../type/template'
-import { Button } from '../ui/button'
-import { Card, CardContent, CardHeader, CardTitle } from '../ui/card'
+import { Template } from '../type/template'
+import { Button } from './ui/button'
+import { Card, CardContent, CardHeader, CardTitle } from './ui/card'
 
 interface TemplateCardProps {
   template: Template
-  onDelete: (template: Template) => void
   isSelected?: boolean
 }
 
 const TemplateCard: React.FC<TemplateCardProps> = ({
   template,
-  onDelete,
   isSelected = false,
 }) => {
   const navigate = useNavigate()
diff --git a/src/component/TemplateManager/ExcelUploadPanel.tsx b/src/component/TemplateManager/ExcelUploadPanel.tsx
index 8748a41..b3238eb 100644
--- a/src/component/TemplateManager/ExcelUploadPanel.tsx
+++ b/src/component/TemplateManager/ExcelUploadPanel.tsx
@@ -1,4 +1,4 @@
-import { Button } from '@/components/ui/button'
+import { Button } from '@/component/ui/button'
 import { FileText, Upload } from 'lucide-react'
 import React, { useRef } from 'react'
 
diff --git a/src/component/TemplateManager/FormattingToolbar.tsx b/src/component/TemplateManager/FormattingToolbar.tsx
index 4e69f79..afaf548 100644
--- a/src/component/TemplateManager/FormattingToolbar.tsx
+++ b/src/component/TemplateManager/FormattingToolbar.tsx
@@ -1,5 +1,5 @@
-import { Button } from '@/components/ui/button'
-import { Separator } from '@/components/ui/separator'
+import { Button } from '@/component/ui/button'
+import { Separator } from '@/component/ui/separator'
 import {
   AlignCenter,
   AlignLeft,
diff --git a/src/component/TemplateManager/HeaderBar.tsx b/src/component/TemplateManager/HeaderBar.tsx
index 55c930e..f1488ab 100644
--- a/src/component/TemplateManager/HeaderBar.tsx
+++ b/src/component/TemplateManager/HeaderBar.tsx
@@ -1,4 +1,4 @@
-import { Button } from '@/components/ui/button'
+import { Button } from '@/component/ui/button'
 import { Template } from '@/type/template'
 import { ArrowLeft, FileText, Settings, Wrench } from 'lucide-react'
 import React from 'react'
diff --git a/src/component/TemplateManager/SpreadsheetViewer.tsx b/src/component/TemplateManager/SpreadsheetViewer.tsx
index 215817a..8b453a9 100644
--- a/src/component/TemplateManager/SpreadsheetViewer.tsx
+++ b/src/component/TemplateManager/SpreadsheetViewer.tsx
@@ -1,4 +1,4 @@
-import DualSpreadsheet from '@/components/DualSpreadsheet/DualSpreadsheet'
+import DualSpreadsheet from '@/component/DualSpreadsheet/DualSpreadsheet'
 import { ExcelParseResult } from '@/service/fileApiSevice'
 import React from 'react'
 
diff --git a/src/component/TemplateManager/TemplateEditor.tsx b/src/component/TemplateManager/TemplateEditor.tsx
index 3ac5e95..9a76a7c 100644
--- a/src/component/TemplateManager/TemplateEditor.tsx
+++ b/src/component/TemplateManager/TemplateEditor.tsx
@@ -1,4 +1,4 @@
-import { useTemplateContext } from '@/context/TemplateContext'
+import { useTemplateContext } from '@/entitiy/template/model/TemplateContext'
 import {
   getFileData,
   getLatestFileForTemplate,
diff --git a/src/component/TemplateManager/TemplateManager.tsx b/src/component/TemplateManager/TemplateManager.tsx
index c8efecf..82c13e2 100644
--- a/src/component/TemplateManager/TemplateManager.tsx
+++ b/src/component/TemplateManager/TemplateManager.tsx
@@ -1,8 +1,9 @@
+import { useTemplateContext } from '@/entitiy/template/model/TemplateContext'
+import { Template } from '@/type/template'
 import { Circle, CircleCheck, FileText, Plus, Trash2 } from 'lucide-react'
 import React, { useEffect, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
-import { useTemplateContext } from '../../context/TemplateContext'
-import { Template } from '../../type/template'
+import TemplateCard from '../TemplateCard'
 import { Button } from '../ui/button'
 import {
   Dialog,
@@ -13,16 +14,14 @@ import {
   DialogTrigger,
 } from '../ui/dialog'
 import { Input } from '../ui/input'
-import TemplateCard from './TemplateCard'
 import { TemplateEditor } from './TemplateEditor'
 
 interface TemplateManagerProps {
-  onTemplateSelect?: (template: Template) => void
-  templateId?: string
+  template?: Template
 }
 
 export const TemplateManager: React.FC<TemplateManagerProps> = ({
-  templateId,
+  template: initialTemplate,
 }) => {
   const navigate = useNavigate()
   const {
@@ -32,7 +31,7 @@ export const TemplateManager: React.FC<TemplateManagerProps> = ({
     addTemplate,
     updateTemplate,
     deleteTemplate,
-    loadTemplates,
+    refetchTemplates,
   } = useTemplateContext()
   const [selectedTemplate, setSelectedTemplate] = useState<Template | null>(
     null
@@ -50,14 +49,11 @@ export const TemplateManager: React.FC<TemplateManagerProps> = ({
 
   // Автоматически открываем редактирование шаблона, если передан templateId
   useEffect(() => {
-    if (templateId) {
-      const template = templates.find(t => t.id === templateId)
-      if (template) {
-        setSelectedTemplate(template)
-        setIsEditMode(true)
-      }
+    if (initialTemplate) {
+      setSelectedTemplate(initialTemplate)
+      setIsEditMode(true)
     }
-  }, [templateId, templates])
+  }, [initialTemplate])
 
   const handleCreateTemplate = async () => {
     if (!newTemplateName.trim()) return
@@ -70,58 +66,44 @@ export const TemplateManager: React.FC<TemplateManagerProps> = ({
         elements: [],
         layoutSettings: undefined,
       })
-
-      // Находим созданный шаблон и открываем его для редактирования
-      // Поскольку addTemplate может занять время, используем небольшую задержку
-      setTimeout(() => {
-        const newTemplate = templates.find(
-          t => t.name === newTemplateName.trim()
-        )
-        if (newTemplate) {
-          setSelectedTemplate(newTemplate)
-          setIsEditMode(true)
-        }
-      }, 100)
-
       setIsCreateDialogOpen(false)
       setNewTemplateName('')
       setNewTemplateDescription('')
-    } catch (error) {
-      console.error('Ошибка при создании шаблона:', error)
-      // Здесь можно добавить уведомление пользователю об ошибке
+      await refetchTemplates()
+      const created = templates.find(t => t.name === newTemplateName.trim())
+      if (created) {
+        setSelectedTemplate(created)
+        setIsEditMode(true)
+      }
+    } catch (err) {
+      console.error('Error creating template:', err)
       alert('Ошибка при создании шаблона. Попробуйте еще раз.')
     } finally {
       setIsCreating(false)
     }
   }
 
-  const handleTemplateUpdate = async (updatedTemplate: Template) => {
-    try {
-      await updateTemplate(updatedTemplate)
-      setSelectedTemplate(updatedTemplate)
-    } catch (error) {
-      console.error('Ошибка при обновлении шаблона:', error)
-      alert('Ошибка при обновлении шаблона. Попробуйте еще раз.')
-    }
-  }
+  // const handleTemplateUpdate = async (updatedTemplate: Template) => {
+  //   try {
+  //     await updateTemplate(updatedTemplate)
+  //     setSelectedTemplate(updatedTemplate)
+  //   } catch (err) {
+  //     console.error('Error updating template:', err)
+  //     alert('Ошибка при обновлении шаблона. Попробуйте еще раз.')
+  //   }
+  // }
 
   const handleDeleteTemplates = () => {
-    templatesToDelete.forEach(template => {
-      deleteTemplate(template.id)
-    })
+    templatesToDelete.forEach(t => deleteTemplate(t.id))
     setTemplatesToDelete([])
     setIsSelectionMode(false)
     setSelectedTemplates(new Set())
   }
 
-  const toggleTemplateSelection = (templateId: string) => {
-    const newSelected = new Set(selectedTemplates)
-    if (newSelected.has(templateId)) {
-      newSelected.delete(templateId)
-    } else {
-      newSelected.add(templateId)
-    }
-    setSelectedTemplates(newSelected)
+  const toggleTemplateSelection = (id: UUID) => {
+    const next = new Set(selectedTemplates)
+    next.has(id) ? next.delete(id) : next.add(id)
+    setSelectedTemplates(next)
   }
 
   const handleSelectionModeToggle = () => {
@@ -135,14 +117,12 @@ export const TemplateManager: React.FC<TemplateManagerProps> = ({
   }
 
   const handleDeleteSelected = () => {
-    const selectedTemplatesList = templates.filter(t =>
-      selectedTemplates.has(t.id)
-    )
-    setTemplatesToDelete(selectedTemplatesList)
+    const toDelete = templates.filter(t => selectedTemplates.has(t.id))
+    setTemplatesToDelete(toDelete)
   }
 
   const handleRetry = () => {
-    loadTemplates()
+    refetchTemplates()
   }
 
   if (isEditMode && selectedTemplate) {
@@ -152,9 +132,7 @@ export const TemplateManager: React.FC<TemplateManagerProps> = ({
         onBack={() => {
           setIsEditMode(false)
           setSelectedTemplate(null)
-          if (templateId) {
-            navigate('/templates')
-          }
+          navigate('/templates')
         }}
       />
     )
@@ -169,7 +147,7 @@ export const TemplateManager: React.FC<TemplateManagerProps> = ({
           <h3 className="mb-2 text-lg font-medium text-gray-900">
             Ошибка загрузки шаблонов
           </h3>
-          <p className="mb-4 text-gray-600">{error}</p>
+          <p className="mb-4 text-gray-600">{error.message}</p>
           <Button onClick={handleRetry}>Попробовать снова</Button>
         </div>
       </div>
diff --git a/src/context/TemplateContext.tsx b/src/context/TemplateContext.tsx
deleted file mode 100644
index 545c9cf..0000000
--- a/src/context/TemplateContext.tsx
+++ /dev/null
@@ -1,235 +0,0 @@
-import React, {
-  createContext,
-  ReactNode,
-  useCallback,
-  useContext,
-  useEffect,
-  useState,
-} from 'react'
-import { getDefaultLayoutSettings, migrateTemplateElement } from '../lib/utils'
-import {
-  apiTemplateToTemplate,
-  createTemplate as createTemplateApi,
-  getTemplate as getTemplateApi,
-  getTemplates,
-  patchTemplate,
-  templateToCreateInput,
-  templateToPatchInput,
-} from '../service/templateApiService'
-import { Template, TemplateElement } from '../type/template'
-
-interface TemplateContextType {
-  templates: Template[]
-  isLoading: boolean
-  error: string | null
-  addTemplate: (
-    template: Omit<Template, 'id' | 'createdAt' | 'updatedAt'>
-  ) => Promise<void>
-  updateTemplate: (template: Template) => Promise<void>
-  deleteTemplate: (templateId: string) => void
-  getTemplate: (templateId: string) => Template | undefined
-  loadTemplates: () => Promise<void>
-  refreshTemplate: (templateId: string) => Promise<void>
-}
-
-const TemplateContext = createContext<TemplateContextType | undefined>(
-  undefined
-)
-
-export const useTemplateContext = () => {
-  const context = useContext(TemplateContext)
-  if (!context) {
-    throw new Error('useTemplateContext must be used within a TemplateProvider')
-  }
-  return context
-}
-
-interface TemplateProviderProps {
-  children: ReactNode
-}
-
-// Функция создания элемента названия протокола
-function createProtocolNameElement(): TemplateElement {
-  return {
-    id: 'protocol-name-' + Date.now(),
-    type: 'text',
-    name: 'protocolName',
-    label: 'Название протокола',
-    placeholder: 'Введите название протокола',
-    required: true,
-    targetCells: [
-      { sheet: 'L', cell: 'A1', displayName: 'Название протокола' },
-    ],
-    options: [],
-    order: 0,
-    layout: {
-      x: 50,
-      y: 50,
-      width: 400,
-      height: 80,
-      zIndex: 1,
-    },
-  }
-}
-
-// Функция миграции шаблона
-function migrateTemplate(template: any): Template {
-  return {
-    ...template,
-    elements: template.elements?.map(migrateTemplateElement) || [],
-    layoutSettings: template.layoutSettings || getDefaultLayoutSettings(),
-    createdAt: template.createdAt ? new Date(template.createdAt) : new Date(),
-    updatedAt: template.updatedAt ? new Date(template.updatedAt) : new Date(),
-  }
-}
-
-export const TemplateProvider: React.FC<TemplateProviderProps> = ({
-  children,
-}) => {
-  const [templates, setTemplates] = useState<Template[]>([])
-  const [isLoading, setIsLoading] = useState(false)
-  const [error, setError] = useState<string | null>(null)
-
-  // Загрузка всех шаблонов с API
-  const loadTemplates = useCallback(async () => {
-    setIsLoading(true)
-    setError(null)
-    try {
-      const response = await getTemplates()
-      const convertedTemplates = response.templates.map(apiTemplateToTemplate)
-      setTemplates(convertedTemplates)
-    } catch (err) {
-      const errorMessage =
-        err instanceof Error ? err.message : 'Неизвестная ошибка'
-      setError(errorMessage)
-      console.error('Ошибка при загрузке шаблонов:', err)
-    } finally {
-      setIsLoading(false)
-    }
-  }, [])
-
-  // Загрузка шаблонов при монтировании компонента
-  useEffect(() => {
-    loadTemplates()
-  }, [loadTemplates])
-
-  // Обновление конкретного шаблона с API
-  const refreshTemplate = useCallback(async (templateId: string) => {
-    try {
-      const response = await getTemplateApi(templateId)
-      if (response.template) {
-        const convertedTemplate = apiTemplateToTemplate(response.template)
-        setTemplates(prev =>
-          prev.map(t => (t.id === templateId ? convertedTemplate : t))
-        )
-      }
-    } catch (err) {
-      console.error('Ошибка при обновлении шаблона:', err)
-    }
-  }, [])
-
-  const addTemplate = async (
-    templateData: Omit<Template, 'id' | 'createdAt' | 'updatedAt'>
-  ) => {
-    // Проверяем есть ли уже элемент названия протокола
-    const hasProtocolName = templateData.elements.some(
-      el => el.name === 'protocolName' || el.label === 'Название протокола'
-    )
-
-    let templateWithProtocolName = templateData
-    if (!hasProtocolName) {
-      // Добавляем элемент названия протокола как первый элемент
-      const protocolNameElement = createProtocolNameElement()
-      templateWithProtocolName = {
-        ...templateData,
-        elements: [
-          protocolNameElement,
-          ...templateData.elements.map(el => ({
-            ...el,
-            order: (el.order || 0) + 1,
-          })),
-        ],
-      }
-    }
-
-    setIsLoading(true)
-    setError(null)
-    try {
-      const createInput = templateToCreateInput(templateWithProtocolName)
-      const response = await createTemplateApi(createInput)
-
-      // Получаем созданный шаблон с сервера
-      const templateResponse = await getTemplateApi(response.id)
-      if (templateResponse.template) {
-        const newTemplate = apiTemplateToTemplate(templateResponse.template)
-        setTemplates(prev => [...prev, newTemplate])
-      }
-    } catch (err) {
-      const errorMessage =
-        err instanceof Error ? err.message : 'Неизвестная ошибка'
-      setError(errorMessage)
-      console.error('Ошибка при создании шаблона:', err)
-      throw err
-    } finally {
-      setIsLoading(false)
-    }
-  }
-
-  const updateTemplate = async (updatedTemplate: Template) => {
-    console.log('updateTemplate called with:', updatedTemplate)
-    console.log('Elements count:', updatedTemplate.elements.length)
-
-    setIsLoading(true)
-    setError(null)
-    try {
-      const patchInput = templateToPatchInput(updatedTemplate)
-      await patchTemplate(updatedTemplate.id, patchInput)
-
-      // Обновляем локальное состояние
-      const migratedTemplate = migrateTemplate(updatedTemplate)
-      console.log('Migrated template:', migratedTemplate)
-      console.log('Migrated elements count:', migratedTemplate.elements.length)
-
-      setTemplates(prev =>
-        prev.map(t => (t.id === migratedTemplate.id ? migratedTemplate : t))
-      )
-    } catch (err) {
-      const errorMessage =
-        err instanceof Error ? err.message : 'Неизвестная ошибка'
-      setError(errorMessage)
-      console.error('Ошибка при обновлении шаблона:', err)
-      throw err
-    } finally {
-      setIsLoading(false)
-    }
-  }
-
-  const deleteTemplate = (templateId: string) => {
-    // Пока удаление только локально, так как в API нет endpoint для удаления
-    // В будущем здесь можно добавить вызов API для удаления
-    setTemplates(prev => prev.filter(t => t.id !== templateId))
-  }
-
-  const getTemplate = (templateId: string) => {
-    const template = templates.find(t => t.id === templateId)
-    return template ? migrateTemplate(template) : undefined
-  }
-
-  return (
-    <TemplateContext.Provider
-      value={{
-        templates: templates.map(migrateTemplate), // Применяем миграцию при получении
-        isLoading,
-        error,
-        addTemplate,
-        updateTemplate,
-        deleteTemplate,
-        getTemplate,
-        loadTemplates,
-        refreshTemplate,
-      }}
-    >
-      {children}
-    </TemplateContext.Provider>
-  )
-}
diff --git a/src/service/templateApiService.ts b/src/entitiy/template/api/templateApiService.ts
similarity index 94%
rename from src/service/templateApiService.ts
rename to src/entitiy/template/api/templateApiService.ts
index 18410f7..529a5ce 100644
--- a/src/service/templateApiService.ts
+++ b/src/entitiy/template/api/templateApiService.ts
@@ -5,7 +5,7 @@ export interface CreateTemplateInput {
 }
 
 export interface CreateTemplateOutput {
-  id: string
+  id: UUID
 }
 
 export interface GetTemplatesOutput {
@@ -37,8 +37,8 @@ export interface ApiTemplate {
 }
 
 // Импортируем типы для преобразования
-import { getDefaultLayoutSettings, migrateTemplateElement } from '../lib/utils'
-import { Template, TemplateElement } from '../type/template'
+import { getDefaultLayoutSettings, migrateTemplateElement } from '@/lib/utils'
+import { Template, TemplateElement } from '@/type/template'
 
 // Утилитарные функции для преобразования данных
 
@@ -93,7 +93,7 @@ export function templateToPatchInput(template: Template): PatchTemplateInput {
 }
 
 // API создание шаблона
-export async function createTemplate(
+export async function createTemplateApi(
   template: CreateTemplateInput
 ): Promise<CreateTemplateOutput> {
   try {
@@ -118,7 +118,7 @@ export async function createTemplate(
 }
 
 // API получение всех шаблонов
-export async function getTemplates(): Promise<GetTemplatesOutput> {
+export async function getTemplatesApi(): Promise<GetTemplatesOutput> {
   try {
     const response = await fetch('/api/templates/', {
       method: 'GET',
@@ -140,8 +140,8 @@ export async function getTemplates(): Promise<GetTemplatesOutput> {
 }
 
 // API получение конкретного шаблона
-export async function getTemplate(
-  templateId: string
+export async function getTemplateApi(
+  templateId: UUID
 ): Promise<GetTemplateOutput> {
   try {
     const response = await fetch(`/api/templates/${templateId}`, {
@@ -164,7 +164,7 @@ export async function getTemplate(
 }
 
 // API обновление шаблона
-export async function patchTemplate(
+export async function patchTemplateApi(
   templateId: string,
   template: PatchTemplateInput
 ): Promise<PatchTemplateOutput> {
@@ -194,5 +194,5 @@ export async function updateTemplate(
   template: Template
 ): Promise<PatchTemplateOutput> {
   const patchInput = templateToPatchInput(template)
-  return patchTemplate(template.id, patchInput)
+  return patchTemplateApi(template.id, patchInput)
 }
diff --git a/src/entitiy/template/model/TemplateContext.tsx b/src/entitiy/template/model/TemplateContext.tsx
new file mode 100644
index 0000000..57657d2
--- /dev/null
+++ b/src/entitiy/template/model/TemplateContext.tsx
@@ -0,0 +1,143 @@
+import {
+  apiTemplateToTemplate,
+  createTemplateApi,
+  getTemplateApi,
+  getTemplatesApi,
+  patchTemplateApi,
+  templateToCreateInput,
+  templateToPatchInput,
+} from '@/entitiy/template/api/templateApiService'
+import { Template } from '@/type/template'
+import {
+  QueryClient,
+  useMutation,
+  useQuery,
+  useQueryClient,
+} from '@tanstack/react-query'
+import React, { createContext, ReactNode, useContext, useMemo } from 'react'
+
+export const queryClient = new QueryClient()
+
+interface TemplateContextType {
+  templates: Template[]
+  isLoading: boolean
+  error: Error | null
+  refetchTemplates: () => void
+  addTemplate: (
+    data: Omit<Template, 'id' | 'createdAt' | 'updatedAt'>
+  ) => Promise<Template>
+  updateTemplate: (template: Template) => Promise<Template>
+  deleteTemplate: (id: UUID) => Promise<string>
+}
+
+const TemplateContext = createContext<TemplateContextType | undefined>(
+  undefined
+)
+
+export const TemplateProvider: React.FC<{ children: ReactNode }> = ({
+  children,
+}) => {
+  const client = useQueryClient()
+
+  const {
+    data: templates = [],
+    status: listStatus,
+    error: errorList,
+    refetch,
+  } = useQuery<Template[], Error>({
+    queryKey: ['templates'],
+    queryFn: async () => {
+      const { templates: apiList } = await getTemplatesApi()
+      return apiList.map(apiTemplateToTemplate)
+    },
+  })
+
+  const createMutation = useMutation({
+    mutationFn: async (
+      newTemplate: Omit<Template, 'id' | 'createdAt' | 'updatedAt'>
+    ) => {
+      const input = templateToCreateInput(newTemplate)
+      const { id } = await createTemplateApi(input)
+      const { template: apiTpl } = await getTemplateApi(id)
+      if (!apiTpl) throw new Error('Template not found')
+      return apiTemplateToTemplate(apiTpl)
+    },
+    onSuccess: () => {
+      client.invalidateQueries({ queryKey: ['templates'] })
+    },
+  })
+
+  const updateMutation = useMutation({
+    mutationFn: async (template: Template) => {
+      const input = templateToPatchInput(template)
+      await patchTemplateApi(template.id, input)
+      return template
+    },
+    onSuccess: updated => {
+      client.setQueryData<Template[]>(
+        ['templates'],
+        old =>
+          old?.map((t: Template) => (t.id === updated.id ? updated : t)) ?? []
+      )
+    },
+  })
+
+  const deleteMutation = useMutation({
+    mutationFn: async (id: string) => {
+      // TODO: deleteTemplateApi
+      return id
+    },
+    onSuccess: id => {
+      client.setQueryData<Template[]>(
+        ['templates'],
+        old => old?.filter((t: Template) => t.id !== id) ?? []
+      )
+    },
+  })
+
+  const value = useMemo(
+    () => ({
+      templates,
+      isLoading:
+        listStatus === 'pending' ||
+        createMutation.status === 'pending' ||
+        updateMutation.status === 'pending' ||
+        deleteMutation.status === 'pending',
+      error:
+        (errorList as Error) ||
+        (createMutation.error as Error) ||
+        (updateMutation.error as Error) ||
+        (deleteMutation.error as Error) ||
+        null,
+      refetchTemplates: refetch,
+      addTemplate: createMutation.mutateAsync,
+      updateTemplate: updateMutation.mutateAsync,
+      deleteTemplate: deleteMutation.mutateAsync,
+    }),
+    [
+      templates,
+      listStatus,
+      errorList,
+      createMutation.status,
+      createMutation.error,
+      updateMutation.status,
+      updateMutation.error,
+      deleteMutation.status,
+      deleteMutation.error,
+      refetch,
+    ]
+  )
+
+  return (
+    <TemplateContext.Provider value={value}>
+      {children}
+    </TemplateContext.Provider>
+  )
+}
+
+export const useTemplateContext = (): TemplateContextType => {
+  const ctx = useContext(TemplateContext)
+  if (!ctx)
+    throw new Error('useTemplateContext must be used within TemplateProvider')
+  return ctx
+}
diff --git a/src/lib/element-registry-init.ts b/src/lib/element-registry-init.ts
index a605d9c..ba9a470 100644
--- a/src/lib/element-registry-init.ts
+++ b/src/lib/element-registry-init.ts
@@ -8,8 +8,8 @@ import {
   selectDefinition,
   textareaDefinition,
   textDefinition,
-} from '@/components/BasicElements'
-import { standardsDefinition } from '@/components/StandardsElement/definition'
+} from '@/component/BasicElements'
+import { standardsDefinition } from '@/component/StandardsElement/definition'
 import { registerElement } from './element-registry'
 
 // Регистрация всех элементов
diff --git a/src/page/ElementsCreation/Page.tsx b/src/page/ElementsCreation/Page.tsx
index 46b13ee..053dea2 100644
--- a/src/page/ElementsCreation/Page.tsx
+++ b/src/page/ElementsCreation/Page.tsx
@@ -1,6 +1,6 @@
-import { ElementConstructor } from '@/components/TemplateManager/ElementConstructor'
-import { Button } from '@/components/ui/button'
-import { useTemplateContext } from '@/context/TemplateContext'
+import { ElementConstructor } from '@/component/TemplateManager/ElementConstructor'
+import { Button } from '@/component/ui/button'
+import { useTemplateContext } from '@/entitiy/template/model/TemplateContext'
 import { Template, TemplateElement } from '@/type/template'
 import { ArrowLeft, FileText, Settings, Wrench } from 'lucide-react'
 import { FC, useEffect, useState } from 'react'
diff --git a/src/page/ProtocolCreation/Page.tsx b/src/page/ProtocolCreation/Page.tsx
index 7d056fb..86e8969 100644
--- a/src/page/ProtocolCreation/Page.tsx
+++ b/src/page/ProtocolCreation/Page.tsx
@@ -1,20 +1,20 @@
-import DualSpreadsheet from '@/components/DualSpreadsheet/DualSpreadsheet'
-import { StandardsSelector } from '@/components/StandardsElement/StandardsSelector'
-import { Badge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
-import { Checkbox } from '@/components/ui/checkbox'
-import { Input } from '@/components/ui/input'
-import { Label } from '@/components/ui/label'
-import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group'
+import DualSpreadsheet from '@/component/DualSpreadsheet/DualSpreadsheet'
+import { StandardsSelector } from '@/component/StandardsElement/StandardsSelector'
+import { Badge } from '@/component/ui/badge'
+import { Button } from '@/component/ui/button'
+import { Checkbox } from '@/component/ui/checkbox'
+import { Input } from '@/component/ui/input'
+import { Label } from '@/component/ui/label'
+import { RadioGroup, RadioGroupItem } from '@/component/ui/radio-group'
 import {
   Select,
   SelectContent,
   SelectItem,
   SelectTrigger,
   SelectValue,
-} from '@/components/ui/select'
-import { Textarea } from '@/components/ui/textarea'
-import { useTemplateContext } from '@/context/TemplateContext'
+} from '@/component/ui/select'
+import { Textarea } from '@/component/ui/textarea'
+import { useTemplateContext } from '@/entitiy/template/model/TemplateContext'
 import { getElementDefinition } from '@/lib/element-registry'
 import { getLatestFileForTemplate } from '@/service/fileApiSevice'
 import { Template, TemplateElement } from '@/type/template'
diff --git a/src/page/TemplateEditPage.tsx b/src/page/TemplateEditPage.tsx
new file mode 100644
index 0000000..2b8bf94
--- /dev/null
+++ b/src/page/TemplateEditPage.tsx
@@ -0,0 +1,17 @@
+import { TemplateEditor } from '@/component/TemplateManager/TemplateEditor'
+import { useTemplateContext } from '@/entitiy/template/model/TemplateContext'
+import { useNavigate, useParams } from 'react-router-dom'
+
+export const TemplateEditPage = () => {
+  const { templateId } = useParams<{ templateId: string }>()
+  const { templates } = useTemplateContext()
+  const navigate = useNavigate()
+
+  const template = templates.find(t => t.id === templateId)
+  if (!template) {
+    navigate('/templates', { replace: true })
+    return null
+  }
+
+  return <TemplateEditor template={template} onBack={() => navigate(-1)} />
+}
diff --git a/src/page/TemplateSetup/Page.tsx b/src/page/TemplateSetup/Page.tsx
deleted file mode 100644
index e176964..0000000
--- a/src/page/TemplateSetup/Page.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { TemplateManager } from '@/components/TemplateManager/TemplateManager'
-import { useTemplateContext } from '@/context/TemplateContext'
-import { FC, useEffect } from 'react'
-import { useParams } from 'react-router-dom'
-
-export const TemplateSetup: FC = () => {
-  const { templateId } = useParams<{ templateId: string }>()
-  const { templates } = useTemplateContext()
-
-  useEffect(() => {
-    if (templateId) {
-      const template = templates.find(t => t.id === templateId)
-      if (template) {
-        console.log('Opening template for editing:', template)
-      }
-    }
-  }, [templateId, templates])
-
-  return <TemplateManager templateId={templateId} />
-}
diff --git a/src/page/TemplateSetup/index.ts b/src/page/TemplateSetup/index.ts
deleted file mode 100644
index dd135f2..0000000
--- a/src/page/TemplateSetup/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { TemplateSetup } from './Page'
diff --git a/src/page/TemplatesOverviewPage.tsx b/src/page/TemplatesOverviewPage.tsx
new file mode 100644
index 0000000..e0beb6f
--- /dev/null
+++ b/src/page/TemplatesOverviewPage.tsx
@@ -0,0 +1,46 @@
+import TemplateCard from '@/component/TemplateCard'
+import { Button } from '@/component/ui/button'
+import { useTemplateContext } from '@/entitiy/template/model/TemplateContext'
+import { Plus, Trash2 } from 'lucide-react'
+import { useState } from 'react'
+import { useNavigate } from 'react-router-dom'
+
+export const TemplatesOverviewPage = () => {
+  const navigate = useNavigate()
+  const { templates, deleteTemplate } = useTemplateContext()
+  const [selected, setSelected] = useState<Set<string>>(new Set())
+
+  const removeSelected = () => {
+    selected.forEach(deleteTemplate)
+    setSelected(new Set())
+  }
+
+  return (
+    <main className="mx-auto max-w-7xl p-6">
+      <header className="mb-6 flex items-center justify-between">
+        <h1 className="text-2xl font-bold">Шаблоны протоколов</h1>
+        <div className="flex gap-3">
+          {!!selected.size && (
+            <Button variant="destructive" onClick={removeSelected}>
+              <Trash2 className="mr-2 h-4 w-4" />
+              Удалить ({selected.size})
+            </Button>
+          )}
+          <Button onClick={() => navigate('/templates/new')}>
+            <Plus className="mr-2 h-4 w-4" /> Создать
+          </Button>
+        </div>
+      </header>
+
+      <section className="grid grid-cols-1 gap-6 md:grid-cols-2 lg:grid-cols-3">
+        {templates.map(t => (
+          <TemplateCard
+            key={t.id}
+            template={t}
+            isSelected={selected.has(t.id)}
+          />
+        ))}
+      </section>
+    </main>
+  )
+}
diff --git a/src/page/index.ts b/src/page/index.ts
index f283c54..262df30 100644
--- a/src/page/index.ts
+++ b/src/page/index.ts
@@ -1,5 +1,5 @@
 import { ElementsCreation } from './ElementsCreation'
 import { ProtocolCreation } from './ProtocolCreation'
-import { TemplateSetup } from './TemplateSetup'
+import { TemplateSetup } from './editTemplate'
 
 export { ElementsCreation, ProtocolCreation, TemplateSetup }
diff --git a/src/type/imports.d.ts b/src/type/imports.d.ts
index eb2c123..1276a89 100644
--- a/src/type/imports.d.ts
+++ b/src/type/imports.d.ts
@@ -4,17 +4,17 @@ declare module 'app/*' {
   export default content
 }
 
-declare module 'pages/*' {
+declare module 'page/*' {
   const content: any
   export default content
 }
 
-declare module 'features/*' {
+declare module 'feature/*' {
   const content: any
   export default content
 }
 
-declare module 'entities/*' {
+declare module 'entitiy/*' {
   const content: any
   export default content
 }
diff --git a/tsconfig.json b/tsconfig.json
index 6da0583..955ce8b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,10 +1,10 @@
 {
   "compilerOptions": {
     "noImplicitAny": true,
+    "target": "ES2015",
     "module": "ESNext",
-    "target": "ESNext",
     "jsx": "react-jsx",
-    "allowJs": true,
+    "allowJs": false,
     "moduleResolution": "node",
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
@@ -15,8 +15,10 @@
     "baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"]
-    }
+    },
+    "skipLibCheck": true
   },
+
   "ts-node": {
     "compilerOptions": {
       "module": "CommonJS"