diff --git a/apps/api/src/app.module.ts b/apps/api/src/app.module.ts
index 1e8cd43..87d40ee 100644
--- a/apps/api/src/app.module.ts
+++ b/apps/api/src/app.module.ts
@@ -5,6 +5,8 @@ import { join } from 'path';
 import { AuthModule } from './auth/auth.module';
 import { UsersModule } from './users/users.module';
 import { CoursesModule } from './courses/courses.module';
+import { CatalogModule } from './catalog/catalog.module';
+import { EnrollmentModule } from './enrollment/enrollment.module';
 import { GenerationModule } from './generation/generation.module';
 import { PaymentsModule } from './payments/payments.module';
 import { SearchModule } from './search/search.module';
@@ -38,6 +40,8 @@ import { PrismaModule } from './common/prisma/prisma.module';
     AuthModule,
     UsersModule,
     CoursesModule,
+    CatalogModule,
+    EnrollmentModule,
     GenerationModule,
     PaymentsModule,
     SearchModule,
diff --git a/apps/api/src/catalog/catalog.controller.ts b/apps/api/src/catalog/catalog.controller.ts
new file mode 100644
index 0000000..33b0774
--- /dev/null
+++ b/apps/api/src/catalog/catalog.controller.ts
@@ -0,0 +1,46 @@
+import { Controller, Get, Post, Patch, Param, Query, HttpCode, HttpStatus } from '@nestjs/common';
+import { ApiTags, ApiOperation, ApiBearerAuth, ApiQuery } from '@nestjs/swagger';
+import { CatalogService } from './catalog.service';
+import { CurrentUser } from '../auth/decorators/current-user.decorator';
+import { Public } from '../auth/decorators/public.decorator';
+import { User } from '@coursecraft/database';
+
+@ApiTags('catalog')
+@Controller('catalog')
+export class CatalogController {
+  constructor(private catalogService: CatalogService) {}
+
+  @Public()
+  @Get()
+  @ApiOperation({ summary: 'Browse published courses (public)' })
+  async browseCourses(
+    @Query('page') page?: number,
+    @Query('limit') limit?: number,
+    @Query('search') search?: string,
+    @Query('difficulty') difficulty?: string,
+  ): Promise<any> {
+    return this.catalogService.getPublishedCourses({ page, limit, search, difficulty });
+  }
+
+  @Public()
+  @Get(':id')
+  @ApiOperation({ summary: 'Get public course details' })
+  async getCourse(@Param('id') id: string): Promise<any> {
+    return this.catalogService.getPublicCourse(id);
+  }
+
+  @Post(':id/submit')
+  @ApiBearerAuth()
+  @HttpCode(HttpStatus.OK)
+  @ApiOperation({ summary: 'Submit course for review / publish' })
+  async submitForReview(@Param('id') id: string, @CurrentUser() user: User): Promise<any> {
+    return this.catalogService.publishCourse(id, user.id);
+  }
+
+  @Patch(':id/verify')
+  @ApiBearerAuth()
+  @ApiOperation({ summary: 'Toggle author verification badge' })
+  async toggleVerify(@Param('id') id: string, @CurrentUser() user: User): Promise<any> {
+    return this.catalogService.toggleVerification(id, user.id);
+  }
+}
diff --git a/apps/api/src/catalog/catalog.module.ts b/apps/api/src/catalog/catalog.module.ts
new file mode 100644
index 0000000..161cdd6
--- /dev/null
+++ b/apps/api/src/catalog/catalog.module.ts
@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common';
+import { CatalogController } from './catalog.controller';
+import { CatalogService } from './catalog.service';
+
+@Module({
+  controllers: [CatalogController],
+  providers: [CatalogService],
+  exports: [CatalogService],
+})
+export class CatalogModule {}
diff --git a/apps/api/src/catalog/catalog.service.ts b/apps/api/src/catalog/catalog.service.ts
new file mode 100644
index 0000000..5953d3f
--- /dev/null
+++ b/apps/api/src/catalog/catalog.service.ts
@@ -0,0 +1,122 @@
+import { Injectable } from '@nestjs/common';
+import { PrismaService } from '../common/prisma/prisma.service';
+import { CourseStatus } from '@coursecraft/database';
+
+@Injectable()
+export class CatalogService {
+  constructor(private prisma: PrismaService) {}
+
+  async getPublishedCourses(options?: {
+    page?: number;
+    limit?: number;
+    category?: string;
+    difficulty?: string;
+    search?: string;
+  }): Promise<any> {
+    const page = options?.page || 1;
+    const limit = options?.limit || 20;
+    const skip = (page - 1) * limit;
+
+    const where: any = {
+      status: CourseStatus.PUBLISHED,
+      isPublished: true,
+    };
+    if (options?.category) where.categoryId = options.category;
+    if (options?.difficulty) where.difficulty = options.difficulty;
+    if (options?.search) {
+      where.OR = [
+        { title: { contains: options.search, mode: 'insensitive' } },
+        { description: { contains: options.search, mode: 'insensitive' } },
+      ];
+    }
+
+    const [courses, total] = await Promise.all([
+      this.prisma.course.findMany({
+        where,
+        include: {
+          author: { select: { id: true, name: true, avatarUrl: true } },
+          _count: { select: { chapters: true, reviews: true, enrollments: true } },
+          chapters: { include: { _count: { select: { lessons: true } } } },
+        },
+        orderBy: { createdAt: 'desc' },
+        skip,
+        take: limit,
+      }),
+      this.prisma.course.count({ where }),
+    ]);
+
+    const data = courses.map((c) => ({
+      id: c.id,
+      title: c.title,
+      description: c.description,
+      slug: c.slug,
+      coverImage: c.coverImage,
+      price: c.price,
+      currency: c.currency,
+      difficulty: c.difficulty,
+      estimatedHours: c.estimatedHours,
+      tags: c.tags,
+      isVerified: c.isVerified,
+      averageRating: c.averageRating,
+      enrollmentCount: c._count.enrollments,
+      reviewCount: c._count.reviews,
+      chaptersCount: c._count.chapters,
+      lessonsCount: c.chapters.reduce((acc, ch) => acc + ch._count.lessons, 0),
+      author: c.author,
+      publishedAt: c.publishedAt,
+    }));
+
+    return { data, meta: { page, limit, total, totalPages: Math.ceil(total / limit) } };
+  }
+
+  async getPublicCourse(courseId: string): Promise<any> {
+    return this.prisma.course.findFirst({
+      where: { id: courseId, status: CourseStatus.PUBLISHED, isPublished: true },
+      include: {
+        author: { select: { id: true, name: true, avatarUrl: true } },
+        chapters: {
+          include: {
+            lessons: { select: { id: true, title: true, order: true, durationMinutes: true }, orderBy: { order: 'asc' } },
+          },
+          orderBy: { order: 'asc' },
+        },
+        reviews: {
+          where: { isApproved: true },
+          include: { user: { select: { id: true, name: true, avatarUrl: true } } },
+          orderBy: { createdAt: 'desc' },
+          take: 20,
+        },
+        _count: { select: { reviews: true, enrollments: true } },
+      },
+    });
+  }
+
+  async submitForReview(courseId: string, userId: string): Promise<any> {
+    return this.prisma.course.update({
+      where: { id: courseId, authorId: userId },
+      data: { status: CourseStatus.PENDING_REVIEW },
+    });
+  }
+
+  async publishCourse(courseId: string, userId: string): Promise<any> {
+    return this.prisma.course.update({
+      where: { id: courseId, authorId: userId },
+      data: {
+        status: CourseStatus.PUBLISHED,
+        isPublished: true,
+        publishedAt: new Date(),
+      },
+    });
+  }
+
+  async toggleVerification(courseId: string, userId: string): Promise<any> {
+    const course = await this.prisma.course.findFirst({
+      where: { id: courseId, authorId: userId },
+    });
+    if (!course) return null;
+    return this.prisma.course.update({
+      where: { id: courseId },
+      data: { isVerified: !course.isVerified },
+    });
+  }
+}
diff --git a/apps/api/src/courses/lessons.controller.ts b/apps/api/src/courses/lessons.controller.ts
index f49db66..bb21c87 100644
--- a/apps/api/src/courses/lessons.controller.ts
+++ b/apps/api/src/courses/lessons.controller.ts
@@ -64,4 +64,10 @@ export class LessonsController {
   ): Promise<any> {
     return this.lessonsService.reorder(chapterId, user.id, lessonIds);
   }
+
+  @Get('lessons/:lessonId/quiz')
+  @ApiOperation({ summary: 'Generate quiz for a lesson' })
+  async generateQuiz(@Param('lessonId') lessonId: string): Promise<any> {
+    return this.lessonsService.generateQuiz(lessonId);
+  }
 }
diff --git a/apps/api/src/courses/lessons.service.ts b/apps/api/src/courses/lessons.service.ts
index 01bf297..9c71a78 100644
--- a/apps/api/src/courses/lessons.service.ts
+++ b/apps/api/src/courses/lessons.service.ts
@@ -138,4 +138,36 @@ export class LessonsService {
       orderBy: { order: 'asc' },
     });
   }
+
+  async generateQuiz(lessonId: string): Promise<any> {
+    const lesson = await this.prisma.lesson.findUnique({ where: { id: lessonId } });
+    if (!lesson) throw new NotFoundException('Lesson not found');
+
+    // Mock quiz - in production, parse lesson.content and call AI to generate questions
+    return {
+      questions: [
+        {
+          id: '1',
+          type: 'multiple_choice',
+          question: 'Какой из следующих вариантов верен?',
+          options: ['Вариант A', 'Вариант B', 'Вариант C', 'Вариант D'],
+          correctAnswer: 0,
+        },
+        {
+          id: '2',
+          type: 'multiple_choice',
+          question: 'Выберите правильный ответ:',
+          options: ['Ответ 1', 'Ответ 2', 'Ответ 3'],
+          correctAnswer: 1,
+        },
+        {
+          id: '3',
+          type: 'multiple_choice',
+          question: 'Что из перечисленного правильно?',
+          options: ['Первое', 'Второе', 'Третье', 'Четвёртое'],
+          correctAnswer: 2,
+        },
+      ],
+    };
+  }
 }
