Different fixes and improvements

Author: eandreeva-twr

astro.config.mjs

@@ -20,7 +20,6 @@ export default defineConfig({
   base: '/docs',
   outDir: './build',
   build: {
-    assets: '_astro',
     inlineStylesheets: 'never',
   },
   vite: {
@@ -95,4 +94,4 @@ export default defineConfig({
       }
     })
   ]
-});
+});

package.json

@@ -1,10 +1,10 @@
 {
-  "name": "cassiopeia",
+  "name": "adapty-docs",
   "type": "module",
   "version": "0.0.1",
   "scripts": {
-    "dev": "npm run build:md && astro dev",
-    "prebuild": "mkdir -p public && rm -rf public/FF_img public/img_webhook_flows && [ -d src/assets/shared/FF_img ] && cp -r src/assets/shared/FF_img public/ || true && [ -d src/content/docs/version-3.0/img_webhook_flows ] && cp -r src/content/docs/version-3.0/img_webhook_flows public/ || true",
+    "dev": "npm run prebuild && npm run build:md && astro dev",
+    "prebuild": "mkdir -p public/api-specs && rm -rf public/FF_img public/img_webhook_flows && [ -d src/assets/shared/FF_img ] && cp -r src/assets/shared/FF_img public/ || true && [ -d src/content/docs/version-3.0/img_webhook_flows ] && cp -r src/content/docs/version-3.0/img_webhook_flows public/ || true && [ -d src/api-reference/specs ] && cp -r src/api-reference/specs/* public/api-specs/ || true",
     "build": "astro build && npm run build:md:prod",
     "build:md": "node scripts/generate-md.mjs && node scripts/generate-llms.mjs",
     "build:md:prod": "node scripts/generate-md.mjs ../build && node scripts/generate-llms.mjs ../build",

public/api-specs/adapty-api.yaml

@@ -2998,6 +2998,3 @@ components:
         - count
         - page
         - pages
-
-security:
-  - apikeyAuth: []

src/components/ArticleButtons.astro

@@ -35,7 +35,10 @@
 
     // Calculate MD URL
     let path = window.location.pathname.replace(/\/$/, '');
-    if (path === '') path = '/what-is-adapty'; // Special case for root
+    // Special case for root: handle both empty string and base URL
+    if (path === '' || path === '/docs') {
+      path = '/docs/what-is-adapty';
+    }
 
     const mdUrl = `${path}.md`;
 

src/components/Footer.astro

@@ -7,7 +7,7 @@
     <!-- Header Section: Logo & Social -->
     <div class="footer-header">
       <a href="https://adapty.io" target="_blank" rel="noopener noreferrer" class="footer-logo">
-        <img src="/logo.svg" alt="Adapty" class="footer-logo-img" />
+        <img src={`${import.meta.env.BASE_URL}/logo.svg`.replace(/\/+/g, '/')} alt="Adapty" class="footer-logo-img" />
       </a>
 
       <div class="footer-social">
@@ -45,7 +45,7 @@
       <div class="footer-column">
         <h3 class="footer-column-title">Adapty SDK Sample Apps</h3>
         <ul class="footer-column-list">
-          <li><a href="/sample-apps">Sample apps</a></li>
+          <li><a href={`${import.meta.env.BASE_URL}/sample-apps`.replace(/\/+/g, '/')}>Sample apps</a></li>
         </ul>
       </div>
 
@@ -65,9 +65,9 @@
       <div class="footer-column">
         <h3 class="footer-column-title">API Reference</h3>
         <ul class="footer-column-list">
-          <li><a href="/api-adapty">Server-side API</a></li>
-          <li><a href="/api-web">Web API</a></li>
-          <li><a href="/api-export-analytics">Analytics export API</a></li>
+          <li><a href={`${import.meta.env.BASE_URL}/api-adapty`.replace(/\/+/g, '/')}>Server-side API</a></li>
+          <li><a href={`${import.meta.env.BASE_URL}/api-web`.replace(/\/+/g, '/')}>Web API</a></li>
+          <li><a href={`${import.meta.env.BASE_URL}/api-export-analytics`.replace(/\/+/g, '/')}>Analytics export API</a></li>
         </ul>
       </div>
 

src/components/Header.astro

@@ -16,8 +16,8 @@ const links = [
 
     <div class="flex items-center gap-12">
         <!-- Logo -->
-        <a href={import.meta.env.BASE_URL} class="flex-shrink-0 block hover:opacity-80 transition-opacity">
-          <img src={`${import.meta.env.BASE_URL}/logo.svg`} alt="Adapty" class="h-6 w-auto header-logo" />
+        <a href={import.meta.env.BASE_URL.replace(/\/+$/, '') || '/'} class="flex-shrink-0 block hover:opacity-80 transition-opacity">
+          <img src={`${import.meta.env.BASE_URL}/logo.svg`.replace(/\/+/g, '/')} alt="Adapty" class="h-6 w-auto header-logo" />
         </a>
 
         <!-- Desktop Navigation -->
@@ -298,7 +298,7 @@ const links = [
     const mobileThemeBtn = document.getElementById('mobile-theme-toggle');
     if (mobileThemeBtn) {
       // Remove old listener by cloning
-      const newBtn = mobileThemeBtn.cloneNode(true) as HTMLElement;
+      const newBtn = mobileThemeBtn.cloneNode(true);
       mobileThemeBtn.parentNode?.replaceChild(newBtn, mobileThemeBtn);
 
       const btn = document.getElementById('mobile-theme-toggle');

src/components/PlatformSwitcher.astro

@@ -65,23 +65,26 @@ function getTargetLink(platformId: string, targetLabel?: string, activeId?: stri
                              activeId?.toLowerCase().includes('intro') ||
                              activeId === 'what-is-adapty';
 
+    const baseUrl = import.meta.env.BASE_URL; // e.g. "/docs/"
+    const normalizedBase = baseUrl.endsWith('/') ? baseUrl : `${baseUrl}/`;
+
     // 1. If current is overview, always try to land on target's overview
     if (isCurrentOverview) {
         const targetOverview = findOverview(sidebarData);
-        if (targetOverview) return `${import.meta.env.BASE_URL}/${targetOverview.id}`.replace(/\/+/g, '/');
+        if (targetOverview) return `${normalizedBase}${targetOverview.id}`.replace(/\/+/g, '/');
     }
 
     // 2. Otherwise, try to find matching label first (Topic Consistency)
     if (targetLabel) {
         const match = findItemByLabel(sidebarData, targetLabel);
-        if (match) return `${import.meta.env.BASE_URL}/${match.id}`.replace(/\/+/g, '/');
+        if (match) return `${normalizedBase}${match.id}`.replace(/\/+/g, '/');
     }
 
     // 3. Last Fallback: Target platform's overview
     const overview = findOverview(sidebarData);
-    if (overview) return `${import.meta.env.BASE_URL}/${overview.id}`.replace(/\/+/g, '/');
+    if (overview) return `${normalizedBase}${overview.id}`.replace(/\/+/g, '/');
 
-    return `${import.meta.env.BASE_URL}/${platformId}-sdk-overview`.replace(/\/+/g, '/'); // Ultimate hardcoded fallback
+    return `${normalizedBase}/${platformId}-sdk-overview`.replace(/\/+/g, '/'); // Ultimate hardcoded fallback
 }
 ---
 

src/components/Sidebar.astro

@@ -68,6 +68,17 @@ function transformItems(items: any[]): any[] {
              }
         }
         
+        // Handle explicit links: /api-adapty -> /docs/api-adapty
+        if (item.type === 'link' && item.href && item.href.startsWith('/')) {
+            const baseUrl = import.meta.env.BASE_URL; // e.g. "/docs/"
+            const normalizedBase = baseUrl.endsWith('/') ? baseUrl : `${baseUrl}/`;
+            
+            if (!item.href.startsWith(normalizedBase) && item.href !== baseUrl && item.href !== normalizedBase.slice(0, -1)) {
+                newItem.href = `${normalizedBase}${item.href.startsWith('/') ? item.href.slice(1) : item.href}`;
+            }
+            newItem.href = newItem.href.replace(/\/+/g, '/');
+        }
+        
         // Handle category with link
         if (item.type === 'category' && item.link?.id && !item.href) {
             const customSlug = docSlugs.get(item.link.id);

src/components/SidebarItem.astro

@@ -9,13 +9,9 @@ const { item, activeId, depth = 0 } = Astro.props;
 
 const isCategory = item.type === 'category';
 
-// Calculate href automatically if not provided
+// Use href provided by Sidebar.astro (which already handles base URL)
 const getHref = (item: any) => {
-  if (item.type === 'link') return item.href;
-  if (item.href) return item.href;
-  const id = item.id || item.link?.id;
-  if (id) return `${import.meta.env.BASE_URL}/${id}`.replace(/\/+/g, '/');
-  return null;
+  return item.href || null;
 };
 
 const itemHref = getHref(item);
@@ -218,8 +214,8 @@ const textColor = getTextColor(depth, isActive);
 
     toggleButtons.forEach(button => {
       const categoryId = button.getAttribute('data-category-id');
-      const itemsList = document.querySelector(`.category-items-container[data-category-id="${categoryId}"]`) as HTMLElement;
-      const svg = button.querySelector('svg') as SVGElement;
+      const itemsList = document.querySelector(`.category-items-container[data-category-id="${categoryId}"]`);
+      const svg = button.querySelector('svg');
 
       if (!itemsList || !svg) return;
 
@@ -252,9 +248,9 @@ const textColor = getTextColor(depth, isActive);
 
       link.addEventListener('click', (e) => {
         const categoryId = link.getAttribute('data-category-id');
-        const itemsList = document.querySelector(`.category-items-container[data-category-id="${categoryId}"]`) as HTMLElement;
+        const itemsList = document.querySelector(`.category-items-container[data-category-id="${categoryId}"]`);
         const toggleButton = document.querySelector(`.category-toggle[data-category-id="${categoryId}"]`);
-        const svg = toggleButton?.querySelector('svg') as SVGElement;
+        const svg = toggleButton?.querySelector('svg');
 
         if (!itemsList || !svg) return;
 

src/components/reusable/AddAudience.md

@@ -1,5 +1,4 @@
 
-
 :::note
 To proceed, ensure that you created a paywall, onboarding, or A/B test you want to run and an audience, you'd like to specify.
 :::
@@ -8,7 +7,7 @@ To proceed, ensure that you created a paywall, onboarding, or A/B test you want
 2. If you want to use more than one audience in the placement to create personalized paywalls tailored to different user groups, click the **Add audience** button and choose the desired user segment from the list.
 
 <Zoom>
-  <img src="placement-add-audience.webp"
+  <img src="/img/placement-add-audience.webp"
   style={{
     border: '1px solid #727272', /* border width and color */
     width: '700px', /* image width */