Update app.py

app.py

@@ -42,9 +42,9 @@ BASE_STYLE = '''
     --text-dark: #e0e0e0; --text-muted: #888; --shadow: 0 10px 30px rgba(0, 0, 0, 0.2);
     --glass-bg: rgba(30, 30, 30, 0.7); --transition: all 0.3s cubic-bezier(0.25, 0.8, 0.25, 1);
     --delete-color: #ff4444; --folder-color: #ffc107; --selection-color: rgba(139, 92, 246, 0.3);
-    --note-color: #6a5acd; --share-color: #4caf50;
+    --note-color: #6a5acd; --share-color: #4caf50; --todolist-color: #20c997; --shoppinglist-color: #fd7e14;
 }
-@keyframes spin { 0% { transform: rotate(0deg); } 100% { transform: rotate(3 ৩৬۰deg); } }
+@keyframes spin { 0% { transform: rotate(0deg); } 100% { transform: rotate(360deg); } }
 * { margin: 0; padding: 0; box-sizing: border-box; }
 html { scroll-behavior: smooth; }
 body { font-family: 'Inter', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif; background: var(--background-dark); color: var(--text-dark); line-height: 1.6; -webkit-tap-highlight-color: transparent; }
@@ -78,13 +78,15 @@ input, select, textarea { width: 100%; padding: 14px; margin: 8px 0; border: 1px
 .item-preview { position: absolute; top: 0; left: 0; width: 100%; height: 100%; object-fit: cover; }
 .item.folder .item-preview { object-fit: contain; font-size: 3.5em; color: var(--folder-color); }
 .item.note .item-preview { object-fit: contain; font-size: 3.5em; color: var(--note-color); }
+.item.todolist .item-preview { object-fit: contain; font-size: 3.5em; color: var(--todolist-color); }
+.item.shoppinglist .item-preview { object-fit: contain; font-size: 3.5em; color: var(--shoppinglist-color); }
 .item-name { font-size: 0.9em; font-weight: 500; word-break: break-all; margin: 5px 0; flex-grow: 1; }
 .item-info { font-size: 0.75em; color: var(--text-muted); }
 .file-grid.list-view { display: flex; flex-direction: column; gap: 8px; }
 .file-grid.list-view .item { flex-direction: row; align-items: center; text-align: left; padding: 8px; }
 .file-grid.list-view .item:hover { transform: translateY(0); }
 .file-grid.list-view .item-preview-wrapper { width: 45px; height: 45px; padding-top: 0; margin-bottom: 0; margin-right: 15px; flex-shrink: 0; }
-.file-grid.list-view .item.folder .item-preview, .file-grid.list-view .item.note .item-preview { font-size: 1.8em; }
+.file-grid.list-view .item.folder .item-preview, .file-grid.list-view .item.note .item-preview, .file-grid.list-view .item.todolist .item-preview, .file-grid.list-view .item.shoppinglist .item-preview { font-size: 1.8em; }
 .file-grid.list-view .item-name-info { flex-grow: 1; }
 .modal { display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(0, 0, 0, 0.85); z-index: 2000; justify-content: center; align-items: center; }
 .modal-content { display: flex; flex-direction: column; max-width: 95%; max-height: 95%; background: var(--card-bg-dark); padding: 10px; border-radius: 15px; overflow: hidden; position: relative; }
@@ -104,14 +106,16 @@ input, select, textarea { width: 100%; padding: 14px; margin: 8px 0; border: 1px
 .fab { width: 56px; height: 56px; background: var(--accent); border-radius: 50%; border: none; box-shadow: var(--shadow); color: white; font-size: 24px; display: flex; justify-content: center; align-items: center; cursor: pointer; transition: transform 0.3s; }
 .fab:active { transform: scale(0.9); }
 .loading-spinner { border: 4px solid #f3f3f3; border-top: 4px solid var(--primary); border-radius: 50%; width: 40px; height: 40px; animation: spin 1s linear infinite; margin: auto; }
-#fab-modal .modal-content { padding: 20px; max-width: 400px; background: var(--card-bg-dark); text-align: center; }
-.fab-options { display: grid; grid-template-columns: repeat(3, 1fr); gap: 15px; margin-bottom: 20px; }
+#fab-modal .modal-content { padding: 20px; max-width: 500px; background: var(--card-bg-dark); text-align: center; }
+.fab-options { display: grid; grid-template-columns: repeat(auto-fill, minmax(80px, 1fr)); gap: 15px; margin-bottom: 20px; }
 .fab-option { display: flex; flex-direction: column; align-items: center; justify-content: center; background: #2a2a2a; border-radius: 12px; padding: 15px; cursor: pointer; transition: var(--transition); text-decoration:none; color: var(--text-dark); }
 .fab-option:hover { background: #333; transform: translateY(-3px); }
 .fab-option i { font-size: 2em; margin-bottom: 8px; }
 #fab-option-upload i { color: var(--secondary); }
 #fab-option-note i { color: var(--note-color); }
 #fab-option-folder i { color: var(--folder-color); }
+#fab-option-todolist i { color: var(--todolist-color); }
+#fab-option-shoppinglist i { color: var(--shoppinglist-color); }
 #create-folder-form { display: none; margin-top: 15px; }
 .shared-link-item { display: flex; justify-content: space-between; align-items: center; padding: 8px; border-bottom: 1px solid #333; }
 .shared-link-item:last-child { border-bottom: none; }
@@ -121,7 +125,7 @@ input, select, textarea { width: 100%; padding: 14px; margin: 8px 0; border: 1px
 .shared-link-actions button { background: none; border: none; color: var(--text-muted); font-size: 1.1em; cursor: pointer; padding: 5px; }
 '''
 
-PUBLIC_SHARE_PAGE_HTML = '''
+PUBLIC_FOLDER_PAGE_HTML = '''
 <!DOCTYPE html><html lang="ru"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>Общая папка: {{ folder.name }}</title>
 <link rel="preconnect" href="https://fonts.googleapis.com"><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
