From c4195916a755331b5d61fa5cf914ef55db9cffa0 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Wed, 19 Jan 2022 11:56:20 +0100 Subject: [PATCH] Lint some more code --- client/package.json | 2 +- client/src/App.vue | 15 +- client/src/components/AddContentButton.vue | 5 +- client/src/components/AddContentElement.vue | 5 +- client/src/components/AddWidget.vue | 7 +- .../components/AssignmentWithSubmissions.vue | 43 ++-- client/src/components/BackLink.vue | 5 +- client/src/components/Chapter.vue | 19 +- client/src/components/ColorChooser.vue | 11 +- client/src/components/ContentBlock.vue | 40 ++-- client/src/components/FullscreenImage.vue | 7 +- .../src/components/FullscreenInfographic.vue | 3 +- client/src/components/FullscreenVideo.vue | 7 +- client/src/components/HeaderBar.vue | 16 +- client/src/components/HelpfulTooltip.vue | 2 +- client/src/components/LoadingButton.vue | 10 +- client/src/components/LogoutWidget.vue | 3 +- client/src/components/MobileHeader.vue | 10 +- client/src/components/Modal.vue | 15 +- client/src/components/ModalInput.vue | 6 +- client/src/components/MoreOptionsWidget.vue | 10 +- client/src/components/ReadOnlyBanner.vue | 11 +- client/src/components/ScrollUp.vue | 5 +- client/src/components/SectionBlock.vue | 22 ++- client/src/components/StudentSubmission.vue | 14 +- .../components/StudentSubmissionDocument.vue | 5 +- client/src/components/UserMetaWidget.vue | 3 +- client/src/components/UserWidget.vue | 6 +- .../book-navigation/BookTopicNavigation.vue | 5 +- .../book-navigation/ContentNavigation.vue | 35 ++-- .../book-navigation/NavigationSidebar.vue | 10 +- .../book-navigation/SubNavigationItem.vue | 15 +- .../content-block-form/ContentsForm.vue | 18 +- .../content-blocks/ContentComponent.vue | 5 +- .../components/content-blocks/ContentList.vue | 8 +- .../content-blocks/ContentListBlock.vue | 5 +- .../content-blocks/DocumentBlock.vue | 10 +- .../content-blocks/GeniallyBlock.vue | 3 +- .../components/content-blocks/ImageBlock.vue | 3 +- .../content-blocks/ImageUrlBlock.vue | 3 +- .../content-blocks/InfogramBlock.vue | 3 +- .../components/content-blocks/Instruction.vue | 8 +- .../content-blocks/InstrumentWidget.vue | 7 +- .../components/content-blocks/LinkBlock.vue | 8 +- .../content-blocks/ModuleRoomSlug.vue | 4 +- .../content-blocks/SectionTitleBlock.vue | 3 +- .../components/content-blocks/Solution.vue | 9 +- .../content-blocks/SubtitleBlock.vue | 3 +- .../components/content-blocks/SurveyBlock.vue | 7 +- client/src/components/content-blocks/Task.vue | 3 +- .../components/content-blocks/TextBlock.vue | 3 +- .../content-blocks/ThinglinkBlock.vue | 3 +- .../components/content-blocks/VideoBlock.vue | 10 +- .../content-blocks/assignment/Assignment.vue | 16 +- .../assignment/FinalSubmission.vue | 8 +- .../content-blocks/assignment/SpellCheck.vue | 5 +- .../assignment/SubmissionForm.vue | 17 +- .../assignment/SubmissionInput.vue | 12 +- .../content-forms/AssignmentForm.vue | 2 +- .../components/content-forms/DocumentForm.vue | 14 +- .../components/content-forms/ImageForm.vue | 12 +- .../src/components/content-forms/LinkForm.vue | 6 +- .../src/components/content-forms/TextForm.vue | 3 +- .../content-forms/TextFormWithHelpText.vue | 8 +- .../components/content-forms/VideoForm.vue | 21 +- client/src/components/icons/AddIcon.vue | 9 +- client/src/components/icons/AddNoteIcon.vue | 10 +- client/src/components/icons/AddPointer.vue | 9 +- client/src/components/icons/ArrowUp.vue | 6 +- client/src/components/icons/BookmarkIcon.vue | 6 +- client/src/components/icons/BulbIcon.vue | 12 +- client/src/components/icons/Cards.vue | 6 +- client/src/components/icons/ChevronDown.vue | 5 +- client/src/components/icons/ChevronLeft.vue | 5 +- client/src/components/icons/ChevronRight.vue | 5 +- client/src/components/icons/ChevronUp.vue | 5 +- client/src/components/icons/CircleIcon.vue | 6 +- client/src/components/icons/ClosedEyeIcon.vue | 6 +- client/src/components/icons/Cross.vue | 6 +- client/src/components/icons/DefaultAvatar.vue | 30 ++- client/src/components/icons/DocumentIcon.vue | 12 +- .../icons/DocumentWithLinesIcon.vue | 19 +- client/src/components/icons/EhbLogo.vue | 79 +++++--- client/src/components/icons/Ellipses.vue | 12 +- client/src/components/icons/EyeIcon.vue | 6 +- client/src/components/icons/Group.vue | 15 +- client/src/components/icons/Hamburger.vue | 9 +- client/src/components/icons/HepLogo.vue | 63 ++++-- .../src/components/icons/HepLogoNoClaim.vue | 15 +- client/src/components/icons/ImageIcon.vue | 9 +- client/src/components/icons/InfoIcon.vue | 11 +- client/src/components/icons/LinkIcon.vue | 9 +- client/src/components/icons/LoadingIcon.vue | 6 +- client/src/components/icons/Logo.vue | 4 +- client/src/components/icons/NoteIcon.vue | 12 +- client/src/components/icons/PenIcon.vue | 6 +- client/src/components/icons/Play.vue | 6 +- client/src/components/icons/PlusIcon.vue | 3 +- client/src/components/icons/ShareIcon.vue | 6 +- .../src/components/icons/SpeechBubbleIcon.vue | 6 +- client/src/components/icons/TextIcon.vue | 9 +- client/src/components/icons/Tick.vue | 5 +- .../src/components/icons/TickCircleIcon.vue | 8 +- client/src/components/icons/TrashIcon.vue | 12 +- client/src/components/icons/UserIcon.vue | 9 +- client/src/components/icons/VideoIcon.vue | 6 +- .../illustrations/ContentsIllustration.vue | 103 ++++++---- .../illustrations/HelloIllustration.vue | 3 +- .../illustrations/PortfolioIllustration.vue | 130 +++++++----- .../illustrations/RoomsIllustration.vue | 187 ++++++++++++------ .../components/instruments/FilterEntry.vue | 5 +- .../components/instruments/FilterGroup.vue | 5 +- .../instruments/InstrumentEntry.vue | 11 +- .../instruments/InstrumentFilter.vue | 1 - client/src/components/modules/Module.vue | 36 ++-- .../components/modules/ModuleNavigation.vue | 57 +++--- .../modules/ModuleSubNavigation.vue | 7 +- .../src/components/modules/ModuleTeaser.vue | 15 +- .../components/modules/SnapshotCreated.vue | 17 +- .../src/components/modules/SnapshotHeader.vue | 30 ++- .../components/modules/SnapshotListItem.vue | 6 +- .../src/components/modules/SnapshotMenu.vue | 19 +- .../components/modules/SnapshotTeamMenu.vue | 8 +- client/src/components/news/NewsTeaser.vue | 9 +- client/src/components/news/NewsTeaserOld.vue | 6 +- client/src/components/news/NewsTeasers.vue | 5 +- .../src/components/notes/BookmarkActions.vue | 18 +- .../src/components/notes/EditNoteWizard.vue | 3 +- client/src/components/notes/NewNoteWizard.vue | 3 +- client/src/components/notes/NoteForm.vue | 12 +- .../objective-groups/NewObjectiveWizard.vue | 8 +- .../components/objective-groups/Objective.vue | 16 +- .../objective-groups/ObjectiveForm.vue | 6 +- .../objective-groups/ObjectiveGroup.vue | 15 +- .../objective-groups/ObjectiveGroups.vue | 2 +- client/src/components/page-form/PageForm.vue | 13 +- .../components/page-form/PageFormInput.vue | 8 +- .../components/portfolio/AddProjectEntry.vue | 3 +- .../portfolio/CreateProjectButton.vue | 4 +- .../portfolio/EditProjectEntryWizard.vue | 3 +- .../portfolio/NewProjectEntryWizard.vue | 3 +- .../src/components/portfolio/OwnerWidget.vue | 3 +- .../portfolio/PortfolioOnboarding.vue | 16 +- .../components/portfolio/ProjectActions.vue | 33 ++-- .../src/components/portfolio/ProjectEntry.vue | 25 ++- .../components/portfolio/ProjectEntryForm.vue | 17 +- .../src/components/portfolio/ProjectForm.vue | 19 +- .../src/components/portfolio/ProjectList.vue | 9 +- .../components/portfolio/ProjectListItem.vue | 21 +- .../components/portfolio/ProjectWidget.vue | 23 ++- client/src/components/portfolio/ShareLink.vue | 2 +- .../src/components/profile/ActivityEntry.vue | 11 +- .../src/components/profile/ActivityFilter.vue | 2 +- client/src/components/profile/Avatar.vue | 14 +- .../components/profile/AvatarUploadForm.vue | 3 +- .../components/profile/ContentBookmark.vue | 6 +- .../components/profile/DeactivatePerson.vue | 17 +- .../src/components/profile/EditGroupName.vue | 5 +- .../src/components/profile/EditNameWizard.vue | 13 +- client/src/components/profile/GroupList.vue | 54 +++-- .../components/profile/InstrumentActivity.vue | 23 ++- client/src/components/profile/JoinForm.vue | 18 +- .../src/components/profile/ModuleActivity.vue | 40 ++-- client/src/components/profile/Profile.vue | 15 +- .../src/components/profile/ProfileSidebar.vue | 41 ++-- .../src/components/profile/ProfileWidget.vue | 7 +- client/src/components/profile/ShowCode.vue | 8 +- client/src/components/rooms/AddRoom.vue | 2 +- .../components/rooms/AddRoomEntryButton.vue | 5 +- .../src/components/rooms/ChangeVisibility.vue | 25 ++- client/src/components/rooms/Comment.vue | 5 +- client/src/components/rooms/CommentInput.vue | 7 +- .../src/components/rooms/EntryCountWidget.vue | 2 +- client/src/components/rooms/MoreActions.vue | 10 +- client/src/components/rooms/RoomActions.vue | 9 +- client/src/components/rooms/RoomEntry.vue | 26 ++- .../src/components/rooms/RoomEntryActions.vue | 6 +- client/src/components/rooms/RoomForm.vue | 25 ++- .../src/components/rooms/RoomGroupWidget.vue | 2 +- .../components/rooms/RoomVisibilityWidget.vue | 5 +- client/src/components/rooms/RoomWidget.vue | 20 +- .../src/components/rooms/RoomsOnboarding.vue | 14 +- .../school-class/ClassSelectionWidget.vue | 31 +-- .../components/school-class/CurrentClass.vue | 3 +- .../school-class/EditClassNameWizard.vue | 3 +- .../components/toggle-menu/ToggleEditing.vue | 3 +- .../toggle-menu/ToggleSolutionsForModule.vue | 3 +- client/src/components/ui/BaseInput.vue | 14 +- .../components/ui/ButtonWithIconAndText.vue | 3 +- client/src/components/ui/Checkbox.vue | 2 +- client/src/components/ui/EmojiBar.vue | 5 +- client/src/components/ui/InputWithLabel.vue | 3 +- client/src/components/ui/PopoverLink.vue | 9 +- client/src/components/ui/WidgetFooter.vue | 2 +- client/src/components/ui/WidgetPopover.vue | 7 +- .../components/ui/file-upload/FileUpload.vue | 3 - .../ui/file-upload/SimpleFileUpload.vue | 3 +- .../SimpleFileUploadHiddenInput.vue | 3 +- .../ui/file-upload/SimpleFileUploadIcon.vue | 2 +- .../file-upload/SimpleFileUploadWithIcon.vue | 5 +- .../components/validation/ValidatedInput.vue | 7 +- client/src/components/videos/SrfEmbed.vue | 3 +- client/src/components/videos/VimeoEmbed.vue | 3 +- client/src/components/videos/YoutubeEmbed.vue | 3 +- .../visibility/VisibilityAction.vue | 9 +- client/src/layouts/BlankLayout.vue | 2 +- client/src/layouts/DefaultFooter.vue | 30 +-- client/src/layouts/DefaultLayout.vue | 15 +- client/src/layouts/FullScreenLayout.vue | 10 +- client/src/layouts/PublicLayout.vue | 7 +- client/src/layouts/SimpleFooter.vue | 8 +- client/src/layouts/SimpleLayout.vue | 11 +- client/src/layouts/SplitLayout.vue | 4 +- client/src/pages/activity.vue | 15 +- client/src/pages/article.vue | 17 +- client/src/pages/beta-login.vue | 19 +- client/src/pages/editRoom.vue | 3 +- client/src/pages/hello.vue | 29 ++- client/src/pages/index.vue | 16 +- client/src/pages/instrument.vue | 11 +- client/src/pages/instrumentOverview.vue | 10 +- client/src/pages/joinClass.vue | 3 +- client/src/pages/license-activation.vue | 32 +-- client/src/pages/login-error.vue | 14 +- client/src/pages/me/joinTeam.vue | 3 +- client/src/pages/me/myTeam.vue | 21 +- client/src/pages/me/showSchoolClassCode.vue | 3 +- client/src/pages/me/showTeamCode.vue | 3 +- client/src/pages/module/module-base.vue | 2 +- client/src/pages/module/module.vue | 3 +- client/src/pages/module/moduleRoom.vue | 14 +- client/src/pages/module/moduleSettings.vue | 28 ++- client/src/pages/module/moduleVisibility.vue | 23 ++- client/src/pages/news.vue | 4 +- client/src/pages/oldClasses.vue | 18 +- client/src/pages/onboarding.vue | 11 +- client/src/pages/onboarding/start.vue | 6 +- client/src/pages/onboarding/step1.vue | 32 ++- client/src/pages/onboarding/step2.vue | 16 +- client/src/pages/onboarding/step3.vue | 16 +- client/src/pages/p404.vue | 9 +- client/src/pages/portfolio/editProject.vue | 3 +- client/src/pages/portfolio/portfolio.vue | 13 +- client/src/pages/portfolio/project.vue | 33 ++-- client/src/pages/profile.vue | 2 +- client/src/pages/room.vue | 26 ++- client/src/pages/rooms.vue | 12 +- client/src/pages/snapshot/snapshot.vue | 3 +- client/src/pages/snapshot/snapshots.vue | 9 +- client/src/pages/start-old.vue | 26 ++- client/src/pages/start.vue | 50 +++-- client/src/pages/studentSubmission.vue | 14 +- client/src/pages/styleguide.vue | 38 +++- client/src/pages/submissions.vue | 8 +- client/src/pages/survey.vue | 12 +- client/src/pages/test.vue | 5 +- 256 files changed, 2171 insertions(+), 1170 deletions(-) diff --git a/client/package.json b/client/package.json index 4cc8b1f5..165f2b60 100644 --- a/client/package.json +++ b/client/package.json @@ -9,7 +9,7 @@ "analyze": "webpack --profile --json --config build/webpack.dev.conf.js > dist/stats.json && webpack-bundle-analyzer dist/stats.json", "start": ". ../server/.env && npm run dev", "lint": "eslint --ext .js,.vue,.ts src", - "fix-lint": "eslint --ext .js,.vue --fix src", + "fix-lint": "eslint --ext .js,.vue,.ts --fix src", "build": "node build/build.js", "open:cypress:e2e": "npm run cypress:e2e:open", "open:cypress:frontend": "npm run cypress:frontend:open", diff --git a/client/src/App.vue b/client/src/App.vue index 4dbd06d5..843d2bd1 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -2,16 +2,19 @@
- - + id="app" + > + + + v-if="showModalDeprecated" + /> - + v-if="showModal" + /> +
diff --git a/client/src/components/AddContentButton.vue b/client/src/components/AddContentButton.vue index 76196426..e76e62a1 100644 --- a/client/src/components/AddContentButton.vue +++ b/client/src/components/AddContentButton.vue @@ -2,8 +2,9 @@
- + @click="addContent" + > +
diff --git a/client/src/components/AddContentElement.vue b/client/src/components/AddContentElement.vue index 0c0173a3..692b617c 100644 --- a/client/src/components/AddContentElement.vue +++ b/client/src/components/AddContentElement.vue @@ -1,8 +1,9 @@ diff --git a/client/src/components/AddWidget.vue b/client/src/components/AddWidget.vue index 6beb58ab..f223ae46 100644 --- a/client/src/components/AddWidget.vue +++ b/client/src/components/AddWidget.vue @@ -1,11 +1,12 @@ diff --git a/client/src/components/AssignmentWithSubmissions.vue b/client/src/components/AssignmentWithSubmissions.vue index 57b6e7aa..bec42176 100644 --- a/client/src/components/AssignmentWithSubmissions.vue +++ b/client/src/components/AssignmentWithSubmissions.vue @@ -1,46 +1,63 @@ diff --git a/client/src/components/BackLink.vue b/client/src/components/BackLink.vue index d2dc3d4f..377d2c35 100644 --- a/client/src/components/BackLink.vue +++ b/client/src/components/BackLink.vue @@ -1,8 +1,9 @@ diff --git a/client/src/components/Chapter.vue b/client/src/components/Chapter.vue index 9326f624..678d249f 100644 --- a/client/src/components/Chapter.vue +++ b/client/src/components/Chapter.vue @@ -1,14 +1,18 @@ diff --git a/client/src/components/ColorChooser.vue b/client/src/components/ColorChooser.vue index a65bf882..82294c25 100644 --- a/client/src/components/ColorChooser.vue +++ b/client/src/components/ColorChooser.vue @@ -1,18 +1,21 @@