From 2d55f080d6daec5561281892027aa3a76d32a40f Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 17 Jun 2014 12:25:49 +0100 Subject: [PATCH] get algolia to pull app id and api key from settings file --- .../coffee/Features/Project/ProjectController.coffee | 7 ++++++- services/web/app/views/project/list.jade | 10 ++++++++++ services/web/public/coffee/UserDetailsUpdater.coffee | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/services/web/app/coffee/Features/Project/ProjectController.coffee b/services/web/app/coffee/Features/Project/ProjectController.coffee index 50b7966332..2a5a5173b4 100644 --- a/services/web/app/coffee/Features/Project/ProjectController.coffee +++ b/services/web/app/coffee/Features/Project/ProjectController.coffee @@ -99,7 +99,12 @@ module.exports = return res.send 500 logger.log results:results, user_id:user_id, "rendering project list" viewModel = _buildListViewModel results.projects[0], results.projects[1], results.projects[2], results.tags[0], results.tags[1] - viewModel.showUserDetailsArea = Settings?.algolia?.institutions?.app_id? and Settings?.algolia?.institutions?.api_key? + if Settings?.algolia?.institutions?.app_id? and Settings?.algolia?.institutions?.api_key? + viewModel.showUserDetailsArea = true + viewModel.algolia_api_key = Settings.algolia.institutions.api_key + viewModel.algolia_app_id = Settings.algolia.institutions.app_id + else + viewModel.showUserDetailsArea = false res.render 'project/list', viewModel timer.done() diff --git a/services/web/app/views/project/list.jade b/services/web/app/views/project/list.jade index 2768b444be..32cd9648a5 100644 --- a/services/web/app/views/project/list.jade +++ b/services/web/app/views/project/list.jade @@ -172,6 +172,16 @@ block content ] }; + - if (showUserDetailsArea) + script + window.algolia = { + institutions:{ + app_id:'#{algolia_app_id}', + api_key:'#{algolia_api_key}' + } + } + + script( data-main=jsPath+'list.js?fingerprint='+fingerprint(jsPath + 'list.js'), baseurl=jsPath, diff --git a/services/web/public/coffee/UserDetailsUpdater.coffee b/services/web/public/coffee/UserDetailsUpdater.coffee index 4864cda97c..5a7db1db07 100644 --- a/services/web/public/coffee/UserDetailsUpdater.coffee +++ b/services/web/public/coffee/UserDetailsUpdater.coffee @@ -3,7 +3,7 @@ define ["libs/algolia", "libs/angular", "libs/angular-autocomplete/angular-autoc app = angular.module("userProfileInformationApp", ["autocomplete"]) app.factory "Institutions", -> - new AlgoliaSearch("SK53GL4JLY", "1606ccef5b70ac44680b61e6b0285126").initIndex("institutions") + new AlgoliaSearch(window.algolia.institutions.app_id, window.algolia.institutions.api_key).initIndex("institutions") app.directive "focusInput", ($timeout) -> return (scope, element, attr) ->