Add a Teaching page that mirrors Enrolled with the same class-card and details-popup behavior while loading courses taught by the signed-in user.

Also make single class cards span full width, rename the sidebar Schedule label to To-Do, and tolerate Classroom permission-denied detail sections so popups still open with available content.

Made-with: Cursor

classroom_app/Google/GoogleClassroomClient.swift

@@ -110,10 +110,60 @@ final class GoogleClassroomClient {
         return enrolled
     }
 
+    func fetchTeachingCourses(accessToken: String, pageSize: Int = 50) async throws -> [ClassroomCourse] {
+        let courses = try await listTeachingActiveCourses(accessToken: accessToken, pageSize: pageSize)
+        if courses.isEmpty { return [] }
+
+        var teaching: [ClassroomCourse] = []
+        teaching.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
+            }
+
+            teaching.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"
+                )
+            )
+        }
+
+        teaching.sort {
+            if $0.name != $1.name { return $0.name.localizedCaseInsensitiveCompare($1.name) == .orderedAscending }
+            return $0.id < $1.id
+        }
+        return teaching
+    }
+
     func fetchClassDetails(accessToken: String, courseId: String, courseName: String) async throws -> ClassroomClassDetails {
         async let announcementsTask = listCourseAnnouncements(accessToken: accessToken, courseId: courseId, pageSize: 30)
         async let courseworkTask = listPublishedCourseWork(accessToken: accessToken, courseId: courseId, pageSize: 30)
-        let (announcements, coursework) = try await (announcementsTask, courseworkTask)
+
+        let announcements: [CourseAnnouncement]
+        let coursework: [CourseWork]
+
+        do {
+            announcements = try await announcementsTask
+        } catch let err as GoogleClassroomClientError where err.isPermissionDenied {
+            announcements = []
+        }
+
+        do {
+            coursework = try await courseworkTask
+        } catch let err as GoogleClassroomClientError where err.isPermissionDenied {
+            coursework = []
+        }
 
         let mappedAnnouncements = announcements.map { item in
             let text = item.text?.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -180,6 +230,35 @@ final class GoogleClassroomClient {
         return decoded.courses ?? []
     }
 
+    private func listTeachingActiveCourses(accessToken: String, pageSize: Int) async throws -> [Course] {
+        var components = URLComponents(string: "https://classroom.googleapis.com/v1/courses")!
+        components.queryItems = [
+            URLQueryItem(name: "teacherId", value: "me"),
+            URLQueryItem(name: "courseStates", value: "ACTIVE"),
+            URLQueryItem(name: "pageSize", value: String(max(1, min(100, pageSize))))
+        ]
+
+        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: CoursesList
+        do {
+            decoded = try JSONDecoder().decode(CoursesList.self, from: data)
+        } catch {
+            let raw = String(data: data, encoding: .utf8) ?? "<unreadable body>"
+            throw GoogleClassroomClientError.decodeFailed(raw)
+        }
+        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 = [
@@ -328,6 +407,14 @@ final class GoogleClassroomClient {
     }
 }
 
+private extension GoogleClassroomClientError {
+    var isPermissionDenied: Bool {
+        guard case let .httpStatus(status, body) = self, status == 403 else { return false }
+        let lowercasedBody = body.lowercased()
+        return lowercasedBody.contains("permission_denied") || lowercasedBody.contains("does not have permission")
+    }
+}
+
 extension GoogleClassroomClientError: LocalizedError {
     var errorDescription: String? {
         switch self {

classroom_app/ViewController.swift

@@ -15,8 +15,9 @@ private enum SidebarPage: Int {
     case joinMeetings = 0
     case photo = 1
     case enrolled = 2
-    case video = 3
-    case settings = 4
+    case teaching = 3
+    case video = 4
+    case settings = 5
 }
 
 private enum ZoomJoinMode: Int {
@@ -289,6 +290,7 @@ final class ViewController: NSViewController {
     private var lastKnownPremiumAccess = false
     private var displayedScheduleTodos: [ClassroomTodoItem] = []
     private var enrolledCachedCourses: [ClassroomCourse] = []
+    private var teachingCachedCourses: [ClassroomCourse] = []
     private var appUsageSessionStartDate: Date?
     private var hasObservedAppLifecycleForUsage = false
     private var premiumUpgradeRatingPromptWorkItem: DispatchWorkItem?
@@ -360,9 +362,11 @@ final class ViewController: NSViewController {
     private weak var schedulePageCardsScrollView: NSScrollView?
     private weak var enrolledPageHeadingLabel: NSTextField?
     private weak var enrolledPageCardsStack: NSStackView?
-    private let enrolledSingleCardWidth: CGFloat = 320
+    private weak var teachingPageHeadingLabel: NSTextField?
+    private weak var teachingPageCardsStack: NSStackView?
     private var enrolledClassDetailsPopover: NSPopover?
     private var enrolledCourseByCardID: [String: ClassroomCourse] = [:]
+    private var teachingCourseByCardID: [String: ClassroomCourse] = [:]
 
     // MARK: - Calendar page (custom month UI)
     private var calendarPageMonthAnchor: Date = Calendar.current.startOfDay(for: Date())
@@ -1270,6 +1274,7 @@ private extension ViewController {
         pageCache[.joinMeetings] = nil
         pageCache[.photo] = nil
         pageCache[.enrolled] = nil
+        pageCache[.teaching] = nil
         pageCache[.video] = nil
         pageCache[.settings] = nil
         showSidebarPage(selectedSidebarPage)
@@ -1518,6 +1523,8 @@ private extension ViewController {
             built = makeSchedulePageContent()
         case .enrolled:
             built = makeEnrolledPageContent()
+        case .teaching:
+            built = makeTeachingPageContent()
         case .video:
             built = makeCalendarPageContent()
         case .settings:
@@ -1878,6 +1885,8 @@ private extension ViewController {
             title = "Schedule"
         case .enrolled:
             title = "Enrolled"
+        case .teaching:
+            title = "Teaching"
         case .video:
             title = "Calendar"
         case .settings:
@@ -1921,7 +1930,7 @@ private extension ViewController {
     private func logoTemplateForSidebarPage(_ page: SidebarPage) -> Bool {
         switch page {
         case .photo: return false
-        case .joinMeetings, .enrolled, .video, .settings: return true
+        case .joinMeetings, .enrolled, .teaching, .video, .settings: return true
         }
     }
 
@@ -1982,12 +1991,15 @@ private extension ViewController {
         menuStack.addArrangedSubview(joinRow)
         sidebarRowViews[.joinMeetings] = joinRow
         menuStack.addArrangedSubview(sidebarSectionTitle("Planning"))
-        let photoRow = sidebarItem("Schedule", icon: "􀏂", page: .photo, systemSymbolName: "clock.badge.checkmark")
+        let photoRow = sidebarItem("To-Do", 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 teachingRow = sidebarItem("Teaching", icon: "􀅼", page: .teaching, systemSymbolName: "person.2.badge.gearshape.fill")
+        menuStack.addArrangedSubview(teachingRow)
+        sidebarRowViews[.teaching] = teachingRow
         let videoRow = sidebarItem("Calendar", icon: "􀎚", page: .video, systemSymbolName: "calendar")
         menuStack.addArrangedSubview(videoRow)
         sidebarRowViews[.video] = videoRow
@@ -2328,6 +2340,109 @@ private extension ViewController {
         return panel
     }
 
+    func makeTeachingPageContent() -> 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("Teaching 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(teachingPageRefreshPressed(_:))
+
+        titleRow.addArrangedSubview(titleLabel)
+        titleRow.addArrangedSubview(spacer)
+        titleRow.addArrangedSubview(refreshButton)
+
+        let heading = textLabel(teachingPageInitialHeadingText(), font: typography.dateHeading, color: palette.textSecondary)
+        heading.alignment = .left
+        heading.maximumNumberOfLines = 2
+        heading.lineBreakMode = .byWordWrapping
+        teachingPageHeadingLabel = 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 = .leading
+        teachingPageCardsStack = 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)
+        ])
+
+        renderTeachingClassCards([])
+        Task { [weak self] in
+            await self?.loadTeachingClasses()
+        }
+
+        return panel
+    }
+
     func makeCalendarPageContent() -> NSView {
         let panel = NSView()
         panel.translatesAutoresizingMaskIntoConstraints = false
@@ -6461,12 +6576,22 @@ private extension ViewController {
         googleOAuth.loadTokens() == nil ? "Connect Google to see enrolled classes" : "Loading classes…"
     }
 
+    private func teachingPageInitialHeadingText() -> String {
+        googleOAuth.loadTokens() == nil ? "Connect Google to see teaching classes" : "Loading classes…"
+    }
+
     @objc func enrolledPageRefreshPressed(_ sender: NSButton) {
         Task { [weak self] in
             await self?.loadEnrolledClasses()
         }
     }
 
+    @objc func teachingPageRefreshPressed(_ sender: NSButton) {
+        Task { [weak self] in
+            await self?.loadTeachingClasses()
+        }
+    }
+
     @objc func scheduleFilterDropdownChanged(_ sender: NSPopUpButton) {
         guard let selectedItem = sender.selectedItem,
               let filter = ScheduleFilter(rawValue: selectedItem.tag) else { return }
@@ -6578,6 +6703,12 @@ private extension ViewController {
         return "\(courses.count) enrolled class\(courses.count == 1 ? "" : "es")"
     }
 
+    private func teachingPageHeadingText(for courses: [ClassroomCourse]) -> String {
+        if googleOAuth.loadTokens() == nil { return "Connect Google to see teaching classes" }
+        if courses.isEmpty { return "No active teaching classes" }
+        return "\(courses.count) teaching class\(courses.count == 1 ? "" : "es")"
+    }
+
     private func openURL(_ url: URL) {
         NSWorkspace.shared.open(url)
     }
@@ -6616,16 +6747,51 @@ private extension ViewController {
             return
         }
 
-        let isSingleCard = (courses.count == 1)
         for course in courses {
             let card = enrolledClassCardButton(course: course)
             stack.addArrangedSubview(card)
-            if isSingleCard {
-                card.widthAnchor.constraint(equalToConstant: enrolledSingleCardWidth).isActive = true
-                card.widthAnchor.constraint(lessThanOrEqualTo: stack.widthAnchor).isActive = true
-            } else {
-                card.widthAnchor.constraint(equalTo: stack.widthAnchor).isActive = true
-            }
+            card.widthAnchor.constraint(equalTo: stack.widthAnchor).isActive = true
+        }
+    }
+
+    private func renderTeachingClassCards(_ courses: [ClassroomCourse]) {
+        guard let stack = teachingPageCardsStack else { return }
+        teachingCourseByCardID.removeAll()
+
+        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 teaching 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)
+            empty.widthAnchor.constraint(equalTo: stack.widthAnchor).isActive = true
+            return
+        }
+
+        for course in courses {
+            let card = teachingClassCardButton(course: course)
+            stack.addArrangedSubview(card)
+            card.widthAnchor.constraint(equalTo: stack.widthAnchor).isActive = true
         }
     }
 
@@ -6664,6 +6830,12 @@ private extension ViewController {
         enrolledClassCardClicked(view: sender, course: course)
     }
 
+    @objc private func teachingCardButtonPressed(_ sender: NSButton) {
+        guard let courseID = sender.identifier?.rawValue,
+              let course = teachingCourseByCardID[courseID] else { return }
+        enrolledClassCardClicked(view: sender, course: course)
+    }
+
     private func enrolledClassCard(course: ClassroomCourse) -> NSView {
         let card = roundedContainer(cornerRadius: 14, color: palette.sectionCard)
         card.translatesAutoresizingMaskIntoConstraints = false
@@ -6713,6 +6885,35 @@ private extension ViewController {
         return card
     }
 
+    private func teachingClassCardButton(course: ClassroomCourse) -> NSView {
+        let hit = HoverButton(title: "", target: self, action: #selector(teachingCardButtonPressed(_:)))
+        hit.translatesAutoresizingMaskIntoConstraints = false
+        hit.isBordered = false
+        hit.bezelStyle = .regularSquare
+        hit.wantsLayer = true
+        hit.identifier = NSUserInterfaceItemIdentifier(course.id)
+        teachingCourseByCardID[course.id] = course
+        hit.heightAnchor.constraint(greaterThanOrEqualToConstant: 124).isActive = true
+
+        let card = enrolledClassCard(course: course)
+        hit.addSubview(card)
+        NSLayoutConstraint.activate([
+            card.leadingAnchor.constraint(equalTo: hit.leadingAnchor),
+            card.trailingAnchor.constraint(equalTo: hit.trailingAnchor),
+            card.topAnchor.constraint(equalTo: hit.topAnchor),
+            card.bottomAnchor.constraint(equalTo: hit.bottomAnchor)
+        ])
+        hit.onHoverChanged = { [weak self, weak card] hovering in
+            guard let self, let card else { return }
+            let base = self.palette.sectionCard
+            let hoverBlend = self.darkModeEnabled ? NSColor.white : NSColor.black
+            let hover = base.blended(withFraction: 0.10, of: hoverBlend) ?? base
+            card.layer?.backgroundColor = (hovering ? hover : base).cgColor
+        }
+        hit.onHoverChanged?(false)
+        return hit
+    }
+
     private func enrolledClassCardClicked(view: NSView, course: ClassroomCourse) {
         Task { [weak self, weak view] in
             guard let self, let view else { return }
@@ -6751,6 +6952,7 @@ private extension ViewController {
         }
     }
 
+
     private func showEnrolledClassDetailsPopover(details: ClassroomClassDetails, defaultAuthorName: String, relativeTo anchor: NSView) {
         enrolledClassDetailsPopover?.performClose(nil)
         let popover = NSPopover()
@@ -7230,6 +7432,48 @@ private extension ViewController {
         }
     }
 
+    private func loadTeachingClasses() async {
+        do {
+            if googleOAuth.loadTokens() == nil {
+                await MainActor.run {
+                    teachingCachedCourses = []
+                    teachingPageHeadingLabel?.stringValue = "Connect Google to see teaching classes"
+                    renderTeachingClassCards([])
+                }
+                return
+            }
+
+            let token = try await googleOAuth.validAccessToken(presentingWindow: view.window)
+            let courses = try await classroomClient.fetchTeachingCourses(accessToken: token)
+
+            await MainActor.run {
+                teachingCachedCourses = courses
+                teachingPageHeadingLabel?.stringValue = teachingPageHeadingText(for: courses)
+                renderTeachingClassCards(courses)
+            }
+        } catch {
+            await MainActor.run {
+                if errorRequiresReconsentForClassroomScopes(error) {
+                    _ = try? googleOAuth.signOut()
+                    applyGoogleProfile(nil)
+                    updateGoogleAuthButtonTitle()
+                    teachingCachedCourses = []
+                    teachingPageHeadingLabel?.stringValue = "Reconnect Google to enable Classroom permissions"
+                    renderTeachingClassCards([])
+                    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
+                }
+                teachingCachedCourses = []
+                teachingPageHeadingLabel?.stringValue = "Couldn’t load teaching classes"
+                renderTeachingClassCards([])
+                showSimpleError("Couldn’t load teaching classes.", error: error)
+            }
+        }
+    }
+
     func showScheduleHelp() {
         let alert = NSAlert()
         alert.messageText = "Google Classroom to-do"
@@ -7249,6 +7493,7 @@ private extension ViewController {
                     self.pageCache[.joinMeetings] = nil
                     self.pageCache[.photo] = nil
                     self.pageCache[.enrolled] = nil
+                    self.pageCache[.teaching] = nil
                     self.showSidebarPage(self.selectedSidebarPage)
                 }
                 await self.loadSchedule()
@@ -7278,6 +7523,7 @@ private extension ViewController {
                     self.pageCache[.joinMeetings] = nil
                     self.pageCache[.photo] = nil
                     self.pageCache[.enrolled] = nil
+                    self.pageCache[.teaching] = nil
                     self.pageCache[.video] = nil
                     self.pageCache[.settings] = nil
                     self.showSidebarPage(self.selectedSidebarPage)
@@ -7330,6 +7576,7 @@ private extension ViewController {
             pageCache[.joinMeetings] = nil
             pageCache[.photo] = nil
             pageCache[.enrolled] = nil
+            pageCache[.teaching] = nil
             pageCache[.video] = nil
             pageCache[.settings] = nil
             showSidebarPage(selectedSidebarPage)