From 2eff6965cc322bed7ba775ee37c5f577b0448bd4 Mon Sep 17 00:00:00 2001 From: Matthew Grove Date: Thu, 24 Jan 2019 21:23:59 +0000 Subject: [PATCH] Update navbar --- _data/pages.yml | 15 +++++++++++++++ _data/pages.yml~ | 0 _site/js/global.js | 2 +- js/global.js | 2 +- js/global.js~ | 42 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 _data/pages.yml create mode 100644 _data/pages.yml~ create mode 100644 js/global.js~ diff --git a/_data/pages.yml b/_data/pages.yml new file mode 100644 index 0000000..bf3e4b6 --- /dev/null +++ b/_data/pages.yml @@ -0,0 +1,15 @@ +- title: Blog + icon: subject + url: https://blog.matthew-grove.ml/ + +- title: Home Page + icon: home + url: / + +- title: GCSE Computer Science Blog + icon: code + url: /computer-science-blog/ + +- title: Luhn Algorithm + icon: credit_card + url: /luhn-algorithm/ diff --git a/_data/pages.yml~ b/_data/pages.yml~ new file mode 100644 index 0000000..e69de29 diff --git a/_site/js/global.js b/_site/js/global.js index 87e4b57..a807f64 100644 --- a/_site/js/global.js +++ b/_site/js/global.js @@ -18,7 +18,7 @@ $(document).ready(function() { drawer_item_link_query_selector = drawer_item_link_query_selector.substring(0,drawer_item_link_query_selector.length - 1); } - // give 'seleted' styling to correct item on navbar + // give 'selected' styling to correct item on navbar $(drawer_item_link_query_selector + "']").addClass("mdc-list-item--activated"); $(drawer_item_link_query_selector + "']").attr("aria-selected", "true"); $(drawer_item_link_query_selector + "/']").addClass("mdc-list-item--activated"); diff --git a/js/global.js b/js/global.js index 87e4b57..a807f64 100644 --- a/js/global.js +++ b/js/global.js @@ -18,7 +18,7 @@ $(document).ready(function() { drawer_item_link_query_selector = drawer_item_link_query_selector.substring(0,drawer_item_link_query_selector.length - 1); } - // give 'seleted' styling to correct item on navbar + // give 'selected' styling to correct item on navbar $(drawer_item_link_query_selector + "']").addClass("mdc-list-item--activated"); $(drawer_item_link_query_selector + "']").attr("aria-selected", "true"); $(drawer_item_link_query_selector + "/']").addClass("mdc-list-item--activated"); diff --git a/js/global.js~ b/js/global.js~ new file mode 100644 index 0000000..87e4b57 --- /dev/null +++ b/js/global.js~ @@ -0,0 +1,42 @@ +$(document).ready(function() { + // initiate MDC drawer + const drawer = new mdc.drawer.MDCDrawer.attachTo(document.querySelector('.mdc-drawer')); + + // initiate MDC top app bar + const mdc_top_app_bar = new mdc.topAppBar.MDCTopAppBar.attachTo(document.querySelector('.mdc-top-app-bar')); + // mdc_top_app_bar.setScrollTarget(document.getElementById('main-content')); + mdc_top_app_bar.listen('MDCTopAppBar:nav', () => { + drawer.open = !drawer.open; + }); + + // initiate MDC items + mdc.autoInit(); + + // get current URL with no forward slash at the end and no domain + var drawer_item_link_query_selector = ".mdc-list-item[href='" + window.location.pathname; + if (drawer_item_link_query_selector.substring(drawer_item_link_query_selector.length - 1) == "/") { + drawer_item_link_query_selector = drawer_item_link_query_selector.substring(0,drawer_item_link_query_selector.length - 1); + } + + // give 'seleted' styling to correct item on navbar + $(drawer_item_link_query_selector + "']").addClass("mdc-list-item--activated"); + $(drawer_item_link_query_selector + "']").attr("aria-selected", "true"); + $(drawer_item_link_query_selector + "/']").addClass("mdc-list-item--activated"); + $(drawer_item_link_query_selector + "/']").attr("aria-selected", "true"); + $(drawer_item_link_query_selector + "/index.html']").addClass("mdc-list-item--activated"); + $(drawer_item_link_query_selector + "/index.html']").attr("aria-selected", "true"); + + // include cookie notice + if(Cookies.get("demo.matthew-grove.ml-cookies-accepted") != "true") { + $("#cookies").show(); + $("#cookies").animate({bottom: "0px"}, 1000); + $(".source-code-link").animate({bottom: "100px"}, 1000); + $("#close-cookies").click(function(){ + event.preventDefault(); + $("#cookies").animate({bottom: "-100px"}, 1000); + setTimeout(function(){$("#cookies").hide()},1000); + $(".source-code-link").animate({bottom: "15px"}, 1000); + Cookies.set("demo.matthew-grove.ml-cookies-accepted", "true", {expires: 30}); + }); + } +});