From fde45eca564b606de1fcacf1307aeb286e8b9b15 Mon Sep 17 00:00:00 2001 From: Daniel K Date: Sat, 16 Dec 2023 03:46:45 -0800 Subject: [PATCH] (reorganize) sidebar panels links --- .../Developers/{api.tsx => apikeys.tsx} | 65 ++++---- .../src/modules/Developers/events.tsx | 44 +++++- .../src/modules/Developers/index.tsx | 85 ++++++++++ .../dashboard/src/modules/Developers/logs.tsx | 44 +++++- .../src/modules/Developers/webhooks.tsx | 53 +++++-- .../{Developers => Resources}/graphiql.tsx | 0 .../docs.tsx => Resources/reference.tsx} | 0 .../src/modules/Settings/account.tsx | 107 +++++++------ .../src/modules/Settings/addresses.tsx | 45 +++++- .../src/modules/Settings/customs-infos.tsx | 146 ------------------ .../src/modules/Settings/organization.tsx | 74 +++++++++ .../src/modules/Settings/parcels.tsx | 45 +++++- .../src/modules/Settings/templates.tsx | 44 +++++- .../pages/_sites/[site]/developers/api.tsx | 2 +- .../_sites/[site]/developers/apikeys.tsx | 1 + .../_sites/[site]/developers/graphiql.tsx | 1 - .../docs.tsx => developers/index.tsx} | 2 +- .../_sites/[site]/resources/graphiql.tsx | 1 + .../_sites/[site]/resources/reference.tsx | 1 + .../_sites/[site]/settings/organization.tsx | 1 + .../_sites/[site]/test/developers/api.tsx | 2 +- .../_sites/[site]/test/developers/apikeys.tsx | 1 + .../[site]/test/developers/graphiql.tsx | 1 - .../[site]/test/developers/index.tsx} | 2 +- .../_sites/[site]/test/resources/graphiql.tsx | 1 + .../[site]/test/resources/reference.tsx | 1 + .../[site]/test/settings/organization.tsx | 1 + apps/dashboard/src/pages/developers/api.tsx | 2 +- .../src/pages/developers/apikeys.tsx | 1 + .../src/pages/developers/graphiql.tsx | 1 - .../docs.tsx => developers/index.tsx} | 2 +- .../src/pages/resources/graphiql.tsx | 1 + .../src/pages/resources/reference.tsx | 1 + .../src/pages/settings/organization.tsx | 1 + .../src/pages/test/developers/api.tsx | 2 +- .../src/pages/test/developers/apikeys.tsx | 1 + .../src/pages/test/developers/graphiql.tsx | 1 - .../test/developers/{docs.tsx => index.tsx} | 2 +- .../src/pages/test/resources/graphiql.tsx | 1 + .../src/pages/test/resources/reference.tsx | 1 + .../src/pages/test/settings/organization.tsx | 1 + packages/ui/components/expanded-sidebar.tsx | 71 ++++----- 42 files changed, 535 insertions(+), 324 deletions(-) rename apps/dashboard/src/modules/Developers/{api.tsx => apikeys.tsx} (74%) create mode 100644 apps/dashboard/src/modules/Developers/index.tsx rename apps/dashboard/src/modules/{Developers => Resources}/graphiql.tsx (100%) rename apps/dashboard/src/modules/{Developers/docs.tsx => Resources/reference.tsx} (100%) delete mode 100644 apps/dashboard/src/modules/Settings/customs-infos.tsx create mode 100644 apps/dashboard/src/modules/Settings/organization.tsx create mode 100644 apps/dashboard/src/pages/_sites/[site]/developers/apikeys.tsx delete mode 100644 apps/dashboard/src/pages/_sites/[site]/developers/graphiql.tsx rename apps/dashboard/src/pages/_sites/[site]/{test/developers/docs.tsx => developers/index.tsx} (87%) create mode 100644 apps/dashboard/src/pages/_sites/[site]/resources/graphiql.tsx create mode 100644 apps/dashboard/src/pages/_sites/[site]/resources/reference.tsx create mode 100644 apps/dashboard/src/pages/_sites/[site]/settings/organization.tsx create mode 100644 apps/dashboard/src/pages/_sites/[site]/test/developers/apikeys.tsx delete mode 100644 apps/dashboard/src/pages/_sites/[site]/test/developers/graphiql.tsx rename apps/dashboard/src/pages/{developers/docs.tsx => _sites/[site]/test/developers/index.tsx} (87%) create mode 100644 apps/dashboard/src/pages/_sites/[site]/test/resources/graphiql.tsx create mode 100644 apps/dashboard/src/pages/_sites/[site]/test/resources/reference.tsx create mode 100644 apps/dashboard/src/pages/_sites/[site]/test/settings/organization.tsx create mode 100644 apps/dashboard/src/pages/developers/apikeys.tsx delete mode 100644 apps/dashboard/src/pages/developers/graphiql.tsx rename apps/dashboard/src/pages/{_sites/[site]/developers/docs.tsx => developers/index.tsx} (87%) create mode 100644 apps/dashboard/src/pages/resources/graphiql.tsx create mode 100644 apps/dashboard/src/pages/resources/reference.tsx create mode 100644 apps/dashboard/src/pages/settings/organization.tsx create mode 100644 apps/dashboard/src/pages/test/developers/apikeys.tsx delete mode 100644 apps/dashboard/src/pages/test/developers/graphiql.tsx rename apps/dashboard/src/pages/test/developers/{docs.tsx => index.tsx} (87%) create mode 100644 apps/dashboard/src/pages/test/resources/graphiql.tsx create mode 100644 apps/dashboard/src/pages/test/resources/reference.tsx create mode 100644 apps/dashboard/src/pages/test/settings/organization.tsx diff --git a/apps/dashboard/src/modules/Developers/api.tsx b/apps/dashboard/src/modules/Developers/apikeys.tsx similarity index 74% rename from apps/dashboard/src/modules/Developers/api.tsx rename to apps/dashboard/src/modules/Developers/apikeys.tsx index 4c415edd65..1932787e52 100644 --- a/apps/dashboard/src/modules/Developers/api.tsx +++ b/apps/dashboard/src/modules/Developers/apikeys.tsx @@ -1,9 +1,9 @@ import { GenerateAPIModal } from "@karrio/ui/modals/generate-api-dialog"; -import { CopiableLink } from "@karrio/ui/components/copiable-link"; import { AuthenticatedPage } from "@/layouts/authenticated-page"; import { useContext, useEffect, useRef, useState } from "react"; import { DashboardLayout } from "@/layouts/dashboard-layout"; import { useAPIMetadata } from "@karrio/hooks/api-metadata"; +import { AppLink } from "@karrio/ui/components/app-link"; import { Loading } from "@karrio/ui/components/loader"; import { useAPIToken } from "@karrio/hooks/api-token"; import Head from "next/head"; @@ -31,49 +31,46 @@ export default function ApiPage(pageProps: any) { <>
- API + Developers
- {/* APIs Overview */} -
- -
- Overview -
- -
- -
-
API Version
-
{references?.VERSION}
-
-
-
REST API
-
- -
-
-
-
GRAPHQL API
-
- -
-
+
+
    +
  • + + Overview + +
    • +
  • + + API Keys + +
    • +
  • + + Webhooks + +
    • +
  • + + Events + +
    • +
  • + + Logs + +
    • +
{/* API Keys */}
-
- API Keys -
- -
-
-

Token

+

Public Key

Use this key to authenticate your API calls.

- Events - + Developers +
- {!query.isFetched && } +
+
    +
  • + + Overview + +
    • +
  • + + API Keys + +
    • +
  • + + Webhooks + +
    • +
  • + + Events + +
    • +
  • + + Logs + +
    • +
+
+ {!query.isFetched && } {(query.isFetched && (events?.edges || []).length > 0) &&
- - - + + + {(events?.edges || []).map(({ node: event }) => ( diff --git a/apps/dashboard/src/modules/Developers/index.tsx b/apps/dashboard/src/modules/Developers/index.tsx new file mode 100644 index 0000000000..d28fde2fa0 --- /dev/null +++ b/apps/dashboard/src/modules/Developers/index.tsx @@ -0,0 +1,85 @@ +import { CopiableLink } from "@karrio/ui/components/copiable-link"; +import { AuthenticatedPage } from "@/layouts/authenticated-page"; +import { DashboardLayout } from "@/layouts/dashboard-layout"; +import { useAPIMetadata } from "@karrio/hooks/api-metadata"; +import { AppLink } from "@karrio/ui/components/app-link"; +import Head from "next/head"; + +export { getServerSideProps } from "@/context/main"; + + +export default function ApiPage(pageProps: any) { + const { references } = useAPIMetadata(); + + const Component: React.FC = () => { + + return ( + <> + +
+ Developers +
+
+ +
+
    +
  • + + Overview + +
    • +
  • + + API Keys + +
    • +
  • + + Webhooks + +
    • +
  • + + Events + +
    • +
  • + + Logs + +
    • +
+
+ + {/* APIs Overview */} +
+ +
+
API Version
+
{references?.VERSION}
+
+
+
REST API
+
+ +
+
+
+
GRAPHQL API
+
+ +
+
+
+ + + ); + }; + + return AuthenticatedPage(( + + {`API Keys - ${references?.APP_NAME}`} + + + ), pageProps); +} diff --git a/apps/dashboard/src/modules/Developers/logs.tsx b/apps/dashboard/src/modules/Developers/logs.tsx index 57f6bd6746..5cdc612d37 100644 --- a/apps/dashboard/src/modules/Developers/logs.tsx +++ b/apps/dashboard/src/modules/Developers/logs.tsx @@ -10,6 +10,7 @@ import React, { useContext, useEffect } from "react"; import { useRouter } from "next/dist/client/router"; import { useLogs } from "@karrio/hooks/log"; import Head from "next/head"; +import { AppLink } from "@karrio/ui/components/app-link"; export { getServerSideProps } from "@/context/main"; @@ -44,11 +45,42 @@ export default function LogsPage(pageProps: any) { return ( <> +
- Logs - + Developers +
+
+
    +
  • + + Overview + +
    • +
  • + + API Keys + +
    • +
  • + + Webhooks + +
    • +
  • + + Events + +
    • +
  • + + Logs + +
    • +
+
+
  • @@ -71,9 +103,11 @@ export default function LogsPage(pageProps: any) {
- - - + + + {(logs?.edges || []).map(({ node: log }) => ( diff --git a/apps/dashboard/src/modules/Developers/webhooks.tsx b/apps/dashboard/src/modules/Developers/webhooks.tsx index 8b39c5a71b..f88bb582e5 100644 --- a/apps/dashboard/src/modules/Developers/webhooks.tsx +++ b/apps/dashboard/src/modules/Developers/webhooks.tsx @@ -6,6 +6,7 @@ import { AuthenticatedPage } from "@/layouts/authenticated-page"; import { NotificationType, WebhookType } from "@karrio/types"; import { DashboardLayout } from "@/layouts/dashboard-layout"; import { formatDateTime, isNoneOrEmpty } from "@karrio/lib"; +import { AppLink } from "@karrio/ui/components/app-link"; import { Notify } from "@karrio/ui/components/notifier"; import { useRouter } from "next/dist/client/router"; import { useContext, useEffect } from "react"; @@ -53,24 +54,54 @@ export default function WebhooksPage(pageProps: any) { <>
- Endpoints -
- -
+ Developers +
+
+
    +
  • + + Overview + +
    • +
  • + + API Keys + +
    • +
  • + + Webhooks + +
    • +
  • + + Events + +
    • +
  • + + Logs + +
    • +
+
+ {((query.data?.webhooks.edges || []).length > 0) &&
EVENTIDDATEEVENT + +
STATUSDESCRIPTIONDATESTATUSDESCRIPTION + +
- - - - + + + + {(query.data?.webhooks.edges || []).map(({ node: webhook }) => ( diff --git a/apps/dashboard/src/modules/Developers/graphiql.tsx b/apps/dashboard/src/modules/Resources/graphiql.tsx similarity index 100% rename from apps/dashboard/src/modules/Developers/graphiql.tsx rename to apps/dashboard/src/modules/Resources/graphiql.tsx diff --git a/apps/dashboard/src/modules/Developers/docs.tsx b/apps/dashboard/src/modules/Resources/reference.tsx similarity index 100% rename from apps/dashboard/src/modules/Developers/docs.tsx rename to apps/dashboard/src/modules/Resources/reference.tsx diff --git a/apps/dashboard/src/modules/Settings/account.tsx b/apps/dashboard/src/modules/Settings/account.tsx index 10db715e71..b8e3018cac 100644 --- a/apps/dashboard/src/modules/Settings/account.tsx +++ b/apps/dashboard/src/modules/Settings/account.tsx @@ -10,6 +10,7 @@ import { AuthenticatedPage } from "@/layouts/authenticated-page"; import { ConfirmModal } from "@karrio/ui/modals/confirm-modal"; import { DashboardLayout } from "@/layouts/dashboard-layout"; import Head from "next/head"; +import { AppLink } from "@karrio/ui/components/app-link"; export { getServerSideProps } from "@/context/main"; @@ -32,60 +33,78 @@ export default function AccountPage(pageProps: any) {
- -
-
-
-

Profile

-

Your email address is your identity on {APP_NAME} and is used to log in.

-
- -
- - -
+
+
    +
  • + + Account + +
    • +
  • + + Organization + +
    • +
  • + + Addresses + +
    • +
  • + + Parcels + +
    • +
  • + + Templates + +
    • +
+
+ + +
+
+
+

Profile

+

Your email address is your identity on {APP_NAME} and is used to log in.

-
+
+ + +
+
-
-
-

Password

-

You can change your password.

-
+
- +
+
+

Password

+

You can change your password.

-
- -
-
-

Close Account

-

- Warning: You will lose access to your {APP_NAME} services -

-
- -
- - Close this account... - -
-
+
- {MULTI_ORGANIZATIONS &&
- - - -
} +
- {(pageProps as any).subscription &&
- -
} +
+
+

Close Account

+

+ Warning: You will lose access to your {APP_NAME} services +

+
- +
+ + Close this account... + +
+
+
); }; diff --git a/apps/dashboard/src/modules/Settings/addresses.tsx b/apps/dashboard/src/modules/Settings/addresses.tsx index bfca75198f..1503e01fbc 100644 --- a/apps/dashboard/src/modules/Settings/addresses.tsx +++ b/apps/dashboard/src/modules/Settings/addresses.tsx @@ -5,6 +5,7 @@ import { GoogleGeocodingScript } from "@karrio/ui/components/google-geocoding-sc import { AddressDescription } from "@karrio/ui/components/address-description"; import { AuthenticatedPage } from "@/layouts/authenticated-page"; import { DashboardLayout } from "@/layouts/dashboard-layout"; +import { AppLink } from "@karrio/ui/components/app-link"; import { Loading } from "@karrio/ui/components/loader"; import React, { useContext, useEffect } from "react"; import { useRouter } from "next/dist/client/router"; @@ -45,14 +46,40 @@ export default function AddressPage(pageProps: any) { <>
- Addresses -
- -
+ Settings +
+
+
    +
  • + + Account + +
    • +
  • + + Organization + +
    • +
  • + + Addresses + +
    • +
  • + + Parcels + +
    • +
  • + + Templates + +
    • +
+
+ {((query?.data?.address_templates?.edges || []).length > 0) &&
URLMODELAST EVENTURLMODELAST EVENT + +
@@ -60,7 +87,11 @@ export default function AddressPage(pageProps: any) { - + {query!.data!.address_templates!.edges.map(({ node: template }) => ( diff --git a/apps/dashboard/src/modules/Settings/customs-infos.tsx b/apps/dashboard/src/modules/Settings/customs-infos.tsx deleted file mode 100644 index dbbadf1b48..0000000000 --- a/apps/dashboard/src/modules/Settings/customs-infos.tsx +++ /dev/null @@ -1,146 +0,0 @@ -import { CustomsInfoEditModal, CustomsInfoEditContext } from "@karrio/ui/modals/customs-info-edit-modal"; -import { useCustomsTemplateMutation, useCustomsTemplates } from "@karrio/hooks/customs"; -import { CustomsInfoDescription } from "@karrio/ui/components/customs-info-description"; -import { ConfirmModal, ConfirmModalContext } from "@karrio/ui/modals/confirm-modal"; -import { AuthenticatedPage } from "@/layouts/authenticated-page"; -import { DashboardLayout } from "@/layouts/dashboard-layout"; -import { useRouter } from "next/dist/client/router"; -import { useContext, useEffect } from "react"; -import { isNoneOrEmpty } from "@karrio/lib"; -import { CustomsType } from "@karrio/types"; -import Head from "next/head"; -import React from "react"; - -export { getServerSideProps } from "@/context/main"; - - -export default function CustomsInfoPage(pageProps: any) { - const Component: React.FC = () => { - const router = useRouter(); - const { confirm: confirmDeletion } = useContext(ConfirmModalContext); - const { editCustomsInfo } = useContext(CustomsInfoEditContext); - const mutation = useCustomsTemplateMutation(); - const { query, setFilter, filter } = useCustomsTemplates(); - const [initialized, setInitialized] = React.useState(false); - - const remove = (id: string) => async () => { - await mutation.deleteCustomsTemplate.mutateAsync({ id }); - }; - - useEffect(() => { - if (!initialized && query.isFetched && !isNoneOrEmpty(router.query.modal)) { - const customsTemplate: any = (query.data?.customs_templates?.edges || []) - .find(c => c.node.id === router.query.modal); - if (customsTemplate || router.query.modal === 'new') { - editCustomsInfo({ customsTemplate }); - } - setInitialized(true); - } - }, [router.query.modal, query.isFetched]); - - return ( - <> - -
- Customs -
- -
-
- - {((query.data?.customs_templates.edges || []).length > 0) &&
-
ADDRESS TEMPLATES + +
- - - - - - - - {(query.data?.customs_templates.edges || []).map(({ node: template }) => ( - - - - - - - - ))} - - -
CUSTOMS INFO TEMPLATES
-

{template.label}

- - 		- {template.is_default && - Default customs - } - -
- - -
-
- -
- - {(query.data?.customs_templates.edges || []).length} results - - -
- - -
-
- -
} - - {(query.isFetched && (query.data?.customs_templates.edges || []).length == 0) && -
-
-

No customs info template has been added yet.

-

Use the New Customs Info button above to add

-
-
} - - - ); - }; - - return AuthenticatedPage(( - - {`Customs Templates - ${(pageProps as any).metadata?.APP_NAME}`} - - - - - - - - - ), pageProps); -} diff --git a/apps/dashboard/src/modules/Settings/organization.tsx b/apps/dashboard/src/modules/Settings/organization.tsx new file mode 100644 index 0000000000..b46d94dac6 --- /dev/null +++ b/apps/dashboard/src/modules/Settings/organization.tsx @@ -0,0 +1,74 @@ +import { OrganizationManagement } from "@karrio/ui/forms/organization-management"; +import { InviteMemberProvider } from "@karrio/ui/modals/invite-member-modal"; +import { AuthenticatedPage } from "@/layouts/authenticated-page"; +import { ConfirmModal } from "@karrio/ui/modals/confirm-modal"; +import { DashboardLayout } from "@/layouts/dashboard-layout"; +import { AppLink } from "@karrio/ui/components/app-link"; +import Head from "next/head"; + +export { getServerSideProps } from "@/context/main"; + + +export default function AccountPage(pageProps: any) { + const { APP_NAME, MULTI_ORGANIZATIONS } = (pageProps as any).metadata || {}; + + const Component: React.FC = () => { + + return ( + <> + +
+ Settings +
+
+ +
+
    +
  • + + Account + +
    • +
  • + + Organization + +
    • +
  • + + Addresses + +
    • +
  • + + Parcels + +
    • +
  • + + Templates + +
    • +
+
+ + {MULTI_ORGANIZATIONS &&
+ + + +
} + + ); + }; + + return AuthenticatedPage(( + + {`Organization Settings - ${APP_NAME}`} + + + + + + + ), pageProps) +} diff --git a/apps/dashboard/src/modules/Settings/parcels.tsx b/apps/dashboard/src/modules/Settings/parcels.tsx index 3644ff2adb..c83c92b836 100644 --- a/apps/dashboard/src/modules/Settings/parcels.tsx +++ b/apps/dashboard/src/modules/Settings/parcels.tsx @@ -4,6 +4,7 @@ import { ConfirmModal, ConfirmModalContext } from "@karrio/ui/modals/confirm-mod import { ParcelDescription } from "@karrio/ui/components/parcel-description"; import { AuthenticatedPage } from "@/layouts/authenticated-page"; import { DashboardLayout } from "@/layouts/dashboard-layout"; +import { AppLink } from "@karrio/ui/components/app-link"; import { Loading } from "@karrio/ui/components/loader"; import { useRouter } from "next/dist/client/router"; import { useContext, useEffect } from "react"; @@ -46,21 +47,51 @@ export default function ParcelsPage(pageProps: any) { <>
- Parcels -
- -
+ Settings +
+
+
    +
  • + + Account + +
    • +
  • + + Organization + +
    • +
  • + + Addresses + +
    • +
  • + + Parcels + +
    • +
  • + + Templates + +
    • +
+
+ {((parcel_templates?.edges || []).length > 0) &&
- + {(parcel_templates?.edges || []).map(({ node: template }) => ( diff --git a/apps/dashboard/src/modules/Settings/templates.tsx b/apps/dashboard/src/modules/Settings/templates.tsx index a1a3375232..c669060635 100644 --- a/apps/dashboard/src/modules/Settings/templates.tsx +++ b/apps/dashboard/src/modules/Settings/templates.tsx @@ -39,21 +39,51 @@ export default function TemplatesPage(pageProps: any) { <>
- Templates -
- - Create template - -
+ Settings +
+
+
    +
  • + + Account + +
    • +
  • + + Organization + +
    • +
  • + + Addresses + +
    • +
  • + + Parcels + +
    • +
  • + + Templates + +
    • +
+
+ {((document_templates?.edges || [])?.length > 0) &&
PARCEL TEMPLATES + +
- + {(document_templates?.edges || []).map(({ node: template }) => ( diff --git a/apps/dashboard/src/pages/_sites/[site]/developers/api.tsx b/apps/dashboard/src/pages/_sites/[site]/developers/api.tsx index 05a9ed780b..c5809a06c1 100644 --- a/apps/dashboard/src/pages/_sites/[site]/developers/api.tsx +++ b/apps/dashboard/src/pages/_sites/[site]/developers/api.tsx @@ -1 +1 @@ -export { default, getServerSideProps } from "@/modules/Developers/api"; +export { default, getServerSideProps } from "@/modules/Developers"; diff --git a/apps/dashboard/src/pages/_sites/[site]/developers/apikeys.tsx b/apps/dashboard/src/pages/_sites/[site]/developers/apikeys.tsx new file mode 100644 index 0000000000..7a8e40d082 --- /dev/null +++ b/apps/dashboard/src/pages/_sites/[site]/developers/apikeys.tsx @@ -0,0 +1 @@ +export { default, getServerSideProps } from "@/modules/Developers/apikeys"; diff --git a/apps/dashboard/src/pages/_sites/[site]/developers/graphiql.tsx b/apps/dashboard/src/pages/_sites/[site]/developers/graphiql.tsx deleted file mode 100644 index a3c331d305..0000000000 --- a/apps/dashboard/src/pages/_sites/[site]/developers/graphiql.tsx +++ /dev/null @@ -1 +0,0 @@ -export { default, getServerSideProps } from "@/modules/Developers/graphiql"; diff --git a/apps/dashboard/src/pages/_sites/[site]/test/developers/docs.tsx b/apps/dashboard/src/pages/_sites/[site]/developers/index.tsx similarity index 87% rename from apps/dashboard/src/pages/_sites/[site]/test/developers/docs.tsx rename to apps/dashboard/src/pages/_sites/[site]/developers/index.tsx index beb51d71ac..c5809a06c1 100644 --- a/apps/dashboard/src/pages/_sites/[site]/test/developers/docs.tsx +++ b/apps/dashboard/src/pages/_sites/[site]/developers/index.tsx @@ -1 +1 @@ -export { default, getServerSideProps } from "@/modules/Developers/docs"; +export { default, getServerSideProps } from "@/modules/Developers"; diff --git a/apps/dashboard/src/pages/_sites/[site]/resources/graphiql.tsx b/apps/dashboard/src/pages/_sites/[site]/resources/graphiql.tsx new file mode 100644 index 0000000000..28fb505a54 --- /dev/null +++ b/apps/dashboard/src/pages/_sites/[site]/resources/graphiql.tsx @@ -0,0 +1 @@ +export { default, getServerSideProps } from "@/modules/Resources/graphiql"; diff --git a/apps/dashboard/src/pages/_sites/[site]/resources/reference.tsx b/apps/dashboard/src/pages/_sites/[site]/resources/reference.tsx new file mode 100644 index 0000000000..42b6b7c9f6 --- /dev/null +++ b/apps/dashboard/src/pages/_sites/[site]/resources/reference.tsx @@ -0,0 +1 @@ +export { default, getServerSideProps } from "@/modules/Resources/reference"; diff --git a/apps/dashboard/src/pages/_sites/[site]/settings/organization.tsx b/apps/dashboard/src/pages/_sites/[site]/settings/organization.tsx new file mode 100644 index 0000000000..9cb2f826b8 --- /dev/null +++ b/apps/dashboard/src/pages/_sites/[site]/settings/organization.tsx @@ -0,0 +1 @@ +export { default, getServerSideProps } from "@/modules/Settings/organization"; diff --git a/apps/dashboard/src/pages/_sites/[site]/test/developers/api.tsx b/apps/dashboard/src/pages/_sites/[site]/test/developers/api.tsx index 05a9ed780b..c5809a06c1 100644 --- a/apps/dashboard/src/pages/_sites/[site]/test/developers/api.tsx +++ b/apps/dashboard/src/pages/_sites/[site]/test/developers/api.tsx @@ -1 +1 @@ -export { default, getServerSideProps } from "@/modules/Developers/api"; +export { default, getServerSideProps } from "@/modules/Developers"; diff --git a/apps/dashboard/src/pages/_sites/[site]/test/developers/apikeys.tsx b/apps/dashboard/src/pages/_sites/[site]/test/developers/apikeys.tsx new file mode 100644 index 0000000000..7a8e40d082 --- /dev/null +++ b/apps/dashboard/src/pages/_sites/[site]/test/developers/apikeys.tsx @@ -0,0 +1 @@ +export { default, getServerSideProps } from "@/modules/Developers/apikeys"; diff --git a/apps/dashboard/src/pages/_sites/[site]/test/developers/graphiql.tsx b/apps/dashboard/src/pages/_sites/[site]/test/developers/graphiql.tsx deleted file mode 100644 index a3c331d305..0000000000 --- a/apps/dashboard/src/pages/_sites/[site]/test/developers/graphiql.tsx +++ /dev/null @@ -1 +0,0 @@ -export { default, getServerSideProps } from "@/modules/Developers/graphiql"; diff --git a/apps/dashboard/src/pages/developers/docs.tsx b/apps/dashboard/src/pages/_sites/[site]/test/developers/index.tsx similarity index 87% rename from apps/dashboard/src/pages/developers/docs.tsx rename to apps/dashboard/src/pages/_sites/[site]/test/developers/index.tsx index beb51d71ac..c5809a06c1 100644 --- a/apps/dashboard/src/pages/developers/docs.tsx +++ b/apps/dashboard/src/pages/_sites/[site]/test/developers/index.tsx @@ -1 +1 @@ -export { default, getServerSideProps } from "@/modules/Developers/docs"; +export { default, getServerSideProps } from "@/modules/Developers"; diff --git a/apps/dashboard/src/pages/_sites/[site]/test/resources/graphiql.tsx b/apps/dashboard/src/pages/_sites/[site]/test/resources/graphiql.tsx new file mode 100644 index 0000000000..28fb505a54 --- /dev/null +++ b/apps/dashboard/src/pages/_sites/[site]/test/resources/graphiql.tsx @@ -0,0 +1 @@ +export { default, getServerSideProps } from "@/modules/Resources/graphiql"; diff --git a/apps/dashboard/src/pages/_sites/[site]/test/resources/reference.tsx b/apps/dashboard/src/pages/_sites/[site]/test/resources/reference.tsx new file mode 100644 index 0000000000..42b6b7c9f6 --- /dev/null +++ b/apps/dashboard/src/pages/_sites/[site]/test/resources/reference.tsx @@ -0,0 +1 @@ +export { default, getServerSideProps } from "@/modules/Resources/reference"; diff --git a/apps/dashboard/src/pages/_sites/[site]/test/settings/organization.tsx b/apps/dashboard/src/pages/_sites/[site]/test/settings/organization.tsx new file mode 100644 index 0000000000..9cb2f826b8 --- /dev/null +++ b/apps/dashboard/src/pages/_sites/[site]/test/settings/organization.tsx @@ -0,0 +1 @@ +export { default, getServerSideProps } from "@/modules/Settings/organization"; diff --git a/apps/dashboard/src/pages/developers/api.tsx b/apps/dashboard/src/pages/developers/api.tsx index 05a9ed780b..c5809a06c1 100644 --- a/apps/dashboard/src/pages/developers/api.tsx +++ b/apps/dashboard/src/pages/developers/api.tsx @@ -1 +1 @@ -export { default, getServerSideProps } from "@/modules/Developers/api"; +export { default, getServerSideProps } from "@/modules/Developers"; diff --git a/apps/dashboard/src/pages/developers/apikeys.tsx b/apps/dashboard/src/pages/developers/apikeys.tsx new file mode 100644 index 0000000000..7a8e40d082 --- /dev/null +++ b/apps/dashboard/src/pages/developers/apikeys.tsx @@ -0,0 +1 @@ +export { default, getServerSideProps } from "@/modules/Developers/apikeys"; diff --git a/apps/dashboard/src/pages/developers/graphiql.tsx b/apps/dashboard/src/pages/developers/graphiql.tsx deleted file mode 100644 index a3c331d305..0000000000 --- a/apps/dashboard/src/pages/developers/graphiql.tsx +++ /dev/null @@ -1 +0,0 @@ -export { default, getServerSideProps } from "@/modules/Developers/graphiql"; diff --git a/apps/dashboard/src/pages/_sites/[site]/developers/docs.tsx b/apps/dashboard/src/pages/developers/index.tsx similarity index 87% rename from apps/dashboard/src/pages/_sites/[site]/developers/docs.tsx rename to apps/dashboard/src/pages/developers/index.tsx index beb51d71ac..c5809a06c1 100644 --- a/apps/dashboard/src/pages/_sites/[site]/developers/docs.tsx +++ b/apps/dashboard/src/pages/developers/index.tsx @@ -1 +1 @@ -export { default, getServerSideProps } from "@/modules/Developers/docs"; +export { default, getServerSideProps } from "@/modules/Developers"; diff --git a/apps/dashboard/src/pages/resources/graphiql.tsx b/apps/dashboard/src/pages/resources/graphiql.tsx new file mode 100644 index 0000000000..28fb505a54 --- /dev/null +++ b/apps/dashboard/src/pages/resources/graphiql.tsx @@ -0,0 +1 @@ +export { default, getServerSideProps } from "@/modules/Resources/graphiql"; diff --git a/apps/dashboard/src/pages/resources/reference.tsx b/apps/dashboard/src/pages/resources/reference.tsx new file mode 100644 index 0000000000..42b6b7c9f6 --- /dev/null +++ b/apps/dashboard/src/pages/resources/reference.tsx @@ -0,0 +1 @@ +export { default, getServerSideProps } from "@/modules/Resources/reference"; diff --git a/apps/dashboard/src/pages/settings/organization.tsx b/apps/dashboard/src/pages/settings/organization.tsx new file mode 100644 index 0000000000..9cb2f826b8 --- /dev/null +++ b/apps/dashboard/src/pages/settings/organization.tsx @@ -0,0 +1 @@ +export { default, getServerSideProps } from "@/modules/Settings/organization"; diff --git a/apps/dashboard/src/pages/test/developers/api.tsx b/apps/dashboard/src/pages/test/developers/api.tsx index 05a9ed780b..c5809a06c1 100644 --- a/apps/dashboard/src/pages/test/developers/api.tsx +++ b/apps/dashboard/src/pages/test/developers/api.tsx @@ -1 +1 @@ -export { default, getServerSideProps } from "@/modules/Developers/api"; +export { default, getServerSideProps } from "@/modules/Developers"; diff --git a/apps/dashboard/src/pages/test/developers/apikeys.tsx b/apps/dashboard/src/pages/test/developers/apikeys.tsx new file mode 100644 index 0000000000..7a8e40d082 --- /dev/null +++ b/apps/dashboard/src/pages/test/developers/apikeys.tsx @@ -0,0 +1 @@ +export { default, getServerSideProps } from "@/modules/Developers/apikeys"; diff --git a/apps/dashboard/src/pages/test/developers/graphiql.tsx b/apps/dashboard/src/pages/test/developers/graphiql.tsx deleted file mode 100644 index a3c331d305..0000000000 --- a/apps/dashboard/src/pages/test/developers/graphiql.tsx +++ /dev/null @@ -1 +0,0 @@ -export { default, getServerSideProps } from "@/modules/Developers/graphiql"; diff --git a/apps/dashboard/src/pages/test/developers/docs.tsx b/apps/dashboard/src/pages/test/developers/index.tsx similarity index 87% rename from apps/dashboard/src/pages/test/developers/docs.tsx rename to apps/dashboard/src/pages/test/developers/index.tsx index beb51d71ac..c5809a06c1 100644 --- a/apps/dashboard/src/pages/test/developers/docs.tsx +++ b/apps/dashboard/src/pages/test/developers/index.tsx @@ -1 +1 @@ -export { default, getServerSideProps } from "@/modules/Developers/docs"; +export { default, getServerSideProps } from "@/modules/Developers"; diff --git a/apps/dashboard/src/pages/test/resources/graphiql.tsx b/apps/dashboard/src/pages/test/resources/graphiql.tsx new file mode 100644 index 0000000000..28fb505a54 --- /dev/null +++ b/apps/dashboard/src/pages/test/resources/graphiql.tsx @@ -0,0 +1 @@ +export { default, getServerSideProps } from "@/modules/Resources/graphiql"; diff --git a/apps/dashboard/src/pages/test/resources/reference.tsx b/apps/dashboard/src/pages/test/resources/reference.tsx new file mode 100644 index 0000000000..42b6b7c9f6 --- /dev/null +++ b/apps/dashboard/src/pages/test/resources/reference.tsx @@ -0,0 +1 @@ +export { default, getServerSideProps } from "@/modules/Resources/reference"; diff --git a/apps/dashboard/src/pages/test/settings/organization.tsx b/apps/dashboard/src/pages/test/settings/organization.tsx new file mode 100644 index 0000000000..9cb2f826b8 --- /dev/null +++ b/apps/dashboard/src/pages/test/settings/organization.tsx @@ -0,0 +1 @@ +export { default, getServerSideProps } from "@/modules/Settings/organization"; diff --git a/packages/ui/components/expanded-sidebar.tsx b/packages/ui/components/expanded-sidebar.tsx index 1ac62c5fc1..a8bd84b939 100644 --- a/packages/ui/components/expanded-sidebar.tsx +++ b/packages/ui/components/expanded-sidebar.tsx @@ -19,8 +19,8 @@ export const ExpandedSidebar: React.FC = () => { const dismissAction = useRef(null); const { query: { data: { user } = {} } } = useUser(); const { testMode, basePath, switchMode } = useAppMode(); - const { metadata: { MULTI_ORGANIZATIONS, ORDERS_MANAGEMENT, DOCUMENTS_MANAGEMENT } } = useAPIMetadata(); - const [showSettingsMenus, setShowSettingsMenus] = React.useState(false); + const { metadata: { MULTI_ORGANIZATIONS, ORDERS_MANAGEMENT } } = useAPIMetadata(); + const [showResourcesMenus, setShowResourcesMenus] = React.useState(false); const dismiss = (e: React.MouseEvent) => { e.preventDefault(); @@ -69,30 +69,10 @@ export const ExpandedSidebar: React.FC = () => { {/* Settings */} - setShowSettingsMenus(!showSettingsMenus)}> - + + Settings - - - {(showSettingsMenus || window.location.pathname.includes('/settings')) && <> - - Account - - - - Addresses - - - - Parcels - - - {DOCUMENTS_MANAGEMENT && <> - - Templates - - } - } +
@@ -109,35 +89,36 @@ export const ExpandedSidebar: React.FC = () => { } {/* Developers */} - - + + Developers - {window.location.pathname.includes('/developers') && <> - - API - - - - Webhooks - + {/* Resources */} + setShowResourcesMenus(!showResourcesMenus)}> + + Resources + - - Events - + {(showResourcesMenus || window.location.pathname.includes('/resources')) && <> - - API Logs + + API Reference - - API Docs + + GraphQL - - GraphiQL - + + Guides + + + + } {/* Administration */}
DOCUMENT TEMPLATES + + Create template + +