@@ -176,6 +180,110 @@ body { padding-bottom: 30px; }
 </div></body></html>
 '''
 
+PUBLIC_SHOPPING_LIST_PAGE_HTML = '''
+<!DOCTYPE html><html lang="ru"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>Список покупок: {{ list_data.title }}</title>
+<link rel="preconnect" href="https://fonts.googleapis.com"><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;800&display=swap" rel="stylesheet">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css">
+<style>''' + BASE_STYLE + '''
+body { padding-bottom: 30px; }
+.public-header { padding: 15px; text-align: center; border-bottom: 1px solid #333; margin-bottom: 20px; }
+.shopping-list { list-style: none; padding: 0; }
+.shopping-item { display: flex; align-items: center; gap: 15px; background: var(--card-bg-dark); padding: 15px; border-radius: 12px; margin-bottom: 10px; transition: all 0.3s; }
+.shopping-item.purchased { opacity: 0.6; }
+.shopping-item.purchased .item-name { text-decoration: line-through; }
+.shopping-item input[type="checkbox"] { width: 22px; height: 22px; flex-shrink: 0; accent-color: var(--accent); }
+.item-details { flex-grow: 1; }
+.item-name { font-weight: 500; }
+.item-quantity { color: var(--text-muted); font-size: 0.9em; }
+</style></head><body>
+<div class="public-header">
+    <h1>Список покупок</h1>
+    <h2>{{ list_data.title }}</h2>
+    <p style="color: var(--text-muted);">Автор: {{ user.first_name or user.telegram_username }}</p>
+</div>
+<div class="container" style="padding-top: 15px;">
+    <ul class="shopping-list" id="shopping-list">
+        <div class="loading-spinner"></div>
+    </ul>
+</div>
+<script>
+    const listId = '{{ link.id }}';
+    const listContainer = document.getElementById('shopping-list');
+    
+    function renderList(items) {
+        listContainer.innerHTML = '';
+        if (!items || items.length === 0) {
+            listContainer.innerHTML = '<p>Список пуст.</p>';
+            return;
+        }
+        
+        items.sort((a, b) => a.purchased - b.purchased);
+
+        items.forEach(item => {
+            const li = document.createElement('li');
+            li.className = 'shopping-item';
+            if (item.purchased) {
+                li.classList.add('purchased');
+            }
+            li.innerHTML = `
+                <input type="checkbox" id="item-${item.id}" data-id="${item.id}" ${item.purchased ? 'checked' : ''}>
+                <div class="item-details">
+                    <label for="item-${item.id}" class="item-name">${item.name}</label>
+                    <div class="item-quantity">Количество: ${item.quantity}</div>
+                </div>
+            `;
+            listContainer.appendChild(li);
+        });
+    }
+
+    async function fetchList() {
+        try {
+            const response = await fetch(`{{ url_for('get_shared_list_data', link_id=link.id) }}`);
+            if (!response.ok) throw new Error('Network response was not ok');
+            const data = await response.json();
+            if (data.status === 'success') {
+                renderList(data.items);
+            } else {
+                listContainer.innerHTML = `<p>Ошибка загрузки списка: ${data.message}</p>`;
+            }
+        } catch (error) {
+            console.error('Fetch error:', error);
+            listContainer.innerHTML = '<p>Не удалось обновить список. Проверьте соединение.</p>';
+        }
+    }
+    
+    async function updateItemStatus(itemId, isPurchased) {
+        try {
+             await fetch(`{{ url_for('update_shared_item_status', link_id=link.id) }}`, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ item_id: itemId, purchased: isPurchased })
+            });
+            fetchList();
+        } catch (error) {
+            console.error('Update error:', error);
+            alert('Ошибка обновления статуса товара.');
+        }
+    }
+
+    listContainer.addEventListener('change', (event) => {
+        if (event.target.type === 'checkbox') {
+            const itemId = event.target.dataset.id;
+            const isPurchased = event.target.checked;
+            updateItemStatus(itemId, isPurchased);
+        }
+    });
+
+    document.addEventListener('DOMContentLoaded', () => {
+        fetchList();
+        setInterval(fetchList, 5000);
+    });
+</script>
+</body></html>
+'''
+
 def find_node_by_id(filesystem, node_id):
     if not filesystem: return None, None
     if filesystem.get('id') == node_id:
@@ -238,7 +346,7 @@ def count_items_recursive(node):
     if not node or not isinstance(node, dict):
         return 0
     count = 0
-    if node.get('type') in ['file', 'note']:
+    if node.get('type') in ['file', 'note', 'todolist', 'shoppinglist']:
         count += 1
     if node.get('type') == 'folder' and 'children' in node:
         for child in node.get('children', []):
@@ -458,10 +566,20 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
 <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;800&display=swap" rel="stylesheet">
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css">
 <script src="https://telegram.org/js/telegram-web-app.js"></script>
-<style>''' + BASE_STYLE + '''</style></head><body>
+<style>''' + BASE_STYLE + '''
+.list-editor-items { max-height: 40vh; overflow-y: auto; margin-bottom: 10px; }
+.list-editor-item { display: flex; align-items: center; gap: 10px; padding: 5px; border-radius: 8px; }
+.list-editor-item:hover { background: #333; }
+.list-editor-item input[type="text"] { margin: 0; flex-grow: 1; }
+.list-editor-item input[type="number"] { margin: 0; width: 60px; text-align: center; }
+.list-editor-item .quantity-controls button { padding: 5px 10px; font-size: 1em; background: #444; }
+.list-editor-item .delete-item-btn { color: var(--delete-color); background: none; border: none; font-size: 1.2em; cursor: pointer; }
+.list-editor-add-item-form { display: flex; gap: 10px; margin-top: 10px; }
+</style></head><body>
 <div class="app-header">
     <div class="user-info">{{ display_name }}</div>
     <div class="view-toggle">
+        <a href="{{ url_for('tma_archive') }}" style="text-decoration: none;"><button title="Архив"><i class="fa-solid fa-archive"></i></button></a>
         <button id="reminders-btn" title="Напоминания"><i class="fa-solid fa-bell"></i></button>
         <button id="grid-view-btn" title="Сетка"><i class="fa fa-th-large"></i></button>
         <button id="list-view-btn" title="Список"><i class="fa fa-bars"></i></button>
@@ -487,14 +605,18 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
             onclick="window.Telegram.WebApp.HapticFeedback.impactOccurred('light'); window.location.href='{{ url_for('tma_dashboard', folder_id=item.id) }}'"
         {% elif item.type == 'note' %}
             onclick="openNoteModal('{{ item.id }}')"
+        {% elif item.type == 'todolist' %}
+            onclick="openListModal('todolist', '{{ item.id }}')"
+        {% elif item.type == 'shoppinglist' %}
+            onclick="openListModal('shoppinglist', '{{ item.id }}')"
         {% else %}
             onclick="openModal('{{ hf_file_url_jinja(item.path) if item.file_type not in ['text', 'pdf'] else (url_for('get_text_content_tma', file_id=item.id) if item.file_type == 'text' else hf_file_url_jinja(item.path, True)) }}', '{{ item.file_type }}', '{{ item.id }}')"
         {% endif %}>
             <div class="item-preview-wrapper">
-            {% if item.type == 'folder' %}
-                <div class="item-preview"><i class="fa-solid fa-folder"></i></div>
-            {% elif item.type == 'note' %}
-                <div class="item-preview"><i class="fa-solid fa-note-sticky"></i></div>
+            {% if item.type == 'folder' %}<div class="item-preview"><i class="fa-solid fa-folder"></i></div>
+            {% elif item.type == 'note' %}<div class="item-preview"><i class="fa-solid fa-note-sticky"></i></div>
+            {% elif item.type == 'todolist' %}<div class="item-preview"><i class="fa-solid fa-list-check"></i></div>
+            {% elif item.type == 'shoppinglist' %}<div class="item-preview"><i class="fa-solid fa-cart-shopping"></i></div>
             {% elif item.type == 'file' %}
                 {% if item.file_type == 'image' %}<img class="item-preview" src="{{ hf_file_url_jinja(item.path) }}" loading="lazy">
                 {% elif item.file_type == 'video' %}<video class="item-preview" preload="metadata" muted loading="lazy"><source src="{{ hf_file_url_jinja(item.path, True) }}#t=0.5"></video>
@@ -505,9 +627,9 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
             {% endif %}
             </div>
             <div class="item-name-info">
-                <p class="item-name">{{ (item.title if item.type == 'note' else item.name if item.type == 'folder' else item.original_filename) | truncate(30, True) }}</p>
+                <p class="item-name">{{ (item.title if item.type in ['note', 'todolist', 'shoppinglist'] else item.name if item.type == 'folder' else item.original_filename) | truncate(30, True) }}</p>
                 {% if item.type == 'file' %}<p class="item-info">{{ item.upload_date }}</p>
-                {% elif item.type == 'note' %}<p class="item-info">{{ item.modified_date }}</p>{% endif %}
+                {% elif item.type in ['note', 'todolist', 'shoppinglist'] %}<p class="item-info">{{ item.modified_date }}</p>{% endif %}
             </div>
         </div>
     {% endfor %}
@@ -528,6 +650,7 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
 
 <div id="selection-bar">
     <span id="selection-count"></span>
+    <button id="selection-archive-btn" class="btn" style="background: var(--todolist-color); display:none;" onclick="archiveSelected()"><i class="fa-solid fa-archive"></i></button>
     <button id="selection-share-btn" class="btn share-btn" onclick="openShareModal()" style="display:none;"><i class="fa-solid fa-share-alt"></i></button>
     <button id="selection-download-btn" class="btn download-btn" onclick="downloadSingleSelected()" style="display:none;"><i class="fa-solid fa-download"></i></button>
     <button class="btn" style="background: var(--accent);" onclick="showMoveModal()"><i class="fa-solid fa-arrow-right-to-bracket"></i></button>
@@ -556,6 +679,12 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
         <div class="fab-option" id="fab-option-folder">
             <i class="fa-solid fa-folder-plus"></i><span>Папку</span>
         </div>
+        <div class="fab-option" id="fab-option-todolist" onclick="openListModal('todolist')">
+            <i class="fa-solid fa-list-check"></i><span>Список дел</span>
+        </div>
+        <div class="fab-option" id="fab-option-shoppinglist" onclick="openListModal('shoppinglist')">
+            <i class="fa-solid fa-cart-shopping"></i><span>Покупки</span>
+        </div>
     </div>
     <form id="upload-form" method="POST" enctype="multipart/form-data" action="{{ url_for('tma_dashboard') }}" style="display:none;">
         <input type="hidden" name="current_folder_id" value="{{ current_folder_id }}">
@@ -581,6 +710,19 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
     </div>
 </div></div>
 
+<div class="modal" id="list-modal"><div class="modal-content" style="padding: 20px; max-width: 500px; width: 90%;">
+    <h4 id="list-modal-title">Новый список</h4>
+    <input type="hidden" id="list-id-input">
+    <input type="hidden" id="list-type-input">
+    <input type="text" id="list-title-input" placeholder="Название списка" style="font-size: 1.1em; margin-bottom: 10px;">
+    <div id="list-items-container" class="list-editor-items"></div>
+    <div id="list-add-item-form-container"></div>
+    <div style="display: flex; gap: 10px; margin-top: 15px;">
+        <button class="btn" style="background: var(--accent); flex-grow: 1;" onclick="saveList()">Сохранить</button>
+        <button class="btn" style="background: #555; flex-grow: 1;" onclick="closeListModal()">Отмена</button>
+    </div>
+</div></div>
+
 <div class="modal" id="reminders-modal"><div class="modal-content" style="padding: 20px; max-width: 500px; width: 90%;">
     <h4>Напоминания</h4>
     <div id="reminders-list" style="max-height: 40vh; overflow-y: auto; margin-bottom: 15px; font-size: 0.9em;"></div>
@@ -594,7 +736,7 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
 </div></div>
 
 <div class="modal" id="share-modal"><div class="modal-content" style="padding: 20px; max-width: 500px; width: 90%;">
-    <h4>Поделиться папкой</h4>
+    <h4 id="share-modal-title">Поделиться</h4>
     <div id="existing-links-list" style="max-height: 30vh; overflow-y: auto; margin-bottom: 15px;"></div>
     <h5 style="margin-top: 15px;">Создать новую ссылку</h5>
     <input type="text" id="share-link-name" placeholder="Название ссылки (необязательно)">
@@ -686,6 +828,7 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
     const selectionCount = document.getElementById('selection-count');
     const selectionDownloadBtn = document.getElementById('selection-download-btn');
     const selectionShareBtn = document.getElementById('selection-share-btn');
+    const selectionArchiveBtn = document.getElementById('selection-archive-btn');
     const allItems = document.querySelectorAll('.item');
     function toggleSelectionMode(enable) {
         selectionMode = enable;
@@ -695,10 +838,20 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
     }
     function updateSelectionUI() {
         selectionCount.textContent = `Выбрано: ${selectedItems.size}`;
+        if (selectedItems.size !== 1) {
+            selectionDownloadBtn.style.display = 'none';
+            selectionShareBtn.style.display = 'none';
+            selectionArchiveBtn.style.display = 'none';
+            return;
+        }
         const firstSelectedId = selectedItems.values().next().value;
         const itemElement = document.querySelector(`.item[data-id='${firstSelectedId}']`);
-        selectionDownloadBtn.style.display = (selectedItems.size === 1 && itemElement?.dataset.type === 'file') ? 'inline-block' : 'none';
-        selectionShareBtn.style.display = (selectedItems.size === 1 && itemElement?.dataset.type === 'folder') ? 'inline-block' : 'none';
+        if (!itemElement) return;
+        const itemType = itemElement.dataset.type;
+        
+        selectionDownloadBtn.style.display = (itemType === 'file') ? 'inline-block' : 'none';
+        selectionShareBtn.style.display = (itemType === 'folder' || itemType === 'shoppinglist') ? 'inline-block' : 'none';
+        selectionArchiveBtn.style.display = (itemType === 'todolist' || itemType === 'shoppinglist') ? 'inline-block' : 'none';
     }
     allItems.forEach(item => {
         item.addEventListener('pointerdown', e => {
@@ -751,6 +904,12 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
             if (ok) { haptic.impactOccurred('heavy'); performBatchAction('{{ url_for("batch_delete_tma") }}', { item_ids: Array.from(selectedItems) }); }
         });
     }
+    function archiveSelected() {
+        if (selectedItems.size !== 1) return;
+        const listId = selectedItems.values().next().value;
+        haptic.impactOccurred('medium');
+        performBatchAction(`{{ url_for("archive_list_tma", list_id='__ID__') }}`.replace('__ID__', listId), {});
+    }
     async function openNoteModal(noteId = null) {
         haptic.impactOccurred('light');
         closeFabModal();
@@ -851,11 +1010,14 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
     async function openShareModal() {
         if (selectedItems.size !== 1) return;
         haptic.impactOccurred('light');
-        const folderId = selectedItems.values().next().value;
+        const itemId = selectedItems.values().next().value;
+        const itemElement = document.querySelector(`.item[data-id='${itemId}']`);
+        const itemType = itemElement.dataset.type;
         const listEl = document.getElementById('existing-links-list');
+        document.getElementById('share-modal-title').textContent = itemType === 'folder' ? 'Поделиться папкой' : 'Поделиться списком';
         listEl.innerHTML = '<div class="loading-spinner"></div>';
         document.getElementById('share-modal').style.display = 'flex';
-        const response = await fetch(`{{ url_for('get_public_links', folder_id='FOLDER_ID') }}`.replace('FOLDER_ID', folderId));
+        const response = await fetch(`{{ url_for('get_public_links', item_id='ITEM_ID') }}`.replace('ITEM_ID', itemId));
         const data = await response.json();
         listEl.innerHTML = '';
         if (data.status === 'success' && data.links.length > 0) {
@@ -875,16 +1037,17 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
                 listEl.appendChild(el);
             });
         } else {
-            listEl.innerHTML = '<p>Публичных ссылок для этой папки нет.</p>';
+            listEl.innerHTML = '<p>Публичных ссылок для этого элемента нет.</p>';
         }
     }
     async function createShareLink() {
-        const folderId = selectedItems.values().next().value;
+        const itemId = selectedItems.values().next().value;
+        const itemType = document.querySelector(`.item[data-id='${itemId}']`).dataset.type;
         const name = document.getElementById('share-link-name').value;
         const duration_hours = document.getElementById('share-link-duration').value;
         const response = await fetch('{{ url_for("create_public_link") }}', {
             method: 'POST', headers: {'Content-Type': 'application/json'},
-            body: JSON.stringify({ folder_id: folderId, name: name, duration_hours: parseInt(duration_hours) })
+            body: JSON.stringify({ item_id: itemId, item_type: itemType, name: name, duration_hours: parseInt(duration_hours) })
         });
         const result = await response.json();
         if (result.status === 'success') {
@@ -919,6 +1082,120 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
             haptic.notificationOccurred('error');
         });
     }
+    function setupListModal(type, itemsContainer, addFormContainer) {
+        itemsContainer.innerHTML = '';
+        if (type === 'todolist') {
+            addFormContainer.innerHTML = `
+                <form onsubmit="addTodoItem(event)" class="list-editor-add-item-form">
+                    <input type="text" id="add-task-input" placeholder="Новая задача" required>
+                    <button type="submit" class="btn" style="padding: 10px 15px;">+</button>
+                </form>`;
+        } else if (type === 'shoppinglist') {
+            addFormContainer.innerHTML = `
+                <form onsubmit="addShoppingItem(event)" class="list-editor-add-item-form">
+                    <input type="text" id="add-shopping-name-input" placeholder="Название товара" required style="flex-grow:1;">
+                    <input type="number" id="add-shopping-qty-input" value="1" min="1" style="width: 70px;">
+                    <button type="submit" class="btn" style="padding: 10px 15px;">+</button>
+                </form>`;
+        }
+    }
+    function renderTodoItem(item) {
+        return `<div class="list-editor-item" data-id="${item.id}">
+                    <input type="checkbox" ${item.completed ? 'checked' : ''}>
+                    <input type="text" value="${item.text.replace(/"/g, '&quot;')}">
+                    <button class="delete-item-btn" onclick="this.parentElement.remove()">&times;</button>
+                </div>`;
+    }
+    function renderShoppingItem(item) {
+        return `<div class="list-editor-item" data-id="${item.id}">
+                    <input type="text" value="${item.name.replace(/"/g, '&quot;')}" class="shopping-item-name">
+                    <div class="quantity-controls" style="display:flex; align-items:center;">
+                        <button type="button" onclick="this.nextElementSibling.stepDown()">-</button>
+                        <input type="number" value="${item.quantity}" min="1" class="shopping-item-qty">
+                        <button type="button" onclick="this.previousElementSibling.stepUp()">+</button>
+                    </div>
+                    <button class="delete-item-btn" onclick="this.parentElement.remove()">&times;</button>
+                </div>`;
+    }
+    function addTodoItem(event) {
+        event.preventDefault();
+        const input = document.getElementById('add-task-input');
+        if (!input.value.trim()) return;
+        const newItem = { id: 'new_' + Date.now(), text: input.value.trim(), completed: false };
+        document.getElementById('list-items-container').insertAdjacentHTML('beforeend', renderTodoItem(newItem));
+        input.value = '';
+    }
+    function addShoppingItem(event) {
+        event.preventDefault();
+        const nameInput = document.getElementById('add-shopping-name-input');
+        const qtyInput = document.getElementById('add-shopping-qty-input');
+        if (!nameInput.value.trim()) return;
+        const newItem = { id: 'new_' + Date.now(), name: nameInput.value.trim(), quantity: parseInt(qtyInput.value) || 1, purchased: false };
+        document.getElementById('list-items-container').insertAdjacentHTML('beforeend', renderShoppingItem(newItem));
+        nameInput.value = '';
+        qtyInput.value = '1';
+    }
+    async function openListModal(type, listId = null) {
+        haptic.impactOccurred('light');
+        closeFabModal();
+        const modal = document.getElementById('list-modal');
+        const titleEl = document.getElementById('list-modal-title');
+        const idInput = document.getElementById('list-id-input');
+        const typeInput = document.getElementById('list-type-input');
+        const titleInput = document.getElementById('list-title-input');
+        const itemsContainer = document.getElementById('list-items-container');
+        const addFormContainer = document.getElementById('list-add-item-form-container');
+        
+        typeInput.value = type;
+        setupListModal(type, itemsContainer, addFormContainer);
+
+        if (listId) {
+            titleEl.textContent = type === 'todolist' ? 'Редактировать список дел' : 'Редактировать список покупок';
+            const response = await fetch(`{{ url_for('get_list_tma', list_id='__ID__') }}`.replace('__ID__', listId));
+            const data = await response.json();
+            if (data.status === 'success') {
+                idInput.value = data.list.id;
+                titleInput.value = data.list.title;
+                itemsContainer.innerHTML = '';
+                if (type === 'todolist') data.list.tasks.forEach(item => itemsContainer.insertAdjacentHTML('beforeend', renderTodoItem(item)));
+                if (type === 'shoppinglist') data.list.items.forEach(item => itemsContainer.insertAdjacentHTML('beforeend', renderShoppingItem(item)));
+            } else { Telegram.WebApp.showAlert('Ошибка загрузки списка.'); return; }
+        } else {
+            titleEl.textContent = type === 'todolist' ? 'Новый список дел' : 'Новый список покупок';
+            idInput.value = ''; titleInput.value = ''; itemsContainer.innerHTML = '';
+        }
+        modal.style.display = 'flex';
+    }
+    function closeListModal() { document.getElementById('list-modal').style.display = 'none'; }
+    async function saveList() {
+        const id = document.getElementById('list-id-input').value;
+        const type = document.getElementById('list-type-input').value;
+        const title = document.getElementById('list-title-input').value;
+        if (!title.trim()) { Telegram.WebApp.showAlert('Название не может быть пустым.'); return; }
+        
+        let payload = { list_id: id, type: type, title: title, parent_folder_id: '{{ current_folder_id }}' };
+        
+        if (type === 'todolist') {
+            payload.tasks = Array.from(document.querySelectorAll('#list-items-container .list-editor-item')).map(el => ({
+                id: el.dataset.id.startsWith('new_') ? null : el.dataset.id,
+                text: el.querySelector('input[type="text"]').value,
+                completed: el.querySelector('input[type="checkbox"]').checked
+            }));
+        } else if (type === 'shoppinglist') {
+            payload.items = Array.from(document.querySelectorAll('#list-items-container .list-editor-item')).map(el => ({
+                id: el.dataset.id.startsWith('new_') ? null : el.dataset.id,
+                name: el.querySelector('.shopping-item-name').value,
+                quantity: parseInt(el.querySelector('.shopping-item-qty').value) || 1
+            }));
+        }
+
+        const response = await fetch('{{ url_for("create_or_update_list_tma") }}', {
+            method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify(payload)
+        });
+        const result = await response.json();
+        if (result.status === 'success') { haptic.notificationOccurred('success'); window.location.reload(); }
+        else { haptic.notificationOccurred('error'); Telegram.WebApp.showAlert(result.message || 'Ошибка сохранения.'); }
+    }
     document.getElementById('reminders-btn').addEventListener('click', openRemindersModal);
     const gridViewBtn = document.getElementById('grid-view-btn');
     const listViewBtn = document.getElementById('list-view-btn');
@@ -956,6 +1233,113 @@ TMA_DASHBOARD_HTML_TEMPLATE = '''
 </script></body></html>
 '''
 
+TMA_ARCHIVE_PAGE_HTML = '''
+<!DOCTYPE html><html lang="ru"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+<title>Архив - Zeus Cloud</title>
+<link rel="preconnect" href="https://fonts.googleapis.com"><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;800&display=swap" rel="stylesheet">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css">
+<script src="https://telegram.org/js/telegram-web-app.js"></script>
+<style>''' + BASE_STYLE + '''</style></head><body>
+<div class="app-header">
+    <div class="user-info">{{ display_name }}</div>
+    <div class="view-toggle">
+        <a href="{{ url_for('tma_dashboard') }}" style="text-decoration: none;"><button title="Домой"><i class="fa-solid fa-home"></i></button></a>
+    </div>
+</div>
+<div class="container" id="main-container">
+<h2>Архив</h2>
+<div class="file-grid list-view" id="file-container">
+    {% for item in items %}
+        <div class="item {{ item.type }}" data-id="{{ item.id }}" data-type="{{ item.type }}">
+            <div class="item-preview-wrapper">
+                {% if item.type == 'todolist' %}<div class="item-preview"><i class="fa-solid fa-list-check"></i></div>
+                {% elif item.type == 'shoppinglist' %}<div class="item-preview"><i class="fa-solid fa-cart-shopping"></i></div>
+                {% endif %}
+            </div>
+            <div class="item-name-info" style="flex-grow: 1;">
+                <p class="item-name">{{ item.title }}</p>
+                <p class="item-info">Заархивировано: {{ item.modified_date }}</p>
+                <p class="item-info">Путь: {{ item.path_string }}</p>
+            </div>
+            <button class="btn" onclick="unarchiveItem('{{ item.id }}')" title="Разархивировать" style="background:var(--secondary); padding: 8px 12px; margin-right: 5px;"><i class="fa-solid fa-box-open"></i></button>
+            <button class="btn delete-btn" onclick="deleteItem('{{ item.id }}')" title="Удалить" style="padding: 8px 12px;"><i class="fa-solid fa-trash"></i></button>
+        </div>
+    {% endfor %}
+    {% if not items %}<p>Архив пуст.</p>{% endif %}
+</div>
+</div>
+<script>
+    window.Telegram.WebApp.ready();
+    window.Telegram.WebApp.expand();
+    const haptic = window.Telegram.WebApp.HapticFeedback;
+
+    async function performAction(url, confirmMessage) {
+        Telegram.WebApp.showConfirm(confirmMessage, async (ok) => {
+            if (ok) {
+                haptic.impactOccurred('heavy');
+                try {
+                    const response = await fetch(url, { method: 'POST' });
+                    const result = await response.json();
+                    if (result.status === 'success') {
+                        haptic.notificationOccurred('success');
+                        window.location.reload();
+                    } else {
+                        haptic.notificationOccurred('error');
+                        Telegram.WebApp.showAlert(result.message || 'Произошла ошибка.');
+                    }
+                } catch (error) {
+                    haptic.notificationOccurred('error');
+                    Telegram.WebApp.showAlert('Сетевая ошибка.');
+                }
+            }
+        });
+    }
+
+    function unarchiveItem(itemId) {
+        const url = `{{ url_for("archive_list_tma", list_id='__ID__') }}`.replace('__ID__', itemId) + '?unarchive=true';
+        performAction(url, 'Разархивировать этот список?');
+    }
+
+    function deleteItem(itemId) {
+        const url = `{{ url_for("batch_delete_tma") }}`;
+        Telegram.WebApp.showConfirm('Вы уверены, что хотите удалить этот список навсегда?', async (ok) => {
+            if (ok) {
+                haptic.impactOccurred('heavy');
+                 try {
+                    const response = await fetch(url, { 
+                        method: 'POST', 
+                        headers: { 'Content-Type': 'application/json' },
+                        body: JSON.stringify({ item_ids: [itemId] })
+                    });
+                    const result = await response.json();
+                    if (result.status === 'success') {
+                        haptic.notificationOccurred('success');
+                        window.location.reload();
+                    } else {
+                        haptic.notificationOccurred('error');
+                        Telegram.WebApp.showAlert(result.message || 'Произошла ошибка.');
+                    }
+                } catch (error) {
+                    haptic.notificationOccurred('error');
+                    Telegram.WebApp.showAlert('Сетевая ошибка.');
+                }
+            }
+        });
+    }
+
+    document.addEventListener('DOMContentLoaded', () => {
+        let backButton = window.Telegram.WebApp.BackButton;
+        backButton.show();
+        backButton.onClick(() => {
+            haptic.impactOccurred('light');
+            window.location.href = `{{ url_for('tma_dashboard') }}`;
+        });
+    });
+</script>
+</body></html>
+'''
+
 @app.route('/tma_dashboard', methods=['GET', 'POST'])
 def tma_dashboard():
     if 'telegram_user_id' not in session:
@@ -978,8 +1362,10 @@ def tma_dashboard():
         current_folder, parent_folder = find_node_by_id(user_data['filesystem'], 'root')
 
     parent_folder_id = parent_folder.get('id', 'root') if parent_folder else 'root'
+    
+    items_in_folder = [item for item in current_folder.get('children', []) if not item.get('archived')]
+    items_in_folder = sorted(items_in_folder, key=lambda x: (x['type'] not in ['folder', 'note'], x.get('name', x.get('original_filename', x.get('title', ''))).lower()))
 
-    items_in_folder = sorted(current_folder.get('children', []), key=lambda x: (x['type'] not in ['folder', 'note'], x.get('name', x.get('original_filename', x.get('title', ''))).lower()))
     if request.method == 'POST':
         if not HF_TOKEN_WRITE:
              flash('Загрузка невозможна: токен для записи не настроен.', 'error')
@@ -1033,6 +1419,29 @@ def tma_dashboard():
 
     return render_template_string(TMA_DASHBOARD_HTML_TEMPLATE, display_name=display_name, items=items_in_folder, current_folder_id=current_folder_id, current_folder=current_folder, parent_folder_id=parent_folder_id, breadcrumbs=breadcrumbs, hf_file_url_jinja=lambda path, download=False: f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/{quote(path)}{'?download=true' if download else ''}", is_tma_user_admin_flag=is_admin_tma(), all_folders_for_move=all_folders_for_move)
 
+@app.route('/tma_archive')
+def tma_archive():
+    if 'telegram_user_id' not in session: return redirect(url_for('tma_entry_page'))
+    tma_user_id = session['telegram_user_id']
+    display_name = session.get('telegram_display_name', 'Пользователь')
+    data = load_data()
+    user_data = data['users'].get(tma_user_id)
+    if not user_data: return redirect(url_for('tma_entry_page'))
+
+    archived_items = []
+    def find_archived(node):
+        if node.get('type') == 'folder':
+            for child in node.get('children', []):
+                if child.get('archived'):
+                    child['path_string'] = get_node_path_string(user_data['filesystem'], node.get('id'))
+                    archived_items.append(child)
+                if child.get('type') == 'folder':
+                    find_archived(child)
+    find_archived(user_data.get('filesystem'))
+    
+    sorted_items = sorted(archived_items, key=lambda x: x.get('modified_date', ''), reverse=True)
+    return render_template_string(TMA_ARCHIVE_PAGE_HTML, display_name=display_name, items=sorted_items)
+
 @app.route('/create_folder_tma', methods=['POST'])
 def create_folder_tma():
     if 'telegram_user_id' not in session: return redirect(url_for('tma_entry_page'))
@@ -1180,20 +1589,24 @@ def batch_delete_tma():
         if not node:
             errors.append(f"Элемент {item_id} не найден.")
             continue
-        if node.get('type') == 'folder':
-            if node.get('children'): errors.append(f'Папка "{node.get("name")}" не пуста.'); continue
+        item_type = node.get('type')
+        item_name = node.get('name') or node.get('title') or node.get('original_filename')
+        
+        if item_type == 'folder':
+            if node.get('children'): errors.append(f'Папка "{item_name}" не пуста.'); continue
             if remove_node(user_data['filesystem'], item_id)[0]: success_count += 1
-            else: errors.append(f'Ошибка удаления папки "{node.get("name")}".')
-        elif node.get('type') == 'note':
+            else: errors.append(f'Ошибка удаления папки "{item_name}".')
+        elif item_type in ['note', 'todolist', 'shoppinglist']:
             if remove_node(user_data['filesystem'], item_id)[0]: success_count += 1
-            else: errors.append(f'Ошибка удаления "{node.get("title")}".')
-        elif node.get('type') == 'file':
+            else: errors.append(f'Ошибка удаления "{item_name}".')
+        elif item_type == 'file':
             try:
                 if node.get('path') and HF_TOKEN_WRITE: api.delete_file(path_in_repo=node['path'], repo_id=REPO_ID, repo_type="dataset", token=HF_TOKEN_WRITE)
             except hf_utils.EntryNotFoundError: pass
-            except Exception as e: errors.append(f'Ошибка удаления "{node.get("original_filename")}" с сервера: {e}'); continue
+            except Exception as e: errors.append(f'Ошибка удаления "{item_name}" с сервера: {e}'); continue
             if remove_node(user_data['filesystem'], item_id)[0]: success_count += 1
-            else: errors.append(f'Ошибка удаления "{node.get("original_filename")}" из базы.')
+            else: errors.append(f'Ошибка удаления "{item_name}" из базы.')
+
     if success_count > 0:
         try: save_data(data)
         except Exception as e: return jsonify({'status': 'error', 'message': f'Ошибка сохранения: {e}'})
@@ -1304,6 +1717,92 @@ def create_or_update_note_tma():
     except Exception as e:
         return jsonify({'status': 'error', 'message': f'Failed to save data: {e}'}), 500
 
+@app.route('/get_list_tma/<list_id>')
+def get_list_tma(list_id):
+    if 'telegram_user_id' not in session: return jsonify({'status': 'error', 'message': 'Unauthorized'}), 401
+    list_node = get_item_node_for_user(list_id)
+    if not list_node or list_node.get('type') not in ['todolist', 'shoppinglist']:
+        return jsonify({'status': 'error', 'message': 'List not found'}), 404
+    return jsonify({'status': 'success', 'list': list_node})
+
+@app.route('/create_or_update_list_tma', methods=['POST'])
+def create_or_update_list_tma():
+    if 'telegram_user_id' not in session: return jsonify({'status': 'error', 'message': 'Unauthorized'}), 401
+    tma_user_id = session['telegram_user_id']
+    data = load_data()
+    user_data = data['users'].get(tma_user_id)
+    if not user_data: return jsonify({'status': 'error', 'message': 'User not found'}), 404
+    
+    payload = request.json
+    list_id = payload.get('list_id')
+    list_type = payload.get('type')
+    title = payload.get('title', '').strip()
+    parent_folder_id = payload.get('parent_folder_id', 'root')
+    now_str = datetime.now().strftime('%Y-%m-%d %H:%M')
+
+    if not title or list_type not in ['todolist', 'shoppinglist']:
+        return jsonify({'status': 'error', 'message': 'Invalid data provided.'}), 400
+
+    if list_id:
+        node, _ = find_node_by_id(user_data['filesystem'], list_id)
+        if not node or node.get('type') != list_type:
+            return jsonify({'status': 'error', 'message': 'List not found'}), 404
+        node['title'] = title
+        node['modified_date'] = now_str
+        if list_type == 'todolist':
+            node['tasks'] = payload.get('tasks', [])
+            for task in node['tasks']:
+                if not task.get('id'): task['id'] = uuid.uuid4().hex
+        elif list_type == 'shoppinglist':
+            existing_items = {item['id']: item for item in node.get('items', [])}
+            new_items_data = payload.get('items', [])
+            updated_items = []
+            for item_data in new_items_data:
+                item_id = item_data.get('id')
+                if item_id and item_id in existing_items:
+                    existing_items[item_id].update(item_data)
+                    updated_items.append(existing_items[item_id])
+                else:
+                    item_data['id'] = uuid.uuid4().hex
+                    item_data['purchased'] = False
+                    updated_items.append(item_data)
+            node['items'] = updated_items
+
+    else:
+        new_list_id = uuid.uuid4().hex
+        list_data = {
+            'type': list_type, 'id': new_list_id, 'title': title, 'archived': False,
+            'created_date': now_str, 'modified_date': now_str
+        }
+        if list_type == 'todolist':
+            list_data['tasks'] = payload.get('tasks', [])
+            for task in list_data['tasks']: task['id'] = uuid.uuid4().hex
+        elif list_type == 'shoppinglist':
+            list_data['items'] = payload.get('items', [])
+            for item in list_data['items']: 
+                item['id'] = uuid.uuid4().hex
+                item['purchased'] = False
+        
+        if not add_node(user_data['filesystem'], parent_folder_id, list_data):
+            return jsonify({'status': 'error', 'message': 'Parent folder not found'}), 404
+    
+    try: save_data(data); return jsonify({'status': 'success', 'message': 'List saved.'})
+    except Exception as e: return jsonify({'status': 'error', 'message': f'Failed to save data: {e}'}), 500
+
+@app.route('/archive_list_tma/<list_id>', methods=['POST'])
+def archive_list_tma(list_id):
+    if 'telegram_user_id' not in session: return jsonify({'status': 'error', 'message': 'Unauthorized'}), 401
+    list_node = get_item_node_for_user(list_id)
+    if not list_node or list_node.get('type') not in ['todolist', 'shoppinglist']:
+        return jsonify({'status': 'error', 'message': 'List not found'}), 404
+    
+    unarchive = request.args.get('unarchive', 'false').lower() == 'true'
+    list_node['archived'] = not unarchive
+    list_node['modified_date'] = datetime.now().strftime('%Y-%m-%d %H:%M')
+
+    try: save_data(load_data()); return jsonify({'status': 'success'})
+    except Exception as e: return jsonify({'status': 'error', 'message': f'Failed to save: {e}'}), 500
+
 @app.route('/get_reminders_tma')
 def get_reminders_tma():
     if 'telegram_user_id' not in session: return jsonify({'status': 'error', 'message': 'Unauthorized'}), 401
@@ -1382,38 +1881,35 @@ def create_public_link():
     if not user_data: return jsonify({'status': 'error', 'message': 'Пользователь не найден.'}), 404
     
     payload = request.json
-    folder_id = payload.get('folder_id')
+    item_id = payload.get('item_id')
+    item_type = payload.get('item_type')
     name = payload.get('name')
     duration_hours = payload.get('duration_hours', 0)
     
-    folder_node, _ = find_node_by_id(user_data['filesystem'], folder_id)
-    if not folder_node or folder_node.get('type') != 'folder':
-        return jsonify({'status': 'error', 'message': 'Папка не найдена.'}), 404
+    item_node, _ = find_node_by_id(user_data['filesystem'], item_id)
+    if not item_node or item_node.get('type') != item_type or item_type not in ['folder', 'shoppinglist']:
+        return jsonify({'status': 'error', 'message': 'Элемент не найден или не может быть опубликован.'}), 404
         
     now = datetime.now(pytz.utc)
-    expires_at = None
+    expires_at_iso = None
     if duration_hours > 0:
         expires_at = now + timedelta(hours=duration_hours)
         expires_at_iso = expires_at.isoformat()
-    else:
-        expires_at_iso = None
 
     link_id = uuid.uuid4().hex
     link_data = {
-        'id': link_id,
-        'user_id': tma_user_id,
-        'folder_id': folder_id,
-        'name': name,
-        'created_at': now.isoformat(),
-        'expires_at': expires_at_iso
+        'id': link_id, 'user_id': tma_user_id, 'item_id': item_id, 'item_type': item_type,
+        'name': name, 'created_at': now.isoformat(), 'expires_at': expires_at_iso
     }
     data['shared_links'][link_id] = link_data
-    
-    folder_node.setdefault('public_links', []).append(link_id)
+    item_node.setdefault('public_links', []).append(link_id)
     
     try:
         save_data(data)
-        public_url = url_for('shared_folder_view', link_id=link_id, _external=True)
+        if item_type == 'folder':
+            public_url = url_for('shared_folder_view', link_id=link_id, _external=True)
+        else: # shoppinglist
+            public_url = url_for('shared_list_view', link_id=link_id, _external=True)
         return jsonify({'status': 'success', 'url': public_url})
     except Exception as e:
         return jsonify({'status': 'error', 'message': f'Ошибка сохранения: {e}'}), 500
@@ -1430,12 +1926,12 @@ def delete_public_link():
     if not link_data or link_data.get('user_id') != tma_user_id:
         return jsonify({'status': 'error', 'message': 'Ссылка не найдена или нет доступа.'}), 404
     
-    folder_id = link_data.get('folder_id')
+    item_id = link_data.get('item_id')
     user_data = data['users'].get(tma_user_id)
     if user_data:
-        folder, _ = find_node_by_id(user_data['filesystem'], folder_id)
-        if folder and 'public_links' in folder:
-            folder['public_links'] = [l for l in folder['public_links'] if l != link_id]
+        item, _ = find_node_by_id(user_data['filesystem'], item_id)
+        if item and 'public_links' in item:
+            item['public_links'] = [l for l in item['public_links'] if l != link_id]
 
     del data['shared_links'][link_id]
     
@@ -1445,23 +1941,26 @@ def delete_public_link():
     except Exception as e:
         return jsonify({'status': 'error', 'message': f'Ошибка сохранения: {e}'}), 500
 
-@app.route('/get_public_links/<folder_id>')
-def get_public_links(folder_id):
+@app.route('/get_public_links/<item_id>')
+def get_public_links(item_id):
     if 'telegram_user_id' not in session: return jsonify({'status': 'error', 'message': 'Не авторизован.'}), 401
     tma_user_id = session['telegram_user_id']
     data = load_data()
     user_data = data['users'].get(tma_user_id)
     if not user_data: return jsonify({'status': 'error', 'message': 'Пользователь не найден.'}), 404
     
-    folder, _ = find_node_by_id(user_data['filesystem'], folder_id)
-    if not folder: return jsonify({'status': 'error', 'message': 'Папка не найдена.'}), 404
+    item, _ = find_node_by_id(user_data['filesystem'], item_id)
+    if not item: return jsonify({'status': 'error', 'message': 'Элемент не найден.'}), 404
         
-    link_ids = folder.get('public_links', [])
+    link_ids = item.get('public_links', [])
     links_details = []
     for link_id in link_ids:
         link_data = data['shared_links'].get(link_id)
         if link_data:
-            link_data['url'] = url_for('shared_folder_view', link_id=link_id, _external=True)
+            if link_data.get('item_type') == 'folder':
+                link_data['url'] = url_for('shared_folder_view', link_id=link_id, _external=True)
+            else:
+                link_data['url'] = url_for('shared_list_view', link_id=link_id, _external=True)
             links_details.append(link_data)
             
     return jsonify({'status': 'success', 'links': links_details})
@@ -1472,7 +1971,7 @@ def shared_folder_view(link_id, subfolder_id=None):
     data = load_data()
     link_data = data['shared_links'].get(link_id)
 
-    if not link_data: return "Ссылка недействительна.", 404
+    if not link_data or link_data.get('item_type') != 'folder': return "Ссылка недействительна.", 404
     
     if link_data.get('expires_at'):
         expires_at = datetime.fromisoformat(link_data['expires_at'])
@@ -1483,7 +1982,7 @@ def shared_folder_view(link_id, subfolder_id=None):
     user_data = data['users'].get(user_id)
     if not user_data: return "Владелец не найден.", 404
 
-    folder_id_to_show = subfolder_id if subfolder_id else link_data['folder_id']
+    folder_id_to_show = subfolder_id if subfolder_id else link_data['item_id']
     folder_node, _ = find_node_by_id(user_data['filesystem'], folder_id_to_show)
 
     if not folder_node or folder_node.get('type') != 'folder':
@@ -1491,7 +1990,71 @@ def shared_folder_view(link_id, subfolder_id=None):
         
     items_in_folder = sorted(folder_node.get('children', []), key=lambda x: (x['type'] != 'folder', x.get('name', x.get('original_filename', x.get('title', ''))).lower()))
 
-    return render_template_string(PUBLIC_SHARE_PAGE_HTML, folder=folder_node, items=items_in_folder, user=user_data, link=link_data, hf_file_url_jinja=lambda path, download=False: f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/{quote(path)}{'?download=true' if download else ''}")
+    return render_template_string(PUBLIC_FOLDER_PAGE_HTML, folder=folder_node, items=items_in_folder, user=user_data, link=link_data, hf_file_url_jinja=lambda path, download=False: f"https://huggingface.co/datasets/{REPO_ID}/resolve/main/{quote(path)}{'?download=true' if download else ''}")
+
+@app.route('/shared_list/<link_id>')
+def shared_list_view(link_id):
+    data = load_data()
+    link_data = data['shared_links'].get(link_id)
+    if not link_data or link_data.get('item_type') != 'shoppinglist': return "Ссылка недействительна.", 404
+    if link_data.get('expires_at'):
+        expires_at = datetime.fromisoformat(link_data['expires_at'])
+        if datetime.now(pytz.utc) > expires_at: return "Срок действия ссылки истек.", 410
+    
+    user_id = link_data['user_id']
+    user_data = data['users'].get(user_id)
+    if not user_data: return "Владелец не найден.", 404
+    
+    list_node, _ = find_node_by_id(user_data['filesystem'], link_data['item_id'])
+    if not list_node or list_node.get('type') != 'shoppinglist': return "Список не найден.", 404
+
+    return render_template_string(PUBLIC_SHOPPING_LIST_PAGE_HTML, list_data=list_node, user=user_data, link=link_data)
+
+@app.route('/get_shared_list_data/<link_id>')
+def get_shared_list_data(link_id):
+    data = load_data()
+    link_data = data['shared_links'].get(link_id)
+    if not link_data or link_data.get('item_type') != 'shoppinglist': return jsonify({'status':'error', 'message':'Ссылка недействительна'}), 404
+    user_id = link_data['user_id']
+    user_data = data['users'].get(user_id)
+    if not user_data: return jsonify({'status':'error', 'message':'Владелец не найден'}), 404
+    list_node, _ = find_node_by_id(user_data['filesystem'], link_data['item_id'])
+    if not list_node: return jsonify({'status':'error', 'message':'Список не найден'}), 404
+    
+    return jsonify({'status': 'success', 'items': list_node.get('items', [])})
+
+@app.route('/update_shared_item_status/<link_id>', methods=['POST'])
+def update_shared_item_status(link_id):
+    data = load_data()
+    link_data = data['shared_links'].get(link_id)
+    if not link_data or link_data.get('item_type') != 'shoppinglist': return jsonify({'status': 'error', 'message': 'Ссылка недействительна'}), 404
+    
+    user_id = link_data['user_id']
+    user_data = data['users'].get(user_id)
+    if not user_data: return jsonify({'status': 'error', 'message': 'Владелец не найден'}), 404
+    
+    list_node, _ = find_node_by_id(user_data['filesystem'], link_data['item_id'])
+    if not list_node: return jsonify({'status': 'error', 'message': 'Список не найден'}), 404
+
+    payload = request.json
+    item_id_to_update = payload.get('item_id')
+    purchased_status = payload.get('purchased')
+    
+    item_found = False
+    for item in list_node.get('items', []):
+        if item.get('id') == item_id_to_update:
+            item['purchased'] = purchased_status
+            item_found = True
+            break
+            
+    if item_found:
+        try:
+            save_data(data)
+            return jsonify({'status': 'success'})
+        except Exception as e:
+            return jsonify({'status': 'error', 'message': f'Ошибка сохранения: {e}'}), 500
+    else:
+        return jsonify({'status': 'error', 'message': 'Элемент не найден в списке'}), 404
 
 @app.route('/public_download/<link_id>/<item_id>')
 def public_download_via_link(link_id, item_id):
@@ -1633,12 +2196,12 @@ ADMIN_USER_FILES_HTML = '''
         <div class="item {{ item.type }}" data-id="{{ item.id }}" data-type="{{ item.type }}">
             <div class="item-preview-wrapper" 
                 {% if item.type == 'folder' %} onclick="window.location.href='{{ url_for('admin_user_files', tma_user_id_str=user_id, folder_id=item.id) }}'"
