From 5164315243274a448da6abe971a020d9fbb2a7b3 Mon Sep 17 00:00:00 2001 From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com> Date: Wed, 22 Mar 2023 18:19:37 +0530 Subject: [PATCH] fix: modified graphql files in dashboard users and teams module to match resolver changes (#50) Co-authored-by: Andrew Bastin --- .../hoppscotch-sh-admin/src/components.d.ts | 16 --- .../src/composables/usePagedQuery.ts | 4 +- .../backend/gql/mutations/CreateTeam.graphql | 2 +- .../gql/mutations/InviteNewUser.graphql | 5 + .../gql/mutations/InviteUserToSignIn.graphql | 5 - .../gql/mutations/MakeUserAdmin.graphql | 2 +- .../RemoveUserAccountByAdmin.graphql | 3 - .../gql/mutations/RemoveUserAsAdmin.graphql | 2 +- .../gql/mutations/RemoveUserByAdmin.graphql | 3 + .../helpers/backend/gql/queries/Me.graphql | 9 -- .../backend/gql/queries/UsersList.graphql | 6 +- .../src/pages/teams/AddTeam.vue | 2 +- .../src/pages/teams/index.vue | 5 +- .../src/pages/users/_id.vue | 4 +- .../src/pages/users/index.vue | 12 +- pnpm-lock.yaml | 126 +++++++++++++----- 16 files changed, 122 insertions(+), 84 deletions(-) create mode 100644 packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/InviteNewUser.graphql delete mode 100644 packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/InviteUserToSignIn.graphql delete mode 100644 packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUserAccountByAdmin.graphql create mode 100644 packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUserByAdmin.graphql delete mode 100644 packages/hoppscotch-sh-admin/src/helpers/backend/gql/queries/Me.graphql diff --git a/packages/hoppscotch-sh-admin/src/components.d.ts b/packages/hoppscotch-sh-admin/src/components.d.ts index b683dfe5..71c920e5 100644 --- a/packages/hoppscotch-sh-admin/src/components.d.ts +++ b/packages/hoppscotch-sh-admin/src/components.d.ts @@ -13,22 +13,6 @@ declare module '@vue/runtime-core' { AppModal: typeof import('./components/app/Modal.vue')['default'] AppSidebar: typeof import('./components/app/Sidebar.vue')['default'] AppToast: typeof import('./components/app/Toast.vue')['default'] - HoppButtonPrimary: typeof import('@hoppscotch/ui')['HoppButtonPrimary'] - HoppButtonSecondary: typeof import('@hoppscotch/ui')['HoppButtonSecondary'] - HoppSmartAnchor: typeof import('@hoppscotch/ui')['HoppSmartAnchor'] - HoppSmartConfirmModal: typeof import('@hoppscotch/ui')['HoppSmartConfirmModal'] - HoppSmartItem: typeof import('@hoppscotch/ui')['HoppSmartItem'] - IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default'] - IconLucideChevronLeft: typeof import('~icons/lucide/chevron-left')['default'] - IconLucideChevronRight: typeof import('~icons/lucide/chevron-right')['default'] - IconLucideInbox: typeof import('~icons/lucide/inbox')['default'] - IconLucideLayoutDashboard: typeof import('~icons/lucide/layout-dashboard')['default'] - IconLucideMenu: typeof import('~icons/lucide/menu')['default'] - IconLucideMoreHorizontal: typeof import('~icons/lucide/more-horizontal')['default'] - IconLucideSidebarClose: typeof import('~icons/lucide/sidebar-close')['default'] - IconLucideSidebarOpen: typeof import('~icons/lucide/sidebar-open')['default'] - IconLucideUser: typeof import('~icons/lucide/user')['default'] - IconLucideUsers: typeof import('~icons/lucide/users')['default'] ProfilePicture: typeof import('./components/profile/Picture.vue')['default'] TeamsAddMembers: typeof import('./components/teams/AddMembers.vue')['default'] TeamsDetails: typeof import('./components/teams/Details.vue')['default'] diff --git a/packages/hoppscotch-sh-admin/src/composables/usePagedQuery.ts b/packages/hoppscotch-sh-admin/src/composables/usePagedQuery.ts index 56863156..689abede 100644 --- a/packages/hoppscotch-sh-admin/src/composables/usePagedQuery.ts +++ b/packages/hoppscotch-sh-admin/src/composables/usePagedQuery.ts @@ -10,6 +10,7 @@ export function usePagedQuery< query: string | TypedDocumentNode | DocumentNode, getList: (result: Result) => ListItem[], getCursor: (value: ListItem) => string, + itemsPerPage: number, variables: Vars ) { //Fetch All Users @@ -26,6 +27,7 @@ export function usePagedQuery< const result = await client .query(query, { ...variables, + take: itemsPerPage, cursor: list.value.length > 0 ? getCursor(list.value.at(-1)) : undefined, }) @@ -33,7 +35,7 @@ export function usePagedQuery< const resultList = getList(result.data!); - if (resultList.length < 20) { + if (resultList.length < itemsPerPage) { hasNextPage.value = false; } diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/CreateTeam.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/CreateTeam.graphql index 128ab2db..82dfa665 100644 --- a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/CreateTeam.graphql +++ b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/CreateTeam.graphql @@ -1,4 +1,4 @@ -mutation CreateTeam($userUid: String!, $name: String!) { +mutation CreateTeam($userUid: ID!, $name: String!) { createTeamByAdmin(userUid: $userUid, name: $name) { id name diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/InviteNewUser.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/InviteNewUser.graphql new file mode 100644 index 00000000..847d56e3 --- /dev/null +++ b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/InviteNewUser.graphql @@ -0,0 +1,5 @@ +mutation InviteNewUser($inviteeEmail: String!) { + inviteNewUser(inviteeEmail: $inviteeEmail) { + inviteeEmail + } +} diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/InviteUserToSignIn.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/InviteUserToSignIn.graphql deleted file mode 100644 index 098e13f2..00000000 --- a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/InviteUserToSignIn.graphql +++ /dev/null @@ -1,5 +0,0 @@ -mutation InviteUserToSignIn($inviteeEmail: String!) { - inviteUserToSignin(inviteeEmail: $inviteeEmail) { - inviteeEmail - } -} diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/MakeUserAdmin.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/MakeUserAdmin.graphql index b1f948c0..89c31c37 100644 --- a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/MakeUserAdmin.graphql +++ b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/MakeUserAdmin.graphql @@ -1,3 +1,3 @@ -mutation MakeUserAdmin($uid: String!) { +mutation MakeUserAdmin($uid: ID!) { makeUserAdmin(userUID: $uid) } diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUserAccountByAdmin.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUserAccountByAdmin.graphql deleted file mode 100644 index 61da3835..00000000 --- a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUserAccountByAdmin.graphql +++ /dev/null @@ -1,3 +0,0 @@ -mutation RemoveUserAccountByAdmin($uid: String!) { - removeUserAccountByAdmin(userUID: $uid) -} diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUserAsAdmin.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUserAsAdmin.graphql index 3b97016f..3fc2374b 100644 --- a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUserAsAdmin.graphql +++ b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUserAsAdmin.graphql @@ -1,3 +1,3 @@ -mutation RemoveUserAsAdmin($uid: String!) { +mutation RemoveUserAsAdmin($uid: ID!) { removeUserAsAdmin(userUID: $uid) } diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUserByAdmin.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUserByAdmin.graphql new file mode 100644 index 00000000..2ee09541 --- /dev/null +++ b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUserByAdmin.graphql @@ -0,0 +1,3 @@ +mutation RemoveUserByAdmin($uid: ID!) { + removeUserByAdmin(userUID: $uid) +} diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/queries/Me.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/queries/Me.graphql deleted file mode 100644 index 0ebb2f44..00000000 --- a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/queries/Me.graphql +++ /dev/null @@ -1,9 +0,0 @@ -query Me { - me { - uid - displayName - photoURL - isAdmin - createdOn - } -} diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/queries/UsersList.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/queries/UsersList.graphql index a07629d8..9baa9e70 100644 --- a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/queries/UsersList.graphql +++ b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/queries/UsersList.graphql @@ -1,10 +1,12 @@ -query UsersList($cursor: ID) { +# Write your query or mutation here +query UsersList($cursor: ID, $take: Int) { admin { - allUsers(cursor: $cursor) { + allUsers(cursor: $cursor, take: $take) { uid displayName email isAdmin + photoURL createdOn } } diff --git a/packages/hoppscotch-sh-admin/src/pages/teams/AddTeam.vue b/packages/hoppscotch-sh-admin/src/pages/teams/AddTeam.vue index c791a84f..1bc4a316 100644 --- a/packages/hoppscotch-sh-admin/src/pages/teams/AddTeam.vue +++ b/packages/hoppscotch-sh-admin/src/pages/teams/AddTeam.vue @@ -66,7 +66,7 @@ const addTeam = async () => { if (data) { name.value = ''; - goToTeamDetailsPage(data.createATeamByAdmin.id); + goToTeamDetailsPage(data.createTeamByAdmin.id); } if (error) { diff --git a/packages/hoppscotch-sh-admin/src/pages/teams/index.vue b/packages/hoppscotch-sh-admin/src/pages/teams/index.vue index 8a4572ec..09aeabaf 100644 --- a/packages/hoppscotch-sh-admin/src/pages/teams/index.vue +++ b/packages/hoppscotch-sh-admin/src/pages/teams/index.vue @@ -74,7 +74,7 @@ @@ -175,7 +175,8 @@ const { TeamListDocument, (x) => x.admin.allTeams, (x) => x.id, - { cursor: undefined } + 10, + { cursor: undefined, take: 10 } ); const goToTeam = (teamId: string) => { diff --git a/packages/hoppscotch-sh-admin/src/pages/users/_id.vue b/packages/hoppscotch-sh-admin/src/pages/users/_id.vue index 67f3751b..9d8e7c73 100644 --- a/packages/hoppscotch-sh-admin/src/pages/users/_id.vue +++ b/packages/hoppscotch-sh-admin/src/pages/users/_id.vue @@ -144,7 +144,7 @@ import { useMutation } from '@urql/vue'; import { MakeUserAdminDocument, UserInfoDocument, - RemoveUserAccountByAdminDocument, + RemoveUserByAdminDocument, RemoveUserAsAdminDocument, } from '../../helpers/backend/graphql'; import { useClientHandle } from '@urql/vue'; @@ -179,7 +179,7 @@ onMounted(async () => { // User Deletion const router = useRouter(); -const userDeletion = useMutation(RemoveUserAccountByAdminDocument); +const userDeletion = useMutation(RemoveUserByAdminDocument); const confirmDeletion = ref(false); const deleteUserUID = ref(null); diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue index eca585dd..107b5bf9 100644 --- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue +++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue @@ -235,9 +235,9 @@ import { onBeforeUnmount, onMounted, ref, watch } from 'vue'; import { useMutation } from '@urql/vue'; import { - InviteUserToSignInDocument, + InviteNewUserDocument, MakeUserAdminDocument, - RemoveUserAccountByAdminDocument, + RemoveUserByAdminDocument, RemoveUserAsAdminDocument, UsersListDocument, } from '../../helpers/backend/graphql'; @@ -256,6 +256,7 @@ const getCreatedDate = (date: string) => format(new Date(date), 'dd-MM-yyyy'); const getCreatedTime = (date: string) => format(new Date(date), 'hh:mm a'); // Get Paginated Results of all the users in the infra +const usersPerPage = 20; const { fetching, error, @@ -266,12 +267,13 @@ const { UsersListDocument, (x) => x.admin.allUsers, (x) => x.uid, - { cursor: undefined } + usersPerPage, + { cursor: undefined, take: usersPerPage } ); // Send Invitation through Email const email = ref(''); -const sendInvitation = useMutation(InviteUserToSignInDocument); +const sendInvitation = useMutation(InviteNewUserDocument); const showInviteUserModal = ref(false); const sendInvite = async () => { @@ -321,7 +323,7 @@ watch( ); // User Deletion -const userDeletion = useMutation(RemoveUserAccountByAdminDocument); +const userDeletion = useMutation(RemoveUserByAdminDocument); const confirmDeletion = ref(false); const deleteUserUID = ref(null); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1f8bfd77..970be928 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -57,6 +57,7 @@ importers: '@nestjs/platform-express': ^9.2.1 '@nestjs/schematics': ^9.0.3 '@nestjs/testing': ^9.2.1 + '@nestjs/throttler': ^4.0.0 '@prisma/client': ^4.7.1 '@relmify/jest-fp-ts': ^2.0.2 '@types/argon2': ^0.15.0 @@ -127,6 +128,7 @@ importers: '@nestjs/jwt': 10.0.1_@nestjs+common@9.2.1 '@nestjs/passport': 9.0.0_6o47igfla2pj7yzh7agpvpttka '@nestjs/platform-express': 9.2.1_hjcqpoaebdr7gdo5hgc22hthbe + '@nestjs/throttler': 4.0.0_dntc3uqqknzoduyjojusds5kla '@prisma/client': 4.8.1_prisma@4.8.1 apollo-server-express: 3.11.1_4mq2c443wwzwcb6dpxnwkfvrzm apollo-server-plugin-base: 3.7.1_graphql@15.8.0 @@ -498,7 +500,7 @@ importers: vite-plugin-inspect: 0.7.4_vite@3.1.4 vite-plugin-pages: 0.26.0_vnheu5mvzzbfbuhqo4shkhdhei vite-plugin-pages-sitemap: 1.4.0 - vite-plugin-pwa: 0.13.1_vite@3.1.4 + vite-plugin-pwa: 0.13.1_bg4cnt4dy3xq3a47wkujd6ryzq vite-plugin-vue-layouts: 0.7.0_oewzdqozxqnqgsrjzmwikx34vi vite-plugin-windicss: 1.8.8_vite@3.1.4 vue-tsc: 0.38.2_typescript@4.7.4 @@ -658,7 +660,7 @@ importers: vite-plugin-inspect: 0.7.4_vite@3.2.4 vite-plugin-pages: 0.26.0_vite@3.2.4 vite-plugin-pages-sitemap: 1.4.0 - vite-plugin-pwa: 0.13.1_vite@3.2.4 + vite-plugin-pwa: 0.13.1_3kw35epztoiwny7qtfesjexvtu vite-plugin-static-copy: 0.12.0_vite@3.2.4 vite-plugin-vue-layouts: 0.7.0_vite@3.2.4+vue@3.2.45 vite-plugin-windicss: 1.8.8_vite@3.2.4 @@ -965,7 +967,7 @@ importers: vite-plugin-inspect: 0.7.4_vite@3.2.4 vite-plugin-pages: 0.26.0_vite@3.2.4 vite-plugin-pages-sitemap: 1.4.0 - vite-plugin-pwa: 0.13.1_vite@3.2.4 + vite-plugin-pwa: 0.13.1_3kw35epztoiwny7qtfesjexvtu vite-plugin-static-copy: 0.12.0_vite@3.2.4 vite-plugin-vue-layouts: 0.7.0_vite@3.2.4+vue@3.2.45 vite-plugin-windicss: 1.8.8_vite@3.2.4 @@ -5140,8 +5142,8 @@ packages: vue-i18n: optional: true dependencies: - '@intlify/message-compiler': 9.3.0-beta.16 - '@intlify/shared': 9.3.0-beta.16 + '@intlify/message-compiler': 9.3.0-beta.17 + '@intlify/shared': 9.3.0-beta.17 acorn: 8.8.2 estree-walker: 2.0.2 jsonc-eslint-parser: 1.4.1 @@ -5161,8 +5163,8 @@ packages: vue-i18n: optional: true dependencies: - '@intlify/message-compiler': 9.3.0-beta.16 - '@intlify/shared': 9.3.0-beta.16 + '@intlify/message-compiler': 9.3.0-beta.17 + '@intlify/shared': 9.3.0-beta.17 acorn: 8.8.2 estree-walker: 2.0.2 jsonc-eslint-parser: 1.4.1 @@ -5193,11 +5195,11 @@ packages: '@intlify/shared': 9.2.2 source-map: 0.6.1 - /@intlify/message-compiler/9.3.0-beta.16: - resolution: {integrity: sha512-CGQI3xRcs1ET75eDQ0DUy3MRYOqTauRIIgaMoISKiF83gqRWg93FqN8lGMKcpBqaF4tI0JhsfosCaGiBL9+dnw==} + /@intlify/message-compiler/9.3.0-beta.17: + resolution: {integrity: sha512-i7hvVIRk1Ax2uKa9xLRJCT57to08OhFMhFXXjWN07rmx5pWQYQ23MfX1xgggv9drnWTNhqEiD+u4EJeHoS5+Ww==} engines: {node: '>= 14'} dependencies: - '@intlify/shared': 9.3.0-beta.16 + '@intlify/shared': 9.3.0-beta.17 source-map: 0.6.1 dev: true @@ -5205,8 +5207,8 @@ packages: resolution: {integrity: sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==} engines: {node: '>= 14'} - /@intlify/shared/9.3.0-beta.16: - resolution: {integrity: sha512-kXbm4svALe3lX+EjdJxfnabOphqS4yQ1Ge/iIlR8tvUiYRCoNz3hig1M4336iY++Dfx5ytEQJPNjIcknNIuvig==} + /@intlify/shared/9.3.0-beta.17: + resolution: {integrity: sha512-mscf7RQsUTOil35jTij4KGW1RC9SWQjYScwLxP53Ns6g24iEd5HN7ksbt9O6FvTmlQuX77u+MXpBdfJsGqizLQ==} engines: {node: '>= 14'} dev: true @@ -5226,7 +5228,7 @@ packages: optional: true dependencies: '@intlify/bundle-utils': 5.2.0_vue-i18n@9.2.2 - '@intlify/shared': 9.3.0-beta.16 + '@intlify/shared': 9.3.0-beta.17 '@rollup/pluginutils': 4.2.1 debug: 4.3.4 fast-glob: 3.2.11 @@ -5253,12 +5255,12 @@ packages: optional: true dependencies: '@intlify/bundle-utils': 5.2.0 - '@intlify/shared': 9.3.0-beta.16 + '@intlify/shared': 9.3.0-beta.17 '@rollup/pluginutils': 4.2.1 debug: 4.3.4 fast-glob: 3.2.11 source-map: 0.6.1 - vite: 3.2.4_sass@1.53.0 + vite: 3.2.4 transitivePeerDependencies: - supports-color dev: true @@ -6206,6 +6208,19 @@ packages: tslib: 2.4.1 dev: true + /@nestjs/throttler/4.0.0_dntc3uqqknzoduyjojusds5kla: + resolution: {integrity: sha512-2T2S/hFhxROa/PZRZhHWFkrukxg3T8Db32Y04m6U6j6N2XqFGSKXhjfIbORO8kk/S2jswa9oTX/K12E120tgaQ==} + peerDependencies: + '@nestjs/common': ^7.0.0 || ^8.0.0 || ^9.0.0 + '@nestjs/core': ^7.0.0 || ^8.0.0 || ^9.0.0 + reflect-metadata: ^0.1.13 + dependencies: + '@nestjs/common': 9.2.1_whg6pvy6vwu66ypq7idiq2suxq + '@nestjs/core': 9.2.1_ajc4cvdydchgvxyi4xnoij5t4i + md5: 2.3.0 + reflect-metadata: 0.1.13 + dev: false + /@nodelib/fs.scandir/2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -8020,7 +8035,7 @@ packages: magic-string: 0.26.7 regenerator-runtime: 0.13.10 systemjs: 6.13.0 - vite: 3.2.4_sass@1.53.0 + vite: 3.2.4 /@vitejs/plugin-vue/3.1.0_vite@3.1.4+vue@3.2.37: resolution: {integrity: sha512-fmxtHPjSOEIRg6vHYDaem+97iwCUg/uSIaTzp98lhELt2ISOQuDo2hbkBdXod0g15IhfPMQmAxh4heUks2zvDA==} @@ -8040,7 +8055,7 @@ packages: vite: ^3.0.0 vue: ^3.2.25 dependencies: - vite: 3.2.4_sass@1.53.0 + vite: 3.2.4 vue: 3.2.45 dev: true @@ -8859,7 +8874,7 @@ packages: hasBin: true /after/0.8.2: - resolution: {integrity: sha512-QbJ0NTQ/I9DI3uSJA4cbexiwQeRAfjPScqIbSjUDd9TOrcg6pTkdgziesOqxBMBzit8vFCTwrP27t13vFOORRA==} + resolution: {integrity: sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=} dev: false /agent-base/6.0.2: @@ -9468,7 +9483,7 @@ packages: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} /base64-arraybuffer/0.1.4: - resolution: {integrity: sha512-a1eIFi4R9ySrbiMuyTGx5e92uRH5tQY6kArNcFaKBUleIoLjdjBg7Zxm3Mqm3Kmkf27HLR/1fnxX9q8GQ7Iavg==} + resolution: {integrity: sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=} engines: {node: '>= 0.6.0'} dev: false @@ -9828,6 +9843,10 @@ packages: resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==} dev: true + /charenc/0.0.2: + resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==} + dev: false + /charset/1.0.1: resolution: {integrity: sha512-6dVyOOYjpfFcL1Y4qChrAoQLRHvj2ziyhcm0QJlhOcAhykL/k1kTUPbeo+87MNRTRdk2OIIsIXbuF3x2wi5EXg==} engines: {node: '>=4.0.0'} @@ -10092,14 +10111,14 @@ packages: dev: true /component-bind/1.0.0: - resolution: {integrity: sha512-WZveuKPeKAG9qY+FkYDeADzdHyTYdIboXS59ixDeRJL5ZhxpqUnxSOwop4FQjMsiYm3/Or8cegVbpAHNA7pHxw==} + resolution: {integrity: sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=} dev: false /component-emitter/1.3.0: resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==} /component-inherit/0.0.3: - resolution: {integrity: sha512-w+LhYREhatpVqTESyGFg3NlP6Iu0kEKUHETY9GoZP/pQyW4mHFZuFWRUCIqVPZ36ueVLtoOEZaAqbCF2RDndaA==} + resolution: {integrity: sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=} dev: false /concat-map/0.0.1: @@ -10383,6 +10402,10 @@ packages: '@types/node': 16.11.43 dev: true + /crypt/0.0.2: + resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==} + dev: false + /crypto-random-string/2.0.0: resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==} engines: {node: '>=8'} @@ -13388,7 +13411,7 @@ packages: dev: false /has-cors/1.1.0: - resolution: {integrity: sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA==} + resolution: {integrity: sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=} dev: false /has-flag/3.0.0: @@ -13781,7 +13804,7 @@ packages: engines: {node: '>=8'} /indexof/0.0.1: - resolution: {integrity: sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==} + resolution: {integrity: sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=} dev: false /inflight/1.0.6: @@ -13970,6 +13993,10 @@ packages: call-bind: 1.0.2 has-tostringtag: 1.0.0 + /is-buffer/1.1.6: + resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==} + dev: false + /is-callable/1.2.4: resolution: {integrity: sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==} engines: {node: '>= 0.4'} @@ -16096,6 +16123,14 @@ packages: uc.micro: 1.0.6 dev: true + /md5/2.3.0: + resolution: {integrity: sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==} + dependencies: + charenc: 0.0.2 + crypt: 0.0.2 + is-buffer: 1.1.6 + dev: false + /mdurl/1.0.1: resolution: {integrity: sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==} dev: true @@ -18391,6 +18426,7 @@ packages: chokidar: 3.5.3 immutable: 4.1.0 source-map-js: 1.0.2 + dev: true /sax/1.2.4: resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==} @@ -19412,7 +19448,7 @@ packages: dev: true /to-array/0.1.4: - resolution: {integrity: sha512-LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A==} + resolution: {integrity: sha1-F+bBH3PdTz10zaek/zI46a2b+JA=} dev: false /to-fast-properties/2.0.0: @@ -20312,7 +20348,7 @@ packages: dependencies: acorn: 8.8.0 chokidar: 3.5.3 - vite: 3.2.4_sass@1.53.0 + vite: 3.2.4 webpack-sources: 3.2.3 webpack-virtual-modules: 0.4.4 @@ -20359,7 +20395,7 @@ packages: dependencies: acorn: 8.8.0 chokidar: 3.5.3 - vite: 3.2.4_sass@1.58.0 + vite: 3.2.4 webpack-sources: 3.2.3 webpack-virtual-modules: 0.4.4 @@ -20673,7 +20709,7 @@ packages: vite: ^2.0.0 || ^3.0.0 dependencies: fast-glob: 3.2.11 - vite: 3.2.4_sass@1.53.0 + vite: 3.2.4 dev: true /vite-plugin-html-config/1.0.10_vite@3.1.4: @@ -20691,7 +20727,7 @@ packages: peerDependencies: vite: '>=2.0.0' dependencies: - vite: 3.2.4_sass@1.53.0 + vite: 3.2.4 dev: true /vite-plugin-inspect/0.7.4_vite@3.1.4: @@ -20723,7 +20759,7 @@ packages: kolorist: 1.5.1 sirv: 2.0.2 ufo: 0.8.5 - vite: 3.2.4_sass@1.53.0 + vite: 3.2.4 transitivePeerDependencies: - supports-color dev: true @@ -20750,7 +20786,7 @@ packages: json5: 2.2.1 local-pkg: 0.4.2 picocolors: 1.0.0 - vite: 3.2.4_sass@1.53.0 + vite: 3.2.4_sass@1.58.0 yaml: 2.1.1 transitivePeerDependencies: - supports-color @@ -20803,10 +20839,29 @@ packages: - supports-color dev: true - /vite-plugin-pwa/0.13.1_vite@3.1.4: + /vite-plugin-pwa/0.13.1_3kw35epztoiwny7qtfesjexvtu: resolution: {integrity: sha512-NR3dIa+o2hzlzo4lF4Gu0cYvoMjSw2DdRc6Epw1yjmCqWaGuN86WK9JqZie4arNlE1ZuWT3CLiMdiX5wcmmUmg==} peerDependencies: vite: ^3.1.0 + workbox-window: ^6.5.4 + dependencies: + debug: 4.3.4 + fast-glob: 3.2.11 + pretty-bytes: 6.0.0 + rollup: 2.79.1 + vite: 3.2.4 + workbox-build: 6.5.4 + workbox-window: 6.5.4 + transitivePeerDependencies: + - '@types/babel__core' + - supports-color + dev: true + + /vite-plugin-pwa/0.13.1_bg4cnt4dy3xq3a47wkujd6ryzq: + resolution: {integrity: sha512-NR3dIa+o2hzlzo4lF4Gu0cYvoMjSw2DdRc6Epw1yjmCqWaGuN86WK9JqZie4arNlE1ZuWT3CLiMdiX5wcmmUmg==} + peerDependencies: + vite: ^3.1.0 + workbox-window: ^6.5.4 dependencies: debug: 4.3.4 fast-glob: 3.2.11 @@ -20824,6 +20879,7 @@ packages: resolution: {integrity: sha512-NR3dIa+o2hzlzo4lF4Gu0cYvoMjSw2DdRc6Epw1yjmCqWaGuN86WK9JqZie4arNlE1ZuWT3CLiMdiX5wcmmUmg==} peerDependencies: vite: ^3.1.0 + workbox-window: ^6.5.4 dependencies: debug: 4.3.4 fast-glob: 3.2.11 @@ -20893,7 +20949,7 @@ packages: '@vue/compiler-sfc': 3.2.45 debug: 4.3.4 fast-glob: 3.2.11 - vite: 3.2.4_sass@1.53.0 + vite: 3.2.4_sass@1.58.0 vue: 3.2.45 vue-router: 4.1.0_vue@3.2.45 transitivePeerDependencies: @@ -20922,7 +20978,7 @@ packages: '@windicss/plugin-utils': 1.8.8 debug: 4.3.4 kolorist: 1.5.1 - vite: 3.2.4_sass@1.53.0 + vite: 3.2.4 windicss: 3.5.6 transitivePeerDependencies: - supports-color @@ -20986,7 +21042,6 @@ packages: rollup: 2.79.1 optionalDependencies: fsevents: 2.3.2 - dev: true /vite/3.2.4_sass@1.53.0: resolution: {integrity: sha512-Z2X6SRAffOUYTa+sLy3NQ7nlHFU100xwanq1WDwqaiFiCe+25zdxP1TfCS5ojPV2oDDcXudHIoPnI1Z/66B7Yw==} @@ -21053,6 +21108,7 @@ packages: sass: 1.58.0 optionalDependencies: fsevents: 2.3.2 + dev: true /vm2/3.9.14: resolution: {integrity: sha512-HgvPHYHeQy8+QhzlFryvSteA4uQLBCOub02mgqdR+0bN/akRZ48TGB1v0aCv7ksyc0HXx16AZtMHKS38alc6TA==} @@ -22211,7 +22267,7 @@ packages: dev: false /yeast/0.1.2: - resolution: {integrity: sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg==} + resolution: {integrity: sha1-AI4G2AlDIMNy28L47XagymyKxBk=} dev: false /yn/3.1.1: