🎈
Записей пока нет
@@ -161,10 +243,10 @@ function renderShare(data, password) {
`).join('');
}
@@ -179,4 +261,4 @@ document.addEventListener('click', e => {
(async()=>{
await loadShare();
-})();
\ No newline at end of file
+})();
diff --git a/public/links.html b/public/links.html
index 1709627..1077dd9 100644
--- a/public/links.html
+++ b/public/links.html
@@ -58,8 +58,26 @@
${!isAnonymized ? `
- ${esc(e.student_name)}
` : ''}
${!isAnonymized && e.group_name ? `${esc(e.group_name)}
` : ''}
- ${esc(e.description)}
+ ${showStudentMessage && e.description ? `${esc(e.description)}
` : ''}
${filesHTML(e.files, password, currentToken)}
${new Date(e.created_at).toLocaleString('ru',{day:'2-digit',month:'2-digit',year:'numeric',hour:'2-digit',minute:'2-digit'})}
+ ${showEntryDate ? `${new Date(e.created_at).toLocaleString('ru',{day:'2-digit',month:'2-digit',year:'numeric',hour:'2-digit',minute:'2-digit'})}
` : ''}
+
+
+
+
+
+
+
+
+
diff --git a/public/settings.html b/public/settings.html
index 522e9c0..1368cdc 100644
--- a/public/settings.html
+++ b/public/settings.html
@@ -43,6 +43,46 @@
+
+
+
+
+ 🔗
+ Страница публичной ссылки /s/<hash>
+Управление видимостью элементов на публичных страницах записей.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 📄
diff --git a/public/share.html b/public/share.html
index b70462c..2380a4d 100644
--- a/public/share.html
+++ b/public/share.html
@@ -66,6 +66,15 @@ body{font-family:'Segoe UI',system-ui,-apple-system,Roboto,sans-serif;background
.share-link-block{margin-bottom:32px}
.share-link-btn{display:inline-flex;align-items:center;gap:8px;background:var(--dark);color:#fff;text-decoration:none;border-radius:999px;padding:13px 24px;font-size:.92rem;font-weight:700;transition:opacity .15s,transform .15s}
.share-link-btn:hover{opacity:.9;transform:translateY(-2px)}
+ .countdown{position:fixed;bottom:24px;left:50%;transform:translateX(-50%) translateY(150%);z-index:50;display:flex;align-items:center;gap:10px;padding:14px 24px;font-size:.92rem;color:var(--dark);background:#fff;border-radius:16px;box-shadow:0 8px 30px rgba(20,30,40,.16);max-width:calc(100vw - 32px);opacity:0;transition:transform .3s ease,opacity .3s ease;pointer-events:none}
+ .countdown.visible{transform:translateX(-50%) translateY(0);opacity:1;pointer-events:auto}
+ .countdown .cd-icon{font-size:1.2rem}
+ .countdown .cd-text{color:#4a4f5a;line-height:1.4;text-align:center}
+ .countdown .cd-text strong{color:var(--dark);font-weight:700}
+ .countdown.warn{background:#FFF3E0}
+ .countdown.warn .cd-text strong{color:#E65100}
+ .countdown.urgent{background:#FFEBEE}
+ .countdown.urgent .cd-text strong{color:#C62828}
@@ -83,6 +92,7 @@ body{font-family:'Segoe UI',system-ui,-apple-system,Roboto,sans-serif;background
Карточки загружаются...
diff --git a/server.js b/server.js
index 9020243..98234fd 100644
--- a/server.js
+++ b/server.js
@@ -656,7 +656,7 @@ app.get('/api/settings', requireAdmin, async (_, res) => {
});
app.get('/api/public-settings', apiLimiter, async (_, res) => {
- const keys = ['footer_left', 'footer_right'];
+ const keys = ['footer_left', 'footer_right', 'share_show_student_message', 'share_show_entry_date', 'share_show_student_names', 'share_show_group_photos'];
const out = {};
for (const k of keys) out[k] = await getSetting(k, '');
res.json(out);
@@ -715,7 +715,8 @@ const zlib = require('zlib');
const tar = require('tar');
const os = require('os');
const AI_URL = process.env.AI_URL || 'http://text-corrector:8080';
-const AI_DEFAULT_PROMPT = 'Ты — редактор текстов для педагогического журнала. Исправь грамматические, орфографические и пунктуационные ошибки. Сохрани смысл и стиль. Верни ТОЛЬКО исправленный текст, без пояснений.';
+const AI_MODEL = process.env.AI_MODEL || 'qwen2.5-1.5b-instruct-q4_k_m.gguf';
+const AI_DEFAULT_PROMPT = process.env.AI_PROMPT || 'Ты — редактор текстов. Исправь ТОЛЬКО грамматические, орфографические и пунктуационные ошибки в тексте. Приведи к правильному регистру буквы. НЕ меняй слова, структуру предложений, стиль или смысл текста. Верни ТОЛЬКО исправленный текст без пояснений.';
let entryAutoChecker = null;
async function getAiPrompt() {
@@ -730,7 +731,7 @@ async function aiCorrectText(text) {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
- model: 'qwen2.5-1.5b-instruct',
+ model: AI_MODEL,
messages: [
{ role: 'system', content: systemPrompt },
{ role: 'user', content: text }
@@ -1148,7 +1149,7 @@ app.get('/api/links', requireAuth, async (req, res) => {
});
app.post('/api/links', requireAuth, async (req, res) => {
- const { name, group_id, student_name, date_from, date_to, anonymize_names, expires_at, access_password } = req.body;
+ const { name, group_id, student_name, date_from, date_to, expires_at, access_password } = req.body;
if (!name?.trim()) return res.status(400).json({ error: 'Название обязательно' });
let message, linkUrl;
try {
@@ -1178,16 +1179,16 @@ app.post('/api/links', requireAuth, async (req, res) => {
expiresAt = defaultExp.toISOString();
}
const { rows } = await pool.query(
- `INSERT INTO share_links (token, name, group_id, student_name, date_from, date_to, anonymize_names, expires_at, access_password_hash, message, link_url)
- VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11) RETURNING *`,
- [token, name.trim(), group_id || null, student_name || null, date_from || null, date_to || null, anonymize_names || false, expiresAt, passwordHash, message, linkUrl]
+ `INSERT INTO share_links (token, name, group_id, student_name, date_from, date_to, show_student_names, expires_at, access_password_hash, message, link_url, show_student_message, show_entry_date, show_group_photos)
+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14) RETURNING *`,
+ [token, name.trim(), group_id || null, student_name || null, date_from || null, date_to || null, req.body.show_student_names == null ? null : !!req.body.show_student_names, expiresAt, passwordHash, message, linkUrl, req.body.show_student_message == null ? null : !!req.body.show_student_message, req.body.show_entry_date == null ? null : !!req.body.show_entry_date, req.body.show_group_photos == null ? null : !!req.body.show_group_photos]
);
await logAudit(req, 'link.create', { id: rows[0].id, name: name.trim() });
res.status(201).json(normDates(rows[0]));
});
app.put('/api/links/:id', requireAuth, async (req, res) => {
- const { name, group_id, student_name, date_from, date_to, anonymize_names, expires_at, access_password } = req.body;
+ const { name, group_id, student_name, date_from, date_to, expires_at, access_password } = req.body;
if (!name?.trim()) return res.status(400).json({ error: 'Название обязательно' });
let message, linkUrl;
try {
@@ -1227,9 +1228,9 @@ app.put('/api/links/:id', requireAuth, async (req, res) => {
expiresAt = null; // Clear expiry if null sent
}
}
- const fields = ['name = $1', 'group_id = $2', 'student_name = $3', 'date_from = $4', 'date_to = $5', 'anonymize_names = $6', 'message = $7', 'link_url = $8'];
- const values = [name.trim(), group_id || null, student_name || null, date_from || null, date_to || null, anonymize_names || false, message, linkUrl];
- let paramIdx = 9;
+ const fields = ['name = $1', 'group_id = $2', 'student_name = $3', 'date_from = $4', 'date_to = $5', 'show_student_names = $6', 'message = $7', 'link_url = $8', 'show_student_message = $9', 'show_entry_date = $10', 'show_group_photos = $11'];
+ const values = [name.trim(), group_id || null, student_name || null, date_from || null, date_to || null, req.body.show_student_names == null ? null : !!req.body.show_student_names, message, linkUrl, req.body.show_student_message == null ? null : !!req.body.show_student_message, req.body.show_entry_date == null ? null : !!req.body.show_entry_date, req.body.show_group_photos == null ? null : !!req.body.show_group_photos];
+ let paramIdx = 12;
if (passwordHash !== undefined) {
fields.push(`access_password_hash = $${paramIdx++}`);
values.push(passwordHash);
@@ -1311,8 +1312,10 @@ app.get('/api/share/:token', fileLimiter, async (req, res) => {
}
entries.forEach(r => { r.files = files[r.id] || []; });
- // Anonymize names if enabled
- if (l.anonymize_names) {
+ const showStudentNames = l.show_student_names != null ? l.show_student_names : (await getSetting('share_show_student_names', 'true')) !== 'false';
+
+ // Anonymize names if disabled
+ if (!showStudentNames) {
const nameMap = new Map();
let counter = 1;
entries.forEach(e => {
@@ -1342,9 +1345,13 @@ app.get('/api/share/:token', fileLimiter, async (req, res) => {
message: l.message,
link_url: l.link_url,
created_at: l.created_at,
- anonymize_names: l.anonymize_names,
+ expires_at: l.expires_at,
+ show_student_names: showStudentNames,
+ show_student_message: l.show_student_message != null ? l.show_student_message : (await getSetting('share_show_student_message', 'false')) === 'true',
+ show_entry_date: l.show_entry_date != null ? l.show_entry_date : (await getSetting('share_show_entry_date', 'false')) === 'true',
+ show_group_photos: l.show_group_photos != null ? l.show_group_photos : (await getSetting('share_show_group_photos', 'true')) !== 'false',
entries,
- photos,
+ photos: (l.show_group_photos != null ? l.show_group_photos : (await getSetting('share_show_group_photos', 'true')) !== 'false') ? photos : [],
});
});
@@ -2589,7 +2596,7 @@ app.get('/api/ai/queue', requireAdmin, async (_, res) => {
enabled,
counts,
worker: entryAutoChecker ? entryAutoChecker.getStats() : null,
- model: process.env.AI_MODEL || 'qwen2.5-1.5b-instruct',
+ model: AI_MODEL,
});
});
@@ -2642,7 +2649,7 @@ app.get('/api/ai/status', requireAdmin, async (_, res) => {
const service = await aiHealthCheck();
res.json({
enabled,
- model: process.env.AI_MODEL || 'qwen2.5-1.5b-instruct',
+ model: AI_MODEL,
ai_url: AI_URL,
service,
worker: entryAutoChecker ? entryAutoChecker.getInfo() : null,
diff --git a/start-text-corrector.sh b/start-text-corrector.sh
new file mode 100755
index 0000000..ef8ed73
--- /dev/null
+++ b/start-text-corrector.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+set -e
+
+MODEL_NAME="${AI_MODEL:-qwen2.5-1.5b-instruct-q4_k_m.gguf}"
+MODEL_REPO="${AI_MODEL_REPO:-Qwen/Qwen2.5-1.5B-Instruct-GGUF}"
+MODEL_PATH="/models/${MODEL_NAME}"
+MODEL_URL="https://huggingface.co/${MODEL_REPO}/resolve/main/${MODEL_NAME}"
+
+if [ ! -s "${MODEL_PATH}" ]; then
+ echo "[text-corrector] Model ${MODEL_PATH} not found, downloading from ${MODEL_URL}"
+ set -- -L --fail --retry 3 --retry-delay 5 --progress-bar -o "${MODEL_PATH}.part"
+ if [ -n "${HUGGINGFACE_TOKEN}" ]; then
+ echo "[text-corrector] Using Hugging Face token"
+ set -- "$@" -H "Authorization: Bearer ${HUGGINGFACE_TOKEN}"
+ fi
+ curl "$@" "${MODEL_URL}"
+ mv "${MODEL_PATH}.part" "${MODEL_PATH}"
+ echo "[text-corrector] Download complete"
+fi
+
+echo "[text-corrector] Starting llama-server with ${MODEL_PATH}"
+exec /app/llama-server -m "${MODEL_PATH}" --host 0.0.0.0 --port 8080 -c 4096 -n 256 -t 8 --temp 0.1
\ No newline at end of file
diff --git a/worker.js b/worker.js
index 55408ca..0727d82 100644
--- a/worker.js
+++ b/worker.js
@@ -6,8 +6,8 @@ const MIN_TEXT_CHARS = 4;
function createEntryAutoChecker({ pool, getSetting, logAudit, aiUrl, defaultPrompt, model }) {
const AI_URL = aiUrl || process.env.AI_URL || 'http://text-corrector:8080';
- const MODEL = model || process.env.AI_MODEL || 'qwen2.5-1.5b-instruct';
- const DEFAULT_PROMPT = defaultPrompt || 'Ты — редактор текстов. Исправь ошибки. Верни ТОЛЬКО исправленный текст.';
+ const MODEL = model || process.env.AI_MODEL || 'qwen2.5-1.5b-instruct-q4_k_m.gguf';
+ const DEFAULT_PROMPT = defaultPrompt || process.env.AI_PROMPT || 'Ты — редактор текстов. Исправь ТОЛЬКО грамматические, орфографические и пунктуационные ошибки в тексте. Приведи к правильному регистру буквы. НЕ меняй слова, структуру предложений, стиль или смысл текста. Верни ТОЛЬКО исправленный текст без пояснений.';
let started = false;
let stopped = false;