-                {% elif item.type == 'note' %} onclick="openModal(null, 'note', '{{ item.id }}')"
+                {% elif item.type in ['note', 'todolist', 'shoppinglist'] %} onclick="openModal(null, '{{item.type}}', '{{ item.id }}')"
                 {% else %} onclick="openModal('{{ hf_file_url_jinja(item.path) if item.file_type not in ['text', 'pdf'] else (url_for('admin_get_text_content', tma_user_id_str=user_id, file_id=item.id) if item.file_type == 'text' else hf_file_url_jinja(item.path, True)) }}', '{{ item.file_type }}', '{{ item.id }}')" {% endif %}>
-            {% if item.type == 'folder' %}
-                <div class="item-preview"><i class="fa-solid fa-folder"></i></div>
-            {% elif item.type == 'note' %}
-                 <div class="item-preview"><i class="fa-solid fa-note-sticky"></i></div>
+            {% if item.type == 'folder' %}<div class="item-preview"><i class="fa-solid fa-folder"></i></div>
+            {% elif item.type == 'note' %}<div class="item-preview"><i class="fa-solid fa-note-sticky"></i></div>
+            {% elif item.type == 'todolist' %}<div class="item-preview"><i class="fa-solid fa-list-check"></i></div>
+            {% elif item.type == 'shoppinglist' %}<div class="item-preview"><i class="fa-solid fa-cart-shopping"></i></div>
             {% elif item.type == 'file' %}
                 {% if item.file_type == 'image' %}<img class="item-preview" src="{{ hf_file_url_jinja(item.path) }}" loading="lazy">
                 {% elif item.file_type == 'video' %}<video class="item-preview" preload="metadata" muted loading="lazy"><source src="{{ hf_file_url_jinja(item.path, True) }}#t=0.5"></video>
