Skip to content

Commit

Permalink
feat: new tlu site (#291)
Browse files Browse the repository at this point in the history
* New homepage layout and SEO updates

Delete index.html

Delete index.html, to keep the original homepage

New homepage layout and course 1 added

Fixed styling for bottom accordion and read more buttons on articles

Changes to homepage

Added tickmarks to course page if a module has been viewed

Added tickmarks to course page if a module has been viewed

Added filter page

Changes to course 1

Added new icons and formats to articles

Added icons

Changes to course 1

Fixed a typo

Tidy up self tests

Let's us write markdown in Self Test section.

Edited a few descriptions and content

Changes to module layouts

Added dropdown menu for categories

Medium articles

Styling changes to medium page

Added levels to posts and small modification on filter page

Fonts

Fixed footer menu

Embedded articles

Add deploy script and fix permalinks

In a production environment, the `output_ext` must be added to internal
links. I don't know why it works locally without it

Permalink fixes

Various UI fixes

Padding on course page

Move Szabo article to Course 2

Responsive layout and pdf api

* Added courses 3, 4 and 5

Added time to posts

Refactored content structure

Course time to complete calc

Change to timing display on posts

Bug fixes

WIP: course 6

feat: discard course 6. clean up existing courses

* This commit discards course 6 for now
* It adds self-tests to course 2 modules
* Starts the MW-bits module of course 5 (but full content is in another
  PR)
* Removes some modules that are too subjective to be part of a course
  (course 5)

draft: New topic - mimblewimble, all the bits (#309)

* draft: New topic - mimblewimble, all the bits

This post describes the key elements of _vanilla_ Mimblewimble, what
purpose they perform, and the bad things that could happen if they're
not there.

It also describes a few pieces that were introduced to the protocol as
a result of to omissions and oversights in
the MW whitepaper.

* fix: add some additional comments based on review

chore: update dependencies (#310)

Update dependencies, and
deal with deprecation error in Sass regarding division.

chore: review course 1 (#312)

Looks good. Minor cosmetic changes.

chore: review course 2 (#314)

Looks good.

fix: update ruby version (#315)

chore: review course 3 (#317)

Looks good.

feat: review course 4 (#318)

Checked course 4 contents, added some context and added an into video to
Lelantus.

fix: add into to mw white paper (#319)

* chore: update code examples in course 3 (#320)

Big update!

1. use tari_crypto in the examples (finally)
2. use a cargo project locally, so we can debug, format, use
   intellisense etc
3. Only keep one copy of the code around

---------

Co-authored-by: NovaT82 <nova@tari.com>
  • Loading branch information
CjS77 and NovaT82 committed Jan 18, 2024
1 parent 1b8a124 commit fbd8998
Show file tree
Hide file tree
Showing 395 changed files with 28,488 additions and 19,980 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,7 @@

_site
vendor
.jekyll-cache
.jekyll-cache
.env

.jekyll-metadata
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.4
3.0.2
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ gem "jekyll-paginate"
gem 'jekyll-tagging'
gem "jekyll-sitemap"
gem 'jekyll-redirect-from'
gem 'jekyll-seo-tag'
group :jekyll_plugins do
gem "jekyll-spaceship"
end
Expand Down
81 changes: 42 additions & 39 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,43 +1,47 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
colorator (1.1.0)
concurrent-ruby (1.1.9)
em-websocket (0.5.2)
concurrent-ruby (1.2.2)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
http_parser.rb (~> 0)
eventmachine (1.2.7)
ffi (1.15.3)
ffi (1.16.3)
forwardable-extended (2.6.0)
gemoji (3.0.1)
http_parser.rb (0.6.0)
i18n (1.8.10)
google-protobuf (3.25.1-x86_64-linux)
http_parser.rb (0.8.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jekyll (4.2.0)
jekyll (4.3.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 1.0)
jekyll-sass-converter (~> 2.0)
jekyll-sass-converter (>= 2.0, < 4.0)
jekyll-watch (~> 2.0)
kramdown (~> 2.3)
kramdown (~> 2.3, >= 2.3.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.4.0)
mercenary (>= 0.3.6, < 0.5)
pathutil (~> 0.9)
rouge (~> 3.0)
rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.0)
terminal-table (~> 2.0)
terminal-table (>= 1.8, < 4.0)
webrick (~> 1.7)
jekyll-paginate (1.1.0)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
jekyll-sass-converter (2.1.0)
sassc (> 2.0.1, < 3.0)
jekyll-sass-converter (3.0.0)
sass-embedded (~> 1.54)
jekyll-seo-tag (2.8.0)
jekyll (>= 3.8, < 5.0)
jekyll-sitemap (1.4.0)
jekyll (>= 3.7, < 5.0)
jekyll-spaceship (0.9.9)
jekyll-spaceship (0.10.2)
gemoji (~> 3.0)
jekyll (>= 3.6, < 5.0)
nokogiri (~> 1.6)
Expand All @@ -46,52 +50,51 @@ GEM
nuggets
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (2.3.1)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.7.0)
liquid (4.0.4)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
nokogiri (1.14.3-x86_64-darwin)
nokogiri (1.16.0-x86_64-linux)
racc (~> 1.4)
nokogiri (1.14.3-x86_64-linux)
racc (~> 1.4)
nuggets (1.6.0)
nuggets (1.6.1)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.6)
racc (1.6.2)
rainbow (3.0.0)
rb-fsevent (0.11.0)
public_suffix (5.0.4)
racc (1.7.3)
rainbow (3.1.1)
rake (13.1.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.5)
rouge (3.26.0)
rexml (3.2.6)
rouge (4.2.0)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
terminal-table (2.0.0)
unicode-display_width (~> 1.1, >= 1.1.1)
unicode-display_width (1.7.0)
webrick (1.7.0)
sass-embedded (1.69.5)
google-protobuf (~> 3.23)
rake (>= 13.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
unicode-display_width (2.5.0)
webrick (1.8.1)

PLATFORMS
x86_64-darwin-19
x86_64-darwin-20
x86_64-linux

DEPENDENCIES
bundler
jekyll
jekyll-paginate
jekyll-redirect-from
jekyll-seo-tag
jekyll-sitemap
jekyll-spaceship
jekyll-tagging
webrick

BUNDLED WITH
2.2.26
2.4.17
10 changes: 8 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ disqus-identifier: mr-brown # Add your shortname for Disqus Comment. For example

#-------------------------------
# Google Analytics
google-analytics: UA-115476091-2
#google-analytics: UA-115476091-2


#-------------------------------
Expand All @@ -67,13 +67,14 @@ mailchimp-identifier: # Add your MailChimp form identifier. For example - blogen
#-------------------------------
# Build settings
markdown: kramdown
permalink: /:categories/:title
permalink: /:categories/:title:output_ext
plugins:
- jekyll-paginate
- jekyll-sitemap
- jekyll/tagging
- jekyll-spaceship
- jekyll-redirect-from
- jekyll-seo-tag

paginate: 6
paginate_path: "/page/:num"
Expand All @@ -88,6 +89,11 @@ defaults:
include:
- _pages

exclude:
- .env
- deploy.sh
- .idea

# Tags
tag_page_dir: tag
tag_page_layout: tag_page
Expand Down
11 changes: 11 additions & 0 deletions _data/menu-categories.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- category: learning-paths
- category: cryptography
- category: consensus-mechanisms
- category: scaling
- category: mining
- category: digital-assets
- category: protocols
- category: network-analysis
- category: labs
- category: style-guide
- category: tari
5 changes: 5 additions & 0 deletions _data/menu-courses.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- course: intro-to-blockchain
- course: the-history-of-money
- course: basics-of-cryptography
- course: digital-assets
- course: mimblewimble-basics
30 changes: 30 additions & 0 deletions _includes/article-card.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<div style="margin-bottom: 20px;">
<a href="{{ post.url | prepend: site.baseurl }}">
<div class="tlu-card-container">
<div class="tlu-card-img" style="background-image: url({{site.baseurl}}{{post.image}});">
{% if post.format %}
<img src="/images/icons/light-{{ post.format }}.svg" style="width: 50px; margin-bottom: 10px;" />
{% endif %}
<p class="tlu-post-title">{{post.title}}</p>
</div>
</div>
</a>
<div class="article__content">
<div class="tlu-excerpt">
<a href="{{ post.url | prepend: site.baseurl }}">
{% if post.description %}
{{post.description | strip_newlines | truncatewords: 35}}
{% endif %}
</a>
</div>
<div class="article-tags">
{% if post.tags.size >= 1 %}
<div class="article-tags__box">
{% for tag in post.tags %}
<a href="{{ site.baseurl }}/tag/{{ tag }}.html" class="article__tag">{{ tag | capitalize | replace:'-',' ' }}</a>
{% endfor %}
</div>
{% endif %}
</div>
</div>
</div>
44 changes: 17 additions & 27 deletions _includes/article-content.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
<div class="article col col-4 col-d-6 col-t-12 grid__post">



{% if post.image %}
<a href="{{post.url | prepend: site.baseurl}}">
<div class="tlu-card-container">
Expand All @@ -11,29 +8,22 @@
</div>
</a>
{% endif %}



<div class="article__content">

<div class="tlu-excerpt">
<a href="{{ post.url | prepend: site.baseurl }}">
{% if post.excerpttext %}
{{post.excerpttext | strip_newlines | truncatewords: 35}}
{% endif %}
</a>
</div>

<div class="article-tags">
{% if post.tags.size >= 1 %}
<div class="article-tags__box">
{% for tag in post.tags %}
<a href="{{ site.baseurl }}/tag/{{ tag }}" class="article__tag">{{ tag }}</a>
{% endfor %}
<div class="article__content">
<div class="tlu-excerpt">
<a href="{{ post.url | prepend: site.baseurl }}">
{% if post.description %}
{{post.description | strip_newlines | truncatewords: 35}}
{% endif %}
</a>
</div>
<div class="article-tags">
{% if post.tags.size >= 1 %}
<div class="article-tags__box">
{% for tag in post.tags %}
<a href="{{ site.baseurl }}/tag/{{ tag }}.html" class="article__tag">{{ tag }}</a>
{% endfor %}
</div>
{% endif %}
</div>
</div>
{% endif %}
</div>

</div>

</div>
38 changes: 28 additions & 10 deletions _includes/breadcrumbs.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,29 @@
<div id="breadcrumbs">
{% assign crumbs = page.url | remove:'/index.html' | split: '/' %}
<a href="/">Home</a>
{% for crumb in crumbs offset: 1 %}
{% if forloop.last %}
/ {{ page.title }}
{% else %}
/ <a href="{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' | replace:'without-plugin/','without-plugins/' }}{% endfor %}">{{ crumb | replace:'-',' ' | remove:'.html' | capitalize }}</a>
<div class="article-meta">
<div id="breadcrumbs">
{% assign crumbs = page.url | remove:'/index.html' | split: '/' %}
<a href="/">Home</a>
{% for crumb in crumbs offset: 1 %}
{% if forloop.last %}
/ {{ page.title }}
{% else %}
/ <a href="{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' | replace:'without-plugin/','without-plugins/' }}{% endfor %}">{{ crumb | replace:'-',' ' | remove:'.html' | capitalize }}</a>
{% endif %}
{% endfor %}
</div>
<div class="time-to-read">
{% if page.time %}
{% assign timeUnit = "min" %}
{% assign minutes = page.time %}
{% if minutes > 1 and minutes <= 59 %}
{% assign timeUnit = "min" %}
{% elsif minutes >= 60 and minutes <= 119 %}
{% assign timeUnit = "hour" %}
{% capture minutes %}{{ minutes | divided_by:60 }}{% endcapture %}
{% elsif minutes >= 120 %}
{% assign timeUnit = "hour" %}
{% capture minutes %}{{ minutes | divided_by:60 }}{% endcapture %}
{% endif %}
{{ minutes }} {{ timeUnit }} read
{% endif %}
{% endfor %}
</div>
</div>
</div>
38 changes: 38 additions & 0 deletions _includes/content/consensus-mechanisms/00-consensus-mechanisms.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
## Purpose

Consensus mechanisms "are crucial for a blockchain in order to function correctly. They make sure everyone uses the same
blockchain" [[1]].

## Definitions

- From **Investopedia**: A
consensus mechanism is a fault-tolerant mechanism that is used in computer and blockchain systems to achieve the
necessary agreement on a single data value or a single state of the network among distributed processes or multi-agent
systems [[2]].

- From **KPMG**:
Consensus mechanism - A method of authenticating and validating a value or transaction on a Blockchain or a distributed
ledger without the need to trust or rely on a central authority. Consensus mechanisms are central to the functioning of
any blockchain or distributed ledger [[3]].


## References

[[1]] "Different Blockchain Consensus Mechanisms", *Hacker Noon* [online].
Available: <https://hackernoon.com/different-blockchain-consensus-mechanisms-d19ea6c3bcd6>. Date accessed: 2019&#8209;06&#8209;07.

[1]: https://hackernoon.com/different-blockchain-consensus-mechanisms-d19ea6c3bcd6
"Different Blockchain Consensus Mechanisms"

[[2]] Investopedia: "Consensus Mechanism (Cryptocurrency)" [online].
Available: <https://www.investopedia.com/terms/c/consensus-mechanism-cryptocurrency.asp>. Date accessed: 2019&#8209;06&#8209;07.

[2]: https://www.investopedia.com/terms/c/consensus-mechanism-cryptocurrency.asp
"Consensus Mechanism (Cryptocurrency)"

[[3]] KPMG: "Consensus - Immutable Agreement for the Internet of Value" [online].
Available: <https://assets.kpmg/content/dam/kpmg/pdf/2016/06/kpmg-blockchain-consensus-mechanism.pdf>.
Date accessed: 2019&#8209;06&#8209;07.

[3]: https://assets.kpmg/content/dam/kpmg/pdf/2016/06/kpmg-blockchain-consensus-mechanism.pdf
"Consensus - Immutable Agreement for the Internet of Value"

0 comments on commit fbd8998

Please sign in to comment.