diff --git a/.env b/.env new file mode 100644 index 00000000..dc96c78c --- /dev/null +++ b/.env @@ -0,0 +1,3 @@ +NEXT_PUBLIC_DOCSEARCH_APP_ID=APP_NEXT_PUBLIC_DOCSEARCH_APP_ID +NEXT_PUBLIC_DOCSEARCH_API_KEY=APP_NEXT_PUBLIC_DOCSEARCH_API_KEY +NEXT_PUBLIC_DOCSEARCH_INDEX_NAME=APP_NEXT_PUBLIC_DOCSEARCH_INDEX_NAME \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index 984f7657..1015a188 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -16,15 +16,17 @@ RUN npm install --production # Copy all files COPY ./ ./ +COPY /docker/entrypoint.sh ./entrypoint.sh + # Build app RUN npm run build +RUN chmod u+x /usr/app/entrypoint.sh + # Expose the listening port EXPOSE 3000 -# Run container as non-root (unprivileged) user -# The node user is provided in the Node.js Alpine base image -USER node +# apply env variables to the Nextjs .env file +ENTRYPOINT ["/usr/app/entrypoint.sh"] -# Run npm start script with PM2 when container starts -CMD [ "pm2-runtime", "npm", "--", "start" ] \ No newline at end of file +CMD npm run start \ No newline at end of file diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh new file mode 100644 index 00000000..9a3c381f --- /dev/null +++ b/docker/entrypoint.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +# this script will check for the following NEXT_* environment variables passed via Docker environment (-e) and apply them +# to the Nextjs. +# The properties that will be replaced and have to start with APP_ prefix in the .env file + +set -ex +NEXT_PUBLIC_DOCSEARCH_APP_ID=${NEXT_PUBLIC_DOCSEARCH_APP_ID:-"none"} +NEXT_PUBLIC_DOCSEARCH_API_KEY=${NEXT_PUBLIC_DOCSEARCH_API_KEY:-"none"} +NEXT_PUBLIC_DOCSEARCH_INDEX_NAME=${NEXT_PUBLIC_DOCSEARCH_INDEX_NAME:"none"} + +find /usr/app/.next \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i "s#APP_NEXT_PUBLIC_DOCSEARCH_APP_ID#${NEXT_PUBLIC_DOCSEARCH_APP_ID}#g" +find /usr/app/.next \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i "s#APP_NEXT_PUBLIC_DOCSEARCH_API_KEY#${NEXT_PUBLIC_DOCSEARCH_API_KEY}#g" +find /usr/app/.next \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i "s#APP_NEXT_PUBLIC_DOCSEARCH_INDEX_NAME#${NEXT_PUBLIC_DOCSEARCH_INDEX_NAME}#g" + +echo "starting Nextjs" +exec "$@" \ No newline at end of file diff --git a/next.config.mjs b/next.config.mjs index 50e393d7..8719a19c 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -1,45 +1,57 @@ import nextMDX from '@next/mdx' -import { remarkPlugins } from './mdx/remark.mjs' -import { rehypePlugins } from './mdx/rehype.mjs' -import { recmaPlugins } from './mdx/recma.mjs' -import rehypeSlug from "rehype-slug"; +import {remarkPlugins} from './mdx/remark.mjs' +import {rehypePlugins} from './mdx/rehype.mjs' +import {recmaPlugins} from './mdx/recma.mjs' const withMDX = nextMDX({ - options: { - remarkPlugins, - // rehypeSlug, - rehypePlugins, - recmaPlugins, - providerImportSource: '@mdx-js/react', - }, + options: { + remarkPlugins, + // rehypeSlug, + rehypePlugins, + recmaPlugins, + providerImportSource: '@mdx-js/react', + }, }) + /** @type {import('next').NextConfig} */ const nextConfig = { - reactStrictMode: true, - pageExtensions: ['js', 'jsx', 'ts', 'tsx', 'mdx'], - experimental: { - scrollRestoration: true, - }, - redirects: async () => { - return [ - { - source: '/', - destination: '/docs/introduction', - permanent: true, - }, - { - source: '/docs', - destination: '/docs/introduction', - permanent: true, - }, - { - source: '/ipa', - destination: '/ipa/introduction', - permanent: true, - }, - ] - } + assetPrefix: '/docs-static', + reactStrictMode: true, + pageExtensions: ['js', 'jsx', 'ts', 'tsx', 'mdx'], + experimental: { + scrollRestoration: true, + }, + redirects: async () => { + return [ + { + source: '/docs', + destination: '/', + permanent: true, + }, + { + source: '/docs/:path*', + destination: '/:path*', + permanent: true, + } + ] + }, + rewrites: async () => { + return [ + { + source: '/', + destination: '/introduction', + }, + { + source: '/api', + destination: '/ipa/introduction', + }, + { + source: '/api/:path*', + destination: '/ipa/:path*', + } + ] + } } export default withMDX(nextConfig) diff --git a/public/img/architecture/acls.png b/public/docs-static/img/architecture/acls.png similarity index 100% rename from public/img/architecture/acls.png rename to public/docs-static/img/architecture/acls.png diff --git a/public/img/architecture/high-level-dia.png b/public/docs-static/img/architecture/high-level-dia.png similarity index 100% rename from public/img/architecture/high-level-dia.png rename to public/docs-static/img/architecture/high-level-dia.png diff --git a/public/img/architecture/management.png b/public/docs-static/img/architecture/management.png similarity index 100% rename from public/img/architecture/management.png rename to public/docs-static/img/architecture/management.png diff --git a/public/img/architecture/mesh.png b/public/docs-static/img/architecture/mesh.png similarity index 100% rename from public/img/architecture/mesh.png rename to public/docs-static/img/architecture/mesh.png diff --git a/public/img/architecture/netbird-peer-auto-tagging-newkey.png b/public/docs-static/img/architecture/netbird-peer-auto-tagging-newkey.png similarity index 100% rename from public/img/architecture/netbird-peer-auto-tagging-newkey.png rename to public/docs-static/img/architecture/netbird-peer-auto-tagging-newkey.png diff --git a/public/img/architecture/peer-auto-tagging-setupkey.gif b/public/docs-static/img/architecture/peer-auto-tagging-setupkey.gif similarity index 100% rename from public/img/architecture/peer-auto-tagging-setupkey.gif rename to public/docs-static/img/architecture/peer-auto-tagging-setupkey.gif diff --git a/public/img/architecture/relay.png b/public/docs-static/img/architecture/relay.png similarity index 100% rename from public/img/architecture/relay.png rename to public/docs-static/img/architecture/relay.png diff --git a/public/img/architecture/setup-keys.png b/public/docs-static/img/architecture/setup-keys.png similarity index 100% rename from public/img/architecture/setup-keys.png rename to public/docs-static/img/architecture/setup-keys.png diff --git a/public/img/architecture/signal.png b/public/docs-static/img/architecture/signal.png similarity index 100% rename from public/img/architecture/signal.png rename to public/docs-static/img/architecture/signal.png diff --git a/public/img/examples/wiretrustee-on-aws-ecs.png b/public/docs-static/img/examples/wiretrustee-on-aws-ecs.png similarity index 100% rename from public/img/examples/wiretrustee-on-aws-ecs.png rename to public/docs-static/img/examples/wiretrustee-on-aws-ecs.png diff --git a/public/img/favicon.ico b/public/docs-static/img/favicon.ico similarity index 100% rename from public/img/favicon.ico rename to public/docs-static/img/favicon.ico diff --git a/public/img/getting-started/add-peer.png b/public/docs-static/img/getting-started/add-peer.png similarity index 100% rename from public/img/getting-started/add-peer.png rename to public/docs-static/img/getting-started/add-peer.png diff --git a/public/img/getting-started/auth.png b/public/docs-static/img/getting-started/auth.png similarity index 100% rename from public/img/getting-started/auth.png rename to public/docs-static/img/getting-started/auth.png diff --git a/public/img/getting-started/device-confirmation.png b/public/docs-static/img/getting-started/device-confirmation.png similarity index 100% rename from public/img/getting-started/device-confirmation.png rename to public/docs-static/img/getting-started/device-confirmation.png diff --git a/public/img/getting-started/empty-peers.png b/public/docs-static/img/getting-started/empty-peers.png similarity index 100% rename from public/img/getting-started/empty-peers.png rename to public/docs-static/img/getting-started/empty-peers.png diff --git a/public/img/getting-started/high-level-dia.png b/public/docs-static/img/getting-started/high-level-dia.png similarity index 100% rename from public/img/getting-started/high-level-dia.png rename to public/docs-static/img/getting-started/high-level-dia.png diff --git a/public/img/getting-started/img.png b/public/docs-static/img/getting-started/img.png similarity index 100% rename from public/img/getting-started/img.png rename to public/docs-static/img/getting-started/img.png diff --git a/public/img/getting-started/logo-full.png b/public/docs-static/img/getting-started/logo-full.png similarity index 100% rename from public/img/getting-started/logo-full.png rename to public/docs-static/img/getting-started/logo-full.png diff --git a/public/img/getting-started/logo.png b/public/docs-static/img/getting-started/logo.png similarity index 100% rename from public/img/getting-started/logo.png rename to public/docs-static/img/getting-started/logo.png diff --git a/public/img/getting-started/netbird-sso-login-cmd.gif b/public/docs-static/img/getting-started/netbird-sso-login-cmd.gif similarity index 100% rename from public/img/getting-started/netbird-sso-login-cmd.gif rename to public/docs-static/img/getting-started/netbird-sso-login-cmd.gif diff --git a/public/img/getting-started/netbird-sso-login-ui.gif b/public/docs-static/img/getting-started/netbird-sso-login-ui.gif similarity index 100% rename from public/img/getting-started/netbird-sso-login-ui.gif rename to public/docs-static/img/getting-started/netbird-sso-login-ui.gif diff --git a/public/img/getting-started/netbird-up.png b/public/docs-static/img/getting-started/netbird-up.png similarity index 100% rename from public/img/getting-started/netbird-up.png rename to public/docs-static/img/getting-started/netbird-up.png diff --git a/public/img/getting-started/peerA.gif b/public/docs-static/img/getting-started/peerA.gif similarity index 100% rename from public/img/getting-started/peerA.gif rename to public/docs-static/img/getting-started/peerA.gif diff --git a/public/img/getting-started/peerB.gif b/public/docs-static/img/getting-started/peerB.gif similarity index 100% rename from public/img/getting-started/peerB.gif rename to public/docs-static/img/getting-started/peerB.gif diff --git a/public/img/getting-started/peers.gif b/public/docs-static/img/getting-started/peers.gif similarity index 100% rename from public/img/getting-started/peers.gif rename to public/docs-static/img/getting-started/peers.gif diff --git a/public/img/getting-started/peers.png b/public/docs-static/img/getting-started/peers.png similarity index 100% rename from public/img/getting-started/peers.png rename to public/docs-static/img/getting-started/peers.png diff --git a/public/img/getting-started/systray.png b/public/docs-static/img/getting-started/systray.png similarity index 100% rename from public/img/getting-started/systray.png rename to public/docs-static/img/getting-started/systray.png diff --git a/public/img/how-to-guides/activity-monitoring.png b/public/docs-static/img/how-to-guides/activity-monitoring.png similarity index 100% rename from public/img/how-to-guides/activity-monitoring.png rename to public/docs-static/img/how-to-guides/activity-monitoring.png diff --git a/public/docs-static/img/how-to-guides/add-new-peer-empty.png b/public/docs-static/img/how-to-guides/add-new-peer-empty.png new file mode 100644 index 00000000..174e5978 Binary files /dev/null and b/public/docs-static/img/how-to-guides/add-new-peer-empty.png differ diff --git a/public/docs-static/img/how-to-guides/add-new-peer-popup.png b/public/docs-static/img/how-to-guides/add-new-peer-popup.png new file mode 100644 index 00000000..fb5b70f9 Binary files /dev/null and b/public/docs-static/img/how-to-guides/add-new-peer-popup.png differ diff --git a/public/docs-static/img/how-to-guides/google-play-badge.png b/public/docs-static/img/how-to-guides/google-play-badge.png new file mode 100644 index 00000000..131f3aca Binary files /dev/null and b/public/docs-static/img/how-to-guides/google-play-badge.png differ diff --git a/public/img/how-to-guides/individual-peer-login-expiration.png b/public/docs-static/img/how-to-guides/individual-peer-login-expiration.png similarity index 100% rename from public/img/how-to-guides/individual-peer-login-expiration.png rename to public/docs-static/img/how-to-guides/individual-peer-login-expiration.png diff --git a/public/img/how-to-guides/netbird-nameserver-add-button.png b/public/docs-static/img/how-to-guides/netbird-nameserver-add-button.png similarity index 100% rename from public/img/how-to-guides/netbird-nameserver-add-button.png rename to public/docs-static/img/how-to-guides/netbird-nameserver-add-button.png diff --git a/public/img/how-to-guides/netbird-nameserver-all-group.png b/public/docs-static/img/how-to-guides/netbird-nameserver-all-group.png similarity index 100% rename from public/img/how-to-guides/netbird-nameserver-all-group.png rename to public/docs-static/img/how-to-guides/netbird-nameserver-all-group.png diff --git a/public/img/how-to-guides/netbird-nameserver-custom.png b/public/docs-static/img/how-to-guides/netbird-nameserver-custom.png similarity index 100% rename from public/img/how-to-guides/netbird-nameserver-custom.png rename to public/docs-static/img/how-to-guides/netbird-nameserver-custom.png diff --git a/public/img/how-to-guides/netbird-nameserver-predefined-selected.png b/public/docs-static/img/how-to-guides/netbird-nameserver-predefined-selected.png similarity index 100% rename from public/img/how-to-guides/netbird-nameserver-predefined-selected.png rename to public/docs-static/img/how-to-guides/netbird-nameserver-predefined-selected.png diff --git a/public/img/how-to-guides/netbird-nameserver-remote-resolver.png b/public/docs-static/img/how-to-guides/netbird-nameserver-remote-resolver.png similarity index 100% rename from public/img/how-to-guides/netbird-nameserver-remote-resolver.png rename to public/docs-static/img/how-to-guides/netbird-nameserver-remote-resolver.png diff --git a/public/img/how-to-guides/netbird-nameserver-remote-route.png b/public/docs-static/img/how-to-guides/netbird-nameserver-remote-route.png similarity index 100% rename from public/img/how-to-guides/netbird-nameserver-remote-route.png rename to public/docs-static/img/how-to-guides/netbird-nameserver-remote-route.png diff --git a/public/img/how-to-guides/netbird-nameserver-remote-rule.png b/public/docs-static/img/how-to-guides/netbird-nameserver-remote-rule.png similarity index 100% rename from public/img/how-to-guides/netbird-nameserver-remote-rule.png rename to public/docs-static/img/how-to-guides/netbird-nameserver-remote-rule.png diff --git a/public/img/how-to-guides/netbird-nameserver-selection-view-open.png b/public/docs-static/img/how-to-guides/netbird-nameserver-selection-view-open.png similarity index 100% rename from public/img/how-to-guides/netbird-nameserver-selection-view-open.png rename to public/docs-static/img/how-to-guides/netbird-nameserver-selection-view-open.png diff --git a/public/img/how-to-guides/netbird-nameserver-selection-view.png b/public/docs-static/img/how-to-guides/netbird-nameserver-selection-view.png similarity index 100% rename from public/img/how-to-guides/netbird-nameserver-selection-view.png rename to public/docs-static/img/how-to-guides/netbird-nameserver-selection-view.png diff --git a/public/img/how-to-guides/netbird-network-routes-add-button.png b/public/docs-static/img/how-to-guides/netbird-network-routes-add-button.png similarity index 100% rename from public/img/how-to-guides/netbird-network-routes-add-button.png rename to public/docs-static/img/how-to-guides/netbird-network-routes-add-button.png diff --git a/public/img/how-to-guides/netbird-network-routes-create-ha.png b/public/docs-static/img/how-to-guides/netbird-network-routes-create-ha.png similarity index 100% rename from public/img/how-to-guides/netbird-network-routes-create-ha.png rename to public/docs-static/img/how-to-guides/netbird-network-routes-create-ha.png diff --git a/public/img/how-to-guides/netbird-network-routes-create.png b/public/docs-static/img/how-to-guides/netbird-network-routes-create.png similarity index 100% rename from public/img/how-to-guides/netbird-network-routes-create.png rename to public/docs-static/img/how-to-guides/netbird-network-routes-create.png diff --git a/public/img/how-to-guides/netbird-network-routes-masquerading.png b/public/docs-static/img/how-to-guides/netbird-network-routes-masquerading.png similarity index 100% rename from public/img/how-to-guides/netbird-network-routes-masquerading.png rename to public/docs-static/img/how-to-guides/netbird-network-routes-masquerading.png diff --git a/public/img/how-to-guides/netbird-network-routes-saved-new-ha.png b/public/docs-static/img/how-to-guides/netbird-network-routes-saved-new-ha.png similarity index 100% rename from public/img/how-to-guides/netbird-network-routes-saved-new-ha.png rename to public/docs-static/img/how-to-guides/netbird-network-routes-saved-new-ha.png diff --git a/public/img/how-to-guides/netbird-network-routes-saved-new.png b/public/docs-static/img/how-to-guides/netbird-network-routes-saved-new.png similarity index 100% rename from public/img/how-to-guides/netbird-network-routes-saved-new.png rename to public/docs-static/img/how-to-guides/netbird-network-routes-saved-new.png diff --git a/public/img/how-to-guides/netbird-network-routes.png b/public/docs-static/img/how-to-guides/netbird-network-routes.png similarity index 100% rename from public/img/how-to-guides/netbird-network-routes.png rename to public/docs-static/img/how-to-guides/netbird-network-routes.png diff --git a/public/docs-static/img/how-to-guides/peer-list.png b/public/docs-static/img/how-to-guides/peer-list.png new file mode 100644 index 00000000..1d4efd02 Binary files /dev/null and b/public/docs-static/img/how-to-guides/peer-list.png differ diff --git a/public/img/how-to-guides/peer-login-expiration.png b/public/docs-static/img/how-to-guides/peer-login-expiration.png similarity index 100% rename from public/img/how-to-guides/peer-login-expiration.png rename to public/docs-static/img/how-to-guides/peer-login-expiration.png diff --git a/public/img/how-to-guides/peer-needs-login.png b/public/docs-static/img/how-to-guides/peer-needs-login.png similarity index 100% rename from public/img/how-to-guides/peer-needs-login.png rename to public/docs-static/img/how-to-guides/peer-needs-login.png diff --git a/public/img/how-to-guides/user-invites.gif b/public/docs-static/img/how-to-guides/user-invites.gif similarity index 100% rename from public/img/how-to-guides/user-invites.gif rename to public/docs-static/img/how-to-guides/user-invites.gif diff --git a/public/img/integrations/identity-providers/self-hosted/auth0-create-interactive-login-app.png b/public/docs-static/img/integrations/identity-providers/self-hosted/auth0-create-interactive-login-app.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/auth0-create-interactive-login-app.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/auth0-create-interactive-login-app.png diff --git a/public/img/integrations/identity-providers/self-hosted/auth0-grant-types.png b/public/docs-static/img/integrations/identity-providers/self-hosted/auth0-grant-types.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/auth0-grant-types.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/auth0-grant-types.png diff --git a/public/img/integrations/identity-providers/self-hosted/auth0-interactive-login-settings.png b/public/docs-static/img/integrations/identity-providers/self-hosted/auth0-interactive-login-settings.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/auth0-interactive-login-settings.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/auth0-interactive-login-settings.png diff --git a/public/img/integrations/identity-providers/self-hosted/authentik-add-user-group.png b/public/docs-static/img/integrations/identity-providers/self-hosted/authentik-add-user-group.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/authentik-add-user-group.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/authentik-add-user-group.png diff --git a/public/img/integrations/identity-providers/self-hosted/authentik-new-application.png b/public/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-application.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/authentik-new-application.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-application.png diff --git a/public/img/integrations/identity-providers/self-hosted/authentik-new-provider-config.png b/public/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-provider-config.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/authentik-new-provider-config.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-provider-config.png diff --git a/public/img/integrations/identity-providers/self-hosted/authentik-new-provider-type.png b/public/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-provider-type.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/authentik-new-provider-type.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-provider-type.png diff --git a/public/img/integrations/identity-providers/self-hosted/authentik-new-service-account.png b/public/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-service-account.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/authentik-new-service-account.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/authentik-new-service-account.png diff --git a/public/img/integrations/identity-providers/self-hosted/authentik-service-account-details.png b/public/docs-static/img/integrations/identity-providers/self-hosted/authentik-service-account-details.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/authentik-service-account-details.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/authentik-service-account-details.png diff --git a/public/img/integrations/identity-providers/self-hosted/azure-add-application-scope.png b/public/docs-static/img/integrations/identity-providers/self-hosted/azure-add-application-scope.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/azure-add-application-scope.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/azure-add-application-scope.png diff --git a/public/img/integrations/identity-providers/self-hosted/azure-add-scope.png b/public/docs-static/img/integrations/identity-providers/self-hosted/azure-add-scope.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/azure-add-scope.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/azure-add-scope.png diff --git a/public/img/integrations/identity-providers/self-hosted/azure-applications-permissions.png b/public/docs-static/img/integrations/identity-providers/self-hosted/azure-applications-permissions.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/azure-applications-permissions.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/azure-applications-permissions.png diff --git a/public/img/integrations/identity-providers/self-hosted/azure-client-secret.png b/public/docs-static/img/integrations/identity-providers/self-hosted/azure-client-secret.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/azure-client-secret.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/azure-client-secret.png diff --git a/public/img/integrations/identity-providers/self-hosted/azure-flows-setup.png b/public/docs-static/img/integrations/identity-providers/self-hosted/azure-flows-setup.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/azure-flows-setup.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/azure-flows-setup.png diff --git a/public/img/integrations/identity-providers/self-hosted/azure-grant-admin-conset.png b/public/docs-static/img/integrations/identity-providers/self-hosted/azure-grant-admin-conset.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/azure-grant-admin-conset.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/azure-grant-admin-conset.png diff --git a/public/img/integrations/identity-providers/self-hosted/azure-netbird-api-permisssions.png b/public/docs-static/img/integrations/identity-providers/self-hosted/azure-netbird-api-permisssions.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/azure-netbird-api-permisssions.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/azure-netbird-api-permisssions.png diff --git a/public/img/integrations/identity-providers/self-hosted/azure-new-application.png b/public/docs-static/img/integrations/identity-providers/self-hosted/azure-new-application.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/azure-new-application.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/azure-new-application.png diff --git a/public/img/integrations/identity-providers/self-hosted/azure-openid-permissions.png b/public/docs-static/img/integrations/identity-providers/self-hosted/azure-openid-permissions.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/azure-openid-permissions.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/azure-openid-permissions.png diff --git a/public/img/integrations/identity-providers/self-hosted/azure-spa-uri-setup.png b/public/docs-static/img/integrations/identity-providers/self-hosted/azure-spa-uri-setup.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/azure-spa-uri-setup.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/azure-spa-uri-setup.png diff --git a/public/img/integrations/identity-providers/self-hosted/azure-user-permissions.png b/public/docs-static/img/integrations/identity-providers/self-hosted/azure-user-permissions.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/azure-user-permissions.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/azure-user-permissions.png diff --git a/public/img/integrations/identity-providers/self-hosted/azure_api_scope.png b/public/docs-static/img/integrations/identity-providers/self-hosted/azure_api_scope.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/azure_api_scope.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/azure_api_scope.png diff --git a/public/img/integrations/identity-providers/self-hosted/keycloack-add-client-scope.png b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloack-add-client-scope.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloack-add-client-scope.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloack-add-client-scope.png diff --git a/public/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claim-mapper-domain-category.png b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claim-mapper-domain-category.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claim-mapper-domain-category.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claim-mapper-domain-category.png diff --git a/public/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claim-mapper-domain.png b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claim-mapper-domain.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claim-mapper-domain.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claim-mapper-domain.png diff --git a/public/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claim-mapper.png b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claim-mapper.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claim-mapper.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claim-mapper.png diff --git a/public/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claims-client.png b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claims-client.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claims-client.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloack-domain-token-claims-client.png diff --git a/public/img/integrations/identity-providers/self-hosted/keycloak-access-settings.png b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-access-settings.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloak-access-settings.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-access-settings.png diff --git a/public/img/integrations/identity-providers/self-hosted/keycloak-add-role.png b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-add-role.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloak-add-role.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-add-role.png diff --git a/public/img/integrations/identity-providers/self-hosted/keycloak-auth-grant.gif b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-auth-grant.gif similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloak-auth-grant.gif rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-auth-grant.gif diff --git a/public/img/integrations/identity-providers/self-hosted/keycloak-backend-client-auth.png b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-backend-client-auth.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloak-backend-client-auth.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-backend-client-auth.png diff --git a/public/img/integrations/identity-providers/self-hosted/keycloak-backend-client-credentials.png b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-backend-client-credentials.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloak-backend-client-credentials.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-backend-client-credentials.png diff --git a/public/img/integrations/identity-providers/self-hosted/keycloak-configure-audience-mapper-2.png b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-configure-audience-mapper-2.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloak-configure-audience-mapper-2.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-configure-audience-mapper-2.png diff --git a/public/img/integrations/identity-providers/self-hosted/keycloak-configure-audience-mapper.png b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-configure-audience-mapper.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloak-configure-audience-mapper.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-configure-audience-mapper.png diff --git a/public/img/integrations/identity-providers/self-hosted/keycloak-create-backend-client.png b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-backend-client.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloak-create-backend-client.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-backend-client.png diff --git a/public/img/integrations/identity-providers/self-hosted/keycloak-create-client-scope.png b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-client-scope.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloak-create-client-scope.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-client-scope.png diff --git a/public/img/integrations/identity-providers/self-hosted/keycloak-create-client.png b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-client.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloak-create-client.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-client.png diff --git a/public/img/integrations/identity-providers/self-hosted/keycloak-create-realm.png b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-realm.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloak-create-realm.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-realm.png diff --git a/public/img/integrations/identity-providers/self-hosted/keycloak-create-user.png b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-user.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloak-create-user.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-create-user.png diff --git a/public/img/integrations/identity-providers/self-hosted/keycloak-domain-token-claim-scope.png b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-domain-token-claim-scope.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloak-domain-token-claim-scope.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-domain-token-claim-scope.png diff --git a/public/img/integrations/identity-providers/self-hosted/keycloak-enable-auth.png b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-enable-auth.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloak-enable-auth.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-enable-auth.png diff --git a/public/img/integrations/identity-providers/self-hosted/keycloak-service-account-role.png b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-service-account-role.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloak-service-account-role.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-service-account-role.png diff --git a/public/img/integrations/identity-providers/self-hosted/keycloak-set-password.png b/public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-set-password.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/keycloak-set-password.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/keycloak-set-password.png diff --git a/public/img/integrations/identity-providers/self-hosted/zitadel-create-user.png b/public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-create-user.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/zitadel-create-user.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-create-user.png diff --git a/public/img/integrations/identity-providers/self-hosted/zitadel-new-application-auth.png b/public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-application-auth.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/zitadel-new-application-auth.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-application-auth.png diff --git a/public/img/integrations/identity-providers/self-hosted/zitadel-new-application-overview.png b/public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-application-overview.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/zitadel-new-application-overview.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-application-overview.png diff --git a/public/img/integrations/identity-providers/self-hosted/zitadel-new-application-uri.png b/public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-application-uri.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/zitadel-new-application-uri.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-application-uri.png diff --git a/public/img/integrations/identity-providers/self-hosted/zitadel-new-application.png b/public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-application.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/zitadel-new-application.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-application.png diff --git a/public/img/integrations/identity-providers/self-hosted/zitadel-new-project.png b/public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-project.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/zitadel-new-project.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-new-project.png diff --git a/public/img/integrations/identity-providers/self-hosted/zitadel-redirect-settings.png b/public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-redirect-settings.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/zitadel-redirect-settings.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-redirect-settings.png diff --git a/public/img/integrations/identity-providers/self-hosted/zitadel-service-account-role.png b/public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-service-account-role.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/zitadel-service-account-role.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-service-account-role.png diff --git a/public/img/integrations/identity-providers/self-hosted/zitadel-service-user-secret.png b/public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-service-user-secret.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/zitadel-service-user-secret.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-service-user-secret.png diff --git a/public/img/integrations/identity-providers/self-hosted/zitadel-token-settings.png b/public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-token-settings.png similarity index 100% rename from public/img/integrations/identity-providers/self-hosted/zitadel-token-settings.png rename to public/docs-static/img/integrations/identity-providers/self-hosted/zitadel-token-settings.png diff --git a/public/docs-static/img/logo/logo-api-dark.png b/public/docs-static/img/logo/logo-api-dark.png new file mode 100644 index 00000000..bbbaae63 Binary files /dev/null and b/public/docs-static/img/logo/logo-api-dark.png differ diff --git a/public/img/logo/logo-api-dark.svg b/public/docs-static/img/logo/logo-api-dark.svg similarity index 88% rename from public/img/logo/logo-api-dark.svg rename to public/docs-static/img/logo/logo-api-dark.svg index 29055bf9..7c4f75e7 100644 --- a/public/img/logo/logo-api-dark.svg +++ b/public/docs-static/img/logo/logo-api-dark.svg @@ -7,7 +7,7 @@ viewBox="0 0 132.29167 23.812502" version="1.1" id="svg1203" - inkscape:version="1.1.1 (1:1.1+202109281944+c3084ef5ed)" + inkscape:version="1.2.1 (1:1.2.1+202210291243+9c6d41e410)" sodipodi:docname="logo-api-dark.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" @@ -26,15 +26,17 @@ width="650px" units="px" inkscape:zoom="1.4289282" - inkscape:cx="334.86637" - inkscape:cy="27.993009" - inkscape:window-width="2560" - inkscape:window-height="1335" - inkscape:window-x="1920" + inkscape:cx="334.51646" + inkscape:cy="28.692834" + inkscape:window-width="1920" + inkscape:window-height="973" + inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="layer1" - inkscape:snap-global="false" /> + inkscape:snap-global="false" + inkscape:showpageshadow="2" + inkscape:deskcolor="#d1d1d1" /> + hide_knots="false" + nodesatellites_param="F,0,0,1,0,4.4979167,0,1 @ F,0,0,1,0,4.4979167,0,1 @ F,0,0,1,0,4.4979167,0,1 @ F,0,0,1,0,4.4979167,0,1" /> API + x="99.439789" + y="15.949568">API + inkscape:snap-global="false" + inkscape:showpageshadow="2" + inkscape:deskcolor="#d1d1d1" /> + hide_knots="false" + nodesatellites_param="F,0,0,1,0,4.4979167,0,1 @ F,0,0,1,0,4.4979167,0,1 @ F,0,0,1,0,4.4979167,0,1 @ F,0,0,1,0,4.4979167,0,1" /> API + x="99.440025" + y="15.806142">API group.links) : apiNavigation.flatMap((group) => group.links) + let allPages = !router.route.startsWith('/ipa') ? docsNavigation.flatMap((group) => group.links) : apiNavigation.flatMap((group) => group.links) let currentPageIndex = allPages.findIndex( (page) => page.href === router.pathname ) diff --git a/src/components/Guides.jsx b/src/components/Guides.jsx index 764ee7fe..4b8ed384 100644 --- a/src/components/Guides.jsx +++ b/src/components/Guides.jsx @@ -3,12 +3,12 @@ import { Heading } from '@/components/Heading' const guides = [ { - href: '/ipa/guides/authentication', + href: '/api/guides/authentication', name: 'Authentication', description: 'Learn how to authenticate your API requests.', }, { - href: '/ipa/guides/errors', + href: '/api/guides/errors', name: 'Errors', description: 'Read about the different types of errors returned by the API.', diff --git a/src/components/Header.jsx b/src/components/Header.jsx index 2a9f9f9f..69ae0579 100644 --- a/src/components/Header.jsx +++ b/src/components/Header.jsx @@ -69,8 +69,8 @@ export const Header = forwardRef(function Header({ className }, ref) {