Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ env:
- secure: CEIMGeEcS+zpdiRXAripOJxwUg5rbmO8pe4u+zm5eteoLA6idQNUEi4o2F2pyWFNZy95B3BiM3ZSMStwdJwu3tZ4cjmX3XnU5GN26tw4wYsM2bW3iNH5xi1pxjtyFTwT9h6JL+mMxOBbPK8DmOPSWEWVMkAs+bw1GLOOMHQ3q29qXUwEDrb4+SS8mAXlWmQSFT+lQVGtRbvu38F6m24qSFQVL2mB/VKty3meByvkddaKShTrhsk867eR1pAvBBjtQHiyVCGaKHHspeOsWjfnnIr2I5CEWFlHSCOQgtY7obS5G0LmNcoApc/aAEYUWcSZ1TIoY0KtK+LyTkKNzB1oaqbVt0ZlrPJUt7fXSlBKyM/UbZ8NFCsIJ+Yi/dXUrD99cPONJK4sVBO9YLmZEpVWfGd1NJs6isULZJoqqbNb9XQ59uZpR9jo9ZyR7IUsHcshQAN8mH0EJLbRtiAN9m3bA89DkdEMWph9UmwBtKYC52JHne6ENClMAk7K/IgzB20iYd4B8M5a6k43DpDUaNf6gjkhL6RrR0ssiNJsI3QmdcYodf2mDlJuYnVmaHpb8dcUBC8ImcVjYKuDst32RXvkAYKvpCy67A2FDuZ1F2CE+hbA7fIaYsN5UkkcF6nYcNJMZ6PF76WQ+2j2UgLVGOvAl91lpoo1P07fzM4P5j9bnc0=
- secure: B3i1AZaCMPRTSqpv65WOpoe5syd/Tx1lXfnTsx2LPRj68FcmklHYVAsm5EmF9T3B94hWdudwHgeV/qN74DrCxo8zvV1EiU1WyPkiXmJ282ekuk9BQLCZQu8yokevU+0R7uE1SwrSRz/in5lAlKtiO8z7uJbzPOVHz9O86tHWVnwfzbPHaMPiYuFFy0bfeikai7cxlPCpKMEzUkQtdc9YOsUCa4kI72M1EHVjrkayzLYFtD1j+68ukr6wqAqdbsvGW1t866G5FbMw9+9jXvbomThZK+qBh2qNKrm4k9i6bSmCR/1Nm9yKf3QSke/RSIO79r2U2NBhn4mlDD9zVoUNC47s5idao8pQRaCmfozBOkcRiD4fohTNygV1Od8kgPR/X72eIedySLnVLWib0cQacpjFjdfjkjBoG132PhTgN5JiNCMcXPOywNN6y7k/uCTlM/tTyfJCKnBqFJq6Kz8UR+5N0PlVRY678MyEv1E27lgbmah708uVf7R1tPpO99gCM+jKfxr20pr3OcNDLYkETAoZts79+2wWz4KunGIKDom85ydLZOFvFYjTBLg9kKbTpdk92HF+NvPaXEJA4zfDjr97Xg+UJyYRh/IE/ivovLqefX46BEh01QkY1asyRYAXr6w3hTsVra+j4KzB6v9m771KxpR1m4unpnCH967R7Ik=
- secure: MZBvysi+t004I4ttd5Ke+9BTB/KKRiAEWc3ziIvUsEveJBSLIZtdbKlzgChDBvBs5PZmhAMd1rwjqnyrwFrhEzQAGBo7xHROk+hzIV5EivGkKleO/Zcmzfty2LcsoBqrE27cGg5xtZ+U4m5yBUNjBYcEOLh799QD0XQFQv62+nxQq3HJU+tEru6pPSVolF4qh0k2GtocakNLao50f4GhrgKEmoBRZktIwtOZ3AcJw+4RfYR5mXWsFbqGvW4aAPKKTa9rrw0+7y8un8lWzPxqjQzIsZ43/VcgzQRmJg4p/3GuRLCl8Xf3FsCg1Jp8xYlYqhCOplh4qXzVoddXpoAfI60rqSt7JKkusAsQOFxq+5NS/1P/udxTkqSyT7nDHE27lT0Qu3ckQkPx1OQkTo2SiizmLLCCdwA7ocfN7UNjpvib4izjNvkYMpLLglA0VfTWXld66L9BlzQyV1/N24NGmiV5rzlyN/OE1lnxu+n+01HweRmUrz42tbutVe2VcecJES9fxW85Pol5CaOHNhAwSO2Wh0NzKIhuWWSdpoEPGCawPT+qJ62BsIqNKDp3sNXE9TtozVVQIkb7PNSqzux0JFDbB4A4AT1iZzGoYOn4SnpOGNv98aLvmNHfu7kWkpreYxGQxl87Oof2AnzXjc5sb4fhkYeVS56XjafkAuZOrZQ=
# ALGOLIA PRIVATE KEY
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎊 👍 🎊

