18.

From 1d000946313c5758b2935ed8cc9a64858172ff74 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Tue, 27 Feb 2018 12:51:53 +0100 Subject: Use relative urls --- 18/index.html | 17 ++++++----------- _includes/head.html | 15 +++++---------- _includes/header.html | 13 +++++++------ _includes/relBase.html | 8 ++++++++ _layouts/random-project.html | 3 ++- _layouts/slides.html | 5 +++-- articles/random-projects.md | 4 ++-- slides/pws/index.html | 9 ++++++++- slides/pws/script.js | 10 +++++++--- slides/pws/style.css | 4 ++++ 10 files changed, 52 insertions(+), 36 deletions(-) create mode 100644 _includes/relBase.html diff --git a/18/index.html b/18/index.html index e570825..3289b6a 100644 --- a/18/index.html +++ b/18/index.html @@ -1,4 +1,5 @@ +{% include relBase.html %} @@ -7,18 +8,12 @@ 18. - - + - - - + + +

@@ -68,6 +63,6 @@

Noah.

- + diff --git a/_includes/head.html b/_includes/head.html index 0dc3028..9bedb01 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,21 +1,16 @@ +{% include relBase.html %} Noah Loomans - + - - - - + + + {% if page.info %} diff --git a/_includes/header.html b/_includes/header.html index 3b0c26e..eb46a8e 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,7 +1,8 @@ +{% include relBase.html %}

- -

+ +

@@ -10,10 +11,10 @@ diff --git a/_includes/relBase.html b/_includes/relBase.html new file mode 100644 index 0000000..b2d4bc4 --- /dev/null +++ b/_includes/relBase.html @@ -0,0 +1,8 @@ +{% assign relBase = '' %} +{% assign tempDepth = page.url | append: 'hackish-solution' | split: '/' | size | minus: 2 %} +{% for i in (1..tempDepth) %} + {% assign relBase = relBase | append: "../" %} +{% endfor %} +{% if relBase == '' %} + {% assign relBase = './' %} +{% endif %} diff --git a/_layouts/random-project.html b/_layouts/random-project.html index 4c7f650..bae9a24 100644 --- a/_layouts/random-project.html +++ b/_layouts/random-project.html @@ -1,5 +1,6 @@ --- --- +{% include relBase.html %} {% include head.html %} @@ -7,7 +8,7 @@ {% if page.branding == true %}

Random Project

diff --git a/_layouts/slides.html b/_layouts/slides.html index db2243a..47be94e 100644 --- a/_layouts/slides.html +++ b/_layouts/slides.html @@ -1,9 +1,10 @@ +{% include relBase.html %} {{ page.title }} - + {% for style in page.styles %} @@ -11,7 +12,7 @@ {{ content }} - + {% for script in page.scripts %} {% endfor %} diff --git a/articles/random-projects.md b/articles/random-projects.md index 4d16824..d788b81 100644 --- a/articles/random-projects.md +++ b/articles/random-projects.md @@ -5,8 +5,8 @@ permalink: /random-projects/ These are some of the random project I've made: - - [Bad Password Generator](/random-projects/bad-password-generator/) - - [Season 3 Countdown](/random-projects/season3-countdown/) + - [Bad Password Generator]({{ relBase }}random-projects/bad-password-generator/) + - [Season 3 Countdown]({{ relBase }}random-projects/season3-countdown/) The source code of all of them can be found on [GitLab](https://gitlab.com/nloomans/noahloomans.com/tree/master/random-projects). diff --git a/slides/pws/index.html b/slides/pws/index.html index af9fb6d..cdf41a7 100644 --- a/slides/pws/index.html +++ b/slides/pws/index.html @@ -45,7 +45,7 @@ styles: [ ../reveal.js/theme/blood.css, ../reveal.js/zenburn.css, ./style.css ]

Hoe de robot werkt.

Hoe werkt de robot?

Process

3 keer herinstalleren
Van IOTA naar Ethereum
Niet perfect

diff --git a/slides/pws/script.js b/slides/pws/script.js index 3f95d00..e044cd7 100644 --- a/slides/pws/script.js +++ b/slides/pws/script.js @@ -1,15 +1,18 @@ -const web3 = new Web3(new Web3.providers.HttpProvider('http://95.85.1.235:8545')); +const web3 = new Web3(new Web3.providers.HttpProvider('http://80.61.192.39:8545')); Reveal.initialize({ history: true, backgroundTransition: 'slide' }) -function addToSlide(data, isHeader) { +function addToSlide(data, isHeader, isToRobot) { const pre = document.createElement('pre'); if (isHeader) { pre.classList.add('header'); } + if (isToRobot) { + pre.classList.add('robot'); + } pre.textContent = data; document.querySelector('#blockchain').appendChild(pre); @@ -39,6 +42,7 @@ filter.watch((err, blockHash) => { } const humanReadableValue = web3.fromWei(transaction.value, 'ether').toString(); - addToSlide(`${compactStr(transaction.from)} -> ${humanReadableValue} ETHER -> ${compactStr(transaction.to)}`); + const isToRobot = transaction.to === '0x5bcd404e6b96dfd033bd362d0f947753d5fb1f57' + addToSlide(`${compactStr(transaction.from)} -> ${humanReadableValue} ETHER -> ${compactStr(transaction.to)}`, false, isToRobot); }); }); diff --git a/slides/pws/style.css b/slides/pws/style.css index 73cf12a..0f5ebc5 100644 --- a/slides/pws/style.css +++ b/slides/pws/style.css @@ -45,6 +45,10 @@ font-weight: bold; } +.robot { + background-color: #7d7d23; +} + @keyframes appear { from { background-color: #91971b; -- cgit v1.1