Linkliste: Ordner, Schnellzugriff-Toggle, Sortierung per Drag/Pfeile, Ordner-Modal im Dashboard

2026-06-04 21:27:34 +02:00
parent c5ccfccf3e
commit e7cd93c766
5 changed files with 551 additions and 242 deletions
--- a/backend/src/db.js
+++ b/backend/src/db.js
@@ -444,4 +444,27 @@ if (!db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='sni
  `);
 }

+// ── Link-Liste Ordner + Erweiterungen ─────────────────────────────────────────
+if (!db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='link_list_folders'").get()) {
+  db.exec(`
+    CREATE TABLE link_list_folders (
+      id           INTEGER PRIMARY KEY AUTOINCREMENT,
+      user_id      INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+      name         TEXT    NOT NULL,
+      icon         TEXT    NOT NULL DEFAULT '📁',
+      sort_order   INTEGER DEFAULT 0,
+      in_quickaccess INTEGER DEFAULT 0,
+      created_at   DATETIME DEFAULT NULL
+    )
+  `);
+}
+// link_list Spalten nachrüsten
+{
+  const cols = db.pragma('table_info(link_list)').map(c => c.name);
+  if (!cols.includes('folder_id'))       db.exec('ALTER TABLE link_list ADD COLUMN folder_id       INTEGER DEFAULT NULL');
+  if (!cols.includes('sort_order'))      db.exec('ALTER TABLE link_list ADD COLUMN sort_order      INTEGER DEFAULT 0');
+  if (!cols.includes('in_quickaccess'))  db.exec('ALTER TABLE link_list ADD COLUMN in_quickaccess  INTEGER DEFAULT 0');
+}
+
+
 module.exports = db;
--- a/backend/src/routes/dashboard.js
+++ b/backend/src/routes/dashboard.js
@@ -6,7 +6,12 @@ const uid = req => req.user.id;

 // ── Quick Links ───────────────────────────────────────────────────────────────
 router.get('/links', authenticate, (req, res) => {
-  res.json(db.prepare('SELECT * FROM quick_links WHERE user_id=? ORDER BY sort_order,id').all(uid(req)));
+  const id = uid(req);
+  // Rückwärtskomp: bestehende quick_links + neue link_list-Einträge mit in_quickaccess=1 + Ordner mit in_quickaccess=1
+  const legacy = db.prepare("SELECT *, 'quicklink' as item_type FROM quick_links WHERE user_id=? ORDER BY sort_order,id").all(id);
+  const listLinks = db.prepare("SELECT *, 'link_list' as item_type FROM link_list WHERE user_id=? AND in_quickaccess=1 ORDER BY sort_order,id").all(id);
+  const folders = db.prepare("SELECT *, 'folder' as item_type FROM link_list_folders WHERE user_id=? AND in_quickaccess=1 ORDER BY sort_order,id").all(id);
+  res.json([...legacy, ...listLinks, ...folders]);
 });
 router.post('/links', authenticate, (req, res) => {
  const { title, url, icon = '🔗' } = req.body;
--- a/backend/src/tools/linkliste/routes.js
+++ b/backend/src/tools/linkliste/routes.js
@@ -3,15 +3,71 @@ const db      = require('../../db');
 const { authenticate } = require('../../middleware/auth');
 const router  = express.Router();

+// ── Ordner ────────────────────────────────────────────────────────────────────
+router.get('/folders', authenticate, (req, res) => {
+  res.json(db.prepare('SELECT * FROM link_list_folders WHERE user_id=? ORDER BY sort_order,id').all(req.user.id));
+});
+
+router.post('/folders', authenticate, (req, res) => {
+  const uid = req.user.id;
+  const { name, icon='📁' } = req.body;
+  if (!name?.trim()) return res.status(400).json({ error: 'Name erforderlich' });
+  const max = db.prepare('SELECT MAX(sort_order) m FROM link_list_folders WHERE user_id=?').get(uid);
+  const r = db.prepare(`INSERT INTO link_list_folders (user_id,name,icon,sort_order,created_at) VALUES (?,?,?,?,datetime('now','localtime'))`)
+    .run(uid, name.trim(), icon, (max?.m ?? -1) + 1);
+  res.json(db.prepare('SELECT * FROM link_list_folders WHERE id=?').get(r.lastInsertRowid));
+});
+
+router.put('/folders/:id', authenticate, (req, res) => {
+  const f = db.prepare('SELECT * FROM link_list_folders WHERE id=? AND user_id=?').get(req.params.id, req.user.id);
+  if (!f) return res.status(404).json({ error: 'Nicht gefunden' });
+  const { name=f.name, icon=f.icon, in_quickaccess } = req.body;
+  const qa = in_quickaccess !== undefined ? (in_quickaccess ? 1 : 0) : f.in_quickaccess;
+  db.prepare('UPDATE link_list_folders SET name=?, icon=?, in_quickaccess=? WHERE id=?').run(name, icon, qa, f.id);
+  res.json(db.prepare('SELECT * FROM link_list_folders WHERE id=?').get(f.id));
+});
+
+router.delete('/folders/:id', authenticate, (req, res) => {
+  const f = db.prepare('SELECT * FROM link_list_folders WHERE id=? AND user_id=?').get(req.params.id, req.user.id);
+  if (!f) return res.status(404).json({ error: 'Nicht gefunden' });
+  // Links aus Ordner herauslösen
+  db.prepare('UPDATE link_list SET folder_id=NULL WHERE folder_id=? AND user_id=?').run(f.id, req.user.id);
+  db.prepare('DELETE FROM link_list_folders WHERE id=?').run(f.id);
+  res.json({ ok: true });
+});
+
+// Ordner-Inhalt abrufen (für Folder-Modal im Dashboard)
+router.get('/folders/:id/links', authenticate, (req, res) => {
+  const f = db.prepare('SELECT * FROM link_list_folders WHERE id=? AND user_id=?').get(req.params.id, req.user.id);
+  if (!f) return res.status(404).json({ error: 'Nicht gefunden' });
+  const links = db.prepare('SELECT * FROM link_list WHERE folder_id=? AND user_id=? ORDER BY sort_order,id').all(f.id, req.user.id);
+  res.json({ folder: f, links });
+});
+
+// ── Sortierung ────────────────────────────────────────────────────────────────
+router.put('/sort', authenticate, (req, res) => {
+  const uid = req.user.id;
+  const { links=[], folders=[] } = req.body;
+  const upLink   = db.prepare('UPDATE link_list SET sort_order=? WHERE id=? AND user_id=?');
+  const upFolder = db.prepare('UPDATE link_list_folders SET sort_order=? WHERE id=? AND user_id=?');
+  db.transaction(() => {
+    links.forEach((id, i)   => upLink.run(i, id, uid));
+    folders.forEach((id, i) => upFolder.run(i, id, uid));
+  })();
+  res.json({ ok: true });
+});
+
 // ── Eigene Links ──────────────────────────────────────────────────────────────
 router.get('/', authenticate, (req, res) => {
  const uid = req.user.id;
  const own = db.prepare(`
    SELECT l.*, 0 as is_shared, NULL as owner_name,
      (SELECT COUNT(*) FROM link_list_shares WHERE link_id=l.id) as share_count
-    FROM link_list l WHERE l.user_id=? ORDER BY l.created_at DESC
+    FROM link_list l WHERE l.user_id=? ORDER BY l.folder_id IS NULL DESC, l.folder_id, l.sort_order, l.id
  `).all(uid);

+  const folders = db.prepare('SELECT * FROM link_list_folders WHERE user_id=? ORDER BY sort_order,id').all(uid);
+
  const shared = db.prepare(`
    SELECT l.*, 1 as is_shared, u.username as owner_name, 0 as share_count
    FROM link_list l
@@ -30,26 +86,35 @@ router.get('/', authenticate, (req, res) => {
    ORDER BY l.title ASC
  `).all(uid);

-  res.json({ own, shared, sharedByMe });
+  res.json({ own, folders, shared, sharedByMe });
 });

 router.post('/', authenticate, (req, res) => {
  const uid = req.user.id;
-  const { title, url, icon = '🔗', description = '' } = req.body;
+  const { title, url, icon = '🔗', description = '', folder_id = null } = req.body;
  if (!title?.trim() || !url?.trim()) return res.status(400).json({ error: 'Titel und URL erforderlich' });
+  const max = db.prepare('SELECT MAX(sort_order) m FROM link_list WHERE user_id=?').get(uid);
  const r = db.prepare(`
-    INSERT INTO link_list (user_id, title, url, icon, description, created_at)
-    VALUES (?,?,?,?,?,datetime('now','localtime'))
-  `).run(uid, title.trim(), url.trim(), icon, description.trim());
+    INSERT INTO link_list (user_id, title, url, icon, description, folder_id, sort_order, created_at)
+    VALUES (?,?,?,?,?,?,?,datetime('now','localtime'))
+  `).run(uid, title.trim(), url.trim(), icon, description.trim(), folder_id || null, (max?.m ?? -1) + 1);
  res.json(db.prepare('SELECT * FROM link_list WHERE id=?').get(r.lastInsertRowid));
 });

 router.put('/:id', authenticate, (req, res) => {
  const link = db.prepare('SELECT * FROM link_list WHERE id=? AND user_id=?').get(req.params.id, req.user.id);
  if (!link) return res.status(404).json({ error: 'Nicht gefunden' });
-  const { title, url, icon, description } = req.body;
-  db.prepare('UPDATE link_list SET title=?, url=?, icon=?, description=? WHERE id=?')
-    .run(title??link.title, url??link.url, icon??link.icon, description??link.description, link.id);
+  const { title, url, icon, description, folder_id, in_quickaccess } = req.body;
+  db.prepare('UPDATE link_list SET title=?, url=?, icon=?, description=?, folder_id=?, in_quickaccess=? WHERE id=?')
+    .run(
+      title ?? link.title,
+      url ?? link.url,
+      icon ?? link.icon,
+      description ?? link.description,
+      folder_id !== undefined ? (folder_id || null) : link.folder_id,
+      in_quickaccess !== undefined ? (in_quickaccess ? 1 : 0) : link.in_quickaccess,
+      link.id
+    );
  res.json(db.prepare('SELECT * FROM link_list WHERE id=?').get(link.id));
 });