@@ -1649,9 +2212,9 @@ ADMIN_USER_FILES_HTML = '''
             {% endif %}
             </div>
             <div class="item-name-info">
-                <p class="item-name">{{ (item.title if item.type == 'note' else item.name if item.type == 'folder' else item.original_filename) | truncate(30, True) }}</p>
+                <p class="item-name">{{ (item.title if item.type in ['note', 'todolist', 'shoppinglist'] else item.name if item.type == 'folder' else item.original_filename) | truncate(30, True) }}</p>
                 {% if item.type == 'file' %}<p class="item-info">{{ item.upload_date }}</p>
-                {% elif item.type == 'note' %}<p class="item-info">{{ item.modified_date }}</p>{% endif %}
+                {% elif item.type in ['note', 'todolist', 'shoppinglist'] %}<p class="item-info">{{ item.modified_date }}</p>{% endif %}
             </div>
             <div class="item-actions-admin">
                 <form action="{{ url_for('admin_delete_item', tma_user_id_str=user_id, item_id=item.id) }}" method="post" onsubmit="return confirm('Are you sure you want to delete this?');">
@@ -1698,11 +2261,16 @@ ADMIN_USER_FILES_HTML = '''
         downloadBtn.style.display = 'none';
         
         try {
-            if (type === 'note') {
-                const response = await fetch(`{{ url_for('admin_get_note', tma_user_id_str=user_id, note_id='__ID__') }}`.replace('__ID__', itemId));
+            if (type === 'note' || type === 'todolist' || type === 'shoppinglist') {
+                const response = await fetch(`{{ url_for('admin_get_item', tma_user_id_str=user_id, item_id='__ID__') }}`.replace('__ID__', itemId));
                 const data = await response.json();
                 if(data.status === 'success') {
-                    modalContent.innerHTML = `<div style="padding:15px; text-align:left;"><h3>${data.note.title.replace(/</g,"&lt;")}</h3><hr style="border-color:#333; margin:10px 0;"><pre>${data.note.content.replace(/</g,"&lt;")}</pre></div>`;
+                    let contentHTML = `<div style="padding:15px; text-align:left;"><h3>${data.item.title.replace(/</g,"&lt;")}</h3><hr style="border-color:#333; margin:10px 0;">`;
+                    if (type === 'note') contentHTML += `<pre>${data.item.content.replace(/</g,"&lt;")}</pre>`;
+                    if (type === 'todolist') contentHTML += `<ul>${data.item.tasks.map(t => `<li><input type='checkbox' ${t.completed ? 'checked' : ''} disabled> ${t.text}</li>`).join('')}</ul>`;
+                    if (type === 'shoppinglist') contentHTML += `<ul>${data.item.items.map(i => `<li><input type='checkbox' ${i.purchased ? 'checked' : ''} disabled> ${i.name} (x${i.quantity})</li>`).join('')}</ul>`;
+                    contentHTML += `</div>`;
+                    modalContent.innerHTML = contentHTML;
                 } else { throw new Error(data.message); }
             } else if (type === 'image') {
                 modalContent.innerHTML = `<img src="${srcOrUrl}">`;
@@ -1930,16 +2498,15 @@ def admin_get_text_content(tma_user_id_str, file_id):
     except Exception as e:
         return Response(f"Download error: {e}", 502)
 
-@app.route('/admhosto/note/<tma_user_id_str>/<note_id>')
+@app.route('/admhosto/item/<tma_user_id_str>/<item_id>')
 @admin_browser_login_required
-def admin_get_note(tma_user_id_str, note_id):
+def admin_get_item(tma_user_id_str, item_id):
     data = load_data()
     user_data = data['users'].get(tma_user_id_str)
     if not user_data: return jsonify({'status': 'error', 'message': 'User not found'}), 404
-    node, _ = find_node_by_id(user_data['filesystem'], note_id)
-    if not node or node.get('type') != 'note':
-        return jsonify({'status': 'error', 'message': 'Note not found'}), 404
-    return jsonify({'status': 'success', 'note': node})
+    node, _ = find_node_by_id(user_data['filesystem'], item_id)
+    if not node: return jsonify({'status': 'error', 'message': 'Item not found'}), 404
+    return jsonify({'status': 'success', 'item': node})
 
 @app.route('/admhosto/delete_item/<tma_user_id_str>/<item_id>', methods=['POST'])
 @admin_browser_login_required
@@ -1968,10 +2535,10 @@ def admin_delete_item(tma_user_id_str, item_id):
                     try: save_data(data); flash('File not found on server, removed from DB.')
                     except Exception: flash('DB save error (file not on server).', 'error')
             except Exception as e: flash(f'Deletion error: {e}', 'error')
-    elif node.get('type') == 'note':
+    elif node.get('type') in ['note', 'todolist', 'shoppinglist']:
         if remove_node(user_data['filesystem'], item_id)[0]:
-            try: save_data(data); flash('Note deleted.')
-            except Exception: flash('DB update failed after note deletion.', 'error')
+            try: save_data(data); flash(f'{node.get("type").capitalize()} deleted.')
+            except Exception: flash('DB update failed after item deletion.', 'error')
     elif node.get('type') == 'folder':
         if node.get('children'): flash('Folder is not empty.', 'error')
         else: