chore: version bump

Merge pull request 'feat: database' (#2 ) from feature/db into main
Reviewed-on: #2
2025-11-16 10:36:56 +01:00 · 2025-11-16 10:35:55 +01:00 · 2025-11-16 10:33:59 +01:00 · 2025-11-16 09:40:33 +01:00 · 2025-11-16 07:49:19 +01:00 · 2025-11-15 19:21:40 +01:00
19 changed files with 4145 additions and 176 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,6 +2,7 @@ node_modules
 npm-debug.log
 data
 .env
+.env.example
 .git
 .gitignore
 *.md
--- a/.env.example
+++ b/.env.example
@@ -0,0 +1,48 @@
+# Application Configuration
+NODE_ENV=production
+PORT=3000
+
+# Database Configuration
+# Option 1: Use DATABASE_URL (recommended for production)
+# DATABASE_URL=postgresql://user:password@host:port/database
+# DATABASE_SSL=true
+
+# Option 2: Use individual connection parameters (recommended for development)
+DB_HOST=localhost
+DB_PORT=5432
+DB_NAME=linkding
+DB_USER=postgres
+DB_PASSWORD=postgres
+
+# Session Configuration
+SESSION_SECRET=your-secret-key-change-this-in-production
+SESSION_NAME=connect.sid
+COOKIE_SECURE=true
+COOKIE_SAMESITE=none
+COOKIE_DOMAIN=
+COOKIE_PATH=/
+
+# Proxy Configuration (for reverse proxy like Traefik)
+TRUST_PROXY=true
+
+# LDAP Authentication Configuration
+LDAP_ADDRESS=ldap://ldap.example.com:389
+LDAP_BASE_DN=dc=example,dc=com
+LDAP_ADDITIONAL_USERS_DN=
+LDAP_USER=cn=admin,dc=example,dc=com
+LDAP_PASSWORD=admin_password
+LDAP_USERS_FILTER=(&(objectClass=person)(uid={{username}}))
+LDAP_TIMEOUT=5000
+
+# LDAP Attribute Mapping
+LDAP_ATTRIBUTE_USERNAME=uid
+LDAP_ATTRIBUTE_MAIL=mail
+LDAP_ATTRIBUTE_DISTINGUISHED_NAME=distinguishedName
+LDAP_ATTRIBUTE_MEMBER_OF=memberOf
+
+# LDAP TLS Configuration
+LDAP_TLS_SKIP_VERIFY=false
+LDAP_TLS_SERVER_NAME=
+
+# Chrome/Chromium Configuration (for Puppeteer)
+CHROME_EXECUTABLE_PATH=/usr/bin/chromium
--- a/23
+++ b/23
@@ -0,0 +1,23 @@
+.PHONY: dev up down clean
+
+# Start development environment: PostgreSQL and the app
+dev:
+	@echo "Starting PostgreSQL database..."
+	@docker compose -f docker-compose.dev.yaml up -d
+	@echo "Waiting for database to be ready..."
+	@sleep 3
+	@echo "Starting application..."
+	@npm start
+
+# Start only the database
+up:
+	@docker compose -f docker-compose.dev.yaml up -d
+
+# Stop the database
+down:
+	@docker compose -f docker-compose.dev.yaml down
+
+# Stop and remove volumes (clean slate)
+clean:
+	@docker compose -f docker-compose.dev.yaml down -v
+
--- a/README.md
+++ b/README.md
@@ -7,22 +7,29 @@ LinkDing is a minimal bookmarking application where you can paste links and get
 - Paste links and get a list of links with title, description, and image
 - Automatic metadata extraction
 - Search functionality by title, description, and URL
+- Organize links into custom lists
+- Archive/unarchive links
+- Public and private lists
 - Modern, responsive web interface
 - Support for JavaScript-heavy sites using Puppeteer
 - Automatic fallback from HTTP scraping to browser rendering
+- LDAP authentication support
+- PostgreSQL database with automatic migrations

 ## Tech Stack

 - **Backend**: Express.js (Node.js)
 - **Frontend**: Vanilla JavaScript, HTML5, CSS3
 - **Web Scraping**: Cheerio + Puppeteer (for JavaScript-heavy sites)
- **Data Storage**: JSON file
+- **Database**: PostgreSQL with Sequelize ORM
+- **Authentication**: LDAP (optional)

 ## Installation

 ### Prerequisites

 - Node.js 18+ (or Docker)
+- PostgreSQL 12+ (or Docker)
 - Chromium/Chrome (for Puppeteer support, optional)

 ### Local Installation
@@ -37,49 +44,86 @@ LinkDing is a minimal bookmarking application where you can paste links and get
   npm install
   ```

-3. Start the server:
+3. Set up environment variables:
   ```bash
+   cp .env.example .env
+   # Edit .env with your database configuration
+   ```
+
+4. Start PostgreSQL database and the application:
+   ```bash
+   make dev
+   ```
+   
+   Or manually:
+   ```bash
+   # Start PostgreSQL (using docker-compose)
+   docker compose -f docker-compose.dev.yaml up -d
+   
+   # Start the application
   npm start
   ```

-4. Open your browser to `http://localhost:3000`
+5. Open your browser to `http://localhost:3000`
+
+**Note**: On first startup, the application will:
+- Create database tables automatically
+- Migrate any existing JSON files (`data/links.json` and `data/lists.json`) to the database
+- Rename migrated JSON files to `*.json.bak`

 ### Docker Installation

-1. Build the Docker image:
+1. Set up environment variables:
   ```bash
-   docker build -t linkding .
+   cp .env.example .env
+   # Edit .env with your database configuration (or use defaults)
   ```

-2. Run the container:
-   ```bash
-   docker run -d \
-     --name linkding \
-     -p 3000:3000 \
-     -v $(pwd)/data:/app/data \
-     linkding
-   ```
-
-   Or use Docker Compose:
+2. Use Docker Compose (recommended):
   ```bash
   docker-compose up -d
   ```
+   
+   This will start both PostgreSQL and the LinkDing application.

 3. Access the application at `http://localhost:3000`

+**Note**: The Docker Compose setup includes:
+- PostgreSQL database with persistent volume
+- LinkDing application container
+- Automatic database initialization and migrations
+
 ## Usage

 1. **Add a Link**: Paste a URL into the input field and click "Add Link"
 2. **Search**: Use the search bar to filter links by title, description, or URL
 3. **View Links**: Browse your saved links with images, titles, and descriptions
-4. **Delete Links**: Click the "Delete" button on any link card to remove it
+4. **Organize Links**: Create lists and assign links to them
+5. **Archive Links**: Archive links to hide them from the main view
+6. **Public Lists**: Make lists public to share them with unauthenticated users
+7. **Delete Links**: Click the "Delete" button on any link card to remove it

 ## API Endpoints

- `GET /api/links` - Get all saved links
+### Links
+- `GET /api/links` - Get all saved links (authenticated users see all, unauthenticated see only public lists)
 - `GET /api/links/search?q=query` - Search links
- `POST /api/links` - Add a new link (body: `{ "url": "https://example.com" }`)
- `DELETE /api/links/:id` - Delete a link by ID
+- `POST /api/links` - Add a new link (body: `{ "url": "https://example.com" }`) - Requires authentication
+- `PATCH /api/links/:id/archive` - Archive/unarchive a link (body: `{ "archived": true }`) - Requires authentication
+- `PATCH /api/links/:id/lists` - Update link's lists (body: `{ "listIds": ["uuid1", "uuid2"] }`) - Requires authentication
+- `DELETE /api/links/:id` - Delete a link by ID - Requires authentication
+
+### Lists
+- `GET /api/lists` - Get all lists (authenticated users see all, unauthenticated see only public)
+- `POST /api/lists` - Create a new list (body: `{ "name": "List Name" }`) - Requires authentication
+- `PUT /api/lists/:id` - Update a list (body: `{ "name": "New Name" }`) - Requires authentication
+- `PATCH /api/lists/:id/public` - Toggle list public status (body: `{ "public": true }`) - Requires authentication
+- `DELETE /api/lists/:id` - Delete a list by ID - Requires authentication
+
+### Authentication
+- `GET /api/auth/status` - Check authentication status
+- `POST /api/auth/login` - Login with LDAP credentials (body: `{ "username": "user", "password": "pass" }`)
+- `POST /api/auth/logout` - Logout

 ## Metadata Extraction

@@ -100,13 +144,63 @@ The application automatically extracts:

 ## Environment Variables

+See `.env.example` for a complete list of environment variables. Key variables include:
+
+### Application
 - `PORT` - Server port (default: 3000)
- `CHROME_EXECUTABLE_PATH` - Path to Chrome/Chromium executable (for Puppeteer)
 - `NODE_ENV` - Environment mode (production/development)

-## Data Storage
+### Database
+- `DATABASE_URL` - Full PostgreSQL connection string (e.g., `postgresql://user:password@host:port/database`)
+- `DATABASE_SSL` - Enable SSL for database connection (true/false)
+- `DB_HOST` - Database host (default: localhost)
+- `DB_PORT` - Database port (default: 5432)
+- `DB_NAME` - Database name (default: linkding)
+- `DB_USER` - Database user (default: postgres)
+- `DB_PASSWORD` - Database password (default: postgres)

-Links are stored in `data/links.json`. Make sure this directory exists and is writable. When using Docker, mount the `data` directory as a volume for persistence.
+### Session & Cookies
+- `SESSION_SECRET` - Secret key for session encryption (change in production!)
+- `SESSION_NAME` - Session cookie name (default: connect.sid)
+- `COOKIE_SECURE` - Use secure cookies (default: true in production)
+- `COOKIE_SAMESITE` - Cookie SameSite attribute (default: none for secure, lax otherwise)
+- `COOKIE_DOMAIN` - Cookie domain (optional)
+- `COOKIE_PATH` - Cookie path (default: /)
+- `TRUST_PROXY` - Trust proxy headers (default: true)
+
+### LDAP Authentication
+- `LDAP_ADDRESS` - LDAP server address
+- `LDAP_BASE_DN` - LDAP base distinguished name
+- `LDAP_USER` - LDAP bind user
+- `LDAP_PASSWORD` - LDAP bind password
+- `LDAP_USERS_FILTER` - LDAP user search filter
+- And more... (see `.env.example`)
+
+### Puppeteer
+- `CHROME_EXECUTABLE_PATH` - Path to Chrome/Chromium executable (for Puppeteer)
+
+## Database
+
+LinkDing uses PostgreSQL for data storage. The application automatically:
+
+- **Creates tables** on first startup
+- **Runs migrations** to keep the schema up to date
+- **Migrates JSON files** if `data/links.json` or `data/lists.json` exist, then renames them to `*.json.bak`
+
+### Migration System
+
+The application includes a migration system for database schema changes:
+- Migrations are stored in `migrations/` directory
+- Migrations are automatically run on startup
+- Each migration is tracked in the `SequelizeMeta` table
+
+### Data Migration
+
+If you have existing JSON files:
+1. Place `links.json` and `lists.json` in the `data/` directory
+2. Start the application
+3. The files will be automatically migrated to PostgreSQL
+4. Original files will be renamed to `links.json.bak` and `lists.json.bak`

 ## Troubleshooting

@@ -127,10 +221,31 @@ Some sites block automated requests. The app automatically:

 ## Development

+### Using Make (Recommended)
+
+```bash
+# Start PostgreSQL and the application
+make dev
+
+# Start only PostgreSQL
+make up
+
+# Stop PostgreSQL
+make down
+
+# Stop and remove volumes (clean slate)
+make clean
+```
+
+### Manual Development Setup
+
 ```bash
 # Install dependencies
 npm install

+# Start PostgreSQL (using docker-compose)
+docker compose -f docker-compose.dev.yaml up -d
+
 # Run in development mode with auto-reload
 npm run dev

@@ -138,6 +253,14 @@ npm run dev
 npm start
 ```

+### Database Management
+
+The application uses Sequelize ORM with PostgreSQL. Database migrations are automatically run on startup. To manually manage the database:
+
+- Connect to PostgreSQL: `psql -h localhost -U postgres -d linkding`
+- Check migrations: Query the `SequelizeMeta` table
+- View tables: `\dt` in psql
+
 ## License

 ISC
--- a/docker-compose.dev.yaml
+++ b/docker-compose.dev.yaml
@@ -0,0 +1,23 @@
+version: '3.8'
+
+services:
+  postgres:
+    image: postgres:16-alpine
+    container_name: linkding-postgres-dev
+    ports:
+      - "5432:5432"
+    environment:
+      - POSTGRES_DB=linkding
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
+    volumes:
+      - postgres-dev-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 5s
+      timeout: 3s
+      retries: 5
+
+volumes:
+  postgres-dev-data:
+
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,22 @@
 version: '3.8'

 services:
+  postgres:
+    image: postgres:16-alpine
+    container_name: linkding-postgres
+    environment:
+      - POSTGRES_DB=${DB_NAME:-linkding}
+      - POSTGRES_USER=${DB_USER:-postgres}
+      - POSTGRES_PASSWORD=${DB_PASSWORD:-postgres}
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-postgres}"]
+      interval: 10s
+      timeout: 3s
+      retries: 5
+
  linkding:
    build: .
    container_name: linkding
@@ -13,6 +29,14 @@ services:
      - NODE_ENV=production
      - PORT=3000
      - CHROME_EXECUTABLE_PATH=/usr/bin/chromium
+      - DB_HOST=postgres
+      - DB_PORT=5432
+      - DB_NAME=${DB_NAME:-linkding}
+      - DB_USER=${DB_USER:-postgres}
+      - DB_PASSWORD=${DB_PASSWORD:-postgres}
+    depends_on:
+      postgres:
+        condition: service_healthy
    restart: unless-stopped
    healthcheck:
      test: ["CMD", "node", "-e", "require('http').get('http://localhost:3000/api/links', (r) => {process.exit(r.statusCode === 200 ? 0 : 1)})"]
@@ -21,3 +45,6 @@ services:
      retries: 3
      start_period: 5s

+volumes:
+  postgres-data:
+
--- a/migrations/001-initial-schema.js
+++ b/migrations/001-initial-schema.js
@@ -0,0 +1,136 @@
+/**
+ * Initial database schema migration
+ * Creates links, lists, and link_lists tables
+ */
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    // Create links table
+    await queryInterface.createTable('links', {
+      id: {
+        type: Sequelize.UUID,
+        defaultValue: Sequelize.UUIDV4,
+        primaryKey: true
+      },
+      url: {
+        type: Sequelize.TEXT,
+        allowNull: false,
+        unique: true
+      },
+      title: {
+        type: Sequelize.TEXT,
+        allowNull: true
+      },
+      description: {
+        type: Sequelize.TEXT,
+        allowNull: true
+      },
+      image: {
+        type: Sequelize.TEXT,
+        allowNull: true
+      },
+      created_at: {
+        type: Sequelize.DATE,
+        allowNull: false,
+        defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
+      },
+      created_by: {
+        type: Sequelize.TEXT,
+        allowNull: true
+      },
+      modified_at: {
+        type: Sequelize.DATE,
+        allowNull: true
+      },
+      modified_by: {
+        type: Sequelize.TEXT,
+        allowNull: true
+      },
+      archived: {
+        type: Sequelize.BOOLEAN,
+        defaultValue: false,
+        allowNull: false
+      }
+    });
+
+    // Create lists table
+    await queryInterface.createTable('lists', {
+      id: {
+        type: Sequelize.UUID,
+        defaultValue: Sequelize.UUIDV4,
+        primaryKey: true
+      },
+      name: {
+        type: Sequelize.TEXT,
+        allowNull: false
+      },
+      created_at: {
+        type: Sequelize.DATE,
+        allowNull: false,
+        defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
+      },
+      created_by: {
+        type: Sequelize.TEXT,
+        allowNull: true
+      },
+      modified_at: {
+        type: Sequelize.DATE,
+        allowNull: true
+      },
+      modified_by: {
+        type: Sequelize.TEXT,
+        allowNull: true
+      },
+      public: {
+        type: Sequelize.BOOLEAN,
+        defaultValue: false,
+        allowNull: false
+      }
+    });
+
+    // Create link_lists junction table
+    await queryInterface.createTable('link_lists', {
+      link_id: {
+        type: Sequelize.UUID,
+        allowNull: false,
+        references: {
+          model: 'links',
+          key: 'id'
+        },
+        onUpdate: 'CASCADE',
+        onDelete: 'CASCADE'
+      },
+      list_id: {
+        type: Sequelize.UUID,
+        allowNull: false,
+        references: {
+          model: 'lists',
+          key: 'id'
+        },
+        onUpdate: 'CASCADE',
+        onDelete: 'CASCADE'
+      }
+    });
+
+    // Add composite primary key
+    await queryInterface.addConstraint('link_lists', {
+      fields: ['link_id', 'list_id'],
+      type: 'primary key',
+      name: 'link_lists_pkey'
+    });
+
+    // Create indexes for better performance
+    await queryInterface.addIndex('links', ['url'], { unique: true });
+    await queryInterface.addIndex('links', ['created_at']);
+    await queryInterface.addIndex('links', ['archived']);
+    await queryInterface.addIndex('lists', ['name']);
+    await queryInterface.addIndex('link_lists', ['link_id']);
+    await queryInterface.addIndex('link_lists', ['list_id']);
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    await queryInterface.dropTable('link_lists');
+    await queryInterface.dropTable('lists');
+    await queryInterface.dropTable('links');
+  }
+};
+
--- a/migrations/runner.js
+++ b/migrations/runner.js
@@ -0,0 +1,104 @@
+const { QueryInterface } = require('sequelize');
+const fs = require('fs').promises;
+const path = require('path');
+
+/**
+ * Simple migration runner for Sequelize
+ * Checks which migrations have been run and executes pending ones
+ */
+class MigrationRunner {
+  constructor(sequelize) {
+    this.sequelize = sequelize;
+    this.migrationsPath = path.join(__dirname);
+  }
+
+  async ensureMigrationsTable() {
+    const queryInterface = this.sequelize.getQueryInterface();
+    
+    // Check if migrations table exists
+    const [results] = await this.sequelize.query(`
+      SELECT EXISTS (
+        SELECT FROM information_schema.tables 
+        WHERE table_schema = 'public' 
+        AND table_name = 'SequelizeMeta'
+      );
+    `);
+
+    if (!results[0].exists) {
+      // Create migrations table
+      await queryInterface.createTable('SequelizeMeta', {
+        name: {
+          type: require('sequelize').DataTypes.STRING,
+          allowNull: false,
+          primaryKey: true
+        }
+      });
+    }
+  }
+
+  async getExecutedMigrations() {
+    await this.ensureMigrationsTable();
+    
+    const [results] = await this.sequelize.query(
+      'SELECT name FROM "SequelizeMeta" ORDER BY name'
+    );
+    
+    return results.map(row => row.name);
+  }
+
+  async getAllMigrations() {
+    const files = await fs.readdir(this.migrationsPath);
+    return files
+      .filter(file => file.endsWith('.js') && file !== 'runner.js')
+      .sort();
+  }
+
+  async runMigrations() {
+    const executed = await this.getExecutedMigrations();
+    const allMigrations = await this.getAllMigrations();
+    const pending = allMigrations.filter(m => !executed.includes(m));
+
+    if (pending.length === 0) {
+      console.log('No pending migrations');
+      return;
+    }
+
+    console.log(`Running ${pending.length} pending migration(s)...`);
+
+    for (const migrationFile of pending) {
+      const migration = require(path.join(this.migrationsPath, migrationFile));
+      
+      if (!migration.up || typeof migration.up !== 'function') {
+        throw new Error(`Migration ${migrationFile} does not export an 'up' function`);
+      }
+
+      const queryInterface = this.sequelize.getQueryInterface();
+      const transaction = await this.sequelize.transaction();
+
+      try {
+        console.log(`Running migration: ${migrationFile}`);
+        await migration.up(queryInterface, this.sequelize.constructor);
+        
+        // Record migration as executed
+        await this.sequelize.query(
+          `INSERT INTO "SequelizeMeta" (name) VALUES (:name)`,
+          {
+            replacements: { name: migrationFile },
+            transaction
+          }
+        );
+
+        await transaction.commit();
+        console.log(`Completed migration: ${migrationFile}`);
+      } catch (error) {
+        await transaction.rollback();
+        throw new Error(`Migration ${migrationFile} failed: ${error.message}`);
+      }
+    }
+
+    console.log('All migrations completed successfully');
+  }
+}
+
+module.exports = MigrationRunner;
+
--- a/models/Link.js
+++ b/models/Link.js
@@ -0,0 +1,66 @@
+const { DataTypes } = require('sequelize');
+const { v4: uuidv4 } = require('uuid');
+
+module.exports = (sequelize) => {
+  const Link = sequelize.define('Link', {
+    id: {
+      type: DataTypes.UUID,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
+    url: {
+      type: DataTypes.TEXT,
+      allowNull: false,
+      unique: true,
+      validate: {
+        isUrl: true
+      }
+    },
+    title: {
+      type: DataTypes.TEXT,
+      allowNull: true
+    },
+    description: {
+      type: DataTypes.TEXT,
+      allowNull: true
+    },
+    image: {
+      type: DataTypes.TEXT,
+      allowNull: true
+    },
+    created_at: {
+      type: DataTypes.DATE,
+      defaultValue: DataTypes.NOW,
+      allowNull: false
+    },
+    created_by: {
+      type: DataTypes.TEXT,
+      allowNull: true
+    },
+    modified_at: {
+      type: DataTypes.DATE,
+      allowNull: true
+    },
+    modified_by: {
+      type: DataTypes.TEXT,
+      allowNull: true
+    },
+    archived: {
+      type: DataTypes.BOOLEAN,
+      defaultValue: false,
+      allowNull: false
+    }
+  }, {
+    tableName: 'links',
+    timestamps: false, // We're using created_at and modified_at manually
+    underscored: true
+  });
+
+  // Hook to set modified_at before update
+  Link.beforeUpdate((link) => {
+    link.modified_at = new Date();
+  });
+
+  return Link;
+};
+
--- a/models/LinkList.js
+++ b/models/LinkList.js
@@ -0,0 +1,33 @@
+const { DataTypes } = require('sequelize');
+
+module.exports = (sequelize) => {
+  const LinkList = sequelize.define('LinkList', {
+    link_id: {
+      type: DataTypes.UUID,
+      primaryKey: true,
+      references: {
+        model: 'links',
+        key: 'id'
+      },
+      onDelete: 'CASCADE',
+      onUpdate: 'CASCADE'
+    },
+    list_id: {
+      type: DataTypes.UUID,
+      primaryKey: true,
+      references: {
+        model: 'lists',
+        key: 'id'
+      },
+      onDelete: 'CASCADE',
+      onUpdate: 'CASCADE'
+    }
+  }, {
+    tableName: 'link_lists',
+    timestamps: false, // No timestamps on junction table
+    underscored: true
+  });
+
+  return LinkList;
+};
+
--- a/models/List.js
+++ b/models/List.js
@@ -0,0 +1,53 @@
+const { DataTypes } = require('sequelize');
+const { v4: uuidv4 } = require('uuid');
+
+module.exports = (sequelize) => {
+  const List = sequelize.define('List', {
+    id: {
+      type: DataTypes.UUID,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true
+    },
+    name: {
+      type: DataTypes.TEXT,
+      allowNull: false,
+      validate: {
+        notEmpty: true
+      }
+    },
+    created_at: {
+      type: DataTypes.DATE,
+      defaultValue: DataTypes.NOW,
+      allowNull: false
+    },
+    created_by: {
+      type: DataTypes.TEXT,
+      allowNull: true
+    },
+    modified_at: {
+      type: DataTypes.DATE,
+      allowNull: true
+    },
+    modified_by: {
+      type: DataTypes.TEXT,
+      allowNull: true
+    },
+    public: {
+      type: DataTypes.BOOLEAN,
+      defaultValue: false,
+      allowNull: false
+    }
+  }, {
+    tableName: 'lists',
+    timestamps: false, // We're using created_at and modified_at manually
+    underscored: true
+  });
+
+  // Hook to set modified_at before update
+  List.beforeUpdate((list) => {
+    list.modified_at = new Date();
+  });
+
+  return List;
+};
+
--- a/models/index.js
+++ b/models/index.js
@@ -0,0 +1,73 @@
+const { Sequelize } = require('sequelize');
+const Link = require('./Link');
+const List = require('./List');
+const LinkList = require('./LinkList');
+
+// Database connection configuration
+const getDatabaseConfig = () => {
+  // Support DATABASE_URL or individual connection parameters
+  if (process.env.DATABASE_URL) {
+    return {
+      url: process.env.DATABASE_URL,
+      dialect: 'postgres',
+      dialectOptions: {
+        ssl: process.env.DATABASE_SSL === 'true' ? {
+          require: true,
+          rejectUnauthorized: false
+        } : false
+      }
+    };
+  }
+
+  return {
+    host: process.env.DB_HOST || 'localhost',
+    port: process.env.DB_PORT || 5432,
+    database: process.env.DB_NAME || 'linkding',
+    username: process.env.DB_USER || 'postgres',
+    password: process.env.DB_PASSWORD || 'postgres',
+    dialect: 'postgres',
+    logging: process.env.NODE_ENV === 'development' ? console.log : false
+  };
+};
+
+// Initialize Sequelize
+const config = getDatabaseConfig();
+const sequelize = config.url
+  ? new Sequelize(config.url, {
+      dialect: 'postgres',
+      dialectOptions: config.dialectOptions,
+      logging: config.logging
+    })
+  : new Sequelize(config.database, config.username, config.password, {
+      host: config.host,
+      port: config.port,
+      dialect: config.dialect,
+      logging: config.logging
+    });
+
+// Initialize models
+const db = {
+  sequelize,
+  Sequelize,
+  Link: Link(sequelize),
+  List: List(sequelize),
+  LinkList: LinkList(sequelize)
+};
+
+// Set up associations
+db.Link.belongsToMany(db.List, {
+  through: db.LinkList,
+  foreignKey: 'link_id',
+  otherKey: 'list_id',
+  as: 'lists'
+});
+
+db.List.belongsToMany(db.Link, {
+  through: db.LinkList,
+  foreignKey: 'list_id',
+  otherKey: 'link_id',
+  as: 'links'
+});
+
+module.exports = db;
+
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,19 +1,27 @@
 {
  "name": "linkding",
-  "version": "1.0.0",
+  "version": "1.2.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "linkding",
-      "version": "1.0.0",
+      "version": "1.2.0",
      "license": "ISC",
      "dependencies": {
        "axios": "^1.6.0",
        "cheerio": "^1.0.0-rc.12",
        "cors": "^2.8.5",
+        "dotenv": "^17.2.3",
        "express": "^4.18.2",
-        "puppeteer-core": "^22.15.0"
+        "express-session": "^1.18.2",
+        "passport": "^0.7.0",
+        "passport-ldapauth": "^3.0.1",
+        "pg": "^8.11.3",
+        "pg-hstore": "^2.3.4",
+        "puppeteer-core": "^22.15.0",
+        "sequelize": "^6.35.2",
+        "uuid": "^9.0.1"
      },
      "devDependencies": {
        "nodemon": "^3.0.1"
@@ -25,16 +33,45 @@
      "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
      "license": "MIT"
    },
+    "node_modules/@types/debug": {
+      "version": "4.1.12",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
+      "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/ms": "*"
+      }
+    },
+    "node_modules/@types/ldapjs": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/@types/ldapjs/-/ldapjs-2.2.5.tgz",
+      "integrity": "sha512-Lv/nD6QDCmcT+V1vaTRnEKE8UgOilVv5pHcQuzkU1LcRe4mbHHuUo/KHi0LKrpdHhQY8FJzryF38fcVdeUIrzg==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/ms": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz",
+      "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==",
+      "license": "MIT"
+    },
    "node_modules/@types/node": {
      "version": "24.10.0",
      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.0.tgz",
      "integrity": "sha512-qzQZRBqkFsYyaSWXuEHc2WR9c0a0CXwiE5FWUvn7ZM+vdy1uZLfCunD38UzhuB7YN/J11ndbDBcTmOdxJo9Q7A==",
      "license": "MIT",
-      "optional": true,
      "dependencies": {
        "undici-types": "~7.16.0"
      }
    },
+    "node_modules/@types/validator": {
+      "version": "13.15.9",
+      "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.15.9.tgz",
+      "integrity": "sha512-9ENIuq9PUX45M1QRtfJDprgfErED4fBiMPmjlPci4W9WiBelVtHYCjF3xkQNcSnmUeuruLS1kH6hSl5M1vz4Sw==",
+      "license": "MIT"
+    },
    "node_modules/@types/yauzl": {
      "version": "2.10.3",
      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
@@ -45,6 +82,12 @@
        "@types/node": "*"
      }
    },
+    "node_modules/abstract-logging": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/abstract-logging/-/abstract-logging-2.0.1.tgz",
+      "integrity": "sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA==",
+      "license": "MIT"
+    },
    "node_modules/accepts": {
      "version": "1.3.8",
      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -111,6 +154,24 @@
      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
      "license": "MIT"
    },
+    "node_modules/asn1": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
+      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
    "node_modules/ast-types": {
      "version": "0.13.4",
      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
@@ -154,6 +215,18 @@
        }
      }
    },
+    "node_modules/backoff": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz",
+      "integrity": "sha512-wC5ihrnUXmR2douXmXLCe5O3zg3GKIyvRi/hi58a/XyRxVI+3/yM0PYueQOZXPXQ9pxBislYkw+sF9b7C/RuMA==",
+      "license": "MIT",
+      "dependencies": {
+        "precond": "0.2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
    "node_modules/balanced-match": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -281,6 +354,12 @@
        "node": ">=10.0.0"
      }
    },
+    "node_modules/bcryptjs": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz",
+      "integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==",
+      "license": "MIT"
+    },
    "node_modules/binary-extensions": {
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
@@ -599,6 +678,12 @@
      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
      "license": "MIT"
    },
+    "node_modules/core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+      "license": "MIT"
+    },
    "node_modules/cors": {
      "version": "2.8.5",
      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
@@ -761,6 +846,24 @@
        "url": "https://github.com/fb55/domutils?sponsor=1"
      }
    },
+    "node_modules/dotenv": {
+      "version": "17.2.3",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz",
+      "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
+    "node_modules/dottie": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.6.tgz",
+      "integrity": "sha512-iGCHkfUc5kFekGiqhe8B/mdaurD+lakO9txNnTvKtA6PISrw86LgqHvRzWYPyoE2Ph5aMIrCw9/uko6XHTKCwA==",
+      "license": "MIT"
+    },
    "node_modules/dunder-proto": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
@@ -1006,6 +1109,40 @@
        "url": "https://opencollective.com/express"
      }
    },
+    "node_modules/express-session": {
+      "version": "1.18.2",
+      "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.18.2.tgz",
+      "integrity": "sha512-SZjssGQC7TzTs9rpPDuUrR23GNZ9+2+IkA/+IJWmvQilTr5OSliEHGF+D9scbIpdC6yGtTI0/VhaHoVes2AN/A==",
+      "license": "MIT",
+      "dependencies": {
+        "cookie": "0.7.2",
+        "cookie-signature": "1.0.7",
+        "debug": "2.6.9",
+        "depd": "~2.0.0",
+        "on-headers": "~1.1.0",
+        "parseurl": "~1.3.3",
+        "safe-buffer": "5.2.1",
+        "uid-safe": "~2.1.5"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/express-session/node_modules/cookie": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/express-session/node_modules/cookie-signature": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz",
+      "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==",
+      "license": "MIT"
+    },
    "node_modules/extract-zip": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
@@ -1049,6 +1186,15 @@
      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
      "license": "MIT"
    },
+    "node_modules/extsprintf": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz",
+      "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==",
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "license": "MIT"
+    },
    "node_modules/fast-fifo": {
      "version": "1.3.2",
      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
@@ -1503,6 +1649,15 @@
      "dev": true,
      "license": "ISC"
    },
+    "node_modules/inflection": {
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.13.4.tgz",
+      "integrity": "sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw==",
+      "engines": [
+        "node >= 0.4.0"
+      ],
+      "license": "MIT"
+    },
    "node_modules/inherits": {
      "version": "2.0.4",
      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
@@ -1582,6 +1737,59 @@
        "node": ">=0.12.0"
      }
    },
+    "node_modules/ldap-filter": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/ldap-filter/-/ldap-filter-0.3.3.tgz",
+      "integrity": "sha512-/tFkx5WIn4HuO+6w9lsfxq4FN3O+fDZeO9Mek8dCD8rTUpqzRa766BOBO7BcGkn3X86m5+cBm1/2S/Shzz7gMg==",
+      "license": "MIT",
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/ldapauth-fork": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/ldapauth-fork/-/ldapauth-fork-5.0.5.tgz",
+      "integrity": "sha512-LWUk76+V4AOZbny/3HIPQtGPWZyA3SW2tRhsWIBi9imP22WJktKLHV1ofd8Jo/wY7Ve6vAT7FCI5mEn3blZTjw==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/ldapjs": "^2.2.2",
+        "bcryptjs": "^2.4.0",
+        "ldapjs": "^2.2.1",
+        "lru-cache": "^7.10.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/ldapjs": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/ldapjs/-/ldapjs-2.3.3.tgz",
+      "integrity": "sha512-75QiiLJV/PQqtpH+HGls44dXweviFwQ6SiIK27EqzKQ5jU/7UFrl2E5nLdQ3IYRBzJ/AVFJI66u0MZ0uofKYwg==",
+      "deprecated": "This package has been decomissioned. See https://github.com/ldapjs/node-ldapjs/blob/8ffd0bc9c149088a10ec4c1ec6a18450f76ad05d/README.md",
+      "license": "MIT",
+      "dependencies": {
+        "abstract-logging": "^2.0.0",
+        "asn1": "^0.2.4",
+        "assert-plus": "^1.0.0",
+        "backoff": "^2.5.0",
+        "ldap-filter": "^0.3.3",
+        "once": "^1.4.0",
+        "vasync": "^2.2.0",
+        "verror": "^1.8.1"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "license": "MIT"
+    },
    "node_modules/lru-cache": {
      "version": "7.18.3",
      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
@@ -1679,6 +1887,27 @@
      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
      "license": "MIT"
    },
+    "node_modules/moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/moment-timezone": {
+      "version": "0.5.48",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.48.tgz",
+      "integrity": "sha512-f22b8LV1gbTO2ms2j2z13MuPogNoh5UzxL3nzNAYKGraILnbGc9NEE6dyiiiLv46DGRb8A4kg8UKWLjPthxBHw==",
+      "license": "MIT",
+      "dependencies": {
+        "moment": "^2.29.4"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
    "node_modules/ms": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -1812,6 +2041,15 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/on-headers": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz",
+      "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
    "node_modules/once": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -1934,18 +2172,163 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/passport": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/passport/-/passport-0.7.0.tgz",
+      "integrity": "sha512-cPLl+qZpSc+ireUvt+IzqbED1cHHkDoVYMo30jbJIdOOjQ1MQYZBPiNvmi8UM6lJuOpTPXJGZQk0DtC4y61MYQ==",
+      "license": "MIT",
+      "dependencies": {
+        "passport-strategy": "1.x.x",
+        "pause": "0.0.1",
+        "utils-merge": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/jaredhanson"
+      }
+    },
+    "node_modules/passport-ldapauth": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/passport-ldapauth/-/passport-ldapauth-3.0.1.tgz",
+      "integrity": "sha512-TRRx3BHi8GC8MfCT9wmghjde/EGeKjll7zqHRRfGRxXbLcaDce2OftbQrFG7/AWaeFhR6zpZHtBQ/IkINdLVjQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ldapauth-fork": "^5.0.1",
+        "passport-strategy": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/passport-strategy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz",
+      "integrity": "sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
    "node_modules/path-to-regexp": {
      "version": "0.1.12",
      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
      "license": "MIT"
    },
+    "node_modules/pause": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
+      "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg=="
+    },
    "node_modules/pend": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
      "license": "MIT"
    },
+    "node_modules/pg": {
+      "version": "8.16.3",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz",
+      "integrity": "sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==",
+      "license": "MIT",
+      "dependencies": {
+        "pg-connection-string": "^2.9.1",
+        "pg-pool": "^3.10.1",
+        "pg-protocol": "^1.10.3",
+        "pg-types": "2.2.0",
+        "pgpass": "1.0.5"
+      },
+      "engines": {
+        "node": ">= 16.0.0"
+      },
+      "optionalDependencies": {
+        "pg-cloudflare": "^1.2.7"
+      },
+      "peerDependencies": {
+        "pg-native": ">=3.0.1"
+      },
+      "peerDependenciesMeta": {
+        "pg-native": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/pg-cloudflare": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.2.7.tgz",
+      "integrity": "sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg==",
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/pg-connection-string": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.9.1.tgz",
+      "integrity": "sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w==",
+      "license": "MIT"
+    },
+    "node_modules/pg-hstore": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/pg-hstore/-/pg-hstore-2.3.4.tgz",
+      "integrity": "sha512-N3SGs/Rf+xA1M2/n0JBiXFDVMzdekwLZLAO0g7mpDY9ouX+fDI7jS6kTq3JujmYbtNSJ53TJ0q4G98KVZSM4EA==",
+      "license": "MIT",
+      "dependencies": {
+        "underscore": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.8.x"
+      }
+    },
+    "node_modules/pg-int8": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
+      "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/pg-pool": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.10.1.tgz",
+      "integrity": "sha512-Tu8jMlcX+9d8+QVzKIvM/uJtp07PKr82IUOYEphaWcoBhIYkoHpLXN3qO59nAI11ripznDsEzEv8nUxBVWajGg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "pg": ">=8.0"
+      }
+    },
+    "node_modules/pg-protocol": {
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.10.3.tgz",
+      "integrity": "sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ==",
+      "license": "MIT"
+    },
+    "node_modules/pg-types": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
+      "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
+      "license": "MIT",
+      "dependencies": {
+        "pg-int8": "1.0.1",
+        "postgres-array": "~2.0.0",
+        "postgres-bytea": "~1.0.0",
+        "postgres-date": "~1.0.4",
+        "postgres-interval": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pgpass": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
+      "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
+      "license": "MIT",
+      "dependencies": {
+        "split2": "^4.1.0"
+      }
+    },
    "node_modules/picomatch": {
      "version": "2.3.1",
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
@@ -1959,6 +2342,53 @@
        "url": "https://github.com/sponsors/jonschlinkert"
      }
    },
+    "node_modules/postgres-array": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
+      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postgres-bytea": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
+      "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postgres-date": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
+      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postgres-interval": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
+      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
+      "license": "MIT",
+      "dependencies": {
+        "xtend": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/precond": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz",
+      "integrity": "sha512-QCYG84SgGyGzqJ/vlMsxeXd/pgL/I94ixdNFyh1PusWmTCyVfPJjZ1K1jvHtsbfnXQs2TSkEP2fR7QiMZAnKFQ==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
    "node_modules/progress": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@@ -2113,6 +2543,15 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/random-bytes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
+      "integrity": "sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
    "node_modules/range-parser": {
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@@ -2171,6 +2610,12 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/retry-as-promised": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-7.1.1.tgz",
+      "integrity": "sha512-hMD7odLOt3LkTjcif8aRZqi/hybjpLNgSk5oF5FCowfCjok6LukpN2bDX7R5wDmbgBQFn7YoBxSagmtXHaJYJw==",
+      "license": "MIT"
+    },
    "node_modules/safe-buffer": {
      "version": "5.2.1",
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -2248,6 +2693,109 @@
      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
      "license": "MIT"
    },
+    "node_modules/sequelize": {
+      "version": "6.37.7",
+      "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.37.7.tgz",
+      "integrity": "sha512-mCnh83zuz7kQxxJirtFD7q6Huy6liPanI67BSlbzSYgVNl5eXVdE2CN1FuAeZwG1SNpGsNRCV+bJAVVnykZAFA==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/sequelize"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@types/debug": "^4.1.8",
+        "@types/validator": "^13.7.17",
+        "debug": "^4.3.4",
+        "dottie": "^2.0.6",
+        "inflection": "^1.13.4",
+        "lodash": "^4.17.21",
+        "moment": "^2.29.4",
+        "moment-timezone": "^0.5.43",
+        "pg-connection-string": "^2.6.1",
+        "retry-as-promised": "^7.0.4",
+        "semver": "^7.5.4",
+        "sequelize-pool": "^7.1.0",
+        "toposort-class": "^1.0.1",
+        "uuid": "^8.3.2",
+        "validator": "^13.9.0",
+        "wkx": "^0.5.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ibm_db": {
+          "optional": true
+        },
+        "mariadb": {
+          "optional": true
+        },
+        "mysql2": {
+          "optional": true
+        },
+        "oracledb": {
+          "optional": true
+        },
+        "pg": {
+          "optional": true
+        },
+        "pg-hstore": {
+          "optional": true
+        },
+        "snowflake-sdk": {
+          "optional": true
+        },
+        "sqlite3": {
+          "optional": true
+        },
+        "tedious": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/sequelize-pool": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/sequelize-pool/-/sequelize-pool-7.1.0.tgz",
+      "integrity": "sha512-G9c0qlIWQSK29pR/5U2JF5dDQeqqHRragoyahj/Nx4KOOQ3CPPfzxnfqFPCSB7x5UgjOgnZ61nSxz+fjDpRlJg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/sequelize/node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/sequelize/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
+    "node_modules/sequelize/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
    "node_modules/serve-static": {
      "version": "1.16.2",
      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
@@ -2425,6 +2973,15 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/split2": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
+      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
+      "license": "ISC",
+      "engines": {
+        "node": ">= 10.x"
+      }
+    },
    "node_modules/statuses": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
@@ -2532,6 +3089,12 @@
        "node": ">=0.6"
      }
    },