diff --git a/apps/api/src/enrollment/enrollment.controller.ts b/apps/api/src/enrollment/enrollment.controller.ts
new file mode 100644
index 0000000..daa967b
--- /dev/null
+++ b/apps/api/src/enrollment/enrollment.controller.ts
@@ -0,0 +1,84 @@
+import {
+  Controller,
+  Post,
+  Get,
+  Param,
+  Body,
+  Query,
+  HttpCode,
+  HttpStatus,
+} from '@nestjs/common';
+import { ApiTags, ApiOperation, ApiBearerAuth } from '@nestjs/swagger';
+import { EnrollmentService } from './enrollment.service';
+import { CurrentUser } from '../auth/decorators/current-user.decorator';
+import { User } from '@coursecraft/database';
+
+@ApiTags('enrollment')
+@Controller('enrollment')
+@ApiBearerAuth()
+export class EnrollmentController {
+  constructor(private enrollmentService: EnrollmentService) {}
+
+  @Post(':courseId/enroll')
+  @HttpCode(HttpStatus.CREATED)
+  @ApiOperation({ summary: 'Enroll in a course' })
+  async enroll(@Param('courseId') courseId: string, @CurrentUser() user: User): Promise<any> {
+    return this.enrollmentService.enroll(user.id, courseId);
+  }
+
+  @Get()
+  @ApiOperation({ summary: 'Get my enrolled courses' })
+  async myEnrollments(@CurrentUser() user: User): Promise<any> {
+    return this.enrollmentService.getUserEnrollments(user.id);
+  }
+
+  @Get(':courseId/progress')
+  @ApiOperation({ summary: 'Get my progress for a course' })
+  async getProgress(@Param('courseId') courseId: string, @CurrentUser() user: User): Promise<any> {
+    return this.enrollmentService.getProgress(user.id, courseId);
+  }
+
+  @Post(':courseId/lessons/:lessonId/complete')
+  @HttpCode(HttpStatus.OK)
+  @ApiOperation({ summary: 'Mark a lesson as completed' })
+  async completeLesson(
+    @Param('courseId') courseId: string,
+    @Param('lessonId') lessonId: string,
+    @CurrentUser() user: User,
+  ): Promise<any> {
+    return this.enrollmentService.completeLesson(user.id, courseId, lessonId);
+  }
+
+  @Post(':courseId/lessons/:lessonId/quiz')
+  @HttpCode(HttpStatus.OK)
+  @ApiOperation({ summary: 'Submit quiz score' })
+  async submitQuiz(
+    @Param('courseId') courseId: string,
+    @Param('lessonId') lessonId: string,
+    @Body('score') score: number,
+    @CurrentUser() user: User,
+  ): Promise<any> {
+    return this.enrollmentService.saveQuizScore(user.id, courseId, lessonId, score);
+  }
+
+  @Post(':courseId/review')
+  @HttpCode(HttpStatus.CREATED)
+  @ApiOperation({ summary: 'Leave a review' })
+  async createReview(
+    @Param('courseId') courseId: string,
+    @Body() body: { rating: number; title?: string; content?: string },
+    @CurrentUser() user: User,
+  ): Promise<any> {
+    return this.enrollmentService.createReview(user.id, courseId, body.rating, body.title, body.content);
+  }
+
+  @Get(':courseId/reviews')
+  @ApiOperation({ summary: 'Get course reviews' })
+  async getReviews(
+    @Param('courseId') courseId: string,
+    @Query('page') page?: number,
+    @Query('limit') limit?: number,
+  ): Promise<any> {
+    return this.enrollmentService.getCourseReviews(courseId, page, limit);
+  }
+}
diff --git a/apps/api/src/enrollment/enrollment.module.ts b/apps/api/src/enrollment/enrollment.module.ts
new file mode 100644
index 0000000..0742ccc
--- /dev/null
+++ b/apps/api/src/enrollment/enrollment.module.ts
@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common';
+import { EnrollmentController } from './enrollment.controller';
+import { EnrollmentService } from './enrollment.service';
+
+@Module({
+  controllers: [EnrollmentController],
+  providers: [EnrollmentService],
+  exports: [EnrollmentService],
+})
+export class EnrollmentModule {}
diff --git a/apps/api/src/enrollment/enrollment.service.ts b/apps/api/src/enrollment/enrollment.service.ts
new file mode 100644
index 0000000..32bc951
--- /dev/null
+++ b/apps/api/src/enrollment/enrollment.service.ts
@@ -0,0 +1,140 @@
+import { Injectable, NotFoundException, ConflictException } from '@nestjs/common';
+import { PrismaService } from '../common/prisma/prisma.service';
+
+@Injectable()
+export class EnrollmentService {
+  constructor(private prisma: PrismaService) {}
+
+  async enroll(userId: string, courseId: string): Promise<any> {
+    const existing = await this.prisma.enrollment.findUnique({
+      where: { userId_courseId: { userId, courseId } },
+    });
+    if (existing) throw new ConflictException('Already enrolled');
+
+    return this.prisma.enrollment.create({
+      data: { userId, courseId },
+      include: { course: { select: { id: true, title: true, slug: true } } },
+    });
+  }
+
+  async getUserEnrollments(userId: string): Promise<any> {
+    return this.prisma.enrollment.findMany({
+      where: { userId },
+      include: {
+        course: {
+          include: {
+            author: { select: { id: true, name: true, avatarUrl: true } },
+            _count: { select: { chapters: true } },
+            chapters: { include: { _count: { select: { lessons: true } } } },
+          },
+        },
+      },
+      orderBy: { updatedAt: 'desc' },
+    });
+  }
+
+  async completeLesson(userId: string, courseId: string, lessonId: string): Promise<any> {
+    const enrollment = await this.prisma.enrollment.findUnique({
+      where: { userId_courseId: { userId, courseId } },
+    });
+    if (!enrollment) throw new NotFoundException('Not enrolled in this course');
+
+    const progress = await this.prisma.lessonProgress.upsert({
+      where: { userId_lessonId: { userId, lessonId } },
+      create: {
+        userId,
+        enrollmentId: enrollment.id,
+        lessonId,
+        completedAt: new Date(),
+      },
+      update: {
+        completedAt: new Date(),
+      },
+    });
+
+    await this.recalculateProgress(enrollment.id, courseId);
+    return progress;
+  }
+
+  async saveQuizScore(userId: string, courseId: string, lessonId: string, score: number): Promise<any> {
+    const enrollment = await this.prisma.enrollment.findUnique({
+      where: { userId_courseId: { userId, courseId } },
+    });
+    if (!enrollment) throw new NotFoundException('Not enrolled in this course');
+
+    return this.prisma.lessonProgress.upsert({
+      where: { userId_lessonId: { userId, lessonId } },
+      create: {
+        userId,
+        enrollmentId: enrollment.id,
+        lessonId,
+        quizScore: score,
+        completedAt: new Date(),
+      },
+      update: { quizScore: score },
+    });
+  }
+
+  async getProgress(userId: string, courseId: string): Promise<any> {
+    return this.prisma.enrollment.findUnique({
+      where: { userId_courseId: { userId, courseId } },
+      include: { lessons: true },
+    });
+  }
+
+  async createReview(userId: string, courseId: string, rating: number, title?: string, content?: string): Promise<any> {
+    const review = await this.prisma.review.upsert({
+      where: { userId_courseId: { userId, courseId } },
+      create: { userId, courseId, rating, title, content },
+      update: { rating, title, content },
+    });
+
+    // Recalculate avg rating
+    const result = await this.prisma.review.aggregate({
+      where: { courseId, isApproved: true },
+      _avg: { rating: true },
+    });
+    if (result._avg.rating !== null) {
+      await this.prisma.course.update({
+        where: { id: courseId },
+        data: { averageRating: result._avg.rating },
+      });
+    }
+
+    return review;
+  }
+
+  async getCourseReviews(courseId: string, page = 1, limit = 20): Promise<any> {
+    const skip = (page - 1) * limit;
+    const [reviews, total] = await Promise.all([
+      this.prisma.review.findMany({
+        where: { courseId, isApproved: true },
+        include: { user: { select: { id: true, name: true, avatarUrl: true } } },
+        orderBy: { createdAt: 'desc' },
+        skip,
+        take: limit,
+      }),
+      this.prisma.review.count({ where: { courseId, isApproved: true } }),
+    ]);
+    return { data: reviews, meta: { page, limit, total } };
+  }
+
+  private async recalculateProgress(enrollmentId: string, courseId: string): Promise<void> {
+    const totalLessons = await this.prisma.lesson.count({
+      where: { chapter: { courseId } },
+    });
+    const completedLessons = await this.prisma.lessonProgress.count({
+      where: { enrollmentId, completedAt: { not: null } },
+    });
+
+    const progress = totalLessons > 0 ? Math.round((completedLessons / totalLessons) * 100) : 0;
+
+    await this.prisma.enrollment.update({
+      where: { id: enrollmentId },
+      data: {
+        progress,
+        completedAt: progress >= 100 ? new Date() : null,
+      },
+    });
+  }
+}
diff --git a/apps/web/src/app/(dashboard)/dashboard/catalog/[id]/page.tsx b/apps/web/src/app/(dashboard)/dashboard/catalog/[id]/page.tsx
new file mode 100644
index 0000000..d27197a
--- /dev/null
+++ b/apps/web/src/app/(dashboard)/dashboard/catalog/[id]/page.tsx
@@ -0,0 +1,297 @@
+'use client';
+
+import { useEffect, useState } from 'react';
+import { useParams, useRouter } from 'next/navigation';
+import {
+  ArrowLeft,
+  BookOpen,
+  Clock,
+  Users,
+  Star,
+  Shield,
+  Check,
+  Loader2,
+  ChevronDown,
+} from 'lucide-react';
+import Link from 'next/link';
+import { Button } from '@/components/ui/button';
+import { Card, CardContent } from '@/components/ui/card';
+import { Progress } from '@/components/ui/progress';
+import { api } from '@/lib/api';
+import { useAuth } from '@/contexts/auth-context';
+import { useToast } from '@/components/ui/use-toast';
+import { cn } from '@/lib/utils';
+
+export default function PublicCoursePage() {
+  const params = useParams();
+  const router = useRouter();
+  const { toast } = useToast();
+  const { user } = useAuth();
+  const id = params?.id as string;
+
+  const [course, setCourse] = useState<any>(null);
+  const [reviews, setReviews] = useState<any[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [enrolling, setEnrolling] = useState(false);
+  const [enrolled, setEnrolled] = useState(false);
+
+  useEffect(() => {
+    if (!id) return;
+    (async () => {
+      setLoading(true);
+      try {
+        const [courseData, reviewsData] = await Promise.all([
+          api.getPublicCourse(id),
+          api.getCourseReviews(id).catch(() => ({ data: [] })),
+        ]);
+        setCourse(courseData);
+        setReviews(reviewsData.data || []);
+        
+        // Check if already enrolled
+        if (user) {
+          const enrollments = await api.getMyEnrollments().catch(() => []);
+          setEnrolled(enrollments.some((e: any) => e.course.id === id));
+        }
+      } catch {
+        setCourse(null);
+      } finally {
+        setLoading(false);
+      }
+    })();
+  }, [id, user]);
+
+  const handleEnroll = async () => {
+    if (!id || enrolling) return;
+    setEnrolling(true);
+    try {
+      await api.enrollInCourse(id);
+      toast({ title: 'Успех', description: 'Вы записались на курс' });
+      router.push(`/dashboard/courses/${id}`);
+    } catch (e: any) {
+      toast({ title: 'Ошибка', description: e.message, variant: 'destructive' });
+    } finally {
+      setEnrolling(false);
+    }
+  };
+
+  if (loading) {
+    return (
+      <div className="flex items-center justify-center min-h-[400px]">
+        <Loader2 className="h-8 w-8 animate-spin text-muted-foreground" />
+      </div>
+    );
+  }
+
+  if (!course) {
+    return (
+      <div className="text-center py-20">
+        <p className="text-muted-foreground">Курс не найден</p>
+        <Link href="/dashboard/catalog" className="text-primary hover:underline mt-2 inline-block">
+          Вернуться к каталогу
+        </Link>
+      </div>
+    );
+  }
+
+  const totalLessons = course.chapters.reduce((acc: number, ch: any) => acc + ch.lessons.length, 0);
+
+  return (
+    <div className="max-w-5xl mx-auto space-y-6">
+      {/* Header */}
+      <Button variant="ghost" size="sm" asChild>
+        <Link href="/dashboard/catalog">
+          <ArrowLeft className="mr-2 h-4 w-4" />
+          К каталогу
+        </Link>
+      </Button>
+
+      {/* Course header */}
+      <div className="grid md:grid-cols-3 gap-6">
+        <div className="md:col-span-2 space-y-4">
+          {/* Cover */}
+          <div className="aspect-video rounded-xl bg-gradient-to-br from-primary/20 to-primary/5 overflow-hidden">
+            {course.coverImage ? (
+              <img src={course.coverImage} alt={course.title} className="w-full h-full object-cover" />
+            ) : (
+              <div className="flex items-center justify-center h-full">
+                <BookOpen className="h-16 w-16 text-primary/30" />
+              </div>
+            )}
+          </div>
+
+          {/* Title & meta */}
+          <div>
+            <div className="flex items-center gap-2 mb-2">
+              {course.isVerified && (
+                <div className="flex items-center gap-1 px-2 py-0.5 rounded-full bg-blue-600 text-white text-xs font-medium">
+                  <Shield className="h-3 w-3" />
+                  Проверен автором
+                </div>
+              )}
+              {course.difficulty && (
+                <span className="px-2 py-0.5 rounded-full bg-muted text-xs font-medium">
+                  {course.difficulty === 'beginner' ? 'Начинающий' : course.difficulty === 'intermediate' ? 'Средний' : 'Продвинутый'}
+                </span>
+              )}
+            </div>
+            <h1 className="text-3xl font-bold">{course.title}</h1>
+            <p className="text-muted-foreground mt-2">{course.description}</p>
+          </div>
+
+          {/* Stats */}
+          <div className="flex items-center gap-4 text-sm">
+            {course.averageRating && (
+              <div className="flex items-center gap-1 text-yellow-600 font-medium">
+                <Star className="h-4 w-4 fill-current" />
+                {course.averageRating.toFixed(1)} ({course._count.reviews} отзывов)
+              </div>
+            )}
+            <span className="flex items-center gap-1 text-muted-foreground">
+              <Users className="h-4 w-4" />
+              {course._count.enrollments} студентов
+            </span>
+            <span className="text-muted-foreground">{totalLessons} уроков</span>
+            {course.estimatedHours && (
+              <span className="flex items-center gap-1 text-muted-foreground">
+                <Clock className="h-4 w-4" />
+                {course.estimatedHours}ч
+              </span>
+            )}
+          </div>
+
+          <div className="h-px bg-border my-4" />
+
+          {/* Author */}
+          <div className="flex items-center gap-3">
+            <div className="h-12 w-12 rounded-full bg-primary/10 flex items-center justify-center font-bold text-primary">
+              {course.author.name?.[0] || 'A'}
+            </div>
+            <div>
+              <p className="text-sm font-medium">{course.author.name || 'Автор'}</p>
+              <p className="text-xs text-muted-foreground">Преподаватель</p>
+            </div>
+          </div>
+        </div>
+
+        {/* Sidebar: Enroll / Price */}
+        <div className="md:col-span-1">
+          <Card className="sticky top-4">
+            <CardContent className="p-6 space-y-4">
+              <div>
+                <p className="text-3xl font-bold">
+                  {course.price ? `${course.price} ${course.currency}` : 'Бесплатно'}
+                </p>
+              </div>
+              {enrolled ? (
+                <Button className="w-full" asChild>
+                  <Link href={`/dashboard/courses/${id}`}>Продолжить обучение</Link>
+                </Button>
+              ) : (
+                <Button className="w-full" onClick={handleEnroll} disabled={enrolling}>
+                  {enrolling ? <Loader2 className="mr-2 h-4 w-4 animate-spin" /> : null}
+                  {course.price ? 'Купить курс' : 'Записаться'}
+                </Button>
+              )}
+              <div className="space-y-2 text-sm">
+                <div className="flex items-center gap-2">
+                  <Check className="h-4 w-4 text-green-600" />
+                  <span>{course.chapters.length} глав</span>
+                </div>
+                <div className="flex items-center gap-2">
+                  <Check className="h-4 w-4 text-green-600" />
+                  <span>{totalLessons} видеоуроков</span>
+                </div>
+                <div className="flex items-center gap-2">
+                  <Check className="h-4 w-4 text-green-600" />
+                  <span>Сертификат по окончании</span>
+                </div>
+                <div className="flex items-center gap-2">
+                  <Check className="h-4 w-4 text-green-600" />
+                  <span>Пожизненный доступ</span>
+                </div>
+              </div>
+            </CardContent>
+          </Card>
+        </div>
+      </div>
+
+      {/* Course content (chapters & lessons) */}
+      <Card>
+        <CardContent className="p-6">
+          <h2 className="text-xl font-semibold mb-4">Содержание курса</h2>
+          <div className="space-y-2">
+            {course.chapters.map((chapter: any) => {
+              const [expanded, setExpanded] = useState(false);
+              return (
+                <div key={chapter.id} className="border rounded-lg overflow-hidden">
+                  <button
+                    className="flex items-center justify-between w-full p-4 hover:bg-muted/50 transition-colors"
+                    onClick={() => setExpanded(!expanded)}
+                  >
+                    <div className="flex items-center gap-3">
+                      <BookOpen className="h-4 w-4 text-primary" />
+                      <span className="font-medium">{chapter.title}</span>
+                    </div>
+                    <div className="flex items-center gap-2 text-sm text-muted-foreground">
+                      <span>{chapter.lessons.length} уроков</span>
+                      <ChevronDown className={cn('h-4 w-4 transition-transform', expanded && 'rotate-180')} />
+                    </div>
+                  </button>
+                  {expanded && (
+                    <div className="border-t bg-muted/20 p-2">
+                      {chapter.lessons.map((lesson: any) => (
+                        <div key={lesson.id} className="flex items-center gap-2 px-3 py-2 text-sm">
+                          <Check className="h-3.5 w-3.5 text-muted-foreground" />
+                          <span>{lesson.title}</span>
+                          {lesson.durationMinutes && (
+                            <span className="ml-auto text-xs text-muted-foreground">{lesson.durationMinutes} мин</span>
+                          )}
+                        </div>
+                      ))}
+                    </div>
+                  )}
+                </div>
+              );
+            })}
+          </div>
+        </CardContent>
+      </Card>
+
+      {/* Reviews */}
+      {reviews.length > 0 && (
+        <Card>
+          <CardContent className="p-6">
+            <h2 className="text-xl font-semibold mb-4">Отзывы студентов</h2>
+            <div className="space-y-4">
+              {reviews.map((review: any) => (
+                <div key={review.id} className="border-b last:border-b-0 pb-4 last:pb-0">
+                  <div className="flex items-center gap-3 mb-2">
+                    <div className="h-10 w-10 rounded-full bg-primary/10 flex items-center justify-center font-bold text-primary text-sm">
+                      {review.user.name?.[0] || 'U'}
+                    </div>
+                    <div className="flex-1">
+                      <p className="font-medium text-sm">{review.user.name || 'Пользователь'}</p>
+                      <div className="flex items-center gap-1">
+                        {Array.from({ length: 5 }).map((_, i) => (
+                          <Star
+                            key={i}
+                            className={cn(
+                              'h-3.5 w-3.5',
+                              i < review.rating ? 'text-yellow-500 fill-current' : 'text-muted-foreground/30'
+                            )}
+                          />
+                        ))}
+                      </div>
+                    </div>
+                  </div>
+                  {review.title && <p className="font-medium text-sm mb-1">{review.title}</p>}
+                  {review.content && <p className="text-sm text-muted-foreground">{review.content}</p>}
+                </div>
+              ))}
+            </div>
+          </CardContent>
+        </Card>
+      )}
+    </div>
+  );
+}
diff --git a/apps/web/src/app/(dashboard)/dashboard/catalog/page.tsx b/apps/web/src/app/(dashboard)/dashboard/catalog/page.tsx
new file mode 100644
index 0000000..7b6a904
--- /dev/null
+++ b/apps/web/src/app/(dashboard)/dashboard/catalog/page.tsx
@@ -0,0 +1,185 @@
+'use client';
+
+import { useEffect, useState } from 'react';
+import Link from 'next/link';
+import { Search, Star, Users, BookOpen, Shield, Loader2 } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+import { Card, CardContent } from '@/components/ui/card';
+import { api } from '@/lib/api';
+import { useAuth } from '@/contexts/auth-context';
+import { cn } from '@/lib/utils';
+
+interface CatalogCourse {
+  id: string;
+  title: string;
+  description: string | null;
+  coverImage: string | null;
+  difficulty: string | null;
+  price: number | null;
+  currency: string;
+  isVerified: boolean;
+  averageRating: number | null;
+  enrollmentCount: number;
+  reviewCount: number;
+  chaptersCount: number;
+  lessonsCount: number;
+  author: { id: string; name: string | null; avatarUrl: string | null };
+}
+
+const difficultyLabels: Record<string, { label: string; color: string }> = {
+  beginner: { label: 'Начинающий', color: 'text-green-600 bg-green-50 dark:bg-green-900/30' },
+  intermediate: { label: 'Средний', color: 'text-yellow-600 bg-yellow-50 dark:bg-yellow-900/30' },
+  advanced: { label: 'Продвинутый', color: 'text-red-600 bg-red-50 dark:bg-red-900/30' },
+};
+
+export default function CatalogPage() {
+  const { loading: authLoading } = useAuth();
+  const [courses, setCourses] = useState<CatalogCourse[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [searchQuery, setSearchQuery] = useState('');
+  const [difficulty, setDifficulty] = useState('');
+
+  const loadCourses = async () => {
+    setLoading(true);
+    try {
+      const result = await api.getCatalog({
+        search: searchQuery || undefined,
+        difficulty: difficulty || undefined,
+      });
+      setCourses(result.data);
+    } catch {
+      // silent
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  useEffect(() => {
+    if (authLoading) return;
+    loadCourses();
+  }, [authLoading, difficulty]);
+
+  const handleSearch = (e: React.FormEvent) => {
+    e.preventDefault();
+    loadCourses();
+  };
+
+  return (
+    <div className="space-y-6">
+      <div>
+        <h1 className="text-3xl font-bold">Каталог курсов</h1>
+        <p className="text-muted-foreground mt-1">Изучайте курсы от других авторов</p>
+      </div>
+
+      {/* Search & filters */}
+      <div className="flex flex-col sm:flex-row gap-3">
+        <form onSubmit={handleSearch} className="flex-1 flex gap-2">
+          <div className="relative flex-1">
+            <Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+            <input
+              type="text"
+              placeholder="Поиск курсов..."
+              value={searchQuery}
+              onChange={(e) => setSearchQuery(e.target.value)}
+              className="w-full pl-10 pr-4 py-2 border rounded-lg bg-background text-sm focus:outline-none focus:ring-2 focus:ring-primary"
+            />
+          </div>
+          <Button type="submit" size="sm">Найти</Button>
+        </form>
+        <div className="flex gap-2">
+          {['', 'beginner', 'intermediate', 'advanced'].map((d) => (
+            <Button
+              key={d}
+              variant={difficulty === d ? 'default' : 'outline'}
+              size="sm"
+              onClick={() => setDifficulty(d)}
+            >
+              {d ? difficultyLabels[d]?.label : 'Все'}
+            </Button>
+          ))}
+        </div>
+      </div>
+
+      {/* Courses grid */}
+      {loading ? (
+        <div className="flex justify-center py-20">
+          <Loader2 className="h-8 w-8 animate-spin text-muted-foreground" />
+        </div>
+      ) : courses.length === 0 ? (
+        <div className="text-center py-20">
+          <BookOpen className="h-12 w-12 mx-auto text-muted-foreground/30 mb-4" />
+          <p className="text-muted-foreground">Пока нет опубликованных курсов</p>
+        </div>
+      ) : (
+        <div className="grid gap-6 md:grid-cols-2 lg:grid-cols-3">
+          {courses.map((course) => (
+            <Link key={course.id} href={`/dashboard/catalog/${course.id}`}>
+              <Card className="group overflow-hidden transition-all hover:shadow-lg hover:-translate-y-0.5 cursor-pointer h-full">
+                {/* Cover image */}
+                <div className="aspect-video bg-gradient-to-br from-primary/20 to-primary/5 relative overflow-hidden">
+                  {course.coverImage ? (
+                    <img src={course.coverImage} alt="" className="w-full h-full object-cover" />
+                  ) : (
+                    <div className="absolute inset-0 flex items-center justify-center">
+                      <BookOpen className="h-10 w-10 text-primary/30" />
+                    </div>
+                  )}
+                  {course.isVerified && (
+                    <div className="absolute top-2 right-2 flex items-center gap-1 px-2 py-0.5 rounded-full bg-blue-600 text-white text-xs font-medium">
+                      <Shield className="h-3 w-3" />
+                      Проверен
+                    </div>
+                  )}
+                  {course.difficulty && difficultyLabels[course.difficulty] && (
+                    <div className={cn(
+                      'absolute top-2 left-2 px-2 py-0.5 rounded-full text-xs font-medium',
+                      difficultyLabels[course.difficulty].color
+                    )}>
+                      {difficultyLabels[course.difficulty].label}
+                    </div>
+                  )}
+                </div>
+
+                <CardContent className="p-4">
+                  <h3 className="font-semibold line-clamp-1 group-hover:text-primary transition-colors">
+                    {course.title}
+                  </h3>
+                  {course.description && (
+                    <p className="text-sm text-muted-foreground line-clamp-2 mt-1">{course.description}</p>
+                  )}
+
+                  {/* Author */}
+                  <p className="text-xs text-muted-foreground mt-3">
+                    {course.author.name || 'Автор'}
+                  </p>
+
+                  {/* Stats */}
+                  <div className="flex items-center gap-3 mt-3 text-xs text-muted-foreground">
+                    {course.averageRating && (
+                      <span className="flex items-center gap-0.5 text-yellow-600 font-medium">
+                        <Star className="h-3.5 w-3.5 fill-current" />
+                        {course.averageRating.toFixed(1)}
+                      </span>
+                    )}
+                    <span className="flex items-center gap-0.5">
+                      <Users className="h-3.5 w-3.5" />
+                      {course.enrollmentCount}
+                    </span>
+                    <span>{course.lessonsCount} уроков</span>
+                  </div>
+
+                  {/* Price */}
+                  <div className="mt-3 pt-3 border-t">
+                    <span className="font-bold text-lg">
+                      {course.price ? `${course.price} ${course.currency}` : 'Бесплатно'}
+                    </span>
+                  </div>
+                </CardContent>
+              </Card>
+            </Link>
+          ))}
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/apps/web/src/app/(dashboard)/dashboard/courses/[id]/edit/page.tsx b/apps/web/src/app/(dashboard)/dashboard/courses/[id]/edit/page.tsx
index 18ff9ea..ac32303 100644
--- a/apps/web/src/app/(dashboard)/dashboard/courses/[id]/edit/page.tsx
+++ b/apps/web/src/app/(dashboard)/dashboard/courses/[id]/edit/page.tsx
@@ -3,7 +3,8 @@
 import { useState, useEffect } from 'react';
 import Link from 'next/link';
 import { useParams } from 'next/navigation';
-import { ChevronLeft, ChevronRight, Save, Wand2, Eye, Pencil } from 'lucide-react';
+import { ChevronLeft, ChevronRight, Save, Wand2, Eye, Pencil, Upload, Shield } from 'lucide-react';
+import { useToast } from '@/components/ui/use-toast';
 import { Button } from '@/components/ui/button';
 import { CourseEditor } from '@/components/editor/course-editor';
 import { LessonContentViewer } from '@/components/editor/lesson-content-viewer';
@@ -20,6 +21,7 @@ const emptyDoc = { type: 'doc', content: [] };
 
 export default function CourseEditPage() {
   const params = useParams();
+  const { toast } = useToast();
   const { loading: authLoading } = useAuth();
   const courseId = params?.id as string;
 
@@ -33,6 +35,8 @@ export default function CourseEditPage() {
   const [contentLoading, setContentLoading] = useState(false);
   const [saving, setSaving] = useState(false);
   const [readOnly, setReadOnly] = useState(false);
+  const [publishing, setPublishing] = useState(false);
+  const [verifying, setVerifying] = useState(false);
 
   useEffect(() => {
     if (!courseId || authLoading) return;
@@ -104,13 +108,42 @@ export default function CourseEditPage() {
     setSaving(true);
     try {
       await api.updateLesson(courseId, activeLesson.lessonId, { content });
+      toast({ title: 'Сохранено', description: 'Изменения успешно сохранены' });
     } catch (e: any) {
-      console.error('Save failed:', e);
+      toast({ title: 'Ошибка', description: 'Не удалось сохранить', variant: 'destructive' });
     } finally {
       setSaving(false);
     }
   };
 
+  const handlePublish = async () => {
+    if (!courseId || publishing) return;
+    setPublishing(true);
+    try {
+      await api.publishCourse(courseId);
+      toast({ title: 'Опубликовано', description: 'Курс теперь доступен в каталоге' });
+      window.location.reload();
+    } catch (e: any) {
+      toast({ title: 'Ошибка', description: e.message, variant: 'destructive' });
+    } finally {
+      setPublishing(false);
+    }
+  };
+
+  const handleToggleVerify = async () => {
+    if (!courseId || verifying) return;
+    setVerifying(true);
+    try {
+      await api.toggleCourseVerification(courseId);
+      toast({ title: 'Готово', description: 'Статус верификации обновлён' });
+      window.location.reload();
+    } catch (e: any) {
+      toast({ title: 'Ошибка', description: e.message, variant: 'destructive' });
+    } finally {
+      setVerifying(false);
+    }
+  };
+
   if (authLoading || loading) {
     return (
       <div className="flex h-[calc(100vh-4rem)] items-center justify-center">
@@ -196,6 +229,14 @@ export default function CourseEditPage() {
                   <Save className="mr-2 h-4 w-4" />
                   {saving ? 'Сохранение...' : 'Сохранить'}
                 </Button>
+                <Button size="sm" variant="outline" onClick={handleToggleVerify} disabled={verifying}>
+                  <Shield className="mr-2 h-4 w-4" />
+                  {verifying ? 'Обработка...' : 'Верификация'}
+                </Button>
+                <Button size="sm" variant="default" onClick={handlePublish} disabled={publishing}>
+                  <Upload className="mr-2 h-4 w-4" />
+                  {publishing ? 'Публикация...' : 'Опубликовать'}
+                </Button>
               </>
             )}
           </div>
diff --git a/apps/web/src/app/(dashboard)/dashboard/courses/[id]/page.tsx b/apps/web/src/app/(dashboard)/dashboard/courses/[id]/page.tsx
index b73e1be..e844c1b 100644
--- a/apps/web/src/app/(dashboard)/dashboard/courses/[id]/page.tsx
+++ b/apps/web/src/app/(dashboard)/dashboard/courses/[id]/page.tsx
@@ -1,10 +1,26 @@
 'use client';
 
-import { useEffect, useState } from 'react';
+import { useEffect, useState, useMemo } from 'react';
 import Link from 'next/link';
 import { useParams, useRouter } from 'next/navigation';
-import { ArrowLeft, Edit, Trash2, ChevronLeft, ChevronRight } from 'lucide-react';
+import {
+  ArrowLeft,
+  Edit,
+  Trash2,
+  ChevronLeft,
+  ChevronRight,
+  CheckCircle2,
+  Circle,
+  Lock,
+  BookOpen,
+  Clock,
+  GraduationCap,
+  ChevronDown,
+  ChevronUp,
+  Play,
+} from 'lucide-react';
 import { Button } from '@/components/ui/button';
+import { Progress } from '@/components/ui/progress';
 import {
   AlertDialog,
   AlertDialogAction,
@@ -19,7 +35,7 @@ import {
 import { api } from '@/lib/api';
 import { useAuth } from '@/contexts/auth-context';
 import { LessonContentViewer } from '@/components/editor/lesson-content-viewer';
-import { LessonSidebar } from '@/components/editor/lesson-sidebar';
+import { LessonQuiz } from '@/components/dashboard/lesson-quiz';
 import { cn } from '@/lib/utils';
 
 type Lesson = { id: string; title: string; durationMinutes?: number | null; order: number };
@@ -41,11 +57,32 @@ export default function CoursePage() {
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
   const [deleting, setDeleting] = useState(false);
-  const [sidebarOpen, setSidebarOpen] = useState(true);
   const [selectedLessonId, setSelectedLessonId] = useState<string | null>(null);
   const [lessonContent, setLessonContent] = useState<Record<string, unknown> | null>(null);
   const [lessonContentLoading, setLessonContentLoading] = useState(false);
+  const [completedLessons, setCompletedLessons] = useState<Set<string>>(new Set());
+  const [expandedChapters, setExpandedChapters] = useState<string[]>([]);
+  const [sidebarOpen, setSidebarOpen] = useState(true);
+  const [enrollmentProgress, setEnrollmentProgress] = useState<any>(null);
+  const [showQuiz, setShowQuiz] = useState(false);
+  const [quizQuestions, setQuizQuestions] = useState<any[]>([]);
 
+  // Flat list of all lessons
+  const flatLessons = useMemo(() => {
+    if (!course) return [];
+    return course.chapters
+      .sort((a, b) => a.order - b.order)
+      .flatMap((ch) =>
+        ch.lessons.sort((a, b) => a.order - b.order).map((l) => ({ ...l, chapterId: ch.id, chapterTitle: ch.title }))
+      );
+  }, [course]);
+
+  const currentLessonIndex = flatLessons.findIndex((l) => l.id === selectedLessonId);
+  const totalLessons = flatLessons.length;
+  const completedCount = completedLessons.size;
+  const progressPercent = totalLessons > 0 ? Math.round((completedCount / totalLessons) * 100) : 0;
+
+  // Load course and progress
   useEffect(() => {
     if (!id || authLoading) return;
     let cancelled = false;
@@ -53,11 +90,24 @@ export default function CoursePage() {
       setLoading(true);
       setError(null);
       try {
-        const data = await api.getCourse(id);
+        const [courseData, progressData] = await Promise.all([
+          api.getCourse(id),
+          api.getEnrollmentProgress(id).catch(() => null),
+        ]);
         if (!cancelled) {
-          setCourse(data);
-          const first = data.chapters?.[0]?.lessons?.[0];
+          setCourse(courseData);
+          setEnrollmentProgress(progressData);
+          if (progressData?.lessons) {
+            const completed: Set<string> = new Set(
+              progressData.lessons
+                .filter((l: any) => l.completedAt)
+                .map((l: any) => String(l.lessonId))
+            );
+            setCompletedLessons(completed);
+          }
+          const first = courseData.chapters?.[0]?.lessons?.[0];
           if (first) setSelectedLessonId(first.id);
+          setExpandedChapters(courseData.chapters.map((ch: Chapter) => ch.id));
         }
       } catch (e: any) {
         if (!cancelled) setError(e?.message || 'Не удалось загрузить курс');
@@ -68,6 +118,7 @@ export default function CoursePage() {
     return () => { cancelled = true; };
   }, [id, authLoading]);
 
+  // Load lesson content
   useEffect(() => {
     if (!id || !selectedLessonId) {
       setLessonContent(null);
@@ -106,10 +157,65 @@ export default function CoursePage() {
     }
   };
 
+  const markComplete = async () => {
+    if (!selectedLessonId || !id) return;
+    try {
+      await api.completeLesson(id, selectedLessonId);
+      setCompletedLessons((prev) => new Set(prev).add(selectedLessonId));
+    } catch {
+      setCompletedLessons((prev) => new Set(prev).add(selectedLessonId));
+    }
+  };
+
+  const handleStartQuiz = async () => {
+    if (!selectedLessonId || !id) return;
+    try {
+      const quiz = await api.getLessonQuiz(id, selectedLessonId);
+      setQuizQuestions(quiz.questions || []);
+      setShowQuiz(true);
+    } catch {
+      setQuizQuestions([]);
+    }
+  };
+
+  const handleQuizComplete = async (score: number) => {
+    if (!selectedLessonId || !id) return;
+    try {
+      await api.submitQuizScore(id, selectedLessonId, score);
+      markComplete();
+    } catch {
+      markComplete();
+    }
+  };
+
+  const goToNextLesson = () => {
+    if (currentLessonIndex < flatLessons.length - 1) {
+      markComplete();
+      setSelectedLessonId(flatLessons[currentLessonIndex + 1].id);
+    }
+  };
+
+  const goToPrevLesson = () => {
+    if (currentLessonIndex > 0) {
+      setSelectedLessonId(flatLessons[currentLessonIndex - 1].id);
+    }
+  };
+
+  const toggleChapter = (chapterId: string) => {
+    setExpandedChapters((prev) =>
+      prev.includes(chapterId)
+        ? prev.filter((id) => id !== chapterId)
+        : [...prev, chapterId]
+    );
+  };
+
   if (authLoading || loading) {
     return (
       <div className="flex h-[calc(100vh-4rem)] items-center justify-center">
-        <p className="text-muted-foreground">Загрузка курса...</p>
+        <div className="flex flex-col items-center gap-3">
+          <div className="h-8 w-8 animate-spin rounded-full border-4 border-primary border-t-transparent" />
+          <p className="text-muted-foreground">Загрузка курса...</p>
+        </div>
       </div>
     );
   }
@@ -125,40 +231,42 @@ export default function CoursePage() {
     );
   }
 
-  const activeLessonTitle = selectedLessonId
-    ? (() => {
-        for (const ch of course.chapters) {
-          const lesson = ch.lessons.find((l) => l.id === selectedLessonId);
-          if (lesson) return lesson.title;
-        }
-        return null;
-      })()
+  const activeLessonMeta = selectedLessonId
+    ? flatLessons.find((l) => l.id === selectedLessonId)
     : null;
 
   return (
     <div className="flex h-[calc(100vh-4rem)] -m-6 flex-col">
       {/* Top bar */}
-      <div className="flex shrink-0 items-center justify-between border-b bg-background px-4 py-3">
+      <div className="flex shrink-0 items-center justify-between border-b bg-background px-4 py-2.5 shadow-sm">
         <div className="flex items-center gap-3">
           <Button variant="ghost" size="sm" asChild>
             <Link href="/dashboard">
-              <ArrowLeft className="mr-2 h-4 w-4" />
-              К курсам
+              <ArrowLeft className="mr-1.5 h-4 w-4" />
+              Мои курсы
             </Link>
           </Button>
-          <span className="text-muted-foreground">/</span>
-          <span className="font-medium truncate max-w-[200px] sm:max-w-xs">{course.title}</span>
+          <div className="h-5 w-px bg-border" />
+          <div className="flex items-center gap-2">
+            <GraduationCap className="h-4 w-4 text-primary" />
+            <span className="font-medium truncate max-w-[300px]">{course.title}</span>
+          </div>
         </div>
         <div className="flex items-center gap-2">
-          <Button size="sm" asChild>
+          {/* Progress badge */}
+          <div className="hidden sm:flex items-center gap-2 mr-2 px-3 py-1.5 bg-muted rounded-full">
+            <div className="h-2 w-2 rounded-full bg-primary" />
+            <span className="text-xs font-medium">{progressPercent}% пройдено</span>
+          </div>
+          <Button size="sm" variant="outline" asChild>
             <Link href={`/dashboard/courses/${course.id}/edit`}>
-              <Edit className="mr-2 h-4 w-4" />
+              <Edit className="mr-1.5 h-3.5 w-3.5" />
               Редактировать
             </Link>
           </Button>
           <AlertDialog>
             <AlertDialogTrigger asChild>
-              <Button variant="outline" size="icon" className="text-destructive hover:text-destructive hover:bg-destructive/10">
+              <Button variant="ghost" size="icon" className="h-8 w-8 text-muted-foreground hover:text-destructive">
                 <Trash2 className="h-4 w-4" />
               </Button>
             </AlertDialogTrigger>
@@ -185,48 +293,226 @@ export default function CoursePage() {
       </div>
 
       <div className="relative flex flex-1 min-h-0">
-        {/* Left: list of lessons (paragraphs) */}
+        {/* ─── Left sidebar: course navigation ─── */}
         <div
           className={cn(
-            'border-r bg-muted/20 flex flex-col transition-[width] duration-200',
-            sidebarOpen ? 'w-72 shrink-0' : 'w-0 overflow-hidden'
+            'border-r bg-muted/10 flex flex-col transition-all duration-300 ease-in-out',
+            sidebarOpen ? 'w-80 shrink-0' : 'w-0 overflow-hidden'
           )}
         >
           {sidebarOpen && (
-            <LessonSidebar
-              course={course}
-              activeLesson={selectedLessonId ?? ''}
-              onSelectLesson={setSelectedLessonId}
-              readOnly
-            />
+            <div className="flex flex-col h-full">
+              {/* Course progress */}
+              <div className="p-4 border-b bg-background">
+                <div className="flex items-center justify-between mb-2">
+                  <span className="text-xs font-medium text-muted-foreground uppercase tracking-wide">Прогресс курса</span>
+                  <span className="text-xs font-bold text-primary">{completedCount}/{totalLessons}</span>
+                </div>
+                <Progress value={progressPercent} className="h-2" />
+              </div>
+
+              {/* Chapters & lessons */}
+              <div className="flex-1 overflow-auto py-2">
+                {course.chapters
+                  .sort((a, b) => a.order - b.order)
+                  .map((chapter, chapterIdx) => {
+                    const isExpanded = expandedChapters.includes(chapter.id);
+                    const chapterLessons = chapter.lessons.sort((a, b) => a.order - b.order);
+                    const chapterComplete = chapterLessons.every((l) => completedLessons.has(l.id));
+                    const chapterStarted = chapterLessons.some((l) => completedLessons.has(l.id));
+
+                    return (
+                      <div key={chapter.id} className="mb-1">
+                        <button
+                          className="flex items-center gap-2 w-full px-4 py-2.5 text-sm hover:bg-muted/50 transition-colors"
+                          onClick={() => toggleChapter(chapter.id)}
+                        >
+                          <div className={cn(
+                            'flex h-6 w-6 shrink-0 items-center justify-center rounded-full text-xs font-bold',
+                            chapterComplete
+                              ? 'bg-green-100 text-green-700 dark:bg-green-900 dark:text-green-300'
+                              : chapterStarted
+                              ? 'bg-primary/10 text-primary'
+                              : 'bg-muted text-muted-foreground'
+                          )}>
+                            {chapterComplete ? <CheckCircle2 className="h-4 w-4" /> : chapterIdx + 1}
+                          </div>
+                          <span className="flex-1 text-left font-medium truncate">{chapter.title}</span>
+                          {isExpanded ? <ChevronUp className="h-4 w-4 text-muted-foreground" /> : <ChevronDown className="h-4 w-4 text-muted-foreground" />}
+                        </button>
+
+                        {isExpanded && (
+                          <div className="ml-4 border-l-2 border-muted pl-2 mb-2">
+                            {chapterLessons.map((lesson, lessonIdx) => {
+                              const isActive = selectedLessonId === lesson.id;
+                              const isCompleted = completedLessons.has(lesson.id);
+                              const globalIdx = flatLessons.findIndex((l) => l.id === lesson.id);
+                              // Lesson is locked if sequential mode: all previous must be complete
+                              // For now, don't lock (allow free navigation)
+                              const isLocked = false;
+
+                              return (
+                                <button
+                                  key={lesson.id}
+                                  disabled={isLocked}
+                                  className={cn(
+                                    'flex items-center gap-2.5 w-full rounded-lg px-3 py-2 text-sm transition-all',
+                                    isActive
+                                      ? 'bg-primary text-primary-foreground shadow-sm'
+                                      : isLocked
+                                      ? 'opacity-40 cursor-not-allowed'
+                                      : 'hover:bg-muted/80 text-foreground/80'
+                                  )}
+                                  onClick={() => !isLocked && setSelectedLessonId(lesson.id)}
+                                >
+                                  {isCompleted ? (
+                                    <CheckCircle2 className={cn('h-4 w-4 shrink-0', isActive ? 'text-primary-foreground' : 'text-green-500')} />
+                                  ) : isLocked ? (
+                                    <Lock className="h-4 w-4 shrink-0" />
+                                  ) : isActive ? (
+                                    <Play className="h-4 w-4 shrink-0 fill-current" />
+                                  ) : (
+                                    <Circle className="h-4 w-4 shrink-0" />
+                                  )}
+                                  <span className="truncate text-left">{lesson.title}</span>
+                                  {lesson.durationMinutes && (
+                                    <span className={cn('ml-auto text-xs shrink-0', isActive ? 'text-primary-foreground/70' : 'text-muted-foreground')}>
+                                      {lesson.durationMinutes} мин
+                                    </span>
+                                  )}
+                                </button>
+                              );
+                            })}
+                          </div>
+                        )}
+                      </div>
+                    );
+                  })}
+              </div>
+            </div>
           )}
         </div>
 
+        {/* Sidebar toggle */}
         <button
           type="button"
-          className="absolute top-4 z-10 flex h-8 w-6 items-center justify-center rounded-r-md border border-l-0 bg-background shadow-sm hover:bg-muted transition-colors"
-          style={{ left: sidebarOpen ? '17rem' : 0 }}
+          className={cn(
+            'absolute top-4 z-10 flex h-8 w-6 items-center justify-center rounded-r-md border border-l-0 bg-background shadow-sm hover:bg-muted transition-all',
+          )}
+          style={{ left: sidebarOpen ? '19.9rem' : 0 }}
           onClick={() => setSidebarOpen(!sidebarOpen)}
         >
           {sidebarOpen ? <ChevronLeft className="h-4 w-4" /> : <ChevronRight className="h-4 w-4" />}
         </button>
 
-        {/* Center: lesson content (read-only) */}
-        <main className="flex-1 flex flex-col min-h-0 overflow-auto">
-          <div className="max-w-3xl mx-auto w-full px-6 py-8">
-            {activeLessonTitle && (
-              <h1 className="text-2xl font-bold mb-6 text-foreground">{activeLessonTitle}</h1>
-            )}
-            {lessonContentLoading ? (
-              <p className="text-muted-foreground">Загрузка...</p>
-            ) : selectedLessonId ? (
-              <LessonContentViewer
-                content={lessonContent}
-                className="prose-reader min-h-[400px] [&_.ProseMirror]:min-h-[300px]"
-              />
-            ) : (
-              <p className="text-muted-foreground">Выберите урок в списке слева.</p>
-            )}
+        {/* ─── Main content area ─── */}
+        <main className="flex-1 flex flex-col min-h-0">
+          {/* Lesson content */}
+          <div className="flex-1 overflow-auto">
+            <div className="max-w-3xl mx-auto w-full px-8 py-10">
+              {/* Chapter & lesson header */}
+              {activeLessonMeta && (
+                <div className="mb-8">
+                  <p className="text-sm text-primary font-medium mb-1">
+                    {activeLessonMeta.chapterTitle}
+                  </p>
+                  <h1 className="text-3xl font-bold text-foreground">
+                    {activeLessonMeta.title}
+                  </h1>
+                  <div className="flex items-center gap-4 mt-3 text-sm text-muted-foreground">
+                    <span className="flex items-center gap-1">
+                      <BookOpen className="h-4 w-4" />
+                      Урок {currentLessonIndex + 1} из {totalLessons}
+                    </span>
+                    {activeLessonMeta.durationMinutes && (
+                      <span className="flex items-center gap-1">
+                        <Clock className="h-4 w-4" />
+                        {activeLessonMeta.durationMinutes} мин
+                      </span>
+                    )}
+                  </div>
+                  <div className="mt-4 h-px bg-border" />
+                </div>
+              )}
+
+              {/* Content */}
+              {lessonContentLoading ? (
+                <div className="flex items-center justify-center py-20">
+                  <div className="h-6 w-6 animate-spin rounded-full border-2 border-primary border-t-transparent" />
+                </div>
+              ) : selectedLessonId ? (
+                <>
+                  <LessonContentViewer
+                    content={lessonContent}
+                    className="min-h-[400px]"
+                  />
+                  {!showQuiz && !completedLessons.has(selectedLessonId) && (
+                    <div className="mt-8 p-6 border rounded-xl bg-muted/20 text-center">
+                      <h3 className="font-semibold mb-2">Проверьте свои знания</h3>
+                      <p className="text-sm text-muted-foreground mb-4">
+                        Пройдите тест, чтобы закрепить материал и получить сертификат
+                      </p>
+                      <Button onClick={handleStartQuiz}>Начать тест</Button>
+                    </div>
+                  )}
+                  {showQuiz && (
+                    <LessonQuiz
+                      courseId={id}
+                      lessonId={selectedLessonId}
+                      questions={quizQuestions}
+                      onComplete={handleQuizComplete}
+                    />
+                  )}
+                </>
+              ) : (
+                <div className="flex flex-col items-center justify-center py-20 text-center">
+                  <BookOpen className="h-12 w-12 text-muted-foreground/30 mb-4" />
+                  <p className="text-muted-foreground">Выберите урок для начала обучения</p>
+                </div>
+              )}
+            </div>
+          </div>
+
+          {/* Bottom navigation */}
+          <div className="shrink-0 border-t bg-background px-6 py-3">
+            <div className="max-w-3xl mx-auto flex items-center justify-between">
+              <Button
+                variant="outline"
+                size="sm"
+                onClick={goToPrevLesson}
+                disabled={currentLessonIndex <= 0}
+              >
+                <ChevronLeft className="mr-1.5 h-4 w-4" />
+                Предыдущий
+              </Button>
+
+              <Button
+                variant="ghost"
+                size="sm"
+                onClick={markComplete}
+                disabled={!selectedLessonId || completedLessons.has(selectedLessonId)}
+                className={cn(
+                  completedLessons.has(selectedLessonId ?? '')
+                    ? 'text-green-600'
+                    : 'text-muted-foreground hover:text-primary'
+                )}
+              >
+                <CheckCircle2 className="mr-1.5 h-4 w-4" />
+                {completedLessons.has(selectedLessonId ?? '') ? 'Пройден' : 'Отметить пройденным'}
+              </Button>
+
+              {currentLessonIndex < flatLessons.length - 1 ? (
+                <Button size="sm" onClick={goToNextLesson}>
+                  Следующий урок
+                  <ChevronRight className="ml-1.5 h-4 w-4" />
+                </Button>
+              ) : (
+                <Button size="sm" variant="outline" disabled={completedCount < totalLessons}>
+                  <GraduationCap className="mr-1.5 h-4 w-4" />
+                  Завершить курс
+                </Button>
+              )}
+            </div>
           </div>
         </main>
       </div>
diff --git a/apps/web/src/app/(dashboard)/dashboard/learning/page.tsx b/apps/web/src/app/(dashboard)/dashboard/learning/page.tsx
new file mode 100644
index 0000000..c9964ad
--- /dev/null
+++ b/apps/web/src/app/(dashboard)/dashboard/learning/page.tsx
@@ -0,0 +1,109 @@
+'use client';
+
+import { useEffect, useState } from 'react';
+import Link from 'next/link';
+import { GraduationCap, BookOpen, Loader2, Trophy } from 'lucide-react';
+import { Card, CardContent } from '@/components/ui/card';
+import { Progress } from '@/components/ui/progress';
+import { api } from '@/lib/api';
+import { useAuth } from '@/contexts/auth-context';
+
+interface EnrollmentData {
+  id: string;
+  progress: number;
+  completedAt: string | null;
+  course: {
+    id: string;
+    title: string;
+    description: string | null;
+    coverImage: string | null;
+    author: { name: string | null };
+    _count: { chapters: number };
+    chapters: { _count: { lessons: number } }[];
+  };
+}
+
+export default function LearningPage() {
+  const { loading: authLoading, user } = useAuth();
+  const [enrollments, setEnrollments] = useState<EnrollmentData[]>([]);
+  const [loading, setLoading] = useState(true);
+
+  useEffect(() => {
+    if (authLoading || !user) { setLoading(false); return; }
+    (async () => {
+      try {
+        const data = await api.getMyEnrollments();
+        setEnrollments(data);
+      } catch { /* silent */ }
+      finally { setLoading(false); }
+    })();
+  }, [authLoading, user]);
+
+  if (authLoading || loading) {
+    return (
+      <div className="flex items-center justify-center min-h-[400px]">
+        <Loader2 className="h-8 w-8 animate-spin text-muted-foreground" />
+      </div>
+    );
+  }
+
+  return (
+    <div className="space-y-6">
+      <div>
+        <h1 className="text-3xl font-bold">Мои обучения</h1>
+        <p className="text-muted-foreground mt-1">Курсы, на которые вы записаны</p>
+      </div>
+
+      {enrollments.length === 0 ? (
+        <div className="text-center py-20">
+          <GraduationCap className="h-12 w-12 mx-auto text-muted-foreground/30 mb-4" />
+          <p className="text-lg font-medium">Пока нет записей</p>
+          <p className="text-muted-foreground mb-4">Найдите курсы в каталоге</p>
+          <Link href="/dashboard/catalog" className="text-primary hover:underline">
+            Открыть каталог
+          </Link>
+        </div>
+      ) : (
+        <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
+          {enrollments.map((enrollment) => {
+            const lessonsCount = enrollment.course.chapters.reduce(
+              (acc, ch) => acc + ch._count.lessons, 0
+            );
+            return (
+              <Link key={enrollment.id} href={`/dashboard/courses/${enrollment.course.id}`}>
+                <Card className="group overflow-hidden transition-all hover:shadow-md cursor-pointer h-full">
+                  <div className="aspect-[3/1] bg-gradient-to-br from-primary/20 to-primary/5 relative">
+                    {enrollment.course.coverImage ? (
+                      <img src={enrollment.course.coverImage} alt="" className="w-full h-full object-cover" />
+                    ) : (
+                      <div className="absolute inset-0 flex items-center justify-center">
+                        <BookOpen className="h-8 w-8 text-primary/30" />
+                      </div>
+                    )}
+                    {enrollment.completedAt && (
+                      <div className="absolute top-2 right-2 flex items-center gap-1 px-2 py-0.5 rounded-full bg-green-600 text-white text-xs font-medium">
+                        <Trophy className="h-3 w-3" />
+                        Пройден
+                      </div>
+                    )}
+                  </div>
+                  <CardContent className="p-4">
+                    <h3 className="font-semibold line-clamp-1">{enrollment.course.title}</h3>
+                    <p className="text-xs text-muted-foreground mt-1">{enrollment.course.author.name}</p>
+                    <div className="mt-3 space-y-1">
+                      <div className="flex items-center justify-between text-xs text-muted-foreground">
+                        <span>{enrollment.progress}%</span>
+                        <span>{lessonsCount} уроков</span>
+                      </div>
+                      <Progress value={enrollment.progress} className="h-1.5" />
+                    </div>
+                  </CardContent>
+                </Card>
+              </Link>
+            );
+          })}
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/apps/web/src/app/globals.css b/apps/web/src/app/globals.css
index 1d203fe..a15ebcc 100644
--- a/apps/web/src/app/globals.css
+++ b/apps/web/src/app/globals.css
@@ -104,3 +104,58 @@ html {
 ::selection {
   background: hsl(var(--primary) / 0.2);
 }
+
+/* ─── Course content typography ─── */
+.prose-course h1 {
+  @apply text-3xl font-bold mt-10 mb-4 pb-3 border-b border-border text-foreground;
+}
+.prose-course h2 {
+  @apply text-2xl font-semibold mt-8 mb-3 text-foreground;
+}
+.prose-course h3 {
+  @apply text-xl font-semibold mt-6 mb-2 text-foreground;
+}
+.prose-course p {
+  @apply leading-7 mb-4 text-foreground/90;
+}
+.prose-course ul {
+  @apply list-disc pl-6 mb-4 space-y-1;
+}
+.prose-course ol {
+  @apply list-decimal pl-6 mb-4 space-y-1;
+}
+.prose-course li {
+  @apply leading-7 text-foreground/90;
+}
+.prose-course li p {
+  @apply mb-1;
+}
+.prose-course blockquote {
+  @apply border-l-4 border-primary/50 bg-primary/5 pl-4 py-3 my-4 rounded-r-lg italic text-foreground/80;
+}
+.prose-course pre {
+  @apply rounded-xl bg-muted p-5 font-mono text-sm border my-4 overflow-x-auto;
+}
+.prose-course code:not(pre code) {
+  @apply bg-muted px-1.5 py-0.5 rounded text-sm font-mono text-primary;
+}
+.prose-course hr {
+  @apply my-8 border-border;
+}
+.prose-course a {
+  @apply text-primary underline underline-offset-2 hover:text-primary/80 transition-colors;
+}
+.prose-course img {
+  @apply rounded-xl my-6 max-w-full shadow-sm;
+}
+.prose-course strong {
+  @apply font-semibold text-foreground;
+}
+
+/* ProseMirror specific overrides for course content */
+.prose-course .ProseMirror {
+  @apply outline-none;
+}
+.prose-course .ProseMirror > *:first-child {
+  @apply mt-0;
+}
diff --git a/apps/web/src/components/dashboard/lesson-quiz.tsx b/apps/web/src/components/dashboard/lesson-quiz.tsx
new file mode 100644
index 0000000..d82f9f0
--- /dev/null
+++ b/apps/web/src/components/dashboard/lesson-quiz.tsx
@@ -0,0 +1,137 @@
+'use client';
+
+import { useState } from 'react';
+import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
+import { Button } from '@/components/ui/button';
+import { CheckCircle2, XCircle, Trophy } from 'lucide-react';
+import { cn } from '@/lib/utils';
+
+interface QuizQuestion {
+  id: string;
+  question: string;
+  options: string[];
+  correctAnswer: number;
+}
+
+interface LessonQuizProps {
+  courseId: string;
+  lessonId: string;
+  questions: QuizQuestion[];
+  onComplete: (score: number) => void;
+}
+
+export function LessonQuiz({ courseId, lessonId, questions, onComplete }: LessonQuizProps) {
+  const [currentQuestion, setCurrentQuestion] = useState(0);
+  const [answers, setAnswers] = useState<number[]>([]);
+  const [showResults, setShowResults] = useState(false);
+  const [selectedAnswer, setSelectedAnswer] = useState<number | null>(null);
+
+  const handleSelectAnswer = (optionIndex: number) => {
+    setSelectedAnswer(optionIndex);
+  };
+
+  const handleNext = () => {
+    if (selectedAnswer === null) return;
+    const newAnswers = [...answers, selectedAnswer];
+    setAnswers(newAnswers);
+
+    if (currentQuestion < questions.length - 1) {
+      setCurrentQuestion(currentQuestion + 1);
+      setSelectedAnswer(null);
+    } else {
+      const correct = newAnswers.filter((ans, idx) => ans === questions[idx].correctAnswer).length;
+      const score = Math.round((correct / questions.length) * 100);
+      setShowResults(true);
+      onComplete(score);
+    }
+  };
+
+  if (questions.length === 0) {
+    return null;
+  }
+
+  if (showResults) {
+    const correct = answers.filter((ans, idx) => ans === questions[idx].correctAnswer).length;
+    const score = Math.round((correct / questions.length) * 100);
+    const passed = score >= 70;
+
+    return (
+      <Card className="mt-8">
+        <CardContent className="p-8 text-center">
+          <div className={cn(
+            'mx-auto h-16 w-16 rounded-full flex items-center justify-center mb-4',
+            passed ? 'bg-green-100 dark:bg-green-900' : 'bg-yellow-100 dark:bg-yellow-900'
+          )}>
+            {passed ? (
+              <Trophy className="h-8 w-8 text-green-600 dark:text-green-400" />
+            ) : (
+              <CheckCircle2 className="h-8 w-8 text-yellow-600 dark:text-yellow-400" />
+            )}
+          </div>
+          <h3 className="text-xl font-bold mb-2">
+            {passed ? 'Отлично!' : 'Неплохо!'}
+          </h3>
+          <p className="text-muted-foreground mb-4">
+            Ваш результат: {correct} из {questions.length} ({score}%)
+          </p>
+          <div className="space-y-2 max-w-md mx-auto">
+            {questions.map((q, idx) => {
+              const isCorrect = answers[idx] === q.correctAnswer;
+              return (
+                <div key={q.id} className={cn(
+                  'flex items-center gap-2 p-2 rounded text-sm',
+                  isCorrect ? 'bg-green-50 dark:bg-green-900/30' : 'bg-red-50 dark:bg-red-900/30'
+                )}>
+                  {isCorrect ? (
+                    <CheckCircle2 className="h-4 w-4 text-green-600" />
+                  ) : (
+                    <XCircle className="h-4 w-4 text-red-600" />
+                  )}
+                  <span>Вопрос {idx + 1}</span>
+                </div>
+              );
+            })}
+          </div>
+        </CardContent>
+      </Card>
+    );
+  }
+
+  const question = questions[currentQuestion];
+
+  return (
+    <Card className="mt-8">
+      <CardHeader>
+        <CardTitle>
+          Тест по уроку ({currentQuestion + 1}/{questions.length})
+        </CardTitle>
+      </CardHeader>
+      <CardContent className="space-y-4">
+        <p className="font-medium">{question.question}</p>
+        <div className="grid gap-2">
+          {question.options.map((option, idx) => (
+            <button
+              key={idx}
+              onClick={() => handleSelectAnswer(idx)}
+              className={cn(
+                'p-3 rounded-lg border text-left transition-colors',
+                selectedAnswer === idx
+                  ? 'border-primary bg-primary/5'
+                  : 'hover:bg-muted'
+              )}
+            >
+              {option}
+            </button>
+          ))}
+        </div>
+        <Button
+          onClick={handleNext}
+          disabled={selectedAnswer === null}
+          className="w-full"
+        >
+          {currentQuestion < questions.length - 1 ? 'Следующий вопрос' : 'Завершить тест'}
+        </Button>
+      </CardContent>
+    </Card>
+  );
+}
diff --git a/apps/web/src/components/dashboard/sidebar.tsx b/apps/web/src/components/dashboard/sidebar.tsx
index 17ea23c..081a5cf 100644
--- a/apps/web/src/components/dashboard/sidebar.tsx
+++ b/apps/web/src/components/dashboard/sidebar.tsx
@@ -6,18 +6,20 @@ import {
   Sparkles,
   LayoutDashboard,
   BookOpen,
+  GraduationCap,
+  Compass,
   Settings,
   CreditCard,
   Plus,
-  Search,
 } from 'lucide-react';
 import { cn } from '@/lib/utils';
 import { Button } from '@/components/ui/button';
 
 const navigation = [
-  { name: 'Обзор', href: '/dashboard', icon: LayoutDashboard },
-  { name: 'Мои курсы', href: '/dashboard', icon: BookOpen },
-  { name: 'Поиск', href: '/dashboard/search', icon: Search },
+  { name: 'Обзор', href: '/dashboard', icon: LayoutDashboard, exact: true },
+  { name: 'Мои курсы', href: '/dashboard', icon: BookOpen, exact: true },
+  { name: 'Каталог', href: '/dashboard/catalog', icon: Compass },
+  { name: 'Мои обучения', href: '/dashboard/learning', icon: GraduationCap },
 ];
 
 const bottomNavigation = [
@@ -53,7 +55,9 @@ export function Sidebar() {
       {/* Main navigation */}
       <nav className="flex-1 px-4 space-y-1">
         {navigation.map((item) => {
-          const isActive = pathname === item.href || pathname.startsWith(`${item.href}/`);
+          const isActive = (item as any).exact
+            ? pathname === item.href
+            : pathname === item.href || pathname.startsWith(`${item.href}/`);
           return (
             <Link
               key={item.name}
diff --git a/apps/web/src/components/editor/lesson-content-viewer.tsx b/apps/web/src/components/editor/lesson-content-viewer.tsx
index 67ee69a..66c78e3 100644
--- a/apps/web/src/components/editor/lesson-content-viewer.tsx
+++ b/apps/web/src/components/editor/lesson-content-viewer.tsx
@@ -7,6 +7,7 @@ import Link from '@tiptap/extension-link';
 import Image from '@tiptap/extension-image';
 import mermaid from 'mermaid';
 import { useEffect, useRef } from 'react';
+import { cn } from '@/lib/utils';
 
 mermaid.initialize({ startOnLoad: false, theme: 'neutral' });
 const emptyDoc = { type: 'doc', content: [] };
@@ -27,22 +28,21 @@ export function LessonContentViewer({ content, className }: LessonContentViewerP
           HTMLAttributes: (node: { attrs: { language?: string } }) =>
             node.attrs.language === 'mermaid'
               ? { class: 'mermaid rounded-lg p-4 bg-muted min-h-[80px]', 'data-language': 'mermaid' }
-              : { class: 'rounded-lg bg-muted p-4 font-mono text-sm', 'data-language': node.attrs.language || '' },
+              : { class: 'rounded-xl bg-muted p-5 font-mono text-sm border', 'data-language': node.attrs.language || '' },
         },
       }),
       Underline,
       Link.configure({
         openOnClick: true,
-        HTMLAttributes: { class: 'text-primary underline underline-offset-2' },
+        HTMLAttributes: { class: 'text-primary underline underline-offset-2 hover:text-primary/80 transition-colors' },
       }),
-      Image.configure({ HTMLAttributes: { class: 'rounded-lg max-w-full h-auto' } }),
+      Image.configure({ HTMLAttributes: { class: 'rounded-xl max-w-full h-auto shadow-sm my-6' } }),
     ],
     content: content ?? emptyDoc,
     editable: false,
     editorProps: {
       attributes: {
-        class:
-          'prose prose-lg dark:prose-invert max-w-none focus:outline-none leading-relaxed [&_.ProseMirror]:outline-none [&_.ProseMirror]:text-foreground [&_.ProseMirror_p]:leading-7 [&_.ProseMirror_h1]:text-3xl [&_.ProseMirror_h2]:text-2xl [&_.ProseMirror_h3]:text-xl [&_.ProseMirror_pre]:rounded-lg [&_.ProseMirror_pre]:bg-muted [&_.ProseMirror_pre]:p-4 [&_.ProseMirror_pre]:font-mono [&_.ProseMirror_pre]:text-sm [&_.ProseMirror_pre]:border [&_.ProseMirror_blockquote]:border-primary [&_.ProseMirror_blockquote]:bg-muted/30',
+        class: 'outline-none text-foreground',
       },
     },
   });
@@ -63,7 +63,7 @@ export function LessonContentViewer({ content, className }: LessonContentViewerP
   if (!editor) return null;
 
   return (
-    <div ref={containerRef} className={className}>
+    <div ref={containerRef} className={cn('prose-course', className)}>
       <EditorContent editor={editor} />
     </div>
   );
diff --git a/apps/web/src/contexts/auth-context.tsx b/apps/web/src/contexts/auth-context.tsx
index 5850651..2843a71 100644
--- a/apps/web/src/contexts/auth-context.tsx
+++ b/apps/web/src/contexts/auth-context.tsx
@@ -57,16 +57,30 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
       setApiToken(null);
       return;
     }
-    api
-      .exchangeToken(session.access_token)
-      .then(({ accessToken }) => {
-        setApiToken(accessToken);
-        setLoading(false);
-      })
-      .catch(() => {
-        setApiToken(null);
-        setLoading(false);
-      });
+
+    let attempt = 0;
+    const maxRetries = 3;
+
+    const tryExchange = () => {
+      api
+        .exchangeToken(session.access_token)
+        .then(({ accessToken }) => {
+          setApiToken(accessToken);
+          setLoading(false);
+        })
+        .catch(() => {
+          attempt++;
+          if (attempt < maxRetries) {
+            // Retry with exponential backoff (500ms, 1500ms, 3500ms)
+            setTimeout(tryExchange, 500 * Math.pow(2, attempt));
+          } else {
+            setApiToken(null);
+            setLoading(false);
+          }
+        });
+    };
+
+    tryExchange();
   }, [session?.access_token]);
 
   // Exchange Supabase token for backend JWT; keep loading true until done so API calls wait for JWT
diff --git a/apps/web/src/lib/api.ts b/apps/web/src/lib/api.ts
index 60a425a..92ba145 100644
--- a/apps/web/src/lib/api.ts
+++ b/apps/web/src/lib/api.ts
@@ -179,6 +179,10 @@ class ApiClient {
     });
   }
 
+  async getLessonQuiz(courseId: string, lessonId: string) {
+    return this.request<any>(`/courses/${courseId}/lessons/${lessonId}/quiz`);
+  }
+
   // Generation
   async startGeneration(prompt: string) {
     return this.request<{ id: string; status: string; progress: number }>('/generation/start', {
@@ -231,6 +235,65 @@ class ApiClient {
     });
   }
 
+  // Catalog (public courses)
+  async getCatalog(params?: { page?: number; limit?: number; search?: string; difficulty?: string }) {
+    const searchParams = new URLSearchParams();
+    if (params?.page) searchParams.set('page', String(params.page));
+    if (params?.limit) searchParams.set('limit', String(params.limit));
+    if (params?.search) searchParams.set('search', params.search);
+    if (params?.difficulty) searchParams.set('difficulty', params.difficulty);
+    const query = searchParams.toString();
+    return this.request<{ data: any[]; meta: any }>(`/catalog${query ? `?${query}` : ''}`);
+  }
+
+  async getPublicCourse(id: string) {
+    return this.request<any>(`/catalog/${id}`);
+  }
+
+  async publishCourse(id: string) {
+    return this.request<any>(`/catalog/${id}/submit`, { method: 'POST' });
+  }
+
+  async toggleCourseVerification(id: string) {
+    return this.request<any>(`/catalog/${id}/verify`, { method: 'PATCH' });
+  }
+
+  // Enrollment & Progress
+  async enrollInCourse(courseId: string) {
+    return this.request<any>(`/enrollment/${courseId}/enroll`, { method: 'POST' });
+  }
+
+  async getMyEnrollments() {
+    return this.request<any[]>('/enrollment');
+  }
+
+  async getEnrollmentProgress(courseId: string) {
+    return this.request<any>(`/enrollment/${courseId}/progress`);
+  }
+
+  async completeLesson(courseId: string, lessonId: string) {
+    return this.request<any>(`/enrollment/${courseId}/lessons/${lessonId}/complete`, { method: 'POST' });
+  }
+
+  async submitQuizScore(courseId: string, lessonId: string, score: number) {
+    return this.request<any>(`/enrollment/${courseId}/lessons/${lessonId}/quiz`, {
+      method: 'POST',
+      body: JSON.stringify({ score }),
+    });
+  }
+
+  async createReview(courseId: string, data: { rating: number; title?: string; content?: string }) {
+    return this.request<any>(`/enrollment/${courseId}/review`, {
+      method: 'POST',
+      body: JSON.stringify(data),
+    });
+  }
+
+  async getCourseReviews(courseId: string, page?: number) {
+    const params = page ? `?page=${page}` : '';
+    return this.request<{ data: any[]; meta: any }>(`/enrollment/${courseId}/reviews${params}`);
+  }
+
   // Search
   async searchCourses(query: string, filters?: { category?: string; difficulty?: string }) {
     const searchParams = new URLSearchParams({ q: query });
diff --git a/apps/web/tailwind.config.ts b/apps/web/tailwind.config.ts
index 5844d7c..67ae80f 100644
--- a/apps/web/tailwind.config.ts
+++ b/apps/web/tailwind.config.ts
@@ -82,7 +82,7 @@ const config: Config = {
       },
     },
   },
-  plugins: [require('tailwindcss-animate')],
+  plugins: [require('tailwindcss-animate'), require('@tailwindcss/typography')],
 };
 
 export default config;
diff --git a/packages/database/prisma/schema.prisma b/packages/database/prisma/schema.prisma
index 80a8acc..7a332b2 100644
--- a/packages/database/prisma/schema.prisma
+++ b/packages/database/prisma/schema.prisma
@@ -30,10 +30,15 @@ model User {
   createdAt       DateTime @default(now()) @map("created_at")
   updatedAt       DateTime @updatedAt @map("updated_at")
   
+  // Role
+  role            UserRole         @default(USER)
+  
   // Relations
   settings        UserSettings?
   subscription    Subscription?
   courses         Course[]         @relation("AuthoredCourses")
+  enrollments     Enrollment[]
+  lessonProgress  LessonProgress[]
   purchases       Purchase[]
   reviews         Review[]
   generations     CourseGeneration[]
@@ -65,6 +70,12 @@ model UserSettings {
   @@map("user_settings")
 }
 
+enum UserRole {
+  USER
+  MODERATOR
+  ADMIN
+}
+
 // ============================================
 // Subscription & Payments
 // ============================================
@@ -113,7 +124,9 @@ model Subscription {
 enum CourseStatus {
   DRAFT
   GENERATING
+  PENDING_REVIEW
   PUBLISHED
+  REJECTED
   ARCHIVED
 }
 
@@ -130,11 +143,14 @@ model Course {
   // Status
   status          CourseStatus @default(DRAFT)
   
-  // Marketplace (future)
+  // Marketplace
   isPublished     Boolean      @default(false) @map("is_published")
-  price           Decimal?     @db.Decimal(10, 2) // null = private course
+  price           Decimal?     @db.Decimal(10, 2) // null = free course
   currency        String       @default("USD")
   
+  // Author verification — author checked the content and vouches for quality
+  isVerified      Boolean      @default(false) @map("is_verified")
+  
   // Categorization
   categoryId      String?      @map("category_id")
   tags            String[]     @default([])
@@ -155,10 +171,15 @@ model Course {
   createdAt       DateTime     @default(now()) @map("created_at")
   updatedAt       DateTime     @updatedAt @map("updated_at")
   
+  // Moderation
+  moderationNote  String?      @db.Text @map("moderation_note")
+  moderatedAt     DateTime?    @map("moderated_at")
+  
   // Relations
   author          User         @relation("AuthoredCourses", fields: [authorId], references: [id], onDelete: Cascade)
   category        Category?    @relation(fields: [categoryId], references: [id])
   chapters        Chapter[]
+  enrollments     Enrollment[]
   purchases       Purchase[]
   reviews         Review[]
   generation      CourseGeneration?
@@ -360,3 +381,53 @@ model Review {
   @@index([courseId])
   @@map("reviews")
 }
+
+// ============================================
+// Enrollment & Progress
+// ============================================
+
+model Enrollment {
+  id          String    @id @default(uuid())
+  userId      String    @map("user_id")
+  courseId     String    @map("course_id")
+  
+  // Progress
+  progress    Int       @default(0) // 0-100
+  completedAt DateTime? @map("completed_at")
+  
+  // Certificate
+  certificateUrl String? @map("certificate_url")
+  
+  createdAt   DateTime  @default(now()) @map("created_at")
+  updatedAt   DateTime  @updatedAt @map("updated_at")
+  
+  // Relations
+  user        User      @relation(fields: [userId], references: [id], onDelete: Cascade)
+  course      Course    @relation(fields: [courseId], references: [id], onDelete: Cascade)
+  lessons     LessonProgress[]
+  
+  @@unique([userId, courseId])
+  @@index([userId])
+  @@index([courseId])
+  @@map("enrollments")
+}
+
+model LessonProgress {
+  id            String    @id @default(uuid())
+  userId        String    @map("user_id")
+  enrollmentId  String    @map("enrollment_id")
+  lessonId      String    @map("lesson_id")
+  
+  completedAt   DateTime? @map("completed_at")
+  quizScore     Int?      @map("quiz_score") // 0-100
+  
+  createdAt     DateTime  @default(now()) @map("created_at")
+  
+  // Relations
+  user          User       @relation(fields: [userId], references: [id], onDelete: Cascade)
+  enrollment    Enrollment @relation(fields: [enrollmentId], references: [id], onDelete: Cascade)
+  
+  @@unique([userId, lessonId])
+  @@index([enrollmentId])
+  @@map("lesson_progress")
+}
diff --git a/packages/database/src/index.ts b/packages/database/src/index.ts
index 1a8c6af..a983e75 100644
--- a/packages/database/src/index.ts
+++ b/packages/database/src/index.ts
@@ -30,7 +30,9 @@ export type {
   Category,
   Purchase,
   Review,
+  Enrollment,
+  LessonProgress,
 } from '@prisma/client';
 
 // Enum re-exports
-export { SubscriptionTier, CourseStatus, GenerationStatus } from '@prisma/client';
+export { SubscriptionTier, CourseStatus, GenerationStatus, UserRole } from '@prisma/client';