- secure: "GBlzbEAylEiZhWfyiSZalTd03PWhjuEGPISdyKTwzI5FDyLj4lOjscftICecOmkYm9v6Q8rFEeMXfd9LP35AGQCFYPkMyJlIPdywcSVPpG+WF0iS18fD0TQeuRKdhR9XQ0fAhIFmnXjusWjk04I61UVuXBIJefUcA75aqjeo6Op+uLYNTJ9OVWkdLcOgsyvnNn1qSnXCU76vC4GUFEYnlzM7E1SZbtrfzSMWnBTjOPsebZQXph365D8E3/wcyy0QxxW+VUAQBYqoh7Zvgl+cFKt7DS4dNZ+BKbr6+wl6A1z2KMHvssvu7pC+ruo/6LWwkhdCnOs+5VHgvc9Uq191OERAsaxIvPaMipP/kNyImPWnBypTVfFJJAkK72V4jVNn00RNsRnJHIJBl3RhfxLsebJwXvLfZ8qmKRjY+yIYiAp6W42DikQFtNA/ad80wAj9j5Pv5vZ/PO3YvgXrLVm2Ap+0DKFVkRh+VECSF6IsAGNsDgevPEsOhzv5Yu9Ewwnu4dwAmT/0Ibc8zAEKMUwrUV1LAKrepMmiBNngk4MjX8MUiH5fUQCTP1VyTlbheX12jfIg0MwsSyc0WYpHvVlN7uhyDqVpdzuU+dzA8eyNb6FTDiVDQCaaeZqIn3KBsTQw1SK3lG4r0z/Ft+nFck2X2rPbOAJoWTl1vZ5dZ+JADyE="

addons:
apt:
Expand Down
6 changes: 3 additions & 3 deletions config/metalsmith.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"path": "/"
},
"algolia": {
"projectId": "4RFBRWISJR",
"index": "",
"publicKey": "6febf1ebe906bd82bce58d5a20ac6c1b",
"projectId": "VF5HP4ZVDU",
"index": "doc-v2",
"publicKey": "de63216cd8d0116b2755916b9a38ae35",
"privateKey": null,
"fnFileParser": null
},
Expand Down
9 changes: 0 additions & 9 deletions config/versions.json

This file was deleted.

1 change: 0 additions & 1 deletion helpers/manageArgs.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const manageArgs = (args, options) => {
console.log(args);

if (args.dev) {
options.dev.enabled = true;
Expand Down
20 changes: 3 additions & 17 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ const saveSrc = require('./plugins/save-src');
const anchors = require('./plugins/anchors');

// configuration
const versionsConfig = require('./config/versions');
const msDefaultOpts = require('./config/metalsmith');
const sdkVersions = JSON.stringify(ymlRead.sync(path.join(__dirname, './test/sdk-versions.yml'))).replace(/\s+/g, '');

Expand Down Expand Up @@ -76,27 +75,15 @@ const redirectList = {
//If you need others, add it here
};

for (const version of versionsConfig) {
if (version.version_path === options.build.path) {
log(`Using version ${color.bold(version.version_label)}`);

options.github.repository = version.version_gh_repo;
options.github.branch = version.version_gh_branch;
options.algolia.index = version.algolia_index;
}
}

options.algolia.fnFileParser = (file, data) => {
const objects = [];
const $ = cheerio.load(data.contents.toString(), {
normalizeWhitespace: true
});
const content = $('.main-content');
const content = $('.md-content');

// remove useless content
$('.hljs', content).remove();
$('blockquote', content).remove();
$('.language-tab-selector', content).remove();
$('pre', content).remove();
$('h1, h2, h3, h4, h5, h6', content).remove();

objects.push({
Expand All @@ -109,7 +96,7 @@ options.algolia.fnFileParser = (file, data) => {
firstMember: (data.ancestry.firstMember ? data.ancestry.firstMember.title : ''),
toc: data.toc
});

return objects;
};

Expand All @@ -126,7 +113,6 @@ const metalsmith = _metalsmith(__dirname)
algolia_projectId: options.algolia.projectId,
algolia_publicKey: options.algolia.publicKey,
algolia_index: options.algolia.index,
versions_config: versionsConfig,
is_dev: options.dev.enabled,
sdkVersions: sdkVersions,
exclude: options.exclude
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Kuzzle Documentation",
"main": "index.js",
"scripts": {
"build": "node index.js --gzip",
"build": "node index.js --gzip --algolia-private-key $ALGOLIA_KEY",
"dev": "node index.js --dev --watch",
"lint": "eslint --max-warnings=0 *.js ./test/lib ./test/test ./helpers ./scaffolding/lib ./plugins",
"snippets-testing": "bash run-all-snippet-tests.sh",
Expand Down
4 changes: 2 additions & 2 deletions src/assets/js/algolia-search.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var algoliaSearch = {
init: function() {
var self = this;
var client = algoliasearch(algolia_projectId, algolia_publicKey);
var index = client.initIndex('kuzzle-documentation');
var index = client.initIndex(algolia_index);
var searchBar = $('.md-search__input');
var searchTrigger = $('#search');
var resultList = $('.md-search-result__list');
Expand Down Expand Up @@ -41,7 +41,7 @@ var algoliaSearch = {
setResults: function(hits, container) {
var content = '';
for (var k in hits) {
var teaser = hits[k]._snippetResult.content.value;
var teaser = hits[k]._highlightResult.content.value;
content +=
'<li class="md-search-result__item">' +
'<a href="' +
Expand Down
2 changes: 1 addition & 1 deletion src/assets/js/app.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/assets/stylesheets/layout/_search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ $md-toggle__search--checked: '[data-md-toggle="search"]:checked ~ .md-header';
overflow: hidden;

// Active or hovered link
&[data-md-state='active'],
&:focus,
&:hover {
background-color: transparentize($md-color-accent, 0.9);

Expand Down
3 changes: 2 additions & 1 deletion src/templates/partials/loadScript.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<script type="text/javascript" data-packer="exclude">
var site_url = 'https://docs.kuzzle.io/';
var site_url = 'https://docs-v2.kuzzle.io/';
var site_base_path = '/';
var algolia_projectId = '{{ algolia_projectId }}';
var algolia_index = '{{ algolia_index }}';
var algolia_publicKey = '{{ algolia_publicKey }}';
var sdkVersions = '{{ sdkVersions }}';

Expand Down