+    "node_modules/toposort-class": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz",
+      "integrity": "sha512-OsLcGGbYF3rMjPUf8oKktyvCiUxSbqMMS39m33MAjLTC1DVIH6x3WSt63/M77ihI09+Sdfk1AXvfhCEeUmC7mg==",
+      "license": "MIT"
+    },
    "node_modules/touch": {
      "version": "3.1.1",
      "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz",
@@ -2561,6 +3124,18 @@
        "node": ">= 0.6"
      }
    },
+    "node_modules/uid-safe": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
+      "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==",
+      "license": "MIT",
+      "dependencies": {
+        "random-bytes": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
    "node_modules/unbzip2-stream": {
      "version": "1.4.3",
      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
@@ -2578,6 +3153,12 @@
      "dev": true,
      "license": "MIT"
    },
+    "node_modules/underscore": {
+      "version": "1.13.7",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz",
+      "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==",
+      "license": "MIT"
+    },
    "node_modules/undici": {
      "version": "7.16.0",
      "resolved": "https://registry.npmjs.org/undici/-/undici-7.16.0.tgz",
@@ -2591,8 +3172,7 @@
      "version": "7.16.0",
      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
-      "license": "MIT",
-      "optional": true
+      "license": "MIT"
    },
    "node_modules/unpipe": {
      "version": "1.0.0",
@@ -2618,6 +3198,28 @@
        "node": ">= 0.4.0"
      }
    },
+    "node_modules/uuid": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/validator": {
+      "version": "13.15.23",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-13.15.23.tgz",
+      "integrity": "sha512-4yoz1kEWqUjzi5zsPbAS/903QXSYp0UOtHsPpp7p9rHAw/W+dkInskAE386Fat3oKRROwO98d9ZB0G4cObgUyw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
    "node_modules/vary": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -2627,6 +3229,46 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/vasync": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/vasync/-/vasync-2.2.1.tgz",
+      "integrity": "sha512-Hq72JaTpcTFdWiNA4Y22Amej2GH3BFmBaKPPlDZ4/oC8HNn2ISHLkFrJU4Ds8R3jcUi7oo5Y9jcMHKjES+N9wQ==",
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "verror": "1.10.0"
+      }
+    },
+    "node_modules/vasync/node_modules/verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "node_modules/verror": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz",
+      "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==",
+      "license": "MIT",
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
    "node_modules/whatwg-encoding": {
      "version": "3.1.1",
      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
@@ -2648,6 +3290,15 @@
        "node": ">=18"
      }
    },
+    "node_modules/wkx": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.5.0.tgz",
+      "integrity": "sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
    "node_modules/wrap-ansi": {
      "version": "7.0.0",
      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -2692,6 +3343,15 @@
        }
      }
    },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
    "node_modules/y18n": {
      "version": "5.0.8",
      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "linkding",
-  "version": "1.0.0",
+  "version": "1.2.0",
  "description": "A modern link bookmarking app with metadata extraction",
  "main": "server.js",
  "scripts": {
@@ -18,8 +18,16 @@
    "axios": "^1.6.0",
    "cheerio": "^1.0.0-rc.12",
    "cors": "^2.8.5",
+    "dotenv": "^17.2.3",
    "express": "^4.18.2",
-    "puppeteer-core": "^22.15.0"
+    "express-session": "^1.18.2",
+    "passport": "^0.7.0",
+    "passport-ldapauth": "^3.0.1",
+    "pg": "^8.11.3",
+    "pg-hstore": "^2.3.4",
+    "puppeteer-core": "^22.15.0",
+    "sequelize": "^6.35.2",
+    "uuid": "^9.0.1"
  },
  "devDependencies": {
    "nodemon": "^3.0.1"
--- a/public/app.js
+++ b/public/app.js
--- a/public/index.html
+++ b/public/index.html
@@ -18,8 +18,8 @@
        <div class="header-container">
            <div class="header-row">
                <div class="header-left">
-                <h1 class="app-title">
-                    <span class="title-text">🔗 Links</span>
+                <h1 class="app-title" id="appLogo">
+                    <span class="title-text"><img src="/icon-192.png" alt="LinkDing" class="title-icon"></span>
                </h1>
            </div>
            <div class="header-right">
@@ -29,11 +29,14 @@
                        <path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path>
                    </svg>
                </button>
-                <button id="archiveToggle" class="archive-toggle-btn" title="Toggle archived links">
+                <button id="listsToggle" class="lists-toggle-btn" title="Manage lists">
                    <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                        <path d="M21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16z"/>
-                        <polyline points="3.27 6.96 12 12.01 20.73 6.96"/>
-                        <line x1="12" y1="22.08" x2="12" y2="12"/>
+                        <line x1="5" y1="6" x2="19" y2="6"></line>
+                        <line x1="5" y1="12" x2="19" y2="12"></line>
+                        <line x1="5" y1="18" x2="19" y2="18"></line>
+                        <line x1="2" y1="6" x2="2.01" y2="6"></line>
+                        <line x1="2" y1="12" x2="2.01" y2="12"></line>
+                        <line x1="2" y1="18" x2="2.01" y2="18"></line>
                    </svg>
                </button>
                <div class="layout-toggle-wrapper">
@@ -72,6 +75,22 @@
                        <path d="m21 21-4.35-4.35"></path>
                    </svg>
                </button>
+                <button id="loginToggle" class="login-toggle-btn" title="Login">
+                    <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                        <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"></path>
+                        <circle cx="12" cy="7" r="4"></circle>
+                    </svg>
+                </button>
+                <div id="userInfo" class="user-info" style="display: none;">
+                    <span id="usernameDisplay"></span>
+                    <button id="logoutBtn" class="logout-btn" title="Logout">
+                        <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                            <path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path>
+                            <polyline points="16 17 21 12 16 7"></polyline>
+                            <line x1="21" y1="12" x2="9" y2="12"></line>
+                        </svg>
+                    </button>
+                </div>
            </div>
            </div>
            <div class="header-fields-container">
@@ -112,10 +131,128 @@
                        autocomplete="off"
                    >
                </div>
+                <div class="list-filter-wrapper" id="listFilterWrapper">
+                    <div class="list-filter-header">
+                        <span class="list-filter-label"><b>Lists</b></span>
+                        <div class="list-filter-actions">
+                            <label class="archive-toggle-switch" title="Show archived links">
+                                <input type="checkbox" id="archiveToggle">
+                                <span class="archive-toggle-slider"></span>
+                                <span class="archive-toggle-label">Archive</span>
+                            </label>
+                            <button id="editListsBtn" class="edit-lists-btn" title="Manage lists">
+                                <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                                    <path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"></path>
+                                    <path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"></path>
+                                </svg>
+                                <span>Edit</span>
+                            </button>
+                            <button id="clearListFilters" class="clear-list-filters-btn" title="Clear filters">Clear</button>
+                        </div>
+                    </div>
+                    <div class="list-filter-chips" id="listFilterChips">
+                        <!-- List filter chips will be inserted here -->
+                    </div>
+                </div>
            </div>
        </div>
    </header>

+    <!-- Login Modal -->
+    <div id="loginModal" class="login-modal">
+        <div class="login-modal-content">
+            <div class="login-modal-header">
+                <h2>Login</h2>
+                <button id="closeLoginModal" class="close-modal-btn">
+                    <svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                        <line x1="18" y1="6" x2="6" y2="18"></line>
+                        <line x1="6" y1="6" x2="18" y2="18"></line>
+                    </svg>
+                </button>
+            </div>
+            <div class="login-modal-body">
+                <form id="loginForm" class="login-form">
+                    <div class="form-group">
+                        <label for="loginUsername">Username</label>
+                        <input 
+                            type="text" 
+                            id="loginUsername" 
+                            placeholder="Enter username" 
+                            required
+                            autocomplete="username"
+                        >
+                    </div>
+                    <div class="form-group">
+                        <label for="loginPassword">Password</label>
+                        <input 
+                            type="password" 
+                            id="loginPassword" 
+                            placeholder="Enter password" 
+                            required
+                            autocomplete="current-password"
+                        >
+                    </div>
+                    <div id="loginError" class="login-error" style="display: none;"></div>
+                    <button type="submit" id="loginSubmitBtn" class="btn-login">
+                        <span class="btn-text">Login</span>
+                        <span class="btn-loader" style="display: none;">
+                            <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                                <path d="M21 12a9 9 0 1 1-6.219-8.56"/>
+                            </svg>
+                        </span>
+                    </button>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <!-- Lists Management Modal -->
+    <div id="listsModal" class="lists-modal">
+        <div class="lists-modal-content">
+            <div class="lists-modal-header">
+                <h2>Manage Lists</h2>
+                <button id="closeListsModal" class="close-modal-btn">
+                    <svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                        <line x1="18" y1="6" x2="6" y2="18"></line>
+                        <line x1="6" y1="6" x2="18" y2="18"></line>
+                    </svg>
+                </button>
+            </div>
+            <div class="lists-modal-body">
+                <div class="create-list-form">
+                    <input 
+                        type="text" 
+                        id="newListName" 
+                        placeholder="Enter list name..." 
+                        autocomplete="off"
+                    >
+                    <button id="createListBtn" class="btn-create-list">Create List</button>
+                </div>
+                <div class="lists-list" id="listsList">
+                    <!-- Lists will be inserted here -->
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- List Selection Overlay -->
+    <div id="listSelectionOverlay" class="list-selection-overlay">
+        <div class="list-selection-content">
+            <div class="list-selection-header">
+                <h3>Add to Lists</h3>
+                <button id="closeListSelection" class="close-overlay-btn">
+                    <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                        <line x1="18" y1="6" x2="6" y2="18"></line>
+                        <line x1="6" y1="6" x2="18" y2="18"></line>
+                    </svg>
+                </button>
+            </div>
+            <div class="list-selection-body" id="listSelectionBody">
+                <!-- List checkboxes will be inserted here -->
+            </div>
+        </div>
+    </div>
+
    <div class="container">
        <div id="linksContainer" class="links-container">
            <div class="empty-state">
--- a/public/styles.css
+++ b/public/styles.css
--- a/public/sw.js
+++ b/public/sw.js
@@ -1,4 +1,4 @@
-const CACHE_NAME = 'linkding-v1';
+const CACHE_NAME = 'linkding-v2.0.1';
 const urlsToCache = [
  '/',
  '/index.html',
@@ -36,12 +36,14 @@ self.addEventListener('activate', (event) => {
          }
        })
      );
+    }).then(() => {
+      // Claim all clients immediately to ensure new service worker takes control
+      return self.clients.claim();
    })
  );
