From 954f40f855e53c72d092f6abbba7bb844af59fbe Mon Sep 17 00:00:00 2001 From: Abdhesh Nayak Date: Mon, 25 Dec 2023 13:59:11 +0530 Subject: [PATCH 1/6] :art: Updated cli queries --- .gitignore | 1 + src/apps/auth/server/gql/cli-queries.ts | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 79c37ca7c..c8afaf902 100644 --- a/.gitignore +++ b/.gitignore @@ -26,5 +26,6 @@ dist-ssr .cache public/** !public/package.json +.tmp tsconfig-compile.tsbuildinfo diff --git a/src/apps/auth/server/gql/cli-queries.ts b/src/apps/auth/server/gql/cli-queries.ts index f449dea96..0195aaaf7 100644 --- a/src/apps/auth/server/gql/cli-queries.ts +++ b/src/apps/auth/server/gql/cli-queries.ts @@ -25,6 +25,9 @@ export const cliQueries = (executor: IExecutor) => ({ encoding value } + status { + isReady + } } } `, @@ -43,6 +46,9 @@ export const cliQueries = (executor: IExecutor) => ({ metadata { name } + status { + isReady + } } } } @@ -59,7 +65,6 @@ export const cliQueries = (executor: IExecutor) => ({ gql` query Accounts_listAccounts { accounts_listAccounts { - id metadata { name } From 88c04f618fc24f57aa5f04b0149a583794d9def5 Mon Sep 17 00:00:00 2001 From: Abdhesh Nayak Date: Mon, 25 Dec 2023 15:22:43 +0530 Subject: [PATCH 2/6] :recycle: Updated flat-files structure to nested directory structure for auth --- package.json | 1 + pnpm-lock.yaml | 47 +++++++++++++++++++ remix.config.js | 10 ++++ src/apps/auth/routes/{ => _404+}/$.tsx | 0 .../routes/{_auth.api.tsx => _main+/api.tsx} | 5 +- .../cli-logged-in.tsx} | 0 .../cli-login.tsx} | 2 +- .../forgot-password.tsx} | 4 +- .../{_a.invite.tsx => _main+/invite.tsx} | 2 +- .../{_a.logout.tsx => _main+/logout.tsx} | 0 .../oauth2.callback.$provider.tsx} | 2 +- .../auth/routes/{ => _main+}/redirect.tsx | 0 .../reset-email-sent.tsx} | 0 .../reset-password.tsx} | 2 +- .../verify-email.tsx} | 0 .../_layout.tsx} | 2 +- .../login.tsx} | 6 +-- .../signup.tsx} | 4 +- 18 files changed, 72 insertions(+), 15 deletions(-) rename src/apps/auth/routes/{ => _404+}/$.tsx (100%) rename src/apps/auth/routes/{_auth.api.tsx => _main+/api.tsx} (70%) rename src/apps/auth/routes/{_a.cli-logged-in.tsx => _main+/cli-logged-in.tsx} (100%) rename src/apps/auth/routes/{_auth.cli-login.tsx => _main+/cli-login.tsx} (98%) rename src/apps/auth/routes/{_auth.forgot-password.tsx => _main+/forgot-password.tsx} (96%) rename src/apps/auth/routes/{_a.invite.tsx => _main+/invite.tsx} (98%) rename src/apps/auth/routes/{_a.logout.tsx => _main+/logout.tsx} (100%) rename src/apps/auth/routes/{_auth.oauth2.callback.$provider.tsx => _main+/oauth2.callback.$provider.tsx} (97%) rename src/apps/auth/routes/{ => _main+}/redirect.tsx (100%) rename src/apps/auth/routes/{_auth.reset-email-sent.tsx => _main+/reset-email-sent.tsx} (100%) rename src/apps/auth/routes/{_auth.reset-password.tsx => _main+/reset-password.tsx} (98%) rename src/apps/auth/routes/{_auth.verify-email.tsx => _main+/verify-email.tsx} (100%) rename src/apps/auth/routes/{_auth._providers.tsx => _providers+/_layout.tsx} (95%) rename src/apps/auth/routes/{_auth._providers.login.tsx => _providers+/login.tsx} (97%) rename src/apps/auth/routes/{_auth._providers.signup.tsx => _providers+/signup.tsx} (98%) diff --git a/package.json b/package.json index d7b773bc8..97690469d 100644 --- a/package.json +++ b/package.json @@ -132,6 +132,7 @@ "json-schema-faker": "^0.5.4", "nodemon": "^2.0.22", "prettier": "^2.8.8", + "remix-flat-routes": "^0.6.4", "tailwindcss": "^3.3.2", "typescript": "^5.1.6", "typescript-json-schema": "^0.62.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dfabbb9a0..a0dbb1498 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -331,6 +331,9 @@ devDependencies: prettier: specifier: ^2.8.8 version: 2.8.8 + remix-flat-routes: + specifier: ^0.6.4 + version: 0.6.4(@remix-run/dev@1.19.3) tailwindcss: specifier: ^3.3.2 version: 3.3.5 @@ -3830,6 +3833,15 @@ packages: set-cookie-parser: 2.6.0 source-map: 0.7.4 + /@remix-run/v1-route-convention@0.1.4(@remix-run/dev@1.19.3): + resolution: {integrity: sha512-fVTr9YlNLWfaiM/6Y56sOtcY8x1bBJQHY0sDWO5+Z/vjJ2Ni7fe2fwrzs1jUFciMPXqBQdFGePnkuiYLz3cuUA==} + peerDependencies: + '@remix-run/dev': ^1.15.0 || ^2.0.0 + dependencies: + '@remix-run/dev': 1.19.3(@remix-run/serve@1.19.3)(@types/node@16.18.64) + minimatch: 7.4.6 + dev: true + /@remix-run/web-blob@3.1.0: resolution: {integrity: sha512-owGzFLbqPH9PlKb8KvpNJ0NO74HWE2euAn61eEiyCXX/oteoVzTVSN8mpLgDjaxBf2btj5/nUllSUgpyd6IH6g==} dependencies: @@ -6348,6 +6360,15 @@ packages: universalify: 2.0.1 dev: true + /fs-extra@11.2.0: + resolution: {integrity: sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==} + engines: {node: '>=14.14'} + dependencies: + graceful-fs: 4.2.11 + jsonfile: 6.1.0 + universalify: 2.0.1 + dev: true + /fs-extra@8.1.0: resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==} engines: {node: '>=6 <7 || >=8'} @@ -7869,6 +7890,20 @@ packages: brace-expansion: 1.1.11 dev: true + /minimatch@5.1.6: + resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==} + engines: {node: '>=10'} + dependencies: + brace-expansion: 2.0.1 + dev: true + + /minimatch@7.4.6: + resolution: {integrity: sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==} + engines: {node: '>=10'} + dependencies: + brace-expansion: 2.0.1 + dev: true + /minimatch@9.0.3: resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} engines: {node: '>=16 || 14 >=14.17'} @@ -9220,6 +9255,18 @@ packages: unified: 10.1.2 dev: true + /remix-flat-routes@0.6.4(@remix-run/dev@1.19.3): + resolution: {integrity: sha512-/0bTfaNSd2O3ak+cCLAlmHIsgm7YWiaBiu5ENUyuSWSNwF/KaHuKFhcHHhozPevQ8ROgCZG9tNbWzH6ktJoprA==} + hasBin: true + peerDependencies: + '@remix-run/dev': ^1.15.0 || ^2 + dependencies: + '@remix-run/dev': 1.19.3(@remix-run/serve@1.19.3)(@types/node@16.18.64) + '@remix-run/v1-route-convention': 0.1.4(@remix-run/dev@1.19.3) + fs-extra: 11.2.0 + minimatch: 5.1.6 + dev: true + /remix@1.19.3: resolution: {integrity: sha512-r6zA1NFWgzKof2XZPyKr5C6MINrSEhehcA8+M9vaAGwIAB3FTm4dd37PM8ojPDPhZ2QCVN0ZvsipP+0Vkw3wdQ==} engines: {node: '>=14.0.0'} diff --git a/remix.config.js b/remix.config.js index fca296999..ac83baa3f 100644 --- a/remix.config.js +++ b/remix.config.js @@ -1,3 +1,8 @@ +import { flatRoutes } from 'remix-flat-routes'; + +/** + * @type {import("@remix-run/dev").AppConfig} + */ export default { appDirectory: `src/apps/${process.env.APP}`, assetsBuildDirectory: `public/${process.env.APP}/assets`, @@ -20,4 +25,9 @@ export default { port: Number(process.env.PORT) + 4000, }, }, + routes: async (defineRoutes) => { + return flatRoutes('routes', defineRoutes, { + appDir: `src/apps/${process.env.APP}`, + }); + }, }; diff --git a/src/apps/auth/routes/$.tsx b/src/apps/auth/routes/_404+/$.tsx similarity index 100% rename from src/apps/auth/routes/$.tsx rename to src/apps/auth/routes/_404+/$.tsx diff --git a/src/apps/auth/routes/_auth.api.tsx b/src/apps/auth/routes/_main+/api.tsx similarity index 70% rename from src/apps/auth/routes/_auth.api.tsx rename to src/apps/auth/routes/_main+/api.tsx index 8321d01fd..6fe2e80d2 100644 --- a/src/apps/auth/routes/_auth.api.tsx +++ b/src/apps/auth/routes/_main+/api.tsx @@ -1,14 +1,13 @@ import { RootAPIAction } from '~/root/lib/app-setup/api'; import { json } from 'react-router-dom'; import { IRemixCtx } from '~/root/lib/types/common'; -import { GQLServerHandler } from '../server/gql/saved-queries'; +import { GQLServerHandler } from '~/auth/server/gql/saved-queries'; export const action = async (ctx: IRemixCtx) => { try { const res = await RootAPIAction(GQLServerHandler)(ctx); return res; } catch (err) { - // @ts-ignore - return json({ errors: [err.message] }, 500); + return json({ errors: [(err as Error).message] }, 500); } }; diff --git a/src/apps/auth/routes/_a.cli-logged-in.tsx b/src/apps/auth/routes/_main+/cli-logged-in.tsx similarity index 100% rename from src/apps/auth/routes/_a.cli-logged-in.tsx rename to src/apps/auth/routes/_main+/cli-logged-in.tsx diff --git a/src/apps/auth/routes/_auth.cli-login.tsx b/src/apps/auth/routes/_main+/cli-login.tsx similarity index 98% rename from src/apps/auth/routes/_auth.cli-login.tsx rename to src/apps/auth/routes/_main+/cli-login.tsx index c81df7f8a..f2bcc0a22 100644 --- a/src/apps/auth/routes/_auth.cli-login.tsx +++ b/src/apps/auth/routes/_main+/cli-login.tsx @@ -8,7 +8,7 @@ import md5 from '~/root/lib/client/helpers/md5'; import { Avatar } from '~/components/atoms/avatar'; import { cn } from '~/components/utils'; import { Power } from '@jengaicons/react'; -import { GQLServerHandler } from '../server/gql/saved-queries'; +import { GQLServerHandler } from '~/auth/server/gql/saved-queries'; function CliLogin() { const { loginId, user } = useLoaderData(); diff --git a/src/apps/auth/routes/_auth.forgot-password.tsx b/src/apps/auth/routes/_main+/forgot-password.tsx similarity index 96% rename from src/apps/auth/routes/_auth.forgot-password.tsx rename to src/apps/auth/routes/_main+/forgot-password.tsx index 6d40037ae..e06897443 100644 --- a/src/apps/auth/routes/_auth.forgot-password.tsx +++ b/src/apps/auth/routes/_main+/forgot-password.tsx @@ -9,8 +9,8 @@ import Yup from '~/root/lib/server/helpers/yup'; import { toast } from '~/components/molecule/toast'; import { cn } from '~/components/utils'; import { handleError } from '~/root/lib/utils/common'; -import Container from '../components/container'; -import { useAuthApi } from '../server/gql/api-provider'; +import { useAuthApi } from '~/auth/server/gql/api-provider'; +import Container from '../../components/container'; const ForgetPassword = () => { const api = useAuthApi(); diff --git a/src/apps/auth/routes/_a.invite.tsx b/src/apps/auth/routes/_main+/invite.tsx similarity index 98% rename from src/apps/auth/routes/_a.invite.tsx rename to src/apps/auth/routes/_main+/invite.tsx index 38b41eda7..462eb1bd1 100644 --- a/src/apps/auth/routes/_a.invite.tsx +++ b/src/apps/auth/routes/_main+/invite.tsx @@ -7,7 +7,7 @@ import { getCookie } from '~/root/lib/app-setup/cookies'; import { redirectWithContext } from '~/root/lib/app-setup/with-contxt'; import { assureNotLoggedIn } from '~/root/lib/server/helpers/minimal-auth'; import { IExtRemixCtx } from '~/root/lib/types/common'; -import Container from '../components/container'; +import Container from '../../components/container'; export const loader = async (ctx: IExtRemixCtx) => { const loggedIn = await assureNotLoggedIn(ctx); diff --git a/src/apps/auth/routes/_a.logout.tsx b/src/apps/auth/routes/_main+/logout.tsx similarity index 100% rename from src/apps/auth/routes/_a.logout.tsx rename to src/apps/auth/routes/_main+/logout.tsx diff --git a/src/apps/auth/routes/_auth.oauth2.callback.$provider.tsx b/src/apps/auth/routes/_main+/oauth2.callback.$provider.tsx similarity index 97% rename from src/apps/auth/routes/_auth.oauth2.callback.$provider.tsx rename to src/apps/auth/routes/_main+/oauth2.callback.$provider.tsx index a07e7a819..0e6277468 100644 --- a/src/apps/auth/routes/_auth.oauth2.callback.$provider.tsx +++ b/src/apps/auth/routes/_main+/oauth2.callback.$provider.tsx @@ -5,7 +5,7 @@ import { toast } from '~/components/molecule/toast'; import { handleError } from '~/root/lib/utils/common'; import { IRemixCtx } from '~/root/lib/types/common'; import useDebounce from '~/root/lib/client/hooks/use-debounce'; -import { useAuthApi } from '../server/gql/api-provider'; +import { useAuthApi } from '~/auth/server/gql/api-provider'; export const decodeState = (str: string) => Buffer.from(str, 'base64url').toString('utf8'); diff --git a/src/apps/auth/routes/redirect.tsx b/src/apps/auth/routes/_main+/redirect.tsx similarity index 100% rename from src/apps/auth/routes/redirect.tsx rename to src/apps/auth/routes/_main+/redirect.tsx diff --git a/src/apps/auth/routes/_auth.reset-email-sent.tsx b/src/apps/auth/routes/_main+/reset-email-sent.tsx similarity index 100% rename from src/apps/auth/routes/_auth.reset-email-sent.tsx rename to src/apps/auth/routes/_main+/reset-email-sent.tsx diff --git a/src/apps/auth/routes/_auth.reset-password.tsx b/src/apps/auth/routes/_main+/reset-password.tsx similarity index 98% rename from src/apps/auth/routes/_auth.reset-password.tsx rename to src/apps/auth/routes/_main+/reset-password.tsx index 495ee6b71..f7e63dacc 100644 --- a/src/apps/auth/routes/_auth.reset-password.tsx +++ b/src/apps/auth/routes/_main+/reset-password.tsx @@ -12,7 +12,7 @@ import { cn } from '~/components/utils'; import { redirect } from '@remix-run/node'; import { handleError } from '~/root/lib/utils/common'; import { IRemixCtx } from '~/root/lib/types/common'; -import { useAuthApi } from '../server/gql/api-provider'; +import { useAuthApi } from '~/auth/server/gql/api-provider'; const ForgetPassword = () => { const { token } = useLoaderData(); diff --git a/src/apps/auth/routes/_auth.verify-email.tsx b/src/apps/auth/routes/_main+/verify-email.tsx similarity index 100% rename from src/apps/auth/routes/_auth.verify-email.tsx rename to src/apps/auth/routes/_main+/verify-email.tsx diff --git a/src/apps/auth/routes/_auth._providers.tsx b/src/apps/auth/routes/_providers+/_layout.tsx similarity index 95% rename from src/apps/auth/routes/_auth._providers.tsx rename to src/apps/auth/routes/_providers+/_layout.tsx index 7c089e30c..bdcc19e49 100644 --- a/src/apps/auth/routes/_auth._providers.tsx +++ b/src/apps/auth/routes/_providers+/_layout.tsx @@ -6,7 +6,7 @@ import { useLoaderData, } from '@remix-run/react'; import { assureNotLoggedIn } from '~/root/lib/server/helpers/minimal-auth'; -import { GQLServerHandler } from '../server/gql/saved-queries'; +import { GQLServerHandler } from '~/auth/server/gql/saved-queries'; export type IProviderContext = { githubLoginUrl: string; diff --git a/src/apps/auth/routes/_auth._providers.login.tsx b/src/apps/auth/routes/_providers+/login.tsx similarity index 97% rename from src/apps/auth/routes/_auth._providers.login.tsx rename to src/apps/auth/routes/_providers+/login.tsx index 61c843673..d91332040 100644 --- a/src/apps/auth/routes/_auth._providers.login.tsx +++ b/src/apps/auth/routes/_providers+/login.tsx @@ -17,9 +17,9 @@ import { handleError } from '~/root/lib/utils/common'; import { toast } from '~/components/molecule/toast'; import { Button } from '~/components/atoms/button'; import { cn } from '~/components/utils'; -import Container from '../components/container'; -import { useAuthApi } from '../server/gql/api-provider'; -import { IProviderContext } from './_auth._providers'; +import { useAuthApi } from '~/auth/server/gql/api-provider'; +import Container from '../../components/container'; +import { IProviderContext } from './_layout'; const CustomGoogleIcon = (props: any) => { return ; diff --git a/src/apps/auth/routes/_auth._providers.signup.tsx b/src/apps/auth/routes/_providers+/signup.tsx similarity index 98% rename from src/apps/auth/routes/_auth._providers.signup.tsx rename to src/apps/auth/routes/_providers+/signup.tsx index 38ef357c0..73ad2a241 100644 --- a/src/apps/auth/routes/_auth._providers.signup.tsx +++ b/src/apps/auth/routes/_providers+/signup.tsx @@ -21,8 +21,8 @@ import Yup from '~/root/lib/server/helpers/yup'; import { toast } from '~/components/molecule/toast'; import { useAPIClient } from '~/root/lib/client/hooks/api-provider'; import { handleError } from '~/root/lib/utils/common'; -import Container from '../components/container'; -import { IProviderContext } from './_auth._providers'; +import Container from '../../components/container'; +import { IProviderContext } from './_layout'; const CustomGoogleIcon = (props: any) => { return ; From 697898ccc2159fcca273595a30b9c0735815a432 Mon Sep 17 00:00:00 2001 From: Bikash Date: Mon, 25 Dec 2023 16:24:39 +0530 Subject: [PATCH 3/6] add new routes for infra and did some ui refactorings --- gql-queries-generator/doc/queries.graphql | 7 +- package.json | 115 +- pnpm-lock.yaml | 2733 +++++++++-------- .../console/components/common-navbar-tabs.tsx | 7 +- src/apps/console/components/commons.tsx | 8 +- src/apps/console/components/raw-wrapper.tsx | 122 +- .../components/resource-extra-action.tsx | 9 +- .../components/secondary-sub-header.tsx | 4 +- src/apps/console/components/wrapper.tsx | 2 +- .../console/page-components/new-cluster.tsx | 4 +- .../handle-backend-resources.tsx | 58 +- .../route.tsx | 6 +- .../backend-services-resources.tsx | 27 +- .../handle-backend-service.tsx | 52 +- .../route.tsx | 2 +- .../route.tsx | 2 +- .../route.tsx | 164 - src/apps/console/routes/_.$account._index.tsx | 2 +- ...ter.$project.$scope.$workspace._index.tsx} | 0 ...ect.$scope.$workspace.app.$app._index.tsx} | 0 ....$project.$scope.$workspace.cs._index.tsx} | 0 ...cluster.$project.$scope.$workspace.cs.tsx} | 0 ...ct.$scope.$workspace.managed-services.tsx} | 0 ...r.$project.$scope.$workspace.settings.tsx} | 0 ...infra.$cluster.$project.$scope._index.tsx} | 0 ...ccount.infra.$cluster.$project.$scope.tsx} | 2 +- ...ccount.infra.$cluster.$project._index.tsx} | 0 ...fra.$cluster.$project.settings._index.tsx} | 0 ...ount.infra.$cluster.$project.settings.tsx} | 2 +- ...=> _.$account.infra.$cluster.$project.tsx} | 2 +- ...x => _.$account.infra.$cluster._index.tsx} | 2 +- .../domain-detail.tsx | 2 +- .../domain-resources.tsx | 0 .../handle-domain.tsx | 0 .../route.tsx | 0 .../tools.tsx | 0 ... => _.$account.infra.$cluster.network.tsx} | 4 +- .../devices-resources.tsx | 0 .../handle-devices.tsx | 0 .../route.tsx | 0 .../tools.tsx | 0 .../handle-nodepool.tsx | 2 +- .../nodepool-resources.tsx | 5 +- .../nodepool-utils.tsx | 0 .../resources_b.tsx | 0 .../route.tsx | 2 +- .../taints-and-labels.tsx | 0 .../tools.tsx | 0 .../route.tsx | 0 ...ccount.infra.$cluster.overview._index.tsx} | 0 .../route.tsx | 208 ++ .../route.tsx | 0 .../route.tsx | 0 .../route.tsx | 2 +- ...ccount.infra.$cluster.settings._index.tsx} | 0 .../route.tsx | 4 +- ...=> _.$account.infra.$cluster.settings.tsx} | 0 .../route.tsx | 0 .../storage-resources.tsx | 0 .../tools.tsx | 0 ...ster.tsx => _.$account.infra.$cluster.tsx} | 9 +- .../routes/_.$account.infra._index/route.tsx | 5 + .../cluster-resources.tsx | 35 +- .../route.tsx | 43 +- .../tools.tsx | 0 ...ters.tsx => _.$account.infra.clusters.tsx} | 0 src/apps/console/routes/_.$account.infra.tsx | 29 + .../console/routes/_.$account.infra.vms.tsx | 7 + ...dex.tsx => _.$account.packages._index.tsx} | 2 +- .../cred-resources.tsx | 0 .../handle-cr-cred.tsx | 0 .../route.tsx | 30 +- .../tools.tsx | 0 .../routes/_.$account.packages.helm-repos.tsx | 7 + .../handle-repo.tsx | 0 .../repo-resources.tsx | 0 .../route.tsx | 15 +- .../tools.tsx | 0 ...r-registry.tsx => _.$account.packages.tsx} | 9 +- .../_.$account.repo_.$repo.images/route.tsx | 18 - .../console/routes/_.$account.repo_.$repo.tsx | 66 +- .../route.tsx | 1 - .../routes/_.$account.settings.general.tsx | 172 +- .../console/routes/_.$account.settings.tsx | 6 +- .../route.tsx | 2 +- src/apps/console/routes/_.$account.tsx | 2 +- src/apps/console/routes/_/route.tsx | 49 +- ...boarding.$a.$cloudprovider.validate-cp.tsx | 2 +- src/apps/console/routes/_a.teams.tsx | 4 +- src/design-system/components/atoms/button.tsx | 3 + src/design-system/components/atoms/select.tsx | 2 + src/design-system/components/atoms/tabs.tsx | 6 +- src/generated/gql/server.ts | 14 +- 93 files changed, 2172 insertions(+), 1927 deletions(-) delete mode 100644 src/apps/console/routes/_.$account.$cluster.overview.info/route.tsx rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace._index.tsx => _.$account.infra.$cluster.$project.$scope.$workspace._index.tsx} (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.app.$app._index.tsx => _.$account.infra.$cluster.$project.$scope.$workspace.app.$app._index.tsx} (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.cs._index.tsx => _.$account.infra.$cluster.$project.$scope.$workspace.cs._index.tsx} (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.cs.tsx => _.$account.infra.$cluster.$project.$scope.$workspace.cs.tsx} (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.managed-services.tsx => _.$account.infra.$cluster.$project.$scope.$workspace.managed-services.tsx} (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.settings.tsx => _.$account.infra.$cluster.$project.$scope.$workspace.settings.tsx} (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope._index.tsx => _.$account.infra.$cluster.$project.$scope._index.tsx} (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.tsx => _.$account.infra.$cluster.$project.$scope.tsx} (96%) rename src/apps/console/routes/{_.$account.$cluster.$project._index.tsx => _.$account.infra.$cluster.$project._index.tsx} (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.settings._index.tsx => _.$account.infra.$cluster.$project.settings._index.tsx} (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.settings.tsx => _.$account.infra.$cluster.$project.settings.tsx} (90%) rename src/apps/console/routes/{_.$account.$cluster.$project.tsx => _.$account.infra.$cluster.$project.tsx} (97%) rename src/apps/console/routes/{_.$account.$cluster._index.tsx => _.$account.infra.$cluster._index.tsx} (76%) rename src/apps/console/routes/{_.$account.$cluster.network.domain => _.$account.infra.$cluster.network.domain}/domain-detail.tsx (96%) rename src/apps/console/routes/{_.$account.$cluster.network.domain => _.$account.infra.$cluster.network.domain}/domain-resources.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.network.domain => _.$account.infra.$cluster.network.domain}/handle-domain.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.network.domain => _.$account.infra.$cluster.network.domain}/route.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.network.domain => _.$account.infra.$cluster.network.domain}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.network.tsx => _.$account.infra.$cluster.network.tsx} (81%) rename src/apps/console/routes/{_.$account.$cluster.network.vpn => _.$account.infra.$cluster.network.vpn}/devices-resources.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.network.vpn => _.$account.infra.$cluster.network.vpn}/handle-devices.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.network.vpn => _.$account.infra.$cluster.network.vpn}/route.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.network.vpn => _.$account.infra.$cluster.network.vpn}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.nodepools => _.$account.infra.$cluster.nodepools}/handle-nodepool.tsx (99%) rename src/apps/console/routes/{_.$account.$cluster.nodepools => _.$account.infra.$cluster.nodepools}/nodepool-resources.tsx (99%) rename src/apps/console/routes/{_.$account.$cluster.nodepools => _.$account.infra.$cluster.nodepools}/nodepool-utils.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.nodepools => _.$account.infra.$cluster.nodepools}/resources_b.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.nodepools => _.$account.infra.$cluster.nodepools}/route.tsx (98%) rename src/apps/console/routes/{_.$account.$cluster.nodepools => _.$account.infra.$cluster.nodepools}/taints-and-labels.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.nodepools => _.$account.infra.$cluster.nodepools}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.np.$nodepool => _.$account.infra.$cluster.np.$nodepool}/route.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.overview._index.tsx => _.$account.infra.$cluster.overview._index.tsx} (100%) create mode 100644 src/apps/console/routes/_.$account.infra.$cluster.overview.info/route.tsx rename src/apps/console/routes/{_.$account.$cluster.overview.logs => _.$account.infra.$cluster.overview.logs}/route.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.overview.metrics => _.$account.infra.$cluster.overview.metrics}/route.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.overview => _.$account.infra.$cluster.overview}/route.tsx (92%) rename src/apps/console/routes/{_.$account.$cluster.settings._index.tsx => _.$account.infra.$cluster.settings._index.tsx} (100%) rename src/apps/console/routes/{_.$account.$cluster.settings.general => _.$account.infra.$cluster.settings.general}/route.tsx (98%) rename src/apps/console/routes/{_.$account.$cluster.settings.tsx => _.$account.infra.$cluster.settings.tsx} (100%) rename src/apps/console/routes/{_.$account.$cluster.storage => _.$account.infra.$cluster.storage}/route.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.storage => _.$account.infra.$cluster.storage}/storage-resources.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.storage => _.$account.infra.$cluster.storage}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.tsx => _.$account.infra.$cluster.tsx} (93%) create mode 100644 src/apps/console/routes/_.$account.infra._index/route.tsx rename src/apps/console/routes/{_.$account.clusters._index => _.$account.infra.clusters._index}/cluster-resources.tsx (85%) rename src/apps/console/routes/{_.$account.clusters._index => _.$account.infra.clusters._index}/route.tsx (84%) rename src/apps/console/routes/{_.$account.clusters._index => _.$account.infra.clusters._index}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.clusters.tsx => _.$account.infra.clusters.tsx} (100%) create mode 100644 src/apps/console/routes/_.$account.infra.tsx create mode 100644 src/apps/console/routes/_.$account.infra.vms.tsx rename src/apps/console/routes/{_.$account.container-registry._index.tsx => _.$account.packages._index.tsx} (73%) rename src/apps/console/routes/{_.$account.container-registry.access-management => _.$account.packages.access-management}/cred-resources.tsx (100%) rename src/apps/console/routes/{_.$account.container-registry.access-management => _.$account.packages.access-management}/handle-cr-cred.tsx (100%) rename src/apps/console/routes/{_.$account.container-registry.access-management => _.$account.packages.access-management}/route.tsx (82%) rename src/apps/console/routes/{_.$account.container-registry.access-management => _.$account.packages.access-management}/tools.tsx (100%) create mode 100644 src/apps/console/routes/_.$account.packages.helm-repos.tsx rename src/apps/console/routes/{_.$account.container-registry.repos => _.$account.packages.repos}/handle-repo.tsx (100%) rename src/apps/console/routes/{_.$account.container-registry.repos => _.$account.packages.repos}/repo-resources.tsx (100%) rename src/apps/console/routes/{_.$account.container-registry.repos => _.$account.packages.repos}/route.tsx (91%) rename src/apps/console/routes/{_.$account.container-registry.repos => _.$account.packages.repos}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.container-registry.tsx => _.$account.packages.tsx} (63%) diff --git a/gql-queries-generator/doc/queries.graphql b/gql-queries-generator/doc/queries.graphql index f1810faa7..41157353e 100644 --- a/gql-queries-generator/doc/queries.graphql +++ b/gql-queries-generator/doc/queries.graphql @@ -2684,6 +2684,9 @@ query authCli_getKubeConfig($name: String!) { encoding value } + status { + isReady + } } } @@ -2695,6 +2698,9 @@ query authCli_listClusters($pagination: CursorPaginationIn) { metadata { name } + status { + isReady + } } } } @@ -2702,7 +2708,6 @@ query authCli_listClusters($pagination: CursorPaginationIn) { query authCli_listAccounts { accounts_listAccounts { - id metadata { name } diff --git a/package.json b/package.json index d7b773bc8..73ee8b4e9 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "tsgen": "pnpm gql:parse && cd src/generated && pnpm tsgen" }, "dependencies": { - "@jengaicons/react": "^1.1.0", + "@jengaicons/react": "^1.3.0", "@mdx-js/react": "^2.3.0", "@oshq/react-select": "^1.0.1", "@radix-ui/primitive": "^1.0.1", @@ -33,15 +33,15 @@ "@radix-ui/react-context": "^1.0.1", "@radix-ui/react-dialog": "1.0.4", "@radix-ui/react-direction": "^1.0.1", - "@radix-ui/react-dismissable-layer": "^1.0.4", - "@radix-ui/react-dropdown-menu": "^2.0.5", + "@radix-ui/react-dismissable-layer": "^1.0.5", + "@radix-ui/react-dropdown-menu": "^2.0.6", "@radix-ui/react-focus-guards": "^1.0.1", - "@radix-ui/react-focus-scope": "^1.0.3", + "@radix-ui/react-focus-scope": "^1.0.4", "@radix-ui/react-id": "^1.0.1", "@radix-ui/react-menu": "2.0.5", "@radix-ui/react-popover": "1.0.6", - "@radix-ui/react-popper": "^1.1.2", - "@radix-ui/react-portal": "^1.0.3", + "@radix-ui/react-popper": "^1.1.3", + "@radix-ui/react-portal": "^1.0.4", "@radix-ui/react-presence": "^1.0.1", "@radix-ui/react-primitive": "^1.0.3", "@radix-ui/react-radio-group": "1.1.3", @@ -49,91 +49,90 @@ "@radix-ui/react-separator": "^1.0.3", "@radix-ui/react-slot": "^1.0.2", "@radix-ui/react-switch": "^1.0.3", - "@radix-ui/react-toast": "^1.1.4", + "@radix-ui/react-toast": "^1.1.5", "@radix-ui/react-toggle-group": "^1.0.4", - "@radix-ui/react-tooltip": "^1.0.6", + "@radix-ui/react-tooltip": "^1.0.7", "@radix-ui/react-use-callback-ref": "^1.0.1", "@radix-ui/react-use-controllable-state": "^1.0.1", - "@react-aria/focus": "^3.13.0", - "@react-aria/gridlist": "^3.5.0", - "@react-types/shared": "^3.19.0", - "@remix-run/node": "^1.19.2", - "@remix-run/react": "^1.19.2", + "@react-aria/focus": "^3.16.0", + "@react-aria/gridlist": "^3.7.3", + "@react-types/shared": "^3.22.0", + "@remix-run/node": "^1.19.3", + "@remix-run/react": "^1.19.3", "anser": "^2.1.1", "aria-hidden": "^1.2.3", - "axios": "^1.4.0", + "axios": "^1.6.2", "classnames": "^2.3.2", "cookie": "^0.5.0", - "dayjs": "^1.11.9", - "framer-motion": "^10.12.16", + "dayjs": "^1.11.10", + "framer-motion": "^10.16.16", "fuse.js": "^6.6.2", - "graphql": "^16.8.0", + "graphql": "^16.8.1", "graphql-tag": "^2.12.6", - "highlight.js": "^11.8.0", - "isbot": "^3.6.10", + "highlight.js": "^11.9.0", + "isbot": "^3.7.1", "js-cookie": "^3.0.5", "js-yaml": "^4.1.0", - "pino": "^8.15.3", - "rc-slider": "^10.2.1", + "pino": "^8.17.1", + "rc-slider": "^10.5.0", "react": "18.2.0", "react-diff-viewer": "3.1.0", "react-dom": "^18.2.0", "react-google-recaptcha-v3": "^1.10.1", "react-highlightjs-logs": "^1.1.0", - "react-hook-form": "^7.46.1", + "react-hook-form": "^7.49.2", "react-loading-skeleton": "^3.3.1", "react-pulsable": "^1.0.17", "react-qr-code": "^2.0.12", - "react-remove-scroll": "^2.5.6", - "react-router-dom": "^6.11.2", + "react-remove-scroll": "^2.5.7", + "react-router-dom": "^6.21.1", "react-toastify": "^9.1.3", - "react-viewport-list": "^7.1.1", - "remix": "^1.19.2", - "search-in-json": "^1.0.5", - "socket.io-client": "^4.7.2", + "react-viewport-list": "^7.1.2", + "remix": "^1.19.3", + "search-in-json": "^1.0.67", "swr": "^2.2.4", "use-immer": "^0.9.0", - "uuid": "^9.0.0", + "uuid": "^9.0.1", "websocket": "^1.0.34", - "yup": "^1.2.0" + "yup": "^1.3.3" }, "devDependencies": { - "@babel/core": "^7.21.8", - "@babel/preset-env": "^7.22.5", + "@babel/core": "^7.23.6", + "@babel/preset-env": "^7.23.6", "@faker-js/faker": "^8.3.1", - "@remix-run/dev": "^1.19.2", - "@remix-run/serve": "^1.19.2", - "@types/cookie": "^0.5.1", + "@remix-run/dev": "^1.19.3", + "@remix-run/serve": "^1.19.3", + "@types/cookie": "^0.5.4", "@types/faker": "^6.6.9", - "@types/js-cookie": "^3.0.3", - "@types/js-yaml": "^4.0.5", - "@types/react": "^18.2.20", - "@types/react-dom": "^18.2.7", - "@types/react-ranger": "^2.0.1", - "@types/uuid": "^9.0.2", - "@types/websocket": "^1.0.6", - "@typescript-eslint/eslint-plugin": "^6.4.1", - "@typescript-eslint/parser": "^6.4.1", - "autoprefixer": "^10.4.2", - "esbuild": "^0.19.4", - "eslint": "^8.47.0", + "@types/js-cookie": "^3.0.6", + "@types/js-yaml": "^4.0.9", + "@types/react": "^18.2.45", + "@types/react-dom": "^18.2.18", + "@types/react-ranger": "^2.0.4", + "@types/uuid": "^9.0.7", + "@types/websocket": "^1.0.10", + "@typescript-eslint/eslint-plugin": "^6.15.0", + "@typescript-eslint/parser": "^6.15.0", + "autoprefixer": "^10.4.16", + "esbuild": "^0.19.10", + "eslint": "^8.56.0", "eslint-config-airbnb": "19.0.4", - "eslint-config-prettier": "^8.3.0", + "eslint-config-prettier": "^8.10.0", "eslint-import-resolver-jsconfig": "^1.1.0", - "eslint-import-resolver-node": "^0.3.6", - "eslint-import-resolver-typescript": "^3.6.0", - "eslint-plugin-import": "^2.25.4", - "eslint-plugin-jsx-a11y": "^6.5.1", - "eslint-plugin-prefer-arrow-functions": "^3.1.4", - "eslint-plugin-prettier": "^4.0.0", - "eslint-plugin-react": "^7.28.0", - "eslint-plugin-react-hooks": "^4.3.0", + "eslint-import-resolver-node": "^0.3.9", + "eslint-import-resolver-typescript": "^3.6.1", + "eslint-plugin-import": "^2.29.1", + "eslint-plugin-jsx-a11y": "^6.8.0", + "eslint-plugin-prefer-arrow-functions": "^3.2.4", + "eslint-plugin-prettier": "^4.2.1", + "eslint-plugin-react": "^7.33.2", + "eslint-plugin-react-hooks": "^4.6.0", "faker": "^5.5.3", "json-schema-faker": "^0.5.4", "nodemon": "^2.0.22", "prettier": "^2.8.8", - "tailwindcss": "^3.3.2", - "typescript": "^5.1.6", + "tailwindcss": "^3.4.0", + "typescript": "^5.3.3", "typescript-json-schema": "^0.62.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dfabbb9a0..d050d9ae7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,115 +6,115 @@ settings: dependencies: '@jengaicons/react': - specifier: ^1.1.0 - version: 1.2.0(react@18.2.0) + specifier: ^1.3.0 + version: 1.3.0(react@18.2.0) '@mdx-js/react': specifier: ^2.3.0 version: 2.3.0(react@18.2.0) '@oshq/react-select': specifier: ^1.0.1 - version: 1.0.1(@radix-ui/react-portal@1.0.4)(classnames@2.3.2)(framer-motion@10.16.5)(rc-virtual-list@3.11.3)(react@18.2.0) + version: 1.0.1(@radix-ui/react-portal@1.0.4)(classnames@2.3.2)(framer-motion@10.16.16)(rc-virtual-list@3.11.3)(react@18.2.0) '@radix-ui/primitive': specifier: ^1.0.1 version: 1.0.1 '@radix-ui/react-alert-dialog': specifier: 1.0.4 - version: 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + version: 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-checkbox': specifier: ^1.0.4 - version: 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + version: 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-collection': specifier: ^1.0.3 - version: 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + version: 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-compose-refs': specifier: ^1.0.1 - version: 1.0.1(@types/react@18.2.38)(react@18.2.0) + version: 1.0.1(@types/react@18.2.45)(react@18.2.0) '@radix-ui/react-context': specifier: ^1.0.1 - version: 1.0.1(@types/react@18.2.38)(react@18.2.0) + version: 1.0.1(@types/react@18.2.45)(react@18.2.0) '@radix-ui/react-dialog': specifier: 1.0.4 - version: 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + version: 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-direction': specifier: ^1.0.1 - version: 1.0.1(@types/react@18.2.38)(react@18.2.0) + version: 1.0.1(@types/react@18.2.45)(react@18.2.0) '@radix-ui/react-dismissable-layer': - specifier: ^1.0.4 - version: 1.0.5(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + specifier: ^1.0.5 + version: 1.0.5(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-dropdown-menu': - specifier: ^2.0.5 - version: 2.0.6(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + specifier: ^2.0.6 + version: 2.0.6(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-focus-guards': specifier: ^1.0.1 - version: 1.0.1(@types/react@18.2.38)(react@18.2.0) + version: 1.0.1(@types/react@18.2.45)(react@18.2.0) '@radix-ui/react-focus-scope': - specifier: ^1.0.3 - version: 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + specifier: ^1.0.4 + version: 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-id': specifier: ^1.0.1 - version: 1.0.1(@types/react@18.2.38)(react@18.2.0) + version: 1.0.1(@types/react@18.2.45)(react@18.2.0) '@radix-ui/react-menu': specifier: 2.0.5 - version: 2.0.5(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + version: 2.0.5(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-popover': specifier: 1.0.6 - version: 1.0.6(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + version: 1.0.6(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-popper': - specifier: ^1.1.2 - version: 1.1.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + specifier: ^1.1.3 + version: 1.1.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-portal': - specifier: ^1.0.3 - version: 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + specifier: ^1.0.4 + version: 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-presence': specifier: ^1.0.1 - version: 1.0.1(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + version: 1.0.1(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-primitive': specifier: ^1.0.3 - version: 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + version: 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-radio-group': specifier: 1.1.3 - version: 1.1.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + version: 1.1.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-roving-focus': specifier: ^1.0.4 - version: 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + version: 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-separator': specifier: ^1.0.3 - version: 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + version: 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-slot': specifier: ^1.0.2 - version: 1.0.2(@types/react@18.2.38)(react@18.2.0) + version: 1.0.2(@types/react@18.2.45)(react@18.2.0) '@radix-ui/react-switch': specifier: ^1.0.3 - version: 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + version: 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-toast': - specifier: ^1.1.4 - version: 1.1.5(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + specifier: ^1.1.5 + version: 1.1.5(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-toggle-group': specifier: ^1.0.4 - version: 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + version: 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-tooltip': - specifier: ^1.0.6 - version: 1.0.7(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + specifier: ^1.0.7 + version: 1.0.7(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-use-callback-ref': specifier: ^1.0.1 - version: 1.0.1(@types/react@18.2.38)(react@18.2.0) + version: 1.0.1(@types/react@18.2.45)(react@18.2.0) '@radix-ui/react-use-controllable-state': specifier: ^1.0.1 - version: 1.0.1(@types/react@18.2.38)(react@18.2.0) + version: 1.0.1(@types/react@18.2.45)(react@18.2.0) '@react-aria/focus': - specifier: ^3.13.0 - version: 3.15.0(react@18.2.0) + specifier: ^3.16.0 + version: 3.16.0(react@18.2.0) '@react-aria/gridlist': - specifier: ^3.5.0 - version: 3.7.2(react-dom@18.2.0)(react@18.2.0) + specifier: ^3.7.3 + version: 3.7.3(react-dom@18.2.0)(react@18.2.0) '@react-types/shared': - specifier: ^3.19.0 + specifier: ^3.22.0 version: 3.22.0(react@18.2.0) '@remix-run/node': - specifier: ^1.19.2 + specifier: ^1.19.3 version: 1.19.3 '@remix-run/react': - specifier: ^1.19.2 + specifier: ^1.19.3 version: 1.19.3(react-dom@18.2.0)(react@18.2.0) anser: specifier: ^2.1.1 @@ -123,7 +123,7 @@ dependencies: specifier: ^1.2.3 version: 1.2.3 axios: - specifier: ^1.4.0 + specifier: ^1.6.2 version: 1.6.2 classnames: specifier: ^2.3.2 @@ -132,25 +132,25 @@ dependencies: specifier: ^0.5.0 version: 0.5.0 dayjs: - specifier: ^1.11.9 + specifier: ^1.11.10 version: 1.11.10 framer-motion: - specifier: ^10.12.16 - version: 10.16.5(react-dom@18.2.0)(react@18.2.0) + specifier: ^10.16.16 + version: 10.16.16(react-dom@18.2.0)(react@18.2.0) fuse.js: specifier: ^6.6.2 version: 6.6.2 graphql: - specifier: ^16.8.0 + specifier: ^16.8.1 version: 16.8.1 graphql-tag: specifier: ^2.12.6 version: 2.12.6(graphql@16.8.1) highlight.js: - specifier: ^11.8.0 + specifier: ^11.9.0 version: 11.9.0 isbot: - specifier: ^3.6.10 + specifier: ^3.7.1 version: 3.7.1 js-cookie: specifier: ^3.0.5 @@ -159,11 +159,11 @@ dependencies: specifier: ^4.1.0 version: 4.1.0 pino: - specifier: ^8.15.3 - version: 8.16.2 + specifier: ^8.17.1 + version: 8.17.1 rc-slider: - specifier: ^10.2.1 - version: 10.4.0(react-dom@18.2.0)(react@18.2.0) + specifier: ^10.5.0 + version: 10.5.0(react-dom@18.2.0)(react@18.2.0) react: specifier: 18.2.0 version: 18.2.0 @@ -178,10 +178,10 @@ dependencies: version: 1.10.1(react-dom@18.2.0)(react@18.2.0) react-highlightjs-logs: specifier: ^1.1.0 - version: 1.1.0(anser@2.1.1)(axios@1.6.2)(classnames@2.3.2)(fuse.js@6.6.2)(highlight.js@11.9.0)(react-dom@18.2.0)(react-viewport-list@7.1.1)(react@18.2.0)(websocket@1.0.34) + version: 1.1.0(anser@2.1.1)(axios@1.6.2)(classnames@2.3.2)(fuse.js@6.6.2)(highlight.js@11.9.0)(react-dom@18.2.0)(react-viewport-list@7.1.2)(react@18.2.0)(websocket@1.0.34) react-hook-form: - specifier: ^7.46.1 - version: 7.48.2(react@18.2.0) + specifier: ^7.49.2 + version: 7.49.2(react@18.2.0) react-loading-skeleton: specifier: ^3.3.1 version: 3.3.1(react@18.2.0) @@ -192,26 +192,23 @@ dependencies: specifier: ^2.0.12 version: 2.0.12(react@18.2.0) react-remove-scroll: - specifier: ^2.5.6 - version: 2.5.7(@types/react@18.2.38)(react@18.2.0) + specifier: ^2.5.7 + version: 2.5.7(@types/react@18.2.45)(react@18.2.0) react-router-dom: - specifier: ^6.11.2 - version: 6.20.0(react-dom@18.2.0)(react@18.2.0) + specifier: ^6.21.1 + version: 6.21.1(react-dom@18.2.0)(react@18.2.0) react-toastify: specifier: ^9.1.3 version: 9.1.3(react-dom@18.2.0)(react@18.2.0) react-viewport-list: - specifier: ^7.1.1 - version: 7.1.1(react@18.2.0) + specifier: ^7.1.2 + version: 7.1.2(react@18.2.0) remix: - specifier: ^1.19.2 + specifier: ^1.19.3 version: 1.19.3 search-in-json: - specifier: ^1.0.5 + specifier: ^1.0.67 version: 1.0.67 - socket.io-client: - specifier: ^4.7.2 - version: 4.7.2 swr: specifier: ^2.2.4 version: 2.2.4(react@18.2.0) @@ -219,106 +216,106 @@ dependencies: specifier: ^0.9.0 version: 0.9.0(immer@10.0.3)(react@18.2.0) uuid: - specifier: ^9.0.0 + specifier: ^9.0.1 version: 9.0.1 websocket: specifier: ^1.0.34 version: 1.0.34 yup: - specifier: ^1.2.0 - version: 1.3.2 + specifier: ^1.3.3 + version: 1.3.3 devDependencies: '@babel/core': - specifier: ^7.21.8 - version: 7.23.3 + specifier: ^7.23.6 + version: 7.23.6 '@babel/preset-env': - specifier: ^7.22.5 - version: 7.23.3(@babel/core@7.23.3) + specifier: ^7.23.6 + version: 7.23.6(@babel/core@7.23.6) '@faker-js/faker': specifier: ^8.3.1 version: 8.3.1 '@remix-run/dev': - specifier: ^1.19.2 - version: 1.19.3(@remix-run/serve@1.19.3)(@types/node@16.18.64) + specifier: ^1.19.3 + version: 1.19.3(@remix-run/serve@1.19.3)(@types/node@16.18.68) '@remix-run/serve': - specifier: ^1.19.2 + specifier: ^1.19.3 version: 1.19.3 '@types/cookie': - specifier: ^0.5.1 + specifier: ^0.5.4 version: 0.5.4 '@types/faker': specifier: ^6.6.9 version: 6.6.9 '@types/js-cookie': - specifier: ^3.0.3 + specifier: ^3.0.6 version: 3.0.6 '@types/js-yaml': - specifier: ^4.0.5 + specifier: ^4.0.9 version: 4.0.9 '@types/react': - specifier: ^18.2.20 - version: 18.2.38 + specifier: ^18.2.45 + version: 18.2.45 '@types/react-dom': - specifier: ^18.2.7 - version: 18.2.17 + specifier: ^18.2.18 + version: 18.2.18 '@types/react-ranger': - specifier: ^2.0.1 + specifier: ^2.0.4 version: 2.0.4 '@types/uuid': - specifier: ^9.0.2 + specifier: ^9.0.7 version: 9.0.7 '@types/websocket': - specifier: ^1.0.6 + specifier: ^1.0.10 version: 1.0.10 '@typescript-eslint/eslint-plugin': - specifier: ^6.4.1 - version: 6.12.0(@typescript-eslint/parser@6.12.0)(eslint@8.54.0)(typescript@5.3.2) + specifier: ^6.15.0 + version: 6.15.0(@typescript-eslint/parser@6.15.0)(eslint@8.56.0)(typescript@5.3.3) '@typescript-eslint/parser': - specifier: ^6.4.1 - version: 6.12.0(eslint@8.54.0)(typescript@5.3.2) + specifier: ^6.15.0 + version: 6.15.0(eslint@8.56.0)(typescript@5.3.3) autoprefixer: - specifier: ^10.4.2 - version: 10.4.16(postcss@8.4.31) + specifier: ^10.4.16 + version: 10.4.16(postcss@8.4.32) esbuild: - specifier: ^0.19.4 - version: 0.19.7 + specifier: ^0.19.10 + version: 0.19.10 eslint: - specifier: ^8.47.0 - version: 8.54.0 + specifier: ^8.56.0 + version: 8.56.0 eslint-config-airbnb: specifier: 19.0.4 - version: 19.0.4(eslint-plugin-import@2.29.0)(eslint-plugin-jsx-a11y@6.8.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.33.2)(eslint@8.54.0) + version: 19.0.4(eslint-plugin-import@2.29.1)(eslint-plugin-jsx-a11y@6.8.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.33.2)(eslint@8.56.0) eslint-config-prettier: - specifier: ^8.3.0 - version: 8.10.0(eslint@8.54.0) + specifier: ^8.10.0 + version: 8.10.0(eslint@8.56.0) eslint-import-resolver-jsconfig: specifier: ^1.1.0 version: 1.1.0 eslint-import-resolver-node: - specifier: ^0.3.6 + specifier: ^0.3.9 version: 0.3.9 eslint-import-resolver-typescript: - specifier: ^3.6.0 - version: 3.6.1(@typescript-eslint/parser@6.12.0)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.0)(eslint@8.54.0) + specifier: ^3.6.1 + version: 3.6.1(@typescript-eslint/parser@6.15.0)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.56.0) eslint-plugin-import: - specifier: ^2.25.4 - version: 2.29.0(@typescript-eslint/parser@6.12.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0) + specifier: ^2.29.1 + version: 2.29.1(@typescript-eslint/parser@6.15.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0) eslint-plugin-jsx-a11y: - specifier: ^6.5.1 - version: 6.8.0(eslint@8.54.0) + specifier: ^6.8.0 + version: 6.8.0(eslint@8.56.0) eslint-plugin-prefer-arrow-functions: - specifier: ^3.1.4 - version: 3.2.4(eslint@8.54.0) + specifier: ^3.2.4 + version: 3.2.4(eslint@8.56.0) eslint-plugin-prettier: - specifier: ^4.0.0 - version: 4.2.1(eslint-config-prettier@8.10.0)(eslint@8.54.0)(prettier@2.8.8) + specifier: ^4.2.1 + version: 4.2.1(eslint-config-prettier@8.10.0)(eslint@8.56.0)(prettier@2.8.8) eslint-plugin-react: - specifier: ^7.28.0 - version: 7.33.2(eslint@8.54.0) + specifier: ^7.33.2 + version: 7.33.2(eslint@8.56.0) eslint-plugin-react-hooks: - specifier: ^4.3.0 - version: 4.6.0(eslint@8.54.0) + specifier: ^4.6.0 + version: 4.6.0(eslint@8.56.0) faker: specifier: ^5.5.3 version: 5.5.3 @@ -332,11 +329,11 @@ devDependencies: specifier: ^2.8.8 version: 2.8.8 tailwindcss: - specifier: ^3.3.2 - version: 3.3.5 + specifier: ^3.4.0 + version: 3.4.0 typescript: - specifier: ^5.1.6 - version: 5.3.2 + specifier: ^5.3.3 + version: 5.3.3 typescript-json-schema: specifier: ^0.62.0 version: 0.62.0 @@ -361,32 +358,32 @@ packages: '@jridgewell/trace-mapping': 0.3.20 dev: true - /@babel/code-frame@7.23.4: - resolution: {integrity: sha512-r1IONyb6Ia+jYR2vvIDhdWdlTGhqbBoFqLTQidzZ4kepUFH15ejXvFHxCVbtl7BOXIudsIubf4E81xeA3h3IXA==} + /@babel/code-frame@7.23.5: + resolution: {integrity: sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==} engines: {node: '>=6.9.0'} dependencies: '@babel/highlight': 7.23.4 chalk: 2.4.2 - /@babel/compat-data@7.23.3: - resolution: {integrity: sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ==} + /@babel/compat-data@7.23.5: + resolution: {integrity: sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==} engines: {node: '>=6.9.0'} dev: true - /@babel/core@7.23.3: - resolution: {integrity: sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==} + /@babel/core@7.23.6: + resolution: {integrity: sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw==} engines: {node: '>=6.9.0'} dependencies: '@ampproject/remapping': 2.2.1 - '@babel/code-frame': 7.23.4 - '@babel/generator': 7.23.4 - '@babel/helper-compilation-targets': 7.22.15 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.3) - '@babel/helpers': 7.23.4 - '@babel/parser': 7.23.4 + '@babel/code-frame': 7.23.5 + '@babel/generator': 7.23.6 + '@babel/helper-compilation-targets': 7.23.6 + '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.6) + '@babel/helpers': 7.23.6 + '@babel/parser': 7.23.6 '@babel/template': 7.22.15 - '@babel/traverse': 7.23.4 - '@babel/types': 7.23.4 + '@babel/traverse': 7.23.6 + '@babel/types': 7.23.6 convert-source-map: 2.0.0 debug: 4.3.4 gensync: 1.0.0-beta.2 @@ -396,11 +393,11 @@ packages: - supports-color dev: true - /@babel/generator@7.23.4: - resolution: {integrity: sha512-esuS49Cga3HcThFNebGhlgsrVLkvhqvYDTzgjfFFlHJcIfLe5jFmRRfCQ1KuBfc4Jrtn3ndLgKWAKjBE+IraYQ==} + /@babel/generator@7.23.6: + resolution: {integrity: sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.4 + '@babel/types': 7.23.6 '@jridgewell/gen-mapping': 0.3.3 '@jridgewell/trace-mapping': 0.3.20 jsesc: 2.5.2 @@ -410,64 +407,64 @@ packages: resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.4 + '@babel/types': 7.23.6 dev: true /@babel/helper-builder-binary-assignment-operator-visitor@7.22.15: resolution: {integrity: sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.4 + '@babel/types': 7.23.6 dev: true - /@babel/helper-compilation-targets@7.22.15: - resolution: {integrity: sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==} + /@babel/helper-compilation-targets@7.23.6: + resolution: {integrity: sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/compat-data': 7.23.3 - '@babel/helper-validator-option': 7.22.15 - browserslist: 4.22.1 + '@babel/compat-data': 7.23.5 + '@babel/helper-validator-option': 7.23.5 + browserslist: 4.22.2 lru-cache: 5.1.1 semver: 6.3.1 dev: true - /@babel/helper-create-class-features-plugin@7.22.15(@babel/core@7.23.3): - resolution: {integrity: sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==} + /@babel/helper-create-class-features-plugin@7.23.6(@babel/core@7.23.6): + resolution: {integrity: sha512-cBXU1vZni/CpGF29iTu4YRbOZt3Wat6zCoMDxRF1MayiEc4URxOj31tT65HUM0CRpMowA3HCJaAOVOUnMf96cw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-function-name': 7.23.0 '@babel/helper-member-expression-to-functions': 7.23.0 '@babel/helper-optimise-call-expression': 7.22.5 - '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.3) + '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.6) '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 semver: 6.3.1 dev: true - /@babel/helper-create-regexp-features-plugin@7.22.15(@babel/core@7.23.3): + /@babel/helper-create-regexp-features-plugin@7.22.15(@babel/core@7.23.6): resolution: {integrity: sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-annotate-as-pure': 7.22.5 regexpu-core: 5.3.2 semver: 6.3.1 dev: true - /@babel/helper-define-polyfill-provider@0.4.3(@babel/core@7.23.3): - resolution: {integrity: sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==} + /@babel/helper-define-polyfill-provider@0.4.4(@babel/core@7.23.6): + resolution: {integrity: sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA==} peerDependencies: '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 dependencies: - '@babel/core': 7.23.3 - '@babel/helper-compilation-targets': 7.22.15 + '@babel/core': 7.23.6 + '@babel/helper-compilation-targets': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 debug: 4.3.4 lodash.debounce: 4.0.8 @@ -486,36 +483,36 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/template': 7.22.15 - '@babel/types': 7.23.4 + '@babel/types': 7.23.6 dev: true /@babel/helper-hoist-variables@7.22.5: resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.4 + '@babel/types': 7.23.6 dev: true /@babel/helper-member-expression-to-functions@7.23.0: resolution: {integrity: sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.4 + '@babel/types': 7.23.6 dev: true /@babel/helper-module-imports@7.22.15: resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.4 + '@babel/types': 7.23.6 - /@babel/helper-module-transforms@7.23.3(@babel/core@7.23.3): + /@babel/helper-module-transforms@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-module-imports': 7.22.15 '@babel/helper-simple-access': 7.22.5 @@ -527,7 +524,7 @@ packages: resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.4 + '@babel/types': 7.23.6 dev: true /@babel/helper-plugin-utils@7.22.5: @@ -535,25 +532,25 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/helper-remap-async-to-generator@7.22.20(@babel/core@7.23.3): + /@babel/helper-remap-async-to-generator@7.22.20(@babel/core@7.23.6): resolution: {integrity: sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-wrap-function': 7.22.20 dev: true - /@babel/helper-replace-supers@7.22.20(@babel/core@7.23.3): + /@babel/helper-replace-supers@7.22.20(@babel/core@7.23.6): resolution: {integrity: sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-member-expression-to-functions': 7.23.0 '@babel/helper-optimise-call-expression': 7.22.5 @@ -563,21 +560,21 @@ packages: resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.4 + '@babel/types': 7.23.6 dev: true /@babel/helper-skip-transparent-expression-wrappers@7.22.5: resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.4 + '@babel/types': 7.23.6 dev: true /@babel/helper-split-export-declaration@7.22.6: resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.23.4 + '@babel/types': 7.23.6 dev: true /@babel/helper-string-parser@7.23.4: @@ -588,8 +585,8 @@ packages: resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==} engines: {node: '>=6.9.0'} - /@babel/helper-validator-option@7.22.15: - resolution: {integrity: sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==} + /@babel/helper-validator-option@7.23.5: + resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==} engines: {node: '>=6.9.0'} dev: true @@ -599,16 +596,16 @@ packages: dependencies: '@babel/helper-function-name': 7.23.0 '@babel/template': 7.22.15 - '@babel/types': 7.23.4 + '@babel/types': 7.23.6 dev: true - /@babel/helpers@7.23.4: - resolution: {integrity: sha512-HfcMizYz10cr3h29VqyfGL6ZWIjTwWfvYBMsBVGwpcbhNGe3wQ1ZXZRPzZoAHhd9OqHadHqjQ89iVKINXnbzuw==} + /@babel/helpers@7.23.6: + resolution: {integrity: sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA==} engines: {node: '>=6.9.0'} dependencies: '@babel/template': 7.22.15 - '@babel/traverse': 7.23.4 - '@babel/types': 7.23.4 + '@babel/traverse': 7.23.6 + '@babel/types': 7.23.6 transitivePeerDependencies: - supports-color dev: true @@ -621,945 +618,946 @@ packages: chalk: 2.4.2 js-tokens: 4.0.0 - /@babel/parser@7.23.4: - resolution: {integrity: sha512-vf3Xna6UEprW+7t6EtOmFpHNAuxw3xqPZghy+brsnusscJRW5BMUzzHZc5ICjULee81WeUV2jjakG09MDglJXQ==} + /@babel/parser@7.23.6: + resolution: {integrity: sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==} engines: {node: '>=6.0.0'} hasBin: true dependencies: - '@babel/types': 7.23.4 + '@babel/types': 7.23.6 dev: true - /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.23.3(@babel/core@7.23.3): + /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.23.3(@babel/core@7.23.3): + /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.13.0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 - '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.23.3) + '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.23.6) dev: true - /@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.23.3(@babel/core@7.23.3): + /@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.3): + /@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.6): resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 dev: true - /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.23.3): + /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.23.6): resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.23.3): + /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.23.6): resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.23.3): + /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.23.6): resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.23.3): + /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.23.6): resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.23.3): + /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.23.6): resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-import-assertions@7.23.3(@babel/core@7.23.3): + /@babel/plugin-syntax-import-assertions@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-import-attributes@7.23.3(@babel/core@7.23.3): + /@babel/plugin-syntax-import-attributes@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.23.3): + /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.23.6): resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.23.3): + /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.23.6): resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.23.3): + /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.23.3): + /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.23.6): resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.23.3): + /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.23.6): resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.23.3): + /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.23.6): resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.23.3): + /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.23.6): resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.23.3): + /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.23.6): resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.23.3): + /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.23.6): resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.23.3): + /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.23.6): resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.23.3): + /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.23.6): resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-typescript@7.23.3(@babel/core@7.23.3): + /@babel/plugin-syntax-typescript@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.23.3): + /@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.23.6): resolution: {integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.3 - '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.3) + '@babel/core': 7.23.6 + '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.6) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-arrow-functions@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-arrow-functions@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-async-generator-functions@7.23.4(@babel/core@7.23.3): + /@babel/plugin-transform-async-generator-functions@7.23.4(@babel/core@7.23.6): resolution: {integrity: sha512-efdkfPhHYTtn0G6n2ddrESE91fgXxjlqLsnUtPWnJs4a4mZIbUaK7ffqKIIUKXSHwcDvaCVX6GXkaJJFqtX7jw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-plugin-utils': 7.22.5 - '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.23.3) - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.3) + '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.23.6) + '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.6) dev: true - /@babel/plugin-transform-async-to-generator@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-async-to-generator@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-module-imports': 7.22.15 '@babel/helper-plugin-utils': 7.22.5 - '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.23.3) + '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.23.6) dev: true - /@babel/plugin-transform-block-scoped-functions@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-block-scoped-functions@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-block-scoping@7.23.4(@babel/core@7.23.3): + /@babel/plugin-transform-block-scoping@7.23.4(@babel/core@7.23.6): resolution: {integrity: sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-class-properties@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-class-properties@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 - '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.23.3) + '@babel/core': 7.23.6 + '@babel/helper-create-class-features-plugin': 7.23.6(@babel/core@7.23.6) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-class-static-block@7.23.4(@babel/core@7.23.3): + /@babel/plugin-transform-class-static-block@7.23.4(@babel/core@7.23.6): resolution: {integrity: sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.12.0 dependencies: - '@babel/core': 7.23.3 - '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.23.3) + '@babel/core': 7.23.6 + '@babel/helper-create-class-features-plugin': 7.23.6(@babel/core@7.23.6) '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.23.3) + '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.23.6) dev: true - /@babel/plugin-transform-classes@7.23.3(@babel/core@7.23.3): - resolution: {integrity: sha512-FGEQmugvAEu2QtgtU0uTASXevfLMFfBeVCIIdcQhn/uBQsMTjBajdnAtanQlOcuihWh10PZ7+HWvc7NtBwP74w==} + /@babel/plugin-transform-classes@7.23.5(@babel/core@7.23.6): + resolution: {integrity: sha512-jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-compilation-targets': 7.22.15 + '@babel/helper-compilation-targets': 7.23.6 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-function-name': 7.23.0 '@babel/helper-optimise-call-expression': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 - '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.3) + '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.6) '@babel/helper-split-export-declaration': 7.22.6 globals: 11.12.0 dev: true - /@babel/plugin-transform-computed-properties@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-computed-properties@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 '@babel/template': 7.22.15 dev: true - /@babel/plugin-transform-destructuring@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-destructuring@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-dotall-regex@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-dotall-regex@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 - '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.3) + '@babel/core': 7.23.6 + '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.6) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-duplicate-keys@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-duplicate-keys@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-dynamic-import@7.23.4(@babel/core@7.23.3): + /@babel/plugin-transform-dynamic-import@7.23.4(@babel/core@7.23.6): resolution: {integrity: sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.23.3) + '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.23.6) dev: true - /@babel/plugin-transform-exponentiation-operator@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-exponentiation-operator@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-builder-binary-assignment-operator-visitor': 7.22.15 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-export-namespace-from@7.23.4(@babel/core@7.23.3): + /@babel/plugin-transform-export-namespace-from@7.23.4(@babel/core@7.23.6): resolution: {integrity: sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.23.3) + '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.23.6) dev: true - /@babel/plugin-transform-for-of@7.23.3(@babel/core@7.23.3): - resolution: {integrity: sha512-X8jSm8X1CMwxmK878qsUGJRmbysKNbdpTv/O1/v0LuY/ZkZrng5WYiekYSdg9m09OTmDDUWeEDsTE+17WYbAZw==} + /@babel/plugin-transform-for-of@7.23.6(@babel/core@7.23.6): + resolution: {integrity: sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 dev: true - /@babel/plugin-transform-function-name@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-function-name@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 - '@babel/helper-compilation-targets': 7.22.15 + '@babel/core': 7.23.6 + '@babel/helper-compilation-targets': 7.23.6 '@babel/helper-function-name': 7.23.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-json-strings@7.23.4(@babel/core@7.23.3): + /@babel/plugin-transform-json-strings@7.23.4(@babel/core@7.23.6): resolution: {integrity: sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.3) + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.6) dev: true - /@babel/plugin-transform-literals@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-literals@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-logical-assignment-operators@7.23.4(@babel/core@7.23.3): + /@babel/plugin-transform-logical-assignment-operators@7.23.4(@babel/core@7.23.6): resolution: {integrity: sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.3) + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.6) dev: true - /@babel/plugin-transform-member-expression-literals@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-member-expression-literals@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-modules-amd@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-modules-amd@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.3) + '@babel/core': 7.23.6 + '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.6) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-modules-commonjs@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-modules-commonjs@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.3) + '@babel/core': 7.23.6 + '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.6) '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-simple-access': 7.22.5 dev: true - /@babel/plugin-transform-modules-systemjs@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-modules-systemjs@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-hoist-variables': 7.22.5 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.3) + '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.6) '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-validator-identifier': 7.22.20 dev: true - /@babel/plugin-transform-modules-umd@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-modules-umd@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.3) + '@babel/core': 7.23.6 + '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.6) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.23.3): + /@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.23.6): resolution: {integrity: sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.3 - '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.3) + '@babel/core': 7.23.6 + '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.6) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-new-target@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-new-target@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-nullish-coalescing-operator@7.23.4(@babel/core@7.23.3): + /@babel/plugin-transform-nullish-coalescing-operator@7.23.4(@babel/core@7.23.6): resolution: {integrity: sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.3) + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.6) dev: true - /@babel/plugin-transform-numeric-separator@7.23.4(@babel/core@7.23.3): + /@babel/plugin-transform-numeric-separator@7.23.4(@babel/core@7.23.6): resolution: {integrity: sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.3) + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.6) dev: true - /@babel/plugin-transform-object-rest-spread@7.23.4(@babel/core@7.23.3): + /@babel/plugin-transform-object-rest-spread@7.23.4(@babel/core@7.23.6): resolution: {integrity: sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/compat-data': 7.23.3 - '@babel/core': 7.23.3 - '@babel/helper-compilation-targets': 7.22.15 + '@babel/compat-data': 7.23.5 + '@babel/core': 7.23.6 + '@babel/helper-compilation-targets': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.3) - '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.23.3) + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.6) + '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.23.6) dev: true - /@babel/plugin-transform-object-super@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-object-super@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 - '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.3) + '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.6) dev: true - /@babel/plugin-transform-optional-catch-binding@7.23.4(@babel/core@7.23.3): + /@babel/plugin-transform-optional-catch-binding@7.23.4(@babel/core@7.23.6): resolution: {integrity: sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.3) + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.6) dev: true - /@babel/plugin-transform-optional-chaining@7.23.4(@babel/core@7.23.3): + /@babel/plugin-transform-optional-chaining@7.23.4(@babel/core@7.23.6): resolution: {integrity: sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.3) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.6) dev: true - /@babel/plugin-transform-parameters@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-parameters@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-private-methods@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-private-methods@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 - '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.23.3) + '@babel/core': 7.23.6 + '@babel/helper-create-class-features-plugin': 7.23.6(@babel/core@7.23.6) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-private-property-in-object@7.23.4(@babel/core@7.23.3): + /@babel/plugin-transform-private-property-in-object@7.23.4(@babel/core@7.23.6): resolution: {integrity: sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.23.3) + '@babel/helper-create-class-features-plugin': 7.23.6(@babel/core@7.23.6) '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.3) + '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.6) dev: true - /@babel/plugin-transform-property-literals@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-property-literals@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-regenerator@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-regenerator@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 regenerator-transform: 0.15.2 dev: true - /@babel/plugin-transform-reserved-words@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-reserved-words@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-shorthand-properties@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-shorthand-properties@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-spread@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-spread@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 dev: true - /@babel/plugin-transform-sticky-regex@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-sticky-regex@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-template-literals@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-template-literals@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-typeof-symbol@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-typeof-symbol@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-typescript@7.23.4(@babel/core@7.23.3): - resolution: {integrity: sha512-39hCCOl+YUAyMOu6B9SmUTiHUU0t/CxJNUmY3qRdJujbqi+lrQcL11ysYUsAvFWPBdhihrv1z0oRG84Yr3dODQ==} + /@babel/plugin-transform-typescript@7.23.6(@babel/core@7.23.6): + resolution: {integrity: sha512-6cBG5mBvUu4VUD04OHKnYzbuHNP8huDsD3EDqqpIpsswTDoqHCjLoHb6+QgsV1WsT2nipRqCPgxD3LXnEO7XfA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.23.3) + '@babel/helper-create-class-features-plugin': 7.23.6(@babel/core@7.23.6) '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.23.3) + '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.23.6) dev: true - /@babel/plugin-transform-unicode-escapes@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-unicode-escapes@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-unicode-property-regex@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-unicode-property-regex@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 - '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.3) + '@babel/core': 7.23.6 + '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.6) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-unicode-regex@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-unicode-regex@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 - '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.3) + '@babel/core': 7.23.6 + '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.6) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-unicode-sets-regex@7.23.3(@babel/core@7.23.3): + /@babel/plugin-transform-unicode-sets-regex@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.3 - '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.3) + '@babel/core': 7.23.6 + '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.6) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/preset-env@7.23.3(@babel/core@7.23.3): - resolution: {integrity: sha512-ovzGc2uuyNfNAs/jyjIGxS8arOHS5FENZaNn4rtE7UdKMMkqHCvboHfcuhWLZNX5cB44QfcGNWjaevxMzzMf+Q==} + /@babel/preset-env@7.23.6(@babel/core@7.23.6): + resolution: {integrity: sha512-2XPn/BqKkZCpzYhUUNZ1ssXw7DcXfKQEjv/uXZUXgaebCMYmkEsfZ2yY+vv+xtXv50WmL5SGhyB6/xsWxIvvOQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/compat-data': 7.23.3 - '@babel/core': 7.23.3 - '@babel/helper-compilation-targets': 7.22.15 + '@babel/compat-data': 7.23.5 + '@babel/core': 7.23.6 + '@babel/helper-compilation-targets': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 - '@babel/helper-validator-option': 7.22.15 - '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.3) - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.3) - '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.23.3) - '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.23.3) - '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.23.3) - '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.23.3) - '@babel/plugin-syntax-import-assertions': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-syntax-import-attributes': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.23.3) - '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.3) - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.3) - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.3) - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.3) - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.3) - '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.3) - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.3) - '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.3) - '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.23.3) - '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.23.3) - '@babel/plugin-transform-arrow-functions': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-async-generator-functions': 7.23.4(@babel/core@7.23.3) - '@babel/plugin-transform-async-to-generator': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-block-scoped-functions': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.23.3) - '@babel/plugin-transform-class-properties': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-class-static-block': 7.23.4(@babel/core@7.23.3) - '@babel/plugin-transform-classes': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-computed-properties': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-destructuring': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-dotall-regex': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-duplicate-keys': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-dynamic-import': 7.23.4(@babel/core@7.23.3) - '@babel/plugin-transform-exponentiation-operator': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-export-namespace-from': 7.23.4(@babel/core@7.23.3) - '@babel/plugin-transform-for-of': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-function-name': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-json-strings': 7.23.4(@babel/core@7.23.3) - '@babel/plugin-transform-literals': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-logical-assignment-operators': 7.23.4(@babel/core@7.23.3) - '@babel/plugin-transform-member-expression-literals': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-modules-amd': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-modules-systemjs': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-modules-umd': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.23.3) - '@babel/plugin-transform-new-target': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-nullish-coalescing-operator': 7.23.4(@babel/core@7.23.3) - '@babel/plugin-transform-numeric-separator': 7.23.4(@babel/core@7.23.3) - '@babel/plugin-transform-object-rest-spread': 7.23.4(@babel/core@7.23.3) - '@babel/plugin-transform-object-super': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-optional-catch-binding': 7.23.4(@babel/core@7.23.3) - '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.23.3) - '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-private-methods': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-private-property-in-object': 7.23.4(@babel/core@7.23.3) - '@babel/plugin-transform-property-literals': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-regenerator': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-reserved-words': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-shorthand-properties': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-spread': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-sticky-regex': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-template-literals': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-typeof-symbol': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-unicode-escapes': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-unicode-property-regex': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-unicode-regex': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-unicode-sets-regex': 7.23.3(@babel/core@7.23.3) - '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.23.3) - babel-plugin-polyfill-corejs2: 0.4.6(@babel/core@7.23.3) - babel-plugin-polyfill-corejs3: 0.8.6(@babel/core@7.23.3) - babel-plugin-polyfill-regenerator: 0.5.3(@babel/core@7.23.3) - core-js-compat: 3.33.3 + '@babel/helper-validator-option': 7.23.5 + '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.6) + '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.6) + '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.23.6) + '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.23.6) + '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.23.6) + '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.23.6) + '@babel/plugin-syntax-import-assertions': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-syntax-import-attributes': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.23.6) + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.6) + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.6) + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.6) + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.6) + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.6) + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.6) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.6) + '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.6) + '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.23.6) + '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.23.6) + '@babel/plugin-transform-arrow-functions': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-async-generator-functions': 7.23.4(@babel/core@7.23.6) + '@babel/plugin-transform-async-to-generator': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-block-scoped-functions': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.23.6) + '@babel/plugin-transform-class-properties': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-class-static-block': 7.23.4(@babel/core@7.23.6) + '@babel/plugin-transform-classes': 7.23.5(@babel/core@7.23.6) + '@babel/plugin-transform-computed-properties': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-destructuring': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-dotall-regex': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-duplicate-keys': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-dynamic-import': 7.23.4(@babel/core@7.23.6) + '@babel/plugin-transform-exponentiation-operator': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-export-namespace-from': 7.23.4(@babel/core@7.23.6) + '@babel/plugin-transform-for-of': 7.23.6(@babel/core@7.23.6) + '@babel/plugin-transform-function-name': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-json-strings': 7.23.4(@babel/core@7.23.6) + '@babel/plugin-transform-literals': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-logical-assignment-operators': 7.23.4(@babel/core@7.23.6) + '@babel/plugin-transform-member-expression-literals': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-modules-amd': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-modules-systemjs': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-modules-umd': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.23.6) + '@babel/plugin-transform-new-target': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-nullish-coalescing-operator': 7.23.4(@babel/core@7.23.6) + '@babel/plugin-transform-numeric-separator': 7.23.4(@babel/core@7.23.6) + '@babel/plugin-transform-object-rest-spread': 7.23.4(@babel/core@7.23.6) + '@babel/plugin-transform-object-super': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-optional-catch-binding': 7.23.4(@babel/core@7.23.6) + '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.23.6) + '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-private-methods': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-private-property-in-object': 7.23.4(@babel/core@7.23.6) + '@babel/plugin-transform-property-literals': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-regenerator': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-reserved-words': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-shorthand-properties': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-spread': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-sticky-regex': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-template-literals': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-typeof-symbol': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-unicode-escapes': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-unicode-property-regex': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-unicode-regex': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-unicode-sets-regex': 7.23.3(@babel/core@7.23.6) + '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.23.6) + babel-plugin-polyfill-corejs2: 0.4.7(@babel/core@7.23.6) + babel-plugin-polyfill-corejs3: 0.8.7(@babel/core@7.23.6) + babel-plugin-polyfill-regenerator: 0.5.4(@babel/core@7.23.6) + core-js-compat: 3.34.0 semver: 6.3.1 transitivePeerDependencies: - supports-color dev: true - /@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.23.3): + /@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.23.6): resolution: {integrity: sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==} peerDependencies: '@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 - '@babel/types': 7.23.4 + '@babel/types': 7.23.6 esutils: 2.0.3 dev: true - /@babel/preset-typescript@7.23.3(@babel/core@7.23.3): + /@babel/preset-typescript@7.23.3(@babel/core@7.23.6): resolution: {integrity: sha512-17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 - '@babel/helper-validator-option': 7.22.15 - '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-transform-typescript': 7.23.4(@babel/core@7.23.3) + '@babel/helper-validator-option': 7.23.5 + '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-transform-typescript': 7.23.6(@babel/core@7.23.6) dev: true /@babel/regjsgen@0.8.0: resolution: {integrity: sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==} dev: true - /@babel/runtime@7.23.4: - resolution: {integrity: sha512-2Yv65nlWnWlSpe3fXEyX5i7fx5kIKo4Qbcj+hMO0odwaneFjfXw5fdum+4yL20O0QiaHpia0cYQ9xpNMqrBwHg==} + /@babel/runtime@7.23.6: + resolution: {integrity: sha512-zHd0eUrf5GZoOWVCXp6koAKQTfZV07eit6bGPmJgnZdnSAvvZee6zniW2XMF7Cmc4ISOOnPy3QaSiIJGJkVEDQ==} engines: {node: '>=6.9.0'} dependencies: - regenerator-runtime: 0.14.0 + regenerator-runtime: 0.14.1 /@babel/template@7.22.15: resolution: {integrity: sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.23.4 - '@babel/parser': 7.23.4 - '@babel/types': 7.23.4 + '@babel/code-frame': 7.23.5 + '@babel/parser': 7.23.6 + '@babel/types': 7.23.6 dev: true - /@babel/traverse@7.23.4: - resolution: {integrity: sha512-IYM8wSUwunWTB6tFC2dkKZhxbIjHoWemdK+3f8/wq8aKhbUscxD5MX72ubd90fxvFknaLPeGw5ycU84V1obHJg==} + /@babel/traverse@7.23.6: + resolution: {integrity: sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.23.4 - '@babel/generator': 7.23.4 + '@babel/code-frame': 7.23.5 + '@babel/generator': 7.23.6 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-function-name': 7.23.0 '@babel/helper-hoist-variables': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 - '@babel/parser': 7.23.4 - '@babel/types': 7.23.4 + '@babel/parser': 7.23.6 + '@babel/types': 7.23.6 debug: 4.3.4 globals: 11.12.0 transitivePeerDependencies: - supports-color dev: true - /@babel/types@7.23.4: - resolution: {integrity: sha512-7uIFwVYpoplT5jp/kVv6EF93VaJ8H+Yn5IczYiaAi98ajzjfoZfslet/e0sLh+wVBjb2qqIut1b0S26VSafsSQ==} + /@babel/types@7.23.6: + resolution: {integrity: sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==} engines: {node: '>=6.9.0'} dependencies: '@babel/helper-string-parser': 7.23.4 @@ -1633,6 +1631,15 @@ packages: resolution: {integrity: sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==} dev: false + /@esbuild/aix-ppc64@0.19.10: + resolution: {integrity: sha512-Q+mk96KJ+FZ30h9fsJl+67IjNJm3x2eX+GBWGmocAKgzp27cowCOOqSdscX80s0SpdFXZnIv/+1xD1EctFx96Q==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [aix] + requiresBuild: true + dev: true + optional: true + /@esbuild/android-arm64@0.17.6: resolution: {integrity: sha512-YnYSCceN/dUzUr5kdtUzB+wZprCafuD89Hs0Aqv9QSdwhYQybhXTaSTcrl6X/aWThn1a/j0eEpUBGOE7269REg==} engines: {node: '>=12'} @@ -1651,8 +1658,8 @@ packages: dev: true optional: true - /@esbuild/android-arm64@0.19.7: - resolution: {integrity: sha512-YEDcw5IT7hW3sFKZBkCAQaOCJQLONVcD4bOyTXMZz5fr66pTHnAet46XAtbXAkJRfIn2YVhdC6R9g4xa27jQ1w==} + /@esbuild/android-arm64@0.19.10: + resolution: {integrity: sha512-1X4CClKhDgC3by7k8aOWZeBXQX8dHT5QAMCAQDArCLaYfkppoARvh0fit3X2Qs+MXDngKcHv6XXyQCpY0hkK1Q==} engines: {node: '>=12'} cpu: [arm64] os: [android] @@ -1678,8 +1685,8 @@ packages: dev: true optional: true - /@esbuild/android-arm@0.19.7: - resolution: {integrity: sha512-YGSPnndkcLo4PmVl2tKatEn+0mlVMr3yEpOOT0BeMria87PhvoJb5dg5f5Ft9fbCVgtAz4pWMzZVgSEGpDAlww==} + /@esbuild/android-arm@0.19.10: + resolution: {integrity: sha512-7W0bK7qfkw1fc2viBfrtAEkDKHatYfHzr/jKAHNr9BvkYDXPcC6bodtm8AyLJNNuqClLNaeTLuwURt4PRT9d7w==} engines: {node: '>=12'} cpu: [arm] os: [android] @@ -1705,8 +1712,8 @@ packages: dev: true optional: true - /@esbuild/android-x64@0.19.7: - resolution: {integrity: sha512-jhINx8DEjz68cChFvM72YzrqfwJuFbfvSxZAk4bebpngGfNNRm+zRl4rtT9oAX6N9b6gBcFaJHFew5Blf6CvUw==} + /@esbuild/android-x64@0.19.10: + resolution: {integrity: sha512-O/nO/g+/7NlitUxETkUv/IvADKuZXyH4BHf/g/7laqKC4i/7whLpB0gvpPc2zpF0q9Q6FXS3TS75QHac9MvVWw==} engines: {node: '>=12'} cpu: [x64] os: [android] @@ -1732,8 +1739,8 @@ packages: dev: true optional: true - /@esbuild/darwin-arm64@0.19.7: - resolution: {integrity: sha512-dr81gbmWN//3ZnBIm6YNCl4p3pjnabg1/ZVOgz2fJoUO1a3mq9WQ/1iuEluMs7mCL+Zwv7AY5e3g1hjXqQZ9Iw==} + /@esbuild/darwin-arm64@0.19.10: + resolution: {integrity: sha512-YSRRs2zOpwypck+6GL3wGXx2gNP7DXzetmo5pHXLrY/VIMsS59yKfjPizQ4lLt5vEI80M41gjm2BxrGZ5U+VMA==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] @@ -1759,8 +1766,8 @@ packages: dev: true optional: true - /@esbuild/darwin-x64@0.19.7: - resolution: {integrity: sha512-Lc0q5HouGlzQEwLkgEKnWcSazqr9l9OdV2HhVasWJzLKeOt0PLhHaUHuzb8s/UIya38DJDoUm74GToZ6Wc7NGQ==} + /@esbuild/darwin-x64@0.19.10: + resolution: {integrity: sha512-alfGtT+IEICKtNE54hbvPg13xGBe4GkVxyGWtzr+yHO7HIiRJppPDhOKq3zstTcVf8msXb/t4eavW3jCDpMSmA==} engines: {node: '>=12'} cpu: [x64] os: [darwin] @@ -1786,8 +1793,8 @@ packages: dev: true optional: true - /@esbuild/freebsd-arm64@0.19.7: - resolution: {integrity: sha512-+y2YsUr0CxDFF7GWiegWjGtTUF6gac2zFasfFkRJPkMAuMy9O7+2EH550VlqVdpEEchWMynkdhC9ZjtnMiHImQ==} + /@esbuild/freebsd-arm64@0.19.10: + resolution: {integrity: sha512-dMtk1wc7FSH8CCkE854GyGuNKCewlh+7heYP/sclpOG6Cectzk14qdUIY5CrKDbkA/OczXq9WesqnPl09mj5dg==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] @@ -1813,8 +1820,8 @@ packages: dev: true optional: true - /@esbuild/freebsd-x64@0.19.7: - resolution: {integrity: sha512-CdXOxIbIzPJmJhrpmJTLx+o35NoiKBIgOvmvT+jeSadYiWJn0vFKsl+0bSG/5lwjNHoIDEyMYc/GAPR9jxusTA==} + /@esbuild/freebsd-x64@0.19.10: + resolution: {integrity: sha512-G5UPPspryHu1T3uX8WiOEUa6q6OlQh6gNl4CO4Iw5PS+Kg5bVggVFehzXBJY6X6RSOMS8iXDv2330VzaObm4Ag==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] @@ -1840,8 +1847,8 @@ packages: dev: true optional: true - /@esbuild/linux-arm64@0.19.7: - resolution: {integrity: sha512-inHqdOVCkUhHNvuQPT1oCB7cWz9qQ/Cz46xmVe0b7UXcuIJU3166aqSunsqkgSGMtUCWOZw3+KMwI6otINuC9g==} + /@esbuild/linux-arm64@0.19.10: + resolution: {integrity: sha512-QxaouHWZ+2KWEj7cGJmvTIHVALfhpGxo3WLmlYfJ+dA5fJB6lDEIg+oe/0//FuyVHuS3l79/wyBxbHr0NgtxJQ==} engines: {node: '>=12'} cpu: [arm64] os: [linux] @@ -1867,8 +1874,8 @@ packages: dev: true optional: true - /@esbuild/linux-arm@0.19.7: - resolution: {integrity: sha512-Y+SCmWxsJOdQtjcBxoacn/pGW9HDZpwsoof0ttL+2vGcHokFlfqV666JpfLCSP2xLxFpF1lj7T3Ox3sr95YXww==} + /@esbuild/linux-arm@0.19.10: + resolution: {integrity: sha512-j6gUW5aAaPgD416Hk9FHxn27On28H4eVI9rJ4az7oCGTFW48+LcgNDBN+9f8rKZz7EEowo889CPKyeaD0iw9Kg==} engines: {node: '>=12'} cpu: [arm] os: [linux] @@ -1894,8 +1901,8 @@ packages: dev: true optional: true - /@esbuild/linux-ia32@0.19.7: - resolution: {integrity: sha512-2BbiL7nLS5ZO96bxTQkdO0euGZIUQEUXMTrqLxKUmk/Y5pmrWU84f+CMJpM8+EHaBPfFSPnomEaQiG/+Gmh61g==} + /@esbuild/linux-ia32@0.19.10: + resolution: {integrity: sha512-4ub1YwXxYjj9h1UIZs2hYbnTZBtenPw5NfXCRgEkGb0b6OJ2gpkMvDqRDYIDRjRdWSe/TBiZltm3Y3Q8SN1xNg==} engines: {node: '>=12'} cpu: [ia32] os: [linux] @@ -1921,8 +1928,8 @@ packages: dev: true optional: true - /@esbuild/linux-loong64@0.19.7: - resolution: {integrity: sha512-BVFQla72KXv3yyTFCQXF7MORvpTo4uTA8FVFgmwVrqbB/4DsBFWilUm1i2Oq6zN36DOZKSVUTb16jbjedhfSHw==} + /@esbuild/linux-loong64@0.19.10: + resolution: {integrity: sha512-lo3I9k+mbEKoxtoIbM0yC/MZ1i2wM0cIeOejlVdZ3D86LAcFXFRdeuZmh91QJvUTW51bOK5W2BznGNIl4+mDaA==} engines: {node: '>=12'} cpu: [loong64] os: [linux] @@ -1948,8 +1955,8 @@ packages: dev: true optional: true - /@esbuild/linux-mips64el@0.19.7: - resolution: {integrity: sha512-DzAYckIaK+pS31Q/rGpvUKu7M+5/t+jI+cdleDgUwbU7KdG2eC3SUbZHlo6Q4P1CfVKZ1lUERRFP8+q0ob9i2w==} + /@esbuild/linux-mips64el@0.19.10: + resolution: {integrity: sha512-J4gH3zhHNbdZN0Bcr1QUGVNkHTdpijgx5VMxeetSk6ntdt+vR1DqGmHxQYHRmNb77tP6GVvD+K0NyO4xjd7y4A==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] @@ -1975,8 +1982,8 @@ packages: dev: true optional: true - /@esbuild/linux-ppc64@0.19.7: - resolution: {integrity: sha512-JQ1p0SmUteNdUaaiRtyS59GkkfTW0Edo+e0O2sihnY4FoZLz5glpWUQEKMSzMhA430ctkylkS7+vn8ziuhUugQ==} + /@esbuild/linux-ppc64@0.19.10: + resolution: {integrity: sha512-tgT/7u+QhV6ge8wFMzaklOY7KqiyitgT1AUHMApau32ZlvTB/+efeCtMk4eXS+uEymYK249JsoiklZN64xt6oQ==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] @@ -2002,8 +2009,8 @@ packages: dev: true optional: true - /@esbuild/linux-riscv64@0.19.7: - resolution: {integrity: sha512-xGwVJ7eGhkprY/nB7L7MXysHduqjpzUl40+XoYDGC4UPLbnG+gsyS1wQPJ9lFPcxYAaDXbdRXd1ACs9AE9lxuw==} + /@esbuild/linux-riscv64@0.19.10: + resolution: {integrity: sha512-0f/spw0PfBMZBNqtKe5FLzBDGo0SKZKvMl5PHYQr3+eiSscfJ96XEknCe+JoOayybWUFQbcJTrk946i3j9uYZA==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] @@ -2029,8 +2036,8 @@ packages: dev: true optional: true - /@esbuild/linux-s390x@0.19.7: - resolution: {integrity: sha512-U8Rhki5PVU0L0nvk+E8FjkV8r4Lh4hVEb9duR6Zl21eIEYEwXz8RScj4LZWA2i3V70V4UHVgiqMpszXvG0Yqhg==} + /@esbuild/linux-s390x@0.19.10: + resolution: {integrity: sha512-pZFe0OeskMHzHa9U38g+z8Yx5FNCLFtUnJtQMpwhS+r4S566aK2ci3t4NCP4tjt6d5j5uo4h7tExZMjeKoehAA==} engines: {node: '>=12'} cpu: [s390x] os: [linux] @@ -2056,8 +2063,8 @@ packages: dev: true optional: true - /@esbuild/linux-x64@0.19.7: - resolution: {integrity: sha512-ZYZopyLhm4mcoZXjFt25itRlocKlcazDVkB4AhioiL9hOWhDldU9n38g62fhOI4Pth6vp+Mrd5rFKxD0/S+7aQ==} + /@esbuild/linux-x64@0.19.10: + resolution: {integrity: sha512-SpYNEqg/6pZYoc+1zLCjVOYvxfZVZj6w0KROZ3Fje/QrM3nfvT2llI+wmKSrWuX6wmZeTapbarvuNNK/qepSgA==} engines: {node: '>=12'} cpu: [x64] os: [linux] @@ -2083,8 +2090,8 @@ packages: dev: true optional: true - /@esbuild/netbsd-x64@0.19.7: - resolution: {integrity: sha512-/yfjlsYmT1O3cum3J6cmGG16Fd5tqKMcg5D+sBYLaOQExheAJhqr8xOAEIuLo8JYkevmjM5zFD9rVs3VBcsjtQ==} + /@esbuild/netbsd-x64@0.19.10: + resolution: {integrity: sha512-ACbZ0vXy9zksNArWlk2c38NdKg25+L9pr/mVaj9SUq6lHZu/35nx2xnQVRGLrC1KKQqJKRIB0q8GspiHI3J80Q==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] @@ -2110,8 +2117,8 @@ packages: dev: true optional: true - /@esbuild/openbsd-x64@0.19.7: - resolution: {integrity: sha512-MYDFyV0EW1cTP46IgUJ38OnEY5TaXxjoDmwiTXPjezahQgZd+j3T55Ht8/Q9YXBM0+T9HJygrSRGV5QNF/YVDQ==} + /@esbuild/openbsd-x64@0.19.10: + resolution: {integrity: sha512-PxcgvjdSjtgPMiPQrM3pwSaG4kGphP+bLSb+cihuP0LYdZv1epbAIecHVl5sD3npkfYBZ0ZnOjR878I7MdJDFg==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] @@ -2137,8 +2144,8 @@ packages: dev: true optional: true - /@esbuild/sunos-x64@0.19.7: - resolution: {integrity: sha512-JcPvgzf2NN/y6X3UUSqP6jSS06V0DZAV/8q0PjsZyGSXsIGcG110XsdmuWiHM+pno7/mJF6fjH5/vhUz/vA9fw==} + /@esbuild/sunos-x64@0.19.10: + resolution: {integrity: sha512-ZkIOtrRL8SEJjr+VHjmW0znkPs+oJXhlJbNwfI37rvgeMtk3sxOQevXPXjmAPZPigVTncvFqLMd+uV0IBSEzqA==} engines: {node: '>=12'} cpu: [x64] os: [sunos] @@ -2164,8 +2171,8 @@ packages: dev: true optional: true - /@esbuild/win32-arm64@0.19.7: - resolution: {integrity: sha512-ZA0KSYti5w5toax5FpmfcAgu3ZNJxYSRm0AW/Dao5up0YV1hDVof1NvwLomjEN+3/GMtaWDI+CIyJOMTRSTdMw==} + /@esbuild/win32-arm64@0.19.10: + resolution: {integrity: sha512-+Sa4oTDbpBfGpl3Hn3XiUe4f8TU2JF7aX8cOfqFYMMjXp6ma6NJDztl5FDG8Ezx0OjwGikIHw+iA54YLDNNVfw==} engines: {node: '>=12'} cpu: [arm64] os: [win32] @@ -2191,8 +2198,8 @@ packages: dev: true optional: true - /@esbuild/win32-ia32@0.19.7: - resolution: {integrity: sha512-CTOnijBKc5Jpk6/W9hQMMvJnsSYRYgveN6O75DTACCY18RA2nqka8dTZR+x/JqXCRiKk84+5+bRKXUSbbwsS0A==} + /@esbuild/win32-ia32@0.19.10: + resolution: {integrity: sha512-EOGVLK1oWMBXgfttJdPHDTiivYSjX6jDNaATeNOaCOFEVcfMjtbx7WVQwPSE1eIfCp/CaSF2nSrDtzc4I9f8TQ==} engines: {node: '>=12'} cpu: [ia32] os: [win32] @@ -2218,8 +2225,8 @@ packages: dev: true optional: true - /@esbuild/win32-x64@0.19.7: - resolution: {integrity: sha512-gRaP2sk6hc98N734luX4VpF318l3w+ofrtTu9j5L8EQXF+FzQKV6alCOHMVoJJHvVK/mGbwBXfOL1HETQu9IGQ==} + /@esbuild/win32-x64@0.19.10: + resolution: {integrity: sha512-whqLG6Sc70AbU73fFYvuYzaE4MNMBIlR1Y/IrUeOXFrWHxBEjjbZaQ3IXIQS8wJdAzue2GwYZCjOrgrU1oUHoA==} engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -2227,13 +2234,13 @@ packages: dev: true optional: true - /@eslint-community/eslint-utils@4.4.0(eslint@8.54.0): + /@eslint-community/eslint-utils@4.4.0(eslint@8.56.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 dependencies: - eslint: 8.54.0 + eslint: 8.56.0 eslint-visitor-keys: 3.4.3 dev: true @@ -2242,14 +2249,14 @@ packages: engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} dev: true - /@eslint/eslintrc@2.1.3: - resolution: {integrity: sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==} + /@eslint/eslintrc@2.1.4: + resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 debug: 4.3.4 espree: 9.6.1 - globals: 13.23.0 + globals: 13.24.0 ignore: 5.3.0 import-fresh: 3.3.0 js-yaml: 4.1.0 @@ -2259,8 +2266,8 @@ packages: - supports-color dev: true - /@eslint/js@8.54.0: - resolution: {integrity: sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==} + /@eslint/js@8.56.0: + resolution: {integrity: sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true @@ -2269,8 +2276,8 @@ packages: engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0, npm: '>=6.14.13'} dev: true - /@floating-ui/core@1.5.0: - resolution: {integrity: sha512-kK1h4m36DQ0UHGj5Ah4db7R0rHemTqqO0QLvUqi1/mUUp3LuAWbWxdxSIf/XsnH9VS6rRVPLJCncjRzUvyCLXg==} + /@floating-ui/core@1.5.2: + resolution: {integrity: sha512-Ii3MrfY/GAIN3OhXNzpCKaLxHQfJF9qvwq/kEJYdqDxeIHa01K8sldugal6TmeeXl+WMvhv9cnVzUTaFFJF09A==} dependencies: '@floating-ui/utils': 0.1.6 dev: false @@ -2278,7 +2285,7 @@ packages: /@floating-ui/dom@1.5.3: resolution: {integrity: sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==} dependencies: - '@floating-ui/core': 1.5.0 + '@floating-ui/core': 1.5.2 '@floating-ui/utils': 0.1.6 dev: false @@ -2355,8 +2362,8 @@ packages: resolution: {integrity: sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==} dev: true - /@internationalized/date@3.5.0: - resolution: {integrity: sha512-nw0Q+oRkizBWMioseI8+2TeUPEyopJVz5YxoYVzR0W1v+2YytiYah7s/ot35F149q/xAg4F1gT/6eTd+tsUpFQ==} + /@internationalized/date@3.5.1: + resolution: {integrity: sha512-LUQIfwU9e+Fmutc/DpRTGXSdgYZLBegi4wygCWDSVmUdLTaMHsQyASDiJtREwanwKuQLq0hY76fCJ9J/9I2xOQ==} dependencies: '@swc/helpers': 0.5.3 dev: false @@ -2368,20 +2375,32 @@ packages: intl-messageformat: 10.5.8 dev: false - /@internationalized/number@3.4.0: - resolution: {integrity: sha512-8TvotW3qVDHC4uv/BVoN6Qx0Dm8clHY1/vpH+dh+XRiPW/9NVpKn1P8d1A+WLphWrMwyqyWXI7uWehJPviaeIw==} + /@internationalized/number@3.5.0: + resolution: {integrity: sha512-ZY1BW8HT9WKYvaubbuqXbbDdHhOUMfE2zHHFJeTppid0S+pc8HtdIxFxaYMsGjCb4UsF+MEJ4n2TfU7iHnUK8w==} dependencies: '@swc/helpers': 0.5.3 dev: false - /@internationalized/string@3.1.1: - resolution: {integrity: sha512-fvSr6YRoVPgONiVIUhgCmIAlifMVCeej/snPZVzbzRPxGpHl3o1GRe+d/qh92D8KhgOciruDUH8I5mjdfdjzfA==} + /@internationalized/string@3.2.0: + resolution: {integrity: sha512-Xx3Sy3f2c9ctT+vh8c7euEaEHQZltp0euZ3Hy4UfT3E13r6lxpUS3kgKyumEjboJZSnaZv7JhqWz3D75v+IxQg==} dependencies: '@swc/helpers': 0.5.3 dev: false - /@jengaicons/react@1.2.0(react@18.2.0): - resolution: {integrity: sha512-udv6UxVy66a9IqvGistqmwBSAJIK9xs3B7nXzMNCo0iSOXZFyJ0/gM2QX6WMNkcJ9KtYKrk6+MVCEV0OTnTnsw==} + /@isaacs/cliui@8.0.2: + resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} + engines: {node: '>=12'} + dependencies: + string-width: 5.1.2 + string-width-cjs: /string-width@4.2.3 + strip-ansi: 7.1.0 + strip-ansi-cjs: /strip-ansi@6.0.1 + wrap-ansi: 8.1.0 + wrap-ansi-cjs: /wrap-ansi@7.0.0 + dev: true + + /@jengaicons/react@1.3.0(react@18.2.0): + resolution: {integrity: sha512-qJ42y7BG5oDWUZQ1y6wuCT/w5LDdFLHZE1KdX5/1mELw+xTsqvl9dEVCxuczYmORHu6VFtp7LjLo0TS3cYCkCQ==} peerDependencies: react: '>=16' dependencies: @@ -2435,7 +2454,7 @@ packages: react: '>=16' dependencies: '@types/mdx': 2.0.10 - '@types/react': 18.2.38 + '@types/react': 18.2.45 react: 18.2.0 dev: false @@ -2457,7 +2476,7 @@ packages: engines: {node: '>= 8'} dependencies: '@nodelib/fs.scandir': 2.1.5 - fastq: 1.15.0 + fastq: 1.16.0 dev: true /@npmcli/fs@1.1.1: @@ -2483,7 +2502,7 @@ packages: json-parse-even-better-errors: 2.3.1 dev: true - /@oshq/react-select@1.0.1(@radix-ui/react-portal@1.0.4)(classnames@2.3.2)(framer-motion@10.16.5)(rc-virtual-list@3.11.3)(react@18.2.0): + /@oshq/react-select@1.0.1(@radix-ui/react-portal@1.0.4)(classnames@2.3.2)(framer-motion@10.16.16)(rc-virtual-list@3.11.3)(react@18.2.0): resolution: {integrity: sha512-jFaoj7C0dzQBZyj4gbisgS7N3ws2VspMOWfcKdF4aaN5Em0JA8TdVJAOS+xAb+wJcZOtVpKaHoXI4otANNmzaA==} peerDependencies: '@radix-ui/react-portal': ^1.0.4 @@ -2492,20 +2511,27 @@ packages: rc-virtual-list: ^3.11.2 react: ^18.2.0 || ^17.0.0 || ^16.0.0 dependencies: - '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 - framer-motion: 10.16.5(react-dom@18.2.0)(react@18.2.0) + framer-motion: 10.16.16(react-dom@18.2.0)(react@18.2.0) rc-virtual-list: 3.11.3(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 dev: false + /@pkgjs/parseargs@0.11.0: + resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} + engines: {node: '>=14'} + requiresBuild: true + dev: true + optional: true + /@radix-ui/primitive@1.0.1: resolution: {integrity: sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==} dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 dev: false - /@radix-ui/react-alert-dialog@1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-alert-dialog@1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-jbfBCRlKYlhbitueOAv7z74PXYeIQmWpKwm3jllsdkw7fGWNkxqP3v0nY9WmOzcPqpQuoorNtvViBgL46n5gVg==} peerDependencies: '@types/react': '*' @@ -2518,20 +2544,20 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-dialog': 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-slot': 1.0.2(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-dialog': 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-slot': 1.0.2(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-arrow@1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-arrow@1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-wSP+pHsB/jQRaL6voubsQ/ZlrGBHHrOjmBnr19hxYgtS0WvAFwZhK2WP/YY5yF9uKECCEEDGxuLxq1NBK51wFA==} peerDependencies: '@types/react': '*' @@ -2544,15 +2570,15 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@babel/runtime': 7.23.6 + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-checkbox@1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-checkbox@1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-CBuGQa52aAYnADZVt/KBQzXrwx6TqnlwtcIPGtVt5JkkzQwMOLJjPukimhfKEr4GQNd43C+djUh5Ikopj8pSLg==} peerDependencies: '@types/react': '*' @@ -2565,22 +2591,22 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-previous': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-size': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-previous': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-size': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-collection@1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-collection@1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-3SzW+0PW7yBBoQlT8wNcGtaxaD0XSu0uLUFgrtHY08Acx05TaHaOmVLR73c0j/cqpDy53KBMO7s0dx2wmOIDIA==} peerDependencies: '@types/react': '*' @@ -2593,18 +2619,18 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-slot': 1.0.2(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@babel/runtime': 7.23.6 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-slot': 1.0.2(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-compose-refs@1.0.1(@types/react@18.2.38)(react@18.2.0): + /@radix-ui/react-compose-refs@1.0.1(@types/react@18.2.45)(react@18.2.0): resolution: {integrity: sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==} peerDependencies: '@types/react': '*' @@ -2613,12 +2639,12 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@types/react': 18.2.38 + '@babel/runtime': 7.23.6 + '@types/react': 18.2.45 react: 18.2.0 dev: false - /@radix-ui/react-context@1.0.1(@types/react@18.2.38)(react@18.2.0): + /@radix-ui/react-context@1.0.1(@types/react@18.2.45)(react@18.2.0): resolution: {integrity: sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==} peerDependencies: '@types/react': '*' @@ -2627,12 +2653,12 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@types/react': 18.2.38 + '@babel/runtime': 7.23.6 + '@types/react': 18.2.45 react: 18.2.0 dev: false - /@radix-ui/react-dialog@1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-dialog@1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-hJtRy/jPULGQZceSAP2Re6/4NpKo8im6V8P2hUqZsdFiSL8l35kYsw3qbRI6Ay5mQd2+wlLqje770eq+RJ3yZg==} peerDependencies: '@types/react': '*' @@ -2645,28 +2671,28 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-dismissable-layer': 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-focus-scope': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-id': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-portal': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-slot': 1.0.2(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-dismissable-layer': 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-focus-scope': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-id': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-portal': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-slot': 1.0.2(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 aria-hidden: 1.2.3 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-remove-scroll: 2.5.5(@types/react@18.2.38)(react@18.2.0) + react-remove-scroll: 2.5.5(@types/react@18.2.45)(react@18.2.0) dev: false - /@radix-ui/react-direction@1.0.1(@types/react@18.2.38)(react@18.2.0): + /@radix-ui/react-direction@1.0.1(@types/react@18.2.45)(react@18.2.0): resolution: {integrity: sha512-RXcvnXgyvYvBEOhCBuddKecVkoMiI10Jcm5cTI7abJRAHYfFxeu+FBQs/DvdxSYucxR5mna0dNsL6QFlds5TMA==} peerDependencies: '@types/react': '*' @@ -2675,12 +2701,12 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@types/react': 18.2.38 + '@babel/runtime': 7.23.6 + '@types/react': 18.2.45 react: 18.2.0 dev: false - /@radix-ui/react-dismissable-layer@1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-dismissable-layer@1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-7UpBa/RKMoHJYjie1gkF1DlK8l1fdU/VKDpoS3rCCo8YBJR294GwcEHyxHw72yvphJ7ld0AXEcSLAzY2F/WyCg==} peerDependencies: '@types/react': '*' @@ -2693,19 +2719,19 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-escape-keydown': 1.0.3(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-escape-keydown': 1.0.3(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-dismissable-layer@1.0.5(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-dismissable-layer@1.0.5(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-aJeDjQhywg9LBu2t/At58hCvr7pEm0o2Ke1x33B+MhjNmmZ17sy4KImo0KPLgsnc/zN7GPdce8Cnn0SWvwZO7g==} peerDependencies: '@types/react': '*' @@ -2718,19 +2744,19 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-escape-keydown': 1.0.3(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-escape-keydown': 1.0.3(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-dropdown-menu@2.0.6(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-dropdown-menu@2.0.6(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-i6TuFOoWmLWq+M/eCLGd/bQ2HfAX1RJgvrBQ6AQLmzfvsLdefxbWu8G9zczcPFfcSPehz9GcpF6K9QYreFV8hA==} peerDependencies: '@types/react': '*' @@ -2743,21 +2769,21 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-id': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-menu': 2.0.6(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-id': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-menu': 2.0.6(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-focus-guards@1.0.1(@types/react@18.2.38)(react@18.2.0): + /@radix-ui/react-focus-guards@1.0.1(@types/react@18.2.45)(react@18.2.0): resolution: {integrity: sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==} peerDependencies: '@types/react': '*' @@ -2766,12 +2792,12 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@types/react': 18.2.38 + '@babel/runtime': 7.23.6 + '@types/react': 18.2.45 react: 18.2.0 dev: false - /@radix-ui/react-focus-scope@1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-focus-scope@1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-upXdPfqI4islj2CslyfUBNlaJCPybbqRHAi1KER7Isel9Q2AtSJ0zRBZv8mWQiFXD2nyAJ4BhC3yXgZ6kMBSrQ==} peerDependencies: '@types/react': '*' @@ -2784,17 +2810,17 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@babel/runtime': 7.23.6 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-focus-scope@1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-focus-scope@1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-sL04Mgvf+FmyvZeYfNu1EPAaaxD+aw7cYeIB9L9Fvq8+urhltTRaEo5ysKOpHuKPclsZcSUMKlN05x4u+CINpA==} peerDependencies: '@types/react': '*' @@ -2807,17 +2833,17 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@babel/runtime': 7.23.6 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-id@1.0.1(@types/react@18.2.38)(react@18.2.0): + /@radix-ui/react-id@1.0.1(@types/react@18.2.45)(react@18.2.0): resolution: {integrity: sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==} peerDependencies: '@types/react': '*' @@ -2826,13 +2852,13 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 + '@babel/runtime': 7.23.6 + '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 react: 18.2.0 dev: false - /@radix-ui/react-menu@2.0.5(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-menu@2.0.5(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-Gw4f9pwdH+w5w+49k0gLjN0PfRDHvxmAgG16AbyJZ7zhwZ6PBHKtWohvnSwfusfnK3L68dpBREHpVkj8wEM7ZA==} peerDependencies: '@types/react': '*' @@ -2845,32 +2871,32 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-direction': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-dismissable-layer': 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-focus-scope': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-id': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-popper': 1.1.2(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-portal': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-roving-focus': 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-slot': 1.0.2(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-direction': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-dismissable-layer': 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-focus-scope': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-id': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-popper': 1.1.2(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-portal': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-roving-focus': 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-slot': 1.0.2(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 aria-hidden: 1.2.3 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-remove-scroll: 2.5.5(@types/react@18.2.38)(react@18.2.0) + react-remove-scroll: 2.5.5(@types/react@18.2.45)(react@18.2.0) dev: false - /@radix-ui/react-menu@2.0.6(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-menu@2.0.6(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-BVkFLS+bUC8HcImkRKPSiVumA1VPOOEC5WBMiT+QAVsPzW1FJzI9KnqgGxVDPBcql5xXrHkD3JOVoXWEXD8SYA==} peerDependencies: '@types/react': '*' @@ -2883,32 +2909,32 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-direction': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-focus-scope': 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-id': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-popper': 1.1.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-roving-focus': 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-slot': 1.0.2(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-direction': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-focus-scope': 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-id': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-popper': 1.1.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-roving-focus': 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-slot': 1.0.2(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 aria-hidden: 1.2.3 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-remove-scroll: 2.5.5(@types/react@18.2.38)(react@18.2.0) + react-remove-scroll: 2.5.5(@types/react@18.2.45)(react@18.2.0) dev: false - /@radix-ui/react-popover@1.0.6(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-popover@1.0.6(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-cZ4defGpkZ0qTRtlIBzJLSzL6ht7ofhhW4i1+pkemjV1IKXm0wgCRnee154qlV6r9Ttunmh2TNZhMfV2bavUyA==} peerDependencies: '@types/react': '*' @@ -2921,29 +2947,29 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-dismissable-layer': 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-focus-scope': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-id': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-popper': 1.1.2(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-portal': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-slot': 1.0.2(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-dismissable-layer': 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-focus-scope': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-id': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-popper': 1.1.2(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-portal': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-slot': 1.0.2(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 aria-hidden: 1.2.3 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-remove-scroll: 2.5.5(@types/react@18.2.38)(react@18.2.0) + react-remove-scroll: 2.5.5(@types/react@18.2.45)(react@18.2.0) dev: false - /@radix-ui/react-popper@1.1.2(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-popper@1.1.2(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-1CnGGfFi/bbqtJZZ0P/NQY20xdG3E0LALJaLUEoKwPLwl6PPPfbeiCqMVQnhoFRAxjJj4RpBRJzDmUgsex2tSg==} peerDependencies: '@types/react': '*' @@ -2956,24 +2982,24 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 '@floating-ui/react-dom': 2.0.4(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-arrow': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-rect': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-size': 1.0.1(@types/react@18.2.38)(react@18.2.0) + '@radix-ui/react-arrow': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-rect': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-size': 1.0.1(@types/react@18.2.45)(react@18.2.0) '@radix-ui/rect': 1.0.1 - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-popper@1.1.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-popper@1.1.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-cKpopj/5RHZWjrbF2846jBNacjQVwkP068DfmgrNJXpvVWrOvlAmE9xSiy5OqeE+Gi8D9fP+oDhUnPqNMY8/5w==} peerDependencies: '@types/react': '*' @@ -2986,24 +3012,24 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 '@floating-ui/react-dom': 2.0.4(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-arrow': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-rect': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-size': 1.0.1(@types/react@18.2.38)(react@18.2.0) + '@radix-ui/react-arrow': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-rect': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-size': 1.0.1(@types/react@18.2.45)(react@18.2.0) '@radix-ui/rect': 1.0.1 - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-portal@1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-portal@1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-xLYZeHrWoPmA5mEKEfZZevoVRK/Q43GfzRXkWV6qawIWWK8t6ifIiLQdd7rmQ4Vk1bmI21XhqF9BN3jWf+phpA==} peerDependencies: '@types/react': '*' @@ -3016,15 +3042,15 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@babel/runtime': 7.23.6 + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-portal@1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-portal@1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-Qki+C/EuGUVCQTOTD5vzJzJuMUlewbzuKyUy+/iHM2uwGiru9gZeBJtHAPKAEkB5KWGi9mP/CHKcY0wt1aW45Q==} peerDependencies: '@types/react': '*' @@ -3037,15 +3063,15 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@babel/runtime': 7.23.6 + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-presence@1.0.1(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-presence@1.0.1(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-UXLW4UAbIY5ZjcvzjfRFo5gxva8QirC9hF7wRE4U5gz+TP0DbRk+//qyuAQ1McDxBt1xNMBTaciFGvEmJvAZCg==} peerDependencies: '@types/react': '*' @@ -3058,16 +3084,16 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@babel/runtime': 7.23.6 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-primitive@1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-primitive@1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==} peerDependencies: '@types/react': '*' @@ -3080,15 +3106,15 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@radix-ui/react-slot': 1.0.2(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@babel/runtime': 7.23.6 + '@radix-ui/react-slot': 1.0.2(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-radio-group@1.1.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-radio-group@1.1.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-x+yELayyefNeKeTx4fjK6j99Fs6c4qKm3aY38G3swQVTN6xMpsrbigC0uHs2L//g8q4qR7qOcww8430jJmi2ag==} peerDependencies: '@types/react': '*' @@ -3101,24 +3127,24 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-direction': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-roving-focus': 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-previous': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-size': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-direction': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-roving-focus': 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-previous': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-size': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-roving-focus@1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-roving-focus@1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-2mUg5Mgcu001VkGy+FfzZyzbmuUWzgWkj3rvv4yu+mLw03+mTzbxZHvfcGyFp2b8EkQeMkpRQ5FiA2Vr2O6TeQ==} peerDependencies: '@types/react': '*' @@ -3131,23 +3157,23 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-direction': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-id': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-direction': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-id': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-separator@1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-separator@1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-itYmTy/kokS21aiV5+Z56MZB54KrhPgn6eHDKkFeOLR34HMN2s8PaN47qZZAGnvupcjxHaFZnW4pQEh0BvvVuw==} peerDependencies: '@types/react': '*' @@ -3160,15 +3186,15 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@babel/runtime': 7.23.6 + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-slot@1.0.2(@types/react@18.2.38)(react@18.2.0): + /@radix-ui/react-slot@1.0.2(@types/react@18.2.45)(react@18.2.0): resolution: {integrity: sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==} peerDependencies: '@types/react': '*' @@ -3177,13 +3203,13 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 + '@babel/runtime': 7.23.6 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 react: 18.2.0 dev: false - /@radix-ui/react-switch@1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-switch@1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-mxm87F88HyHztsI7N+ZUmEoARGkC22YVW5CaC+Byc+HRpuvCrOBPTAnXgf+tZ/7i0Sg/eOePGdMhUKhPaQEqow==} peerDependencies: '@types/react': '*' @@ -3196,21 +3222,21 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-previous': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-size': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-previous': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-size': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-toast@1.1.5(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-toast@1.1.5(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-fRLn227WHIBRSzuRzGJ8W+5YALxofH23y0MlPLddaIpLpCDqdE0NZlS2NRQDRiptfxDeeCjgFIpexB1/zkxDlw==} peerDependencies: '@types/react': '*' @@ -3223,26 +3249,26 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-visually-hidden': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-visually-hidden': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-toggle-group@1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-toggle-group@1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-Uaj/M/cMyiyT9Bx6fOZO0SAG4Cls0GptBWiBmBxofmDbNVnYYoyRWj/2M/6VCi/7qcXFWnHhRUfdfZFvvkuu8A==} peerDependencies: '@types/react': '*' @@ -3255,21 +3281,21 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-context': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-direction': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-roving-focus': 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-toggle': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@radix-ui/react-context': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-direction': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-roving-focus': 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-toggle': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-toggle@1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-toggle@1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-Pkqg3+Bc98ftZGsl60CLANXQBBQ4W3mTFS9EJvNxKMZ7magklKV69/id1mlAlOFDDfHvlCms0fx8fA4CMKDJHg==} peerDependencies: '@types/react': '*' @@ -3282,17 +3308,17 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-tooltip@1.0.7(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-tooltip@1.0.7(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-lPh5iKNFVQ/jav/j6ZrWq3blfDJ0OH9R6FlNUHPMqdLuQ9vwDgFsRxvl8b7Asuy5c8xmoojHUxKHQSOAvMHxyw==} peerDependencies: '@types/react': '*' @@ -3305,26 +3331,26 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-id': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-popper': 1.1.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-slot': 1.0.2(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@radix-ui/react-visually-hidden': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-id': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-popper': 1.1.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-slot': 1.0.2(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@radix-ui/react-visually-hidden': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-use-callback-ref@1.0.1(@types/react@18.2.38)(react@18.2.0): + /@radix-ui/react-use-callback-ref@1.0.1(@types/react@18.2.45)(react@18.2.0): resolution: {integrity: sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==} peerDependencies: '@types/react': '*' @@ -3333,12 +3359,12 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@types/react': 18.2.38 + '@babel/runtime': 7.23.6 + '@types/react': 18.2.45 react: 18.2.0 dev: false - /@radix-ui/react-use-controllable-state@1.0.1(@types/react@18.2.38)(react@18.2.0): + /@radix-ui/react-use-controllable-state@1.0.1(@types/react@18.2.45)(react@18.2.0): resolution: {integrity: sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==} peerDependencies: '@types/react': '*' @@ -3347,13 +3373,13 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 + '@babel/runtime': 7.23.6 + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 react: 18.2.0 dev: false - /@radix-ui/react-use-escape-keydown@1.0.3(@types/react@18.2.38)(react@18.2.0): + /@radix-ui/react-use-escape-keydown@1.0.3(@types/react@18.2.45)(react@18.2.0): resolution: {integrity: sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==} peerDependencies: '@types/react': '*' @@ -3362,13 +3388,13 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 + '@babel/runtime': 7.23.6 + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 react: 18.2.0 dev: false - /@radix-ui/react-use-layout-effect@1.0.1(@types/react@18.2.38)(react@18.2.0): + /@radix-ui/react-use-layout-effect@1.0.1(@types/react@18.2.45)(react@18.2.0): resolution: {integrity: sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ==} peerDependencies: '@types/react': '*' @@ -3377,12 +3403,12 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@types/react': 18.2.38 + '@babel/runtime': 7.23.6 + '@types/react': 18.2.45 react: 18.2.0 dev: false - /@radix-ui/react-use-previous@1.0.1(@types/react@18.2.38)(react@18.2.0): + /@radix-ui/react-use-previous@1.0.1(@types/react@18.2.45)(react@18.2.0): resolution: {integrity: sha512-cV5La9DPwiQ7S0gf/0qiD6YgNqM5Fk97Kdrlc5yBcrF3jyEZQwm7vYFqMo4IfeHgJXsRaMvLABFtd0OVEmZhDw==} peerDependencies: '@types/react': '*' @@ -3391,12 +3417,12 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@types/react': 18.2.38 + '@babel/runtime': 7.23.6 + '@types/react': 18.2.45 react: 18.2.0 dev: false - /@radix-ui/react-use-rect@1.0.1(@types/react@18.2.38)(react@18.2.0): + /@radix-ui/react-use-rect@1.0.1(@types/react@18.2.45)(react@18.2.0): resolution: {integrity: sha512-Cq5DLuSiuYVKNU8orzJMbl15TXilTnJKUCltMVQg53BQOF1/C5toAaGrowkgksdBQ9H+SRL23g0HDmg9tvmxXw==} peerDependencies: '@types/react': '*' @@ -3405,13 +3431,13 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 '@radix-ui/rect': 1.0.1 - '@types/react': 18.2.38 + '@types/react': 18.2.45 react: 18.2.0 dev: false - /@radix-ui/react-use-size@1.0.1(@types/react@18.2.38)(react@18.2.0): + /@radix-ui/react-use-size@1.0.1(@types/react@18.2.45)(react@18.2.0): resolution: {integrity: sha512-ibay+VqrgcaI6veAojjofPATwledXiSmX+C0KrBk/xgpX9rBzPV3OsfwlhQdUOFbh+LKQorLYT+xTXW9V8yd0g==} peerDependencies: '@types/react': '*' @@ -3420,13 +3446,13 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.38)(react@18.2.0) - '@types/react': 18.2.38 + '@babel/runtime': 7.23.6 + '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.45)(react@18.2.0) + '@types/react': 18.2.45 react: 18.2.0 dev: false - /@radix-ui/react-visually-hidden@1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-visually-hidden@1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-D4w41yN5YRKtu464TLnByKzMDG/JlMPHtfZgQAu9v6mNakUqGUI9vUrfQKz8NK41VMm/xbZbh76NUTVtIYqOMA==} peerDependencies: '@types/react': '*' @@ -3439,10 +3465,10 @@ packages: '@types/react-dom': optional: true dependencies: - '@babel/runtime': 7.23.4 - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0) - '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 + '@babel/runtime': 7.23.6 + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.18)(@types/react@18.2.45)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 18.2.45 + '@types/react-dom': 18.2.18 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false @@ -3450,38 +3476,38 @@ packages: /@radix-ui/rect@1.0.1: resolution: {integrity: sha512-fyrgCaedtvMg9NK3en0pnOYJdtfwxUcNolezkNPUsoX57X8oQk+NkqcvzHXD2uKNij6GXmWU9NDru2IWjrO4BQ==} dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 dev: false - /@react-aria/focus@3.15.0(react@18.2.0): - resolution: {integrity: sha512-nnxRyfqHuAjRwdQ4BpQyZPtGFKZmRU6cnaIb3pqWFCqEyJQensV7MA3TJ4Jhadq67cy1Ji5SYSlr1duBwjoYvw==} + /@react-aria/focus@3.16.0(react@18.2.0): + resolution: {integrity: sha512-GP6EYI07E8NKQQcXHjpIocEU0vh0oi0Vcsd+/71fKS0NnTR0TUOEeil0JuuQ9ymkmPDTu51Aaaa4FxVsuN/23A==} peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 dependencies: - '@react-aria/interactions': 3.20.0(react@18.2.0) - '@react-aria/utils': 3.22.0(react@18.2.0) + '@react-aria/interactions': 3.20.1(react@18.2.0) + '@react-aria/utils': 3.23.0(react@18.2.0) '@react-types/shared': 3.22.0(react@18.2.0) '@swc/helpers': 0.5.3 - clsx: 1.2.1 + clsx: 2.0.0 react: 18.2.0 dev: false - /@react-aria/grid@3.8.5(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-0p+Bbs9rpQeOy8b75DamlzVPKylBoe/z0XwkeeTChHP2TK3TwPXh6J5EmisQx6K8zsb3iZULQRcP4QibvnMbrg==} + /@react-aria/grid@3.8.6(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-JlQDkdm5heG1FfRyy5KnB8b6s/hRqSI6Xt2xN2AccLX5kcbfFr2/d5KVxyf6ahfa4Gfd46alN6477ju5eTWJew==} peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 dependencies: - '@react-aria/focus': 3.15.0(react@18.2.0) - '@react-aria/i18n': 3.9.0(react@18.2.0) - '@react-aria/interactions': 3.20.0(react@18.2.0) + '@react-aria/focus': 3.16.0(react@18.2.0) + '@react-aria/i18n': 3.10.0(react@18.2.0) + '@react-aria/interactions': 3.20.1(react@18.2.0) '@react-aria/live-announcer': 3.3.1 - '@react-aria/selection': 3.17.2(react-dom@18.2.0)(react@18.2.0) - '@react-aria/utils': 3.22.0(react@18.2.0) - '@react-stately/collections': 3.10.3(react@18.2.0) - '@react-stately/grid': 3.8.3(react@18.2.0) - '@react-stately/selection': 3.14.1(react@18.2.0) - '@react-stately/virtualizer': 3.6.5(react@18.2.0) + '@react-aria/selection': 3.17.3(react-dom@18.2.0)(react@18.2.0) + '@react-aria/utils': 3.23.0(react@18.2.0) + '@react-stately/collections': 3.10.4(react@18.2.0) + '@react-stately/grid': 3.8.4(react@18.2.0) + '@react-stately/selection': 3.14.2(react@18.2.0) + '@react-stately/virtualizer': 3.6.6(react@18.2.0) '@react-types/checkbox': 3.6.0(react@18.2.0) '@react-types/grid': 3.2.3(react@18.2.0) '@react-types/shared': 3.22.0(react@18.2.0) @@ -3490,48 +3516,48 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: false - /@react-aria/gridlist@3.7.2(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-9keGYZz0yILVqAnFzF6hGRtHm1vfSD1mNnH8oyn7mKjyr7qOln7s5f8Nl85ueMolfrV3H2rCZgM2itNQ+Ezzgg==} + /@react-aria/gridlist@3.7.3(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-rkkepYM7xJiebR0g3uC4zzkdR7a8z0fLaM+sg9lSTbdElHMLAlrebS2ytEyZnhiu9nbOnw13GN1OC4/ZenzbHQ==} peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 dependencies: - '@react-aria/focus': 3.15.0(react@18.2.0) - '@react-aria/grid': 3.8.5(react-dom@18.2.0)(react@18.2.0) - '@react-aria/i18n': 3.9.0(react@18.2.0) - '@react-aria/interactions': 3.20.0(react@18.2.0) - '@react-aria/selection': 3.17.2(react-dom@18.2.0)(react@18.2.0) - '@react-aria/utils': 3.22.0(react@18.2.0) - '@react-stately/list': 3.10.1(react@18.2.0) + '@react-aria/focus': 3.16.0(react@18.2.0) + '@react-aria/grid': 3.8.6(react-dom@18.2.0)(react@18.2.0) + '@react-aria/i18n': 3.10.0(react@18.2.0) + '@react-aria/interactions': 3.20.1(react@18.2.0) + '@react-aria/selection': 3.17.3(react-dom@18.2.0)(react@18.2.0) + '@react-aria/utils': 3.23.0(react@18.2.0) + '@react-stately/list': 3.10.2(react@18.2.0) '@react-types/shared': 3.22.0(react@18.2.0) '@swc/helpers': 0.5.3 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@react-aria/i18n@3.9.0(react@18.2.0): - resolution: {integrity: sha512-ebGP/sVG0ZtNF4RNFzs/W01tl7waYpBManh1kKWgA4roDPFt/odkgkDBzKGl+ggBb7TQRHsfUFHuqKsrsMy9TA==} + /@react-aria/i18n@3.10.0(react@18.2.0): + resolution: {integrity: sha512-sviD5Y1pLPG49HHRmVjR+5nONrp0HK219+nu9Y7cDfUhXu2EjyhMS9t/n9/VZ69hHChZ2PnHYLEE2visu9CuCg==} peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 dependencies: - '@internationalized/date': 3.5.0 + '@internationalized/date': 3.5.1 '@internationalized/message': 3.1.1 - '@internationalized/number': 3.4.0 - '@internationalized/string': 3.1.1 - '@react-aria/ssr': 3.9.0(react@18.2.0) - '@react-aria/utils': 3.22.0(react@18.2.0) + '@internationalized/number': 3.5.0 + '@internationalized/string': 3.2.0 + '@react-aria/ssr': 3.9.1(react@18.2.0) + '@react-aria/utils': 3.23.0(react@18.2.0) '@react-types/shared': 3.22.0(react@18.2.0) '@swc/helpers': 0.5.3 react: 18.2.0 dev: false - /@react-aria/interactions@3.20.0(react@18.2.0): - resolution: {integrity: sha512-JCCEyK2Nb4mEHucrgmqhTHTNAEqhsiM07jJmmY22eikxnCQnsEfdwXyg9cgZLG79D5V7jyqVRqOp2OsG7Qx7kQ==} + /@react-aria/interactions@3.20.1(react@18.2.0): + resolution: {integrity: sha512-PLNBr87+SzRhe9PvvF9qvzYeP4ofTwfKSorwmO+hjr3qoczrSXf4LRQlb27wB6hF10C7ZE/XVbUI1lj4QQrZ/g==} peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 dependencies: - '@react-aria/ssr': 3.9.0(react@18.2.0) - '@react-aria/utils': 3.22.0(react@18.2.0) + '@react-aria/ssr': 3.9.1(react@18.2.0) + '@react-aria/utils': 3.23.0(react@18.2.0) '@react-types/shared': 3.22.0(react@18.2.0) '@swc/helpers': 0.5.3 react: 18.2.0 @@ -3543,25 +3569,25 @@ packages: '@swc/helpers': 0.5.3 dev: false - /@react-aria/selection@3.17.2(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-AXXY3eOIWnITabMn6c0bpLPXkSX7040LOZU+7pQgtZJwDdZorLuKw4i7WS5i71LcV71ywG4mtqc9mOb/GfhUbg==} + /@react-aria/selection@3.17.3(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-xl2sgeGH61ngQeE05WOWWPVpGRTPMjQEFmsAWEprArFi4Z7ihSZgpGX22l1w7uSmtXM/eN/v0W8hUYUju5iXlQ==} peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 dependencies: - '@react-aria/focus': 3.15.0(react@18.2.0) - '@react-aria/i18n': 3.9.0(react@18.2.0) - '@react-aria/interactions': 3.20.0(react@18.2.0) - '@react-aria/utils': 3.22.0(react@18.2.0) - '@react-stately/selection': 3.14.1(react@18.2.0) + '@react-aria/focus': 3.16.0(react@18.2.0) + '@react-aria/i18n': 3.10.0(react@18.2.0) + '@react-aria/interactions': 3.20.1(react@18.2.0) + '@react-aria/utils': 3.23.0(react@18.2.0) + '@react-stately/selection': 3.14.2(react@18.2.0) '@react-types/shared': 3.22.0(react@18.2.0) '@swc/helpers': 0.5.3 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@react-aria/ssr@3.9.0(react@18.2.0): - resolution: {integrity: sha512-Bz6BqP6ZorCme9tSWHZVmmY+s7AU8l6Vl2NUYmBzezD//fVHHfFo4lFBn5tBuAaJEm3AuCLaJQ6H2qhxNSb7zg==} + /@react-aria/ssr@3.9.1(react@18.2.0): + resolution: {integrity: sha512-NqzkLFP8ZVI4GSorS0AYljC13QW2sc8bDqJOkBvkAt3M8gbcAXJWVRGtZBCRscki9RZF+rNlnPdg0G0jYkhJcg==} engines: {node: '>= 12'} peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 @@ -3570,21 +3596,21 @@ packages: react: 18.2.0 dev: false - /@react-aria/utils@3.22.0(react@18.2.0): - resolution: {integrity: sha512-Qi/m65GFFljXA/ayj1m5g3KZdgbZY3jacSSqD5vNUOEGiKsn4OQcsw8RfC2c0SgtLV1hLzsfvFI1OiryPlGCcw==} + /@react-aria/utils@3.23.0(react@18.2.0): + resolution: {integrity: sha512-fJA63/VU4iQNT8WUvrmll3kvToqMurD69CcgVmbQ56V7ZbvlzFi44E7BpnoaofScYLLtFWRjVdaHsohT6O/big==} peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 dependencies: - '@react-aria/ssr': 3.9.0(react@18.2.0) + '@react-aria/ssr': 3.9.1(react@18.2.0) '@react-stately/utils': 3.9.0(react@18.2.0) '@react-types/shared': 3.22.0(react@18.2.0) '@swc/helpers': 0.5.3 - clsx: 1.2.1 + clsx: 2.0.0 react: 18.2.0 dev: false - /@react-stately/collections@3.10.3(react@18.2.0): - resolution: {integrity: sha512-fA28HIApAIz9sNGeOVXZJPgV5Kig6M72KI1t9sUbnRUr9Xq9OMJTR6ElDMXNe0iTeZffRFDOPYyqnX9zkxof6Q==} + /@react-stately/collections@3.10.4(react@18.2.0): + resolution: {integrity: sha512-OHhCrItGt4zB2bSrgObRo0H2SC7QlkH8ReGxo+NVIWchXRLRoiWBP7S+IwleewEo5gOqDVPY3hqA9n4iiI8twg==} peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 dependencies: @@ -3593,38 +3619,38 @@ packages: react: 18.2.0 dev: false - /@react-stately/grid@3.8.3(react@18.2.0): - resolution: {integrity: sha512-JceGSJcuO6Zv+Aq5s2NZvmbMjdPjTtGNQR9kTgXKC/pOfM6FJ58bJiOmEllyN6oawqh4Ey8Xdqk9NuW4l2ctuw==} + /@react-stately/grid@3.8.4(react@18.2.0): + resolution: {integrity: sha512-rwqV1K4lVhaiaqJkt4TfYqdJoVIyqvSm98rKAYfCNzrKcivVpoiCMJ2EMt6WlYCjDVBdEOQ7fMV1I60IV0pntA==} peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 dependencies: - '@react-stately/collections': 3.10.3(react@18.2.0) - '@react-stately/selection': 3.14.1(react@18.2.0) + '@react-stately/collections': 3.10.4(react@18.2.0) + '@react-stately/selection': 3.14.2(react@18.2.0) '@react-types/grid': 3.2.3(react@18.2.0) '@react-types/shared': 3.22.0(react@18.2.0) '@swc/helpers': 0.5.3 react: 18.2.0 dev: false - /@react-stately/list@3.10.1(react@18.2.0): - resolution: {integrity: sha512-iVarLMd7FmMT0H20dRWsFOHHX5+c4gK51AXP2BSr1VtDSfbL4dgaGgu7IaAMVc/rO0au1e1tPM2hutiIFvPcnA==} + /@react-stately/list@3.10.2(react@18.2.0): + resolution: {integrity: sha512-INt+zofkIg2KN8B95xPi9pJG7ZFWAm30oIm/lCPBqM3K1Nm03/QaAbiQj2QeJcOsG3lb7oqI6D6iwTolwJkjIQ==} peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 dependencies: - '@react-stately/collections': 3.10.3(react@18.2.0) - '@react-stately/selection': 3.14.1(react@18.2.0) + '@react-stately/collections': 3.10.4(react@18.2.0) + '@react-stately/selection': 3.14.2(react@18.2.0) '@react-stately/utils': 3.9.0(react@18.2.0) '@react-types/shared': 3.22.0(react@18.2.0) '@swc/helpers': 0.5.3 react: 18.2.0 dev: false - /@react-stately/selection@3.14.1(react@18.2.0): - resolution: {integrity: sha512-96/CerrB6yH4Ad9FkzBzyVerSPjcIj1NBTWTFHo1N+oHECvyGsDxZl7Y4LQR++teFK66FhX5KjCJQGae4IZd6A==} + /@react-stately/selection@3.14.2(react@18.2.0): + resolution: {integrity: sha512-mL7OoiUgVWaaF7ks5XSxgbXeShijYmD4G3bkBHhqkpugU600QH6BM2hloCq8KOUupk1y8oTljPtF9EmCv375DA==} peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 dependencies: - '@react-stately/collections': 3.10.3(react@18.2.0) + '@react-stately/collections': 3.10.4(react@18.2.0) '@react-stately/utils': 3.9.0(react@18.2.0) '@react-types/shared': 3.22.0(react@18.2.0) '@swc/helpers': 0.5.3 @@ -3640,12 +3666,12 @@ packages: react: 18.2.0 dev: false - /@react-stately/virtualizer@3.6.5(react@18.2.0): - resolution: {integrity: sha512-v0cZeNCGPMeo3LP4UrGuDo3Xpq7ufNaZyGObgSvdrIW49qK5F02kczcKy6NKg+QfOgC/+Nc9Tof/2S8dcxDrCA==} + /@react-stately/virtualizer@3.6.6(react@18.2.0): + resolution: {integrity: sha512-9hWvfITdE/028q4YFve6FxlmA3PdSMkUwpYA+vfaGCXI/4DFZIssBMspUeu4PTRJoV+k+m0z1wYHPmufrq6a3g==} peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 dependencies: - '@react-aria/utils': 3.22.0(react@18.2.0) + '@react-aria/utils': 3.23.0(react@18.2.0) '@react-types/shared': 3.22.0(react@18.2.0) '@swc/helpers': 0.5.3 react: 18.2.0 @@ -3677,7 +3703,7 @@ packages: react: 18.2.0 dev: false - /@remix-run/dev@1.19.3(@remix-run/serve@1.19.3)(@types/node@16.18.64): + /@remix-run/dev@1.19.3(@remix-run/serve@1.19.3)(@types/node@16.18.68): resolution: {integrity: sha512-Yh733OI0AxR7QbPaJbocujxSF1S5CToDmfZnmv5SlTTIXEw5KfnbCceHy9qhUp0nrkz2YT7pd1zbTEVYIi/Vug==} engines: {node: '>=14.0.0'} hasBin: true @@ -3687,19 +3713,19 @@ packages: '@remix-run/serve': optional: true dependencies: - '@babel/core': 7.23.3 - '@babel/generator': 7.23.4 - '@babel/parser': 7.23.4 - '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.3) - '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.23.3) - '@babel/preset-env': 7.23.3(@babel/core@7.23.3) - '@babel/preset-typescript': 7.23.3(@babel/core@7.23.3) - '@babel/traverse': 7.23.4 - '@babel/types': 7.23.4 + '@babel/core': 7.23.6 + '@babel/generator': 7.23.6 + '@babel/parser': 7.23.6 + '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.6) + '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.23.6) + '@babel/preset-env': 7.23.6(@babel/core@7.23.6) + '@babel/preset-typescript': 7.23.3(@babel/core@7.23.6) + '@babel/traverse': 7.23.6 + '@babel/types': 7.23.6 '@npmcli/package-json': 2.0.0 '@remix-run/serve': 1.19.3 '@remix-run/server-runtime': 1.19.3 - '@vanilla-extract/integration': 6.2.4(@types/node@16.18.64) + '@vanilla-extract/integration': 6.2.4(@types/node@16.18.68) arg: 5.0.2 cacache: 15.3.0 chalk: 4.1.2 @@ -3725,10 +3751,10 @@ packages: picocolors: 1.0.0 picomatch: 2.3.1 pidtree: 0.6.0 - postcss: 8.4.31 - postcss-discard-duplicates: 5.1.0(postcss@8.4.31) - postcss-load-config: 4.0.2(postcss@8.4.31) - postcss-modules: 6.0.0(postcss@8.4.31) + postcss: 8.4.32 + postcss-discard-duplicates: 5.1.0(postcss@8.4.32) + postcss-load-config: 4.0.2(postcss@8.4.32) + postcss-modules: 6.0.0(postcss@8.4.32) prettier: 2.8.8 pretty-ms: 7.0.1 proxy-agent: 6.3.1 @@ -3773,7 +3799,7 @@ packages: engines: {node: '>=14.0.0'} dependencies: '@remix-run/server-runtime': 1.19.3 - '@remix-run/web-fetch': 4.4.1 + '@remix-run/web-fetch': 4.4.2 '@remix-run/web-file': 3.1.0 '@remix-run/web-stream': 1.1.0 '@web3-storage/multipart-parser': 1.0.0 @@ -3795,8 +3821,8 @@ packages: react-router-dom: 6.14.2(react-dom@18.2.0)(react@18.2.0) dev: false - /@remix-run/router@1.13.0: - resolution: {integrity: sha512-5dMOnVnefRsl4uRnAdoWjtVTdh8e6aZqgM4puy9nmEADH72ck+uXwzpJLEKE9Q6F8ZljNewLgmTfkxUrBdv4WA==} + /@remix-run/router@1.14.1: + resolution: {integrity: sha512-Qg4DMQsfPNAs88rb2xkdk03N3bjK4jgX5fR24eHCTR9q6PrhZQZ4UJBPzCHJkIpTRN1UKxx2DzjZmnC+7Lj0Ow==} engines: {node: '>=14.0.0'} dev: false @@ -3836,8 +3862,8 @@ packages: '@remix-run/web-stream': 1.1.0 web-encoding: 1.1.5 - /@remix-run/web-fetch@4.4.1: - resolution: {integrity: sha512-xMceEGn2kvfeWS91nHSOhEQHPGgjFnmDVpWFZrbWPVdiTByMZIn421/tdSF6Kd1RsNsY+5Iwt3JFEKZHAcMQHw==} + /@remix-run/web-fetch@4.4.2: + resolution: {integrity: sha512-jgKfzA713/4kAW/oZ4bC3MoLWyjModOVDjFPNseVqcJKSafgIscrYL9G50SurEYLswPuoU3HzSbO0jQCMYWHhA==} engines: {node: ^10.17 || >=12.3} dependencies: '@remix-run/web-blob': 3.1.0 @@ -3877,10 +3903,6 @@ packages: engines: {node: '>=10'} dev: true - /@socket.io/component-emitter@3.1.0: - resolution: {integrity: sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==} - dev: false - /@swc/helpers@0.5.3: resolution: {integrity: sha512-FaruWX6KdudYloq1AHD/4nU+UsMTdNE8CKyrseXWEcgjDAbvkwJg2QGPAnfIJLIWsjZOSPLOAykK6fuYp4vp4A==} dependencies: @@ -3925,7 +3947,7 @@ packages: dependencies: '@types/http-cache-semantics': 4.0.4 '@types/keyv': 3.1.4 - '@types/node': 20.9.4 + '@types/node': 20.10.5 '@types/responselike': 1.0.3 dev: true @@ -3969,7 +3991,7 @@ packages: resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} dependencies: '@types/minimatch': 5.1.2 - '@types/node': 20.9.4 + '@types/node': 20.10.5 dev: true /@types/hast@2.3.8: @@ -4001,7 +4023,7 @@ packages: /@types/keyv@3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} dependencies: - '@types/node': 20.9.4 + '@types/node': 20.10.5 dev: true /@types/mdast@3.0.15: @@ -4026,12 +4048,12 @@ packages: resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==} dev: true - /@types/node@16.18.64: - resolution: {integrity: sha512-TiY2gIDob8+QOPIcVpS0ZY+H1DVTfplBW6UgL2b4gOYbigIlKVIh6Lcv+7YDUciUTqhVLG91PrZBXW10IoBhtw==} + /@types/node@16.18.68: + resolution: {integrity: sha512-sG3hPIQwJLoewrN7cr0dwEy+yF5nD4D/4FxtQpFciRD/xwUzgD+G05uxZHv5mhfXo4F9Jkp13jjn0CC2q325sg==} dev: true - /@types/node@20.9.4: - resolution: {integrity: sha512-wmyg8HUhcn6ACjsn8oKYjkN/zUzQeNtMy44weTJSM6p4MMzEOuKbA3OjJ267uPCOW7Xex9dyrNTful8XTQYoDA==} + /@types/node@20.10.5: + resolution: {integrity: sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==} dependencies: undici-types: 5.26.5 dev: true @@ -4043,28 +4065,28 @@ packages: /@types/prop-types@15.7.11: resolution: {integrity: sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==} - /@types/react-dom@18.2.17: - resolution: {integrity: sha512-rvrT/M7Df5eykWFxn6MYt5Pem/Dbyc1N8Y0S9Mrkw2WFCRiqUgw9P7ul2NpwsXCSM1DVdENzdG9J5SreqfAIWg==} + /@types/react-dom@18.2.18: + resolution: {integrity: sha512-TJxDm6OfAX2KJWJdMEVTwWke5Sc/E/RlnPGvGfS0W7+6ocy2xhDVQVh/KvC2Uf7kACs+gDytdusDSdWfWkaNzw==} dependencies: - '@types/react': 18.2.38 + '@types/react': 18.2.45 /@types/react-ranger@2.0.4: resolution: {integrity: sha512-68kkQNEENn8Vj0Cgren7cDKocTovcVM3bBSRQ85k0DNfbsfjllG8VfPIEuhFr6o1P/6HqJboHINR8CN66sxEgw==} dependencies: - '@types/react': 18.2.38 + '@types/react': 18.2.45 dev: true - /@types/react@18.2.38: - resolution: {integrity: sha512-cBBXHzuPtQK6wNthuVMV6IjHAFkdl/FOPFIlkd81/Cd1+IqkHu/A+w4g43kaQQoYHik/ruaQBDL72HyCy1vuMw==} + /@types/react@18.2.45: + resolution: {integrity: sha512-TtAxCNrlrBp8GoeEp1npd5g+d/OejJHFxS3OWmrPBMFaVQMSN0OFySozJio5BHxTuTeug00AVXVAjfDSfk+lUg==} dependencies: '@types/prop-types': 15.7.11 '@types/scheduler': 0.16.8 - csstype: 3.1.2 + csstype: 3.1.3 /@types/responselike@1.0.3: resolution: {integrity: sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==} dependencies: - '@types/node': 20.9.4 + '@types/node': 20.10.5 dev: true /@types/scheduler@0.16.8: @@ -4085,11 +4107,11 @@ packages: /@types/websocket@1.0.10: resolution: {integrity: sha512-svjGZvPB7EzuYS94cI7a+qhwgGU1y89wUgjT6E2wVUfmAGIvRfT7obBvRtnhXCSsoMdlG4gBFGE7MfkIXZLoww==} dependencies: - '@types/node': 20.9.4 + '@types/node': 20.10.5 dev: true - /@typescript-eslint/eslint-plugin@6.12.0(@typescript-eslint/parser@6.12.0)(eslint@8.54.0)(typescript@5.3.2): - resolution: {integrity: sha512-XOpZ3IyJUIV1b15M7HVOpgQxPPF7lGXgsfcEIu3yDxFPaf/xZKt7s9QO/pbk7vpWQyVulpJbu4E5LwpZiQo4kA==} + /@typescript-eslint/eslint-plugin@6.15.0(@typescript-eslint/parser@6.15.0)(eslint@8.56.0)(typescript@5.3.3): + resolution: {integrity: sha512-j5qoikQqPccq9QoBAupOP+CBu8BaJ8BLjaXSioDISeTZkVO3ig7oSIKh3H+rEpee7xCXtWwSB4KIL5l6hWZzpg==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha @@ -4100,25 +4122,25 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 6.12.0(eslint@8.54.0)(typescript@5.3.2) - '@typescript-eslint/scope-manager': 6.12.0 - '@typescript-eslint/type-utils': 6.12.0(eslint@8.54.0)(typescript@5.3.2) - '@typescript-eslint/utils': 6.12.0(eslint@8.54.0)(typescript@5.3.2) - '@typescript-eslint/visitor-keys': 6.12.0 + '@typescript-eslint/parser': 6.15.0(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/scope-manager': 6.15.0 + '@typescript-eslint/type-utils': 6.15.0(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/utils': 6.15.0(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/visitor-keys': 6.15.0 debug: 4.3.4 - eslint: 8.54.0 + eslint: 8.56.0 graphemer: 1.4.0 ignore: 5.3.0 natural-compare: 1.4.0 semver: 7.5.4 - ts-api-utils: 1.0.3(typescript@5.3.2) - typescript: 5.3.2 + ts-api-utils: 1.0.3(typescript@5.3.3) + typescript: 5.3.3 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@6.12.0(eslint@8.54.0)(typescript@5.3.2): - resolution: {integrity: sha512-s8/jNFPKPNRmXEnNXfuo1gemBdVmpQsK1pcu+QIvuNJuhFzGrpD7WjOcvDc/+uEdfzSYpNu7U/+MmbScjoQ6vg==} + /@typescript-eslint/parser@6.15.0(eslint@8.56.0)(typescript@5.3.3): + resolution: {integrity: sha512-MkgKNnsjC6QwcMdlNAel24jjkEO/0hQaMDLqP4S9zq5HBAUJNQB6y+3DwLjX7b3l2b37eNAxMPLwb3/kh8VKdA==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: eslint: ^7.0.0 || ^8.0.0 @@ -4127,27 +4149,27 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 6.12.0 - '@typescript-eslint/types': 6.12.0 - '@typescript-eslint/typescript-estree': 6.12.0(typescript@5.3.2) - '@typescript-eslint/visitor-keys': 6.12.0 + '@typescript-eslint/scope-manager': 6.15.0 + '@typescript-eslint/types': 6.15.0 + '@typescript-eslint/typescript-estree': 6.15.0(typescript@5.3.3) + '@typescript-eslint/visitor-keys': 6.15.0 debug: 4.3.4 - eslint: 8.54.0 - typescript: 5.3.2 + eslint: 8.56.0 + typescript: 5.3.3 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/scope-manager@6.12.0: - resolution: {integrity: sha512-5gUvjg+XdSj8pcetdL9eXJzQNTl3RD7LgUiYTl8Aabdi8hFkaGSYnaS6BLc0BGNaDH+tVzVwmKtWvu0jLgWVbw==} + /@typescript-eslint/scope-manager@6.15.0: + resolution: {integrity: sha512-+BdvxYBltqrmgCNu4Li+fGDIkW9n//NrruzG9X1vBzaNK+ExVXPoGB71kneaVw/Jp+4rH/vaMAGC6JfMbHstVg==} engines: {node: ^16.0.0 || >=18.0.0} dependencies: - '@typescript-eslint/types': 6.12.0 - '@typescript-eslint/visitor-keys': 6.12.0 + '@typescript-eslint/types': 6.15.0 + '@typescript-eslint/visitor-keys': 6.15.0 dev: true - /@typescript-eslint/type-utils@6.12.0(eslint@8.54.0)(typescript@5.3.2): - resolution: {integrity: sha512-WWmRXxhm1X8Wlquj+MhsAG4dU/Blvf1xDgGaYCzfvStP2NwPQh6KBvCDbiOEvaE0filhranjIlK/2fSTVwtBng==} + /@typescript-eslint/type-utils@6.15.0(eslint@8.56.0)(typescript@5.3.3): + resolution: {integrity: sha512-CnmHKTfX6450Bo49hPg2OkIm/D/TVYV7jO1MCfPYGwf6x3GO0VU8YMO5AYMn+u3X05lRRxA4fWCz87GFQV6yVQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: eslint: ^7.0.0 || ^8.0.0 @@ -4156,23 +4178,23 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 6.12.0(typescript@5.3.2) - '@typescript-eslint/utils': 6.12.0(eslint@8.54.0)(typescript@5.3.2) + '@typescript-eslint/typescript-estree': 6.15.0(typescript@5.3.3) + '@typescript-eslint/utils': 6.15.0(eslint@8.56.0)(typescript@5.3.3) debug: 4.3.4 - eslint: 8.54.0 - ts-api-utils: 1.0.3(typescript@5.3.2) - typescript: 5.3.2 + eslint: 8.56.0 + ts-api-utils: 1.0.3(typescript@5.3.3) + typescript: 5.3.3 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/types@6.12.0: - resolution: {integrity: sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q==} + /@typescript-eslint/types@6.15.0: + resolution: {integrity: sha512-yXjbt//E4T/ee8Ia1b5mGlbNj9fB9lJP4jqLbZualwpP2BCQ5is6BcWwxpIsY4XKAhmdv3hrW92GdtJbatC6dQ==} engines: {node: ^16.0.0 || >=18.0.0} dev: true - /@typescript-eslint/typescript-estree@6.12.0(typescript@5.3.2): - resolution: {integrity: sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==} + /@typescript-eslint/typescript-estree@6.15.0(typescript@5.3.3): + resolution: {integrity: sha512-7mVZJN7Hd15OmGuWrp2T9UvqR2Ecg+1j/Bp1jXUEY2GZKV6FXlOIoqVDmLpBiEiq3katvj/2n2mR0SDwtloCew==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: typescript: '*' @@ -4180,42 +4202,42 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/types': 6.12.0 - '@typescript-eslint/visitor-keys': 6.12.0 + '@typescript-eslint/types': 6.15.0 + '@typescript-eslint/visitor-keys': 6.15.0 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.4 - ts-api-utils: 1.0.3(typescript@5.3.2) - typescript: 5.3.2 + ts-api-utils: 1.0.3(typescript@5.3.3) + typescript: 5.3.3 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils@6.12.0(eslint@8.54.0)(typescript@5.3.2): - resolution: {integrity: sha512-LywPm8h3tGEbgfyjYnu3dauZ0U7R60m+miXgKcZS8c7QALO9uWJdvNoP+duKTk2XMWc7/Q3d/QiCuLN9X6SWyQ==} + /@typescript-eslint/utils@6.15.0(eslint@8.56.0)(typescript@5.3.3): + resolution: {integrity: sha512-eF82p0Wrrlt8fQSRL0bGXzK5nWPRV2dYQZdajcfzOD9+cQz9O7ugifrJxclB+xVOvWvagXfqS4Es7vpLP4augw==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: eslint: ^7.0.0 || ^8.0.0 dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.54.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) '@types/json-schema': 7.0.15 '@types/semver': 7.5.6 - '@typescript-eslint/scope-manager': 6.12.0 - '@typescript-eslint/types': 6.12.0 - '@typescript-eslint/typescript-estree': 6.12.0(typescript@5.3.2) - eslint: 8.54.0 + '@typescript-eslint/scope-manager': 6.15.0 + '@typescript-eslint/types': 6.15.0 + '@typescript-eslint/typescript-estree': 6.15.0(typescript@5.3.3) + eslint: 8.56.0 semver: 7.5.4 transitivePeerDependencies: - supports-color - typescript dev: true - /@typescript-eslint/visitor-keys@6.12.0: - resolution: {integrity: sha512-rg3BizTZHF1k3ipn8gfrzDXXSFKyOEB5zxYXInQ6z0hUvmQlhaZQzK+YmHmNViMA9HzW5Q9+bPPt90bU6GQwyw==} + /@typescript-eslint/visitor-keys@6.15.0: + resolution: {integrity: sha512-1zvtdC1a9h5Tb5jU9x3ADNXO9yjP8rXlaoChu0DQX40vf5ACVpYIVIZhIMZ6d5sDXH7vq4dsZBT1fEGj8D2n2w==} engines: {node: ^16.0.0 || >=18.0.0} dependencies: - '@typescript-eslint/types': 6.12.0 + '@typescript-eslint/types': 6.15.0 eslint-visitor-keys: 3.4.3 dev: true @@ -4226,7 +4248,7 @@ packages: /@vanilla-extract/babel-plugin-debug-ids@1.0.3: resolution: {integrity: sha512-vm4jYu1xhSa6ofQ9AhIpR3DkAp4c+eoR1Rpm8/TQI4DmWbmGbOjYRcqV0aWsfaIlNhN4kFuxFMKBNN9oG6iRzA==} dependencies: - '@babel/core': 7.23.3 + '@babel/core': 7.23.6 transitivePeerDependencies: - supports-color dev: true @@ -4239,7 +4261,7 @@ packages: chalk: 4.1.2 css-what: 6.1.0 cssesc: 3.0.0 - csstype: 3.1.2 + csstype: 3.1.3 deep-object-diff: 1.1.9 deepmerge: 4.3.1 media-query-parser: 2.0.2 @@ -4247,11 +4269,11 @@ packages: outdent: 0.8.0 dev: true - /@vanilla-extract/integration@6.2.4(@types/node@16.18.64): + /@vanilla-extract/integration@6.2.4(@types/node@16.18.68): resolution: {integrity: sha512-+AfymNMVq9sEUe0OJpdCokmPZg4Zi6CqKaW/PnUOfDwEn53ighHOMOBl5hAgxYR8Kiz9NG43Bn00mkjWlFi+ng==} dependencies: - '@babel/core': 7.23.3 - '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.23.3) + '@babel/core': 7.23.6 + '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.23.6) '@vanilla-extract/babel-plugin-debug-ids': 1.0.3 '@vanilla-extract/css': 1.14.0 esbuild: 0.17.6 @@ -4261,8 +4283,8 @@ packages: lodash: 4.17.21 mlly: 1.4.2 outdent: 0.8.0 - vite: 4.5.1(@types/node@16.18.64) - vite-node: 0.28.5(@types/node@16.18.64) + vite: 4.5.1(@types/node@16.18.68) + vite-node: 0.28.5(@types/node@16.18.68) transitivePeerDependencies: - '@types/node' - less @@ -4312,8 +4334,8 @@ packages: acorn: 8.11.2 dev: true - /acorn-walk@8.3.0: - resolution: {integrity: sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==} + /acorn-walk@8.3.1: + resolution: {integrity: sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw==} engines: {node: '>=0.4.0'} dev: true @@ -4365,6 +4387,11 @@ packages: engines: {node: '>=8'} dev: true + /ansi-regex@6.0.1: + resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==} + engines: {node: '>=12'} + dev: true + /ansi-styles@3.2.1: resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==} engines: {node: '>=4'} @@ -4378,6 +4405,11 @@ packages: color-convert: 2.0.1 dev: true + /ansi-styles@6.2.1: + resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} + engines: {node: '>=12'} + dev: true + /any-promise@1.3.0: resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} dev: true @@ -4539,19 +4571,19 @@ packages: engines: {node: '>=8.0.0'} dev: false - /autoprefixer@10.4.16(postcss@8.4.31): + /autoprefixer@10.4.16(postcss@8.4.32): resolution: {integrity: sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==} engines: {node: ^10 || ^12 || >=14} hasBin: true peerDependencies: postcss: ^8.1.0 dependencies: - browserslist: 4.22.1 - caniuse-lite: 1.0.30001564 + browserslist: 4.22.2 + caniuse-lite: 1.0.30001571 fraction.js: 4.3.7 normalize-range: 0.1.2 picocolors: 1.0.0 - postcss: 8.4.31 + postcss: 8.4.32 postcss-value-parser: 4.2.0 dev: true @@ -4598,43 +4630,43 @@ packages: /babel-plugin-macros@2.8.0: resolution: {integrity: sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==} dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 cosmiconfig: 6.0.0 resolve: 1.22.8 dev: false - /babel-plugin-polyfill-corejs2@0.4.6(@babel/core@7.23.3): - resolution: {integrity: sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==} + /babel-plugin-polyfill-corejs2@0.4.7(@babel/core@7.23.6): + resolution: {integrity: sha512-LidDk/tEGDfuHW2DWh/Hgo4rmnw3cduK6ZkOI1NPFceSK3n/yAGeOsNT7FLnSGHkXj3RHGSEVkN3FsCTY6w2CQ==} peerDependencies: '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 dependencies: - '@babel/compat-data': 7.23.3 - '@babel/core': 7.23.3 - '@babel/helper-define-polyfill-provider': 0.4.3(@babel/core@7.23.3) + '@babel/compat-data': 7.23.5 + '@babel/core': 7.23.6 + '@babel/helper-define-polyfill-provider': 0.4.4(@babel/core@7.23.6) semver: 6.3.1 transitivePeerDependencies: - supports-color dev: true - /babel-plugin-polyfill-corejs3@0.8.6(@babel/core@7.23.3): - resolution: {integrity: sha512-leDIc4l4tUgU7str5BWLS2h8q2N4Nf6lGZP6UrNDxdtfF2g69eJ5L0H7S8A5Ln/arfFAfHor5InAdZuIOwZdgQ==} + /babel-plugin-polyfill-corejs3@0.8.7(@babel/core@7.23.6): + resolution: {integrity: sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA==} peerDependencies: '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 dependencies: - '@babel/core': 7.23.3 - '@babel/helper-define-polyfill-provider': 0.4.3(@babel/core@7.23.3) - core-js-compat: 3.33.3 + '@babel/core': 7.23.6 + '@babel/helper-define-polyfill-provider': 0.4.4(@babel/core@7.23.6) + core-js-compat: 3.34.0 transitivePeerDependencies: - supports-color dev: true - /babel-plugin-polyfill-regenerator@0.5.3(@babel/core@7.23.3): - resolution: {integrity: sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==} + /babel-plugin-polyfill-regenerator@0.5.4(@babel/core@7.23.6): + resolution: {integrity: sha512-S/x2iOCvDaCASLYsOOgWOq4bCfKYVqvO/uxjkaYyZ3rVsVE3CeAI/c84NpyuBBymEgNvHgjEot3a9/Z/kXvqsg==} peerDependencies: '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 dependencies: - '@babel/core': 7.23.3 - '@babel/helper-define-polyfill-provider': 0.4.3(@babel/core@7.23.3) + '@babel/core': 7.23.6 + '@babel/helper-define-polyfill-provider': 0.4.4(@babel/core@7.23.6) transitivePeerDependencies: - supports-color dev: true @@ -4661,8 +4693,8 @@ packages: safe-buffer: 5.1.2 dev: true - /basic-ftp@5.0.3: - resolution: {integrity: sha512-QHX8HLlncOLpy54mh+k/sWIFd0ThmRqwe9ZjELybGZK+tZ8rUb9VO0saKJUROTbE+KhzDUT7xziGpGrW8Kmd+g==} + /basic-ftp@5.0.4: + resolution: {integrity: sha512-8PzkB0arJFV4jJWSGOYR+OEic6aeKMu/osRhBULN6RY0ykby6LKhbmuQ5ublvaas5BOwboah5D87nrHyuh8PPA==} engines: {node: '>=10.0.0'} dev: true @@ -4737,15 +4769,15 @@ packages: pako: 0.2.9 dev: true - /browserslist@4.22.1: - resolution: {integrity: sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==} + /browserslist@4.22.2: + resolution: {integrity: sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001564 - electron-to-chromium: 1.4.592 - node-releases: 2.0.13 - update-browserslist-db: 1.0.13(browserslist@4.22.1) + caniuse-lite: 1.0.30001571 + electron-to-chromium: 1.4.616 + node-releases: 2.0.14 + update-browserslist-db: 1.0.13(browserslist@4.22.2) dev: true /buffer-from@1.1.2: @@ -4770,7 +4802,7 @@ packages: engines: {node: '>=6.14.2'} requiresBuild: true dependencies: - node-gyp-build: 4.7.0 + node-gyp-build: 4.7.1 dev: false /bytes@3.0.0: @@ -4852,8 +4884,8 @@ packages: engines: {node: '>= 6'} dev: true - /caniuse-lite@1.0.30001564: - resolution: {integrity: sha512-DqAOf+rhof+6GVx1y+xzbFPeOumfQnhYzVnZD6LAXijR77yPtm9mfOcqOnT3mpnJiZVT+kwLAFnRlZcIz+c6bg==} + /caniuse-lite@1.0.30001571: + resolution: {integrity: sha512-tYq/6MoXhdezDLFZuCO/TKboTzuQ/xR5cFdgXPfDtM7/kchBO3b4VWghE/OAi/DV7tTdhmLjZiZBZi1fA/GheQ==} dev: true /chalk@2.4.2: @@ -4932,8 +4964,8 @@ packages: restore-cursor: 3.1.0 dev: true - /cli-spinners@2.9.1: - resolution: {integrity: sha512-jHgecW0pxkonBJdrKsqxgRX9AcG+u/5k0Q7WPDfi8AogLAdwxEkyYYNWwZ5GvVFoFx2uiY1eNcSK00fh+1+FyQ==} + /cli-spinners@2.9.2: + resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==} engines: {node: '>=6'} dev: true @@ -4971,6 +5003,11 @@ packages: engines: {node: '>=6'} dev: false + /clsx@2.0.0: + resolution: {integrity: sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==} + engines: {node: '>=6'} + dev: false + /color-convert@1.9.3: resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==} dependencies: @@ -5072,10 +5109,10 @@ packages: resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==} engines: {node: '>= 0.6'} - /core-js-compat@3.33.3: - resolution: {integrity: sha512-cNzGqFsh3Ot+529GIXacjTJ7kegdt5fPXxCBVS1G0iaZpuo/tBz399ymceLJveQhFFZ8qThHiP3fzuoQjKN2ow==} + /core-js-compat@3.34.0: + resolution: {integrity: sha512-4ZIyeNbW/Cn1wkMMDy+mvrRUxrwFNjKwbhCfQpDd+eLgYipDqp8oGFGtLmhh18EDPKA0g3VUBYOxQGGwvWLVpA==} dependencies: - browserslist: 4.22.1 + browserslist: 4.22.2 dev: true /core-util-is@1.0.3: @@ -5130,8 +5167,8 @@ packages: resolution: {integrity: sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==} dev: false - /csstype@3.1.2: - resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==} + /csstype@3.1.3: + resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} /d@1.0.1: resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==} @@ -5199,6 +5236,7 @@ packages: optional: true dependencies: ms: 2.1.2 + dev: true /decode-named-character-reference@1.0.2: resolution: {integrity: sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==} @@ -5349,12 +5387,16 @@ packages: stream-shift: 1.0.1 dev: true + /eastasianwidth@0.2.0: + resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} + dev: true + /ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} dev: true - /electron-to-chromium@1.4.592: - resolution: {integrity: sha512-D3NOkROIlF+d5ixnz7pAf3Lu/AuWpd6AYgI9O67GQXMXTcCP1gJQRotOq35eQy5Sb4hez33XH1YdTtILA7Udww==} + /electron-to-chromium@1.4.616: + resolution: {integrity: sha512-1n7zWYh8eS0L9Uy+GskE0lkBUNK83cXTVJI0pU3mGprFsbfSdAc15VTFbo+A+Bq4pwstmL30AVcEU3Fo463lNg==} dev: true /emoji-regex@8.0.0: @@ -5388,25 +5430,6 @@ packages: once: 1.4.0 dev: true - /engine.io-client@6.5.3: - resolution: {integrity: sha512-9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q==} - dependencies: - '@socket.io/component-emitter': 3.1.0 - debug: 4.3.4 - engine.io-parser: 5.2.1 - ws: 8.11.0 - xmlhttprequest-ssl: 2.0.0 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - dev: false - - /engine.io-parser@5.2.1: - resolution: {integrity: sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==} - engines: {node: '>=10.0.0'} - dev: false - /enhanced-resolve@5.15.0: resolution: {integrity: sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==} engines: {node: '>=10.13.0'} @@ -5451,7 +5474,7 @@ packages: is-weakref: 1.0.2 object-inspect: 1.13.1 object-keys: 1.1.1 - object.assign: 4.1.4 + object.assign: 4.1.5 regexp.prototype.flags: 1.5.1 safe-array-concat: 1.0.1 safe-regex-test: 1.0.0 @@ -5606,34 +5629,35 @@ packages: '@esbuild/win32-x64': 0.18.20 dev: true - /esbuild@0.19.7: - resolution: {integrity: sha512-6brbTZVqxhqgbpqBR5MzErImcpA0SQdoKOkcWK/U30HtQxnokIpG3TX2r0IJqbFUzqLjhU/zC1S5ndgakObVCQ==} + /esbuild@0.19.10: + resolution: {integrity: sha512-S1Y27QGt/snkNYrRcswgRFqZjaTG5a5xM3EQo97uNBnH505pdzSNe/HLBq1v0RO7iK/ngdbhJB6mDAp0OK+iUA==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - '@esbuild/android-arm': 0.19.7 - '@esbuild/android-arm64': 0.19.7 - '@esbuild/android-x64': 0.19.7 - '@esbuild/darwin-arm64': 0.19.7 - '@esbuild/darwin-x64': 0.19.7 - '@esbuild/freebsd-arm64': 0.19.7 - '@esbuild/freebsd-x64': 0.19.7 - '@esbuild/linux-arm': 0.19.7 - '@esbuild/linux-arm64': 0.19.7 - '@esbuild/linux-ia32': 0.19.7 - '@esbuild/linux-loong64': 0.19.7 - '@esbuild/linux-mips64el': 0.19.7 - '@esbuild/linux-ppc64': 0.19.7 - '@esbuild/linux-riscv64': 0.19.7 - '@esbuild/linux-s390x': 0.19.7 - '@esbuild/linux-x64': 0.19.7 - '@esbuild/netbsd-x64': 0.19.7 - '@esbuild/openbsd-x64': 0.19.7 - '@esbuild/sunos-x64': 0.19.7 - '@esbuild/win32-arm64': 0.19.7 - '@esbuild/win32-ia32': 0.19.7 - '@esbuild/win32-x64': 0.19.7 + '@esbuild/aix-ppc64': 0.19.10 + '@esbuild/android-arm': 0.19.10 + '@esbuild/android-arm64': 0.19.10 + '@esbuild/android-x64': 0.19.10 + '@esbuild/darwin-arm64': 0.19.10 + '@esbuild/darwin-x64': 0.19.10 + '@esbuild/freebsd-arm64': 0.19.10 + '@esbuild/freebsd-x64': 0.19.10 + '@esbuild/linux-arm': 0.19.10 + '@esbuild/linux-arm64': 0.19.10 + '@esbuild/linux-ia32': 0.19.10 + '@esbuild/linux-loong64': 0.19.10 + '@esbuild/linux-mips64el': 0.19.10 + '@esbuild/linux-ppc64': 0.19.10 + '@esbuild/linux-riscv64': 0.19.10 + '@esbuild/linux-s390x': 0.19.10 + '@esbuild/linux-x64': 0.19.10 + '@esbuild/netbsd-x64': 0.19.10 + '@esbuild/openbsd-x64': 0.19.10 + '@esbuild/sunos-x64': 0.19.10 + '@esbuild/win32-arm64': 0.19.10 + '@esbuild/win32-ia32': 0.19.10 + '@esbuild/win32-x64': 0.19.10 dev: true /escalade@3.1.1: @@ -5666,7 +5690,7 @@ packages: source-map: 0.6.1 dev: true - /eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.29.0)(eslint@8.54.0): + /eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.29.1)(eslint@8.56.0): resolution: {integrity: sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -5674,14 +5698,14 @@ packages: eslint-plugin-import: ^2.25.2 dependencies: confusing-browser-globals: 1.0.11 - eslint: 8.54.0 - eslint-plugin-import: 2.29.0(@typescript-eslint/parser@6.12.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0) - object.assign: 4.1.4 + eslint: 8.56.0 + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.15.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0) + object.assign: 4.1.5 object.entries: 1.1.7 semver: 6.3.1 dev: true - /eslint-config-airbnb@19.0.4(eslint-plugin-import@2.29.0)(eslint-plugin-jsx-a11y@6.8.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.33.2)(eslint@8.54.0): + /eslint-config-airbnb@19.0.4(eslint-plugin-import@2.29.1)(eslint-plugin-jsx-a11y@6.8.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.33.2)(eslint@8.56.0): resolution: {integrity: sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==} engines: {node: ^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -5691,23 +5715,23 @@ packages: eslint-plugin-react: ^7.28.0 eslint-plugin-react-hooks: ^4.3.0 dependencies: - eslint: 8.54.0 - eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.0)(eslint@8.54.0) - eslint-plugin-import: 2.29.0(@typescript-eslint/parser@6.12.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0) - eslint-plugin-jsx-a11y: 6.8.0(eslint@8.54.0) - eslint-plugin-react: 7.33.2(eslint@8.54.0) - eslint-plugin-react-hooks: 4.6.0(eslint@8.54.0) - object.assign: 4.1.4 + eslint: 8.56.0 + eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.1)(eslint@8.56.0) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.15.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0) + eslint-plugin-jsx-a11y: 6.8.0(eslint@8.56.0) + eslint-plugin-react: 7.33.2(eslint@8.56.0) + eslint-plugin-react-hooks: 4.6.0(eslint@8.56.0) + object.assign: 4.1.5 object.entries: 1.1.7 dev: true - /eslint-config-prettier@8.10.0(eslint@8.54.0): + /eslint-config-prettier@8.10.0(eslint@8.56.0): resolution: {integrity: sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==} hasBin: true peerDependencies: eslint: '>=7.0.0' dependencies: - eslint: 8.54.0 + eslint: 8.56.0 dev: true /eslint-import-resolver-jsconfig@1.1.0: @@ -5728,7 +5752,7 @@ packages: - supports-color dev: true - /eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.12.0)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.0)(eslint@8.54.0): + /eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.15.0)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.56.0): resolution: {integrity: sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -5737,9 +5761,9 @@ packages: dependencies: debug: 4.3.4 enhanced-resolve: 5.15.0 - eslint: 8.54.0 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.12.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0) - eslint-plugin-import: 2.29.0(@typescript-eslint/parser@6.12.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0) + eslint: 8.56.0 + eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.15.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.15.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0) fast-glob: 3.3.2 get-tsconfig: 4.7.2 is-core-module: 2.13.1 @@ -5751,7 +5775,7 @@ packages: - supports-color dev: true - /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.12.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0): + /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.15.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0): resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==} engines: {node: '>=4'} peerDependencies: @@ -5772,17 +5796,17 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 6.12.0(eslint@8.54.0)(typescript@5.3.2) + '@typescript-eslint/parser': 6.15.0(eslint@8.56.0)(typescript@5.3.3) debug: 3.2.7(supports-color@5.5.0) - eslint: 8.54.0 + eslint: 8.56.0 eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@6.12.0)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.0)(eslint@8.54.0) + eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@6.15.0)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.56.0) transitivePeerDependencies: - supports-color dev: true - /eslint-plugin-import@2.29.0(@typescript-eslint/parser@6.12.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0): - resolution: {integrity: sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==} + /eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.15.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0): + resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==} engines: {node: '>=4'} peerDependencies: '@typescript-eslint/parser': '*' @@ -5791,16 +5815,16 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 6.12.0(eslint@8.54.0)(typescript@5.3.2) + '@typescript-eslint/parser': 6.15.0(eslint@8.56.0)(typescript@5.3.3) array-includes: 3.1.7 array.prototype.findlastindex: 1.2.3 array.prototype.flat: 1.3.2 array.prototype.flatmap: 1.3.2 debug: 3.2.7(supports-color@5.5.0) doctrine: 2.1.0 - eslint: 8.54.0 + eslint: 8.56.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.12.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.54.0) + eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.15.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0) hasown: 2.0.0 is-core-module: 2.13.1 is-glob: 4.0.3 @@ -5809,20 +5833,20 @@ packages: object.groupby: 1.0.1 object.values: 1.1.7 semver: 6.3.1 - tsconfig-paths: 3.14.2 + tsconfig-paths: 3.15.0 transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack - supports-color dev: true - /eslint-plugin-jsx-a11y@6.8.0(eslint@8.54.0): + /eslint-plugin-jsx-a11y@6.8.0(eslint@8.56.0): resolution: {integrity: sha512-Hdh937BS3KdwwbBaKd5+PLCOmYY6U4f2h9Z2ktwtNKvIdIEu137rjYbcb9ApSbVJfWxANNuiKTD/9tOKjK9qOA==} engines: {node: '>=4.0'} peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 aria-query: 5.3.0 array-includes: 3.1.7 array.prototype.flatmap: 1.3.2 @@ -5832,7 +5856,7 @@ packages: damerau-levenshtein: 1.0.8 emoji-regex: 9.2.2 es-iterator-helpers: 1.0.15 - eslint: 8.54.0 + eslint: 8.56.0 hasown: 2.0.0 jsx-ast-utils: 3.3.5 language-tags: 1.0.9 @@ -5841,15 +5865,15 @@ packages: object.fromentries: 2.0.7 dev: true - /eslint-plugin-prefer-arrow-functions@3.2.4(eslint@8.54.0): + /eslint-plugin-prefer-arrow-functions@3.2.4(eslint@8.56.0): resolution: {integrity: sha512-HbPmlbO/iYQeVs2fuShNkGVJDfVfgSd84Vzxv+xlh+nIVoSsZvTj6yOqszw4mtG9JbiqMShVWqbVeoVsejE59w==} peerDependencies: eslint: '>=5.0.0' dependencies: - eslint: 8.54.0 + eslint: 8.56.0 dev: true - /eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.10.0)(eslint@8.54.0)(prettier@2.8.8): + /eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.10.0)(eslint@8.56.0)(prettier@2.8.8): resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} engines: {node: '>=12.0.0'} peerDependencies: @@ -5860,22 +5884,22 @@ packages: eslint-config-prettier: optional: true dependencies: - eslint: 8.54.0 - eslint-config-prettier: 8.10.0(eslint@8.54.0) + eslint: 8.56.0 + eslint-config-prettier: 8.10.0(eslint@8.56.0) prettier: 2.8.8 prettier-linter-helpers: 1.0.0 dev: true - /eslint-plugin-react-hooks@4.6.0(eslint@8.54.0): + /eslint-plugin-react-hooks@4.6.0(eslint@8.56.0): resolution: {integrity: sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==} engines: {node: '>=10'} peerDependencies: eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 dependencies: - eslint: 8.54.0 + eslint: 8.56.0 dev: true - /eslint-plugin-react@7.33.2(eslint@8.54.0): + /eslint-plugin-react@7.33.2(eslint@8.56.0): resolution: {integrity: sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==} engines: {node: '>=4'} peerDependencies: @@ -5886,7 +5910,7 @@ packages: array.prototype.tosorted: 1.1.2 doctrine: 2.1.0 es-iterator-helpers: 1.0.15 - eslint: 8.54.0 + eslint: 8.56.0 estraverse: 5.3.0 jsx-ast-utils: 3.3.5 minimatch: 3.1.2 @@ -5913,15 +5937,15 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /eslint@8.54.0: - resolution: {integrity: sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==} + /eslint@8.56.0: + resolution: {integrity: sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.54.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) '@eslint-community/regexpp': 4.10.0 - '@eslint/eslintrc': 2.1.3 - '@eslint/js': 8.54.0 + '@eslint/eslintrc': 2.1.4 + '@eslint/js': 8.56.0 '@humanwhocodes/config-array': 0.11.13 '@humanwhocodes/module-importer': 1.0.1 '@nodelib/fs.walk': 1.2.8 @@ -5941,7 +5965,7 @@ packages: file-entry-cache: 6.0.1 find-up: 5.0.0 glob-parent: 6.0.2 - globals: 13.23.0 + globals: 13.24.0 graphemer: 1.4.0 ignore: 5.3.0 imurmurhash: 0.1.4 @@ -6054,7 +6078,7 @@ packages: resolution: {integrity: sha512-EzV94NYKoO09GLXGjXj9JIlXijVck4ONSr5wiCWDvhsvj5jxSrzTmRU/9C1DyB6uToszLs8aifA6NQ7lEQdvFw==} engines: {node: '>= 0.8'} dependencies: - '@types/node': 20.9.4 + '@types/node': 20.10.5 require-like: 0.1.2 dev: true @@ -6192,8 +6216,8 @@ packages: engines: {node: '>=6'} dev: false - /fastq@1.15.0: - resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==} + /fastq@1.16.0: + resolution: {integrity: sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==} dependencies: reusify: 1.0.4 dev: true @@ -6285,6 +6309,14 @@ packages: dependencies: is-callable: 1.2.7 + /foreground-child@3.1.1: + resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==} + engines: {node: '>=14'} + dependencies: + cross-spawn: 7.0.3 + signal-exit: 4.1.0 + dev: true + /form-data@4.0.0: resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==} engines: {node: '>= 6'} @@ -6312,8 +6344,8 @@ packages: resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==} dev: true - /framer-motion@10.16.5(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-GEzVjOYP2MIpV9bT/GbhcsBNoImG3/2X3O/xVNWmktkv9MdJ7P/44zELm/7Fjb+O3v39SmKFnoDQB32giThzpg==} + /framer-motion@10.16.16(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-je6j91rd7NmUX7L1XHouwJ4v3R+SO4umso2LUcgOct3rHZ0PajZ80ETYZTajzEXEl9DlKyzjyt4AvGQ+lrebOw==} peerDependencies: react: ^18.0.0 react-dom: ^18.0.0 @@ -6462,7 +6494,7 @@ packages: resolution: {integrity: sha512-5KLucCJobh8vBY1K07EFV4+cPZH3mrV9YeAruUseCQKHB58SGjjT2l9/eA9LD082IiuMjSlFJEcdJ27TXvbZNw==} engines: {node: '>= 14'} dependencies: - basic-ftp: 5.0.3 + basic-ftp: 5.0.4 data-uri-to-buffer: 6.0.1 debug: 4.3.4 fs-extra: 8.1.0 @@ -6488,15 +6520,16 @@ packages: is-glob: 4.0.3 dev: true - /glob@7.1.6: - resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==} + /glob@10.3.10: + resolution: {integrity: sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==} + engines: {node: '>=16 || 14 >=14.17'} + hasBin: true dependencies: - fs.realpath: 1.0.0 - inflight: 1.0.6 - inherits: 2.0.4 - minimatch: 3.1.2 - once: 1.4.0 - path-is-absolute: 1.0.1 + foreground-child: 3.1.1 + jackspeak: 2.3.6 + minimatch: 9.0.3 + minipass: 7.0.4 + path-scurry: 1.10.1 dev: true /glob@7.2.3: @@ -6515,8 +6548,8 @@ packages: engines: {node: '>=4'} dev: true - /globals@13.23.0: - resolution: {integrity: sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==} + /globals@13.24.0: + resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==} engines: {node: '>=8'} dependencies: type-fest: 0.20.2 @@ -6742,13 +6775,13 @@ packages: safer-buffer: 2.1.2 dev: true - /icss-utils@5.1.0(postcss@8.4.31): + /icss-utils@5.1.0(postcss@8.4.32): resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 dependencies: - postcss: 8.4.31 + postcss: 8.4.32 dev: true /ieee754@1.2.1: @@ -7133,6 +7166,15 @@ packages: set-function-name: 2.0.1 dev: true + /jackspeak@2.3.6: + resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==} + engines: {node: '>=14'} + dependencies: + '@isaacs/cliui': 8.0.2 + optionalDependencies: + '@pkgjs/parseargs': 0.11.0 + dev: true + /javascript-stringify@2.1.0: resolution: {integrity: sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==} dev: true @@ -7255,7 +7297,7 @@ packages: dependencies: array-includes: 3.1.7 array.prototype.flat: 1.3.2 - object.assign: 4.1.4 + object.assign: 4.1.5 object.values: 1.1.7 dev: true @@ -7367,6 +7409,11 @@ packages: engines: {node: '>=8'} dev: true + /lru-cache@10.1.0: + resolution: {integrity: sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==} + engines: {node: 14 || >=16.14} + dev: true + /lru-cache@5.1.1: resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} dependencies: @@ -7523,7 +7570,7 @@ packages: /media-query-parser@2.0.2: resolution: {integrity: sha512-1N4qp+jE0pL5Xv4uEcwVUhIkwdUO3S/9gML90nqKA7v7FcOS5vUtatfzok9S9U1EJU8dHWlcv95WLnKmmxZI9w==} dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 dev: true /media-typer@0.3.0: @@ -7913,6 +7960,11 @@ packages: engines: {node: '>=8'} dev: true + /minipass@7.0.4: + resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==} + engines: {node: '>=16 || 14 >=14.17'} + dev: true + /minizlib@2.1.2: resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} engines: {node: '>= 8'} @@ -7971,6 +8023,7 @@ packages: /ms@2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} + dev: true /ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} @@ -8030,13 +8083,13 @@ packages: whatwg-url: 5.0.0 dev: true - /node-gyp-build@4.7.0: - resolution: {integrity: sha512-PbZERfeFdrHQOOXiAKOY0VPbykZy90ndPKk0d+CFDegTKmWp1VgOTz2xACVbr1BjCWxrQp68CXtvNsveFhqDJg==} + /node-gyp-build@4.7.1: + resolution: {integrity: sha512-wTSrZ+8lsRRa3I3H8Xr65dLWSgCvY2l4AOnaeKdPA9TB/WYMPaTcrzf3rXvFoVvjKNVnu0CcWSx54qq9GKRUYg==} hasBin: true dev: false - /node-releases@2.0.13: - resolution: {integrity: sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==} + /node-releases@2.0.14: + resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==} dev: true /nodemon@2.0.22: @@ -8103,8 +8156,8 @@ packages: engines: {node: '>= 0.4'} dev: true - /object.assign@4.1.4: - resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==} + /object.assign@4.1.5: + resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.5 @@ -8218,7 +8271,7 @@ packages: bl: 4.1.0 chalk: 4.1.2 cli-cursor: 3.1.0 - cli-spinners: 2.9.1 + cli-spinners: 2.9.2 is-interactive: 1.0.0 is-unicode-supported: 0.1.0 log-symbols: 4.1.0 @@ -8313,7 +8366,7 @@ packages: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} engines: {node: '>=8'} dependencies: - '@babel/code-frame': 7.23.4 + '@babel/code-frame': 7.23.5 error-ex: 1.3.2 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 @@ -8351,6 +8404,14 @@ packages: /path-parse@1.0.7: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} + /path-scurry@1.10.1: + resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + lru-cache: 10.1.0 + minipass: 7.0.4 + dev: true + /path-to-regexp@0.1.7: resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==} dev: true @@ -8402,7 +8463,7 @@ packages: /pino-abstract-transport@1.1.0: resolution: {integrity: sha512-lsleG3/2a/JIWUtf9Q5gUNErBqwIu1tUKTT3dUzaf5DySw9ra1wcqKjJjLX1VTY64Wk1eEOYsVGSaGfCK85ekA==} dependencies: - readable-stream: 4.4.2 + readable-stream: 4.5.1 split2: 4.2.0 dev: false @@ -8410,8 +8471,8 @@ packages: resolution: {integrity: sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA==} dev: false - /pino@8.16.2: - resolution: {integrity: sha512-2advCDGVEvkKu9TTVSa/kWW7Z3htI/sBKEZpqiHk6ive0i/7f5b1rsU8jn0aimxqfnSz5bj/nOYkwhBUn5xxvg==} + /pino@8.17.1: + resolution: {integrity: sha512-YoN7/NJgnsJ+fkADZqjhRt96iepWBndQHeClmSBH0sQWCb8zGD74t00SK4eOtKFi/f8TUmQnfmgglEhd2kI1RQ==} hasBin: true dependencies: atomic-sleep: 1.0.0 @@ -8419,7 +8480,7 @@ packages: on-exit-leak-free: 2.1.2 pino-abstract-transport: 1.1.0 pino-std-serializers: 6.2.2 - process-warning: 2.3.1 + process-warning: 2.3.2 quick-format-unescaped: 4.0.4 real-require: 0.2.0 safe-stable-stringify: 2.4.3 @@ -8440,38 +8501,38 @@ packages: pathe: 1.1.1 dev: true - /postcss-discard-duplicates@5.1.0(postcss@8.4.31): + /postcss-discard-duplicates@5.1.0(postcss@8.4.32): resolution: {integrity: sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==} engines: {node: ^10 || ^12 || >=14.0} peerDependencies: postcss: ^8.2.15 dependencies: - postcss: 8.4.31 + postcss: 8.4.32 dev: true - /postcss-import@15.1.0(postcss@8.4.31): + /postcss-import@15.1.0(postcss@8.4.32): resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==} engines: {node: '>=14.0.0'} peerDependencies: postcss: ^8.0.0 dependencies: - postcss: 8.4.31 + postcss: 8.4.32 postcss-value-parser: 4.2.0 read-cache: 1.0.0 resolve: 1.22.8 dev: true - /postcss-js@4.0.1(postcss@8.4.31): + /postcss-js@4.0.1(postcss@8.4.32): resolution: {integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==} engines: {node: ^12 || ^14 || >= 16} peerDependencies: postcss: ^8.4.21 dependencies: camelcase-css: 2.0.1 - postcss: 8.4.31 + postcss: 8.4.32 dev: true - /postcss-load-config@4.0.2(postcss@8.4.31): + /postcss-load-config@4.0.2(postcss@8.4.32): resolution: {integrity: sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==} engines: {node: '>= 14'} peerDependencies: @@ -8484,74 +8545,74 @@ packages: optional: true dependencies: lilconfig: 3.0.0 - postcss: 8.4.31 + postcss: 8.4.32 yaml: 2.3.4 dev: true - /postcss-modules-extract-imports@3.0.0(postcss@8.4.31): + /postcss-modules-extract-imports@3.0.0(postcss@8.4.32): resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 dependencies: - postcss: 8.4.31 + postcss: 8.4.32 dev: true - /postcss-modules-local-by-default@4.0.3(postcss@8.4.31): + /postcss-modules-local-by-default@4.0.3(postcss@8.4.32): resolution: {integrity: sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 dependencies: - icss-utils: 5.1.0(postcss@8.4.31) - postcss: 8.4.31 + icss-utils: 5.1.0(postcss@8.4.32) + postcss: 8.4.32 postcss-selector-parser: 6.0.13 postcss-value-parser: 4.2.0 dev: true - /postcss-modules-scope@3.0.0(postcss@8.4.31): - resolution: {integrity: sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==} + /postcss-modules-scope@3.1.0(postcss@8.4.32): + resolution: {integrity: sha512-SaIbK8XW+MZbd0xHPf7kdfA/3eOt7vxJ72IRecn3EzuZVLr1r0orzf0MX/pN8m+NMDoo6X/SQd8oeKqGZd8PXg==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 dependencies: - postcss: 8.4.31 + postcss: 8.4.32 postcss-selector-parser: 6.0.13 dev: true - /postcss-modules-values@4.0.0(postcss@8.4.31): + /postcss-modules-values@4.0.0(postcss@8.4.32): resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 dependencies: - icss-utils: 5.1.0(postcss@8.4.31) - postcss: 8.4.31 + icss-utils: 5.1.0(postcss@8.4.32) + postcss: 8.4.32 dev: true - /postcss-modules@6.0.0(postcss@8.4.31): + /postcss-modules@6.0.0(postcss@8.4.32): resolution: {integrity: sha512-7DGfnlyi/ju82BRzTIjWS5C4Tafmzl3R79YP/PASiocj+aa6yYphHhhKUOEoXQToId5rgyFgJ88+ccOUydjBXQ==} peerDependencies: postcss: ^8.0.0 dependencies: generic-names: 4.0.0 - icss-utils: 5.1.0(postcss@8.4.31) + icss-utils: 5.1.0(postcss@8.4.32) lodash.camelcase: 4.3.0 - postcss: 8.4.31 - postcss-modules-extract-imports: 3.0.0(postcss@8.4.31) - postcss-modules-local-by-default: 4.0.3(postcss@8.4.31) - postcss-modules-scope: 3.0.0(postcss@8.4.31) - postcss-modules-values: 4.0.0(postcss@8.4.31) + postcss: 8.4.32 + postcss-modules-extract-imports: 3.0.0(postcss@8.4.32) + postcss-modules-local-by-default: 4.0.3(postcss@8.4.32) + postcss-modules-scope: 3.1.0(postcss@8.4.32) + postcss-modules-values: 4.0.0(postcss@8.4.32) string-hash: 1.1.3 dev: true - /postcss-nested@6.0.1(postcss@8.4.31): + /postcss-nested@6.0.1(postcss@8.4.32): resolution: {integrity: sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==} engines: {node: '>=12.0'} peerDependencies: postcss: ^8.2.14 dependencies: - postcss: 8.4.31 + postcss: 8.4.32 postcss-selector-parser: 6.0.13 dev: true @@ -8567,8 +8628,8 @@ packages: resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} dev: true - /postcss@8.4.31: - resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==} + /postcss@8.4.32: + resolution: {integrity: sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==} engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.7 @@ -8605,8 +8666,8 @@ packages: resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} dev: true - /process-warning@2.3.1: - resolution: {integrity: sha512-JjBvFEn7MwFbzUDa2SRtKJSsyO0LlER4V/FmwLMhBlXNbGgGxdyFCxIdMDLerWUycsVUyaoM9QFLvppFy4IWaQ==} + /process-warning@2.3.2: + resolution: {integrity: sha512-n9wh8tvBe5sFmsqlg+XQhaQLumwpqoAUruLwjCopgTmUBjJ/fjtBsJzKleCaIGBOMXYEhp1YfKl4d7rJ5ZKJGA==} dev: false /process@0.11.10: @@ -8745,7 +8806,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 classnames: 2.3.2 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -8753,14 +8814,14 @@ packages: resize-observer-polyfill: 1.5.1 dev: false - /rc-slider@10.4.0(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-ZlpWjFhOlEf0w4Ng31avFBkXNNBj60NAcTPaIoiCxBkJ29wOtHSPMqv9PZeEoqmx64bpJkgK7kPa47HG4LPzww==} + /rc-slider@10.5.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-xiYght50cvoODZYI43v3Ylsqiw14+D7ELsgzR40boDZaya1HFa1Etnv9MDkQE8X/UrXAffwv2AcNAhslgYuDTw==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 classnames: 2.3.2 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -8773,7 +8834,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) react-is: 18.2.0 @@ -8786,7 +8847,7 @@ packages: react: '*' react-dom: '*' dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 classnames: 2.3.2 rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) @@ -8832,7 +8893,7 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: false - /react-highlightjs-logs@1.1.0(anser@2.1.1)(axios@1.6.2)(classnames@2.3.2)(fuse.js@6.6.2)(highlight.js@11.9.0)(react-dom@18.2.0)(react-viewport-list@7.1.1)(react@18.2.0)(websocket@1.0.34): + /react-highlightjs-logs@1.1.0(anser@2.1.1)(axios@1.6.2)(classnames@2.3.2)(fuse.js@6.6.2)(highlight.js@11.9.0)(react-dom@18.2.0)(react-viewport-list@7.1.2)(react@18.2.0)(websocket@1.0.34): resolution: {integrity: sha512-3Oe2FHeOPiSTJlIwKo37XKJA7nQa0xwu9WGRrKC8+N2MABlJA4KOhJXN+VHq/ru+CI4Pud1X9bJJ3CBFMSNRAw==} peerDependencies: anser: ^2.1.1 @@ -8853,13 +8914,13 @@ packages: react: 18.2.0 react-dom: 18.2.0(react@18.2.0) react-icons: 4.12.0(react@18.2.0) - react-viewport-list: 7.1.1(react@18.2.0) + react-viewport-list: 7.1.2(react@18.2.0) websocket: 1.0.34 dev: false - /react-hook-form@7.48.2(react@18.2.0): - resolution: {integrity: sha512-H0T2InFQb1hX7qKtDIZmvpU1Xfn/bdahWBN1fH19gSe4bBEqTfmlr7H3XWTaVtiK4/tpPaI1F3355GPMZYge+A==} - engines: {node: '>=12.22.0'} + /react-hook-form@7.49.2(react@18.2.0): + resolution: {integrity: sha512-TZcnSc17+LPPVpMRIDNVITY6w20deMdNi6iehTFLV1x8SqThXGwu93HjlUVU09pzFgZH7qZOvLMM7UYf2ShAHA==} + engines: {node: '>=18', pnpm: '8'} peerDependencies: react: ^16.8.0 || ^17 || ^18 dependencies: @@ -8919,7 +8980,7 @@ packages: engines: {node: '>=0.10.0'} dev: true - /react-remove-scroll-bar@2.3.4(@types/react@18.2.38)(react@18.2.0): + /react-remove-scroll-bar@2.3.4(@types/react@18.2.45)(react@18.2.0): resolution: {integrity: sha512-63C4YQBUt0m6ALadE9XV56hV8BgJWDmmTPY758iIJjfQKt2nYwoUrPk0LXRXcB/yIj82T1/Ixfdpdk68LwIB0A==} engines: {node: '>=10'} peerDependencies: @@ -8929,13 +8990,13 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 18.2.38 + '@types/react': 18.2.45 react: 18.2.0 - react-style-singleton: 2.2.1(@types/react@18.2.38)(react@18.2.0) + react-style-singleton: 2.2.1(@types/react@18.2.45)(react@18.2.0) tslib: 2.6.2 dev: false - /react-remove-scroll@2.5.5(@types/react@18.2.38)(react@18.2.0): + /react-remove-scroll@2.5.5(@types/react@18.2.45)(react@18.2.0): resolution: {integrity: sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==} engines: {node: '>=10'} peerDependencies: @@ -8945,16 +9006,16 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 18.2.38 + '@types/react': 18.2.45 react: 18.2.0 - react-remove-scroll-bar: 2.3.4(@types/react@18.2.38)(react@18.2.0) - react-style-singleton: 2.2.1(@types/react@18.2.38)(react@18.2.0) + react-remove-scroll-bar: 2.3.4(@types/react@18.2.45)(react@18.2.0) + react-style-singleton: 2.2.1(@types/react@18.2.45)(react@18.2.0) tslib: 2.6.2 - use-callback-ref: 1.3.0(@types/react@18.2.38)(react@18.2.0) - use-sidecar: 1.1.2(@types/react@18.2.38)(react@18.2.0) + use-callback-ref: 1.3.0(@types/react@18.2.45)(react@18.2.0) + use-sidecar: 1.1.2(@types/react@18.2.45)(react@18.2.0) dev: false - /react-remove-scroll@2.5.7(@types/react@18.2.38)(react@18.2.0): + /react-remove-scroll@2.5.7(@types/react@18.2.45)(react@18.2.0): resolution: {integrity: sha512-FnrTWO4L7/Bhhf3CYBNArEG/yROV0tKmTv7/3h9QCFvH6sndeFf1wPqOcbFVu5VAulS5dV1wGT3GZZ/1GawqiA==} engines: {node: '>=10'} peerDependencies: @@ -8964,13 +9025,13 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 18.2.38 + '@types/react': 18.2.45 react: 18.2.0 - react-remove-scroll-bar: 2.3.4(@types/react@18.2.38)(react@18.2.0) - react-style-singleton: 2.2.1(@types/react@18.2.38)(react@18.2.0) + react-remove-scroll-bar: 2.3.4(@types/react@18.2.45)(react@18.2.0) + react-style-singleton: 2.2.1(@types/react@18.2.45)(react@18.2.0) tslib: 2.6.2 - use-callback-ref: 1.3.0(@types/react@18.2.38)(react@18.2.0) - use-sidecar: 1.1.2(@types/react@18.2.38)(react@18.2.0) + use-callback-ref: 1.3.0(@types/react@18.2.45)(react@18.2.0) + use-sidecar: 1.1.2(@types/react@18.2.45)(react@18.2.0) dev: false /react-router-dom@6.14.2(react-dom@18.2.0)(react@18.2.0): @@ -8986,17 +9047,17 @@ packages: react-router: 6.14.2(react@18.2.0) dev: false - /react-router-dom@6.20.0(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-CbcKjEyiSVpA6UtCHOIYLUYn/UJfwzp55va4yEfpk7JBN3GPqWfHrdLkAvNCcpXr8QoihcDMuk0dzWZxtlB/mQ==} + /react-router-dom@6.21.1(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-QCNrtjtDPwHDO+AO21MJd7yIcr41UetYt5jzaB9Y1UYaPTCnVuJq6S748g1dE11OQlCFIQg+RtAA1SEZIyiBeA==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' react-dom: '>=16.8' dependencies: - '@remix-run/router': 1.13.0 + '@remix-run/router': 1.14.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-router: 6.20.0(react@18.2.0) + react-router: 6.21.1(react@18.2.0) dev: false /react-router@6.14.2(react@18.2.0): @@ -9009,17 +9070,17 @@ packages: react: 18.2.0 dev: false - /react-router@6.20.0(react@18.2.0): - resolution: {integrity: sha512-pVvzsSsgUxxtuNfTHC4IxjATs10UaAtvLGVSA1tbUE4GDaOSU1Esu2xF5nWLz7KPiMuW8BJWuPFdlGYJ7/rW0w==} + /react-router@6.21.1(react@18.2.0): + resolution: {integrity: sha512-W0l13YlMTm1YrpVIOpjCADJqEUpz1vm+CMo47RuFX4Ftegwm6KOYsL5G3eiE52jnJpKvzm6uB/vTKTPKM8dmkA==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' dependencies: - '@remix-run/router': 1.13.0 + '@remix-run/router': 1.14.1 react: 18.2.0 dev: false - /react-style-singleton@2.2.1(@types/react@18.2.38)(react@18.2.0): + /react-style-singleton@2.2.1(@types/react@18.2.45)(react@18.2.0): resolution: {integrity: sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==} engines: {node: '>=10'} peerDependencies: @@ -9029,7 +9090,7 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 18.2.38 + '@types/react': 18.2.45 get-nonce: 1.0.1 invariant: 2.2.4 react: 18.2.0 @@ -9047,8 +9108,8 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: false - /react-viewport-list@7.1.1(react@18.2.0): - resolution: {integrity: sha512-O3gxykg3DgpcyYH+/X2kFwWFaZjckJ0FK3UBb4vFhZe+CsGLcX8OVJb0VSYI+IupEuQ9pl8dvJak8JRkIuvNjw==} + /react-viewport-list@7.1.2(react@18.2.0): + resolution: {integrity: sha512-CfmkYyoFufSdJ95nTgENAHtWOn1XwxcUZPBSueOPzOvz59A31qHgYpADYuiSUfZ5ypR3MfyWMUgRAOMsNDDl8Q==} peerDependencies: react: '>=17.0.0' dependencies: @@ -9089,8 +9150,8 @@ packages: util-deprecate: 1.0.2 dev: true - /readable-stream@4.4.2: - resolution: {integrity: sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==} + /readable-stream@4.5.1: + resolution: {integrity: sha512-uQjbf34vmf/asGnOHQEw07Q4llgMACQZTWWa4MmICS0IKJoHbLwKCy71H3eR99Dw5iYejc6W+pqZZEeqRtUFAw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: abort-controller: 3.0.0 @@ -9145,13 +9206,13 @@ packages: resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==} dev: true - /regenerator-runtime@0.14.0: - resolution: {integrity: sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==} + /regenerator-runtime@0.14.1: + resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==} /regenerator-transform@0.15.2: resolution: {integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==} dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.6 dev: true /regexp.prototype.flags@1.5.1: @@ -9478,6 +9539,11 @@ packages: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} dev: true + /signal-exit@4.1.0: + resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} + engines: {node: '>=14'} + dev: true + /simple-update-notifier@1.1.0: resolution: {integrity: sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==} engines: {node: '>=8.10.0'} @@ -9495,30 +9561,6 @@ packages: engines: {node: '>= 6.0.0', npm: '>= 3.0.0'} dev: true - /socket.io-client@4.7.2: - resolution: {integrity: sha512-vtA0uD4ibrYD793SOIAwlo8cj6haOeMHrGvwPxJsxH7CeIksqJ+3Zc06RvWTIFgiSqx4A3sOnTXpfAEE2Zyz6w==} - engines: {node: '>=10.0.0'} - dependencies: - '@socket.io/component-emitter': 3.1.0 - debug: 4.3.4 - engine.io-client: 6.5.3 - socket.io-parser: 4.2.4 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - dev: false - - /socket.io-parser@4.2.4: - resolution: {integrity: sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==} - engines: {node: '>=10.0.0'} - dependencies: - '@socket.io/component-emitter': 3.1.0 - debug: 4.3.4 - transitivePeerDependencies: - - supports-color - dev: false - /socks-proxy-agent@8.0.2: resolution: {integrity: sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==} engines: {node: '>= 14'} @@ -9629,6 +9671,15 @@ packages: strip-ansi: 6.0.1 dev: true + /string-width@5.1.2: + resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==} + engines: {node: '>=12'} + dependencies: + eastasianwidth: 0.2.0 + emoji-regex: 9.2.2 + strip-ansi: 7.1.0 + dev: true + /string.prototype.matchall@4.0.10: resolution: {integrity: sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==} dependencies: @@ -9693,6 +9744,13 @@ packages: ansi-regex: 5.0.1 dev: true + /strip-ansi@7.1.0: + resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} + engines: {node: '>=12'} + dependencies: + ansi-regex: 6.0.1 + dev: true + /strip-bom@3.0.0: resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==} engines: {node: '>=4'} @@ -9714,14 +9772,14 @@ packages: inline-style-parser: 0.1.1 dev: true - /sucrase@3.34.0: - resolution: {integrity: sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==} - engines: {node: '>=8'} + /sucrase@3.35.0: + resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==} + engines: {node: '>=16 || 14 >=14.17'} hasBin: true dependencies: '@jridgewell/gen-mapping': 0.3.3 commander: 4.1.1 - glob: 7.1.6 + glob: 10.3.10 lines-and-columns: 1.2.4 mz: 2.7.0 pirates: 4.0.6 @@ -9755,8 +9813,8 @@ packages: use-sync-external-store: 1.2.0(react@18.2.0) dev: false - /tailwindcss@3.3.5: - resolution: {integrity: sha512-5SEZU4J7pxZgSkv7FP1zY8i2TIAOooNZ1e/OGtxIEv6GltpoiXUqWvLy89+a10qYTB1N5Ifkuw9lqQkN9sscvA==} + /tailwindcss@3.4.0: + resolution: {integrity: sha512-VigzymniH77knD1dryXbyxR+ePHihHociZbXnLZHUyzf2MMs2ZVqlUrZ3FvpXP8pno9JzmILt1sZPD19M3IxtA==} engines: {node: '>=14.0.0'} hasBin: true dependencies: @@ -9774,14 +9832,14 @@ packages: normalize-path: 3.0.0 object-hash: 3.0.0 picocolors: 1.0.0 - postcss: 8.4.31 - postcss-import: 15.1.0(postcss@8.4.31) - postcss-js: 4.0.1(postcss@8.4.31) - postcss-load-config: 4.0.2(postcss@8.4.31) - postcss-nested: 6.0.1(postcss@8.4.31) + postcss: 8.4.32 + postcss-import: 15.1.0(postcss@8.4.32) + postcss-js: 4.0.1(postcss@8.4.32) + postcss-load-config: 4.0.2(postcss@8.4.32) + postcss-nested: 6.0.1(postcss@8.4.32) postcss-selector-parser: 6.0.13 resolve: 1.22.8 - sucrase: 3.34.0 + sucrase: 3.35.0 transitivePeerDependencies: - ts-node dev: true @@ -9907,21 +9965,21 @@ packages: resolution: {integrity: sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==} dev: true - /ts-api-utils@1.0.3(typescript@5.3.2): + /ts-api-utils@1.0.3(typescript@5.3.3): resolution: {integrity: sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==} engines: {node: '>=16.13.0'} peerDependencies: typescript: '>=4.2.0' dependencies: - typescript: 5.3.2 + typescript: 5.3.3 dev: true /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} dev: true - /ts-node@10.9.1(@types/node@16.18.64)(typescript@5.1.6): - resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} + /ts-node@10.9.2(@types/node@16.18.68)(typescript@5.1.6): + resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true peerDependencies: '@swc/core': '>=1.2.50' @@ -9939,9 +9997,9 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 16.18.64 + '@types/node': 16.18.68 acorn: 8.11.2 - acorn-walk: 8.3.0 + acorn-walk: 8.3.1 arg: 4.1.3 create-require: 1.1.1 diff: 4.0.2 @@ -9951,8 +10009,8 @@ packages: yn: 3.1.1 dev: true - /tsconfig-paths@3.14.2: - resolution: {integrity: sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==} + /tsconfig-paths@3.15.0: + resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==} dependencies: '@types/json5': 0.0.29 json5: 1.0.2 @@ -10059,11 +10117,11 @@ packages: hasBin: true dependencies: '@types/json-schema': 7.0.15 - '@types/node': 16.18.64 + '@types/node': 16.18.68 glob: 7.2.3 path-equal: 1.2.5 safe-stable-stringify: 2.4.3 - ts-node: 10.9.1(@types/node@16.18.64)(typescript@5.1.6) + ts-node: 10.9.2(@types/node@16.18.68)(typescript@5.1.6) typescript: 5.1.6 yargs: 17.7.2 transitivePeerDependencies: @@ -10077,8 +10135,8 @@ packages: hasBin: true dev: true - /typescript@5.3.2: - resolution: {integrity: sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==} + /typescript@5.3.3: + resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==} engines: {node: '>=14.17'} hasBin: true dev: true @@ -10222,13 +10280,13 @@ packages: engines: {node: '>= 0.8'} dev: true - /update-browserslist-db@1.0.13(browserslist@4.22.1): + /update-browserslist-db@1.0.13(browserslist@4.22.2): resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' dependencies: - browserslist: 4.22.1 + browserslist: 4.22.2 escalade: 3.1.1 picocolors: 1.0.0 dev: true @@ -10239,7 +10297,7 @@ packages: punycode: 2.3.1 dev: true - /use-callback-ref@1.3.0(@types/react@18.2.38)(react@18.2.0): + /use-callback-ref@1.3.0(@types/react@18.2.45)(react@18.2.0): resolution: {integrity: sha512-3FT9PRuRdbB9HfXhEq35u4oZkvpJ5kuYbpqhCfmiZyReuRgpnhDlbr2ZEnnuS0RrJAPn6l23xjFg9kpDM+Ms7w==} engines: {node: '>=10'} peerDependencies: @@ -10249,7 +10307,7 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 18.2.38 + '@types/react': 18.2.45 react: 18.2.0 tslib: 2.6.2 dev: false @@ -10264,7 +10322,7 @@ packages: react: 18.2.0 dev: false - /use-sidecar@1.1.2(@types/react@18.2.38)(react@18.2.0): + /use-sidecar@1.1.2(@types/react@18.2.45)(react@18.2.0): resolution: {integrity: sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==} engines: {node: '>=10'} peerDependencies: @@ -10274,7 +10332,7 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 18.2.38 + '@types/react': 18.2.45 detect-node-es: 1.1.0 react: 18.2.0 tslib: 2.6.2 @@ -10293,7 +10351,7 @@ packages: engines: {node: '>=6.14.2'} requiresBuild: true dependencies: - node-gyp-build: 4.7.0 + node-gyp-build: 4.7.1 dev: false /util-deprecate@1.0.2: @@ -10355,7 +10413,7 @@ packages: vfile-message: 3.1.4 dev: true - /vite-node@0.28.5(@types/node@16.18.64): + /vite-node@0.28.5(@types/node@16.18.68): resolution: {integrity: sha512-LmXb9saMGlrMZbXTvOveJKwMTBTNUH66c8rJnQ0ZPNX+myPEol64+szRzXtV5ORb0Hb/91yq+/D3oERoyAt6LA==} engines: {node: '>=v14.16.0'} hasBin: true @@ -10367,7 +10425,7 @@ packages: picocolors: 1.0.0 source-map: 0.6.1 source-map-support: 0.5.21 - vite: 4.5.1(@types/node@16.18.64) + vite: 4.5.1(@types/node@16.18.68) transitivePeerDependencies: - '@types/node' - less @@ -10379,7 +10437,7 @@ packages: - terser dev: true - /vite@4.5.1(@types/node@16.18.64): + /vite@4.5.1(@types/node@16.18.68): resolution: {integrity: sha512-AXXFaAJ8yebyqzoNB9fu2pHoo/nWX+xZlaRwoeYUxEqBO+Zj4msE5G+BhGBll9lYEKv9Hfks52PAF2X7qDYXQA==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -10407,9 +10465,9 @@ packages: terser: optional: true dependencies: - '@types/node': 16.18.64 + '@types/node': 16.18.68 esbuild: 0.18.20 - postcss: 8.4.31 + postcss: 8.4.32 rollup: 3.29.4 optionalDependencies: fsevents: 2.3.3 @@ -10530,6 +10588,15 @@ packages: strip-ansi: 6.0.1 dev: true + /wrap-ansi@8.1.0: + resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==} + engines: {node: '>=12'} + dependencies: + ansi-styles: 6.2.1 + string-width: 5.1.2 + strip-ansi: 7.1.0 + dev: true + /wrappy@1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} dev: true @@ -10547,19 +10614,6 @@ packages: optional: true dev: true - /ws@8.11.0: - resolution: {integrity: sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==} - engines: {node: '>=10.0.0'} - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: ^5.0.2 - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - dev: false - /xdm@2.1.0: resolution: {integrity: sha512-3LxxbxKcRogYY7cQSMy1tUuU1zKNK9YPqMT7/S0r7Cz2QpyF8O9yFySGD7caOZt+LWUOQioOIX+6ZzCoBCpcAA==} dependencies: @@ -10590,11 +10644,6 @@ packages: - supports-color dev: true - /xmlhttprequest-ssl@2.0.0: - resolution: {integrity: sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==} - engines: {node: '>=0.4.0'} - dev: false - /xtend@4.0.2: resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==} engines: {node: '>=0.4'} @@ -10656,8 +10705,8 @@ packages: engines: {node: '>=10'} dev: true - /yup@1.3.2: - resolution: {integrity: sha512-6KCM971iQtJ+/KUaHdrhVr2LDkfhBtFPRnsG1P8F4q3uUVQ2RfEM9xekpha9aA4GXWJevjM10eDcPQ1FfWlmaQ==} + /yup@1.3.3: + resolution: {integrity: sha512-v8QwZSsHH2K3/G9WSkp6mZKO+hugKT1EmnMqLNUcfu51HU9MDyhlETT/JgtzprnrnQHPWsjc6MUDMBp/l9fNnw==} dependencies: property-expr: 2.0.6 tiny-case: 1.0.3 diff --git a/src/apps/console/components/common-navbar-tabs.tsx b/src/apps/console/components/common-navbar-tabs.tsx index 09c61ef71..675cbb997 100644 --- a/src/apps/console/components/common-navbar-tabs.tsx +++ b/src/apps/console/components/common-navbar-tabs.tsx @@ -1,7 +1,7 @@ import { ChevronLeft } from '@jengaicons/react'; import { Link } from '@remix-run/react'; import { AnimatePresence, motion } from 'framer-motion'; -import { useContext } from 'react'; +import { ReactNode, useContext, useState } from 'react'; import ScrollArea from '~/components/atoms/scroll-area'; import Tabs from '~/components/atoms/tabs'; import { BrandLogo } from '~/components/branding/brand-logo'; @@ -10,7 +10,7 @@ import { useActivePath } from '~/root/lib/client/hooks/use-active-path'; interface CommonTabsProps { tabs?: { - label: string; + label: ReactNode | ((active: boolean) => ReactNode); to: string; value: string; }[]; @@ -31,6 +31,8 @@ export const CommonTabs = ({ const context = useContext(TopBarContext); const { isSticked } = context || {}; + const [activeTab, setActiveTab] = useState(`/${activePath.split('/')[1]}`); + return (
@@ -68,6 +70,7 @@ export const CommonTabs = ({ value={`/${activePath.split('/')[1]}`} fitted LinkComponent={Link} + onChange={(tab) => setActiveTab(tab)} > {tabs.map(({ value, to, label }) => { return ; diff --git a/src/apps/console/components/commons.tsx b/src/apps/console/components/commons.tsx index 70e5ecdcc..d8e82b8e9 100644 --- a/src/apps/console/components/commons.tsx +++ b/src/apps/console/components/commons.tsx @@ -34,7 +34,7 @@ export const DetailItem = ({ return (
{title}
-
{value}
+
{value}
); }; @@ -142,11 +142,11 @@ type ICommonMeta = IUpdateMeta & IStatusMeta; const parseStatusComponent = ({ status }: { status: IStatus }) => { switch (status) { case 'deleting': - return
Deleting...
; + return
Deleting...
; case 'notready': - return
Not Ready
; + return
Not Ready
; case 'syncing': - return
Syncing
; + return
Syncing
; default: return null; } diff --git a/src/apps/console/components/raw-wrapper.tsx b/src/apps/console/components/raw-wrapper.tsx index 25755bdeb..310d9a5af 100644 --- a/src/apps/console/components/raw-wrapper.tsx +++ b/src/apps/console/components/raw-wrapper.tsx @@ -30,77 +30,75 @@ function RawWrapper({ rightChildren, }: IRawWrapper) { return ( - -
-
-
- -
-
-
{title}
-
{subtitle}
- {(!!badge?.title || !!badge?.subtitle) && ( -
- {badge.image && ( -
- {badge?.image} -
- )} -
-
- {badge?.title} -
-
- {badge?.subtitle} -
+
+
+
+ +
+
+
{title}
+
{subtitle}
+ {(!!badge?.title || !!badge?.subtitle) && ( +
+ {badge.image && ( +
+ {badge?.image} +
+ )} +
+
+ {badge?.title} +
+
+ {badge?.subtitle}
- )} -
- {progressItems && ( - { - onProgressClick(v); - }} - > - {(item) => { - return ( - - {item.label} - - ); - }} - +
)}
- - {!!onCancel && ( -
+ + {!!onCancel && ( +
-
-
-
{rightChildren}
-
+
+
+
+
{rightChildren}
- +
); } diff --git a/src/apps/console/components/resource-extra-action.tsx b/src/apps/console/components/resource-extra-action.tsx index 7753939f4..fcddcba95 100644 --- a/src/apps/console/components/resource-extra-action.tsx +++ b/src/apps/console/components/resource-extra-action.tsx @@ -4,7 +4,7 @@ import { Key, useState } from 'react'; import { IconButton } from '~/components/atoms/button'; import OptionList from '~/components/atoms/option-list'; -type IResourceExtraItem = +export type IResourceExtraItem = | { to?: string; linkProps?: { @@ -24,15 +24,20 @@ type IResourceExtraItem = interface IResourceExtraAction { options: Array; + disabled?: boolean; } -const ResourceExtraAction = ({ options = [] }: IResourceExtraAction) => { +const ResourceExtraAction = ({ + options = [], + disabled, +}: IResourceExtraAction) => { const [open, setOpen] = useState(false); return ( } selected={open} diff --git a/src/apps/console/components/secondary-sub-header.tsx b/src/apps/console/components/secondary-sub-header.tsx index ef3755570..7b01cdf4f 100644 --- a/src/apps/console/components/secondary-sub-header.tsx +++ b/src/apps/console/components/secondary-sub-header.tsx @@ -2,11 +2,11 @@ import { ReactNode } from 'react'; interface ISecondarySubHeader { title: ReactNode; - action: ReactNode; + action?: ReactNode; } const SecondarySubHeader = ({ title, action }: ISecondarySubHeader) => { return ( -
+
{title}
{action}
diff --git a/src/apps/console/components/wrapper.tsx b/src/apps/console/components/wrapper.tsx index b70987c0d..7a071686b 100644 --- a/src/apps/console/components/wrapper.tsx +++ b/src/apps/console/components/wrapper.tsx @@ -56,7 +56,7 @@ const Wrapper = ({ /> )} {secondaryHeader && ( -
+
{ throw e[0]; } toast.success('cluster created successfully'); - navigate(`/${accountName}/clusters`); + navigate(`/${accountName}/infra/clusters`); } catch (err) { handleError(err); } @@ -383,7 +383,7 @@ export const NewCluster = ({ providerSecrets, cloudProvider }: props) => { setShow={setShowUnsavedChanges} onSubmit={() => { setShowUnsavedChanges(false); - navigate(`/${accountName}/clusters`); + navigate(`/${accountName}/infra/clusters`); }} /> diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/handle-backend-resources.tsx b/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/handle-backend-resources.tsx index 752dff2c7..b185def92 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/handle-backend-resources.tsx +++ b/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/handle-backend-resources.tsx @@ -104,35 +104,35 @@ const HandleBackendResources = ({ }, {}), }), onSubmit: async (val) => { - try { - const { errors: e } = await api.createManagedResource({ - mres: { - displayName: valuesFirst.displayName, - metadata: { - name: valuesFirst.name, - namespace: parseTargetNs(workspace), - }, - spec: { - mresKind: { - kind: selectedType?.resource.kind || '', - }, - msvcRef: { - apiVersion: template.apiVersion || '', - name: parseName(backendService), - kind: template.kind!, - }, - inputs: { - ...val, - }, - }, - }, - }); - if (e) { - throw e[0]; - } - } catch (err) { - handleError(err); - } + // try { + // const { errors: e } = await api.createManagedResource({ + // mres: { + // displayName: valuesFirst.displayName, + // metadata: { + // name: valuesFirst.name, + // namespace: parseTargetNs(workspace), + // }, + // spec: { + // mresKind: { + // kind: selectedType?.resource.kind || '', + // }, + // msvcRef: { + // apiVersion: template.apiVersion || '', + // name: parseName(backendService), + // kind: template.kind!, + // }, + // inputs: { + // ...val, + // }, + // }, + // }, + // }); + // if (e) { + // throw e[0]; + // } + // } catch (err) { + // handleError(err); + // } }, }); diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/route.tsx b/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/route.tsx index e9d348d7e..5a75a5e1e 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/route.tsx +++ b/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/route.tsx @@ -120,8 +120,10 @@ const BackingResources = () => { template={ getManagedTemplate({ templates: managedTemplates, - kind: backendService.spec.msvcKind.kind || '', - apiVersion: backendService.spec.msvcKind.apiVersion, + kind: '', + // kind: backendService.spec.msvcKind.kind || '', + // apiVersion: backendService.spec.msvcKind.apiVersion, + apiVersion: '', })! } setShow={setShowBackendResourceDialog} diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/backend-services-resources.tsx b/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/backend-services-resources.tsx index bd079f5d3..1f5884769 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/backend-services-resources.tsx +++ b/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/backend-services-resources.tsx @@ -25,14 +25,14 @@ import { getManagedTemplate } from '~/console/utils/commons'; const RESOURCE_NAME = 'backend service'; const parseItem = ( - item: ExtractNodeType, - templates: IManagedServiceTemplates + item: ExtractNodeType + // templates: IManagedServiceTemplates ) => { - const template = getManagedTemplate({ - templates, - kind: item.spec.msvcKind.kind || '', - apiVersion: item.spec.msvcKind.apiVersion, - }); + // const template = getManagedTemplate({ + // templates, + // kind: item.spec.msvcKind.kind || '', + // apiVersion: item.spec.msvcKind.apiVersion, + // }); return { name: item?.displayName, id: parseName(item), @@ -41,7 +41,8 @@ const parseItem = ( author: `Updated by ${titleCase(parseUpdateOrCreatedBy(item))}`, time: parseUpdateOrCreatedOn(item), }, - logo: template?.logoUrl, + logo: '', + // logo: template?.logoUrl, }; }; @@ -55,7 +56,10 @@ const GridView = ({ return ( {items.map((item, index) => { - const { name, id, type, logo, updateInfo } = parseItem(item, templates); + const { name, id, type, logo, updateInfo } = parseItem( + item + // templates + ); const keyPrefix = `${RESOURCE_NAME}-${id}-${index}`; return ( {items.map((item, index) => { - const { name, id, type, logo, updateInfo } = parseItem(item, templates); + const { name, id, type, logo, updateInfo } = parseItem( + item + // templates + ); const keyPrefix = `${RESOURCE_NAME}-${id}-${index}`; return ( diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/handle-backend-service.tsx b/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/handle-backend-service.tsx index 05cf0c34c..ff0c69614 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/handle-backend-service.tsx +++ b/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/handle-backend-service.tsx @@ -315,32 +315,32 @@ const HandleBackendService = ({ const tempVal = { ...val }; delete tempVal.name; delete tempVal.displayName; - try { - const { errors: e } = await api.createManagedService({ - msvc: { - displayName: val.displayName, - metadata: { - name: val.name, - namespace: parseTargetNs(workspace), - annotations: {}, - }, - spec: { - msvcKind: { - apiVersion: selectedService?.service.apiVersion || '', - kind: selectedService?.service.kind || '', - }, - inputs: { - ...tempVal, - }, - }, - }, - }); - if (e) { - throw e[0]; - } - } catch (err) { - handleError(err); - } + // try { + // const { errors: e } = await api.createManagedService({ + // msvc: { + // displayName: val.displayName, + // metadata: { + // name: val.name, + // namespace: parseTargetNs(workspace), + // annotations: {}, + // }, + // spec: { + // msvcKind: { + // apiVersion: selectedService?.service.apiVersion || '', + // kind: selectedService?.service.kind || '', + // }, + // inputs: { + // ...tempVal, + // }, + // }, + // }, + // }); + // if (e) { + // throw e[0]; + // } + // } catch (err) { + // handleError(err); + // } }, }); diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace/route.tsx b/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace/route.tsx index c754f7645..a215b13a5 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace/route.tsx +++ b/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace/route.tsx @@ -38,7 +38,7 @@ import { SubNavDataProvider } from '~/root/lib/client/hooks/use-create-subnav-ac import useDebounce from '~/root/lib/client/hooks/use-debounce'; import { IRemixCtx } from '~/root/lib/types/common'; import { Truncate, handleError } from '~/root/lib/utils/common'; -import { IProjectContext } from '../_.$account.$cluster.$project'; +import { IProjectContext } from '../_.$account.infra.$cluster.$project'; export interface IWorkspaceContext extends IProjectContext { workspace: IWorkspace; diff --git a/src/apps/console/routes/_.$account.$cluster.$project.settings.general/route.tsx b/src/apps/console/routes/_.$account.$cluster.$project.settings.general/route.tsx index 3a0a8d968..d08d49c78 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.settings.general/route.tsx +++ b/src/apps/console/routes/_.$account.$cluster.$project.settings.general/route.tsx @@ -19,7 +19,7 @@ import { useUnsavedChanges } from '~/root/lib/client/hooks/use-unsaved-changes'; import { consoleBaseUrl } from '~/root/lib/configs/base-url.cjs'; import Yup from '~/root/lib/server/helpers/yup'; import { handleError } from '~/root/lib/utils/common'; -import { IProjectContext } from '../_.$account.$cluster.$project'; +import { IProjectContext } from '../_.$account.infra.$cluster.$project'; export const updateProject = async ({ api, diff --git a/src/apps/console/routes/_.$account.$cluster.overview.info/route.tsx b/src/apps/console/routes/_.$account.$cluster.overview.info/route.tsx deleted file mode 100644 index 7444813de..000000000 --- a/src/apps/console/routes/_.$account.$cluster.overview.info/route.tsx +++ /dev/null @@ -1,164 +0,0 @@ -/* eslint-disable jsx-a11y/control-has-associated-label */ -import { useOutletContext } from '@remix-run/react'; -import { Box } from '~/console/components/common-console-components'; -import { parseName } from '~/console/server/r-utils/common'; -import { DownloadSimple } from '@jengaicons/react'; -import { downloadFile, renderCloudProvider } from '~/console/utils/commons'; -import { Chip } from '~/components/atoms/chips'; -import { - CopyButton, - DetailItem, - InfoLabel, -} from '~/console/components/commons'; -import { useConsoleApi } from '~/console/server/gql/api-provider'; -import { handleError } from '~/root/lib/utils/common'; -import { toast } from '~/components/molecule/toast'; -import { useState } from 'react'; -import Wrapper from '~/console/components/wrapper'; -import { IClusterContext } from '../_.$account.$cluster'; - -const KubeConfigDownload = ({ cluster }: { cluster: string }) => { - const filename = `${cluster} kubeconfig.yaml`; - const api = useConsoleApi(); - - const [loading, setLoading] = useState(false); - - const downloadConfig = async () => { - setLoading(true); - try { - const { errors, data } = await api.getKubeConfig({ - name: cluster, - }); - if (errors) { - throw errors[0]; - } - if (data.adminKubeconfig) { - const { encoding, value } = data.adminKubeconfig; - let linkSource = ''; - switch (encoding) { - case 'base64': - linkSource = atob(value); - break; - default: - linkSource = value; - } - - downloadFile({ - filename, - data: linkSource, - format: 'text/plain', - }); - } else { - toast.error('Kubeconfig not found.'); - } - } catch (err) { - handleError(err); - } finally { - setLoading(false); - } - }; - return ( - } - loading={loading} - onClick={() => { - downloadConfig(); - }} - /> - ); -}; - -const ClusterInfo = () => { - const { cluster } = useOutletContext(); - - const providerInfo = () => { - const provider = cluster.spec?.cloudProvider; - switch (provider) { - case 'aws': - return ( - - } - /> - ); - default: - return null; - } - }; - return ( - -
-
- - } - /> - } - /> - - In Development mode, we will operate your Kubernetes cluster - with the control plane running on a{' '} - single master node. -
- } - label={ - cluster.spec?.availabilityMode === 'dev' - ? 'Development' - : 'Highly Available' || '' - } - /> - } - /> - - } - /> - - } - /> - - - {providerInfo()} -
-
- - ); -}; -export default ClusterInfo; diff --git a/src/apps/console/routes/_.$account._index.tsx b/src/apps/console/routes/_.$account._index.tsx index 34ad163ce..db084b414 100644 --- a/src/apps/console/routes/_.$account._index.tsx +++ b/src/apps/console/routes/_.$account._index.tsx @@ -11,5 +11,5 @@ export const loader = async (ctx: IRemixCtx) => { return redirect('/teams'); } - return redirect(`/${account}/projects`); + return redirect(`/${account}/infra/clusters`); }; diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace._index.tsx b/src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace._index.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace._index.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace._index.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app._index.tsx b/src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.app.$app._index.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app._index.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.app.$app._index.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.cs._index.tsx b/src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.cs._index.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.cs._index.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.cs._index.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.cs.tsx b/src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.cs.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.cs.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.cs.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.managed-services.tsx b/src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.managed-services.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.managed-services.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.managed-services.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.settings.tsx b/src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.settings.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.settings.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.settings.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope._index.tsx b/src/apps/console/routes/_.$account.infra.$cluster.$project.$scope._index.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope._index.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.$project.$scope._index.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.tsx b/src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.tsx similarity index 96% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.tsx index e37f2c467..42ebe352e 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.tsx +++ b/src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.tsx @@ -7,7 +7,7 @@ import Breadcrum from '../components/breadcrum'; import LogoWrapper from '../components/logo-wrapper'; import { SCOPE } from '../page-components/new-scope'; import { ensureAccountSet, ensureClusterSet } from '../server/utils/auth-utils'; -import { IProjectContext } from './_.$account.$cluster.$project'; +import { IProjectContext } from './_.$account.infra.$cluster.$project'; export const loader = async (ctx: IRemixCtx) => { ensureAccountSet(ctx); diff --git a/src/apps/console/routes/_.$account.$cluster.$project._index.tsx b/src/apps/console/routes/_.$account.infra.$cluster.$project._index.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project._index.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.$project._index.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.settings._index.tsx b/src/apps/console/routes/_.$account.infra.$cluster.$project.settings._index.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.settings._index.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.$project.settings._index.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.settings.tsx b/src/apps/console/routes/_.$account.infra.$cluster.$project.settings.tsx similarity index 90% rename from src/apps/console/routes/_.$account.$cluster.$project.settings.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.$project.settings.tsx index 28f559a2d..09f74afd8 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.settings.tsx +++ b/src/apps/console/routes/_.$account.infra.$cluster.$project.settings.tsx @@ -1,7 +1,7 @@ import { Outlet, useOutletContext } from '@remix-run/react'; import { useSubNavData } from '~/root/lib/client/hooks/use-create-subnav-action'; import SidebarLayout from '../components/sidebar-layout'; -import { IProjectContext } from './_.$account.$cluster.$project'; +import { IProjectContext } from './_.$account.infra.$cluster.$project'; const Settings = () => { const rootContext = useOutletContext(); diff --git a/src/apps/console/routes/_.$account.$cluster.$project.tsx b/src/apps/console/routes/_.$account.infra.$cluster.$project.tsx similarity index 97% rename from src/apps/console/routes/_.$account.$cluster.$project.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.$project.tsx index 15b6141eb..0698348db 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.tsx +++ b/src/apps/console/routes/_.$account.infra.$cluster.$project.tsx @@ -12,7 +12,7 @@ import { CommonTabs } from '../components/common-navbar-tabs'; import { type IProject } from '../server/gql/queries/project-queries'; import { GQLServerHandler } from '../server/gql/saved-queries'; import { ensureAccountSet, ensureClusterSet } from '../server/utils/auth-utils'; -import { IClusterContext } from './_.$account.$cluster'; +import { IClusterContext } from './_.$account.infra.$cluster'; export interface IProjectContext extends IClusterContext { project: IProject; diff --git a/src/apps/console/routes/_.$account.$cluster._index.tsx b/src/apps/console/routes/_.$account.infra.$cluster._index.tsx similarity index 76% rename from src/apps/console/routes/_.$account.$cluster._index.tsx rename to src/apps/console/routes/_.$account.infra.$cluster._index.tsx index b1add35d8..0c1522803 100644 --- a/src/apps/console/routes/_.$account.$cluster._index.tsx +++ b/src/apps/console/routes/_.$account.infra.$cluster._index.tsx @@ -3,5 +3,5 @@ import { IRemixCtx } from '~/root/lib/types/common'; export const loader = async (ctx: IRemixCtx) => { const { account, cluster } = ctx.params; - return redirect(`/${account}/${cluster}/nodepools`); + return redirect(`/${account}/infra/${cluster}/nodepools`); }; diff --git a/src/apps/console/routes/_.$account.$cluster.network.domain/domain-detail.tsx b/src/apps/console/routes/_.$account.infra.$cluster.network.domain/domain-detail.tsx similarity index 96% rename from src/apps/console/routes/_.$account.$cluster.network.domain/domain-detail.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.network.domain/domain-detail.tsx index e81dc33d4..6649bc11b 100644 --- a/src/apps/console/routes/_.$account.$cluster.network.domain/domain-detail.tsx +++ b/src/apps/console/routes/_.$account.infra.$cluster.network.domain/domain-detail.tsx @@ -3,7 +3,7 @@ import Popup from '~/components/molecule/popup'; import { CopyButton, DetailItem } from '~/console/components/commons'; import { IDomains } from '~/console/server/gql/queries/domain-queries'; import { ExtractNodeType } from '~/console/server/r-utils/common'; -import { IClusterContext } from '../_.$account.$cluster'; +import { IClusterContext } from '../_.$account.infra.$cluster'; const DomainDetailPopup = ({ visible, diff --git a/src/apps/console/routes/_.$account.$cluster.network.domain/domain-resources.tsx b/src/apps/console/routes/_.$account.infra.$cluster.network.domain/domain-resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.network.domain/domain-resources.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.network.domain/domain-resources.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.network.domain/handle-domain.tsx b/src/apps/console/routes/_.$account.infra.$cluster.network.domain/handle-domain.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.network.domain/handle-domain.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.network.domain/handle-domain.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.network.domain/route.tsx b/src/apps/console/routes/_.$account.infra.$cluster.network.domain/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.network.domain/route.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.network.domain/route.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.network.domain/tools.tsx b/src/apps/console/routes/_.$account.infra.$cluster.network.domain/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.network.domain/tools.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.network.domain/tools.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.network.tsx b/src/apps/console/routes/_.$account.infra.$cluster.network.tsx similarity index 81% rename from src/apps/console/routes/_.$account.$cluster.network.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.network.tsx index 3b5837ef5..c56fc23c2 100644 --- a/src/apps/console/routes/_.$account.$cluster.network.tsx +++ b/src/apps/console/routes/_.$account.infra.$cluster.network.tsx @@ -1,13 +1,13 @@ import { Outlet, useOutletContext } from '@remix-run/react'; import SidebarLayout from '../components/sidebar-layout'; -import { IClusterContext } from './_.$account.$cluster'; +import { IClusterContext } from './_.$account.infra.$cluster'; const ContainerRegistry = () => { const rootContext = useOutletContext(); return ( >; diff --git a/src/apps/console/routes/_.$account.$cluster.nodepools/nodepool-resources.tsx b/src/apps/console/routes/_.$account.infra.$cluster.nodepools/nodepool-resources.tsx similarity index 99% rename from src/apps/console/routes/_.$account.$cluster.nodepools/nodepool-resources.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.nodepools/nodepool-resources.tsx index f602eccf0..f3ffd05c4 100644 --- a/src/apps/console/routes/_.$account.$cluster.nodepools/nodepool-resources.tsx +++ b/src/apps/console/routes/_.$account.infra.$cluster.nodepools/nodepool-resources.tsx @@ -153,7 +153,10 @@ const ListDetail = ( } }; - const statusRender = lR.statusRender({ className: 'w-[180px]', type:'nodepool' }); + const statusRender = lR.statusRender({ + className: 'w-[180px]', + type: 'nodepool', + }); return (
diff --git a/src/apps/console/routes/_.$account.$cluster.nodepools/nodepool-utils.tsx b/src/apps/console/routes/_.$account.infra.$cluster.nodepools/nodepool-utils.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.nodepools/nodepool-utils.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.nodepools/nodepool-utils.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.nodepools/resources_b.tsx b/src/apps/console/routes/_.$account.infra.$cluster.nodepools/resources_b.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.nodepools/resources_b.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.nodepools/resources_b.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.nodepools/route.tsx b/src/apps/console/routes/_.$account.infra.$cluster.nodepools/route.tsx similarity index 98% rename from src/apps/console/routes/_.$account.$cluster.nodepools/route.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.nodepools/route.tsx index be9deca34..3d76dd766 100644 --- a/src/apps/console/routes/_.$account.$cluster.nodepools/route.tsx +++ b/src/apps/console/routes/_.$account.infra.$cluster.nodepools/route.tsx @@ -15,7 +15,7 @@ import fake from '~/root/fake-data-generator/fake'; import HandleNodePool from './handle-nodepool'; import Tools from './tools'; import NodepoolResources from './nodepool-resources'; -import { IClusterContext } from '../_.$account.$cluster'; +import { IClusterContext } from '../_.$account.infra.$cluster'; export const loader = async (ctx: IRemixCtx) => { ensureAccountSet(ctx); diff --git a/src/apps/console/routes/_.$account.$cluster.nodepools/taints-and-labels.tsx b/src/apps/console/routes/_.$account.infra.$cluster.nodepools/taints-and-labels.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.nodepools/taints-and-labels.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.nodepools/taints-and-labels.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.nodepools/tools.tsx b/src/apps/console/routes/_.$account.infra.$cluster.nodepools/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.nodepools/tools.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.nodepools/tools.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.np.$nodepool/route.tsx b/src/apps/console/routes/_.$account.infra.$cluster.np.$nodepool/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.np.$nodepool/route.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.np.$nodepool/route.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.overview._index.tsx b/src/apps/console/routes/_.$account.infra.$cluster.overview._index.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.overview._index.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.overview._index.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.overview.info/route.tsx b/src/apps/console/routes/_.$account.infra.$cluster.overview.info/route.tsx new file mode 100644 index 000000000..47dd80b7e --- /dev/null +++ b/src/apps/console/routes/_.$account.infra.$cluster.overview.info/route.tsx @@ -0,0 +1,208 @@ +/* eslint-disable jsx-a11y/control-has-associated-label */ +import { Link, useOutletContext } from '@remix-run/react'; +import { Box } from '~/console/components/common-console-components'; +import { parseName } from '~/console/server/r-utils/common'; +import { DownloadSimple } from '@jengaicons/react'; +import { downloadFile, renderCloudProvider } from '~/console/utils/commons'; +import { Chip } from '~/components/atoms/chips'; +import { + CopyButton, + DetailItem, + InfoLabel, +} from '~/console/components/commons'; +import { useConsoleApi } from '~/console/server/gql/api-provider'; +import { handleError } from '~/root/lib/utils/common'; +import { toast } from '~/components/molecule/toast'; +import { useState } from 'react'; +import CodeView from '~/console/components/code-view'; +import { Button } from '~/components/atoms/button'; +import { IClusterContext } from '../_.$account.infra.$cluster'; + +const KubeConfigDownload = ({ cluster }: { cluster: string }) => { + const filename = `${cluster} kubeconfig.yaml`; + const api = useConsoleApi(); + + const [loading, setLoading] = useState(false); + + const downloadConfig = async () => { + setLoading(true); + try { + const { errors, data } = await api.getKubeConfig({ + name: cluster, + }); + if (errors) { + throw errors[0]; + } + if (data.adminKubeconfig) { + const { encoding, value } = data.adminKubeconfig; + let linkSource = ''; + switch (encoding) { + case 'base64': + linkSource = atob(value); + break; + default: + linkSource = value; + } + + downloadFile({ + filename, + data: linkSource, + format: 'text/plain', + }); + } else { + toast.error('Kubeconfig not found.'); + } + } catch (err) { + handleError(err); + } finally { + setLoading(false); + } + }; + return ( + } + loading={loading} + onClick={() => { + downloadConfig(); + }} + /> + ); +}; + +const ClusterInfo = () => { + const { cluster, account } = useOutletContext(); + const providerInfo = () => { + const provider = cluster.spec?.cloudProvider; + switch (provider) { + case 'aws': + return ( + + } + /> + ); + default: + return null; + } + }; + return ( + <> + +
+
+ + } + /> + } + /> + + In Development mode, we will operate your Kubernetes + cluster with the control plane running on a{' '} + single master{' '} + node. +
+ } + label={ + cluster.spec?.availabilityMode === 'dev' + ? 'Development' + : 'Highly Available' || '' + } + /> + } + /> + + } + /> + + } + /> + + + {providerInfo()} +
+
+ + +
+ + Download and Install Kloudlite CLI tool from following instruction + given in{' '} +
+ + } + /> + + } + /> + + + ); +}; +export default ClusterInfo; diff --git a/src/apps/console/routes/_.$account.$cluster.overview.logs/route.tsx b/src/apps/console/routes/_.$account.infra.$cluster.overview.logs/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.overview.logs/route.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.overview.logs/route.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.overview.metrics/route.tsx b/src/apps/console/routes/_.$account.infra.$cluster.overview.metrics/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.overview.metrics/route.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.overview.metrics/route.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.overview/route.tsx b/src/apps/console/routes/_.$account.infra.$cluster.overview/route.tsx similarity index 92% rename from src/apps/console/routes/_.$account.$cluster.overview/route.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.overview/route.tsx index d38403753..c15d58610 100644 --- a/src/apps/console/routes/_.$account.$cluster.overview/route.tsx +++ b/src/apps/console/routes/_.$account.infra.$cluster.overview/route.tsx @@ -2,7 +2,7 @@ import { Outlet, useOutletContext } from '@remix-run/react'; import SidebarLayout from '~/console/components/sidebar-layout'; import { useSubNavData } from '~/root/lib/client/hooks/use-create-subnav-action'; -import { IClusterContext } from '../_.$account.$cluster'; +import { IClusterContext } from '../_.$account.infra.$cluster'; const ClusterOverview = () => { const rootContext = useOutletContext(); diff --git a/src/apps/console/routes/_.$account.$cluster.settings._index.tsx b/src/apps/console/routes/_.$account.infra.$cluster.settings._index.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.settings._index.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.settings._index.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.settings.general/route.tsx b/src/apps/console/routes/_.$account.infra.$cluster.settings.general/route.tsx similarity index 98% rename from src/apps/console/routes/_.$account.$cluster.settings.general/route.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.settings.general/route.tsx index 9e0e7b320..44a45fc35 100644 --- a/src/apps/console/routes/_.$account.$cluster.settings.general/route.tsx +++ b/src/apps/console/routes/_.$account.infra.$cluster.settings.general/route.tsx @@ -36,7 +36,7 @@ import { handleError } from '~/root/lib/utils/common'; import { mapper } from '~/components/utils'; import DeleteDialog from '~/console/components/delete-dialog'; import { useReload } from '~/root/lib/client/helpers/reloader'; -import { IClusterContext } from '../_.$account.$cluster'; +import { IClusterContext } from '../_.$account.infra.$cluster'; export const loader = async (ctx: IRemixCtx) => { const promise = pWrapper(async () => { @@ -274,7 +274,7 @@ const SettingGeneral = () => { reload(); toast.success(`Cluster deleted successfully`); setDeleteCluster(false); - navigate(`/${parseName(account)}/clusters`); + navigate(`/${parseName(account)}/infra/clusters`); } catch (err) { handleError(err); } diff --git a/src/apps/console/routes/_.$account.$cluster.settings.tsx b/src/apps/console/routes/_.$account.infra.$cluster.settings.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.settings.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.settings.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.storage/route.tsx b/src/apps/console/routes/_.$account.infra.$cluster.storage/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.storage/route.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.storage/route.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.storage/storage-resources.tsx b/src/apps/console/routes/_.$account.infra.$cluster.storage/storage-resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.storage/storage-resources.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.storage/storage-resources.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.storage/tools.tsx b/src/apps/console/routes/_.$account.infra.$cluster.storage/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.storage/tools.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.storage/tools.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.tsx b/src/apps/console/routes/_.$account.infra.$cluster.tsx similarity index 93% rename from src/apps/console/routes/_.$account.$cluster.tsx rename to src/apps/console/routes/_.$account.infra.$cluster.tsx index c491f43d9..41b6c2c0a 100644 --- a/src/apps/console/routes/_.$account.$cluster.tsx +++ b/src/apps/console/routes/_.$account.infra.$cluster.tsx @@ -63,7 +63,7 @@ const ClusterTabs = () => { value: '/settings', }, ]} - baseurl={`/${account}/${cluster}`} + baseurl={`/${account}/infra/${cluster}`} /> ); }; @@ -78,7 +78,7 @@ const NetworkBreadcrum = ({ return (
@@ -87,7 +87,7 @@ const NetworkBreadcrum = ({ } /> {displayName}} /> @@ -113,6 +113,7 @@ export const handle = ({ navbar: , breadcrum: () => , logo: , + noLayout: true, }; }; @@ -131,7 +132,7 @@ export const loader = async (ctx: IExtRemixCtx) => { cluster: data, }); } catch (err) { - return redirect(`/${account}/clusters`); + return redirect(`/${account}/infra/clusters`); } }; diff --git a/src/apps/console/routes/_.$account.infra._index/route.tsx b/src/apps/console/routes/_.$account.infra._index/route.tsx new file mode 100644 index 000000000..793a1b9e8 --- /dev/null +++ b/src/apps/console/routes/_.$account.infra._index/route.tsx @@ -0,0 +1,5 @@ +import { redirect } from '@remix-run/node'; + +export const loader = async () => { + return redirect('clusters'); +}; diff --git a/src/apps/console/routes/_.$account.clusters._index/cluster-resources.tsx b/src/apps/console/routes/_.$account.infra.clusters._index/cluster-resources.tsx similarity index 85% rename from src/apps/console/routes/_.$account.clusters._index/cluster-resources.tsx rename to src/apps/console/routes/_.$account.infra.clusters._index/cluster-resources.tsx index 78aa9e130..9776c328b 100644 --- a/src/apps/console/routes/_.$account.clusters._index/cluster-resources.tsx +++ b/src/apps/console/routes/_.$account.infra.clusters._index/cluster-resources.tsx @@ -1,7 +1,7 @@ import { GearSix } from '@jengaicons/react'; import { Link, useParams } from '@remix-run/react'; import { cn, generateKey, titleCase } from '~/components/utils'; -import { listRender } from '~/console/components/commons'; +import { IStatus, listRender } from '~/console/components/commons'; import ConsoleAvatar from '~/console/components/console-avatar'; import { ListBody, @@ -63,10 +63,17 @@ const parseItem = (item: ExtractNodeType) => { }; }; -const ExtraButton = ({ cluster }: { cluster: ExtractNodeType }) => { +const ExtraButton = ({ + cluster, + status, +}: { + cluster: ExtractNodeType; + status: IStatus; +}) => { const { account } = useParams(); return ( [] }) => { const { name, id, provider, updateInfo } = parseItem(item); const keyPrefix = `${RESOURCE_NAME}-${id}-${index}`; const lR = listRender({ keyPrefix, resource: item }); + const status = lR.statusRender({ className: '' }); return ( [] }) => { } + action={ + + } /> ), }, @@ -112,7 +122,7 @@ const GridView = ({ items }: { items: ExtractNodeType[] }) => {
), }, - lR.statusRender({ className: '' }), + status, { key: generateKey(keyPrefix, updateInfo.author), render: () => ( @@ -138,6 +148,7 @@ const ListView = ({ items }: { items: ExtractNodeType[] }) => { const { name, id, provider } = parseItem(item); const keyPrefix = `${RESOURCE_NAME}-${id}-${index}`; const lR = listRender({ keyPrefix, resource: item }); + const statusRender = lR.statusRender({ className: 'w-[180px] mr-[50px]', }); @@ -147,13 +158,17 @@ const ListView = ({ items }: { items: ExtractNodeType[] }) => { key={id} className={cn( '!p-3xl', - statusRender.status === 'notready' + statusRender.status === 'notready' || + statusRender.status === 'deleting' ? '!cursor-default hover:!bg-surface-basic-default' : '' )} // to={`/${account}/${id}/overview`} - {...(statusRender.status !== 'notready' - ? { to: `/${account}/${id}/overview` } + {...(!( + statusRender.status === 'notready' || + statusRender.status === 'deleting' + ) + ? { to: `/${account}/infra/${id}/overview` } : {})} columns={[ { @@ -176,7 +191,9 @@ const ListView = ({ items }: { items: ExtractNodeType[] }) => { lR.authorRender({ className: 'w-[180px]' }), { key: generateKey(keyPrefix, 'action'), - render: () => , + render: () => ( + + ), }, ]} /> diff --git a/src/apps/console/routes/_.$account.clusters._index/route.tsx b/src/apps/console/routes/_.$account.infra.clusters._index/route.tsx similarity index 84% rename from src/apps/console/routes/_.$account.clusters._index/route.tsx rename to src/apps/console/routes/_.$account.infra.clusters._index/route.tsx index aa1e43ccd..e815f91d8 100644 --- a/src/apps/console/routes/_.$account.clusters._index/route.tsx +++ b/src/apps/console/routes/_.$account.infra.clusters._index/route.tsx @@ -7,6 +7,7 @@ import { parseNodes } from '~/console/server/r-utils/common'; import { getPagination, getSearch } from '~/console/server/utils/common'; import { IRemixCtx } from '~/root/lib/types/common'; import fake from '~/root/fake-data-generator/fake'; +import SecondarySubHeader from '~/console/components/secondary-sub-header'; import { LoadingComp, pWrapper } from '../../components/loading-component'; import { GQLServerHandler } from '../../server/gql/saved-queries'; import { ensureAccountSet } from '../../server/utils/auth-utils'; @@ -121,7 +122,6 @@ const Clusters = () => { > {({ clustersData, secretsCount }) => { const clusters = parseNodes(clustersData); - console.log(clusters); if (!clusters) { return null; @@ -129,31 +129,32 @@ const Clusters = () => { const { pageInfo, totalCount } = clustersData; return ( - 0 && ( +
+ } LinkComponent={Link} to={`/${account}/new-cluster`} /> - ), - }} - empty={getEmptyState({ - clustersCount: clusters.length, - cloudProviderSecretsCount: secretsCount, - })} - pagination={{ - pageInfo, - totalCount, - }} - tools={} - > - - + } + /> + } + > + + +
); }} diff --git a/src/apps/console/routes/_.$account.clusters._index/tools.tsx b/src/apps/console/routes/_.$account.infra.clusters._index/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.clusters._index/tools.tsx rename to src/apps/console/routes/_.$account.infra.clusters._index/tools.tsx diff --git a/src/apps/console/routes/_.$account.clusters.tsx b/src/apps/console/routes/_.$account.infra.clusters.tsx similarity index 100% rename from src/apps/console/routes/_.$account.clusters.tsx rename to src/apps/console/routes/_.$account.infra.clusters.tsx diff --git a/src/apps/console/routes/_.$account.infra.tsx b/src/apps/console/routes/_.$account.infra.tsx new file mode 100644 index 000000000..2da0cf802 --- /dev/null +++ b/src/apps/console/routes/_.$account.infra.tsx @@ -0,0 +1,29 @@ +import { Outlet, useOutletContext } from '@remix-run/react'; +import { useSubNavData } from '~/root/lib/client/hooks/use-create-subnav-action'; +import { useHandleFromMatches } from '~/root/lib/client/hooks/use-custom-matches'; +import SidebarLayout from '../components/sidebar-layout'; + +const Infra = () => { + const rootContext = useOutletContext(); + const subNavAction = useSubNavData(); + const noLayout = useHandleFromMatches('noLayout', null); + console.log(noLayout); + + if (noLayout) { + return ; + } + return ( + + + + ); +}; + +export default Infra; diff --git a/src/apps/console/routes/_.$account.infra.vms.tsx b/src/apps/console/routes/_.$account.infra.vms.tsx new file mode 100644 index 000000000..d9f7e622c --- /dev/null +++ b/src/apps/console/routes/_.$account.infra.vms.tsx @@ -0,0 +1,7 @@ +import Wip from '../components/wip'; + +const VM = () => { + return ; +}; + +export default VM; diff --git a/src/apps/console/routes/_.$account.container-registry._index.tsx b/src/apps/console/routes/_.$account.packages._index.tsx similarity index 73% rename from src/apps/console/routes/_.$account.container-registry._index.tsx rename to src/apps/console/routes/_.$account.packages._index.tsx index e1e200e2d..b947c8cce 100644 --- a/src/apps/console/routes/_.$account.container-registry._index.tsx +++ b/src/apps/console/routes/_.$account.packages._index.tsx @@ -1,5 +1,5 @@ import { redirect } from '@remix-run/node'; export const loader = async () => { - return redirect('general'); + return redirect('repos'); }; diff --git a/src/apps/console/routes/_.$account.container-registry.access-management/cred-resources.tsx b/src/apps/console/routes/_.$account.packages.access-management/cred-resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.container-registry.access-management/cred-resources.tsx rename to src/apps/console/routes/_.$account.packages.access-management/cred-resources.tsx diff --git a/src/apps/console/routes/_.$account.container-registry.access-management/handle-cr-cred.tsx b/src/apps/console/routes/_.$account.packages.access-management/handle-cr-cred.tsx similarity index 100% rename from src/apps/console/routes/_.$account.container-registry.access-management/handle-cr-cred.tsx rename to src/apps/console/routes/_.$account.packages.access-management/handle-cr-cred.tsx diff --git a/src/apps/console/routes/_.$account.container-registry.access-management/route.tsx b/src/apps/console/routes/_.$account.packages.access-management/route.tsx similarity index 82% rename from src/apps/console/routes/_.$account.container-registry.access-management/route.tsx rename to src/apps/console/routes/_.$account.packages.access-management/route.tsx index bae7aa8b2..c8c9987d0 100644 --- a/src/apps/console/routes/_.$account.container-registry.access-management/route.tsx +++ b/src/apps/console/routes/_.$account.packages.access-management/route.tsx @@ -12,6 +12,7 @@ import { getPagination, getSearch } from '~/console/server/utils/common'; import logger from '~/root/lib/client/helpers/log'; import { IRemixCtx } from '~/root/lib/types/common'; import fake from '~/root/fake-data-generator/fake'; +import SecondarySubHeader from '~/console/components/secondary-sub-header'; import CredResources from './cred-resources'; import HandleCrCred from './handle-cr-cred'; import Tools from './tools'; @@ -51,18 +52,21 @@ const ContainerRegistryAccessManagement = () => { {({ credentials }) => { const creds = credentials.edges?.map(({ node }) => node); return ( - <> - {creds.length > 0 && ( - -
); }} diff --git a/src/apps/console/routes/_.$account.container-registry.access-management/tools.tsx b/src/apps/console/routes/_.$account.packages.access-management/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.container-registry.access-management/tools.tsx rename to src/apps/console/routes/_.$account.packages.access-management/tools.tsx diff --git a/src/apps/console/routes/_.$account.packages.helm-repos.tsx b/src/apps/console/routes/_.$account.packages.helm-repos.tsx new file mode 100644 index 000000000..1f8ad335f --- /dev/null +++ b/src/apps/console/routes/_.$account.packages.helm-repos.tsx @@ -0,0 +1,7 @@ +import Wip from '../components/wip'; + +const HelmRepos = () => { + return ; +}; + +export default HelmRepos; diff --git a/src/apps/console/routes/_.$account.container-registry.repos/handle-repo.tsx b/src/apps/console/routes/_.$account.packages.repos/handle-repo.tsx similarity index 100% rename from src/apps/console/routes/_.$account.container-registry.repos/handle-repo.tsx rename to src/apps/console/routes/_.$account.packages.repos/handle-repo.tsx diff --git a/src/apps/console/routes/_.$account.container-registry.repos/repo-resources.tsx b/src/apps/console/routes/_.$account.packages.repos/repo-resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.container-registry.repos/repo-resources.tsx rename to src/apps/console/routes/_.$account.packages.repos/repo-resources.tsx diff --git a/src/apps/console/routes/_.$account.container-registry.repos/route.tsx b/src/apps/console/routes/_.$account.packages.repos/route.tsx similarity index 91% rename from src/apps/console/routes/_.$account.container-registry.repos/route.tsx rename to src/apps/console/routes/_.$account.packages.repos/route.tsx index 7565c256d..b0758b768 100644 --- a/src/apps/console/routes/_.$account.container-registry.repos/route.tsx +++ b/src/apps/console/routes/_.$account.packages.repos/route.tsx @@ -4,7 +4,6 @@ import { useLoaderData } from '@remix-run/react'; import { useState } from 'react'; import { Button } from '~/components/atoms/button'; import { LoadingComp, pWrapper } from '~/console/components/loading-component'; -import SubNavAction from '~/console/components/sub-nav-action'; import Wrapper from '~/console/components/wrapper'; import { GQLServerHandler } from '~/console/server/gql/saved-queries'; import { ensureAccountSet } from '~/console/server/utils/auth-utils'; @@ -12,6 +11,7 @@ import { getPagination, getSearch } from '~/console/server/utils/common'; import logger from '~/root/lib/client/helpers/log'; import { IRemixCtx } from '~/root/lib/types/common'; import fake from '~/root/fake-data-generator/fake'; +import SecondarySubHeader from '~/console/components/secondary-sub-header'; import HandleRepo from './handle-repo'; import RepoResources from './repo-resources'; import Tools from './tools'; @@ -51,9 +51,10 @@ const ContainerRegistryRepos = () => { const repos = repository.edges?.map(({ node }) => node); return ( - <> - {repos.length > 0 && ( - +
+ { setVisible(true); }} /> - - )} + } + /> { > - +
); }} diff --git a/src/apps/console/routes/_.$account.container-registry.repos/tools.tsx b/src/apps/console/routes/_.$account.packages.repos/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.container-registry.repos/tools.tsx rename to src/apps/console/routes/_.$account.packages.repos/tools.tsx diff --git a/src/apps/console/routes/_.$account.container-registry.tsx b/src/apps/console/routes/_.$account.packages.tsx similarity index 63% rename from src/apps/console/routes/_.$account.container-registry.tsx rename to src/apps/console/routes/_.$account.packages.tsx index 6b52437f3..908c69da1 100644 --- a/src/apps/console/routes/_.$account.container-registry.tsx +++ b/src/apps/console/routes/_.$account.packages.tsx @@ -1,21 +1,18 @@ import { Outlet, useOutletContext } from '@remix-run/react'; -import { useSubNavData } from '~/root/lib/client/hooks/use-create-subnav-action'; import SidebarLayout from '../components/sidebar-layout'; import { IAccountContext } from './_.$account'; const ContainerRegistry = () => { const rootContext = useOutletContext(); - const subNavAction = useSubNavData(); return ( diff --git a/src/apps/console/routes/_.$account.repo_.$repo.images/route.tsx b/src/apps/console/routes/_.$account.repo_.$repo.images/route.tsx index abaaed906..cf2b6a218 100644 --- a/src/apps/console/routes/_.$account.repo_.$repo.images/route.tsx +++ b/src/apps/console/routes/_.$account.repo_.$repo.images/route.tsx @@ -33,24 +33,6 @@ export const loader = async (ctx: IRemixCtx) => { return defer({ promise }); }; -const Tabs = () => { - const { account } = useParams(); - return ( - - ); -}; - -export const handle = () => { - return { - navbar: , - }; -}; - const Images = () => { const { promise } = useLoaderData(); return ( diff --git a/src/apps/console/routes/_.$account.repo_.$repo.tsx b/src/apps/console/routes/_.$account.repo_.$repo.tsx index d1570fc4c..10c7000a9 100644 --- a/src/apps/console/routes/_.$account.repo_.$repo.tsx +++ b/src/apps/console/routes/_.$account.repo_.$repo.tsx @@ -1,27 +1,61 @@ -import { Outlet, useOutletContext, useParams } from '@remix-run/react'; +import { Link, Outlet, useOutletContext, useParams } from '@remix-run/react'; import { useSubNavData } from '~/root/lib/client/hooks/use-create-subnav-action'; +import { ChevronRight } from '@jengaicons/react'; import SidebarLayout from '../components/sidebar-layout'; -import { IProjectContext } from './_.$account.$cluster.$project'; +import { IProjectContext } from './_.$account.infra.$cluster.$project'; +import { CommonTabs } from '../components/common-navbar-tabs'; +import Breadcrum from '../components/breadcrum'; +import { ExtractNodeType, parseName } from '../server/r-utils/common'; +import { constants } from '../server/utils/constants'; +import Wrapper from '../components/wrapper'; -const Repo = () => { - const rootContext = useOutletContext(); - const subNavAction = useSubNavData(); +const NetworkBreadcrum = () => { + const { repo, account } = useParams(); + return ( +
+ + Packages {' '} +
+ } + /> + {repo}} /> +
+ ); +}; - const { repo } = useParams(); +export const handle = () => { + return { + navbar: constants.nan, + breadcrum: () => , + }; +}; +const Repo = () => { + const rootContext = useOutletContext(); return ( - + // + // + - + ); }; diff --git a/src/apps/console/routes/_.$account.repo_.$repo_.$build._index/route.tsx b/src/apps/console/routes/_.$account.repo_.$repo_.$build._index/route.tsx index 7bdc9f2c9..701f53ec8 100644 --- a/src/apps/console/routes/_.$account.repo_.$repo_.$build._index/route.tsx +++ b/src/apps/console/routes/_.$account.repo_.$repo_.$build._index/route.tsx @@ -8,7 +8,6 @@ import { GQLServerHandler } from '~/console/server/gql/saved-queries'; import { getPagination, getSearch } from '~/console/server/utils/common'; import { defer } from '@remix-run/node'; import fake from '~/root/fake-data-generator/fake'; -import BuildRunResources from '../_.$account.$cluster.storage/storage-resources'; import Tools from './tools'; export const loader = async (ctx: IRemixCtx) => { diff --git a/src/apps/console/routes/_.$account.settings.general.tsx b/src/apps/console/routes/_.$account.settings.general.tsx index 062cc7c97..6441804a7 100644 --- a/src/apps/console/routes/_.$account.settings.general.tsx +++ b/src/apps/console/routes/_.$account.settings.general.tsx @@ -18,6 +18,7 @@ import { IAccount } from '../server/gql/queries/access-queries'; import { ConsoleApiType } from '../server/gql/saved-queries'; import { IAccountContext } from './_.$account'; import { parseName } from '../server/r-utils/common'; +import SecondarySubHeader from '../components/secondary-sub-header'; export const updateAccount = async ({ api, @@ -82,91 +83,102 @@ const SettingGeneral = () => { }, [account]); return ( - <> - - {values.displayName !== account.displayName && ( - <> -
+ ) + } + /> - -
- } />{' '} -
- -
-
- - -
- } - /> +
+ +
+ } />{' '} +
-
- - +
+ } + /> +
+
+ - - -
- } - disabled - /> + +
+ } + disabled + /> +
-
- + - {}}> - Permanently remove your personal account and all of its contents from - the Kloudlite platform. This action is not reversible, so please - continue with caution. - - + {}}> + Permanently remove your personal account and all of its contents from + the Kloudlite platform. This action is not reversible, so please + continue with caution. + +
+
); }; export default SettingGeneral; diff --git a/src/apps/console/routes/_.$account.settings.tsx b/src/apps/console/routes/_.$account.settings.tsx index 04436c51e..5d5e69ada 100644 --- a/src/apps/console/routes/_.$account.settings.tsx +++ b/src/apps/console/routes/_.$account.settings.tsx @@ -1,10 +1,8 @@ import { Outlet, useOutletContext } from '@remix-run/react'; -import { useSubNavData } from '~/root/lib/client/hooks/use-create-subnav-action'; import SidebarLayout from '../components/sidebar-layout'; const Settings = () => { const rootContext = useOutletContext(); - const subNavAction = useSubNavData(); return ( { { label: 'Cloud providers', value: 'cloud-providers' }, ]} parentPath="/settings" - headerTitle="Settings" - headerActions={subNavAction.data} + // headerTitle="Settings" + // headerActions={subNavAction.data} > diff --git a/src/apps/console/routes/_.$account.settings.user-management/route.tsx b/src/apps/console/routes/_.$account.settings.user-management/route.tsx index cc9bf14c7..e5f831002 100644 --- a/src/apps/console/routes/_.$account.settings.user-management/route.tsx +++ b/src/apps/console/routes/_.$account.settings.user-management/route.tsx @@ -212,7 +212,7 @@ const SettingUserManagement = () => { return (
-
+
{ key={name} onClick={() => { if (accountName !== name) { - navigate(`/${name}/projects`); + navigate(`/${name}/infra/clusters`); } }} active={accountName === name} diff --git a/src/apps/console/routes/_/route.tsx b/src/apps/console/routes/_/route.tsx index c00577cfb..83da39fae 100644 --- a/src/apps/console/routes/_/route.tsx +++ b/src/apps/console/routes/_/route.tsx @@ -33,6 +33,13 @@ import { UnsavedChangesProvider } from '~/root/lib/client/hooks/use-unsaved-chan import { authBaseUrl } from '~/root/lib/configs/base-url.cjs'; import { UserMe } from '~/root/lib/server/gql/saved-queries'; import { IExtRemixCtx } from '~/root/lib/types/common'; +import { + Nodeless, + InfraAsCode, + CustomEnv, + Container as ContainerIcon, + GearSix, +} from '@jengaicons/react'; import HandleProfile from './handle-profile'; const restActions = (ctx: IExtRemixCtx) => { @@ -57,27 +64,43 @@ export const meta = () => { const AccountTabs = () => { const { account } = useParams(); + const iconSize = 16; return ( + + Infrastructure + + ), + to: '/infra', + value: '/infra', }, { - label: 'Container registry', - to: '/container-registry/repos', - value: '/container-registry', + label: ( + + + Packages + + ), + to: '/packages/repos', + value: '/packages', }, { - label: 'Settings', + label: ( + + + Settings + + ), to: '/settings', value: '/settings', }, @@ -89,7 +112,7 @@ const AccountTabs = () => { const Logo = () => { const { account } = useParams(); return ( - + ); diff --git a/src/apps/console/routes/_a.onboarding.$a.$cloudprovider.validate-cp.tsx b/src/apps/console/routes/_a.onboarding.$a.$cloudprovider.validate-cp.tsx index d8fb93dc8..7bb893a72 100644 --- a/src/apps/console/routes/_a.onboarding.$a.$cloudprovider.validate-cp.tsx +++ b/src/apps/console/routes/_a.onboarding.$a.$cloudprovider.validate-cp.tsx @@ -232,7 +232,7 @@ const Validator = ({ cloudProvider }: { cloudProvider: any }) => { setShow={setShowUnsavedChanges} onSubmit={() => { setShowUnsavedChanges(false); - navigate(`/${parseName(account)}/clusters`); + navigate(`/${parseName(account)}/infra/clusters`); }} /> diff --git a/src/apps/console/routes/_a.teams.tsx b/src/apps/console/routes/_a.teams.tsx index 5d09ec069..27f23faf4 100644 --- a/src/apps/console/routes/_a.teams.tsx +++ b/src/apps/console/routes/_a.teams.tsx @@ -152,7 +152,7 @@ const Accounts = () => { inviteToken, api: api.acceptInvitation, success: () => { - navigate(`/${accountName}/projects`); + navigate(`/${accountName}/infra/clusters`); }, }); }; @@ -206,7 +206,7 @@ const Accounts = () => { const { isInvite, displayName, inviteToken } = account; return ( { }; const groupRender = ({ label }: IGroupRender) => { + // return null; return (
{label}
); @@ -72,6 +73,7 @@ const Select = (
)} { const c = cn( 'rounded flex flex-row items-center border bodyMd outline-none cursor-default', diff --git a/src/design-system/components/atoms/tabs.tsx b/src/design-system/components/atoms/tabs.tsx index 575beb208..4deb5253d 100644 --- a/src/design-system/components/atoms/tabs.tsx +++ b/src/design-system/components/atoms/tabs.tsx @@ -24,7 +24,7 @@ interface IBase { } interface ITabBase extends IBase { - label: ReactNode; + label: ReactNode | ((active: boolean) => ReactNode); active?: boolean; onClick?: (e: KeyboardEvent) => void; prefix?: JSX.Element; @@ -40,7 +40,7 @@ interface ITabs extends IBase { export interface ITab { to?: string; - label: ReactNode; + label: ReactNode | ((active: boolean) => ReactNode); prefix?: JSX.Element; value: T; } @@ -121,7 +121,7 @@ const TabBase = ({ > {!!prefix && React.cloneElement(prefix, { size: 16, color: 'currentColor' })} - {label} + {typeof label === 'function' ? label(active) : label} {active && variant === 'plain' && ( diff --git a/src/generated/gql/server.ts b/src/generated/gql/server.ts index 224b1993e..9ce528bc9 100644 --- a/src/generated/gql/server.ts +++ b/src/generated/gql/server.ts @@ -3544,7 +3544,10 @@ export type AuthCli_GetKubeConfigQueryVariables = Exact<{ }>; export type AuthCli_GetKubeConfigQuery = { - infra_getCluster?: { adminKubeconfig?: { encoding: string; value: string } }; + infra_getCluster?: { + adminKubeconfig?: { encoding: string; value: string }; + status?: { isReady: boolean }; + }; }; export type AuthCli_ListClustersQueryVariables = Exact<{ @@ -3553,7 +3556,13 @@ export type AuthCli_ListClustersQueryVariables = Exact<{ export type AuthCli_ListClustersQuery = { infra_listClusters?: { - edges: Array<{ node: { displayName: string; metadata: { name: string } } }>; + edges: Array<{ + node: { + displayName: string; + metadata: { name: string }; + status?: { isReady: boolean }; + }; + }>; }; }; @@ -3563,7 +3572,6 @@ export type AuthCli_ListAccountsQueryVariables = Exact<{ export type AuthCli_ListAccountsQuery = { accounts_listAccounts?: Array<{ - id: string; displayName: string; metadata?: { name: string }; }>; From f31a00fe4aed2716a9df237db6d6708a60c7974c Mon Sep 17 00:00:00 2001 From: Abdhesh Nayak Date: Mon, 25 Dec 2023 17:43:14 +0530 Subject: [PATCH 4/6] :recycle: Updated flat-file structure to nested directory structure in console app. --- .../helpers/execute-query-with-context.ts | 2 + pnpm-lock.yaml | 8 +- src/apps/console/components/id-selector.tsx | 2 +- .../page-components/config-resource.tsx | 2 +- .../console/page-components/new-cluster.tsx | 5 +- .../console/page-components/new-project.tsx | 4 +- .../page-components/secret-resource.tsx | 2 +- .../util.tsx | 0 .../route.tsx | 76 ----------------- .../tools.tsx | 31 ------- .../route.tsx | 83 ------------------- .../routes/_.$account.infra.clusters.tsx | 8 -- .../routes/_.$account.settings._index.tsx | 5 -- src/apps/console/routes/{ => _404+}/$.tsx | 0 .../routes/{ => _a+}/_a.$a.new-cluster.tsx | 10 +-- .../routes/{ => _a+}/_a.$a.new-project.tsx | 9 +- src/apps/console/routes/{ => _a+}/_a.$a.tsx | 2 +- .../console/routes/{ => _a+}/_a.new-team.tsx | 9 +- ...boarding.$a.$cloudprovider.new-cluster.tsx | 9 +- ...boarding.$a.$cloudprovider.validate-cp.tsx | 24 +++--- .../_a.onboarding.$a.$cluster.new-project.tsx | 7 +- .../_a.onboarding.$a.invite-team-members.tsx | 12 +-- .../_a.onboarding.$a.new-cloud-provider.tsx | 10 +-- .../routes/{ => _a+}/_a.onboarding.$a.tsx | 0 .../console/routes/{ => _a+}/_a.teams.tsx | 19 +++-- src/apps/console/routes/{ => _a+}/_a.tsx | 0 .../$project+/$scope+/$workspace+/_index.tsx} | 0 .../$scope+/$workspace+/_layout.tsx} | 3 +- .../$workspace+/app+/$app+/_index.tsx} | 0 .../$workspace+/app+/$app+/_index}/route.tsx | 3 +- .../app+/$app+/overview}/route.tsx | 0 .../app+/$app+/settings+/_index}/route.tsx | 3 +- .../app+/$app+/settings+/advance}/route.tsx | 3 +- .../app+/$app+/settings+/compute}/route.tsx | 11 +-- .../settings+/environment}/app-dialogs.tsx | 0 .../$app+/settings+/environment}/cs-item.tsx | 0 .../$app+/settings+/environment}/route.tsx | 7 +- .../app+/$app+/settings+/general}/route.tsx | 3 +- .../app+/$app+/settings+/network}/route.tsx | 6 +- .../$workspace+/apps}/apps-resources.tsx | 0 .../$scope+/$workspace+/apps}/route.tsx | 0 .../$scope+/$workspace+/apps}/tools.tsx | 0 .../backing-service+/$service/_index.tsx} | 3 +- .../resources}/handle-backend-resources.tsx | 4 +- .../$service/resources}/managed-resources.tsx | 0 .../$service/resources}/route.tsx | 10 +-- .../$service/resources}/tools.tsx | 0 .../backend-services-resources.tsx | 0 .../handle-backend-service.tsx | 5 +- .../$workspace+/backing-services}/route.tsx | 3 +- .../$workspace+/backing-services}/tools.tsx | 0 .../$workspace+/config.$config}/handle.tsx | 0 .../$workspace+/config.$config}/resources.tsx | 0 .../$workspace+/config.$config}/route.tsx | 0 .../$workspace+/config.$config}/tools.tsx | 0 .../$scope+/$workspace+/cs+/_index.tsx} | 0 .../$scope+/$workspace+/cs+/_layout.tsx} | 4 +- .../cs+/configs._index}/handle-config.tsx | 3 +- .../$workspace+/cs+/configs._index}/route.tsx | 0 .../$workspace+/cs+/configs._index}/tools.tsx | 0 .../cs+/secrets._index}/handle-secret.tsx | 3 +- .../$workspace+/cs+/secrets._index}/route.tsx | 0 .../$workspace+/cs+/secrets._index}/tools.tsx | 0 .../$scope+/$workspace+/jc+/_index}/route.tsx | 0 .../$workspace+/jc+/scheduledtask}/route.tsx | 0 .../$scope+/$workspace+/jc+/task}/route.tsx | 0 .../$workspace+/jc+/taskruns}/route.tsx | 0 .../$scope+/$workspace+/managed-services.tsx} | 0 .../$workspace+/new-app}/app-compute.tsx | 2 +- .../$workspace+/new-app}/app-detail.tsx | 4 +- .../$workspace+/new-app}/app-dialogs.tsx | 0 .../new-app}/app-environment-mounts.tsx | 0 .../new-app}/app-environment-variables.tsx | 0 .../$workspace+/new-app}/app-environment.tsx | 2 +- .../$workspace+/new-app}/app-network.tsx | 2 +- .../$workspace+/new-app}/app-review.tsx | 2 +- .../$scope+/$workspace+/new-app}/cs-item.tsx | 0 .../$scope+/$workspace+/new-app}/datas.ts | 0 .../$scope+/$workspace+/new-app}/route.tsx | 4 +- .../$scope+/$workspace+/routers}/route.tsx | 0 .../$scope+/$workspace+/routers}/tools.tsx | 0 .../$workspace+/secret.$secret}/handle.tsx | 0 .../$workspace+/secret.$secret}/resources.tsx | 0 .../$workspace+/secret.$secret}/route.tsx | 0 .../$workspace+/secret.$secret}/tools.tsx | 0 .../$workspace+/settings+/_layout.tsx} | 4 +- .../$workspace+/settings+/general}/route.tsx | 2 +- .../$cluster+/$project+/$scope+/_index.tsx} | 0 .../$cluster+/$project+/$scope+/_layout.tsx} | 10 +-- .../$account+/$cluster+/$project+/_index.tsx} | 0 .../$cluster+/$project+/_layout.tsx} | 10 +-- .../$project+/environments}/resources.tsx | 0 .../$project+/environments}/route.tsx | 8 +- .../$project+/environments}/tools.tsx | 0 .../$cluster+/$project+/settings+/_index.tsx} | 0 .../$project+/settings+/_layout.tsx} | 4 +- .../access-management}/handle-user.tsx | 0 .../settings+/access-management}/resource.tsx | 0 .../settings+/access-management}/route.tsx | 0 .../settings+/access-management}/tools.tsx | 0 .../$project+/settings+/general}/route.tsx | 3 +- .../$project+/workspaces}/resources.tsx | 0 .../$cluster+/$project+/workspaces}/route.tsx | 8 +- .../$cluster+/$project+/workspaces}/tools.tsx | 0 .../_.$account.repo_.$repo._index.tsx | 0 .../_.$account.repo_.$repo.builds.tsx | 0 .../$account+}/_.$account.repo_.$repo.tsx | 12 +-- .../$account+/_index.tsx} | 2 +- .../$account+/_layout.tsx} | 17 ++-- .../$account+/infra+/$cluster+/_index.tsx} | 0 .../$account+/infra+/$cluster+/_layout.tsx} | 19 ++--- .../infra+/$cluster+/network+/_layout.tsx} | 4 +- .../network+/domain}/domain-detail.tsx | 3 +- .../network+/domain}/domain-resources.tsx | 0 .../network+/domain}/handle-domain.tsx | 0 .../$cluster+/network+/domain}/route.tsx | 0 .../$cluster+/network+/domain}/tools.tsx | 0 .../network+/vpn}/devices-resources.tsx | 0 .../network+/vpn}/handle-devices.tsx | 6 +- .../infra+/$cluster+/network+/vpn}/route.tsx | 0 .../infra+/$cluster+/network+/vpn}/tools.tsx | 0 .../$cluster+/nodepools}/handle-nodepool.tsx | 4 +- .../nodepools}/nodepool-resources.tsx | 0 .../$cluster+/nodepools}/nodepool-utils.tsx | 0 .../$cluster+/nodepools}/resources_b.tsx | 0 .../infra+/$cluster+/nodepools}/route.tsx | 1 - .../nodepools}/taints-and-labels.tsx | 0 .../infra+/$cluster+/nodepools}/tools.tsx | 0 .../infra+/$cluster+/np.$nodepool}/route.tsx | 3 +- .../infra+/$cluster+/overview+/_index.tsx} | 0 .../infra+/$cluster+/overview+/_layout.tsx} | 3 +- .../$cluster+/overview+/info}/route.tsx | 2 +- .../$cluster+/overview+/metrics}/route.tsx | 0 .../infra+/$cluster+/settings+/_layout.tsx} | 2 +- .../$cluster+/settings+/general}/route.tsx | 3 +- .../infra+/$cluster+/storage}/route.tsx | 0 .../$cluster+/storage}/storage-resources.tsx | 0 .../infra+/$cluster+/storage}/tools.tsx | 0 .../$account+/infra+/_index.tsx} | 0 .../$account+/infra+/_layout.tsx} | 3 +- .../infra+/clusters}/cluster-resources.tsx | 0 .../$account+/infra+/clusters}/route.tsx | 6 +- .../$account+/infra+/clusters}/tools.tsx | 0 .../$account+/infra+/vms.tsx} | 2 +- .../$account+/packages+/_index.tsx} | 0 .../$account+/packages+/_layout.tsx} | 4 +- .../access-management}/cred-resources.tsx | 0 .../access-management}/handle-cr-cred.tsx | 0 .../packages+/access-management}/route.tsx | 0 .../packages+/access-management}/tools.tsx | 0 .../$account+/packages+/helm-repos.tsx} | 2 +- .../packages+/repos}/handle-repo.tsx | 0 .../packages+/repos}/repo-resources.tsx | 0 .../$account+/packages+/repos}/route.tsx | 0 .../$account+/packages+/repos}/tools.tsx | 0 .../$account+/projects}/project-resources.tsx | 0 .../$account+/projects}/route.tsx | 4 +- .../$account+/projects}/tools.tsx | 0 .../repo+/$build}/buildruns-resources.tsx | 0 .../$account+/repo+/$build}/route.tsx | 0 .../$account+/repo+/$build}/tools.tsx | 0 .../buildcaches}/build-caches-resources.tsx | 0 .../repo+/buildcaches}/handle-build-cache.tsx | 0 .../$account+/repo+/buildcaches}/route.tsx | 0 .../$account+/repo+/buildcaches}/tools.tsx | 0 .../repo+/builds}/build-resources.tsx | 0 .../$account+/repo+/builds}/handle-builds.tsx | 0 .../$account+/repo+/builds}/route.tsx | 0 .../$account+/repo+/builds}/tools.tsx | 0 .../$account+/repo+/images}/route.tsx | 0 .../$account+/repo+/images}/sha-dialog.tsx | 0 .../repo+/images}/tags-resources.tsx | 0 .../$account+/repo+/images}/tools.tsx | 0 .../repo+/new-build}/build-details.tsx | 0 .../repo+/new-build}/configure-git-repo.tsx | 4 +- .../repo+/new-build}/repo-selector.tsx | 0 .../$account+/repo+/new-build}/route.tsx | 2 +- .../$account+/settings+/_index.tsx} | 0 .../$account+/settings+/_layout.tsx} | 2 +- .../$account+/settings+/billing.tsx} | 0 .../cloud-providers}/handle-provider.tsx | 0 .../cloud-providers}/provider-resources.tsx | 0 .../settings+/cloud-providers}/route.tsx | 3 +- .../settings+/cloud-providers}/tools.tsx | 0 .../$account+/settings+/general.tsx} | 22 +++-- .../$account+/settings+/sample.tsx} | 11 ++- .../user-management}/handle-user.tsx | 2 +- .../settings+/user-management}/route.tsx | 2 +- .../settings+/user-management}/tools.tsx | 0 .../user-management}/user-access-resource.tsx | 2 +- .../{_._index.tsx => _main+/_index.tsx} | 0 .../route.tsx => _main+/_layout/_layout.tsx} | 0 .../{_ => _main+/_layout}/handle-profile.tsx | 0 .../server/gql/queries/access-queries.ts | 4 - 194 files changed, 222 insertions(+), 412 deletions(-) rename src/apps/console/{routes/_.$account.$cluster.$project.$scope.$workspace.new-app => page-components}/util.tsx (100%) delete mode 100644 src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.logs/route.tsx delete mode 100644 src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.logs/tools.tsx delete mode 100644 src/apps/console/routes/_.$account.infra.$cluster.overview.logs/route.tsx delete mode 100644 src/apps/console/routes/_.$account.infra.clusters.tsx delete mode 100644 src/apps/console/routes/_.$account.settings._index.tsx rename src/apps/console/routes/{ => _404+}/$.tsx (100%) rename src/apps/console/routes/{ => _a+}/_a.$a.new-cluster.tsx (70%) rename src/apps/console/routes/{ => _a+}/_a.$a.new-project.tsx (67%) rename src/apps/console/routes/{ => _a+}/_a.$a.tsx (90%) rename src/apps/console/routes/{ => _a+}/_a.new-team.tsx (93%) rename src/apps/console/routes/{ => _a+}/_a.onboarding.$a.$cloudprovider.new-cluster.tsx (75%) rename src/apps/console/routes/{ => _a+}/_a.onboarding.$a.$cloudprovider.validate-cp.tsx (90%) rename src/apps/console/routes/{ => _a+}/_a.onboarding.$a.$cluster.new-project.tsx (73%) rename src/apps/console/routes/{ => _a+}/_a.onboarding.$a.invite-team-members.tsx (95%) rename src/apps/console/routes/{ => _a+}/_a.onboarding.$a.new-cloud-provider.tsx (94%) rename src/apps/console/routes/{ => _a+}/_a.onboarding.$a.tsx (100%) rename src/apps/console/routes/{ => _a+}/_a.teams.tsx (93%) rename src/apps/console/routes/{ => _a+}/_a.tsx (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.$project.$scope.$workspace._index.tsx => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/_index.tsx} (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace/route.tsx => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/_layout.tsx} (99%) rename src/apps/console/routes/{_.$account.infra.$cluster.$project.$scope.$workspace.app.$app._index.tsx => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/_index.tsx} (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.app.$app => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/_index}/route.tsx (98%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.app.$app.overview => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/overview}/route.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.app.$app.settings => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/_index}/route.tsx (89%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.advance => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/advance}/route.tsx (96%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.compute => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/compute}/route.tsx (97%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.environment => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/environment}/app-dialogs.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.environment => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/environment}/cs-item.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.environment => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/environment}/route.tsx (81%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.general => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/general}/route.tsx (96%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.network => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/network}/route.tsx (62%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.apps => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/apps}/apps-resources.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.apps => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/apps}/route.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.apps => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/apps}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.backing-service.$service/route.tsx => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-service+/$service/_index.tsx} (96%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-service+/$service/resources}/handle-backend-resources.tsx (96%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-service+/$service/resources}/managed-resources.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-service+/$service/resources}/route.tsx (93%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-service+/$service/resources}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.backing-services => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-services}/backend-services-resources.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.backing-services => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-services}/handle-backend-service.tsx (98%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.backing-services => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-services}/route.tsx (97%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.backing-services => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-services}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.config.$config => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/config.$config}/handle.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.config.$config => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/config.$config}/resources.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.config.$config => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/config.$config}/route.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.config.$config => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/config.$config}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.$project.$scope.$workspace.cs._index.tsx => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/_index.tsx} (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.$project.$scope.$workspace.cs.tsx => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/_layout.tsx} (82%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.cs.configs._index => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/configs._index}/handle-config.tsx (97%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.cs.configs._index => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/configs._index}/route.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.cs.configs._index => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/configs._index}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.cs.secrets._index => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/secrets._index}/handle-secret.tsx (97%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.cs.secrets._index => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/secrets._index}/route.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.cs.secrets._index => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/secrets._index}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.jc => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/jc+/_index}/route.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.jc.scheduledtask => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/jc+/scheduledtask}/route.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.jc.task => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/jc+/task}/route.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.jc.taskruns => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/jc+/taskruns}/route.tsx (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.$project.$scope.$workspace.managed-services.tsx => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/managed-services.tsx} (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.new-app => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app}/app-compute.tsx (99%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.new-app => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app}/app-detail.tsx (95%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.new-app => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app}/app-dialogs.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.new-app => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app}/app-environment-mounts.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.new-app => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app}/app-environment-variables.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.new-app => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app}/app-environment.tsx (97%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.new-app => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app}/app-network.tsx (98%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.new-app => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app}/app-review.tsx (98%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.new-app => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app}/cs-item.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.new-app => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app}/datas.ts (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.new-app => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app}/route.tsx (95%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.routers => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/routers}/route.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.routers => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/routers}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.secret.$secret => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/secret.$secret}/handle.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.secret.$secret => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/secret.$secret}/resources.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.secret.$secret => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/secret.$secret}/route.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.secret.$secret => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/secret.$secret}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.$project.$scope.$workspace.settings.tsx => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/settings+/_layout.tsx} (79%) rename src/apps/console/routes/{_.$account.$cluster.$project.$scope.$workspace.settings.general => _main+/$account+/$cluster+/$project+/$scope+/$workspace+/settings+/general}/route.tsx (98%) rename src/apps/console/routes/{_.$account.infra.$cluster.$project.$scope._index.tsx => _main+/$account+/$cluster+/$project+/$scope+/_index.tsx} (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.$project.$scope.tsx => _main+/$account+/$cluster+/$project+/$scope+/_layout.tsx} (83%) rename src/apps/console/routes/{_.$account.infra.$cluster.$project._index.tsx => _main+/$account+/$cluster+/$project+/_index.tsx} (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.$project.tsx => _main+/$account+/$cluster+/$project+/_layout.tsx} (83%) rename src/apps/console/routes/{_.$account.$cluster.$project.environments => _main+/$account+/$cluster+/$project+/environments}/resources.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.environments => _main+/$account+/$cluster+/$project+/environments}/route.tsx (95%) rename src/apps/console/routes/{_.$account.$cluster.$project.environments => _main+/$account+/$cluster+/$project+/environments}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.$project.settings._index.tsx => _main+/$account+/$cluster+/$project+/settings+/_index.tsx} (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.$project.settings.tsx => _main+/$account+/$cluster+/$project+/settings+/_layout.tsx} (83%) rename src/apps/console/routes/{_.$account.$cluster.$project.settings.access-management => _main+/$account+/$cluster+/$project+/settings+/access-management}/handle-user.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.settings.access-management => _main+/$account+/$cluster+/$project+/settings+/access-management}/resource.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.settings.access-management => _main+/$account+/$cluster+/$project+/settings+/access-management}/route.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.settings.access-management => _main+/$account+/$cluster+/$project+/settings+/access-management}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.settings.general => _main+/$account+/$cluster+/$project+/settings+/general}/route.tsx (98%) rename src/apps/console/routes/{_.$account.$cluster.$project.workspaces => _main+/$account+/$cluster+/$project+/workspaces}/resources.tsx (100%) rename src/apps/console/routes/{_.$account.$cluster.$project.workspaces => _main+/$account+/$cluster+/$project+/workspaces}/route.tsx (95%) rename src/apps/console/routes/{_.$account.$cluster.$project.workspaces => _main+/$account+/$cluster+/$project+/workspaces}/tools.tsx (100%) rename src/apps/console/routes/{ => _main+/$account+}/_.$account.repo_.$repo._index.tsx (100%) rename src/apps/console/routes/{ => _main+/$account+}/_.$account.repo_.$repo.builds.tsx (100%) rename src/apps/console/routes/{ => _main+/$account+}/_.$account.repo_.$repo.tsx (73%) rename src/apps/console/routes/{_.$account._index.tsx => _main+/$account+/_index.tsx} (84%) rename src/apps/console/routes/{_.$account.tsx => _main+/$account+/_layout.tsx} (92%) rename src/apps/console/routes/{_.$account.infra.$cluster._index.tsx => _main+/$account+/infra+/$cluster+/_index.tsx} (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.tsx => _main+/$account+/infra+/$cluster+/_layout.tsx} (84%) rename src/apps/console/routes/{_.$account.infra.$cluster.network.tsx => _main+/$account+/infra+/$cluster+/network+/_layout.tsx} (79%) rename src/apps/console/routes/{_.$account.infra.$cluster.network.domain => _main+/$account+/infra+/$cluster+/network+/domain}/domain-detail.tsx (96%) rename src/apps/console/routes/{_.$account.infra.$cluster.network.domain => _main+/$account+/infra+/$cluster+/network+/domain}/domain-resources.tsx (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.network.domain => _main+/$account+/infra+/$cluster+/network+/domain}/handle-domain.tsx (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.network.domain => _main+/$account+/infra+/$cluster+/network+/domain}/route.tsx (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.network.domain => _main+/$account+/infra+/$cluster+/network+/domain}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.network.vpn => _main+/$account+/infra+/$cluster+/network+/vpn}/devices-resources.tsx (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.network.vpn => _main+/$account+/infra+/$cluster+/network+/vpn}/handle-devices.tsx (99%) rename src/apps/console/routes/{_.$account.infra.$cluster.network.vpn => _main+/$account+/infra+/$cluster+/network+/vpn}/route.tsx (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.network.vpn => _main+/$account+/infra+/$cluster+/network+/vpn}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.nodepools => _main+/$account+/infra+/$cluster+/nodepools}/handle-nodepool.tsx (99%) rename src/apps/console/routes/{_.$account.infra.$cluster.nodepools => _main+/$account+/infra+/$cluster+/nodepools}/nodepool-resources.tsx (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.nodepools => _main+/$account+/infra+/$cluster+/nodepools}/nodepool-utils.tsx (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.nodepools => _main+/$account+/infra+/$cluster+/nodepools}/resources_b.tsx (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.nodepools => _main+/$account+/infra+/$cluster+/nodepools}/route.tsx (98%) rename src/apps/console/routes/{_.$account.infra.$cluster.nodepools => _main+/$account+/infra+/$cluster+/nodepools}/taints-and-labels.tsx (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.nodepools => _main+/$account+/infra+/$cluster+/nodepools}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.np.$nodepool => _main+/$account+/infra+/$cluster+/np.$nodepool}/route.tsx (99%) rename src/apps/console/routes/{_.$account.infra.$cluster.overview._index.tsx => _main+/$account+/infra+/$cluster+/overview+/_index.tsx} (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.overview/route.tsx => _main+/$account+/infra+/$cluster+/overview+/_layout.tsx} (92%) rename src/apps/console/routes/{_.$account.infra.$cluster.overview.info => _main+/$account+/infra+/$cluster+/overview+/info}/route.tsx (98%) rename src/apps/console/routes/{_.$account.infra.$cluster.overview.metrics => _main+/$account+/infra+/$cluster+/overview+/metrics}/route.tsx (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.settings.tsx => _main+/$account+/infra+/$cluster+/settings+/_layout.tsx} (89%) rename src/apps/console/routes/{_.$account.infra.$cluster.settings.general => _main+/$account+/infra+/$cluster+/settings+/general}/route.tsx (99%) rename src/apps/console/routes/{_.$account.infra.$cluster.storage => _main+/$account+/infra+/$cluster+/storage}/route.tsx (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.storage => _main+/$account+/infra+/$cluster+/storage}/storage-resources.tsx (100%) rename src/apps/console/routes/{_.$account.infra.$cluster.storage => _main+/$account+/infra+/$cluster+/storage}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.infra._index/route.tsx => _main+/$account+/infra+/_index.tsx} (100%) rename src/apps/console/routes/{_.$account.infra.tsx => _main+/$account+/infra+/_layout.tsx} (92%) rename src/apps/console/routes/{_.$account.infra.clusters._index => _main+/$account+/infra+/clusters}/cluster-resources.tsx (100%) rename src/apps/console/routes/{_.$account.infra.clusters._index => _main+/$account+/infra+/clusters}/route.tsx (95%) rename src/apps/console/routes/{_.$account.infra.clusters._index => _main+/$account+/infra+/clusters}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.infra.vms.tsx => _main+/$account+/infra+/vms.tsx} (58%) rename src/apps/console/routes/{_.$account.packages._index.tsx => _main+/$account+/packages+/_index.tsx} (100%) rename src/apps/console/routes/{_.$account.packages.tsx => _main+/$account+/packages+/_layout.tsx} (82%) rename src/apps/console/routes/{_.$account.packages.access-management => _main+/$account+/packages+/access-management}/cred-resources.tsx (100%) rename src/apps/console/routes/{_.$account.packages.access-management => _main+/$account+/packages+/access-management}/handle-cr-cred.tsx (100%) rename src/apps/console/routes/{_.$account.packages.access-management => _main+/$account+/packages+/access-management}/route.tsx (100%) rename src/apps/console/routes/{_.$account.packages.access-management => _main+/$account+/packages+/access-management}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.packages.helm-repos.tsx => _main+/$account+/packages+/helm-repos.tsx} (63%) rename src/apps/console/routes/{_.$account.packages.repos => _main+/$account+/packages+/repos}/handle-repo.tsx (100%) rename src/apps/console/routes/{_.$account.packages.repos => _main+/$account+/packages+/repos}/repo-resources.tsx (100%) rename src/apps/console/routes/{_.$account.packages.repos => _main+/$account+/packages+/repos}/route.tsx (100%) rename src/apps/console/routes/{_.$account.packages.repos => _main+/$account+/packages+/repos}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.projects._index => _main+/$account+/projects}/project-resources.tsx (100%) rename src/apps/console/routes/{_.$account.projects._index => _main+/$account+/projects}/route.tsx (97%) rename src/apps/console/routes/{_.$account.projects._index => _main+/$account+/projects}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.repo_.$repo_.$build._index => _main+/$account+/repo+/$build}/buildruns-resources.tsx (100%) rename src/apps/console/routes/{_.$account.repo_.$repo_.$build._index => _main+/$account+/repo+/$build}/route.tsx (100%) rename src/apps/console/routes/{_.$account.repo_.$repo_.$build._index => _main+/$account+/repo+/$build}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.repo_.$repo.buildcaches => _main+/$account+/repo+/buildcaches}/build-caches-resources.tsx (100%) rename src/apps/console/routes/{_.$account.repo_.$repo.buildcaches => _main+/$account+/repo+/buildcaches}/handle-build-cache.tsx (100%) rename src/apps/console/routes/{_.$account.repo_.$repo.buildcaches => _main+/$account+/repo+/buildcaches}/route.tsx (100%) rename src/apps/console/routes/{_.$account.repo_.$repo.buildcaches => _main+/$account+/repo+/buildcaches}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.repo_.$repo.builds._index => _main+/$account+/repo+/builds}/build-resources.tsx (100%) rename src/apps/console/routes/{_.$account.repo_.$repo.builds._index => _main+/$account+/repo+/builds}/handle-builds.tsx (100%) rename src/apps/console/routes/{_.$account.repo_.$repo.builds._index => _main+/$account+/repo+/builds}/route.tsx (100%) rename src/apps/console/routes/{_.$account.repo_.$repo.builds._index => _main+/$account+/repo+/builds}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.repo_.$repo.images => _main+/$account+/repo+/images}/route.tsx (100%) rename src/apps/console/routes/{_.$account.repo_.$repo.images => _main+/$account+/repo+/images}/sha-dialog.tsx (100%) rename src/apps/console/routes/{_.$account.repo_.$repo.images => _main+/$account+/repo+/images}/tags-resources.tsx (100%) rename src/apps/console/routes/{_.$account.repo_.$repo.images => _main+/$account+/repo+/images}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.repo_.$repo_.new-build => _main+/$account+/repo+/new-build}/build-details.tsx (100%) rename src/apps/console/routes/{_.$account.repo_.$repo_.new-build => _main+/$account+/repo+/new-build}/configure-git-repo.tsx (93%) rename src/apps/console/routes/{_.$account.repo_.$repo_.new-build => _main+/$account+/repo+/new-build}/repo-selector.tsx (100%) rename src/apps/console/routes/{_.$account.repo_.$repo_.new-build => _main+/$account+/repo+/new-build}/route.tsx (97%) rename src/apps/console/routes/{_.$account.infra.$cluster.settings._index.tsx => _main+/$account+/settings+/_index.tsx} (100%) rename src/apps/console/routes/{_.$account.settings.tsx => _main+/$account+/settings+/_layout.tsx} (89%) rename src/apps/console/routes/{_.$account.settings.billing.tsx => _main+/$account+/settings+/billing.tsx} (100%) rename src/apps/console/routes/{_.$account.settings.cloud-providers => _main+/$account+/settings+/cloud-providers}/handle-provider.tsx (100%) rename src/apps/console/routes/{_.$account.settings.cloud-providers => _main+/$account+/settings+/cloud-providers}/provider-resources.tsx (100%) rename src/apps/console/routes/{_.$account.settings.cloud-providers => _main+/$account+/settings+/cloud-providers}/route.tsx (97%) rename src/apps/console/routes/{_.$account.settings.cloud-providers => _main+/$account+/settings+/cloud-providers}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.settings.general.tsx => _main+/$account+/settings+/general.tsx} (86%) rename src/apps/console/routes/{_.$account.settings.sample.tsx => _main+/$account+/settings+/sample.tsx} (91%) rename src/apps/console/routes/{_.$account.settings.user-management => _main+/$account+/settings+/user-management}/handle-user.tsx (98%) rename src/apps/console/routes/{_.$account.settings.user-management => _main+/$account+/settings+/user-management}/route.tsx (99%) rename src/apps/console/routes/{_.$account.settings.user-management => _main+/$account+/settings+/user-management}/tools.tsx (100%) rename src/apps/console/routes/{_.$account.settings.user-management => _main+/$account+/settings+/user-management}/user-access-resource.tsx (98%) rename src/apps/console/routes/{_._index.tsx => _main+/_index.tsx} (100%) rename src/apps/console/routes/{_/route.tsx => _main+/_layout/_layout.tsx} (100%) rename src/apps/console/routes/{_ => _main+/_layout}/handle-profile.tsx (100%) diff --git a/lib/server/helpers/execute-query-with-context.ts b/lib/server/helpers/execute-query-with-context.ts index 40e9c6edc..5f78191a7 100644 --- a/lib/server/helpers/execute-query-with-context.ts +++ b/lib/server/helpers/execute-query-with-context.ts @@ -10,6 +10,7 @@ import { IGqlReturn, NN, } from '../../types/common'; +import logger from '../../client/helpers/log'; const parseCookie = (cookieString: string) => { const [cookie] = cookieString.split(';'); @@ -127,6 +128,7 @@ export const ExecuteQueryWithContext = ( }; } finally { console.timeEnd(apiName); + console.trace(apiName); } }; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a5e6d8160..3460b03fb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -332,10 +332,10 @@ devDependencies: specifier: ^0.6.4 version: 0.6.4(@remix-run/dev@1.19.3) tailwindcss: - specifier: ^3.4.0 + specifier: ^3.3.2 version: 3.4.0 typescript: - specifier: ^5.3.3 + specifier: ^5.1.6 version: 5.3.3 typescript-json-schema: specifier: ^0.62.0 @@ -3864,7 +3864,7 @@ packages: peerDependencies: '@remix-run/dev': ^1.15.0 || ^2.0.0 dependencies: - '@remix-run/dev': 1.19.3(@remix-run/serve@1.19.3)(@types/node@16.18.64) + '@remix-run/dev': 1.19.3(@remix-run/serve@1.19.3)(@types/node@16.18.68) minimatch: 7.4.6 dev: true @@ -9322,7 +9322,7 @@ packages: peerDependencies: '@remix-run/dev': ^1.15.0 || ^2 dependencies: - '@remix-run/dev': 1.19.3(@remix-run/serve@1.19.3)(@types/node@16.18.64) + '@remix-run/dev': 1.19.3(@remix-run/serve@1.19.3)(@types/node@16.18.68) '@remix-run/v1-route-convention': 0.1.4(@remix-run/dev@1.19.3) fs-extra: 11.2.0 minimatch: 5.1.6 diff --git a/src/apps/console/components/id-selector.tsx b/src/apps/console/components/id-selector.tsx index 7cf757b5b..ac56baefd 100644 --- a/src/apps/console/components/id-selector.tsx +++ b/src/apps/console/components/id-selector.tsx @@ -10,11 +10,11 @@ import useDebounce from '~/root/lib/client/hooks/use-debounce'; import { NonNullableString } from '~/root/lib/types/common'; import { handleError } from '~/root/lib/utils/common'; import { ConsoleResType, ResType } from '~/root/src/generated/gql/server'; -import { IWorkspaceContext } from '../routes/_.$account.$cluster.$project.$scope.$workspace/route'; import { ensureAccountClientSide, ensureClusterClientSide, } from '../server/utils/auth-utils'; +import { IWorkspaceContext } from '../routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/_layout'; interface IidSelector { name: string; diff --git a/src/apps/console/page-components/config-resource.tsx b/src/apps/console/page-components/config-resource.tsx index dec07a1e5..34c8da208 100644 --- a/src/apps/console/page-components/config-resource.tsx +++ b/src/apps/console/page-components/config-resource.tsx @@ -15,7 +15,6 @@ import DeleteDialog from '../components/delete-dialog'; import Grid from '../components/grid'; import ListGridView from '../components/list-grid-view'; import ResourceExtraAction from '../components/resource-extra-action'; -import { IWorkspaceContext } from '../routes/_.$account.$cluster.$project.$scope.$workspace/route'; import { useConsoleApi } from '../server/gql/api-provider'; import { IConfigs } from '../server/gql/queries/config-queries'; import { @@ -25,6 +24,7 @@ import { parseUpdateOrCreatedBy, parseUpdateOrCreatedOn, } from '../server/r-utils/common'; +import { IWorkspaceContext } from '../routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/_layout'; const RESOURCE_NAME = 'config'; type BaseType = ExtractNodeType; diff --git a/src/apps/console/page-components/new-cluster.tsx b/src/apps/console/page-components/new-cluster.tsx index 986bf811c..eafb738dd 100644 --- a/src/apps/console/page-components/new-cluster.tsx +++ b/src/apps/console/page-components/new-cluster.tsx @@ -13,7 +13,6 @@ import AlertModal from '../components/alert-modal'; import { IdSelector } from '../components/id-selector'; import RawWrapper, { TitleBox } from '../components/raw-wrapper'; import { constDatas, awsRegions } from '../dummy/consts'; -import { FadeIn } from '../routes/_.$account.$cluster.$project.$scope.$workspace.new-app/util'; import { useConsoleApi } from '../server/gql/api-provider'; import { IProviderSecret, @@ -27,7 +26,9 @@ import { validateClusterCloudProvider, } from '../server/r-utils/common'; import { ensureAccountClientSide } from '../server/utils/auth-utils'; -import { IAccountContext } from '../routes/_.$account'; +import { IAccountContext } from '../routes/_main+/$account+/_layout'; +import { FadeIn } from './util'; + type props = | { diff --git a/src/apps/console/page-components/new-project.tsx b/src/apps/console/page-components/new-project.tsx index b31a2750d..20c6eae10 100644 --- a/src/apps/console/page-components/new-project.tsx +++ b/src/apps/console/page-components/new-project.tsx @@ -23,14 +23,14 @@ import { IdSelector } from '../components/id-selector'; import NoResultsFound from '../components/no-results-found'; import RawWrapper, { TitleBox } from '../components/raw-wrapper'; import { SearchBox } from '../components/search-box'; -import { FadeIn } from '../routes/_.$account.$cluster.$project.$scope.$workspace.new-app/util'; -import { INewProjectFromAccountLoader } from '../routes/_a.$a.new-project'; import { parseName, parseNodes } from '../server/r-utils/common'; import { keyconstants } from '../server/r-utils/key-constants'; import { ensureAccountClientSide, ensureClusterClientSide, } from '../server/utils/auth-utils'; +import { INewProjectFromAccountLoader } from '../routes/_a+/_a.$a.new-project'; +import { FadeIn } from './util'; const NewProject = () => { const { cluster: clusterName } = useParams(); diff --git a/src/apps/console/page-components/secret-resource.tsx b/src/apps/console/page-components/secret-resource.tsx index 7746639a7..a7eb9ccd6 100644 --- a/src/apps/console/page-components/secret-resource.tsx +++ b/src/apps/console/page-components/secret-resource.tsx @@ -22,9 +22,9 @@ import DeleteDialog from '../components/delete-dialog'; import Grid from '../components/grid'; import ListGridView from '../components/list-grid-view'; import ResourceExtraAction from '../components/resource-extra-action'; -import { IWorkspaceContext } from '../routes/_.$account.$cluster.$project.$scope.$workspace/route'; import { useConsoleApi } from '../server/gql/api-provider'; import { ISecrets } from '../server/gql/queries/secret-queries'; +import { IWorkspaceContext } from '../routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/_layout'; const RESOURCE_NAME = 'secret'; type BaseType = ExtractNodeType; diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/util.tsx b/src/apps/console/page-components/util.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/util.tsx rename to src/apps/console/page-components/util.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.logs/route.tsx b/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.logs/route.tsx deleted file mode 100644 index 323626a6f..000000000 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.logs/route.tsx +++ /dev/null @@ -1,76 +0,0 @@ -import { useOutletContext, useSearchParams } from '@remix-run/react'; -import HighlightJsLog from '~/console/components/logger'; -import { NumberInput } from '~/components/atoms/input'; -import { useState } from 'react'; -import useForm from '~/root/lib/client/hooks/use-form'; -import Yup from '~/root/lib/server/helpers/yup'; -import { Button } from '~/components/atoms/button'; -import { useQueryParameters } from '~/root/lib/client/hooks/use-search'; -import { parseName } from '~/console/server/r-utils/common'; -import { IAppContext } from '../_.$account.$cluster.$project.$scope.$workspace.app.$app/route'; - -const ItemList = () => { - const { app } = useOutletContext(); - const [sp] = useSearchParams(); - - const [url] = useState( - `wss://observability.dev.kloudlite.io/observability/logs/app?resource_name=${parseName( - app - )}&resource_namespace=${app.metadata!.namespace}&start_time=${ - sp.get('start') || 1690273382 - }&end_time=${sp.get('end') || 1690532560}` - ); - - const { setQueryParameters } = useQueryParameters(); - - const { values, handleChange, handleSubmit } = useForm({ - initialValues: { - start: sp.get('start') || '1690273382', - end: sp.get('end') || '1690532560', - }, - validationSchema: Yup.object({}), - onSubmit: (val) => { - // @ts-ignore - setQueryParameters(val); - }, - }); - - return ( -
-
Logs Url: {url}
- -
- - -
-
- -
- ); -}; - -export default ItemList; diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.logs/tools.tsx b/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.logs/tools.tsx deleted file mode 100644 index ff01ec092..000000000 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.logs/tools.tsx +++ /dev/null @@ -1,31 +0,0 @@ -import { useSearchParams } from '@remix-run/react'; -import { useMemo } from 'react'; -import { toast } from 'react-toastify'; -import CommonTools from '~/console/components/common-tools'; - -const Tools = () => { - const [searchParams] = useSearchParams(); - - const options = useMemo( - () => [ - { - name: 'Status', - type: 'text', - search: false, - dataFetcher: async () => { - toast.info(`todo status`); - return [ - { content: 'Active', value: 'active' }, - { content: 'Freezed', value: 'freezed' }, - { content: 'Archived', value: 'archived' }, - ]; - }, - }, - ], - [searchParams] - ); - - return ; -}; - -export default Tools; diff --git a/src/apps/console/routes/_.$account.infra.$cluster.overview.logs/route.tsx b/src/apps/console/routes/_.$account.infra.$cluster.overview.logs/route.tsx deleted file mode 100644 index 7bf64200e..000000000 --- a/src/apps/console/routes/_.$account.infra.$cluster.overview.logs/route.tsx +++ /dev/null @@ -1,83 +0,0 @@ -import { Suspense } from 'react'; -import { Box } from '~/console/components/common-console-components'; -import HighlightJsLog from '~/console/components/logger'; - -const Log = () => { - const getTime = () => { - return Math.floor(new Date().getTime() / 1000); - }; - - const selectOptions = [ - { - label: 'Last 12 hours', - value: '1', - from: () => getTime() - 43200, - }, - { - label: 'Last 24 hours', - value: '2', - from: () => getTime() - 86400, - }, - { - label: 'Last 7 days', - value: '3', - from: () => getTime() - 604800, - }, - { - label: 'Last 30 days', - value: '3', - from: () => getTime() - 2592000, - }, - ]; - - // const [from, setFrom] = useState(selectOptions[1].from()); - // const [selected, setSelected] = useState('1'); - - const getUrl = (f: number) => { - return `wss://observability.dev.kloudlite.io/observability/logs/cluster-job?start_time=${f}&end_time=${getTime()}`; - }; - - // const [url, setUrl] = useState(getUrl(from)); - - return ( - -
- selectOptions} - // value={selectOptions[parseValue(selected, 1)]} - // onChange={(e) => { - // setSelected(e.value); - // }} - // /> - // } - // title={ - //
- //
Cluster logs
- //
- // } - dark - websocket - height="60vh" - width="100%" - url={getUrl(selectOptions[3].from())} - selectableLines - /> -
- - ); -}; - -const ClusterLogs = () => { - return ( -
- - - -
- ); -}; - -export default ClusterLogs; diff --git a/src/apps/console/routes/_.$account.infra.clusters.tsx b/src/apps/console/routes/_.$account.infra.clusters.tsx deleted file mode 100644 index 543e5ab2d..000000000 --- a/src/apps/console/routes/_.$account.infra.clusters.tsx +++ /dev/null @@ -1,8 +0,0 @@ -import { Outlet, useOutletContext } from '@remix-run/react'; - -const Clusters = () => { - const rootContext = useOutletContext(); - return ; -}; - -export default Clusters; diff --git a/src/apps/console/routes/_.$account.settings._index.tsx b/src/apps/console/routes/_.$account.settings._index.tsx deleted file mode 100644 index e1e200e2d..000000000 --- a/src/apps/console/routes/_.$account.settings._index.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { redirect } from '@remix-run/node'; - -export const loader = async () => { - return redirect('general'); -}; diff --git a/src/apps/console/routes/$.tsx b/src/apps/console/routes/_404+/$.tsx similarity index 100% rename from src/apps/console/routes/$.tsx rename to src/apps/console/routes/_404+/$.tsx diff --git a/src/apps/console/routes/_a.$a.new-cluster.tsx b/src/apps/console/routes/_a+/_a.$a.new-cluster.tsx similarity index 70% rename from src/apps/console/routes/_a.$a.new-cluster.tsx rename to src/apps/console/routes/_a+/_a.$a.new-cluster.tsx index 0131717f6..713dc48f5 100644 --- a/src/apps/console/routes/_a.$a.new-cluster.tsx +++ b/src/apps/console/routes/_a+/_a.$a.new-cluster.tsx @@ -1,11 +1,11 @@ import { IRemixCtx } from '~/root/lib/types/common'; import { defer } from '@remix-run/node'; import { useLoaderData } from '@remix-run/react'; -import { GQLServerHandler } from '../server/gql/saved-queries'; -import { ensureAccountSet } from '../server/utils/auth-utils'; -import { NewCluster } from '../page-components/new-cluster'; -import { getPagination } from '../server/utils/common'; -import { LoadingComp, pWrapper } from '../components/loading-component'; +import { LoadingComp, pWrapper } from '~/console/components/loading-component'; +import { ensureAccountSet } from '~/console/server/utils/auth-utils'; +import { GQLServerHandler } from '~/console/server/gql/saved-queries'; +import { getPagination } from '~/console/server/utils/common'; +import { NewCluster } from '~/console/page-components/new-cluster'; export const loader = async (ctx: IRemixCtx) => { const promise = pWrapper(async () => { diff --git a/src/apps/console/routes/_a.$a.new-project.tsx b/src/apps/console/routes/_a+/_a.$a.new-project.tsx similarity index 67% rename from src/apps/console/routes/_a.$a.new-project.tsx rename to src/apps/console/routes/_a+/_a.$a.new-project.tsx index f2759baec..7d6656415 100644 --- a/src/apps/console/routes/_a.$a.new-project.tsx +++ b/src/apps/console/routes/_a+/_a.$a.new-project.tsx @@ -1,9 +1,10 @@ +import NewProject from '~/console/page-components/new-project'; +import { GQLServerHandler } from '~/console/server/gql/saved-queries'; +import { ensureAccountSet } from '~/console/server/utils/auth-utils'; +import { getPagination, getSearch } from '~/console/server/utils/common'; import logger from '~/root/lib/client/helpers/log'; import { IRemixCtx } from '~/root/lib/types/common'; -import { ensureAccountSet } from '../server/utils/auth-utils'; -import { GQLServerHandler } from '../server/gql/saved-queries'; -import { getPagination, getSearch } from '../server/utils/common'; -import NewProject from '../page-components/new-project'; + const _NewProject = () => { return ; diff --git a/src/apps/console/routes/_a.$a.tsx b/src/apps/console/routes/_a+/_a.$a.tsx similarity index 90% rename from src/apps/console/routes/_a.$a.tsx rename to src/apps/console/routes/_a+/_a.$a.tsx index 8a430ee8c..430cecbd9 100644 --- a/src/apps/console/routes/_a.$a.tsx +++ b/src/apps/console/routes/_a+/_a.$a.tsx @@ -1,7 +1,7 @@ import { redirect } from '@remix-run/node'; import { Outlet, useLoaderData, useOutletContext } from '@remix-run/react'; +import { GQLServerHandler } from '~/console/server/gql/saved-queries'; import { IRemixCtx } from '~/root/lib/types/common'; -import { GQLServerHandler } from '../server/gql/saved-queries'; const Account = () => { const { account } = useLoaderData(); diff --git a/src/apps/console/routes/_a.new-team.tsx b/src/apps/console/routes/_a+/_a.new-team.tsx similarity index 93% rename from src/apps/console/routes/_a.new-team.tsx rename to src/apps/console/routes/_a+/_a.new-team.tsx index fe58d0e08..82b0af484 100644 --- a/src/apps/console/routes/_a.new-team.tsx +++ b/src/apps/console/routes/_a+/_a.new-team.tsx @@ -10,10 +10,11 @@ import { UserMe } from '~/root/lib/server/gql/saved-queries'; import Yup from '~/root/lib/server/helpers/yup'; import { handleError } from '~/root/lib/utils/common'; import { useState } from 'react'; -import { IdSelector } from '../components/id-selector'; -import RawWrapper, { TitleBox } from '../components/raw-wrapper'; -import { useConsoleApi } from '../server/gql/api-provider'; -import { FadeIn } from './_.$account.$cluster.$project.$scope.$workspace.new-app/util'; +import { useConsoleApi } from '~/console/server/gql/api-provider'; +import RawWrapper, { TitleBox } from '~/console/components/raw-wrapper'; +import { FadeIn } from '~/console/page-components/util'; +import { IdSelector } from '~/console/components/id-selector'; + const NewAccount = () => { const api = useConsoleApi(); diff --git a/src/apps/console/routes/_a.onboarding.$a.$cloudprovider.new-cluster.tsx b/src/apps/console/routes/_a+/_a.onboarding.$a.$cloudprovider.new-cluster.tsx similarity index 75% rename from src/apps/console/routes/_a.onboarding.$a.$cloudprovider.new-cluster.tsx rename to src/apps/console/routes/_a+/_a.onboarding.$a.$cloudprovider.new-cluster.tsx index 132a0df9e..5ef2580b3 100644 --- a/src/apps/console/routes/_a.onboarding.$a.$cloudprovider.new-cluster.tsx +++ b/src/apps/console/routes/_a+/_a.onboarding.$a.$cloudprovider.new-cluster.tsx @@ -1,10 +1,11 @@ import { IRemixCtx } from '~/root/lib/types/common'; import { useLoaderData } from '@remix-run/react'; import { defer } from '@remix-run/node'; -import { GQLServerHandler } from '../server/gql/saved-queries'; -import { ensureAccountSet } from '../server/utils/auth-utils'; -import { NewCluster } from '../page-components/new-cluster'; -import { LoadingComp, pWrapper } from '../components/loading-component'; +import { LoadingComp, pWrapper } from '~/console/components/loading-component'; +import { ensureAccountSet } from '~/console/server/utils/auth-utils'; +import { GQLServerHandler } from '~/console/server/gql/saved-queries'; +import { NewCluster } from '~/console/page-components/new-cluster'; + export const loader = async (ctx: IRemixCtx) => { const promise = pWrapper(async () => { diff --git a/src/apps/console/routes/_a.onboarding.$a.$cloudprovider.validate-cp.tsx b/src/apps/console/routes/_a+/_a.onboarding.$a.$cloudprovider.validate-cp.tsx similarity index 90% rename from src/apps/console/routes/_a.onboarding.$a.$cloudprovider.validate-cp.tsx rename to src/apps/console/routes/_a+/_a.onboarding.$a.$cloudprovider.validate-cp.tsx index 7bb893a72..3af027cc9 100644 --- a/src/apps/console/routes/_a.onboarding.$a.$cloudprovider.validate-cp.tsx +++ b/src/apps/console/routes/_a+/_a.onboarding.$a.$cloudprovider.validate-cp.tsx @@ -9,18 +9,18 @@ import { toast } from '~/components/molecule/toast'; import { handleError } from '~/root/lib/utils/common'; import useCustomSwr from '~/root/lib/client/hooks/use-custom-swr'; import { Badge } from '~/components/atoms/badge'; -import { GQLServerHandler } from '../server/gql/saved-queries'; -import { ensureAccountSet } from '../server/utils/auth-utils'; -import { LoadingComp, pWrapper } from '../components/loading-component'; -import RawWrapper, { TitleBox } from '../components/raw-wrapper'; -import { parseName } from '../server/r-utils/common'; -import { IAccountContext } from './_.$account'; -import { FadeIn } from './_.$account.$cluster.$project.$scope.$workspace.new-app/util'; -import AlertModal from '../components/alert-modal'; -import CodeView from '../components/code-view'; -import { asyncPopupWindow } from '../utils/commons'; -import { useConsoleApi } from '../server/gql/api-provider'; -import { LoadingPlaceHolder } from '../components/loading'; +import { LoadingComp, pWrapper } from '~/console/components/loading-component'; +import { ensureAccountSet } from '~/console/server/utils/auth-utils'; +import { GQLServerHandler } from '~/console/server/gql/saved-queries'; +import { IAccountContext } from '../_main+/$account+/_layout'; +import { useConsoleApi } from '~/console/server/gql/api-provider'; +import RawWrapper, { TitleBox } from '~/console/components/raw-wrapper'; +import { parseName } from '~/console/server/r-utils/common'; +import { FadeIn } from '~/console/page-components/util'; +import { LoadingPlaceHolder } from '~/console/components/loading'; +import CodeView from '~/console/components/code-view'; +import { asyncPopupWindow } from '~/console/utils/commons'; +import AlertModal from '~/console/components/alert-modal'; export const loader = async (ctx: IRemixCtx) => { const promise = pWrapper(async () => { diff --git a/src/apps/console/routes/_a.onboarding.$a.$cluster.new-project.tsx b/src/apps/console/routes/_a+/_a.onboarding.$a.$cluster.new-project.tsx similarity index 73% rename from src/apps/console/routes/_a.onboarding.$a.$cluster.new-project.tsx rename to src/apps/console/routes/_a+/_a.onboarding.$a.$cluster.new-project.tsx index 4ab26a1fb..633298b3d 100644 --- a/src/apps/console/routes/_a.onboarding.$a.$cluster.new-project.tsx +++ b/src/apps/console/routes/_a+/_a.onboarding.$a.$cluster.new-project.tsx @@ -1,8 +1,9 @@ +import NewProject from '~/console/page-components/new-project'; +import { GQLServerHandler } from '~/console/server/gql/saved-queries'; +import { ensureAccountSet } from '~/console/server/utils/auth-utils'; import logger from '~/root/lib/client/helpers/log'; import { IRemixCtx } from '~/root/lib/types/common'; -import { ensureAccountSet } from '../server/utils/auth-utils'; -import { GQLServerHandler } from '../server/gql/saved-queries'; -import NewProject from '../page-components/new-project'; + const _NewProject = () => { return ; diff --git a/src/apps/console/routes/_a.onboarding.$a.invite-team-members.tsx b/src/apps/console/routes/_a+/_a.onboarding.$a.invite-team-members.tsx similarity index 95% rename from src/apps/console/routes/_a.onboarding.$a.invite-team-members.tsx rename to src/apps/console/routes/_a+/_a.onboarding.$a.invite-team-members.tsx index cfa28d76d..6a606cc45 100644 --- a/src/apps/console/routes/_a.onboarding.$a.invite-team-members.tsx +++ b/src/apps/console/routes/_a+/_a.onboarding.$a.invite-team-members.tsx @@ -7,16 +7,16 @@ import SelectPrimitive from '~/components/atoms/select-primitive'; import { usePagination } from '~/components/molecule/pagination'; import { toast } from '~/components/molecule/toast'; import { titleCase, useMapper } from '~/components/utils'; +import { ListBody, ListItem } from '~/console/components/console-list-components'; +import DynamicPagination from '~/console/components/dynamic-pagination'; +import List from '~/console/components/list'; +import RawWrapper, { TitleBox } from '~/console/components/raw-wrapper'; +import { useConsoleApi } from '~/console/server/gql/api-provider'; +import { ACCOUNT_ROLES } from '~/console/utils/commons'; import useForm from '~/root/lib/client/hooks/use-form'; import Yup from '~/root/lib/server/helpers/yup'; import { handleError } from '~/root/lib/utils/common'; import { Github__Com___Kloudlite___Api___Apps___Iam___Types__Role as Role } from '~/root/src/generated/gql/server'; -import { ListBody, ListItem } from '../components/console-list-components'; -import DynamicPagination from '../components/dynamic-pagination'; -import List from '../components/list'; -import RawWrapper, { TitleBox } from '../components/raw-wrapper'; -import { useConsoleApi } from '../server/gql/api-provider'; -import { ACCOUNT_ROLES } from '../utils/commons'; const progressItems = [ { label: 'Create Team', active: true, id: 1, completed: false }, diff --git a/src/apps/console/routes/_a.onboarding.$a.new-cloud-provider.tsx b/src/apps/console/routes/_a+/_a.onboarding.$a.new-cloud-provider.tsx similarity index 94% rename from src/apps/console/routes/_a.onboarding.$a.new-cloud-provider.tsx rename to src/apps/console/routes/_a+/_a.onboarding.$a.new-cloud-provider.tsx index d8bbed781..81639d6ea 100644 --- a/src/apps/console/routes/_a.onboarding.$a.new-cloud-provider.tsx +++ b/src/apps/console/routes/_a+/_a.onboarding.$a.new-cloud-provider.tsx @@ -9,11 +9,11 @@ import useForm, { dummyEvent } from '~/root/lib/client/hooks/use-form'; import Yup from '~/root/lib/server/helpers/yup'; import { handleError } from '~/root/lib/utils/common'; import { useState } from 'react'; -import { IdSelector } from '../components/id-selector'; -import RawWrapper, { TitleBox } from '../components/raw-wrapper'; -import { useConsoleApi } from '../server/gql/api-provider'; -import { validateCloudProvider } from '../server/r-utils/common'; -import { FadeIn } from './_.$account.$cluster.$project.$scope.$workspace.new-app/util'; +import { useConsoleApi } from '~/console/server/gql/api-provider'; +import { validateCloudProvider } from '~/console/server/r-utils/common'; +import RawWrapper, { TitleBox } from '~/console/components/raw-wrapper'; +import { FadeIn } from '~/console/page-components/util'; +import { IdSelector } from '~/console/components/id-selector'; const NewCloudProvider = () => { const { a: accountName } = useParams(); diff --git a/src/apps/console/routes/_a.onboarding.$a.tsx b/src/apps/console/routes/_a+/_a.onboarding.$a.tsx similarity index 100% rename from src/apps/console/routes/_a.onboarding.$a.tsx rename to src/apps/console/routes/_a+/_a.onboarding.$a.tsx diff --git a/src/apps/console/routes/_a.teams.tsx b/src/apps/console/routes/_a+/_a.teams.tsx similarity index 93% rename from src/apps/console/routes/_a.teams.tsx rename to src/apps/console/routes/_a+/_a.teams.tsx index 27f23faf4..2f5c9c679 100644 --- a/src/apps/console/routes/_a.teams.tsx +++ b/src/apps/console/routes/_a+/_a.teams.tsx @@ -16,15 +16,16 @@ import { UserMe } from '~/root/lib/server/gql/saved-queries'; import { IRemixCtx } from '~/root/lib/types/common'; import { handleError } from '~/root/lib/utils/common'; import { useReload } from '~/root/lib/client/helpers/reloader'; -import ConsoleAvatar from '../components/console-avatar'; -import DynamicPagination from '../components/dynamic-pagination'; -import List from '../components/list'; -import RawWrapper from '../components/raw-wrapper'; -import { IAccounts, IInvites } from '../server/gql/queries/access-queries'; -import { GQLServerHandler } from '../server/gql/saved-queries'; -import { parseName } from '../server/r-utils/common'; -import { FadeIn } from './_.$account.$cluster.$project.$scope.$workspace.new-app/util'; -import { useConsoleApi } from '../server/gql/api-provider'; +import { GQLServerHandler } from '~/console/server/gql/saved-queries'; +import { IAccounts } from '~/console/server/gql/queries/account-queries'; +import { IInvites } from '~/console/server/gql/queries/access-queries'; +import { useConsoleApi } from '~/console/server/gql/api-provider'; +import RawWrapper from '~/console/components/raw-wrapper'; +import { FadeIn } from '~/console/page-components/util'; +import DynamicPagination from '~/console/components/dynamic-pagination'; +import List from '~/console/components/list'; +import { parseName } from '~/console/server/r-utils/common'; +import ConsoleAvatar from '~/console/components/console-avatar'; export const loader = async (ctx: IRemixCtx) => { let accounts; diff --git a/src/apps/console/routes/_a.tsx b/src/apps/console/routes/_a+/_a.tsx similarity index 100% rename from src/apps/console/routes/_a.tsx rename to src/apps/console/routes/_a+/_a.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace._index.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/_index.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace._index.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/_index.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/_layout.tsx similarity index 99% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/_layout.tsx index a215b13a5..943f2e360 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace/route.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/_layout.tsx @@ -38,7 +38,8 @@ import { SubNavDataProvider } from '~/root/lib/client/hooks/use-create-subnav-ac import useDebounce from '~/root/lib/client/hooks/use-debounce'; import { IRemixCtx } from '~/root/lib/types/common'; import { Truncate, handleError } from '~/root/lib/utils/common'; -import { IProjectContext } from '../_.$account.infra.$cluster.$project'; +import { IProjectContext } from '../../_layout'; + export interface IWorkspaceContext extends IProjectContext { workspace: IWorkspace; diff --git a/src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.app.$app._index.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/_index.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.app.$app._index.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/_index.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/_index/route.tsx similarity index 98% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/_index/route.tsx index edb5dd257..acb2e65e7 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app/route.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/_index/route.tsx @@ -34,7 +34,8 @@ import { useActivePath } from '~/root/lib/client/hooks/use-active-path'; import useForm from '~/root/lib/client/hooks/use-form'; import Yup from '~/root/lib/server/helpers/yup'; import { handleError } from '~/root/lib/utils/common'; -import { IWorkspaceContext } from '../_.$account.$cluster.$project.$scope.$workspace/route'; +import { IWorkspaceContext } from '../../../_layout'; + const ProjectTabs = () => { const { account, cluster, project, scope, workspace, app } = useParams(); diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.overview/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/overview/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.overview/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/overview/route.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/_index/route.tsx similarity index 89% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/_index/route.tsx index 090c86330..160b36bab 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings/route.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/_index/route.tsx @@ -1,7 +1,8 @@ import { Outlet, useOutletContext } from '@remix-run/react'; import SidebarLayout from '~/console/components/sidebar-layout'; import { useSubNavData } from '~/root/lib/client/hooks/use-create-subnav-action'; -import { IAppContext } from '../_.$account.$cluster.$project.$scope.$workspace.app.$app/route'; +import { IAppContext } from '../../_index/route'; + const navItems = [ { label: 'General', value: 'general' }, diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.advance/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/advance/route.tsx similarity index 96% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.advance/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/advance/route.tsx index a589c391e..c2557f7b5 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.advance/route.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/advance/route.tsx @@ -7,7 +7,8 @@ import { keyconstants } from '~/console/server/r-utils/key-constants'; import useForm from '~/root/lib/client/hooks/use-form'; import Yup from '~/root/lib/server/helpers/yup'; import { parseName } from '~/console/server/r-utils/common'; -import { IAppContext } from '../_.$account.$cluster.$project.$scope.$workspace.app.$app/route'; +import { IAppContext } from '../../_index/route'; + const SettingAdvance = () => { const { app, setApp } = useAppState(); diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.compute/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/compute/route.tsx similarity index 97% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.compute/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/compute/route.tsx index 2d4bb375f..992b74ef2 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.compute/route.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/compute/route.tsx @@ -8,15 +8,10 @@ import { useAppState } from '~/console/page-components/app-states'; import { keyconstants } from '~/console/server/r-utils/key-constants'; import useForm, { dummyEvent } from '~/root/lib/client/hooks/use-form'; import Yup from '~/root/lib/server/helpers/yup'; -import { - IcpuMode, - plans, -} from '../_.$account.$cluster.$project.$scope.$workspace.new-app/datas'; -import { - FadeIn, - parseValue, -} from '../_.$account.$cluster.$project.$scope.$workspace.new-app/util'; + import { InfoLabel } from '~/console/components/commons'; +import { FadeIn, parseValue } from '~/console/page-components/util'; +import { IcpuMode, plans } from '../../../../new-app/datas'; const SettingCompute = () => { const { app, setApp, getContainer } = useAppState(); diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.environment/app-dialogs.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/environment/app-dialogs.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.environment/app-dialogs.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/environment/app-dialogs.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.environment/cs-item.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/environment/cs-item.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.environment/cs-item.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/environment/cs-item.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.environment/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/environment/route.tsx similarity index 81% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.environment/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/environment/route.tsx index 635671f28..607af6f55 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.environment/route.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/environment/route.tsx @@ -4,9 +4,10 @@ import { createAppEnvPage, useAppState, } from '~/console/page-components/app-states'; -import { FadeIn } from '../_.$account.$cluster.$project.$scope.$workspace.new-app/util'; -import { EnvironmentVariables } from '../_.$account.$cluster.$project.$scope.$workspace.new-app/app-environment-variables'; -import { ConfigMounts } from '../_.$account.$cluster.$project.$scope.$workspace.new-app/app-environment-mounts'; +import { FadeIn } from '~/console/page-components/util'; +import { EnvironmentVariables } from '../../../../new-app/app-environment-variables'; +import { ConfigMounts } from '../../../../new-app/app-environment-mounts'; + export interface IAppDialogValue { refKey: string; diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.general/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/general/route.tsx similarity index 96% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.general/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/general/route.tsx index 95dc9451f..e0ed0dc8e 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.general/route.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/general/route.tsx @@ -8,7 +8,8 @@ import { keyconstants } from '~/console/server/r-utils/key-constants'; import useForm from '~/root/lib/client/hooks/use-form'; import Yup from '~/root/lib/server/helpers/yup'; import { parseName } from '~/console/server/r-utils/common'; -import { IAppContext } from '../_.$account.$cluster.$project.$scope.$workspace.app.$app/route'; +import { IAppContext } from '../../_index/route'; + const SettingGeneral = () => { const { app, setApp } = useAppState(); diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.network/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/network/route.tsx similarity index 62% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.network/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/network/route.tsx index 860106dac..0fe159dce 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.app.$app.settings.network/route.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/app+/$app+/settings+/network/route.tsx @@ -1,6 +1,8 @@ import { TitleBox } from '~/console/components/raw-wrapper'; -import { ExposedPorts } from '../_.$account.$cluster.$project.$scope.$workspace.new-app/app-network'; -import { FadeIn } from '../_.$account.$cluster.$project.$scope.$workspace.new-app/util'; +import { FadeIn } from '~/console/page-components/util'; +import { ExposedPorts } from '../../../../new-app/app-network'; + + const AppNetwork = () => { return ( diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.apps/apps-resources.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/apps/apps-resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.apps/apps-resources.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/apps/apps-resources.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.apps/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/apps/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.apps/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/apps/route.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.apps/tools.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/apps/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.apps/tools.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/apps/tools.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-service+/$service/_index.tsx similarity index 96% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-service+/$service/_index.tsx index 2c672ad74..da361ad4c 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service/route.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-service+/$service/_index.tsx @@ -15,7 +15,8 @@ import { } from '~/console/server/utils/auth-utils'; import logger from '~/root/lib/client/helpers/log'; import { IRemixCtx } from '~/root/lib/types/common'; -import { IWorkspaceContext } from '../_.$account.$cluster.$project.$scope.$workspace/route'; +import { IWorkspaceContext } from '../../_layout'; + export interface IManagedServiceContext extends IWorkspaceContext { backendService: IManagedService; diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/handle-backend-resources.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-service+/$service/resources/handle-backend-resources.tsx similarity index 96% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/handle-backend-resources.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-service+/$service/resources/handle-backend-resources.tsx index b185def92..4c68d8ea3 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/handle-backend-resources.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-service+/$service/resources/handle-backend-resources.tsx @@ -10,11 +10,9 @@ import RenderDynamicField from '~/console/components/render-dynamic-field'; import { IDialog } from '~/console/components/types.d'; import { useConsoleApi } from '~/console/server/gql/api-provider'; import { IManagedServiceTemplate } from '~/console/server/gql/queries/managed-service-queries'; -import { parseName, parseTargetNs } from '~/console/server/r-utils/common'; import useForm, { dummyEvent } from '~/root/lib/client/hooks/use-form'; import Yup from '~/root/lib/server/helpers/yup'; -import { handleError } from '~/root/lib/utils/common'; -import { IManagedServiceContext } from '../_.$account.$cluster.$project.$scope.$workspace.backing-service.$service/route'; +import { IManagedServiceContext } from '../_index'; const HandleBackendResources = ({ show, diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/managed-resources.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-service+/$service/resources/managed-resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/managed-resources.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-service+/$service/resources/managed-resources.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-service+/$service/resources/route.tsx similarity index 93% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-service+/$service/resources/route.tsx index 5a75a5e1e..310d02415 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/route.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-service+/$service/resources/route.tsx @@ -14,15 +14,13 @@ import { getSearch } from '~/console/server/utils/common'; import { getManagedTemplate } from '~/console/utils/commons'; import { IRemixCtx } from '~/root/lib/types/common'; import fake from '~/root/fake-data-generator/fake'; -import { GQLServerHandler } from '../../server/gql/saved-queries'; -import { - ensureAccountSet, - ensureClusterSet, -} from '../../server/utils/auth-utils'; -import { IManagedServiceContext } from '../_.$account.$cluster.$project.$scope.$workspace.backing-service.$service/route'; + import HandleBackendResources from './handle-backend-resources'; import ManagedResources from './managed-resources'; import Tools from './tools'; +import { ensureAccountSet, ensureClusterSet } from '~/console/server/utils/auth-utils'; +import { GQLServerHandler } from '~/console/server/gql/saved-queries'; +import { IManagedServiceContext } from '../_index'; export const loader = async (ctx: IRemixCtx) => { ensureAccountSet(ctx); diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/tools.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-service+/$service/resources/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-service.$service.resources/tools.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-service+/$service/resources/tools.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/backend-services-resources.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-services/backend-services-resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/backend-services-resources.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-services/backend-services-resources.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/handle-backend-service.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-services/handle-backend-service.tsx similarity index 98% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/handle-backend-service.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-services/handle-backend-service.tsx index ff0c69614..c7f036c9a 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/handle-backend-service.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-services/handle-backend-service.tsx @@ -13,13 +13,12 @@ import NoResultsFound from '~/console/components/no-results-found'; import { IDialog } from '~/console/components/types.d'; import { useConsoleApi } from '~/console/server/gql/api-provider'; import { IManagedServiceTemplates } from '~/console/server/gql/queries/managed-service-queries'; -import { parseTargetNs } from '~/console/server/r-utils/common'; import { useInputSearch } from '~/root/lib/client/helpers/search-filter'; import useForm, { dummyEvent } from '~/root/lib/client/hooks/use-form'; import Yup from '~/root/lib/server/helpers/yup'; import { NN } from '~/root/lib/types/common'; -import { handleError } from '~/root/lib/utils/common'; -import { IWorkspaceContext } from '../_.$account.$cluster.$project.$scope.$workspace/route'; +import { IWorkspaceContext } from '../_layout'; + type IActiveCategory = { name: string; diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-services/route.tsx similarity index 97% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-services/route.tsx index 749c3f606..a22cf0041 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/route.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-services/route.tsx @@ -13,10 +13,11 @@ import { } from '~/console/server/r-utils/common'; import { IRemixCtx } from '~/root/lib/types/common'; import fake from '~/root/fake-data-generator/fake'; -import { IWorkspaceContext } from '../_.$account.$cluster.$project.$scope.$workspace/route'; + import BackendServicesResources from './backend-services-resources'; import HandleBackendService from './handle-backend-service'; import Tools from './tools'; +import { IWorkspaceContext } from '../_layout'; export const loader = (ctx: IRemixCtx) => { const promise = pWrapper(async () => { diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/tools.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-services/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.backing-services/tools.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/backing-services/tools.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.config.$config/handle.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/config.$config/handle.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.config.$config/handle.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/config.$config/handle.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.config.$config/resources.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/config.$config/resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.config.$config/resources.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/config.$config/resources.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.config.$config/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/config.$config/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.config.$config/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/config.$config/route.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.config.$config/tools.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/config.$config/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.config.$config/tools.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/config.$config/tools.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.cs._index.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/_index.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.cs._index.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/_index.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.cs.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/_layout.tsx similarity index 82% rename from src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.cs.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/_layout.tsx index 523af953c..2dca2f4a1 100644 --- a/src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.cs.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/_layout.tsx @@ -1,7 +1,7 @@ import { Outlet, useOutletContext } from '@remix-run/react'; import { useSubNavData } from '~/root/lib/client/hooks/use-create-subnav-action'; -import SidebarLayout from '../components/sidebar-layout'; -import { IWorkspaceContext } from './_.$account.$cluster.$project.$scope.$workspace/route'; +import { IWorkspaceContext } from '../_layout'; +import SidebarLayout from '~/console/components/sidebar-layout'; const ProjectConfigAndSecrets = () => { const rootContext = useOutletContext(); diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.cs.configs._index/handle-config.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/configs._index/handle-config.tsx similarity index 97% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.cs.configs._index/handle-config.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/configs._index/handle-config.tsx index e05301fbd..8b9afcd99 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.cs.configs._index/handle-config.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/configs._index/handle-config.tsx @@ -11,7 +11,8 @@ import { useReload } from '~/root/lib/client/helpers/reloader'; import useForm, { dummyEvent } from '~/root/lib/client/hooks/use-form'; import Yup from '~/root/lib/server/helpers/yup'; import { handleError } from '~/root/lib/utils/common'; -import { IWorkspaceContext } from '../_.$account.$cluster.$project.$scope.$workspace/route'; +import { IWorkspaceContext } from '../../_layout'; + const HandleConfig = ({ show, setShow }: IDialog) => { const api = useConsoleApi(); diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.cs.configs._index/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/configs._index/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.cs.configs._index/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/configs._index/route.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.cs.configs._index/tools.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/configs._index/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.cs.configs._index/tools.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/configs._index/tools.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.cs.secrets._index/handle-secret.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/secrets._index/handle-secret.tsx similarity index 97% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.cs.secrets._index/handle-secret.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/secrets._index/handle-secret.tsx index 732541e46..d900fed95 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.cs.secrets._index/handle-secret.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/secrets._index/handle-secret.tsx @@ -11,7 +11,8 @@ import { useReload } from '~/root/lib/client/helpers/reloader'; import useForm, { dummyEvent } from '~/root/lib/client/hooks/use-form'; import Yup from '~/root/lib/server/helpers/yup'; import { handleError } from '~/root/lib/utils/common'; -import { IWorkspaceContext } from '../_.$account.$cluster.$project.$scope.$workspace/route'; +import { IWorkspaceContext } from '../../_layout'; + const HandleSecret = ({ show, setShow }: IDialog) => { const api = useConsoleApi(); diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.cs.secrets._index/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/secrets._index/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.cs.secrets._index/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/secrets._index/route.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.cs.secrets._index/tools.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/secrets._index/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.cs.secrets._index/tools.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/cs+/secrets._index/tools.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.jc/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/jc+/_index/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.jc/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/jc+/_index/route.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.jc.scheduledtask/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/jc+/scheduledtask/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.jc.scheduledtask/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/jc+/scheduledtask/route.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.jc.task/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/jc+/task/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.jc.task/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/jc+/task/route.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.jc.taskruns/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/jc+/taskruns/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.jc.taskruns/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/jc+/taskruns/route.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.managed-services.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/managed-services.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.managed-services.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/managed-services.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-compute.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-compute.tsx similarity index 99% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-compute.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-compute.tsx index 047d3ea91..6e81a3072 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-compute.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-compute.tsx @@ -11,7 +11,7 @@ import { keyconstants } from '~/console/server/r-utils/key-constants'; import useForm, { dummyEvent } from '~/root/lib/client/hooks/use-form'; import Yup from '~/root/lib/server/helpers/yup'; import { IcpuMode, plans } from './datas'; -import { FadeIn, parseValue } from './util'; +import { FadeIn, parseValue } from '../../../../../../../../page-components/util'; import { InfoLabel } from '~/console/components/commons'; const AppCompute = () => { diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-detail.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-detail.tsx similarity index 95% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-detail.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-detail.tsx index e7d94b521..817aa205c 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-detail.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-detail.tsx @@ -9,8 +9,8 @@ import { keyconstants } from '~/console/server/r-utils/key-constants'; import useForm, { dummyEvent } from '~/root/lib/client/hooks/use-form'; import Yup from '~/root/lib/server/helpers/yup'; import { parseName } from '~/console/server/r-utils/common'; -import { IWorkspaceContext } from '../_.$account.$cluster.$project.$scope.$workspace/route'; -import { FadeIn } from './util'; +import { IWorkspaceContext } from '../_layout'; +import { FadeIn } from '~/console/page-components/util'; const AppDetail = () => { const { app, setApp, setPage, markPageAsCompleted } = useAppState(); diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-dialogs.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-dialogs.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-dialogs.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-dialogs.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-environment-mounts.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-environment-mounts.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-environment-mounts.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-environment-mounts.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-environment-variables.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-environment-variables.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-environment-variables.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-environment-variables.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-environment.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-environment.tsx similarity index 97% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-environment.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-environment.tsx index a3a0b6d9e..b4988f46a 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-environment.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-environment.tsx @@ -6,7 +6,7 @@ import { createAppEnvPage, useAppState, } from '~/console/page-components/app-states'; -import { FadeIn } from './util'; +import { FadeIn } from '../../../../../../../../page-components/util'; import { EnvironmentVariables } from './app-environment-variables'; import { ConfigMounts } from './app-environment-mounts'; diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-network.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-network.tsx similarity index 98% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-network.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-network.tsx index 9aeafa3bb..96c9d3f37 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-network.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-network.tsx @@ -15,7 +15,7 @@ import List from '~/console/components/list'; import NoResultsFound from '~/console/components/no-results-found'; import { TitleBox } from '~/console/components/raw-wrapper'; import { useAppState } from '~/console/page-components/app-states'; -import { FadeIn, parseValue } from './util'; +import { FadeIn, parseValue } from '../../../../../../../../page-components/util'; import { InfoLabel } from '~/console/components/commons'; interface IExposedPorts { diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-review.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-review.tsx similarity index 98% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-review.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-review.tsx index 81ae06482..b1b3405fc 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/app-review.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/app-review.tsx @@ -11,7 +11,7 @@ import Yup from '~/root/lib/server/helpers/yup'; import { handleError } from '~/root/lib/utils/common'; import { validateType } from '~/root/src/generated/gql/validator'; import { parseName } from '~/console/server/r-utils/common'; -import { FadeIn } from './util'; +import { FadeIn } from '../../../../../../../../page-components/util'; interface IReviewComponent { title: string; diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/cs-item.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/cs-item.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/cs-item.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/cs-item.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/datas.ts b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/datas.ts similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/datas.ts rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/datas.ts diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/route.tsx similarity index 95% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/route.tsx index 926bf0c1f..03768cfaa 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.new-app/route.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/new-app/route.tsx @@ -8,13 +8,13 @@ import { useAppState, } from '~/console/page-components/app-states'; import { parseName } from '~/console/server/r-utils/common'; -import { IWorkspaceContext } from '../_.$account.$cluster.$project.$scope.$workspace/route'; import AppCompute from './app-compute'; import AppDetail from './app-detail'; import AppEnvironment from './app-environment'; import AppNetwork from './app-network'; import AppReview from './app-review'; -import { FadeIn } from './util'; +import { FadeIn } from '../../../../../../../../page-components/util'; +import { IWorkspaceContext } from '../_layout'; const AppComp = () => { const { setPage, page, isPageComplete, resetState } = useAppState(); diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.routers/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/routers/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.routers/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/routers/route.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.routers/tools.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/routers/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.routers/tools.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/routers/tools.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.secret.$secret/handle.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/secret.$secret/handle.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.secret.$secret/handle.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/secret.$secret/handle.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.secret.$secret/resources.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/secret.$secret/resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.secret.$secret/resources.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/secret.$secret/resources.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.secret.$secret/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/secret.$secret/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.secret.$secret/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/secret.$secret/route.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.secret.$secret/tools.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/secret.$secret/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.secret.$secret/tools.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/secret.$secret/tools.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.settings.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/settings+/_layout.tsx similarity index 79% rename from src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.settings.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/settings+/_layout.tsx index 430b9215a..2b11254cc 100644 --- a/src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.$workspace.settings.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/settings+/_layout.tsx @@ -1,7 +1,7 @@ import { Outlet, useOutletContext } from '@remix-run/react'; import { useSubNavData } from '~/root/lib/client/hooks/use-create-subnav-action'; -import SidebarLayout from '../components/sidebar-layout'; -import { IWorkspaceContext } from './_.$account.$cluster.$project.$scope.$workspace/route'; +import { IWorkspaceContext } from '../_layout'; +import SidebarLayout from '~/console/components/sidebar-layout'; const WorkspaceSettings = () => { const rootContext = useOutletContext(); diff --git a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.settings.general/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/settings+/general/route.tsx similarity index 98% rename from src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.settings.general/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/settings+/general/route.tsx index 9d2a26aa2..b8c3af85b 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.$scope.$workspace.settings.general/route.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/$workspace+/settings+/general/route.tsx @@ -19,7 +19,7 @@ import { useUnsavedChanges } from '~/root/lib/client/hooks/use-unsaved-changes'; import { consoleBaseUrl } from '~/root/lib/configs/base-url.cjs'; import Yup from '~/root/lib/server/helpers/yup'; import { handleError } from '~/root/lib/utils/common'; -import { IWorkspaceContext } from '../_.$account.$cluster.$project.$scope.$workspace/route'; +import { IWorkspaceContext } from '../../_layout'; export const updateWorkspace = async ({ api, diff --git a/src/apps/console/routes/_.$account.infra.$cluster.$project.$scope._index.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/_index.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.$project.$scope._index.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/_index.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/_layout.tsx similarity index 83% rename from src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/_layout.tsx index 42ebe352e..293c7a1f2 100644 --- a/src/apps/console/routes/_.$account.infra.$cluster.$project.$scope.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/$scope+/_layout.tsx @@ -2,12 +2,12 @@ import { redirect } from '@remix-run/node'; import { Link, Outlet, useOutletContext, useParams } from '@remix-run/react'; import { ProdLogo } from '~/components/branding/prod-logo'; import { WorkspacesLogo } from '~/components/branding/workspace-logo'; +import { SCOPE } from '~/console/page-components/new-scope'; +import { ensureAccountSet, ensureClusterSet } from '~/console/server/utils/auth-utils'; import { IRemixCtx } from '~/root/lib/types/common'; -import Breadcrum from '../components/breadcrum'; -import LogoWrapper from '../components/logo-wrapper'; -import { SCOPE } from '../page-components/new-scope'; -import { ensureAccountSet, ensureClusterSet } from '../server/utils/auth-utils'; -import { IProjectContext } from './_.$account.infra.$cluster.$project'; +import { IProjectContext } from '../_layout'; +import Breadcrum from '~/console/components/breadcrum'; +import LogoWrapper from '~/console/components/logo-wrapper'; export const loader = async (ctx: IRemixCtx) => { ensureAccountSet(ctx); diff --git a/src/apps/console/routes/_.$account.infra.$cluster.$project._index.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/_index.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.$project._index.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/_index.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.$project.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/_layout.tsx similarity index 83% rename from src/apps/console/routes/_.$account.infra.$cluster.$project.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/_layout.tsx index 0698348db..dfa231857 100644 --- a/src/apps/console/routes/_.$account.infra.$cluster.$project.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/_layout.tsx @@ -8,11 +8,11 @@ import { import logger from '~/root/lib/client/helpers/log'; import { SubNavDataProvider } from '~/root/lib/client/hooks/use-create-subnav-action'; import { IRemixCtx } from '~/root/lib/types/common'; -import { CommonTabs } from '../components/common-navbar-tabs'; -import { type IProject } from '../server/gql/queries/project-queries'; -import { GQLServerHandler } from '../server/gql/saved-queries'; -import { ensureAccountSet, ensureClusterSet } from '../server/utils/auth-utils'; -import { IClusterContext } from './_.$account.infra.$cluster'; +import { IClusterContext } from '../../infra+/$cluster+/_layout'; +import { IProject } from '~/console/server/gql/queries/project-queries'; +import { CommonTabs } from '~/console/components/common-navbar-tabs'; +import { ensureAccountSet, ensureClusterSet } from '~/console/server/utils/auth-utils'; +import { GQLServerHandler } from '~/console/server/gql/saved-queries'; export interface IProjectContext extends IClusterContext { project: IProject; diff --git a/src/apps/console/routes/_.$account.$cluster.$project.environments/resources.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/environments/resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.environments/resources.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/environments/resources.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.environments/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/environments/route.tsx similarity index 95% rename from src/apps/console/routes/_.$account.$cluster.$project.environments/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/environments/route.tsx index 47ea4b523..2b395c220 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.environments/route.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/environments/route.tsx @@ -12,13 +12,11 @@ import { parseNodes } from '~/console/server/r-utils/common'; import { getPagination, getSearch } from '~/console/server/utils/common'; import { IRemixCtx } from '~/root/lib/types/common'; import fake from '~/root/fake-data-generator/fake'; -import { GQLServerHandler } from '../../server/gql/saved-queries'; -import { - ensureAccountSet, - ensureClusterSet, -} from '../../server/utils/auth-utils'; + import Resources from './resources'; import Tools from './tools'; +import { ensureAccountSet, ensureClusterSet } from '~/console/server/utils/auth-utils'; +import { GQLServerHandler } from '~/console/server/gql/saved-queries'; export const loader = async (ctx: IRemixCtx) => { ensureAccountSet(ctx); diff --git a/src/apps/console/routes/_.$account.$cluster.$project.environments/tools.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/environments/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.environments/tools.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/environments/tools.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.$project.settings._index.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/settings+/_index.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.$project.settings._index.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/settings+/_index.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.$project.settings.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/settings+/_layout.tsx similarity index 83% rename from src/apps/console/routes/_.$account.infra.$cluster.$project.settings.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/settings+/_layout.tsx index 09f74afd8..49bce69e5 100644 --- a/src/apps/console/routes/_.$account.infra.$cluster.$project.settings.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/settings+/_layout.tsx @@ -1,7 +1,7 @@ import { Outlet, useOutletContext } from '@remix-run/react'; import { useSubNavData } from '~/root/lib/client/hooks/use-create-subnav-action'; -import SidebarLayout from '../components/sidebar-layout'; -import { IProjectContext } from './_.$account.infra.$cluster.$project'; +import { IProjectContext } from '../_layout'; +import SidebarLayout from '~/console/components/sidebar-layout'; const Settings = () => { const rootContext = useOutletContext(); diff --git a/src/apps/console/routes/_.$account.$cluster.$project.settings.access-management/handle-user.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/settings+/access-management/handle-user.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.settings.access-management/handle-user.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/settings+/access-management/handle-user.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.settings.access-management/resource.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/settings+/access-management/resource.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.settings.access-management/resource.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/settings+/access-management/resource.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.settings.access-management/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/settings+/access-management/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.settings.access-management/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/settings+/access-management/route.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.settings.access-management/tools.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/settings+/access-management/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.settings.access-management/tools.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/settings+/access-management/tools.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.settings.general/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/settings+/general/route.tsx similarity index 98% rename from src/apps/console/routes/_.$account.$cluster.$project.settings.general/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/settings+/general/route.tsx index d08d49c78..8732f6e8e 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.settings.general/route.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/settings+/general/route.tsx @@ -19,7 +19,8 @@ import { useUnsavedChanges } from '~/root/lib/client/hooks/use-unsaved-changes'; import { consoleBaseUrl } from '~/root/lib/configs/base-url.cjs'; import Yup from '~/root/lib/server/helpers/yup'; import { handleError } from '~/root/lib/utils/common'; -import { IProjectContext } from '../_.$account.infra.$cluster.$project'; +import { IProjectContext } from '../../_layout'; + export const updateProject = async ({ api, diff --git a/src/apps/console/routes/_.$account.$cluster.$project.workspaces/resources.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/workspaces/resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.workspaces/resources.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/workspaces/resources.tsx diff --git a/src/apps/console/routes/_.$account.$cluster.$project.workspaces/route.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/workspaces/route.tsx similarity index 95% rename from src/apps/console/routes/_.$account.$cluster.$project.workspaces/route.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/workspaces/route.tsx index cc32003a7..ebfccee97 100644 --- a/src/apps/console/routes/_.$account.$cluster.$project.workspaces/route.tsx +++ b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/workspaces/route.tsx @@ -12,13 +12,11 @@ import { parseNodes } from '~/console/server/r-utils/common'; import { getPagination, getSearch } from '~/console/server/utils/common'; import { IRemixCtx } from '~/root/lib/types/common'; import fake from '~/root/fake-data-generator/fake'; -import { GQLServerHandler } from '../../server/gql/saved-queries'; -import { - ensureAccountSet, - ensureClusterSet, -} from '../../server/utils/auth-utils'; + import Resources from './resources'; import Tools from './tools'; +import { ensureAccountSet, ensureClusterSet } from '~/console/server/utils/auth-utils'; +import { GQLServerHandler } from '~/console/server/gql/saved-queries'; export const loader = async (ctx: IRemixCtx) => { ensureAccountSet(ctx); diff --git a/src/apps/console/routes/_.$account.$cluster.$project.workspaces/tools.tsx b/src/apps/console/routes/_main+/$account+/$cluster+/$project+/workspaces/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.$cluster.$project.workspaces/tools.tsx rename to src/apps/console/routes/_main+/$account+/$cluster+/$project+/workspaces/tools.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo._index.tsx b/src/apps/console/routes/_main+/$account+/_.$account.repo_.$repo._index.tsx similarity index 100% rename from src/apps/console/routes/_.$account.repo_.$repo._index.tsx rename to src/apps/console/routes/_main+/$account+/_.$account.repo_.$repo._index.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo.builds.tsx b/src/apps/console/routes/_main+/$account+/_.$account.repo_.$repo.builds.tsx similarity index 100% rename from src/apps/console/routes/_.$account.repo_.$repo.builds.tsx rename to src/apps/console/routes/_main+/$account+/_.$account.repo_.$repo.builds.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo.tsx b/src/apps/console/routes/_main+/$account+/_.$account.repo_.$repo.tsx similarity index 73% rename from src/apps/console/routes/_.$account.repo_.$repo.tsx rename to src/apps/console/routes/_main+/$account+/_.$account.repo_.$repo.tsx index 10c7000a9..ed1a9830b 100644 --- a/src/apps/console/routes/_.$account.repo_.$repo.tsx +++ b/src/apps/console/routes/_main+/$account+/_.$account.repo_.$repo.tsx @@ -1,13 +1,9 @@ import { Link, Outlet, useOutletContext, useParams } from '@remix-run/react'; -import { useSubNavData } from '~/root/lib/client/hooks/use-create-subnav-action'; import { ChevronRight } from '@jengaicons/react'; -import SidebarLayout from '../components/sidebar-layout'; -import { IProjectContext } from './_.$account.infra.$cluster.$project'; -import { CommonTabs } from '../components/common-navbar-tabs'; -import Breadcrum from '../components/breadcrum'; -import { ExtractNodeType, parseName } from '../server/r-utils/common'; -import { constants } from '../server/utils/constants'; -import Wrapper from '../components/wrapper'; +import Breadcrum from '~/console/components/breadcrum'; +import { constants } from '~/console/server/utils/constants'; +import { IProjectContext } from './$cluster+/$project+/_layout'; +import Wrapper from '~/console/components/wrapper'; const NetworkBreadcrum = () => { const { repo, account } = useParams(); diff --git a/src/apps/console/routes/_.$account._index.tsx b/src/apps/console/routes/_main+/$account+/_index.tsx similarity index 84% rename from src/apps/console/routes/_.$account._index.tsx rename to src/apps/console/routes/_main+/$account+/_index.tsx index db084b414..f9738508c 100644 --- a/src/apps/console/routes/_.$account._index.tsx +++ b/src/apps/console/routes/_main+/$account+/_index.tsx @@ -1,6 +1,6 @@ import { redirect } from '@remix-run/node'; +import { GQLServerHandler } from '~/console/server/gql/saved-queries'; import { IRemixCtx } from '~/root/lib/types/common'; -import { GQLServerHandler } from '../server/gql/saved-queries'; export const loader = async (ctx: IRemixCtx) => { const { account } = ctx.params; diff --git a/src/apps/console/routes/_.$account.tsx b/src/apps/console/routes/_main+/$account+/_layout.tsx similarity index 92% rename from src/apps/console/routes/_.$account.tsx rename to src/apps/console/routes/_main+/$account+/_layout.tsx index 6ee317863..5888db34c 100644 --- a/src/apps/console/routes/_.$account.tsx +++ b/src/apps/console/routes/_main+/$account+/_layout.tsx @@ -16,14 +16,14 @@ import logger from '~/root/lib/client/helpers/log'; import { useDataFromMatches } from '~/root/lib/client/hooks/use-custom-matches'; import { useUnsavedChanges } from '~/root/lib/client/hooks/use-unsaved-changes'; import { IRemixCtx, LoaderResult } from '~/root/lib/types/common'; -import { - type IAccount, - type IAccounts, -} from '../server/gql/queries/account-queries'; -import { GQLServerHandler } from '../server/gql/saved-queries'; -import { parseName } from '../server/r-utils/common'; -import { ensureAccountClientSide } from '../server/utils/auth-utils'; -import { IConsoleRootContext } from './_/route'; + + +import { IAccount, IAccounts } from '~/console/server/gql/queries/account-queries'; +import { parseName } from '~/console/server/r-utils/common'; + +import { ensureAccountClientSide } from '~/console/server/utils/auth-utils'; +import { GQLServerHandler } from '~/console/server/gql/saved-queries'; +import { IConsoleRootContext } from '../_layout/_layout'; // OptionList for various actions const AccountMenu = ({ account }: { account: IAccount }) => { @@ -135,7 +135,6 @@ export const loader = async (ctx: IRemixCtx) => { } acccountData = data; - return { account: data, }; diff --git a/src/apps/console/routes/_.$account.infra.$cluster._index.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/_index.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster._index.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/_index.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/_layout.tsx similarity index 84% rename from src/apps/console/routes/_.$account.infra.$cluster.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/_layout.tsx index 41b6c2c0a..acc522f5f 100644 --- a/src/apps/console/routes/_.$account.infra.$cluster.tsx +++ b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/_layout.tsx @@ -10,17 +10,14 @@ import withContext from '~/root/lib/app-setup/with-contxt'; import { IExtRemixCtx } from '~/root/lib/types/common'; import { BrandLogo } from '~/components/branding/brand-logo'; import { ChevronRight } from '@jengaicons/react'; -import { CommonTabs } from '../components/common-navbar-tabs'; -import { - IClusters, - type ICluster, -} from '../server/gql/queries/cluster-queries'; -import { GQLServerHandler } from '../server/gql/saved-queries'; -import { ensureAccountSet, ensureClusterSet } from '../server/utils/auth-utils'; -import { IAccountContext } from './_.$account'; -import Breadcrum from '../components/breadcrum'; -import { ExtractNodeType, parseName } from '../server/r-utils/common'; -import LogoWrapper from '../components/logo-wrapper'; +import { IAccountContext } from '../../_layout'; +import { ICluster, IClusters } from '~/console/server/gql/queries/cluster-queries'; +import { CommonTabs } from '~/console/components/common-navbar-tabs'; +import { ExtractNodeType, parseName } from '~/console/server/r-utils/common'; +import Breadcrum from '~/console/components/breadcrum'; +import LogoWrapper from '~/console/components/logo-wrapper'; +import { ensureAccountSet, ensureClusterSet } from '~/console/server/utils/auth-utils'; +import { GQLServerHandler } from '~/console/server/gql/saved-queries'; export interface IClusterContext extends IAccountContext { cluster: ICluster; diff --git a/src/apps/console/routes/_.$account.infra.$cluster.network.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/_layout.tsx similarity index 79% rename from src/apps/console/routes/_.$account.infra.$cluster.network.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/_layout.tsx index c56fc23c2..770e6ab03 100644 --- a/src/apps/console/routes/_.$account.infra.$cluster.network.tsx +++ b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/_layout.tsx @@ -1,6 +1,6 @@ import { Outlet, useOutletContext } from '@remix-run/react'; -import SidebarLayout from '../components/sidebar-layout'; -import { IClusterContext } from './_.$account.infra.$cluster'; +import { IClusterContext } from '../_layout'; +import SidebarLayout from '~/console/components/sidebar-layout'; const ContainerRegistry = () => { const rootContext = useOutletContext(); diff --git a/src/apps/console/routes/_.$account.infra.$cluster.network.domain/domain-detail.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/domain/domain-detail.tsx similarity index 96% rename from src/apps/console/routes/_.$account.infra.$cluster.network.domain/domain-detail.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/domain/domain-detail.tsx index 6649bc11b..ed0d4da58 100644 --- a/src/apps/console/routes/_.$account.infra.$cluster.network.domain/domain-detail.tsx +++ b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/domain/domain-detail.tsx @@ -3,7 +3,8 @@ import Popup from '~/components/molecule/popup'; import { CopyButton, DetailItem } from '~/console/components/commons'; import { IDomains } from '~/console/server/gql/queries/domain-queries'; import { ExtractNodeType } from '~/console/server/r-utils/common'; -import { IClusterContext } from '../_.$account.infra.$cluster'; +import { IClusterContext } from '../../_layout'; + const DomainDetailPopup = ({ visible, diff --git a/src/apps/console/routes/_.$account.infra.$cluster.network.domain/domain-resources.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/domain/domain-resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.network.domain/domain-resources.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/domain/domain-resources.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.network.domain/handle-domain.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/domain/handle-domain.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.network.domain/handle-domain.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/domain/handle-domain.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.network.domain/route.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/domain/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.network.domain/route.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/domain/route.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.network.domain/tools.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/domain/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.network.domain/tools.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/domain/tools.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.network.vpn/devices-resources.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/vpn/devices-resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.network.vpn/devices-resources.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/vpn/devices-resources.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.network.vpn/handle-devices.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/vpn/handle-devices.tsx similarity index 99% rename from src/apps/console/routes/_.$account.infra.$cluster.network.vpn/handle-devices.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/vpn/handle-devices.tsx index 308e3ac36..68fb7707c 100644 --- a/src/apps/console/routes/_.$account.infra.$cluster.network.vpn/handle-devices.tsx +++ b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/vpn/handle-devices.tsx @@ -41,8 +41,10 @@ import { LoadingPlaceHolder } from '~/console/components/loading'; import { downloadFile } from '~/console/utils/commons'; import CodeView from '~/console/components/code-view'; import { InfoLabel } from '~/console/components/commons'; -import { parseValue } from '../_.$account.$cluster.$project.$scope.$workspace.new-app/util'; -import { IAccountContext } from '../_.$account'; +import { IAccountContext } from '../../../../_layout'; +import { parseValue } from '~/console/page-components/util'; + + interface IExposedPorts { targetPort?: number; diff --git a/src/apps/console/routes/_.$account.infra.$cluster.network.vpn/route.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/vpn/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.network.vpn/route.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/vpn/route.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.network.vpn/tools.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/vpn/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.network.vpn/tools.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/network+/vpn/tools.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.nodepools/handle-nodepool.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/nodepools/handle-nodepool.tsx similarity index 99% rename from src/apps/console/routes/_.$account.infra.$cluster.nodepools/handle-nodepool.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/nodepools/handle-nodepool.tsx index 5ff95856f..7bd40ca10 100644 --- a/src/apps/console/routes/_.$account.infra.$cluster.nodepools/handle-nodepool.tsx +++ b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/nodepools/handle-nodepool.tsx @@ -18,10 +18,10 @@ import Chips from '~/components/atoms/chips'; import { awsRegions } from '~/console/dummy/consts'; import { mapper } from '~/components/utils'; import { IDialogBase } from '~/console/components/types.d'; -import { Checkbox } from '~/components/atoms/checkbox'; import { Switch } from '~/components/atoms/switch'; import { findNodePlan, nodePlans, provisionTypes } from './nodepool-utils'; -import { IClusterContext } from '../_.$account.infra.$cluster'; +import { IClusterContext } from '../_layout'; + type IDialog = IDialogBase>; diff --git a/src/apps/console/routes/_.$account.infra.$cluster.nodepools/nodepool-resources.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/nodepools/nodepool-resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.nodepools/nodepool-resources.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/nodepools/nodepool-resources.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.nodepools/nodepool-utils.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/nodepools/nodepool-utils.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.nodepools/nodepool-utils.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/nodepools/nodepool-utils.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.nodepools/resources_b.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/nodepools/resources_b.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.nodepools/resources_b.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/nodepools/resources_b.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.nodepools/route.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/nodepools/route.tsx similarity index 98% rename from src/apps/console/routes/_.$account.infra.$cluster.nodepools/route.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/nodepools/route.tsx index 3d76dd766..a7792662b 100644 --- a/src/apps/console/routes/_.$account.infra.$cluster.nodepools/route.tsx +++ b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/nodepools/route.tsx @@ -15,7 +15,6 @@ import fake from '~/root/fake-data-generator/fake'; import HandleNodePool from './handle-nodepool'; import Tools from './tools'; import NodepoolResources from './nodepool-resources'; -import { IClusterContext } from '../_.$account.infra.$cluster'; export const loader = async (ctx: IRemixCtx) => { ensureAccountSet(ctx); diff --git a/src/apps/console/routes/_.$account.infra.$cluster.nodepools/taints-and-labels.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/nodepools/taints-and-labels.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.nodepools/taints-and-labels.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/nodepools/taints-and-labels.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.nodepools/tools.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/nodepools/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.nodepools/tools.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/nodepools/tools.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.np.$nodepool/route.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/np.$nodepool/route.tsx similarity index 99% rename from src/apps/console/routes/_.$account.infra.$cluster.np.$nodepool/route.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/np.$nodepool/route.tsx index 046507280..6e2389d1a 100644 --- a/src/apps/console/routes/_.$account.infra.$cluster.np.$nodepool/route.tsx +++ b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/np.$nodepool/route.tsx @@ -21,7 +21,8 @@ import { renderCloudProvider } from '~/console/utils/commons'; import { CommonTabs } from '~/console/components/common-navbar-tabs'; import { DetailItem } from '~/console/components/commons'; import { INodepool } from '~/console/server/gql/queries/nodepool-queries'; -import { IAccountContext } from '../_.$account'; +import { IAccountContext } from '../../../_layout'; + const ClusterTabs = () => { const { account, cluster } = useParams(); diff --git a/src/apps/console/routes/_.$account.infra.$cluster.overview._index.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/overview+/_index.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.overview._index.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/overview+/_index.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.overview/route.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/overview+/_layout.tsx similarity index 92% rename from src/apps/console/routes/_.$account.infra.$cluster.overview/route.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/overview+/_layout.tsx index c15d58610..af7da55d9 100644 --- a/src/apps/console/routes/_.$account.infra.$cluster.overview/route.tsx +++ b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/overview+/_layout.tsx @@ -2,7 +2,8 @@ import { Outlet, useOutletContext } from '@remix-run/react'; import SidebarLayout from '~/console/components/sidebar-layout'; import { useSubNavData } from '~/root/lib/client/hooks/use-create-subnav-action'; -import { IClusterContext } from '../_.$account.infra.$cluster'; +import { IClusterContext } from '../_layout'; + const ClusterOverview = () => { const rootContext = useOutletContext(); diff --git a/src/apps/console/routes/_.$account.infra.$cluster.overview.info/route.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/overview+/info/route.tsx similarity index 98% rename from src/apps/console/routes/_.$account.infra.$cluster.overview.info/route.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/overview+/info/route.tsx index 47dd80b7e..5088ab5d1 100644 --- a/src/apps/console/routes/_.$account.infra.$cluster.overview.info/route.tsx +++ b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/overview+/info/route.tsx @@ -16,7 +16,7 @@ import { toast } from '~/components/molecule/toast'; import { useState } from 'react'; import CodeView from '~/console/components/code-view'; import { Button } from '~/components/atoms/button'; -import { IClusterContext } from '../_.$account.infra.$cluster'; +import { IClusterContext } from '../../_layout'; const KubeConfigDownload = ({ cluster }: { cluster: string }) => { const filename = `${cluster} kubeconfig.yaml`; diff --git a/src/apps/console/routes/_.$account.infra.$cluster.overview.metrics/route.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/overview+/metrics/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.overview.metrics/route.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/overview+/metrics/route.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.settings.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/settings+/_layout.tsx similarity index 89% rename from src/apps/console/routes/_.$account.infra.$cluster.settings.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/settings+/_layout.tsx index e44523d38..c542c6502 100644 --- a/src/apps/console/routes/_.$account.infra.$cluster.settings.tsx +++ b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/settings+/_layout.tsx @@ -1,6 +1,6 @@ import { Outlet, useOutletContext } from '@remix-run/react'; +import SidebarLayout from '~/console/components/sidebar-layout'; import { useSubNavData } from '~/root/lib/client/hooks/use-create-subnav-action'; -import SidebarLayout from '../components/sidebar-layout'; const ClusterSettings = () => { const rootContext = useOutletContext(); diff --git a/src/apps/console/routes/_.$account.infra.$cluster.settings.general/route.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/settings+/general/route.tsx similarity index 99% rename from src/apps/console/routes/_.$account.infra.$cluster.settings.general/route.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/settings+/general/route.tsx index 44a45fc35..215d2a1dc 100644 --- a/src/apps/console/routes/_.$account.infra.$cluster.settings.general/route.tsx +++ b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/settings+/general/route.tsx @@ -36,7 +36,8 @@ import { handleError } from '~/root/lib/utils/common'; import { mapper } from '~/components/utils'; import DeleteDialog from '~/console/components/delete-dialog'; import { useReload } from '~/root/lib/client/helpers/reloader'; -import { IClusterContext } from '../_.$account.infra.$cluster'; +import { IClusterContext } from '../../_layout'; + export const loader = async (ctx: IRemixCtx) => { const promise = pWrapper(async () => { diff --git a/src/apps/console/routes/_.$account.infra.$cluster.storage/route.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/storage/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.storage/route.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/storage/route.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.storage/storage-resources.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/storage/storage-resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.storage/storage-resources.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/storage/storage-resources.tsx diff --git a/src/apps/console/routes/_.$account.infra.$cluster.storage/tools.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/storage/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.storage/tools.tsx rename to src/apps/console/routes/_main+/$account+/infra+/$cluster+/storage/tools.tsx diff --git a/src/apps/console/routes/_.$account.infra._index/route.tsx b/src/apps/console/routes/_main+/$account+/infra+/_index.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra._index/route.tsx rename to src/apps/console/routes/_main+/$account+/infra+/_index.tsx diff --git a/src/apps/console/routes/_.$account.infra.tsx b/src/apps/console/routes/_main+/$account+/infra+/_layout.tsx similarity index 92% rename from src/apps/console/routes/_.$account.infra.tsx rename to src/apps/console/routes/_main+/$account+/infra+/_layout.tsx index 2da0cf802..4901fe31e 100644 --- a/src/apps/console/routes/_.$account.infra.tsx +++ b/src/apps/console/routes/_main+/$account+/infra+/_layout.tsx @@ -1,7 +1,8 @@ import { Outlet, useOutletContext } from '@remix-run/react'; +import SidebarLayout from '~/console/components/sidebar-layout'; import { useSubNavData } from '~/root/lib/client/hooks/use-create-subnav-action'; import { useHandleFromMatches } from '~/root/lib/client/hooks/use-custom-matches'; -import SidebarLayout from '../components/sidebar-layout'; + const Infra = () => { const rootContext = useOutletContext(); diff --git a/src/apps/console/routes/_.$account.infra.clusters._index/cluster-resources.tsx b/src/apps/console/routes/_main+/$account+/infra+/clusters/cluster-resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.clusters._index/cluster-resources.tsx rename to src/apps/console/routes/_main+/$account+/infra+/clusters/cluster-resources.tsx diff --git a/src/apps/console/routes/_.$account.infra.clusters._index/route.tsx b/src/apps/console/routes/_main+/$account+/infra+/clusters/route.tsx similarity index 95% rename from src/apps/console/routes/_.$account.infra.clusters._index/route.tsx rename to src/apps/console/routes/_main+/$account+/infra+/clusters/route.tsx index e815f91d8..4b25046e4 100644 --- a/src/apps/console/routes/_.$account.infra.clusters._index/route.tsx +++ b/src/apps/console/routes/_main+/$account+/infra+/clusters/route.tsx @@ -8,11 +8,11 @@ import { getPagination, getSearch } from '~/console/server/utils/common'; import { IRemixCtx } from '~/root/lib/types/common'; import fake from '~/root/fake-data-generator/fake'; import SecondarySubHeader from '~/console/components/secondary-sub-header'; -import { LoadingComp, pWrapper } from '../../components/loading-component'; -import { GQLServerHandler } from '../../server/gql/saved-queries'; -import { ensureAccountSet } from '../../server/utils/auth-utils'; import ClusterResources from './cluster-resources'; import Tools from './tools'; +import { LoadingComp, pWrapper } from '~/console/components/loading-component'; +import { ensureAccountSet } from '~/console/server/utils/auth-utils'; +import { GQLServerHandler } from '~/console/server/gql/saved-queries'; export const loader = async (ctx: IRemixCtx) => { const promise = pWrapper(async () => { diff --git a/src/apps/console/routes/_.$account.infra.clusters._index/tools.tsx b/src/apps/console/routes/_main+/$account+/infra+/clusters/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.clusters._index/tools.tsx rename to src/apps/console/routes/_main+/$account+/infra+/clusters/tools.tsx diff --git a/src/apps/console/routes/_.$account.infra.vms.tsx b/src/apps/console/routes/_main+/$account+/infra+/vms.tsx similarity index 58% rename from src/apps/console/routes/_.$account.infra.vms.tsx rename to src/apps/console/routes/_main+/$account+/infra+/vms.tsx index d9f7e622c..a99b90523 100644 --- a/src/apps/console/routes/_.$account.infra.vms.tsx +++ b/src/apps/console/routes/_main+/$account+/infra+/vms.tsx @@ -1,4 +1,4 @@ -import Wip from '../components/wip'; +import Wip from "~/console/components/wip"; const VM = () => { return ; diff --git a/src/apps/console/routes/_.$account.packages._index.tsx b/src/apps/console/routes/_main+/$account+/packages+/_index.tsx similarity index 100% rename from src/apps/console/routes/_.$account.packages._index.tsx rename to src/apps/console/routes/_main+/$account+/packages+/_index.tsx diff --git a/src/apps/console/routes/_.$account.packages.tsx b/src/apps/console/routes/_main+/$account+/packages+/_layout.tsx similarity index 82% rename from src/apps/console/routes/_.$account.packages.tsx rename to src/apps/console/routes/_main+/$account+/packages+/_layout.tsx index 908c69da1..fe9babd79 100644 --- a/src/apps/console/routes/_.$account.packages.tsx +++ b/src/apps/console/routes/_main+/$account+/packages+/_layout.tsx @@ -1,6 +1,6 @@ import { Outlet, useOutletContext } from '@remix-run/react'; -import SidebarLayout from '../components/sidebar-layout'; -import { IAccountContext } from './_.$account'; +import { IAccountContext } from '../_layout'; +import SidebarLayout from '~/console/components/sidebar-layout'; const ContainerRegistry = () => { const rootContext = useOutletContext(); diff --git a/src/apps/console/routes/_.$account.packages.access-management/cred-resources.tsx b/src/apps/console/routes/_main+/$account+/packages+/access-management/cred-resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.packages.access-management/cred-resources.tsx rename to src/apps/console/routes/_main+/$account+/packages+/access-management/cred-resources.tsx diff --git a/src/apps/console/routes/_.$account.packages.access-management/handle-cr-cred.tsx b/src/apps/console/routes/_main+/$account+/packages+/access-management/handle-cr-cred.tsx similarity index 100% rename from src/apps/console/routes/_.$account.packages.access-management/handle-cr-cred.tsx rename to src/apps/console/routes/_main+/$account+/packages+/access-management/handle-cr-cred.tsx diff --git a/src/apps/console/routes/_.$account.packages.access-management/route.tsx b/src/apps/console/routes/_main+/$account+/packages+/access-management/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.packages.access-management/route.tsx rename to src/apps/console/routes/_main+/$account+/packages+/access-management/route.tsx diff --git a/src/apps/console/routes/_.$account.packages.access-management/tools.tsx b/src/apps/console/routes/_main+/$account+/packages+/access-management/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.packages.access-management/tools.tsx rename to src/apps/console/routes/_main+/$account+/packages+/access-management/tools.tsx diff --git a/src/apps/console/routes/_.$account.packages.helm-repos.tsx b/src/apps/console/routes/_main+/$account+/packages+/helm-repos.tsx similarity index 63% rename from src/apps/console/routes/_.$account.packages.helm-repos.tsx rename to src/apps/console/routes/_main+/$account+/packages+/helm-repos.tsx index 1f8ad335f..6c406802c 100644 --- a/src/apps/console/routes/_.$account.packages.helm-repos.tsx +++ b/src/apps/console/routes/_main+/$account+/packages+/helm-repos.tsx @@ -1,4 +1,4 @@ -import Wip from '../components/wip'; +import Wip from "~/console/components/wip"; const HelmRepos = () => { return ; diff --git a/src/apps/console/routes/_.$account.packages.repos/handle-repo.tsx b/src/apps/console/routes/_main+/$account+/packages+/repos/handle-repo.tsx similarity index 100% rename from src/apps/console/routes/_.$account.packages.repos/handle-repo.tsx rename to src/apps/console/routes/_main+/$account+/packages+/repos/handle-repo.tsx diff --git a/src/apps/console/routes/_.$account.packages.repos/repo-resources.tsx b/src/apps/console/routes/_main+/$account+/packages+/repos/repo-resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.packages.repos/repo-resources.tsx rename to src/apps/console/routes/_main+/$account+/packages+/repos/repo-resources.tsx diff --git a/src/apps/console/routes/_.$account.packages.repos/route.tsx b/src/apps/console/routes/_main+/$account+/packages+/repos/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.packages.repos/route.tsx rename to src/apps/console/routes/_main+/$account+/packages+/repos/route.tsx diff --git a/src/apps/console/routes/_.$account.packages.repos/tools.tsx b/src/apps/console/routes/_main+/$account+/packages+/repos/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.packages.repos/tools.tsx rename to src/apps/console/routes/_main+/$account+/packages+/repos/tools.tsx diff --git a/src/apps/console/routes/_.$account.projects._index/project-resources.tsx b/src/apps/console/routes/_main+/$account+/projects/project-resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.projects._index/project-resources.tsx rename to src/apps/console/routes/_main+/$account+/projects/project-resources.tsx diff --git a/src/apps/console/routes/_.$account.projects._index/route.tsx b/src/apps/console/routes/_main+/$account+/projects/route.tsx similarity index 97% rename from src/apps/console/routes/_.$account.projects._index/route.tsx rename to src/apps/console/routes/_main+/$account+/projects/route.tsx index 746b1abdd..83114ff1b 100644 --- a/src/apps/console/routes/_.$account.projects._index/route.tsx +++ b/src/apps/console/routes/_main+/$account+/projects/route.tsx @@ -9,10 +9,10 @@ import logger from '~/root/lib/client/helpers/log'; import { IRemixCtx } from '~/root/lib/types/common'; import fake from '~/root/fake-data-generator/fake'; import Wip from '~/console/components/wip'; -import { GQLServerHandler } from '../../server/gql/saved-queries'; -import { ensureAccountSet } from '../../server/utils/auth-utils'; import ProjectResources from './project-resources'; import Tools from './tools'; +import { ensureAccountSet } from '~/console/server/utils/auth-utils'; +import { GQLServerHandler } from '~/console/server/gql/saved-queries'; export const loader = (ctx: IRemixCtx) => { const promise = pWrapper(async () => { diff --git a/src/apps/console/routes/_.$account.projects._index/tools.tsx b/src/apps/console/routes/_main+/$account+/projects/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.projects._index/tools.tsx rename to src/apps/console/routes/_main+/$account+/projects/tools.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo_.$build._index/buildruns-resources.tsx b/src/apps/console/routes/_main+/$account+/repo+/$build/buildruns-resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.repo_.$repo_.$build._index/buildruns-resources.tsx rename to src/apps/console/routes/_main+/$account+/repo+/$build/buildruns-resources.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo_.$build._index/route.tsx b/src/apps/console/routes/_main+/$account+/repo+/$build/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.repo_.$repo_.$build._index/route.tsx rename to src/apps/console/routes/_main+/$account+/repo+/$build/route.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo_.$build._index/tools.tsx b/src/apps/console/routes/_main+/$account+/repo+/$build/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.repo_.$repo_.$build._index/tools.tsx rename to src/apps/console/routes/_main+/$account+/repo+/$build/tools.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo.buildcaches/build-caches-resources.tsx b/src/apps/console/routes/_main+/$account+/repo+/buildcaches/build-caches-resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.repo_.$repo.buildcaches/build-caches-resources.tsx rename to src/apps/console/routes/_main+/$account+/repo+/buildcaches/build-caches-resources.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo.buildcaches/handle-build-cache.tsx b/src/apps/console/routes/_main+/$account+/repo+/buildcaches/handle-build-cache.tsx similarity index 100% rename from src/apps/console/routes/_.$account.repo_.$repo.buildcaches/handle-build-cache.tsx rename to src/apps/console/routes/_main+/$account+/repo+/buildcaches/handle-build-cache.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo.buildcaches/route.tsx b/src/apps/console/routes/_main+/$account+/repo+/buildcaches/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.repo_.$repo.buildcaches/route.tsx rename to src/apps/console/routes/_main+/$account+/repo+/buildcaches/route.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo.buildcaches/tools.tsx b/src/apps/console/routes/_main+/$account+/repo+/buildcaches/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.repo_.$repo.buildcaches/tools.tsx rename to src/apps/console/routes/_main+/$account+/repo+/buildcaches/tools.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo.builds._index/build-resources.tsx b/src/apps/console/routes/_main+/$account+/repo+/builds/build-resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.repo_.$repo.builds._index/build-resources.tsx rename to src/apps/console/routes/_main+/$account+/repo+/builds/build-resources.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo.builds._index/handle-builds.tsx b/src/apps/console/routes/_main+/$account+/repo+/builds/handle-builds.tsx similarity index 100% rename from src/apps/console/routes/_.$account.repo_.$repo.builds._index/handle-builds.tsx rename to src/apps/console/routes/_main+/$account+/repo+/builds/handle-builds.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo.builds._index/route.tsx b/src/apps/console/routes/_main+/$account+/repo+/builds/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.repo_.$repo.builds._index/route.tsx rename to src/apps/console/routes/_main+/$account+/repo+/builds/route.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo.builds._index/tools.tsx b/src/apps/console/routes/_main+/$account+/repo+/builds/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.repo_.$repo.builds._index/tools.tsx rename to src/apps/console/routes/_main+/$account+/repo+/builds/tools.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo.images/route.tsx b/src/apps/console/routes/_main+/$account+/repo+/images/route.tsx similarity index 100% rename from src/apps/console/routes/_.$account.repo_.$repo.images/route.tsx rename to src/apps/console/routes/_main+/$account+/repo+/images/route.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo.images/sha-dialog.tsx b/src/apps/console/routes/_main+/$account+/repo+/images/sha-dialog.tsx similarity index 100% rename from src/apps/console/routes/_.$account.repo_.$repo.images/sha-dialog.tsx rename to src/apps/console/routes/_main+/$account+/repo+/images/sha-dialog.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo.images/tags-resources.tsx b/src/apps/console/routes/_main+/$account+/repo+/images/tags-resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.repo_.$repo.images/tags-resources.tsx rename to src/apps/console/routes/_main+/$account+/repo+/images/tags-resources.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo.images/tools.tsx b/src/apps/console/routes/_main+/$account+/repo+/images/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.repo_.$repo.images/tools.tsx rename to src/apps/console/routes/_main+/$account+/repo+/images/tools.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo_.new-build/build-details.tsx b/src/apps/console/routes/_main+/$account+/repo+/new-build/build-details.tsx similarity index 100% rename from src/apps/console/routes/_.$account.repo_.$repo_.new-build/build-details.tsx rename to src/apps/console/routes/_main+/$account+/repo+/new-build/build-details.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo_.new-build/configure-git-repo.tsx b/src/apps/console/routes/_main+/$account+/repo+/new-build/configure-git-repo.tsx similarity index 93% rename from src/apps/console/routes/_.$account.repo_.$repo_.new-build/configure-git-repo.tsx rename to src/apps/console/routes/_main+/$account+/repo+/new-build/configure-git-repo.tsx index 85ec647d2..b1c6e42ac 100644 --- a/src/apps/console/routes/_.$account.repo_.$repo_.new-build/configure-git-repo.tsx +++ b/src/apps/console/routes/_main+/$account+/repo+/new-build/configure-git-repo.tsx @@ -1,7 +1,9 @@ import { useState } from 'react'; import ExtendedFilledTab from '~/console/components/extended-filled-tab'; import { AnimatePresence, motion } from 'framer-motion'; -import { FadeIn } from '../_.$account.$cluster.$project.$scope.$workspace.new-app/util'; +import { FadeIn } from '~/console/page-components/util'; + + const ConfigureRepo = () => { const [setting, setSetting] = useState('general'); diff --git a/src/apps/console/routes/_.$account.repo_.$repo_.new-build/repo-selector.tsx b/src/apps/console/routes/_main+/$account+/repo+/new-build/repo-selector.tsx similarity index 100% rename from src/apps/console/routes/_.$account.repo_.$repo_.new-build/repo-selector.tsx rename to src/apps/console/routes/_main+/$account+/repo+/new-build/repo-selector.tsx diff --git a/src/apps/console/routes/_.$account.repo_.$repo_.new-build/route.tsx b/src/apps/console/routes/_main+/$account+/repo+/new-build/route.tsx similarity index 97% rename from src/apps/console/routes/_.$account.repo_.$repo_.new-build/route.tsx rename to src/apps/console/routes/_main+/$account+/repo+/new-build/route.tsx index bc8da88bf..312f34f1c 100644 --- a/src/apps/console/routes/_.$account.repo_.$repo_.new-build/route.tsx +++ b/src/apps/console/routes/_main+/$account+/repo+/new-build/route.tsx @@ -10,10 +10,10 @@ import Yup from '~/root/lib/server/helpers/yup'; import { handleError } from '~/root/lib/utils/common'; import AlertModal from '~/console/components/alert-modal'; import MultiStep, { useMultiStep } from '~/console/components/multi-step'; -import { FadeIn } from '../_.$account.$cluster.$project.$scope.$workspace.new-app/util'; import BuildDetails from './build-details'; import RepoSelector from './repo-selector'; import ConfigureRepo from './configure-git-repo'; +import { FadeIn } from '../../../../../page-components/util'; const NewBuild = () => { const navigate = useNavigate(); diff --git a/src/apps/console/routes/_.$account.infra.$cluster.settings._index.tsx b/src/apps/console/routes/_main+/$account+/settings+/_index.tsx similarity index 100% rename from src/apps/console/routes/_.$account.infra.$cluster.settings._index.tsx rename to src/apps/console/routes/_main+/$account+/settings+/_index.tsx diff --git a/src/apps/console/routes/_.$account.settings.tsx b/src/apps/console/routes/_main+/$account+/settings+/_layout.tsx similarity index 89% rename from src/apps/console/routes/_.$account.settings.tsx rename to src/apps/console/routes/_main+/$account+/settings+/_layout.tsx index 5d5e69ada..25b99b50f 100644 --- a/src/apps/console/routes/_.$account.settings.tsx +++ b/src/apps/console/routes/_main+/$account+/settings+/_layout.tsx @@ -1,5 +1,5 @@ import { Outlet, useOutletContext } from '@remix-run/react'; -import SidebarLayout from '../components/sidebar-layout'; +import SidebarLayout from '~/console/components/sidebar-layout'; const Settings = () => { const rootContext = useOutletContext(); diff --git a/src/apps/console/routes/_.$account.settings.billing.tsx b/src/apps/console/routes/_main+/$account+/settings+/billing.tsx similarity index 100% rename from src/apps/console/routes/_.$account.settings.billing.tsx rename to src/apps/console/routes/_main+/$account+/settings+/billing.tsx diff --git a/src/apps/console/routes/_.$account.settings.cloud-providers/handle-provider.tsx b/src/apps/console/routes/_main+/$account+/settings+/cloud-providers/handle-provider.tsx similarity index 100% rename from src/apps/console/routes/_.$account.settings.cloud-providers/handle-provider.tsx rename to src/apps/console/routes/_main+/$account+/settings+/cloud-providers/handle-provider.tsx diff --git a/src/apps/console/routes/_.$account.settings.cloud-providers/provider-resources.tsx b/src/apps/console/routes/_main+/$account+/settings+/cloud-providers/provider-resources.tsx similarity index 100% rename from src/apps/console/routes/_.$account.settings.cloud-providers/provider-resources.tsx rename to src/apps/console/routes/_main+/$account+/settings+/cloud-providers/provider-resources.tsx diff --git a/src/apps/console/routes/_.$account.settings.cloud-providers/route.tsx b/src/apps/console/routes/_main+/$account+/settings+/cloud-providers/route.tsx similarity index 97% rename from src/apps/console/routes/_.$account.settings.cloud-providers/route.tsx rename to src/apps/console/routes/_main+/$account+/settings+/cloud-providers/route.tsx index 6f1407ac2..14b726160 100644 --- a/src/apps/console/routes/_.$account.settings.cloud-providers/route.tsx +++ b/src/apps/console/routes/_main+/$account+/settings+/cloud-providers/route.tsx @@ -10,11 +10,12 @@ import { getPagination, getSearch } from '~/console/server/utils/common'; import { IRemixCtx } from '~/root/lib/types/common'; import fake from '~/root/fake-data-generator/fake'; import { useState } from 'react'; -import { GQLServerHandler } from '../../server/gql/saved-queries'; + import HandleProvider from './handle-provider'; import ProviderResources from './provider-resources'; import Tools from './tools'; +import { GQLServerHandler } from '~/console/server/gql/saved-queries'; export const loader = async (ctx: IRemixCtx) => { const promise = pWrapper(async () => { diff --git a/src/apps/console/routes/_.$account.settings.cloud-providers/tools.tsx b/src/apps/console/routes/_main+/$account+/settings+/cloud-providers/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.settings.cloud-providers/tools.tsx rename to src/apps/console/routes/_main+/$account+/settings+/cloud-providers/tools.tsx diff --git a/src/apps/console/routes/_.$account.settings.general.tsx b/src/apps/console/routes/_main+/$account+/settings+/general.tsx similarity index 86% rename from src/apps/console/routes/_.$account.settings.general.tsx rename to src/apps/console/routes/_main+/$account+/settings+/general.tsx index 6441804a7..4f33f285d 100644 --- a/src/apps/console/routes/_.$account.settings.general.tsx +++ b/src/apps/console/routes/_main+/$account+/settings+/general.tsx @@ -11,14 +11,20 @@ import { useUnsavedChanges } from '~/root/lib/client/hooks/use-unsaved-changes'; import { consoleBaseUrl } from '~/root/lib/configs/base-url.cjs'; import Yup from '~/root/lib/server/helpers/yup'; import { handleError } from '~/root/lib/utils/common'; -import { Box, DeleteContainer } from '../components/common-console-components'; -import SubNavAction from '../components/sub-nav-action'; -import { useConsoleApi } from '../server/gql/api-provider'; -import { IAccount } from '../server/gql/queries/access-queries'; -import { ConsoleApiType } from '../server/gql/saved-queries'; -import { IAccountContext } from './_.$account'; -import { parseName } from '../server/r-utils/common'; -import SecondarySubHeader from '../components/secondary-sub-header'; +import { parseName } from '~/console/server/r-utils/common'; + +import SecondarySubHeader from '~/console/components/secondary-sub-header'; +import { useConsoleApi } from '~/console/server/gql/api-provider'; +import { IAccountContext } from '../_layout'; +import { ConsoleApiType } from '~/console/server/gql/saved-queries'; +import { Box, DeleteContainer } from '~/console/components/common-console-components'; +import { IAccount } from '~/console/server/gql/queries/account-queries'; +// import SubNavAction from '../components/sub-nav-action'; +// import { useConsoleApi } from '../server/gql/api-provider'; +// import { IAccount } from '../server/gql/queries/access-queries'; +// import { ConsoleApiType } from '../server/gql/saved-queries'; +// import { IAccountContext } from './_.$account'; +// import SecondarySubHeader from '../components/secondary-sub-header'; export const updateAccount = async ({ api, diff --git a/src/apps/console/routes/_.$account.settings.sample.tsx b/src/apps/console/routes/_main+/$account+/settings+/sample.tsx similarity index 91% rename from src/apps/console/routes/_.$account.settings.sample.tsx rename to src/apps/console/routes/_main+/$account+/settings+/sample.tsx index 78c2a62bc..9c6a82853 100644 --- a/src/apps/console/routes/_.$account.settings.sample.tsx +++ b/src/apps/console/routes/_main+/$account+/settings+/sample.tsx @@ -1,13 +1,16 @@ import { useLoaderData } from '@remix-run/react'; import { Button } from '~/components/atoms/button'; +import GitRepoSelector from '~/console/components/git-repo-selector'; +import { IAccount } from '~/console/server/gql/queries/account-queries'; +import { + type ConsoleApiType, + GQLServerHandler, +} from '~/console/server/gql/saved-queries'; +import { parseName } from '~/console/server/r-utils/common'; import logger from '~/root/lib/client/helpers/log'; import { githubAppName } from '~/root/lib/configs/base-url.cjs'; import { IRemixCtx } from '~/root/lib/types/common'; import { handleError } from '~/root/lib/utils/common'; -import GitRepoSelector from '../components/git-repo-selector'; -import { IAccount } from '../server/gql/queries/access-queries'; -import { ConsoleApiType, GQLServerHandler } from '../server/gql/saved-queries'; -import { parseName } from '../server/r-utils/common'; export const popupWindow = ({ url = '', diff --git a/src/apps/console/routes/_.$account.settings.user-management/handle-user.tsx b/src/apps/console/routes/_main+/$account+/settings+/user-management/handle-user.tsx similarity index 98% rename from src/apps/console/routes/_.$account.settings.user-management/handle-user.tsx rename to src/apps/console/routes/_main+/$account+/settings+/user-management/handle-user.tsx index 487e47def..f38daa433 100644 --- a/src/apps/console/routes/_.$account.settings.user-management/handle-user.tsx +++ b/src/apps/console/routes/_main+/$account+/settings+/user-management/handle-user.tsx @@ -10,7 +10,7 @@ import Yup from '~/root/lib/server/helpers/yup'; import { handleError } from '~/root/lib/utils/common'; import { Github__Com___Kloudlite___Api___Apps___Iam___Types__Role as Role } from '~/root/src/generated/gql/server'; import { parseName } from '~/console/server/r-utils/common'; -import { IAccountContext } from '../_.$account'; +import { IAccountContext } from '../../_layout'; const validRoles = (role: string): Role => { switch (role as Role) { diff --git a/src/apps/console/routes/_.$account.settings.user-management/route.tsx b/src/apps/console/routes/_main+/$account+/settings+/user-management/route.tsx similarity index 99% rename from src/apps/console/routes/_.$account.settings.user-management/route.tsx rename to src/apps/console/routes/_main+/$account+/settings+/user-management/route.tsx index e5f831002..55c77fd00 100644 --- a/src/apps/console/routes/_.$account.settings.user-management/route.tsx +++ b/src/apps/console/routes/_main+/$account+/settings+/user-management/route.tsx @@ -16,7 +16,7 @@ import { EmptyState } from '~/console/components/empty-state'; import useCustomSwr from '~/root/lib/client/hooks/use-custom-swr'; import { motion } from 'framer-motion'; import { parseName } from '~/console/server/r-utils/common'; -import { IAccountContext } from '../_.$account'; +import { IAccountContext } from '../../_layout'; import HandleUser from './handle-user'; import Tools from './tools'; import UserAccessResources from './user-access-resource'; diff --git a/src/apps/console/routes/_.$account.settings.user-management/tools.tsx b/src/apps/console/routes/_main+/$account+/settings+/user-management/tools.tsx similarity index 100% rename from src/apps/console/routes/_.$account.settings.user-management/tools.tsx rename to src/apps/console/routes/_main+/$account+/settings+/user-management/tools.tsx diff --git a/src/apps/console/routes/_.$account.settings.user-management/user-access-resource.tsx b/src/apps/console/routes/_main+/$account+/settings+/user-management/user-access-resource.tsx similarity index 98% rename from src/apps/console/routes/_.$account.settings.user-management/user-access-resource.tsx rename to src/apps/console/routes/_main+/$account+/settings+/user-management/user-access-resource.tsx index d38a26e15..22a64d7af 100644 --- a/src/apps/console/routes/_.$account.settings.user-management/user-access-resource.tsx +++ b/src/apps/console/routes/_main+/$account+/settings+/user-management/user-access-resource.tsx @@ -16,7 +16,7 @@ import { useConsoleApi } from '~/console/server/gql/api-provider'; import { useReload } from '~/root/lib/client/helpers/reloader'; import { handleError } from '~/root/lib/utils/common'; import { parseName } from '~/console/server/r-utils/common'; -import { IAccountContext } from '../_.$account'; +import { IAccountContext } from '../../_layout'; const RESOURCE_NAME = 'user'; diff --git a/src/apps/console/routes/_._index.tsx b/src/apps/console/routes/_main+/_index.tsx similarity index 100% rename from src/apps/console/routes/_._index.tsx rename to src/apps/console/routes/_main+/_index.tsx diff --git a/src/apps/console/routes/_/route.tsx b/src/apps/console/routes/_main+/_layout/_layout.tsx similarity index 100% rename from src/apps/console/routes/_/route.tsx rename to src/apps/console/routes/_main+/_layout/_layout.tsx diff --git a/src/apps/console/routes/_/handle-profile.tsx b/src/apps/console/routes/_main+/_layout/handle-profile.tsx similarity index 100% rename from src/apps/console/routes/_/handle-profile.tsx rename to src/apps/console/routes/_main+/_layout/handle-profile.tsx diff --git a/src/apps/console/server/gql/queries/access-queries.ts b/src/apps/console/server/gql/queries/access-queries.ts index c1b6a1c33..8256426dc 100644 --- a/src/apps/console/server/gql/queries/access-queries.ts +++ b/src/apps/console/server/gql/queries/access-queries.ts @@ -4,10 +4,8 @@ import { NN } from '~/root/lib/types/common'; import { ConsoleDeleteAccountInvitationMutation, ConsoleDeleteAccountInvitationMutationVariables, - ConsoleGetAccountQuery, ConsoleInviteMembersForAccountMutation, ConsoleInviteMembersForAccountMutationVariables, - ConsoleListAccountsQuery, ConsoleListInvitationsForAccountQuery, ConsoleListInvitationsForAccountQueryVariables, ConsoleListMembershipsForAccountQuery, @@ -24,8 +22,6 @@ import { ConsoleDeleteAccountMembershipMutationVariables, } from '~/root/src/generated/gql/server'; -export type IAccounts = NN; -export type IAccount = NN; export type IInvites = NN< ConsoleListInvitationsForUserQuery['accounts_listInvitationsForUser'] >; From c071e652cfe1d2c4539877e701f9dda3bb93379e Mon Sep 17 00:00:00 2001 From: Bikash Date: Mon, 25 Dec 2023 17:54:33 +0530 Subject: [PATCH 5/6] Designed cli login pages --- pnpm-lock.yaml | 10 +- src/apps/auth/routes/_main+/cli-logged-in.tsx | 19 +-- src/apps/auth/routes/_main+/cli-login.tsx | 125 ++++++++++-------- src/design-system/components/atoms/button.tsx | 20 ++- src/design-system/tailwind-base.js | 2 +- 5 files changed, 109 insertions(+), 67 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a5e6d8160..ae8503634 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -332,10 +332,10 @@ devDependencies: specifier: ^0.6.4 version: 0.6.4(@remix-run/dev@1.19.3) tailwindcss: - specifier: ^3.4.0 + specifier: ^3.3.2 version: 3.4.0 typescript: - specifier: ^5.3.3 + specifier: ^5.1.6 version: 5.3.3 typescript-json-schema: specifier: ^0.62.0 @@ -3864,7 +3864,7 @@ packages: peerDependencies: '@remix-run/dev': ^1.15.0 || ^2.0.0 dependencies: - '@remix-run/dev': 1.19.3(@remix-run/serve@1.19.3)(@types/node@16.18.64) + '@remix-run/dev': 1.19.3(@remix-run/serve@1.19.3)(@types/node@16.18.68) minimatch: 7.4.6 dev: true @@ -6590,7 +6590,7 @@ packages: '@types/glob': 7.2.0 array-union: 2.1.0 dir-glob: 3.0.1 - fast-glob: 3.2.11 + fast-glob: 3.3.2 glob: 7.2.3 ignore: 5.3.0 merge2: 1.4.1 @@ -9322,7 +9322,7 @@ packages: peerDependencies: '@remix-run/dev': ^1.15.0 || ^2 dependencies: - '@remix-run/dev': 1.19.3(@remix-run/serve@1.19.3)(@types/node@16.18.64) + '@remix-run/dev': 1.19.3(@remix-run/serve@1.19.3)(@types/node@16.18.68) '@remix-run/v1-route-convention': 0.1.4(@remix-run/dev@1.19.3) fs-extra: 11.2.0 minimatch: 5.1.6 diff --git a/src/apps/auth/routes/_main+/cli-logged-in.tsx b/src/apps/auth/routes/_main+/cli-logged-in.tsx index 80ae60e41..bb625949a 100644 --- a/src/apps/auth/routes/_main+/cli-logged-in.tsx +++ b/src/apps/auth/routes/_main+/cli-logged-in.tsx @@ -1,19 +1,22 @@ +import Container from '~/auth/components/container'; +import { BrandLogo } from '~/components/branding/brand-logo'; import { getCookie } from '~/root/lib/app-setup/cookies'; import withContext from '~/root/lib/app-setup/with-contxt'; import { IExtRemixCtx } from '~/root/lib/types/common'; const cliLoggedIn = () => { return ( -
-
-

- Logged in Successfully -

-
- Visit your terminal. + +
+ +
+

+ Logged in Successfully +

+
Visit your terminal.
-
+ ); }; diff --git a/src/apps/auth/routes/_main+/cli-login.tsx b/src/apps/auth/routes/_main+/cli-login.tsx index f2bcc0a22..74b6f653a 100644 --- a/src/apps/auth/routes/_main+/cli-login.tsx +++ b/src/apps/auth/routes/_main+/cli-login.tsx @@ -3,12 +3,19 @@ import { IExtRemixCtx } from '~/root/lib/types/common'; import getQueries from '~/root/lib/server/helpers/get-queries'; import { getCookie } from '~/root/lib/app-setup/cookies'; import withContext from '~/root/lib/app-setup/with-contxt'; -import { useLoaderData, useLocation, useNavigate } from '@remix-run/react'; +import { + Link, + useLoaderData, + useLocation, + useNavigate, +} from '@remix-run/react'; import md5 from '~/root/lib/client/helpers/md5'; import { Avatar } from '~/components/atoms/avatar'; import { cn } from '~/components/utils'; -import { Power } from '@jengaicons/react'; +import { SignOut } from '@jengaicons/react'; import { GQLServerHandler } from '~/auth/server/gql/saved-queries'; +import { BrandLogo } from '~/components/branding/brand-logo'; +import Container from '~/auth/components/container'; function CliLogin() { const { loginId, user } = useLoaderData(); @@ -25,16 +32,35 @@ function CliLogin() { if (!loginId) { return ( -
-
-

- Login id not provided -

-
- Please wait try again. + +
+ +
+ + Login id not provided + +
+ + You should be able to login with the url generated by
+ kl login + command + + + Setup kloudlite-client following instructions provided + +
-
+ ); } @@ -42,8 +68,8 @@ function CliLogin() { const profile = () => { return ( -
-
+
+
{/* eslint-disable-next-line no-nested-ternary */} {avatar ? ( )}
-
- - {name || email} - - - {/* {role.replace('-', ' ')} */} - {email} - -
); }; @@ -86,41 +103,45 @@ function CliLogin() { }; return ( -
-
-

- Login to Kloudlite CLI -

-
- {user ? ( -
-
{profile()}
- -
- ) : ( -
-
+ ); } diff --git a/src/design-system/components/atoms/button.tsx b/src/design-system/components/atoms/button.tsx index 86f539f32..cd7c3df06 100644 --- a/src/design-system/components/atoms/button.tsx +++ b/src/design-system/components/atoms/button.tsx @@ -126,6 +126,15 @@ export const ButtonBase = React.forwardRef< const noRing = false; + console.log( + disabled && + !['plain', 'primary-plain', 'critical-plain', 'secondary-plain'].includes( + variant + ), + variant, + disabled + ); + return ( Date: Mon, 25 Dec 2023 17:57:50 +0530 Subject: [PATCH 6/6] :bug: Fixed minor issues --- lib/server/helpers/execute-query-with-context.ts | 5 ++--- src/apps/console/components/logger.tsx | 3 ++- .../_main+/$account+/infra+/$cluster+/_layout.tsx | 12 +++++++++--- .../$account+/infra+/$cluster+/overview+/_layout.tsx | 1 - .../routes/_main+/$account+/infra+/_layout.tsx | 2 -- src/design-system/components/atoms/button.tsx | 9 --------- src/design-system/tailwind-base.js | 2 +- 7 files changed, 14 insertions(+), 20 deletions(-) diff --git a/lib/server/helpers/execute-query-with-context.ts b/lib/server/helpers/execute-query-with-context.ts index 5f78191a7..7694b49f0 100644 --- a/lib/server/helpers/execute-query-with-context.ts +++ b/lib/server/helpers/execute-query-with-context.ts @@ -113,11 +113,11 @@ export const ExecuteQueryWithContext = ( return { ...resp.data, data }; } catch (err) { if ((err as AxiosError).response) { - console.error('ErrorIn:', apiName, (err as Error).name); + console.trace('ErrorIn:', apiName, (err as Error).name); return (err as AxiosError).response?.data; } - console.error('ErrorIn:', apiName, (err as Error).message); + console.trace('ErrorIn:', apiName, (err as Error).message); return { errors: [ @@ -128,7 +128,6 @@ export const ExecuteQueryWithContext = ( }; } finally { console.timeEnd(apiName); - console.trace(apiName); } }; diff --git a/src/apps/console/components/logger.tsx b/src/apps/console/components/logger.tsx index 0addefe95..c5474ccde 100644 --- a/src/apps/console/components/logger.tsx +++ b/src/apps/console/components/logger.tsx @@ -622,7 +622,6 @@ ${url}` // eslint-disable-next-line new-cap wsclient = new sock.w3cwebsocket(url, '', '', {}); } catch (err) { - setIsLoading(false); setErrors( `${(err as Error).message} An error occurred attempting to load the provided log. @@ -630,6 +629,8 @@ Please check the URL and ensure it is reachable. ${url}` ); return () => {}; + } finally { + setIsLoading(false); } // wsclient.onopen = logger.log; // wsclient.onclose = logger.log; diff --git a/src/apps/console/routes/_main+/$account+/infra+/$cluster+/_layout.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/_layout.tsx index acc522f5f..6ddf6974f 100644 --- a/src/apps/console/routes/_main+/$account+/infra+/$cluster+/_layout.tsx +++ b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/_layout.tsx @@ -10,14 +10,20 @@ import withContext from '~/root/lib/app-setup/with-contxt'; import { IExtRemixCtx } from '~/root/lib/types/common'; import { BrandLogo } from '~/components/branding/brand-logo'; import { ChevronRight } from '@jengaicons/react'; -import { IAccountContext } from '../../_layout'; -import { ICluster, IClusters } from '~/console/server/gql/queries/cluster-queries'; +import { + ICluster, + IClusters, +} from '~/console/server/gql/queries/cluster-queries'; import { CommonTabs } from '~/console/components/common-navbar-tabs'; import { ExtractNodeType, parseName } from '~/console/server/r-utils/common'; import Breadcrum from '~/console/components/breadcrum'; import LogoWrapper from '~/console/components/logo-wrapper'; -import { ensureAccountSet, ensureClusterSet } from '~/console/server/utils/auth-utils'; +import { + ensureAccountSet, + ensureClusterSet, +} from '~/console/server/utils/auth-utils'; import { GQLServerHandler } from '~/console/server/gql/saved-queries'; +import { IAccountContext } from '../../_layout'; export interface IClusterContext extends IAccountContext { cluster: ICluster; diff --git a/src/apps/console/routes/_main+/$account+/infra+/$cluster+/overview+/_layout.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/overview+/_layout.tsx index af7da55d9..6fab78974 100644 --- a/src/apps/console/routes/_main+/$account+/infra+/$cluster+/overview+/_layout.tsx +++ b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/overview+/_layout.tsx @@ -4,7 +4,6 @@ import SidebarLayout from '~/console/components/sidebar-layout'; import { useSubNavData } from '~/root/lib/client/hooks/use-create-subnav-action'; import { IClusterContext } from '../_layout'; - const ClusterOverview = () => { const rootContext = useOutletContext(); const subNavAction = useSubNavData(); diff --git a/src/apps/console/routes/_main+/$account+/infra+/_layout.tsx b/src/apps/console/routes/_main+/$account+/infra+/_layout.tsx index 4901fe31e..431d78d76 100644 --- a/src/apps/console/routes/_main+/$account+/infra+/_layout.tsx +++ b/src/apps/console/routes/_main+/$account+/infra+/_layout.tsx @@ -3,12 +3,10 @@ import SidebarLayout from '~/console/components/sidebar-layout'; import { useSubNavData } from '~/root/lib/client/hooks/use-create-subnav-action'; import { useHandleFromMatches } from '~/root/lib/client/hooks/use-custom-matches'; - const Infra = () => { const rootContext = useOutletContext(); const subNavAction = useSubNavData(); const noLayout = useHandleFromMatches('noLayout', null); - console.log(noLayout); if (noLayout) { return ; diff --git a/src/design-system/components/atoms/button.tsx b/src/design-system/components/atoms/button.tsx index cd7c3df06..d88eebb2a 100644 --- a/src/design-system/components/atoms/button.tsx +++ b/src/design-system/components/atoms/button.tsx @@ -126,15 +126,6 @@ export const ButtonBase = React.forwardRef< const noRing = false; - console.log( - disabled && - !['plain', 'primary-plain', 'critical-plain', 'secondary-plain'].includes( - variant - ), - variant, - disabled - ); - return (