Merge pull request dekart-xyz#24 from dekart-xyz/copy-iteration

Copy iteration
Tsovak · Mar 1, 2024 · 71cdc3a · 71cdc3a
2 parents e7c0fec + 5244dfc
commit 71cdc3a
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 21 deletions.
diff --git a/assets/scss/content/cloud.scss b/assets/scss/content/cloud.scss
@@ -12,6 +12,12 @@
         height: calc(100vw * 0.5);
     }
 }
+.cloud-scroll-down{
+    display: none;
+    @media (min-width: 1400px) and (max-width: 1800px) {
+        display: block;
+    }
+}
 .cloud-prices {
     background-color: #F7F7F7;
     display: flex;

diff --git a/assets/scss/layouts/_posts.scss b/assets/scss/layouts/_posts.scss
@@ -35,6 +35,7 @@ img.connector {
   height: 80px;
 }
 
+
 div.connector {
   margin-top: 1em;
 }
diff --git a/config/_default/menus.toml b/config/_default/menus.toml
@@ -24,9 +24,14 @@
 
 
 [[main]]
-  name = "Cloud"
-  url = "/cloud/"
-  weight = 9
+  name = "Login"
+  url = "https://cloud.dekart.xyz/"
+  weight = 8
+
+[[main]]
+  name = "Playground"
+  url = "/docs/about/playground/"
+  weight = 8
 
 [[main]]
   name = "Docs"

diff --git a/content/_index.md b/content/_index.md
@@ -1,7 +1,7 @@
 ---
 title : "Maps for your Data Platform."
 description: "Open-source WebGL-powered map visualization and spatial analytics for modern data warehouses."
-lead: "Open-source, self-hosted alternative to CARTO and Foursquare Studio for data scientists, analysts and engineers."
+lead: "Open-source, lightweight alternative to CARTO and Foursquare Studio for data scientists, analysts and engineers."
 date: 2020-10-06T08:47:36+00:00
 lastmod: 2020-10-06T08:47:36+00:00
 draft: false

diff --git a/content/cloud/index.md b/content/cloud/index.md
@@ -7,20 +7,21 @@ type: "html-content"
 ---
 
 <article class="pb-5">
-  <div class="p-3 text-center">
+  <div class="pb-3 text-center">
     <h1 class="cloud-title">Introducing Dekart Cloud.</h1>
     <p class="lead">
       <mark>Secure, worry-free Dekart instance at the cost of hosting it yourself on AWS or Google Cloud.</mark>
       <br/> Lightweight alternative for CARTO and Foursquare Studio.
     </p>
   </div>
-  <div class="cloud-prices">
+  <a class="cloud-prices plausible-event-name--cloud plausible-event-name--cloud-page-image" href="http://cloud.dekart.xyz">
     <div style="background-image: url(./cloud-prices.png);">
     </div>
-  </div>
+  </a>
   <div class="text-center pt-5">
-    <a class="btn btn-primary btn-lg" href="http://cloud.dekart.xyz" role="button">Start Free with BigQuery</a>
+    <a class="btn btn-primary btn-lg plausible-event-name--cloud plausible-event-name--cloud-page-button" href="http://cloud.dekart.xyz" role="button">Launch Dekart</a>
     <p><small>Requires Google Cloud Access</small></p>
+    <div class="cloud-scroll-down">↓</div>
   </div>
   <div>
     <div class="text-center d-flex flex-column align-items-center">

diff --git a/content/docs/about/playground/index.md b/content/docs/about/playground/index.md
@@ -12,13 +12,13 @@ menu:
 
 ---
 
-You can try Dekart on <a target="_blank" href="https://play.dekart.xyz">play.dekart.xyz</a> (requires Gmail Account) with one of many Public Datasets available on BigQuery.
+Try Dekart on <a target="_blank" href="https://play.dekart.xyz">play.dekart.xyz</a> with one of many **Public Datasets** available on BigQuery.
 
 <a class="btn btn-primary" target="_blank" href="https://play.dekart.xyz/" role="button">Go to BigQuery Playground</a>
 
+[⚙️ Configure access to private BigQuery datasets](https://cloud.dekart.xyz/)
 
-
-<p><a target="_blank" href="https://console.cloud.google.com/marketplace/browse?filter=solution-type:dataset" role="button">BigQuery Public Datasets</a> and <a target="_blank" href="https://www.reddit.com/r/bigquery/wiki/datasets" role="button">Even More Datasets</a></p>
+<p>👉 <a target="_blank" href="https://console.cloud.google.com/marketplace/browse?filter=solution-type:dataset" role="button">BigQuery Public Datasets</a> and <a target="_blank" href="https://www.reddit.com/r/bigquery/wiki/datasets" role="button">Even More Datasets</a></p>
 
 
 ## Quick Start
@@ -60,4 +60,4 @@ WHERE  Rand() < 5 / 100.0
 
 <a class="btn btn-primary" target="_blank" href="https://play.dekart.xyz/" role="button">Go to BigQuery Playground</a>
 
-[How to use with Your Private Datasets](/docs/about/your-datasets/)
+[⚙️ Configure access to private BigQuery datasets](https://cloud.dekart.xyz/)
diff --git a/content/docs/about/your-datasets.md b/content/docs/about/your-datasets.md
@@ -1,5 +1,5 @@
 ---
-title: "Use with Your Data"
+title: "Query Private Datasets"
 description: "Using Dekart with your team/company internal/private datasets"
 date: 2021-02-21T09:17:56+01:00
 lastmod: 2021-02-21T09:17:56+01:00
@@ -12,21 +12,32 @@ menu:
 
 ---
 
-To analyze private datasets with Dekart, you have 2 options:
+Dekart offers 2 different options to work with private datasets:
 
-* **Dekart Cloud**: we host and manage Dekart instance for you (BigQuery only). Free for personal use. Requires Google Cloud access (BigQuery and Google Cloud Storage). [Try it free](/cloud).
-* **Self-hosted**: you self-host the Dekart instance (open-source, MIT License) on your Google Cloud, AWS account or your server. [Documentation](/docs/).
 
+<p class="lead text-left">✨<a href="/cloud"><b>Dekart Cloud</b></a>. We host and manage Dekart instance for you. Free for single person use. Subscription plan for teams at the cost of self-hosting.</p>
 
+⚙️ [Configure access to private BigQuery datasets](https://cloud.dekart.xyz/)
+
+<hr/>
+
+<p class="lead text-left"><b>🏰 Self-hosted</b>. You host the Dekart instance (open-source, MIT License) on your Google Cloud, AWS account or your server.
+
+👉 [Documentation](/docs/).
+
+<hr/>
 
 ## Requirements
 
-**Dekart Cloud**
+✨**Dekart Cloud**:
 
 * Google Cloud project with BigQuery and Google Cloud Storage enabled
 * Google Cloud Storage bucket to store query cache
 
-**Self-hosted**
+<p><small>⚙️ <a href="https://cloud.dekart.xyz">Configure</a></small></p>
+
+
+🏰 **Self-hosted**
 
 * Postgres DB (like Amazon RDS or Google Cloud SQL) to store metadata
 * Mapbox token to load the map

diff --git a/layouts/index.html b/layouts/index.html
@@ -49,8 +49,7 @@
     <div class="col-lg-9 col-xl-8 text-center">
       <p class="mt-2"><a class="btn btn-primary btn-lg" href="/docs/about/playground/" role="button">BigQuery Live
           Demo</a></p>
-      <p><a target="_blank" href="/cloud/">Quick start with ✨Dekart Cloud✨</a>
-      </p>
+          <p><a target="_blank" href="https://github.com/dekart-xyz/dekart/releases/tag/v0.15.0">Latest open-source release 0.15.0</a></p>
     </div>
   </div>
 </section>
@@ -85,18 +84,21 @@ <h2 class="h3 mt-0 mb-5 text-center">Connectors</h2>
         <div class="text-center">
           <img class="connector" src="/bigquery.svg" alt="BigQuery">
           <div class="h5 connector"><a href="/docs/configuration/environment-variables/#bigquery">BigQuery</a></div>
+          <div class="configure-in-cloud"><a class="btn btn-info btn-sm" href="https://cloud.dekart.xyz/" title="Configure in Dekart Cloud" target="_blank">Configure</a></div>
         </div>
       </div>
       <div class="col-sm">
         <div class="text-center">
           <img class="connector" src="/snowflake.svg" alt="BigQuery">
           <div class="h5 connector"><a href="/docs/configuration/environment-variables/#snowflake">Snowflake</a></div>
+          <div class="configure-in-cloud"><small>Self-hosted only</small></div>
         </div>
       </div>
       <div class="col-sm">
         <div class="text-center">
           <img class="connector" src="/athena.svg" alt="BigQuery">
           <div class="h5 connector"><a href="/docs/configuration/environment-variables/#aws-athena">Athena</a></div>
+          <div class="configure-in-cloud"><small>Self-hosted only</small></div>
         </div>
       </div>
     </div>

diff --git a/layouts/partials/footer/footer.html b/layouts/partials/footer/footer.html
@@ -2,6 +2,7 @@
   <div class="container">
       <div class="col-16">
         <ul class="list-inline">
+          <li class="list-inline-item">✨ <a href="/cloud">Dekart Cloud</a></li>
           <li class="list-inline-item"><a href="/legal/notice">Legal Notice</a></li>
           <li class="list-inline-item"><a href="/legal/terms">Terms of Service</a></li>
           <li class="list-inline-item"><a href="/legal/privacy">Privacy Policy</a></li>

diff --git a/layouts/partials/footer/script-footer.html b/layouts/partials/footer/script-footer.html
@@ -17,4 +17,4 @@
   <script src="{{ $jsProd.Permalink }}" integrity="{{ $jsProd.Data.Integrity }}" crossorigin="anonymous" defer></script>
   <script src="{{ $indexProd.Permalink }}" integrity="{{ $indexProd.Data.Integrity }}" crossorigin="anonymous" defer></script>
 {{ end -}}
-<script async defer data-domain="dekart.xyz" src="https://plausible.io/js/plausible.js"></script>
+
diff --git a/layouts/partials/head/head.html b/layouts/partials/head/head.html
@@ -7,4 +7,5 @@
   {{ block "head/seo" . }}{{ partial "head/seo.html" . }}{{ end }}
   {{ block "head/favicons" . }}{{ partial "head/favicons.html" . }}{{ end }}
   {{ block "head/script-header" . }}{{ partial "head/script-header.html" . }}{{ end }}
+  <script defer data-domain="dekart.xyz" src="https://plausible.io/js/script.tagged-events.js"></script>
 </head>