feature: default analytics to on for public page

devflowinc · Dec 12, 2024 · 11ff07b · 11ff07b
1 parent 2cbac8f
commit 11ff07b
Show file tree

Hide file tree

Showing 11 changed files with 84 additions and 40 deletions.
diff --git a/clients/ts-sdk/openapi.json b/clients/ts-sdk/openapi.json
@@ -12059,6 +12059,10 @@
             "type": "string",
             "nullable": true
           },
+          "headingPrefix": {
+            "type": "string",
+            "nullable": true
+          },
           "heroPattern": {
             "allOf": [
               {

diff --git a/clients/ts-sdk/package.json b/clients/ts-sdk/package.json
@@ -6,7 +6,7 @@
   "files": [
     "dist"
   ],
-  "version": "0.0.41",
+  "version": "0.0.43",
   "license": "MIT",
   "scripts": {
     "lint": "eslint 'src/**/*.ts'",

diff --git a/clients/ts-sdk/src/types.gen.ts b/clients/ts-sdk/src/types.gen.ts
@@ -1978,6 +1978,7 @@ export type PublicPageParameters = {
     defaultSearchMode?: (string) | null;
     defaultSearchQueries?: Array<(string)> | null;
     forBrandName?: (string) | null;
+    headingPrefix?: (string) | null;
     heroPattern?: ((HeroPattern) | null);
     navLogoImgSrcUrl?: (string) | null;
     openGraphMetadata?: ((OpenGraphMetadata) | null);

diff --git a/frontends/dashboard/src/hooks/usePublicPageSettings.tsx b/frontends/dashboard/src/hooks/usePublicPageSettings.tsx
@@ -170,6 +170,7 @@ export const { use: usePublicPage, provider: PublicPageProvider } =
                 api_key: response.api_key,
                 extra_params: {
                   ...extraParams,
+                  analytics: true,
                 },
               },
             },

diff --git a/frontends/dashboard/src/pages/dataset/PublicPageSettings.tsx b/frontends/dashboard/src/pages/dataset/PublicPageSettings.tsx
@@ -161,25 +161,52 @@ const PublicPageControls = () => {
 
         <div class="mt-4 flex items-start gap-8">
           <div class="flex grow flex-col gap-2">
-            <div class="grow">
-              <div class="flex items-center gap-1">
-                <label class="block" for="">
-                  Header Brand Name
-                </label>
-                <Tooltip
-                  tooltipText="Brand name which will be displayed in the navbar on the page"
-                  body={<FaRegularCircleQuestion class="h-3 w-3 text-black" />}
-                />
+            <div class="flex grow items-center gap-2">
+              <div class="grow">
+                <div class="flex items-center gap-1">
+                  <label class="block" for="">
+                    Heading Prefix
+                  </label>
+                  <Tooltip
+                    tooltipText="Brand name which will be displayed in the navbar on the page"
+                    body={
+                      <FaRegularCircleQuestion class="h-3 w-3 text-black" />
+                    }
+                  />
+                </div>
+                <div class="flex grow items-center gap-2">
+                  <input
+                    placeholder="Demo For"
+                    value={extraParams.headingPrefix || ""}
+                    onInput={(e) => {
+                      setExtraParams("headingPrefix", e.currentTarget.value);
+                    }}
+                    class="block w-full grow rounded border border-neutral-300 px-3 py-1.5 shadow-sm placeholder:text-neutral-400 focus:outline-magenta-500 sm:text-sm sm:leading-6"
+                  />
+                </div>
               </div>
-              <div class="flex grow items-center gap-2">
-                <input
-                  placeholder="Devflow, Inc."
-                  value={extraParams.forBrandName || ""}
-                  onInput={(e) => {
-                    setExtraParams("forBrandName", e.currentTarget.value);
-                  }}
-                  class="block w-full grow rounded border border-neutral-300 px-3 py-1.5 shadow-sm placeholder:text-neutral-400 focus:outline-magenta-500 sm:text-sm sm:leading-6"
-                />
+              <div class="grow">
+                <div class="flex items-center gap-1">
+                  <label class="block" for="">
+                    Header Brand Name
+                  </label>
+                  <Tooltip
+                    tooltipText="Brand name which will be displayed in the navbar on the page"
+                    body={
+                      <FaRegularCircleQuestion class="h-3 w-3 text-black" />
+                    }
+                  />
+                </div>
+                <div class="flex grow items-center gap-2">
+                  <input
+                    placeholder="Devflow, Inc."
+                    value={extraParams.forBrandName || ""}
+                    onInput={(e) => {
+                      setExtraParams("forBrandName", e.currentTarget.value);
+                    }}
+                    class="block w-full grow rounded border border-neutral-300 px-3 py-1.5 shadow-sm placeholder:text-neutral-400 focus:outline-magenta-500 sm:text-sm sm:leading-6"
+                  />
+                </div>
               </div>
             </div>
             <div class="grow">

diff --git a/server/src/data/models.rs b/server/src/data/models.rs
@@ -3111,6 +3111,9 @@ impl DatasetConfigurationDTO {
                     search_options: page_parameters_self
                         .search_options
                         .or(page_parameters_curr.search_options),
+                    heading_prefix: page_parameters_self
+                        .heading_prefix
+                        .or(page_parameters_curr.heading_prefix),
                     for_brand_name: page_parameters_self
                         .for_brand_name
                         .or(page_parameters_curr.for_brand_name),

diff --git a/server/src/handlers/page_handler.rs b/server/src/handlers/page_handler.rs
@@ -171,6 +171,8 @@ pub struct PublicPageParameters {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub search_options: Option<PublicPageSearchOptions>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub heading_prefix: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub for_brand_name: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub brand_name: Option<String>,

diff --git a/server/src/public/navbar.html b/server/src/public/navbar.html
@@ -1,4 +1,4 @@
-<nav class="w-screen bg-white border-b">
+<nav class="bg-white border-b">
   <div
     class="max-w-screen-2xl mx-auto w-full p-2 flex items-center justify-center flex-col gap-2 sm:justify-between sm:!flex-row"
   >
@@ -8,9 +8,10 @@
         src="{{params.navLogoImgSrcUrl|safe if (params.navLogoImgSrcUrl is defined and params.navLogoImgSrcUrl) else 'https://cdn.trieve.ai/trieve-logo.png'|safe}}"
       />
     </a>
-    <div>
+    <div class="text-center">
       <p class="font-medium text-3xl">
-        Demo For
+        {{params.headingPrefix|safe if (params.headingPrefix is defined and
+        params.headingPrefix) else 'Demo For'|safe}}
         <span class="brand-name">
           {{params.forBrandName|safe if (params.forBrandName is defined and
           params.forBrandName) else 'Prospect'|safe}}

diff --git a/server/src/public/page.html b/server/src/public/page.html
@@ -137,7 +137,6 @@
         flex-direction: column;
         padding-top: 48px;
         gap: 40px;
-        width: 100vw;
       }
 
       .corner-logo {
@@ -160,9 +159,9 @@
 
       .made-with-love {
         font-family: "Maven Pro", sans-serif;
-        position: fixed;
-        bottom: 0.5rem;
-        right: 0.5rem;
+        margin-right: 0.5rem;
+        margin-bottom: 0.5rem;
+        margin-left: auto;
       }
 
       .heart {
@@ -258,7 +257,7 @@
       >Back To Dashboard</a
     >
     {% endif %}
-    <p class="text-xs made-with-love">
+    <p class="text-xs made-with-love text-end">
       Made with <span class="heart">&hearts;</span> in San Francisco
     </p>
   </body>
@@ -279,11 +278,9 @@
       tabContainer = document.getElementById("tab-container");
       await new Promise((resolve) => setTimeout(resolve, 10));
     }
-    openTrieveModalElement.style.width = tabContainer.offsetWidth / 2 + "px";
-    console.log(
-      "set openTrieveModalElement width to",
-      tabContainer.width + "px"
-    );
+    if (window.innerWidth > 768) {
+      openTrieveModalElement.style.width = tabContainer.offsetWidth / 2 + "px";
+    }
 
     let brandNameElement = document.querySelector(".brand-name");
     while (!brandNameElement) {
@@ -320,8 +317,10 @@
     canvas.style.position = "absolute";
     canvas.style.left = "0";
     canvas.style.top = "0";
-    canvas.width = window.innerWidth;
-    canvas.height = window.innerHeight;
+    canvas.width =
+      document.documentElement.clientWidth || document.body.clientWidth;
+    canvas.height =
+      document.documentElement.clientHeight || document.body.clientHeight;
     canvas.style.zIndex = "-1";
 
     const rc = rough.canvas(canvas);

diff --git a/server/src/public/search-component-code.html b/server/src/public/search-component-code.html
@@ -1,4 +1,6 @@
-<pre class="-my-4"> <code class="language-javascript">import { TrieveModalSearch } from 'trieve-search-component';
+<pre class="-my-4"> 
+<code class="language-javascript">
+import { TrieveModalSearch } from 'trieve-search-component';
 import 'trieve-search-component/styles';
 
 const App = () => {
@@ -73,7 +75,7 @@
       {% if params.debounceMs -%}
       debounceMs={{ params.debounceMs }}
       {% endif -%}
-/&gt;
+    /&gt;
   );
 } </code>
 </pre>
diff --git a/server/static/output.css b/server/static/output.css
@@ -592,10 +592,6 @@ video {
   width: 100%;
 }
 
-.w-screen {
-  width: 100vw;
-}
-
 .max-w-2xl {
   max-width: 42rem;
 }
@@ -661,6 +657,14 @@ video {
   padding-left: 0.125rem;
 }
 
+.text-center {
+  text-align: center;
+}
+
+.text-end {
+  text-align: end;
+}
+
 .text-3xl {
   font-size: 1.875rem;
   line-height: 2.25rem;