From a405c70bf9aad6aab721ded6c0763002e65a309a Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Tue, 27 Aug 2024 15:30:51 +0200 Subject: [PATCH] Add "prettier-plugin-organize-imports" plugin -> imports got sorted --- client/.prettierrc | 6 ++++- client/package-lock.json | 22 +++++++++++++--- client/src/components/AppFooter.vue | 2 +- .../AssignmentSubmissionProgress.vue | 2 +- .../evaluation/EvaluationContainer.vue | 2 +- .../assignment/evaluation/EvaluationIntro.vue | 2 +- .../evaluation/EvaluationSummary.vue | 2 +- .../assignment/evaluation/EvaluationTask.vue | 2 +- .../cockpit/SubmissionsOverview.vue | 18 ++++++------- .../components/cockpit/UserStatusCount.vue | 2 +- .../dashboard/AgentConnectionCount.vue | 4 +-- .../AssignmentProgressSummaryBox.vue | 4 +-- .../dashboard/AssignmentSummary.vue | 6 ++--- .../dashboard/AssignmentSummaryBox.vue | 2 +- .../dashboard/AttendanceSummaryBox.vue | 2 +- .../dashboard/BerufsbildnerStatistics.vue | 14 +++++----- .../dashboard/CompetenceSummary.vue | 6 ++--- .../src/components/dashboard/CoursePanel.vue | 18 ++++++------- .../dashboard/MentorCompetenceSummary.vue | 6 ++--- .../dashboard/MentorOpenTasksCount.vue | 4 +-- .../dashboard/StatisticFilterList.vue | 4 +-- .../src/components/dashboard/UkStatistics.vue | 12 ++++----- .../dueDates/CourseSessionDueDatesList.vue | 8 +++--- .../src/components/dueDates/DueDateSingle.vue | 4 +-- .../components/header/CoursePreviewBar.vue | 4 +-- .../components/header/MainNavigationBar.vue | 16 ++++++------ client/src/components/header/MobileMenu.vue | 6 ++--- .../learningMentor/AssignmentItem.vue | 2 +- .../components/learningMentor/MyMentees.vue | 4 +-- .../components/learningMentor/MyMentors.vue | 4 +-- .../learningPath/LearningPathDiagram.vue | 4 +-- .../learningPath/SelfEvaluation.vue | 6 ++--- .../assignment/CaseWorkSubmit.vue | 16 ++++++------ .../assignment/PraxisAssignmentSubmit.vue | 14 +++++----- .../learningPath/assignment/SimpleSubmit.vue | 10 +++---- .../DatatransCembraDeviceFingerprint.vue | 2 +- .../onboarding/OrganisationAddress.vue | 2 +- .../components/onboarding/PersonalAddress.vue | 4 +-- .../src/components/onboarding/WizardPage.vue | 2 +- .../components/onboarding/WizardSidePanel.vue | 2 +- .../personalProfile/ProfileEdit.vue | 6 ++--- .../personalProfile/ProfileView.vue | 8 +++--- .../FeedbackByLearningUnitSummary.vue | 4 +-- .../FeedbackProvided.vue | 2 +- .../FeedbackProviderReleaseOverview.vue | 2 +- .../FeedbackReceived.vue | 2 +- .../FeedbackSubmissionProgress.vue | 6 ++--- .../SelfEvaluationAndFeedbackList.vue | 8 +++--- .../SelfEvaluationAndFeedbackOverview.vue | 4 +-- client/src/components/ui/ItCheckbox.vue | 2 +- client/src/components/ui/ItDatePicker.vue | 2 +- client/src/components/ui/RatingScale.vue | 4 +-- client/src/components/ui/RichText.vue | 2 +- client/src/pages/StyleGuidePage.vue | 2 +- .../AssignmentEvaluationPage.vue | 6 ++--- .../pages/cockpit/CockpitUserCirclePage.vue | 4 +-- client/src/pages/cockpit/FeedbackPage.vue | 8 +++--- client/src/pages/cockpit/FeedbackPageUK.vue | 2 +- client/src/pages/cockpit/FeedbackPageVV.vue | 2 +- .../assignmentsPage/AssignmentDetails.vue | 10 +++---- .../assignmentsPage/AssignmentsPage.vue | 6 ++--- .../AttendanceCheckPage.vue | 12 ++++----- .../cockpit/cockpitPage/CockpitExpertPage.vue | 10 +++---- .../cockpit/documentPage/DocumentPage.vue | 18 ++++++------- .../documentPage/DocumentUploadForm.vue | 2 +- .../competence/ActionCompetenceDetail.vue | 4 +-- .../competence/ActionCompetenceListPage.vue | 2 +- .../CompetenceCertificateComponent.vue | 10 +++---- .../CompetenceCertificateDetailPage.vue | 8 +++--- .../CompetenceCertificateListPage.vue | 6 ++--- .../pages/competence/CompetenceIndexPage.vue | 8 +++--- .../pages/competence/CompetenceParentPage.vue | 2 +- .../SelfEvaluationAndFeedbackPage.vue | 2 +- client/src/pages/dashboard/CourseListPage.vue | 2 +- .../pages/dashboard/DashboardAsideWidget.vue | 10 +++---- .../pages/dashboard/DashboardDueDatesPage.vue | 14 +++++----- client/src/pages/dashboard/DashboardPage.vue | 10 +++---- .../pages/dashboard/DashboardPersonsPage.vue | 16 ++++++------ client/src/pages/dashboard/MentorPage.vue | 2 +- client/src/pages/dashboard/ProgressPage.vue | 10 +++---- .../src/pages/dashboard/SimpleCoursePage.vue | 2 +- .../agentAssignment/AgentAssignmentDetail.vue | 4 +-- .../AgentAssignmentDetailPage.vue | 4 +-- .../AgentAssignmentStatisticPage.vue | 10 +++---- .../AgentCompetenceGradeDetailPage.vue | 18 ++++++------- .../AgentCompetenceGradePage.vue | 14 +++++----- .../dashboard/statistic/AssignmentList.vue | 12 ++++----- .../dashboard/statistic/AttendanceList.vue | 12 ++++----- .../dashboard/statistic/CompetenceList.vue | 2 +- .../dashboard/statistic/FeedbackList.vue | 8 +++--- .../learningMentor/mentor/MentorIndexPage.vue | 2 +- .../mentor/MentorOverviewPage.vue | 2 +- .../mentor/MentorParticipantsPage.vue | 4 +-- .../mentor/MentorPraxisAssignmentPage.vue | 4 +-- ...orSelfEvaluationFeedbackAssignmentPage.vue | 2 +- .../mentor/SelfEvaluationFeedbackPage.vue | 8 +++--- .../learningPath/circlePage/CircleDiagram.vue | 2 +- .../circlePage/CircleOverview.vue | 2 +- .../learningPath/circlePage/CirclePage.vue | 18 ++++++------- .../circlePage/DocumentSection.vue | 4 +-- .../circlePage/LearningSequence.vue | 2 +- .../LearningContentContainer.vue | 2 +- .../LearningContentPage.vue | 4 +-- .../LearningContentParent.vue | 8 +++--- .../AssignmentSubmissionResponses.vue | 2 +- .../assignment/AssignmentSubmissionView.vue | 12 ++++----- .../assignment/AssignmentTaskView.vue | 4 +-- .../assignment/AssignmentView.vue | 8 +++--- .../assignment/AttachmentSection.vue | 4 +-- .../attendanceCourse/AttendanceCourse.vue | 2 +- .../blocks/AttendanceCourseBlock.vue | 2 +- .../blocks/DocumentListBlock.vue | 6 ++--- .../blocks/EdoniqTestBlock.vue | 16 ++++++------ .../blocks/PlaceholderBlock.vue | 2 +- .../blocks/RichTextBlock.vue | 2 +- .../feedback/FeedbackBase.vue | 6 ++--- .../feedback/FeedbackBlockUK.vue | 8 +++--- .../feedback/FeedbackBlockVV.vue | 2 +- .../layouts/LearningContentFooter.vue | 2 +- .../layouts/LearningContentMultiLayout.vue | 4 +-- .../layouts/LearningContentSimpleLayout.vue | 4 +-- .../LearningPathCircleListTile.vue | 2 +- .../learningPathPage/LearningPathPage.vue | 22 ++++++++-------- .../LearningPathPathTopic.vue | 2 +- .../learningPathPage/LearningPathPathView.vue | 4 +-- .../selfEvaluationPage/SelfEvaluationPage.vue | 2 +- .../SelfEvaluationRequestFeedbackPage.vue | 12 ++++----- .../mediaLibrary/MediaLibraryCategoryPage.vue | 2 +- .../mediaLibrary/MediaLibraryContentPage.vue | 4 +-- .../mediaLibrary/MediaLibraryIndexPage.vue | 2 +- .../src/pages/onboarding/AccountConfirm.vue | 2 +- .../src/pages/onboarding/AccountProfile.vue | 14 +++++----- client/src/pages/onboarding/AccountSetup.vue | 4 +-- client/src/pages/onboarding/WizardBase.vue | 6 ++--- .../src/pages/onboarding/uk/SetupComplete.vue | 2 +- .../pages/onboarding/vv/CheckoutAddress.vue | 26 +++++++++---------- .../personalProfile/PersonalProfilePage.vue | 2 +- client/src/pages/start/VVStartPage.vue | 2 +- .../userProfile/LearningPathProfilePage.vue | 8 +++--- .../src/pages/userProfile/UserProfilePage.vue | 6 ++--- .../userProfile/UserProfileTopicList.vue | 8 +++--- client/src/services/onboarding.ts | 2 +- .../tests/test_attendance_export.py | 1 - 143 files changed, 441 insertions(+), 422 deletions(-) diff --git a/client/.prettierrc b/client/.prettierrc index ee7239ef..49aec493 100644 --- a/client/.prettierrc +++ b/client/.prettierrc @@ -2,7 +2,11 @@ "htmlWhitespaceSensitivity": "ignore", "jsonRecursiveSort": true, "organizeImportsSkipDestructiveCodeActions": true, - "plugins": ["prettier-plugin-sort-json", "prettier-plugin-tailwindcss"], + "plugins": [ + "prettier-plugin-sort-json", + "prettier-plugin-organize-imports", + "prettier-plugin-tailwindcss" + ], "printWidth": 88, "semi": true, "singleQuote": false, diff --git a/client/package-lock.json b/client/package-lock.json index a46c22ae..78e6e22a 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -5723,6 +5723,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, "dependencies": { "fill-range": "^7.0.1" }, @@ -8258,6 +8259,7 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, "dependencies": { "to-regex-range": "^5.0.1" }, @@ -9316,6 +9318,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -9332,6 +9335,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, "dependencies": { "is-extglob": "^2.1.1" }, @@ -9385,6 +9389,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, "engines": { "node": ">=0.12.0" } @@ -10330,6 +10335,7 @@ "version": "4.0.5", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dev": true, "dependencies": { "braces": "^3.0.2", "picomatch": "^2.3.1" @@ -11067,6 +11073,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, "engines": { "node": ">=8.6" }, @@ -12666,6 +12673,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, "dependencies": { "is-number": "^7.0.0" }, @@ -18799,6 +18807,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, "requires": { "fill-range": "^7.0.1" } @@ -20659,6 +20668,7 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, "requires": { "to-regex-range": "^5.0.1" } @@ -21416,7 +21426,8 @@ "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==" + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true }, "is-fullwidth-code-point": { "version": "3.0.0", @@ -21427,6 +21438,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, "requires": { "is-extglob": "^2.1.1" } @@ -21464,7 +21476,8 @@ "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true }, "is-number-object": { "version": "1.0.7", @@ -22162,6 +22175,7 @@ "version": "4.0.5", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dev": true, "requires": { "braces": "^3.0.2", "picomatch": "^2.3.1" @@ -22714,7 +22728,8 @@ "picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true }, "pify": { "version": "2.3.0", @@ -23810,6 +23825,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, "requires": { "is-number": "^7.0.0" } diff --git a/client/src/components/AppFooter.vue b/client/src/components/AppFooter.vue index 958469fb..ae8bdca3 100644 --- a/client/src/components/AppFooter.vue +++ b/client/src/components/AppFooter.vue @@ -1,9 +1,9 @@ diff --git a/client/src/pages/dashboard/CourseListPage.vue b/client/src/pages/dashboard/CourseListPage.vue index fe76aa9e..75851515 100644 --- a/client/src/pages/dashboard/CourseListPage.vue +++ b/client/src/pages/dashboard/CourseListPage.vue @@ -1,6 +1,6 @@ diff --git a/client/src/pages/dashboard/DashboardAsideWidget.vue b/client/src/pages/dashboard/DashboardAsideWidget.vue index c36e24e7..008d66e4 100644 --- a/client/src/pages/dashboard/DashboardAsideWidget.vue +++ b/client/src/pages/dashboard/DashboardAsideWidget.vue @@ -1,10 +1,10 @@ diff --git a/client/src/pages/dashboard/ProgressPage.vue b/client/src/pages/dashboard/ProgressPage.vue index ca65c47a..66b0fb70 100644 --- a/client/src/pages/dashboard/ProgressPage.vue +++ b/client/src/pages/dashboard/ProgressPage.vue @@ -1,15 +1,15 @@ diff --git a/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue b/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue index 12170fd9..cb502d44 100644 --- a/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue +++ b/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue @@ -1,10 +1,10 @@ diff --git a/client/src/pages/onboarding/AccountProfile.vue b/client/src/pages/onboarding/AccountProfile.vue index 727dd96e..030e89c1 100644 --- a/client/src/pages/onboarding/AccountProfile.vue +++ b/client/src/pages/onboarding/AccountProfile.vue @@ -1,13 +1,13 @@ diff --git a/client/src/pages/userProfile/LearningPathProfilePage.vue b/client/src/pages/userProfile/LearningPathProfilePage.vue index ca7921c9..d6ab1fd2 100644 --- a/client/src/pages/userProfile/LearningPathProfilePage.vue +++ b/client/src/pages/userProfile/LearningPathProfilePage.vue @@ -1,11 +1,11 @@