From 32a63a693df6e09f30b28a91065913d2e314f048 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 18 Nov 2021 09:49:00 +0100 Subject: [PATCH] Initial work Signed-off-by: Thomas Citharel --- js/package.json | 49 +- js/src/App.vue | 210 ++++---- .../components/Account/ActorAutoComplete.vue | 6 +- js/src/components/Account/ActorCard.vue | 2 +- js/src/components/Account/ActorInline.vue | 2 +- .../Activity/DiscussionActivityItem.vue | 74 +-- .../components/Activity/EventActivityItem.vue | 2 +- .../components/Activity/GroupActivityItem.vue | 2 +- .../Activity/MemberActivityItem.vue | 2 +- .../components/Activity/PostActivityItem.vue | 2 +- .../Activity/ResourceActivityItem.vue | 2 +- .../Activity/SkeletonActivityItem.vue | 6 +- js/src/components/Address/AddressInfo.vue | 2 +- js/src/components/Address/InlineAddress.vue | 2 +- js/src/components/Admin/Followers.vue | 40 +- js/src/components/Admin/Followings.vue | 50 +- js/src/components/Comment/Comment.vue | 22 +- js/src/components/Comment/CommentTree.vue | 20 +- .../Discussion/DiscussionComment.vue | 34 +- .../Discussion/DiscussionListItem.vue | 2 +- js/src/components/Editor.vue | 32 +- js/src/components/Error.vue | 28 +- .../components/Event/AddressAutoComplete.vue | 20 +- js/src/components/Event/EventCard.vue | 14 +- js/src/components/Event/EventFullDate.vue | 16 +- js/src/components/Event/EventListViewCard.vue | 6 +- .../components/Event/EventMetadataBlock.vue | 2 +- js/src/components/Event/EventMetadataItem.vue | 40 +- js/src/components/Event/EventMetadataList.vue | 36 +- .../components/Event/EventMetadataSidebar.vue | 4 +- .../components/Event/EventMinimalistCard.vue | 14 +- .../Event/EventParticipationCard.vue | 50 +- .../Event/FullAddressAutoComplete.vue | 14 +- js/src/components/Event/OrganizerPicker.vue | 8 +- .../Event/OrganizerPickerWrapper.vue | 20 +- .../components/Event/ParticipationButton.vue | 52 +- js/src/components/Event/ShareEventModal.vue | 30 +- js/src/components/Event/TagInput.vue | 14 +- js/src/components/Footer.vue | 31 +- js/src/components/Group/GroupCard.vue | 4 +- js/src/components/Group/GroupMemberCard.vue | 28 +- js/src/components/Group/GroupSection.vue | 2 +- js/src/components/Group/InvitationCard.vue | 10 +- js/src/components/Group/ShareGroupModal.vue | 26 +- js/src/components/NavBar.vue | 312 ++++++----- .../Participation/ConfirmParticipation.vue | 8 +- .../Participation/ParticipationSection.vue | 34 +- .../ParticipationWithoutAccount.vue | 44 +- .../Participation/UnloggedParticipation.vue | 22 +- js/src/components/PictureUpload.vue | 14 +- js/src/components/Post/PostListItem.vue | 12 +- js/src/components/Post/SharePostModal.vue | 26 +- js/src/components/Report/ReportCard.vue | 2 +- js/src/components/Report/ReportModal.vue | 14 +- js/src/components/Resource/FolderItem.vue | 2 +- .../components/Resource/ResourceDropdown.vue | 24 +- js/src/components/Resource/ResourceItem.vue | 4 +- .../components/Resource/ResourceSelector.vue | 18 +- js/src/components/SearchField.vue | 2 +- .../Settings/NotificationsOnboarding.vue | 4 +- .../Settings/SettingsOnboarding.vue | 8 +- js/src/components/Todo/CompactTodo.vue | 6 +- js/src/components/Todo/FullTodo.vue | 22 +- js/src/components/User/AuthProvider.vue | 4 +- js/src/components/Utils/EmptyContent.vue | 2 +- .../components/Utils/RedirectWithAccount.vue | 20 +- js/src/main.ts | 62 +-- js/src/plugins/notifier.ts | 33 +- js/src/router/index.ts | 25 +- js/src/shims-vue.d.ts | 17 + js/src/utils/i18n.ts | 7 +- js/src/variables.scss | 7 +- js/src/views/About.vue | 12 +- js/src/views/About/AboutInstance.vue | 8 +- js/src/views/Account/IdentityPicker.vue | 2 +- .../views/Account/IdentityPickerWrapper.vue | 12 +- js/src/views/Account/Profile.vue | 28 +- js/src/views/Account/Register.vue | 32 +- .../views/Account/children/EditIdentity.vue | 62 +-- js/src/views/Admin/AdminGroupProfile.vue | 86 ++-- js/src/views/Admin/AdminProfile.vue | 74 +-- js/src/views/Admin/AdminUserProfile.vue | 4 +- js/src/views/Admin/Follows.vue | 8 +- js/src/views/Admin/GroupProfiles.vue | 20 +- js/src/views/Admin/Profiles.vue | 20 +- js/src/views/Admin/Settings.vue | 112 ++-- js/src/views/Admin/Users.vue | 24 +- js/src/views/Discussions/Create.vue | 12 +- js/src/views/Discussions/Discussion.vue | 40 +- js/src/views/Discussions/DiscussionsList.vue | 8 +- js/src/views/Event/Edit.vue | 166 +++--- js/src/views/Event/Event.vue | 108 ++-- js/src/views/Event/EventList.vue | 6 +- js/src/views/Event/GroupEvents.vue | 12 +- js/src/views/Event/MyEvents.vue | 52 +- js/src/views/Event/Participants.vue | 72 +-- js/src/views/Group/Create.vue | 22 +- js/src/views/Group/Group.vue | 148 +++--- js/src/views/Group/GroupFollowers.vue | 38 +- js/src/views/Group/GroupMembers.vue | 94 ++-- js/src/views/Group/GroupSettings.vue | 70 +-- js/src/views/Group/MyGroups.vue | 6 +- js/src/views/Group/Timeline.vue | 74 +-- js/src/views/Home.vue | 36 +- js/src/views/Interact.vue | 12 +- js/src/views/Moderation/Logs.vue | 6 +- js/src/views/Moderation/Report.vue | 50 +- js/src/views/Moderation/ReportList.vue | 20 +- js/src/views/PageNotFound.vue | 6 +- js/src/views/Posts/Edit.vue | 48 +- js/src/views/Posts/List.vue | 14 +- js/src/views/Posts/Post.vue | 56 +- js/src/views/Resources/ResourceFolder.vue | 98 ++-- js/src/views/Search.vue | 84 +-- js/src/views/Settings.vue | 45 +- js/src/views/Settings/AccountSettings.vue | 66 +-- js/src/views/Settings/Notifications.vue | 77 +-- js/src/views/Settings/Preferences.vue | 38 +- js/src/views/Todos/TodoList.vue | 10 +- js/src/views/Todos/TodoLists.vue | 8 +- js/src/views/User/EmailValidate.vue | 4 +- js/src/views/User/Login.vue | 30 +- js/src/views/User/PasswordReset.vue | 16 +- js/src/views/User/Register.vue | 26 +- js/src/views/User/ResendConfirmation.vue | 18 +- js/src/views/User/SendPasswordReset.vue | 22 +- js/src/views/User/SettingsOnboard.vue | 28 +- js/src/views/User/Validate.vue | 4 +- js/src/vue-apollo.ts | 10 +- js/tests/unit/specs/boot/routes.spec.ts | 33 +- .../components/Comment/CommentTree.spec.ts | 37 +- .../__snapshots__/CommentTree.spec.ts.snap | 4 +- .../components/Group/GroupSection.spec.ts | 24 +- .../ParticipationSection.spec.ts | 36 +- .../ParticipationWithoutAccount.spec.ts | 39 +- .../components/Post/PostListItem.spec.ts | 37 +- .../components/Report/ReportCard.spec.ts | 14 +- .../components/Report/ReportModal.spec.ts | 39 +- .../components/User/PasswordReset.spec.ts | 36 +- .../unit/specs/components/User/login.spec.ts | 42 +- .../__snapshots__/navbar.spec.ts.snap | 2 +- js/tests/unit/specs/components/navbar.spec.ts | 32 +- js/vue.config.js | 16 - js/yarn.lock | 485 +++++++++++------- 144 files changed, 2509 insertions(+), 2418 deletions(-) diff --git a/js/package.json b/js/package.json index cd242a8a0..f372ecb51 100644 --- a/js/package.json +++ b/js/package.json @@ -16,6 +16,8 @@ "@absinthe/socket-apollo-link": "^0.2.1", "@apollo/client": "^3.3.16", "@mdi/font": "^6.1.95", + "@oruga-ui/oruga-next": "^0.4.7", + "@oruga-ui/theme-bulma": "^0.1.3", "@tiptap/core": "^2.0.0-beta.41", "@tiptap/extension-blockquote": "^2.0.0-beta.6", "@tiptap/extension-bubble-menu": "^2.0.0-beta.9", @@ -28,14 +30,14 @@ "@tiptap/extension-ordered-list": "^2.0.0-beta.6", "@tiptap/extension-underline": "^2.0.0-beta.7", "@tiptap/starter-kit": "^2.0.0-beta.37", - "@tiptap/vue-2": "^2.0.0-beta.21", - "@vue/compat": "^3.1.0", - "@vue-a11y/announcer": "^2.1.0", - "@vue-a11y/skip-to": "^2.1.2", - "@vue/apollo-option": "4.0.0-alpha.11", + "@tiptap/vue-3": "^2.0.0-beta.81", + "@vue-a11y/announcer": "^3.1.5", + "@vue-a11y/skip-to": "^3.0.3", + "@vue-leaflet/vue-leaflet": "^0.6.1", + "@vue/apollo-composable": "^4.0.0-alpha.15", + "@vue/apollo-option": "^4.0.0-alpha.15", "apollo-absinthe-upload-link": "^1.5.0", "blurhash": "^1.1.3", - "buefy": "^0.9.0", "bulma-divider": "^0.2.0", "core-js": "^3.6.4", "date-fns": "^2.16.0", @@ -54,15 +56,14 @@ "sanitize-html": "^2.5.3", "tippy.js": "^6.2.3", "unfetch": "^4.2.0", - "v-tooltip": "^2.1.3", + "v-tooltip": "^4.0.0-beta.2", "vue": "^3.1.0", - "vue-class-component": "^7.2.3", - "vue-i18n": "^8.14.0", - "vue-meta": "^2.3.1", - "vue-property-decorator": "^9.0.0", - "vue-router": "^3.1.6", + "vue-class-component": "8.0.0-rc.1", + "vue-i18n": "^9.0.0", + "vue-meta": "^3.0.0-alpha.9", + "vue-property-decorator": "^10.0.0-rc.3", + "vue-router": "^4.0.0", "vue-scrollto": "^2.17.1", - "vue2-leaflet": "^2.0.3", "vuedraggable": "^2.24.3" }, "devDependencies": { @@ -79,19 +80,19 @@ "@types/sanitize-html": "^2.5.0", "@typescript-eslint/eslint-plugin": "^5.3.0", "@typescript-eslint/parser": "^5.3.0", - "@vue/cli-plugin-babel": "~5.0.0-rc.0", - "@vue/cli-plugin-e2e-cypress": "~5.0.0-rc.0", - "@vue/cli-plugin-eslint": "~5.0.0-rc.0", - "@vue/cli-plugin-pwa": "~5.0.0-rc.0", - "@vue/cli-plugin-router": "~5.0.0-rc.0", - "@vue/cli-plugin-typescript": "~5.0.0-rc.0", - "@vue/cli-plugin-unit-jest": "~5.0.0-rc.0", - "@vue/cli-service": "~5.0.0-rc.0", + "@vue/cli-plugin-babel": "~5.0.0-rc.1", + "@vue/cli-plugin-e2e-cypress": "~5.0.0-rc.1", + "@vue/cli-plugin-eslint": "~5.0.0-rc.1", + "@vue/cli-plugin-pwa": "~5.0.0-rc.1", + "@vue/cli-plugin-router": "~5.0.0-rc.1", + "@vue/cli-plugin-typescript": "~5.0.0-rc.1", + "@vue/cli-plugin-unit-jest": "~5.0.0-rc.1", + "@vue/cli-service": "~5.0.0-rc.1", "@vue/compiler-sfc": "^3.1.0", "@vue/eslint-config-typescript": "^9.0.0", - "@vue/test-utils": "^1.1.0", - "@vue/vue2-jest": "^27.0.0-alpha.3", - "@vue/vue3-jest": "^27.0.0-alpha.1", + "@vue/test-utils": "^2.0.0-rc.16", + "@vue/vue3-jest": "^27.0.0-alpha.3", + "babel-core": "^7.0.0-bridge.0", "cypress": "^8.3.0", "eslint": "^8.2.0", "eslint-config-prettier": "^8.3.0", diff --git a/js/src/App.vue b/js/src/App.vue index 521346415..8ac0af5b1 100644 --- a/js/src/App.vue +++ b/js/src/App.vue @@ -4,7 +4,7 @@
- - +
- +
@@ -34,7 +34,6 @@ diff --git a/js/src/components/Discussion/DiscussionComment.vue b/js/src/components/Discussion/DiscussionComment.vue index ab1745b9d..c8cf1542b 100644 --- a/js/src/components/Discussion/DiscussionComment.vue +++ b/js/src/components/Discussion/DiscussionComment.vue @@ -7,7 +7,7 @@ > - +
@@ -29,30 +29,30 @@ comment.actor.id === currentActor.id " > - - + + - - + {{ $t("Edit") }} - - + - + {{ $t("Delete") }} - - - + --> + diff --git a/js/src/components/Discussion/DiscussionListItem.vue b/js/src/components/Discussion/DiscussionListItem.vue index 7f8998330..c4f00b952 100644 --- a/js/src/components/Discussion/DiscussionListItem.vue +++ b/js/src/components/Discussion/DiscussionListItem.vue @@ -20,7 +20,7 @@ alt /> - +
diff --git a/js/src/components/Editor.vue b/js/src/components/Editor.vue index 6645de3ac..8ed9f22d7 100644 --- a/js/src/components/Editor.vue +++ b/js/src/components/Editor.vue @@ -18,7 +18,7 @@ type="button" :title="$t('Bold')" > - +
@@ -171,7 +171,7 @@ type="button" :title="$t('Bold')" > - + {{ $t("Bold") }} @@ -182,7 +182,7 @@ type="button" :title="$t('Italic')" > - + {{ $t("Italic") }} diff --git a/js/src/components/Error.vue b/js/src/components/Error.vue index 752938f06..fa686221a 100644 --- a/js/src/components/Error.vue +++ b/js/src/components/Error.vue @@ -25,7 +25,7 @@ />
- +

{{ $t( @@ -33,21 +33,23 @@ ) }}

-
+ - +

{{ $t("What can I do to help?") }}

- - {{ config.name }} - {{ - $t("Mobilizon") - }} - + + + {{ $t( "We improve this software thanks to your feedback. To let us know about this issue, two possibilities (both unfortunately require user account creation):" @@ -97,18 +99,18 @@ }}

- - {{ $t("Copy details to clipboard") }}{{ $t("Copy details to clipboard") }} - +
diff --git a/js/src/components/Event/AddressAutoComplete.vue b/js/src/components/Event/AddressAutoComplete.vue index 71c18fc64..a84ea7258 100644 --- a/js/src/components/Event/AddressAutoComplete.vue +++ b/js/src/components/Event/AddressAutoComplete.vue @@ -1,7 +1,7 @@ - - + - +
- - - {{ `@${availableActor.preferredUsername}` }}
- +