From 2af844ec22cf8a444aabf43947193647ab0c78a9 Mon Sep 17 00:00:00 2001 From: JacOng17 Date: Mon, 25 May 2020 11:57:34 +1200 Subject: [PATCH 1/3] Removed Mailchimp & newsletter code. --- assets/js/index.js | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/assets/js/index.js b/assets/js/index.js index d7fbee2d3..d7c39494b 100644 --- a/assets/js/index.js +++ b/assets/js/index.js @@ -28,40 +28,12 @@ $(function() { }, ); - // Mailchimp - var $form = $('#contact-form'), - $newsletter = $('#newsletter'), - $newsletterSuccess = $('#newsletter-success'), - $newsletterEmail = $('#newsletter-email'); - - var defaultNewsletterText = $newsletter.text(); - - var newsletterForm = { - response: function() { - var email = $newsletterEmail.val(); - $('#newsletter-response').text(email); - $form.hide(); - $newsletterSuccess.show(); - }, - reset: function(argument) { - $newsletter.text(defaultNewsletterText); - $newsletterEmail.val(''); - $form.show(); - $newsletterSuccess.hide(); - $newsletterEmail.focus(); - }, - }; - function callbackFunction(resp) { if (resp.result === 'success') { newsletterForm.response(); } } - $('#button-reset').on('click', function() { - newsletterForm.reset(); - }); - $('.search-interface').on('submit', function() { $('#search-loading').show(); }); From fb1bf94a596fb6cc7405ed33cd92e76513b5d670 Mon Sep 17 00:00:00 2001 From: JacOng17 Date: Tue, 26 May 2020 16:20:14 +1200 Subject: [PATCH 2/3] Search function list objects. --- assets/js/jekyll-pages-api-search.js | 24 ++++++++++ pages/search-results-test.md | 70 ++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 pages/search-results-test.md diff --git a/assets/js/jekyll-pages-api-search.js b/assets/js/jekyll-pages-api-search.js index 7fb83f215..497d38167 100644 --- a/assets/js/jekyll-pages-api-search.js +++ b/assets/js/jekyll-pages-api-search.js @@ -11,6 +11,30 @@ function renderJekyllPagesApiSearchResults(query, results, doc, resultsElem) { $('#search-loading').hide(); results.forEach(function(result, index) { var resultTitle = result.title; + console.log(result); + console.log(result.score); + console.log(result.url); + // console.log(result.matchData); + console.log(result.ref); + // console.log(result.tags); + // console.log(result.categories); + // console.log(result.body); + console.log(results.length); + + // if (results.length) { // Are there any results? + // var appendString = ''; + + // for (var i = 0; i < results.length; i++) { // Iterate over the results + // var item = store[results[i].ref]; + // appendString += '

  • ' + item.title + '

    '; + // appendString += '

    ' + item.content.substring(0, 150) + '...

    • '; + // } + + // searchResults.innerHTML = appendString; + // } else { + // searchResults.innerHTML = '
  • No results found
    • '; + // } + var errorPages = resultTitle === '404' || resultTitle === '500' || resultTitle === ''; diff --git a/pages/search-results-test.md b/pages/search-results-test.md new file mode 100644 index 000000000..ec6d5081e --- /dev/null +++ b/pages/search-results-test.md @@ -0,0 +1,70 @@ +--- +title: search +layout: none +search: exclude +permalink: /search-results-test/ +--- + + + From 25fc04b7a241e606283cc8d1132300b856fe3772 Mon Sep 17 00:00:00 2001 From: JacOng17 Date: Wed, 27 May 2020 15:25:17 +1200 Subject: [PATCH 3/3] Some progress to troubleshoot. --- Gemfile | 2 +- Gemfile.lock | 13 +++++++++---- _config.yml | 1 + _posts/2019-07-30-Testing-Our-Toolkit.md | 1 + _services_projects/20-year-emtech-landscape.md | 1 + 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 67e2cc34b..6c30cb380 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,7 @@ group :jekyll_plugins do gem 'jekyll-sitemap' gem 'jekyll_frontmatter_tests', '~> 0.1.0' gem 'jekyll_oembed' - gem 'jekyll_pages_api' + gem 'jekyll_pages_api', git: 'https://github.com/18F/jekyll_pages_api.git' gem 'jekyll_pages_api_search', '~> 0.5.0' end diff --git a/Gemfile.lock b/Gemfile.lock index 3bceb3349..c991fd417 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: https://github.com/18F/jekyll_pages_api.git + revision: b6de4f6f5e69226840d237133e1928a7ab1508b0 + specs: + jekyll_pages_api (0.1.6) + htmlentities (~> 4.3) + jekyll (>= 2.0, < 4.0) + GEM remote: https://rubygems.org/ specs: @@ -98,9 +106,6 @@ GEM jekyll_oembed (0.0.3) jekyll (~> 3) ruby-oembed (~> 0) - jekyll_pages_api (0.1.6) - htmlentities (~> 4.3) - jekyll (>= 2.0, < 4.0) jekyll_pages_api_search (0.5.0) jekyll_pages_api (~> 0.1.4) sass (~> 3.4) @@ -228,7 +233,7 @@ DEPENDENCIES jekyll-watch (~> 2.2.0) jekyll_frontmatter_tests (~> 0.1.0) jekyll_oembed - jekyll_pages_api + jekyll_pages_api! jekyll_pages_api_search (~> 0.5.0) jemoji parallel diff --git a/_config.yml b/_config.yml index 4e39f344c..e7373fadd 100644 --- a/_config.yml +++ b/_config.yml @@ -170,4 +170,5 @@ jekyll_pages_api_search: boost: 10 url: boost: 5 + type: body: diff --git a/_posts/2019-07-30-Testing-Our-Toolkit.md b/_posts/2019-07-30-Testing-Our-Toolkit.md index 9e69a8e1d..daf391cbc 100644 --- a/_posts/2019-07-30-Testing-Our-Toolkit.md +++ b/_posts/2019-07-30-Testing-Our-Toolkit.md @@ -7,6 +7,7 @@ tags: - open source - tech excerpt: "" +type: blogpost --- ## Tests we run diff --git a/_services_projects/20-year-emtech-landscape.md b/_services_projects/20-year-emtech-landscape.md index cfc3f37c3..db9feb133 100644 --- a/_services_projects/20-year-emtech-landscape.md +++ b/_services_projects/20-year-emtech-landscape.md @@ -8,6 +8,7 @@ image: /assets/img/projects/20yr-emtech-landscape-image.png image_accessibility: Image showing the 20 year landscape. Click on this to view the blogpost and a detailed view of the landscape. media: "[20 Year EmTech Landscape](/staging-site/assets/media/20-Year-Emtech-Landscape/Emerging-Technology-20Year-Landscape.pdf)" resources: +type: report ---
    Led by Hazel Bradshaw, Emerging Tech Lead - Service Innovation Lab