Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions Endpoints/ImportEndpoints.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
using DocumentFormat.OpenXml.Packaging;
using DocumentFormat.OpenXml.Wordprocessing;
using System.Text;

namespace WebEditor.Endpoints
{
public static class ImportEndpoints
{
public static void MapImportEndpoints(this WebApplication app)
{
app.MapPost("/import/docx", async (HttpRequest request) =>
{
if (!request.HasFormContentType)
return Results.BadRequest("Ожидается multipart/form-data");

var form = await request.ReadFormAsync();
var file = form.Files.GetFile("file");

if (file == null || file.Length == 0)
return Results.BadRequest("Файл не найден");

if (!file.FileName.EndsWith(".docx", StringComparison.OrdinalIgnoreCase))
return Results.BadRequest("Поддерживается только .docx");

try
{
using var stream = file.OpenReadStream();
using var doc = WordprocessingDocument.Open(stream, false);

var body = doc.MainDocumentPart?.Document?.Body;
if (body == null)
return Results.BadRequest("Не удалось прочитать документ");

// Извлекаем текст с сохранением абзацев
var sb = new StringBuilder();
foreach (var para in body.Elements<Paragraph>())
{
var text = para.InnerText;
sb.AppendLine(text);
}

return Results.Ok(new { text = sb.ToString().Trim() });
}
catch (Exception ex)
{
return Results.BadRequest($"Ошибка чтения файла: {ex.Message}");
}
});
}
}
}
1 change: 1 addition & 0 deletions Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public static void Main(string[] args)
// ENDPOINTS
app.MapAnalysisEndpoints();
app.MapExportEndpoints();
app.MapImportEndpoints();

app.Run();
}
Expand Down
23 changes: 19 additions & 4 deletions client/src/components/Editor.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,30 @@ export default function Editor({ onAnalyze, loading, issues, result, onOpenRepor
})
}, [issues])

const handleImport = useCallback((text) => {
if (!text || !editor) return
const html = text
.split('\n')
.filter(line => line.trim())
.map(line => `<p>${line}</p>`)
.join('')

editor.commands.setContent(html)

// Обновляем счётчик слов
setWordCount(text.trim().split(/\s+/).length)
}, [editor])

return (
<div style={{ display: 'flex', flexDirection: 'column', height: '100vh' }}>

{/* Тулбар */}
<EditorToolbar
editor={editor}
wordCount={wordCount}
isDark={isDark}
onToggleTheme={onToggleTheme}
editor={editor}
wordCount={wordCount}
isDark={isDark}
onToggleTheme={onToggleTheme}
onImport={handleImport}
/>

{/* Рабочая область */}
Expand Down
85 changes: 70 additions & 15 deletions client/src/components/EditorToolbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ function StyledSelect({ onChange, value, defaultValue, children, width }) {
value={value}
defaultValue={defaultValue}
style={{
height: '28px',
width: width || 'auto',
border: '1px solid #e2e8f0',
borderRadius: '4px',
fontSize: '12px',
padding: '0 4px',
cursor: 'pointer',
color: '#374151',
height: '28px',
width: width || 'auto',
border: '1px solid #e2e8f0',
borderRadius: '4px',
fontSize: '12px',
padding: '0 4px',
cursor: 'pointer',
color: '#374151',
backgroundColor: '#fff'
}}
>
Expand All @@ -58,7 +58,10 @@ function StyledSelect({ onChange, value, defaultValue, children, width }) {
)
}

export default function EditorToolbar({ editor, wordCount, isDark, onToggleTheme }) {
// ↓ ВСЕ ХУКИ ТОЛЬКО ВНУТРИ КОМПОНЕНТА
export default function EditorToolbar({ editor, wordCount, isDark, onToggleTheme, onImport }) {

// Хуки идут первыми — до любых return и условий!
const setFontFamily = useCallback((font) => {
editor?.chain().focus().setFontFamily(font).run()
}, [editor])
Expand All @@ -67,6 +70,29 @@ export default function EditorToolbar({ editor, wordCount, isDark, onToggleTheme
editor?.chain().focus().setFontSize(`${size}px`).run()
}, [editor])

const handleImport = useCallback(async (e) => {
const file = e.target.files?.[0]
if (!file) return

const formData = new FormData()
formData.append('file', file)

try {
const response = await fetch('https://localhost:7076/import/docx', {
method: 'POST',
body: formData
})
if (!response.ok) throw new Error('Ошибка импорта')
const data = await response.json()
onImport(data.text)
} catch (err) {
console.error('Ошибка импорта:', err)
}

e.target.value = ''
}, [onImport])

// Только после всех хуков
if (!editor) return null

return (
Expand All @@ -90,6 +116,40 @@ export default function EditorToolbar({ editor, wordCount, isDark, onToggleTheme

<Divider />

{/* Импорт DOCX */}
<div style={{ position: 'relative' }} title="Импортировать DOCX">
<input
type="file"
accept=".docx"
onChange={handleImport}
style={{
position: 'absolute',
inset: 0,
opacity: 0,
cursor: 'pointer',
width: '100%',
height: '100%'
}}
/>
<div style={{
padding: '4px 10px',
height: '28px',
backgroundColor: isDark ? '#2d2d3f' : '#f1f5f9',
color: isDark ? '#e2e8f0' : '#374151',
border: `1px solid ${isDark ? '#3d3d5f' : '#e2e8f0'}`,
borderRadius: '4px',
cursor: 'pointer',
fontSize: '12px',
display: 'flex',
alignItems: 'center',
gap: '4px'
}}>
📄 Открыть DOCX
</div>
</div>

<Divider />

{/* Шрифт */}
<StyledSelect onChange={(e) => setFontFamily(e.target.value)} defaultValue="Arial">
{FONTS.map(f => <option key={f} value={f}>{f}</option>)}
Expand Down Expand Up @@ -168,13 +228,8 @@ export default function EditorToolbar({ editor, wordCount, isDark, onToggleTheme

{/* Правая часть */}
<div style={{ marginLeft: 'auto', display: 'flex', alignItems: 'center', gap: '12px' }}>
<span style={{ fontSize: '12px', color: '#94a3b8' }}>{wordCount} слов</span>

{/* Счётчик слов */}
<span style={{ fontSize: '12px', color: '#94a3b8' }}>
{wordCount} слов
</span>

{/* Тёмная тема */}
<button
onClick={onToggleTheme}
title={isDark ? 'Светлая тема' : 'Тёмная тема'}
Expand Down
Loading