clients/web/docs: fix login return_to link when under docs.polar.sh

clients/apps/web/src/app/[organization]/(sidebar)/layout.tsx

@@ -1,4 +1,5 @@
 import LogoIcon from '@/components/Brand/LogoIcon'
+import PolarMenu from '@/components/Layout/PolarMenu'
 import { BrandingMenu } from '@/components/Layout/Public/BrandingMenu'
 import { OrganizationPublicPageNav } from '@/components/Organization/OrganizationPublicPageNav'
 import { OrganizationPublicSidebar } from '@/components/Organization/OrganizationPublicSidebar'
@@ -13,7 +14,6 @@ import {
 } from '@polar-sh/sdk'
 import { notFound } from 'next/navigation'
 import React from 'react'
-import { PolarMenu } from './LayoutPolarMenu'
 
 const cacheConfig = {
   next: {

clients/apps/web/src/app/[organization]/[repo]/layout.tsx

@@ -1,4 +1,5 @@
 import LogoIcon from '@/components/Brand/LogoIcon'
+import PolarMenu from '@/components/Layout/PolarMenu'
 import { BrandingMenu } from '@/components/Layout/Public/BrandingMenu'
 import { getServerSideAPI } from '@/utils/api/serverside'
 import { organizationPageLink } from '@/utils/nav'
@@ -7,7 +8,6 @@ import Link from 'next/link'
 import { notFound } from 'next/navigation'
 import Avatar from 'polarkit/components/ui/atoms/avatar'
 import React from 'react'
-import { PolarMenu } from '../(sidebar)/LayoutPolarMenu'
 
 const cacheConfig = {
   next: {

clients/apps/web/src/components/Documentation/UserMenu.tsx

@@ -1,9 +1,9 @@
 'use client'
 
-import { PolarMenu } from '@/app/[organization]/(sidebar)/LayoutPolarMenu'
 import { useClientSideLoadedUser } from '@/hooks/docs'
 import { useListAdminOrganizations } from '@/hooks/queries'
 import { Skeleton } from 'polarkit/components/ui/skeleton'
+import PolarMenu from '../Layout/PolarMenu'
 
 const UserMenu = () => {
   const { user, loaded } = useClientSideLoadedUser()

clients/apps/web/src/app/[organization]/(sidebar)/LayoutPolarMenu.tsx → clients/apps/web/src/components/Layout/PolarMenu.tsx

@@ -10,16 +10,20 @@ import Link from 'next/link'
 import { usePathname } from 'next/navigation'
 import Button from 'polarkit/components/ui/atoms/button'
 
-export const PolarMenu = ({
+const PolarMenu = ({
   authenticatedUser,
   userAdminOrganizations,
 }: {
   authenticatedUser?: UserRead
   userAdminOrganizations: Organization[]
 }) => {
   const pathname = usePathname()
-  const loginReturnTo = pathname ?? '/feed'
-  const createWithPolarReturnTo = '/me'
+  const host = window.location.protocol + '//' + window.location.host
+  const returnToPrefix = host !== CONFIG.FRONTEND_BASE_URL ? host : ''
+  const loginReturnTo = pathname
+    ? `${returnToPrefix}${pathname}`
+    : `${returnToPrefix}/feed`
+  const createWithPolarReturnTo = `${returnToPrefix}/me`
 
   // Fallback to client side user loading (needed as we're loading data in the layout, and it isn't refreshed on navigation)
   const { currentUser: clientCurrentUser } = useAuth()
@@ -83,3 +87,5 @@ const CreateWithPolar = ({ returnTo }: { returnTo: string }) => {
     />
   )
 }
+
+export default PolarMenu