Add enrolled classes page with Classroom roster support.

Introduce a new sidebar Enrolled page that mirrors schedule styling, fetches active courses for the signed-in user, and shows teacher names via Classroom roster APIs.

Made-with: Cursor

classroom_app/Auth/GoogleOAuthService.swift

@@ -47,7 +47,8 @@ final class GoogleOAuthService: NSObject {
         "https://www.googleapis.com/auth/calendar.events",
         // Classroom To-do (assignments/quizzes)
         "https://www.googleapis.com/auth/classroom.courses.readonly",
-        "https://www.googleapis.com/auth/classroom.coursework.me.readonly"
+        "https://www.googleapis.com/auth/classroom.coursework.me.readonly",
+        "https://www.googleapis.com/auth/classroom.rosters.readonly"
     ]
 
     private let tokenStore = KeychainTokenStore()

classroom_app/Google/GoogleClassroomClient.swift

@@ -74,6 +74,42 @@ final class GoogleClassroomClient {
         return todos
     }
 
+    func fetchEnrolledCourses(accessToken: String, pageSize: Int = 50) async throws -> [ClassroomCourse] {
+        let courses = try await listActiveCourses(accessToken: accessToken, pageSize: pageSize)
+        if courses.isEmpty { return [] }
+
+        var enrolled: [ClassroomCourse] = []
+        enrolled.reserveCapacity(courses.count)
+        for course in courses {
+            let teachers = try await listCourseTeachers(accessToken: accessToken, courseId: course.id)
+            let teacherNames = teachers.compactMap { teacher -> String? in
+                let profileName = teacher.profile?.name?.fullName?.trimmingCharacters(in: .whitespacesAndNewlines)
+                if let profileName, profileName.isEmpty == false { return profileName }
+                let email = teacher.profile?.emailAddress?.trimmingCharacters(in: .whitespacesAndNewlines)
+                if let email, email.isEmpty == false { return email }
+                return nil
+            }
+
+            enrolled.append(
+                ClassroomCourse(
+                    id: course.id,
+                    name: (course.name?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false) ? (course.name ?? "Course") : "Course",
+                    section: course.section,
+                    room: course.room,
+                    teacherNames: teacherNames,
+                    enrollmentCode: course.enrollmentCode,
+                    courseState: course.courseState ?? "ACTIVE"
+                )
+            )
+        }
+
+        enrolled.sort {
+            if $0.name != $1.name { return $0.name.localizedCaseInsensitiveCompare($1.name) == .orderedAscending }
+            return $0.id < $1.id
+        }
+        return enrolled
+    }
+
     // MARK: - Courses
 
     private func listActiveCourses(accessToken: String, pageSize: Int) async throws -> [Course] {
@@ -105,6 +141,33 @@ final class GoogleClassroomClient {
         return decoded.courses ?? []
     }
 
+    private func listCourseTeachers(accessToken: String, courseId: String) async throws -> [Teacher] {
+        var components = URLComponents(string: "https://classroom.googleapis.com/v1/courses/\(courseId)/teachers")!
+        components.queryItems = [
+            URLQueryItem(name: "pageSize", value: "30")
+        ]
+
+        var request = URLRequest(url: components.url!)
+        request.httpMethod = "GET"
+        request.setValue("Bearer \(accessToken)", forHTTPHeaderField: "Authorization")
+
+        let (data, response) = try await session.data(for: request)
+        guard let http = response as? HTTPURLResponse else { throw GoogleClassroomClientError.invalidResponse }
+        guard (200..<300).contains(http.statusCode) else {
+            let body = String(data: data, encoding: .utf8) ?? "<no body>"
+            throw GoogleClassroomClientError.httpStatus(http.statusCode, body)
+        }
+
+        let decoded: TeachersList
+        do {
+            decoded = try JSONDecoder().decode(TeachersList.self, from: data)
+        } catch {
+            let raw = String(data: data, encoding: .utf8) ?? "<unreadable body>"
+            throw GoogleClassroomClientError.decodeFailed(raw)
+        }
+        return decoded.teachers ?? []
+    }
+
     // MARK: - CourseWork
 
     private func listPublishedCourseWork(accessToken: String, courseId: String, pageSize: Int) async throws -> [CourseWork] {
@@ -160,6 +223,10 @@ private struct CoursesList: Decodable {
 private struct Course: Decodable {
     let id: String
     let name: String?
+    let section: String?
+    let room: String?
+    let enrollmentCode: String?
+    let courseState: String?
 }
 
 private struct CourseWorkList: Decodable {
@@ -208,3 +275,21 @@ private struct TimeOfDay: Decodable {
     let seconds: Int?
     let nanos: Int?
 }
+
+private struct TeachersList: Decodable {
+    let teachers: [Teacher]?
+    let nextPageToken: String?
+}
+
+private struct Teacher: Decodable {
+    let profile: UserProfile?
+}
+
+private struct UserProfile: Decodable {
+    let name: UserName?
+    let emailAddress: String?
+}
+
+private struct UserName: Decodable {
+    let fullName: String?
+}

classroom_app/Models/ClassroomCourse.swift

@@ -0,0 +1,11 @@
+import Foundation
+
+struct ClassroomCourse: Identifiable, Equatable {
+    let id: String
+    let name: String
+    let section: String?
+    let room: String?
+    let teacherNames: [String]
+    let enrollmentCode: String?
+    let courseState: String
+}

classroom_app/ViewController.swift

@@ -14,8 +14,9 @@ import StoreKit
 private enum SidebarPage: Int {
     case joinMeetings = 0
     case photo = 1
-    case video = 2
-    case settings = 3
+    case enrolled = 2
+    case video = 3
+    case settings = 4
 }
 
 private enum ZoomJoinMode: Int {
@@ -287,6 +288,7 @@ final class ViewController: NSViewController {
     private var hasViewAppearedOnce = false
     private var lastKnownPremiumAccess = false
     private var displayedScheduleTodos: [ClassroomTodoItem] = []
+    private var enrolledCachedCourses: [ClassroomCourse] = []
     private var appUsageSessionStartDate: Date?
     private var hasObservedAppLifecycleForUsage = false
     private var premiumUpgradeRatingPromptWorkItem: DispatchWorkItem?
@@ -356,6 +358,8 @@ final class ViewController: NSViewController {
     private weak var schedulePageRangeErrorLabel: NSTextField?
     private weak var schedulePageCardsStack: NSStackView?
     private weak var schedulePageCardsScrollView: NSScrollView?
+    private weak var enrolledPageHeadingLabel: NSTextField?
+    private weak var enrolledPageCardsStack: NSStackView?
 
     // MARK: - Calendar page (custom month UI)
     private var calendarPageMonthAnchor: Date = Calendar.current.startOfDay(for: Date())
@@ -1262,6 +1266,7 @@ private extension ViewController {
     private func refreshPagesAfterPremiumStateUpdate() {
         pageCache[.joinMeetings] = nil
         pageCache[.photo] = nil
+        pageCache[.enrolled] = nil
         pageCache[.video] = nil
         pageCache[.settings] = nil
         showSidebarPage(selectedSidebarPage)
@@ -1508,6 +1513,8 @@ private extension ViewController {
             built = makeJoinMeetingsContent()
         case .photo:
             built = makeSchedulePageContent()
+        case .enrolled:
+            built = makeEnrolledPageContent()
         case .video:
             built = makeCalendarPageContent()
         case .settings:
@@ -1866,6 +1873,8 @@ private extension ViewController {
             title = "App for Google Classroom"
         case .photo:
             title = "Schedule"
+        case .enrolled:
+            title = "Enrolled"
         case .video:
             title = "Calendar"
         case .settings:
@@ -1909,7 +1918,7 @@ private extension ViewController {
     private func logoTemplateForSidebarPage(_ page: SidebarPage) -> Bool {
         switch page {
         case .photo: return false
-        case .joinMeetings, .video, .settings: return true
+        case .joinMeetings, .enrolled, .video, .settings: return true
         }
     }
 
@@ -1964,6 +1973,9 @@ private extension ViewController {
         let photoRow = sidebarItem("Schedule", icon: "􀏂", page: .photo, systemSymbolName: "clock.badge.checkmark")
         menuStack.addArrangedSubview(photoRow)
         sidebarRowViews[.photo] = photoRow
+        let enrolledRow = sidebarItem("Enrolled", icon: "􀆄", page: .enrolled, systemSymbolName: "person.3.sequence.fill")
+        menuStack.addArrangedSubview(enrolledRow)
+        sidebarRowViews[.enrolled] = enrolledRow
         let videoRow = sidebarItem("Calendar", icon: "􀎚", page: .video, systemSymbolName: "calendar")
         menuStack.addArrangedSubview(videoRow)
         sidebarRowViews[.video] = videoRow
@@ -2201,6 +2213,109 @@ private extension ViewController {
         return panel
     }
 
+    func makeEnrolledPageContent() -> NSView {
+        let panel = NSView()
+        panel.translatesAutoresizingMaskIntoConstraints = false
+        panel.userInterfaceLayoutDirection = .leftToRight
+
+        let contentStack = NSStackView()
+        contentStack.translatesAutoresizingMaskIntoConstraints = false
+        contentStack.userInterfaceLayoutDirection = .leftToRight
+        contentStack.orientation = .vertical
+        contentStack.spacing = 14
+        contentStack.alignment = .width
+        contentStack.distribution = .fill
+
+        let titleRow = NSStackView()
+        titleRow.translatesAutoresizingMaskIntoConstraints = false
+        titleRow.userInterfaceLayoutDirection = .leftToRight
+        titleRow.orientation = .horizontal
+        titleRow.alignment = .centerY
+        titleRow.distribution = .fill
+        titleRow.spacing = 10
+
+        let titleLabel = textLabel("Enrolled Classes", font: typography.pageTitle, color: palette.textPrimary)
+        titleLabel.alignment = .left
+        titleLabel.maximumNumberOfLines = 1
+        titleLabel.lineBreakMode = .byTruncatingTail
+        titleLabel.setContentHuggingPriority(.required, for: .horizontal)
+        titleLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
+
+        let spacer = NSView()
+        spacer.translatesAutoresizingMaskIntoConstraints = false
+        spacer.setContentHuggingPriority(.defaultLow, for: .horizontal)
+        spacer.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+
+        let refreshButton = makeScheduleRefreshButton()
+        refreshButton.target = self
+        refreshButton.action = #selector(enrolledPageRefreshPressed(_:))
+
+        titleRow.addArrangedSubview(titleLabel)
+        titleRow.addArrangedSubview(spacer)
+        titleRow.addArrangedSubview(refreshButton)
+
+        let heading = textLabel(enrolledPageInitialHeadingText(), font: typography.dateHeading, color: palette.textSecondary)
+        heading.alignment = .left
+        heading.maximumNumberOfLines = 2
+        heading.lineBreakMode = .byWordWrapping
+        enrolledPageHeadingLabel = heading
+
+        let scroll = NSScrollView()
+        scroll.translatesAutoresizingMaskIntoConstraints = false
+        scroll.userInterfaceLayoutDirection = .leftToRight
+        scroll.drawsBackground = false
+        scroll.hasHorizontalScroller = false
+        scroll.hasVerticalScroller = true
+        scroll.autohidesScrollers = true
+        scroll.borderType = .noBorder
+        scroll.scrollerStyle = .overlay
+        scroll.automaticallyAdjustsContentInsets = false
+        let clip = TopAlignedClipView()
+        clip.drawsBackground = false
+        scroll.contentView = clip
+
+        let stack = NSStackView()
+        stack.translatesAutoresizingMaskIntoConstraints = false
+        stack.userInterfaceLayoutDirection = .leftToRight
+        stack.orientation = .vertical
+        stack.spacing = 14
+        stack.alignment = .width
+        enrolledPageCardsStack = stack
+        scroll.documentView = stack
+
+        NSLayoutConstraint.activate([
+            stack.leadingAnchor.constraint(equalTo: scroll.contentView.leadingAnchor),
+            stack.trailingAnchor.constraint(equalTo: scroll.contentView.trailingAnchor),
+            stack.topAnchor.constraint(equalTo: scroll.contentView.topAnchor),
+            stack.widthAnchor.constraint(equalTo: scroll.contentView.widthAnchor)
+        ])
+
+        contentStack.addArrangedSubview(titleRow)
+        contentStack.setCustomSpacing(10, after: titleRow)
+        contentStack.addArrangedSubview(heading)
+        contentStack.setCustomSpacing(12, after: heading)
+        contentStack.addArrangedSubview(scroll)
+        panel.addSubview(contentStack)
+
+        NSLayoutConstraint.activate([
+            contentStack.leftAnchor.constraint(equalTo: panel.leftAnchor, constant: 28),
+            contentStack.rightAnchor.constraint(equalTo: panel.rightAnchor, constant: -28),
+            contentStack.topAnchor.constraint(equalTo: panel.topAnchor),
+            contentStack.bottomAnchor.constraint(equalTo: panel.bottomAnchor, constant: -16),
+            titleRow.widthAnchor.constraint(equalTo: contentStack.widthAnchor),
+            heading.widthAnchor.constraint(equalTo: contentStack.widthAnchor),
+            scroll.widthAnchor.constraint(equalTo: contentStack.widthAnchor),
+            scroll.heightAnchor.constraint(greaterThanOrEqualToConstant: 420)
+        ])
+
+        renderEnrolledClassCards([])
+        Task { [weak self] in
+            await self?.loadEnrolledClasses()
+        }
+
+        return panel
+    }
+
     func makeCalendarPageContent() -> NSView {
         let panel = NSView()
         panel.translatesAutoresizingMaskIntoConstraints = false
@@ -5845,6 +5960,16 @@ private extension ViewController {
         googleOAuth.loadTokens() == nil ? "Connect Google to see your to-do" : "Loading to-do…"
     }
 
+    private func enrolledPageInitialHeadingText() -> String {
+        googleOAuth.loadTokens() == nil ? "Connect Google to see enrolled classes" : "Loading classes…"
+    }
+
+    @objc func enrolledPageRefreshPressed(_ sender: NSButton) {
+        Task { [weak self] in
+            await self?.loadEnrolledClasses()
+        }
+    }
+
     @objc func scheduleFilterDropdownChanged(_ sender: NSPopUpButton) {
         guard let selectedItem = sender.selectedItem,
               let filter = ScheduleFilter(rawValue: selectedItem.tag) else { return }
@@ -5950,10 +6075,102 @@ private extension ViewController {
         return f.string(from: day)
     }
 
+    private func enrolledPageHeadingText(for courses: [ClassroomCourse]) -> String {
+        if googleOAuth.loadTokens() == nil { return "Connect Google to see enrolled classes" }
+        if courses.isEmpty { return "No active enrolled classes" }
+        return "\(courses.count) enrolled class\(courses.count == 1 ? "" : "es")"
+    }
+
     private func openURL(_ url: URL) {
         NSWorkspace.shared.open(url)
     }
 
+    private func renderEnrolledClassCards(_ courses: [ClassroomCourse]) {
+        guard let stack = enrolledPageCardsStack else { return }
+
+        stack.arrangedSubviews.forEach { view in
+            stack.removeArrangedSubview(view)
+            view.removeFromSuperview()
+        }
+
+        if courses.isEmpty {
+            let empty = roundedContainer(cornerRadius: 12, color: palette.sectionCard)
+            empty.translatesAutoresizingMaskIntoConstraints = false
+            empty.heightAnchor.constraint(equalToConstant: 128).isActive = true
+            styleSurface(empty, borderColor: palette.inputBorder, borderWidth: 1, shadow: false)
+
+            let emptyLabel = textLabel(
+                googleOAuth.loadTokens() == nil ? "Connect to load classes" : "No enrolled classes found",
+                font: typography.cardSubtitle,
+                color: palette.textSecondary
+            )
+            emptyLabel.translatesAutoresizingMaskIntoConstraints = false
+            emptyLabel.alignment = .left
+            empty.addSubview(emptyLabel)
+
+            NSLayoutConstraint.activate([
+                emptyLabel.leadingAnchor.constraint(equalTo: empty.leadingAnchor, constant: 18),
+                emptyLabel.trailingAnchor.constraint(equalTo: empty.trailingAnchor, constant: -18),
+                emptyLabel.centerYAnchor.constraint(equalTo: empty.centerYAnchor)
+            ])
+            stack.addArrangedSubview(empty)
+            return
+        }
+
+        for course in courses {
+            stack.addArrangedSubview(enrolledClassCard(course: course))
+        }
+    }
+
+    private func enrolledClassCard(course: ClassroomCourse) -> NSView {
+        let card = roundedContainer(cornerRadius: 14, color: palette.sectionCard)
+        card.translatesAutoresizingMaskIntoConstraints = false
+        styleSurface(card, borderColor: palette.inputBorder, borderWidth: 1, shadow: false)
+        card.heightAnchor.constraint(greaterThanOrEqualToConstant: 124).isActive = true
+
+        let title = textLabel(course.name, font: NSFont.systemFont(ofSize: 17, weight: .semibold), color: palette.textPrimary)
+        title.translatesAutoresizingMaskIntoConstraints = false
+        title.alignment = .left
+        title.maximumNumberOfLines = 2
+        title.lineBreakMode = .byWordWrapping
+
+        let sectionText = [course.section, course.room]
+            .compactMap { $0?.trimmingCharacters(in: .whitespacesAndNewlines) }
+            .filter { !$0.isEmpty }
+            .joined(separator: " • ")
+        let sectionLabel = textLabel(sectionText.isEmpty ? "Section details unavailable" : sectionText, font: typography.cardSubtitle, color: palette.textSecondary)
+        sectionLabel.translatesAutoresizingMaskIntoConstraints = false
+        sectionLabel.alignment = .left
+        sectionLabel.maximumNumberOfLines = 1
+        sectionLabel.lineBreakMode = .byTruncatingTail
+
+        let teachers = course.teacherNames.isEmpty ? "Teacher unavailable" : course.teacherNames.joined(separator: ", ")
+        let teacherLabel = textLabel("Teacher: \(teachers)", font: NSFont.systemFont(ofSize: 12, weight: .medium), color: palette.textMuted)
+        teacherLabel.translatesAutoresizingMaskIntoConstraints = false
+        teacherLabel.alignment = .left
+        teacherLabel.maximumNumberOfLines = 2
+        teacherLabel.lineBreakMode = .byWordWrapping
+
+        card.addSubview(title)
+        card.addSubview(sectionLabel)
+        card.addSubview(teacherLabel)
+        NSLayoutConstraint.activate([
+            title.leadingAnchor.constraint(equalTo: card.leadingAnchor, constant: 18),
+            title.trailingAnchor.constraint(equalTo: card.trailingAnchor, constant: -18),
+            title.topAnchor.constraint(equalTo: card.topAnchor, constant: 16),
+
+            sectionLabel.leadingAnchor.constraint(equalTo: title.leadingAnchor),
+            sectionLabel.trailingAnchor.constraint(equalTo: title.trailingAnchor),
+            sectionLabel.topAnchor.constraint(equalTo: title.bottomAnchor, constant: 8),
+
+            teacherLabel.leadingAnchor.constraint(equalTo: title.leadingAnchor),
+            teacherLabel.trailingAnchor.constraint(equalTo: title.trailingAnchor),
+            teacherLabel.topAnchor.constraint(equalTo: sectionLabel.bottomAnchor, constant: 10),
+            teacherLabel.bottomAnchor.constraint(lessThanOrEqualTo: card.bottomAnchor, constant: -16)
+        ])
+        return card
+    }
+
     private func renderScheduleCards(into stack: NSStackView, todos: [ClassroomTodoItem]) {
         displayedScheduleTodos = todos
         let shouldShowScrollControls = todos.count > 3
@@ -6293,6 +6510,48 @@ private extension ViewController {
         }
     }
 
+    private func loadEnrolledClasses() async {
+        do {
+            if googleOAuth.loadTokens() == nil {
+                await MainActor.run {
+                    enrolledCachedCourses = []
+                    enrolledPageHeadingLabel?.stringValue = "Connect Google to see enrolled classes"
+                    renderEnrolledClassCards([])
+                }
+                return
+            }
+
+            let token = try await googleOAuth.validAccessToken(presentingWindow: view.window)
+            let courses = try await classroomClient.fetchEnrolledCourses(accessToken: token)
+
+            await MainActor.run {
+                enrolledCachedCourses = courses
+                enrolledPageHeadingLabel?.stringValue = enrolledPageHeadingText(for: courses)
+                renderEnrolledClassCards(courses)
+            }
+        } catch {
+            await MainActor.run {
+                if errorRequiresReconsentForClassroomScopes(error) {
+                    _ = try? googleOAuth.signOut()
+                    applyGoogleProfile(nil)
+                    updateGoogleAuthButtonTitle()
+                    enrolledCachedCourses = []
+                    enrolledPageHeadingLabel?.stringValue = "Reconnect Google to enable Classroom permissions"
+                    renderEnrolledClassCards([])
+                    showSimpleAlert(
+                        title: "Reconnect Google",
+                        message: "We added Google Classroom permissions. Please connect your Google account again so Google can grant access to your classes."
+                    )
+                    return
+                }
+                enrolledCachedCourses = []
+                enrolledPageHeadingLabel?.stringValue = "Couldn’t load enrolled classes"
+                renderEnrolledClassCards([])
+                showSimpleError("Couldn’t load enrolled classes.", error: error)
+            }
+        }
+    }
+
     func showScheduleHelp() {
         let alert = NSAlert()
         alert.messageText = "Google Classroom to-do"
@@ -6311,6 +6570,7 @@ private extension ViewController {
                     self.scheduleDateHeadingLabel?.stringValue = "Refreshing…"
                     self.pageCache[.joinMeetings] = nil
                     self.pageCache[.photo] = nil
+                    self.pageCache[.enrolled] = nil
                     self.showSidebarPage(self.selectedSidebarPage)
                 }
                 await self.loadSchedule()
@@ -6339,6 +6599,7 @@ private extension ViewController {
                     self.applyGoogleProfile(profile.map { self.makeGoogleProfileDisplay(from: $0) })
                     self.pageCache[.joinMeetings] = nil
                     self.pageCache[.photo] = nil
+                    self.pageCache[.enrolled] = nil
                     self.pageCache[.video] = nil
                     self.pageCache[.settings] = nil
                     self.showSidebarPage(self.selectedSidebarPage)
@@ -6390,6 +6651,7 @@ private extension ViewController {
             updateGoogleAuthButtonTitle()
             pageCache[.joinMeetings] = nil
             pageCache[.photo] = nil
+            pageCache[.enrolled] = nil
             pageCache[.video] = nil
             pageCache[.settings] = nil
             showSidebarPage(selectedSidebarPage)