From 048473070eeed65c891147baf812ce7a6141f9c8 Mon Sep 17 00:00:00 2001 From: Alex Mickelson Date: Wed, 21 Aug 2024 11:21:28 -0600 Subject: [PATCH] renaming --- .../canvas/assignments/canvasAssignment.ts | 10 ++++----- .../{CanvasLockInfo.ts => canvasLockInfo.ts} | 0 .../canvas/courses/calendarLinkModel.ts | 3 --- .../canvas/courses/canvasCalendarLinkModel.ts | 3 +++ .../{courseModel.ts => canvasCourseModel.ts} | 22 ++++++++++--------- ...sModel.ts => canvasCourseProgressModel.ts} | 2 +- ...sModel.ts => canvasCourseSettingsModel.ts} | 2 +- .../{termModel.ts => canvasTermModel.ts} | 2 +- .../discussions/canvasDiscussionModelTopic.ts | 10 ++++----- .../discussions/canvasFileAttachmentModel.ts | 2 +- ...lmentModel.ts => canvasEnrollmentModel.ts} | 10 ++++----- .../{gradeModel.ts => canvasG'radeModel.ts} | 2 +- .../canvas/modules/canvasModuleItems.ts | 14 +++++------- .../models/canvas/quizzes/canvasQuizModel.ts | 2 +- .../submissions/canvasSubmissionModel.ts | 14 ++++++------ .../models/canvas/users/canvasUserModel.ts | 6 ++--- .../models/canvas/users/userDisplayModel.ts | 4 ++-- 17 files changed, 54 insertions(+), 54 deletions(-) rename nextjs/src/models/canvas/assignments/{CanvasLockInfo.ts => canvasLockInfo.ts} (100%) delete mode 100644 nextjs/src/models/canvas/courses/calendarLinkModel.ts create mode 100644 nextjs/src/models/canvas/courses/canvasCalendarLinkModel.ts rename nextjs/src/models/canvas/courses/{courseModel.ts => canvasCourseModel.ts} (69%) rename nextjs/src/models/canvas/courses/{courseProgressModel.ts => canvasCourseProgressModel.ts} (77%) rename nextjs/src/models/canvas/courses/{courseSettingsModel.ts => canvasCourseSettingsModel.ts} (92%) rename nextjs/src/models/canvas/courses/{termModel.ts => canvasTermModel.ts} (77%) rename nextjs/src/models/canvas/enrollments/{enrollmentModel.ts => canvasEnrollmentModel.ts} (86%) rename nextjs/src/models/canvas/enrollments/{gradeModel.ts => canvasG'radeModel.ts} (87%) diff --git a/nextjs/src/models/canvas/assignments/canvasAssignment.ts b/nextjs/src/models/canvas/assignments/canvasAssignment.ts index 87a5f5c..ae791f2 100644 --- a/nextjs/src/models/canvas/assignments/canvasAssignment.ts +++ b/nextjs/src/models/canvas/assignments/canvasAssignment.ts @@ -1,9 +1,9 @@ -import { DiscussionTopicModel } from "../discussions/canvasDiscussionModelTopic"; -import { SubmissionModel } from "../submissions/canvasSubmissionModel"; +import { CanvasDiscussionTopicModel } from "../discussions/canvasDiscussionModelTopic"; +import { CanvasSubmissionModel } from "../submissions/canvasSubmissionModel"; import { CanvasAssignmentDate } from "./canvasAssignmentDate"; import { CanvasAssignmentOverride } from "./canvasAssignmentOverride"; import { CanvasExternalToolTagAttributes } from "./canvasExternalToolTagAttributes"; -import { CanvasLockInfo } from "./CanvasLockInfo"; +import { CanvasLockInfo } from "./canvasLockInfo"; import { CanvasRubricCriteria } from "./canvasRubricCriteria"; import { CanvasTurnitinSettings } from "./canvasTurnitinSettings"; @@ -63,11 +63,11 @@ export interface CanvasAssignment { lock_explanation?: string; quiz_id?: number; anonymous_submissions?: boolean; - discussion_topic?: DiscussionTopicModel; + discussion_topic?: CanvasDiscussionTopicModel; freeze_on_copy?: boolean; frozen?: boolean; frozen_attributes?: string[]; - submission?: SubmissionModel; + submission?: CanvasSubmissionModel; use_rubric_for_grading?: boolean; rubric_settings?: any; rubric?: CanvasRubricCriteria[]; diff --git a/nextjs/src/models/canvas/assignments/CanvasLockInfo.ts b/nextjs/src/models/canvas/assignments/canvasLockInfo.ts similarity index 100% rename from nextjs/src/models/canvas/assignments/CanvasLockInfo.ts rename to nextjs/src/models/canvas/assignments/canvasLockInfo.ts diff --git a/nextjs/src/models/canvas/courses/calendarLinkModel.ts b/nextjs/src/models/canvas/courses/calendarLinkModel.ts deleted file mode 100644 index 4c2b619..0000000 --- a/nextjs/src/models/canvas/courses/calendarLinkModel.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface CalendarLinkModel { - ics: string; -} diff --git a/nextjs/src/models/canvas/courses/canvasCalendarLinkModel.ts b/nextjs/src/models/canvas/courses/canvasCalendarLinkModel.ts new file mode 100644 index 0000000..5ed98de --- /dev/null +++ b/nextjs/src/models/canvas/courses/canvasCalendarLinkModel.ts @@ -0,0 +1,3 @@ +export interface CanvasCalendarLinkModel { + ics: string; +} diff --git a/nextjs/src/models/canvas/courses/courseModel.ts b/nextjs/src/models/canvas/courses/canvasCourseModel.ts similarity index 69% rename from nextjs/src/models/canvas/courses/courseModel.ts rename to nextjs/src/models/canvas/courses/canvasCourseModel.ts index 9bb55c0..0090d42 100644 --- a/nextjs/src/models/canvas/courses/courseModel.ts +++ b/nextjs/src/models/canvas/courses/canvasCourseModel.ts @@ -1,9 +1,9 @@ -import { EnrollmentModel } from "../enrollments/enrollmentModel"; -import { CalendarLinkModel } from "./calendarLinkModel"; -import { CourseProgressModel } from "./courseProgressModel"; -import { TermModel } from "./termModel"; +import { CanvasEnrollmentModel } from "../enrollments/canvasEnrollmentModel"; +import { CanvasCalendarLinkModel } from "./canvasCalendarLinkModel"; +import { CanvasCourseProgressModel } from "./canvasCourseProgressModel"; +import { CanvasTermModel } from "./canvasTermModel"; -export interface CourseModel { +export interface CanvasCourseModel { id: number; sis_course_id: string; uuid: string; @@ -16,7 +16,7 @@ export interface CourseModel { enrollment_term_id: number; created_at: string; // ISO 8601 date string locale: string; - calendar: CalendarLinkModel; + calendar: CanvasCalendarLinkModel; default_view: string; syllabus_body: string; permissions: { [key: string]: boolean }; @@ -29,11 +29,11 @@ export interface CourseModel { grading_standard_id?: number; start_at?: string; // ISO 8601 date string end_at?: string; // ISO 8601 date string - enrollments?: EnrollmentModel[]; + enrollments?: CanvasEnrollmentModel[]; total_students?: number; needs_grading_count?: number; - term?: TermModel; - course_progress?: CourseProgressModel; + term?: CanvasTermModel; + course_progress?: CanvasCourseProgressModel; apply_assignment_group_weights?: boolean; is_public?: boolean; is_public_to_auth_users?: boolean; @@ -50,5 +50,7 @@ export interface CourseModel { access_restricted_by_date?: boolean; blueprint?: boolean; blueprint_restrictions?: { [key: string]: boolean }; - blueprint_restrictions_by_object_type?: { [key: string]: { [key: string]: boolean } }; + blueprint_restrictions_by_object_type?: { + [key: string]: { [key: string]: boolean }; + }; } diff --git a/nextjs/src/models/canvas/courses/courseProgressModel.ts b/nextjs/src/models/canvas/courses/canvasCourseProgressModel.ts similarity index 77% rename from nextjs/src/models/canvas/courses/courseProgressModel.ts rename to nextjs/src/models/canvas/courses/canvasCourseProgressModel.ts index 6f994aa..99b1df1 100644 --- a/nextjs/src/models/canvas/courses/courseProgressModel.ts +++ b/nextjs/src/models/canvas/courses/canvasCourseProgressModel.ts @@ -1,4 +1,4 @@ -export interface CourseProgressModel { +export interface CanvasCourseProgressModel { requirement_count?: number; requirement_completed_count?: number; next_requirement_url?: string; diff --git a/nextjs/src/models/canvas/courses/courseSettingsModel.ts b/nextjs/src/models/canvas/courses/canvasCourseSettingsModel.ts similarity index 92% rename from nextjs/src/models/canvas/courses/courseSettingsModel.ts rename to nextjs/src/models/canvas/courses/canvasCourseSettingsModel.ts index ce02569..45d05d1 100644 --- a/nextjs/src/models/canvas/courses/courseSettingsModel.ts +++ b/nextjs/src/models/canvas/courses/canvasCourseSettingsModel.ts @@ -1,4 +1,4 @@ -export interface CourseSettingsModel { +export interface CanvasCourseSettingsModel { allow_final_grade_override: boolean; allow_student_discussion_topics: boolean; allow_student_forum_attachments: boolean; diff --git a/nextjs/src/models/canvas/courses/termModel.ts b/nextjs/src/models/canvas/courses/canvasTermModel.ts similarity index 77% rename from nextjs/src/models/canvas/courses/termModel.ts rename to nextjs/src/models/canvas/courses/canvasTermModel.ts index 3d76831..89c889d 100644 --- a/nextjs/src/models/canvas/courses/termModel.ts +++ b/nextjs/src/models/canvas/courses/canvasTermModel.ts @@ -1,4 +1,4 @@ -export interface TermModel { +export interface CanvasTermModel { id: number; name: string; start_at?: string; // ISO 8601 date string diff --git a/nextjs/src/models/canvas/discussions/canvasDiscussionModelTopic.ts b/nextjs/src/models/canvas/discussions/canvasDiscussionModelTopic.ts index db435b6..c667b16 100644 --- a/nextjs/src/models/canvas/discussions/canvasDiscussionModelTopic.ts +++ b/nextjs/src/models/canvas/discussions/canvasDiscussionModelTopic.ts @@ -1,7 +1,7 @@ -import { UserDisplayModel } from "../users/userDisplayModel"; -import { FileAttachmentModel } from "./canvasFileAttachmentModel"; +import { CanvasUserDisplayModel } from "../users/userDisplayModel"; +import { CanvasFileAttachmentModel } from "./canvasFileAttachmentModel"; -export interface DiscussionTopicModel { +export interface CanvasDiscussionTopicModel { id: number; title: string; message: string; @@ -14,9 +14,9 @@ export interface DiscussionTopicModel { topic_children: number[]; podcast_url: string; discussion_type: string; - attachments: FileAttachmentModel[]; + attachments: CanvasFileAttachmentModel[]; permissions: { [key: string]: boolean }; - author: UserDisplayModel; + author: CanvasUserDisplayModel; unread_count?: number; subscribed?: boolean; posted_at?: string; // ISO 8601 date string diff --git a/nextjs/src/models/canvas/discussions/canvasFileAttachmentModel.ts b/nextjs/src/models/canvas/discussions/canvasFileAttachmentModel.ts index ff6eeff..049c936 100644 --- a/nextjs/src/models/canvas/discussions/canvasFileAttachmentModel.ts +++ b/nextjs/src/models/canvas/discussions/canvasFileAttachmentModel.ts @@ -1,4 +1,4 @@ -export interface FileAttachmentModel { +export interface CanvasFileAttachmentModel { content_type: string; url: string; filename: string; diff --git a/nextjs/src/models/canvas/enrollments/enrollmentModel.ts b/nextjs/src/models/canvas/enrollments/canvasEnrollmentModel.ts similarity index 86% rename from nextjs/src/models/canvas/enrollments/enrollmentModel.ts rename to nextjs/src/models/canvas/enrollments/canvasEnrollmentModel.ts index 1234225..d965907 100644 --- a/nextjs/src/models/canvas/enrollments/enrollmentModel.ts +++ b/nextjs/src/models/canvas/enrollments/canvasEnrollmentModel.ts @@ -1,7 +1,7 @@ -import { UserDisplayModel } from "../users/userDisplayModel"; -import { GradeModel } from "./gradeModel"; +import { CanvasUserDisplayModel } from "../users/userDisplayModel"; +import { CanvasGradeModel } from "./canvasG'radeModel"; -export interface EnrollmentModel { +export interface CanvasEnrollmentModel { id: number; course_id: number; enrollment_state: string; @@ -10,8 +10,8 @@ export interface EnrollmentModel { role: string; role_id: number; html_url: string; - grades: GradeModel; - user: UserDisplayModel; + grades: CanvasGradeModel; + user: CanvasUserDisplayModel; override_grade: string; sis_course_id?: string; course_integration_id?: string; diff --git a/nextjs/src/models/canvas/enrollments/gradeModel.ts b/nextjs/src/models/canvas/enrollments/canvasG'radeModel.ts similarity index 87% rename from nextjs/src/models/canvas/enrollments/gradeModel.ts rename to nextjs/src/models/canvas/enrollments/canvasG'radeModel.ts index ef0185d..caad4c3 100644 --- a/nextjs/src/models/canvas/enrollments/gradeModel.ts +++ b/nextjs/src/models/canvas/enrollments/canvasG'radeModel.ts @@ -1,4 +1,4 @@ -export interface GradeModel { +export interface CanvasGradeModel { html_url?: string; current_grade?: number; final_grade?: number; diff --git a/nextjs/src/models/canvas/modules/canvasModuleItems.ts b/nextjs/src/models/canvas/modules/canvasModuleItems.ts index 65d1568..314f80c 100644 --- a/nextjs/src/models/canvas/modules/canvasModuleItems.ts +++ b/nextjs/src/models/canvas/modules/canvasModuleItems.ts @@ -17,12 +17,10 @@ export interface CanvasModuleItem { completed?: boolean; }; published?: boolean; - content_details?: CanvasModuleItemContentDetails; -} - -export interface CanvasModuleItemContentDetails { - due_at?: string; // ISO 8601 date string - lock_at?: string; // ISO 8601 date string - points_possible: number; - locked_for_user: boolean; + content_details?: { + due_at?: string; // ISO 8601 date string + lock_at?: string; // ISO 8601 date string + points_possible: number; + locked_for_user: boolean; + }; } diff --git a/nextjs/src/models/canvas/quizzes/canvasQuizModel.ts b/nextjs/src/models/canvas/quizzes/canvasQuizModel.ts index a3850d6..c207dd0 100644 --- a/nextjs/src/models/canvas/quizzes/canvasQuizModel.ts +++ b/nextjs/src/models/canvas/quizzes/canvasQuizModel.ts @@ -1,4 +1,4 @@ -import { CanvasLockInfo } from "../assignments/CanvasLockInfo"; +import { CanvasLockInfo } from "../assignments/canvasLockInfo"; import { CanvasQuizPermissions } from "./canvasQuizPermission"; export interface CanvasQuiz { diff --git a/nextjs/src/models/canvas/submissions/canvasSubmissionModel.ts b/nextjs/src/models/canvas/submissions/canvasSubmissionModel.ts index c86c49b..355a953 100644 --- a/nextjs/src/models/canvas/submissions/canvasSubmissionModel.ts +++ b/nextjs/src/models/canvas/submissions/canvasSubmissionModel.ts @@ -1,20 +1,20 @@ import { CanvasAssignment } from "../assignments/canvasAssignment"; -import { CourseModel } from "../courses/courseModel"; -import { UserModel } from "../users/canvasUserModel"; -import { UserDisplayModel } from "../users/userDisplayModel"; +import { CanvasCourseModel } from "../courses/canvasCourseModel"; +import { CanvasUserModel } from "../users/canvasUserModel"; +import { CanvasUserDisplayModel } from "../users/userDisplayModel"; -export interface SubmissionModel { +export interface CanvasSubmissionModel { assignment_id: number; grade: string; html_url: string; preview_url: string; submission_type: string; user_id: number; - user: UserModel; + user: CanvasUserModel; workflow_state: string; late_policy_status: string; assignment?: CanvasAssignment; - course?: CourseModel; + course?: CanvasCourseModel; attempt?: number; body?: string; grade_matches_current_submission?: boolean; @@ -23,7 +23,7 @@ export interface SubmissionModel { id: number; author_id: number; author_name: string; - author: UserDisplayModel; + author: CanvasUserDisplayModel; comment: string; created_at: string; // ISO 8601 date string edited_at?: string; // ISO 8601 date string diff --git a/nextjs/src/models/canvas/users/canvasUserModel.ts b/nextjs/src/models/canvas/users/canvasUserModel.ts index 044c95f..50aa8fa 100644 --- a/nextjs/src/models/canvas/users/canvasUserModel.ts +++ b/nextjs/src/models/canvas/users/canvasUserModel.ts @@ -1,6 +1,6 @@ -import { EnrollmentModel } from "../enrollments/enrollmentModel"; +import { CanvasEnrollmentModel } from "../enrollments/canvasEnrollmentModel"; -export interface UserModel { +export interface CanvasUserModel { id: number; name: string; sortable_name: string; @@ -9,7 +9,7 @@ export interface UserModel { integration_id: string; login_id: string; avatar_url: string; - enrollments: EnrollmentModel[]; + enrollments: CanvasEnrollmentModel[]; email: string; locale: string; effective_locale: string; diff --git a/nextjs/src/models/canvas/users/userDisplayModel.ts b/nextjs/src/models/canvas/users/userDisplayModel.ts index 182aca3..3c152cc 100644 --- a/nextjs/src/models/canvas/users/userDisplayModel.ts +++ b/nextjs/src/models/canvas/users/userDisplayModel.ts @@ -1,4 +1,4 @@ -export interface UserDisplayModel { +export interface CanvasUserDisplayModel { avatar_image_url: string; html_url: string; anonymous_id: string; @@ -6,4 +6,4 @@ export interface UserDisplayModel { short_name?: string; display_name?: string; pronouns?: string; -} \ No newline at end of file +}