-  return self.clients.claim();
 });

-// Fetch event - serve from cache, fallback to network
+// Fetch event - network first for HTML/CSS/JS, cache first for images
 self.addEventListener('fetch', (event) => {
  // API requests - always fetch from network, don't cache
  if (event.request.url.includes('/api/')) {
@@ -49,12 +51,17 @@ self.addEventListener('fetch', (event) => {
    return;
  }

-  // Static assets - cache first, then network
-  event.respondWith(
-    caches.match(event.request)
-      .then((response) => {
-        // Return cached version or fetch from network
-        return response || fetch(event.request).then((response) => {
+  const url = new URL(event.request.url);
+  const isHTML = event.request.destination === 'document' || url.pathname === '/' || url.pathname.endsWith('.html');
+  const isCSS = url.pathname.endsWith('.css');
+  const isJS = url.pathname.endsWith('.js');
+  const isImage = event.request.destination === 'image' || url.pathname.match(/\.(png|jpg|jpeg|gif|svg|webp|ico)$/i);
+
+  // For HTML, CSS, and JS: Network first, then cache (for offline support)
+  if (isHTML || isCSS || isJS) {
+    event.respondWith(
+      fetch(event.request)
+        .then((response) => {
          // Don't cache non-successful responses
          if (!response || response.status !== 200 || response.type !== 'basic') {
            return response;
@@ -69,14 +76,55 @@ self.addEventListener('fetch', (event) => {
            });

          return response;
-        });
-      })
-      .catch(() => {
-        // If both cache and network fail, return offline page if available
-        if (event.request.destination === 'document') {
-          return caches.match('/index.html');
-        }
-      })
-  );
+        })
+        .catch(() => {
+          // Network failed, try cache
+          return caches.match(event.request).then((response) => {
+            // If it's a document request and cache fails, return index.html
+            if (!response && isHTML) {
+              return caches.match('/index.html');
+            }
+            return response;
+          });
+        })
+    );
+    return;
+  }
+
+  // For images and other static assets: Cache first, then network
+  if (isImage) {
+    event.respondWith(
+      caches.match(event.request)
+        .then((response) => {
+          // Return cached version or fetch from network
+          return response || fetch(event.request).then((response) => {
+            // Don't cache non-successful responses
+            if (!response || response.status !== 200 || response.type !== 'basic') {
+              return response;
+            }
+
+            // Clone the response
+            const responseToCache = response.clone();
+
+            caches.open(CACHE_NAME)
+              .then((cache) => {
+                cache.put(event.request, responseToCache);
+              });
+
+            return response;
+          });
+        })
+        .catch(() => {
+          // If both cache and network fail, return offline page if available
+          if (event.request.destination === 'document') {
+            return caches.match('/index.html');
+          }
+        })
+    );
+    return;
+  }
+
+  // For other requests: Network first
+  event.respondWith(fetch(event.request));
 });

--- a/server.js
+++ b/server.js
@@ -1,9 +1,17 @@
+require('dotenv').config();
 const express = require('express');
 const cors = require('cors');
+const session = require('express-session');
+const passport = require('passport');
+const LdapStrategy = require('passport-ldapauth').Strategy;
 const fs = require('fs').promises;
 const path = require('path');
 const axios = require('axios');
 const cheerio = require('cheerio');
+const { Op } = require('sequelize');
+const db = require('./models');
+const MigrationRunner = require('./migrations/runner');
+const { v4: uuidv4 } = require('uuid');

 // Lazy load puppeteer (only if needed)
 let puppeteer = null;
@@ -64,40 +72,290 @@ function findChromeExecutable() {
 const app = express();
 const PORT = process.env.PORT || 3000;
 const DATA_FILE = path.join(__dirname, 'data', 'links.json');
+const LISTS_FILE = path.join(__dirname, 'data', 'lists.json');
+
+// Trust proxy - required when behind reverse proxy (Traefik)
+// This allows Express to trust X-Forwarded-* headers
+app.set('trust proxy', process.env.TRUST_PROXY !== 'false'); // Default to true, set to 'false' to disable
+
+// Session configuration
+const isSecure = process.env.COOKIE_SECURE === 'true' || 
+                 (process.env.COOKIE_SECURE !== 'false' && process.env.NODE_ENV === 'production');
+
+app.use(session({
+  secret: process.env.SESSION_SECRET || 'your-secret-key-change-this-in-production',
+  resave: false,
+  saveUninitialized: false,
+  name: process.env.SESSION_NAME || 'connect.sid', // Custom session name to avoid conflicts
+  cookie: {
+    secure: isSecure, // Use secure cookies when behind HTTPS proxy
+    httpOnly: true,
+    maxAge: 24 * 60 * 60 * 1000, // 24 hours
+    sameSite: process.env.COOKIE_SAMESITE || (isSecure ? 'none' : 'lax'), // 'none' for cross-site, 'lax' for same-site
+    domain: process.env.COOKIE_DOMAIN || undefined, // Set if cookies need to be shared across subdomains
+    path: process.env.COOKIE_PATH || '/' // Cookie path
+  }
+}));
+
+// Initialize Passport
+app.use(passport.initialize());
+app.use(passport.session());
+
+// Configure LDAP Strategy
+// Combine base DN with additional users DN if provided
+const baseDN = process.env.LDAP_BASE_DN;
+const additionalUsersDN = process.env.LDAP_ADDITIONAL_USERS_DN || '';
+const searchBase = additionalUsersDN && baseDN
+  ? `${additionalUsersDN},${baseDN}` 
+  : baseDN;
+
+const searchAttributes = [];
+if (process.env.LDAP_ATTRIBUTE_USERNAME) {
+  searchAttributes.push(process.env.LDAP_ATTRIBUTE_USERNAME);
+}
+if (process.env.LDAP_ATTRIBUTE_MAIL) {
+  searchAttributes.push(process.env.LDAP_ATTRIBUTE_MAIL);
+}
+if (process.env.LDAP_ATTRIBUTE_DISTINGUISHED_NAME) {
+  searchAttributes.push(process.env.LDAP_ATTRIBUTE_DISTINGUISHED_NAME);
+}
+if (process.env.LDAP_ATTRIBUTE_MEMBER_OF) {
+  searchAttributes.push(process.env.LDAP_ATTRIBUTE_MEMBER_OF);
+}
+
+const ldapOptions = {
+  server: {
+    url: process.env.LDAP_ADDRESS,
+    bindDN: process.env.LDAP_USER,
+    bindCredentials: process.env.LDAP_PASSWORD,
+    searchBase: searchBase,
+    searchFilter: process.env.LDAP_USERS_FILTER,
+    searchAttributes: searchAttributes.length > 0 ? searchAttributes : undefined,
+    timeout: process.env.LDAP_TIMEOUT ? parseInt(process.env.LDAP_TIMEOUT) : undefined,
+    connectTimeout: process.env.LDAP_TIMEOUT ? parseInt(process.env.LDAP_TIMEOUT) : undefined,
+    tlsOptions: {
+      rejectUnauthorized: process.env.LDAP_TLS_SKIP_VERIFY !== 'true',
+      servername: process.env.LDAP_TLS_SERVER_NAME || undefined
+    }
+  },
+  usernameField: 'username',
+  passwordField: 'password'
+};
+
+// Replace {username} placeholder in search filter
+if (ldapOptions.server.searchFilter && ldapOptions.server.searchFilter.includes('{{username}}')) {
+  // Keep as is, passport-ldapauth will replace it
+} else if (ldapOptions.server.searchFilter && ldapOptions.server.searchFilter.includes('{username_attribute}')) {
+  // Replace with actual attribute name
+  const usernameAttr = process.env.LDAP_ATTRIBUTE_USERNAME;
+  if (usernameAttr) {
+    ldapOptions.server.searchFilter = ldapOptions.server.searchFilter.replace('{username_attribute}', usernameAttr);
+    ldapOptions.server.searchFilter = ldapOptions.server.searchFilter.replace('{input}', '{{username}}');
+  }
+}
+
+passport.use(new LdapStrategy(ldapOptions, (user, done) => {
+  // User object contains LDAP user data
+  const usernameAttr = process.env.LDAP_ATTRIBUTE_USERNAME;
+  const mailAttr = process.env.LDAP_ATTRIBUTE_MAIL;
+  const dnAttr = process.env.LDAP_ATTRIBUTE_DISTINGUISHED_NAME;
+  
+  return done(null, {
+    id: usernameAttr ? user[usernameAttr] : user.uid,
+    username: usernameAttr ? user[usernameAttr] : user.uid,
+    email: mailAttr ? user[mailAttr] : user.mail,
+    dn: dnAttr ? user[dnAttr] : user.dn
+  });
+}));
+
+// Serialize user for session
+passport.serializeUser((user, done) => {
+  done(null, user);
+});
+
+// Deserialize user from session
+passport.deserializeUser((user, done) => {
+  done(null, user);
+});

 // Middleware
-app.use(cors());
+app.use(cors({
+  origin: true,
+  credentials: true
+}));
 app.use(express.json());
 app.use(express.static('public'));

-// Ensure data directory exists
-async function ensureDataDir() {
-  const dataDir = path.dirname(DATA_FILE);
-  try {
-    await fs.access(dataDir);
-  } catch {
-    await fs.mkdir(dataDir, { recursive: true });
-  }
-  try {
-    await fs.access(DATA_FILE);
-  } catch {
-    await fs.writeFile(DATA_FILE, JSON.stringify([]));
+// Authentication middleware
+function isAuthenticated(req, res, next) {
+  if (req.isAuthenticated()) {
+    return next();
  }
+  res.status(401).json({ error: 'Authentication required' });
 }

-// Read links from file
-async function readLinks() {
+// Database initialization and migration
+async function initializeDatabase() {
  try {
-    const data = await fs.readFile(DATA_FILE, 'utf8');
-    return JSON.parse(data);
+    // Test database connection
+    await db.sequelize.authenticate();
+    console.log('Database connection established successfully.');
+
+    // Run migrations
+    const migrationRunner = new MigrationRunner(db.sequelize);
+    await migrationRunner.runMigrations();
+
+    // Migrate JSON files if they exist
+    await migrateJsonFiles();
+
+    console.log('Database initialization completed.');
  } catch (error) {
-    return [];
+    console.error('Database initialization failed:', error);
+    throw error;
  }
 }

-// Write links to file
-async function writeLinks(links) {
-  await fs.writeFile(DATA_FILE, JSON.stringify(links, null, 2));
+// Migrate JSON files to database
+async function migrateJsonFiles() {
+  const linksFile = DATA_FILE;
+  const listsFile = LISTS_FILE;
+  const linksBackup = linksFile + '.bak';
+  const listsBackup = listsFile + '.bak';
+
+  // Check if files have already been migrated
+  let linksAlreadyMigrated = false;
+  let listsAlreadyMigrated = false;
+  
+  try {
+    await fs.access(linksBackup);
+    linksAlreadyMigrated = true;
+  } catch {
+    // Not migrated yet
+  }
+  
+  try {
+    await fs.access(listsBackup);
+    listsAlreadyMigrated = true;
+  } catch {
+    // Not migrated yet
+  }
+
+  // Step 1: Migrate lists first (so we can create relationships)
+  const listIdMap = new Map(); // Map old ID -> new UUID
+  
+  if (!listsAlreadyMigrated) {
+    try {
+      await fs.access(listsFile);
+      const listsData = JSON.parse(await fs.readFile(listsFile, 'utf8'));
+      
+      if (Array.isArray(listsData) && listsData.length > 0) {
+        console.log(`Migrating ${listsData.length} lists from JSON file...`);
+        
+        for (const list of listsData) {
+          const newId = uuidv4();
+          listIdMap.set(list.id, newId);
+          
+          await db.List.create({
+            id: newId,
+            name: list.name,
+            created_at: list.createdAt ? new Date(list.createdAt) : new Date(),
+            created_by: null, // No user info in JSON
+            public: list.public || false
+          });
+        }
+        
+        // Rename file to backup
+        await fs.rename(listsFile, listsBackup);
+        console.log('Lists migration completed.');
+      }
+    } catch (error) {
+      if (error.code !== 'ENOENT') {
+        console.error('Error migrating lists:', error);
+      }
+    }
+  }
+
+  // Step 2: Migrate links and set up relationships
+  if (!linksAlreadyMigrated) {
+    try {
+      await fs.access(linksFile);
+      const linksData = JSON.parse(await fs.readFile(linksFile, 'utf8'));
+      
+      if (Array.isArray(linksData) && linksData.length > 0) {
+        console.log(`Migrating ${linksData.length} links from JSON file...`);
+        
+        for (const link of linksData) {
+          // Create link
+          const linkRecord = await db.Link.create({
+            id: uuidv4(),
+            url: link.url,
+            title: link.title || null,
+            description: link.description || null,
+            image: link.image || null,
+            created_at: link.createdAt ? new Date(link.createdAt) : new Date(),
+            created_by: null, // No user info in JSON
+            archived: link.archived || false
+          });
+
+          // Create relationships if listIds exist
+          if (link.listIds && Array.isArray(link.listIds) && link.listIds.length > 0) {
+            const listRecords = [];
+            for (const oldListId of link.listIds) {
+              const newListId = listIdMap.get(oldListId);
+              if (newListId) {
+                const listRecord = await db.List.findByPk(newListId);
+                if (listRecord) {
+                  listRecords.push(listRecord);
+                }
+              }
+            }
+            if (listRecords.length > 0) {
+              await linkRecord.setLists(listRecords);
+            }
+          }
+        }
+        
+        // Rename file to backup
+        await fs.rename(linksFile, linksBackup);
+        console.log('Links migration completed.');
+      }
+    } catch (error) {
+      if (error.code !== 'ENOENT') {
+        console.error('Error migrating links:', error);
+      }
+    }
+  }
+}
+
+// Helper function to format link for API response
+function formatLink(link) {
+  const formatted = {
+    id: link.id,
+    url: link.url,
+    title: link.title,
+    description: link.description,
+    image: link.image,
+    createdAt: link.created_at,
+    createdBy: link.created_by,
+    modifiedAt: link.modified_at,
+    modifiedBy: link.modified_by,
+    archived: link.archived || false,
+    listIds: link.lists ? link.lists.map(list => list.id) : []
+  };
+  return formatted;
+}
+
+// Helper function to format list for API response
+function formatList(list) {
+  return {
+    id: list.id,
+    name: list.name,
+    createdAt: list.created_at,
+    createdBy: list.created_by,
+    modifiedAt: list.modified_at,
+    modifiedBy: list.modified_by,
+    public: list.public || false
+  };
 }

 // Extract metadata using Puppeteer (for JavaScript-heavy sites)
@@ -568,14 +826,89 @@ async function extractMetadata(url) {
  }
 }

+// Authentication Routes
+
+// Check authentication status
+app.get('/api/auth/status', (req, res) => {
+  res.json({
+    authenticated: req.isAuthenticated(),
+    user: req.isAuthenticated() ? req.user : null
+  });
+});
+
+// Login endpoint
+app.post('/api/auth/login', (req, res, next) => {
+  passport.authenticate('ldapauth', (err, user, info) => {
+    if (err) {
+      console.error('LDAP authentication error:', err);
+      return res.status(500).json({ error: 'Authentication failed', details: err.message });
+    }
+    if (!user) {
+      return res.status(401).json({ error: 'Invalid credentials' });
+    }
+    req.logIn(user, (loginErr) => {
+      if (loginErr) {
+        return res.status(500).json({ error: 'Login failed', details: loginErr.message });
+      }
+      return res.json({
+        authenticated: true,
+        user: user
+      });
+    });
+  })(req, res, next);
+});
+
+// Logout endpoint
+app.post('/api/auth/logout', (req, res) => {
+  req.logout((err) => {
+    if (err) {
+      return res.status(500).json({ error: 'Logout failed' });
+    }
+    res.json({ authenticated: false });
+  });
+});
+
 // API Routes

 // Get all links
 app.get('/api/links', async (req, res) => {
  try {
-    const links = await readLinks();
-    res.json(links);
+    let links;
+    
+    // If user is not authenticated, only show links in public lists
+    if (!req.isAuthenticated()) {
+      // Get all public lists
+      const publicLists = await db.List.findAll({
+        where: { public: true }
+      });
+      const publicListIds = publicLists.map(list => list.id);
+      
+      // Get links that are in at least one public list
+      links = await db.Link.findAll({
+        include: [{
+          model: db.List,
+          as: 'lists',
+          where: { id: { [Op.in]: publicListIds } },
+          required: true,
+          attributes: ['id']
+        }],
+        order: [['created_at', 'DESC']]
+      });
+    } else {
+      // Authenticated users see all links
+      links = await db.Link.findAll({
+        include: [{
+          model: db.List,
+          as: 'lists',
+          attributes: ['id']
+        }],
+        order: [['created_at', 'DESC']]
+      });
+    }
+    
+    res.json(links.map(formatLink));
  } catch (error) {
+    console.error('Error fetching links:', error);
    res.status(500).json({ error: 'Failed to read links' });
  }
 });
@@ -584,27 +917,57 @@ app.get('/api/links', async (req, res) => {
 app.get('/api/links/search', async (req, res) => {
  try {
    const query = req.query.q?.toLowerCase() || '';
-    const links = await readLinks();
    
-    if (!query) {
-      return res.json(links);
+    const whereClause = {};
+    if (query) {
+      whereClause[Op.or] = [
+        { title: { [Op.iLike]: `%${query}%` } },
+        { description: { [Op.iLike]: `%${query}%` } },
+        { url: { [Op.iLike]: `%${query}%` } }
+      ];
    }
    
-    const filtered = links.filter(link => {
-      const titleMatch = link.title?.toLowerCase().includes(query);
-      const descMatch = link.description?.toLowerCase().includes(query);
-      const urlMatch = link.url?.toLowerCase().includes(query);
-      return titleMatch || descMatch || urlMatch;
-    });
+    let links;
    
-    res.json(filtered);
+    // If user is not authenticated, only show links in public lists
+    if (!req.isAuthenticated()) {
+      const publicLists = await db.List.findAll({
+        where: { public: true }
+      });
+      const publicListIds = publicLists.map(list => list.id);
+      
+      links = await db.Link.findAll({
+        where: whereClause,
+        include: [{
+          model: db.List,
+          as: 'lists',
+          where: { id: { [Op.in]: publicListIds } },
+          required: true,
+          attributes: ['id']
+        }],
+        order: [['created_at', 'DESC']]
+      });
+    } else {
+      links = await db.Link.findAll({
+        where: whereClause,
+        include: [{
+          model: db.List,
+          as: 'lists',
+          attributes: ['id']
+        }],
+        order: [['created_at', 'DESC']]
+      });
+    }
+    
+    res.json(links.map(formatLink));
  } catch (error) {
+    console.error('Error searching links:', error);
    res.status(500).json({ error: 'Failed to search links' });
  }
 });

 // Add a new link
-app.post('/api/links', async (req, res) => {
+app.post('/api/links', isAuthenticated, async (req, res) => {
  try {
    const { url } = req.body;
    
@@ -613,8 +976,7 @@ app.post('/api/links', async (req, res) => {
    }
    
    // Check if link already exists
-    const links = await readLinks();
-    const existingLink = links.find(link => link.url === url);
+    const existingLink = await db.Link.findOne({ where: { url } });
    if (existingLink) {
      return res.status(409).json({ error: 'Link already exists' });
    }
@@ -623,19 +985,19 @@ app.post('/api/links', async (req, res) => {
    const metadata = await extractMetadata(url);
    
    // Create new link
-    const newLink = {
-      id: Date.now().toString(),
+    const newLink = await db.Link.create({
      url: url,
      title: metadata.title,
      description: metadata.description,
      image: metadata.image,
-      createdAt: new Date().toISOString()
-    };
+      created_by: req.user?.username || null,
+      archived: false
+    });
    
-    links.unshift(newLink); // Add to beginning
-    await writeLinks(links);
+    // Reload with associations to get listIds
+    await newLink.reload({ include: [{ model: db.List, as: 'lists', attributes: ['id'] }] });
    
-    res.status(201).json(newLink);
+    res.status(201).json(formatLink(newLink));
  } catch (error) {
    console.error('Error adding link:', error);
    res.status(500).json({ error: 'Failed to add link' });
@@ -643,7 +1005,7 @@ app.post('/api/links', async (req, res) => {
 });

 // Archive/Unarchive a link
-app.patch('/api/links/:id/archive', async (req, res) => {
+app.patch('/api/links/:id/archive', isAuthenticated, async (req, res) => {
  try {
    const { id } = req.params;
    const { archived } = req.body;
@@ -652,40 +1014,237 @@ app.patch('/api/links/:id/archive', async (req, res) => {
      return res.status(400).json({ error: 'archived must be a boolean' });
    }
    
-    const links = await readLinks();
-    const linkIndex = links.findIndex(link => link.id === id);
+    const link = await db.Link.findByPk(id, {
+      include: [{ model: db.List, as: 'lists', attributes: ['id'] }]
+    });
    
-    if (linkIndex === -1) {
+    if (!link) {
      return res.status(404).json({ error: 'Link not found' });
    }
    
-    links[linkIndex].archived = archived;
-    await writeLinks(links);
+    await link.update({
+      archived: archived,
+      modified_by: req.user?.username || null
+    });
    
-    res.json(links[linkIndex]);
+    await link.reload({ include: [{ model: db.List, as: 'lists', attributes: ['id'] }] });
+    
+    res.json(formatLink(link));
  } catch (error) {
+    console.error('Error updating link:', error);
    res.status(500).json({ error: 'Failed to update link' });
  }
 });

 // Delete a link
-app.delete('/api/links/:id', async (req, res) => {
+app.delete('/api/links/:id', isAuthenticated, async (req, res) => {
  try {
    const { id } = req.params;
-    const links = await readLinks();
-    const filtered = links.filter(link => link.id !== id);
+    const link = await db.Link.findByPk(id);
    
-    if (filtered.length === links.length) {
+    if (!link) {
      return res.status(404).json({ error: 'Link not found' });
    }
    
-    await writeLinks(filtered);
+    await link.destroy();
    res.json({ message: 'Link deleted successfully' });
  } catch (error) {
+    console.error('Error deleting link:', error);
    res.status(500).json({ error: 'Failed to delete link' });
  }
 });

+// Update link's lists
+app.patch('/api/links/:id/lists', isAuthenticated, async (req, res) => {
+  try {
+    const { id } = req.params;
+    const { listIds } = req.body;
+    
+    if (!Array.isArray(listIds)) {
+      return res.status(400).json({ error: 'listIds must be an array' });
+    }
+    
+    const link = await db.Link.findByPk(id);
+    
+    if (!link) {
+      return res.status(404).json({ error: 'Link not found' });
+    }
+    
+    // Find all lists by IDs
+    const lists = await db.List.findAll({
+      where: { id: { [Op.in]: listIds } }
+    });
+    
+    // Update relationships
+    await link.setLists(lists);
+    
+    // Update modified fields
+    await link.update({
+      modified_by: req.user?.username || null
+    });
+    
+    // Reload with associations
+    await link.reload({ include: [{ model: db.List, as: 'lists', attributes: ['id'] }] });
+    
+    res.json(formatLink(link));
+  } catch (error) {
+    console.error('Error updating link lists:', error);
+    res.status(500).json({ error: 'Failed to update link lists' });
+  }
+});
+
+// Lists API Routes
+
+// Get all lists
+app.get('/api/lists', async (req, res) => {
+  try {
+    let lists;
+    
+    // If user is not authenticated, only return public lists
+    if (!req.isAuthenticated()) {
+      lists = await db.List.findAll({
+        where: { public: true },
+        order: [['created_at', 'DESC']]
+      });
+    } else {
+      // Authenticated users see all lists
+      lists = await db.List.findAll({
+        order: [['created_at', 'DESC']]
+      });
+    }
+    
+    res.json(lists.map(formatList));
+  } catch (error) {
+    console.error('Error fetching lists:', error);
+    res.status(500).json({ error: 'Failed to read lists' });
+  }
+});
+
+// Create a new list
+app.post('/api/lists', isAuthenticated, async (req, res) => {
+  try {
+    const { name } = req.body;
+    
+    if (!name || typeof name !== 'string' || name.trim().length === 0) {
+      return res.status(400).json({ error: 'List name is required' });
+    }
+    
+    const trimmedName = name.trim();
+    
+    // Check if list with same name already exists (case-insensitive)
+    const existingList = await db.List.findOne({
+      where: {
+        name: { [Op.iLike]: trimmedName }
+      }
+    });
+    
+    if (existingList) {
+      return res.status(409).json({ error: 'List with this name already exists' });
+    }
+    
+    const newList = await db.List.create({
+      name: trimmedName,
+      created_by: req.user?.username || null,
+      public: false
+    });
+    
+    res.status(201).json(formatList(newList));
+  } catch (error) {
+    console.error('Error creating list:', error);
+    res.status(500).json({ error: 'Failed to create list' });
+  }
+});
+
+// Update a list
+app.put('/api/lists/:id', isAuthenticated, async (req, res) => {
+  try {
+    const { id } = req.params;
+    const { name } = req.body;
+    
+    if (!name || typeof name !== 'string' || name.trim().length === 0) {
+      return res.status(400).json({ error: 'List name is required' });
+    }
+    
+    const list = await db.List.findByPk(id);
+    
+    if (!list) {
+      return res.status(404).json({ error: 'List not found' });
+    }
+    
+    const trimmedName = name.trim();
+    
+    // Check if another list with same name exists (case-insensitive)
+    const existingList = await db.List.findOne({
+      where: {
+        id: { [Op.ne]: id },
+        name: { [Op.iLike]: trimmedName }
+      }
+    });
+    
+    if (existingList) {
+      return res.status(409).json({ error: 'List with this name already exists' });
+    }
+    
+    await list.update({
+      name: trimmedName,
+      modified_by: req.user?.username || null
+    });
+    
+    res.json(formatList(list));
+  } catch (error) {
+    console.error('Error updating list:', error);
+    res.status(500).json({ error: 'Failed to update list' });
+  }
+});
+
+// Toggle list public status
+app.patch('/api/lists/:id/public', isAuthenticated, async (req, res) => {
+  try {
+    const { id } = req.params;
+    const { public: isPublic } = req.body;
+    
+    if (typeof isPublic !== 'boolean') {
+      return res.status(400).json({ error: 'public must be a boolean' });
+    }
+    
+    const list = await db.List.findByPk(id);
+    
+    if (!list) {
+      return res.status(404).json({ error: 'List not found' });
+    }
+    
+    await list.update({
+      public: isPublic,
+      modified_by: req.user?.username || null
+    });
+    
+    res.json(formatList(list));
+  } catch (error) {
+    console.error('Error updating list public status:', error);
+    res.status(500).json({ error: 'Failed to update list public status' });
+  }
+});
+
+// Delete a list
+app.delete('/api/lists/:id', isAuthenticated, async (req, res) => {
+  try {
+    const { id } = req.params;
+    const list = await db.List.findByPk(id);
+    
+    if (!list) {
+      return res.status(404).json({ error: 'List not found' });
+    }
+    
+    // CASCADE delete will automatically remove from link_lists junction table
+    await list.destroy();
+    
+    res.json({ message: 'List deleted successfully' });
+  } catch (error) {
+    console.error('Error deleting list:', error);
+    res.status(500).json({ error: 'Failed to delete list' });
+  }
+});
+
 // Helper function to validate URL
 function isValidUrl(string) {
  try {
@@ -698,10 +1257,18 @@ function isValidUrl(string) {

 // Initialize server
 async function startServer() {
-  await ensureDataDir();
-  app.listen(PORT, () => {
-    console.log(`LinkDing server running on http://localhost:${PORT}`);
-  });
+  try {
+    // Initialize database (connect, run migrations, migrate JSON files)
+    await initializeDatabase();
+    
+    // Start server
+    app.listen(PORT, () => {
+      console.log(`LinkDing server running on http://localhost:${PORT}`);
+    });
+  } catch (error) {
+    console.error('Failed to start server:', error);
+    process.exit(1);
+  }
 }

 startServer();
Author	SHA1	Message	Date
0x1d	674efefc0c	chore: version bump	2025-11-16 10:36:56 +01:00
master	0e582595f7	Merge pull request 'feat: database' (#2 ) from feature/db into main Reviewed-on: #2	2025-11-16 10:35:55 +01:00
0x1d	1417023395	feat: database	2025-11-16 10:33:59 +01:00
master	3cf9601a71	Merge pull request 'feat: auth' (#1 ) from feature/auth into main Reviewed-on: #1	2025-11-16 09:40:33 +01:00
0x1d	2ea90554ef	feat: auth	2025-11-16 07:49:19 +01:00
0x1d	3c372878a3	feat: UX improvements for list handling	2025-11-15 19:21:40 +01:00
0x1d	3378a13fe4	feat: lists	2025-11-15 19:11:07 +01:00