algolia keys to env vars & clean up

Author: blakeandrewwood

docker/Dockerfile.docs

@@ -4,6 +4,12 @@
 
 FROM node:8.1.2-slim as ms-builder
 
+ARG algolia_project_id
+ARG algolia_public_key
+ARG algolia_private_key
+ARG algolia_index
+ARG algolia_clear_index
+
 RUN apt-get update -qq
 RUN apt-get install -y build-essential
 
@@ -16,7 +22,13 @@ RUN npm install
 
 RUN make build-swagger
 RUN make build-ngindox
-RUN npm run build
+RUN \
+ALGOLIA_PROJECT_ID=$algolia_project_id \
+ALGOLIA_PUBLIC_KEY=$algolia_private_key \
+ALGOLIA_PRIVATE_KEY=$algolia_private_key \
+ALGOLIA_INDEX=$algolia_index \
+ALGOLIA_CLEAR_INDEX=$algolia_clear_index \
+npm run build
 
 #
 # Nginx

docker/docker-compose.production.yml

@@ -8,6 +8,11 @@ services:
       dockerfile: ./docker/Dockerfile.docs
       args:
         nginx_dir: ./docker/nginx
+        algolia_project_id: ${ALGOLIA_PROJECT_ID}
+        algolia_public_key: ${ALGOLIA_PUBLIC_KEY}
+        algolia_private_key: ${ALGOLIA_PRIVATE_KEY}
+        algolia_index: ${ALGOLIA_INDEX}
+        algolia_clear_index: ${ALGOLIA_CLEAR_INDEX}
     ports:
       - "80:80"
       - "443:443"

index.js

@@ -18,11 +18,16 @@ const cheerio          = require('cheerio');
 //
 
 const ALGOLIA_PROJECT_ID = process.env.ALGOLIA_PROJECT_ID;
+const ALGOLIA_PUBLIC_KEY = process.env.ALGOLIA_PUBLIC_KEY;
 const ALGOLIA_PRIVATE_KEY = process.env.ALGOLIA_PRIVATE_KEY;
 const ALGOLIA_INDEX = process.env.ALGOLIA_INDEX;
 const ALGOLIA_CLEAR_INDEX = process.env.ALGOLIA_CLEAR_INDEX;
-const ALGOLIA_UPDATE_INDEX = (ALGOLIA_PROJECT_ID != undefined &&
-  ALGOLIA_PRIVATE_KEY != undefined && ALGOLIA_INDEX != undefined);
+const ALGOLIA_UPDATE_INDEX = (
+  ALGOLIA_PROJECT_ID != undefined &&
+  ALGOLIA_PUBLIC_KEY != undefined &&
+  ALGOLIA_PRIVATE_KEY != undefined &&
+  ALGOLIA_INDEX != undefined
+);
 
 if(process.env.NODE_ENV == "production" && !ALGOLIA_UPDATE_INDEX) {
   console.error("Algolia env variables are not set");
@@ -42,7 +47,7 @@ MS.metadata({
   title: "Mesosphere DC/OS",
   description: "Lorem ipsum dolor sit amet, consectetur adipisicing elit",
   copyright: "@ 2017 Mesosphere, Inc. All rights reserved.",
-  env: process.env.NODE_ENV
+  env: process.env.NODE_ENV,
 })
 
 // Source
@@ -52,10 +57,7 @@ MS.source('./pages')
 MS.destination('./build')
 
 // Clean
-if(
-  process.env.NODE_ENV == "development" ||
-  ALOGLIA_UPDATE_INDEX
-) {
+if(process.env.NODE_ENV == "development") {
   MS.clean(false)
 }
 else if(

js/header.js

@@ -6,34 +6,4 @@ if (headerSearch) {
   headerSearch.addEventListener('focus', () => headerMenu.classList.add('header__menu--hide'));
   headerSearch.addEventListener('blur', () => headerMenu.classList.remove('header__menu--hide'));
   headerSearchLabel.addEventListener('click', () => headerSearch.focus());
-
-  /**
-  * Algolia Header Search Config
-  */
-  /*
-  console.log('Not search page');
-  const client = algoliasearch('O1RKPTZXK1', '4cc78f4d67f726ba3b2c5bd1ed690fb4');
-  const index = client.initIndex('dev_MESOSPHERE');  
-
-  autocomplete('#header-search-input', {
-    hint: false,
-    minLength: 3,
-    debug: true,
-  }, [
-  {
-    source: autocomplete.sources.hits(index, { hitsPerPage: 5 }),
-    displayKey: 'title',
-    templates: {
-      suggestion: suggestion => {
-        return '<span>' +
-          suggestion._highlightResult.title.value + '</span><span>' +
-          suggestion._highlightResult.team.value + '</span>';
-      }
-      suggestion: suggestion => suggestion._highlightResult.title.value,
-    },
-  },
-  ]).on('autocomplete:selected', (event, suggestion, dataset) => {
-  console.log(suggestion, dataset);
-  });
-  */
 }

js/search.js

@@ -1,8 +1,30 @@
 const landingContainer = document.querySelector('.landing');
 
+//
+// Env vars injected from webpack config
+//
+
+const algoliaProjectId = ALGOLIA_PROJECT_ID;
+const algoliaPublicKey = ALGOLIA_PUBLIC_KEY;
+const algoliaIndex = ALGOLIA_INDEX;
+
+const algoliaConfigured = (
+  algoliaProjectId != undefined &&
+  algoliaPublicKey != undefined &&
+  algoliaIndex != undefined
+);
+
+if(!algoliaConfigured) {
+  console.error("Algolia not configured.");
+}
+
+//
+//
+//
+
 if (landingContainer) {
-  const client = algoliasearch('O1RKPTZXK1', '00ad2d0be3e5a7155820357a73730e84');
-  const index = client.initIndex('dev_MESOSPHERE');
+  const client = algoliasearch(algoliaProjectId, algoliaPublicKey);
+  const index = client.initIndex(algoliaIndex);
 
   autocomplete(
     '#landing-search-input',
@@ -47,16 +69,16 @@ if (searchForm) {
    * Algolia Search Page Config
    */
   const search = instantsearch({
-    appId: 'O1RKPTZXK1',
-    apiKey: '4cc78f4d67f726ba3b2c5bd1ed690fb4',
-    indexName: 'dev_MESOSPHERE',
+    appId: algoliaProjectId,
+    apiKey: algoliaPublicKey,
+    indexName: algoliaIndex,
     urlSync: true,
     searchParameters: {
       hitsPerPage: 10,
     },
   });
 
-  /** 
+  /**
    * Search result templates
    */
   const hitTemplate = `

js/toc-scroll.js

@@ -1,6 +1,6 @@
 const inPageToc = document.querySelector('.content__sections-list-container');
 
-if (inPageToc.offsetHeight > document.body.clientHeight) {
+if (inPageToc && inPageToc.offsetHeight > document.body.clientHeight) {
   inPageToc.setAttribute('style', `height: ${document.body.clientHeight - 140}px;`);
 
   const followScroll = (element, position) => {

layouts/partials/head.pug

@@ -17,7 +17,7 @@ script.
   window.dataLayer = window.dataLayer || [];
   function gtag(){dataLayer.push(arguments);}
   gtag('js', new Date());
-  gtag('config', 'UA-45222428-2');)
+  gtag('config', 'UA-45222428-2');
 
 script(src='https://unpkg.com/feather-icons/dist/feather.min.js')
 if env != 'development' && env != 'pdf'

package.json

@@ -9,7 +9,7 @@
   },
   "scripts": {
     "dev": "NODE_ENV=development DEBUG=metalsmith-timer node index.js",
-    "docs": "ALGOLIA_PROJECT_ID=O1RKPTZXK1 ALGOLIA_PRIVATE_KEY=00ad2d0be3e5a7155820357a73730e84 ALGOLIA_INDEX=dev_MESOSPHERE NODE_ENV=development DEBUG=metalsmith-timer node index.js",
+    "docs": "NODE_ENV=development DEBUG=metalsmith-timer node index.js",
     "build": "NODE_ENV=production DEBUG=metalsmith-timer node index.js",
     "build-pdf": "NODE_ENV=pdf DEBUG=metalsmith-timer node index.js",
     "webpack": "webpack --progress --colors",

scripts/build-pdf.sh

@@ -14,4 +14,4 @@ if [[ "$docker_image_build_id" != "" ]]; then
 fi
 
 #docker-compose -f ./docker/docker-compose.production.yml build --force-rm --no-cache docs
-docker-compose -f ./docker/docker-compose.production.yml build pdf
+docker-compose -f ./docker/docker-compose.production.yml build --no-cache pdf

scripts/build-site.sh

@@ -13,5 +13,8 @@ if [[ "$docker_image_build_id" != "" ]]; then
   docker rmi $docker_image
 fi
 
-#docker-compose -f ./docker/docker-compose.production.yml build --force-rm --no-cache docs
-docker-compose -f ./docker/docker-compose.production.yml build docs
+ALGOLIA_PROJECT_ID=$ALGOLIA_PROJECT_ID \
+ALGOLIA_PRIVATE_KEY=$ALGOLIA_PRIVATE_KEY \
+ALGOLIA_INDEX=$ALGOLIA_INDEX \
+ALGOLIA_CLEAR_INDEX=$ALGOLIA_CLEAR_INDEX \
+docker-compose -f ./docker/docker-compose.production.yml build --no-cache docs

webpack.config.js

@@ -26,5 +26,10 @@ module.exports = {
   },
   plugins: [
     new ExtractTextPlugin('./build/css/styles.css'),
+    new webpack.DefinePlugin({
+      ALGOLIA_PROJECT_ID: JSON.stringify(process.env.ALGOLIA_PROJECT_ID),
+      ALGOLIA_PUBLIC_KEY: JSON.stringify(process.env.ALGOLIA_PUBLIC_KEY),
+      ALGOLIA_INDEX: JSON.stringify(process.env.ALGOLIA_INDEX),
+    })
   ],
 };