Added new site design and content.

soepai · Nov 19, 2018 · 0afd4a2 · 0afd4a2
1 parent 9ac181f
commit 0afd4a2
Show file tree

Hide file tree

Showing 176 changed files with 8,406 additions and 1,236 deletions.
diff --git a/404.html b/404.html
@@ -2,21 +2,7 @@
 layout: default
 ---
 
-<style type="text/css" media="screen">
-  .container {
-    margin: 10px auto;
-    max-width: 600px;
-    text-align: center;
-  }
-  h1 {
-    margin: 30px 0;
-    font-size: 4em;
-    line-height: 1;
-    letter-spacing: -1px;
-  }
-</style>
-
-<div class="container">
+<div class="container text-center">
   <h1>404</h1>
 
   <p><strong>Page not found :(</strong></p>

diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,16 @@
 source "https://rubygems.org"
 
-gem "github-pages", group: :jekyll_plugins
+# Hello! This is where you manage which Jekyll version is used to run.
+# When you want to use a different version, change it below, save the
+# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
+#
+#     bundle exec jekyll serve
+#
+# This will help ensure the proper Jekyll version is running.
+# Happy Jekylling!
+#gem "jekyll", "~> 3.7.3"
+
 
-group :jekyll_plugins do
-  gem "jekyll-seo-tag"
-end
+# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
+# uncomment the line below. To upgrade, run `bundle update github-pages`.
+gem "github-pages", group: :jekyll_plugins
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -15,7 +15,7 @@ GEM
     colorator (1.1.0)
     commonmarker (0.17.13)
       ruby-enum (~> 0.5)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.3)
     dnsruby (1.61.2)
       addressable (~> 2.5)
     em-websocket (0.5.1)
@@ -185,7 +185,7 @@ GEM
       jekyll-seo-tag (~> 2.0)
     jekyll-titles-from-headings (0.5.1)
       jekyll (~> 3.3)
-    jekyll-watch (2.0.0)
+    jekyll-watch (2.1.2)
       listen (~> 3.0)
     jemoji (0.10.1)
       gemoji (~> 3.0)
@@ -205,11 +205,11 @@ GEM
       jekyll-seo-tag (~> 2.1)
     minitest (5.11.3)
     multipart-post (2.0.0)
-    nokogiri (1.8.4)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
-    octokit (4.12.0)
+    octokit (4.13.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    pathutil (0.16.1)
+    pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (2.0.5)
     rb-fsevent (0.10.3)
@@ -221,7 +221,7 @@ GEM
     ruby_dep (1.5.0)
     rubyzip (1.2.2)
     safe_yaml (1.0.4)
-    sass (3.6.0)
+    sass (3.7.2)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -232,7 +232,7 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    typhoeus (1.3.0)
+    typhoeus (1.3.1)
       ethon (>= 0.9.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
@@ -243,7 +243,6 @@ PLATFORMS
 
 DEPENDENCIES
   github-pages
-  jekyll-seo-tag
 
 BUNDLED WITH
-   1.16.3
+   1.16.1
diff --git a/_config.yml b/_config.yml
@@ -1,21 +1,26 @@
 title: Hacker101
-description: Hacker101 is a free class for web security. Whether you're a programmer with an interest in bug bounties or a seasoned security professional, Hacker101 has something to teach you.
-author:
-  name: HackerOne
-  twitter: Hacker0x01
-google_analytics: UA-49905813-8
-markdown: kramdown
-url: https://www.hacker101.com
-twitter:
-  username: Hacker0x01
-facebook:
-  app_id: 345444188982280
-social:
-  links:
-    - https://twitter.com/Hacker0x01
-    - https://www.facebook.com/Hacker0x01
-    - https://www.linkedin.com/company/hackerone
-    - https://github.com/Hacker0x01
-logo: /assets/images/h101_angle.png
+email: [email protected]
+description: >-
+  Hacker101 is a free class for web security. Whether you're a programmer with an interest in bug bounties or a seasoned security professional, Hacker101 has something to teach you.
+author: HackerOne
+#baseurl: "" # the subpath of your site, e.g. /blog
+#url: "" # the base hostname & protocol for your site, e.g. http://example.com
+twitter_username: Hacker0x01
+github_username:  Hacker0x01
+
+repository: "Hacker0x01/hacker101"
+
+# Build settings
 plugins:
-  - jekyll-seo-tag
+  - jekyll-sitemap
+
+# A list of the pages to display in the navigation bar
+header_pages:
+
+exclude:
+  - Gemfile
+  - Gemfile.lock
+  - node_modules
+  - update_boostrap.sh
+  - resourceGen.py
+  - resources.res
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -0,0 +1,25 @@
+
+<div class="py-5 border-top">
+  <div class="container">
+
+    <div class="row">
+
+      <div class="col-sm">
+        <ul class="list-inline">
+          <li class="list-inline-item">
+            <a href="https://www.hackerone.com/start-hacking">Powered by HackerOne</a>
+          </li>
+          <li class="list-inline-item">|</li>
+          <li class="list-inline-item">
+            <a href="https://github.com/Hacker0x01/hacker101">Open Source</a>
+          </li>
+          <li class="list-inline-item">|</li>
+          <li class="list-inline-item">
+            <a href="https://twitter.com/Hacker0x01">Follow us on Twitter</a>
+          </li>
+        </ul>
+      </div>
+    </div>
+
+  </div>
+</div>
diff --git a/_includes/head.html b/_includes/head.html
@@ -0,0 +1,9 @@
+<head>
+ <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  {%- seo -%}
+  <link rel="stylesheet" href="{{ "/assets/main.css" | relative_url }}">
+  <script src="{{ "/assets/javascript/bootstrap/jquery.min.js" | relative_url }}"></script>
+  <script src="{{ "/assets/javascript/bootstrap/bootstrap.bundle.min.js" | relative_url }}"></script>
+</head>
diff --git a/_includes/header.html b/_includes/header.html
@@ -0,0 +1,29 @@
+<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
+  <div class="container">
+    <a class="navbar-brand text-success" rel="author" href="{{ "/" | relative_url }}">{{ site.title | escape }}</a>
+
+    {%- assign page_paths = site.header_pages -%}
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
+      aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+      <ul class="navbar-nav mr-auto">
+        <li class="nav-item">
+          <a class="nav-link" href="{{ "/videos" | relative_url }}">Videos</a>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link" href="https://ctf.hacker101.com/">CTF</a>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link" href="{{ "/resources" | relative_url }}">Resources</a>
+        </li>
+      </ul>
+      <ul class="navbar-nav ml-auto">
+        <li class="nav-item">
+          <a class="nav-link" href="{{ site.github.repository_url }}">Fork me on Github</a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</nav>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,40 +1,27 @@
 <!DOCTYPE html>
-<html lang="{{ site.lang | default: "en-US" }}">
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width">
-  <meta http-equiv="X-UA-Compatible" content="chrome=1">
-  <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico">
-  <link rel="stylesheet" type="text/css" href="/assets/css/style.css">
-{% seo %}
-</head>
-<body>
-  <div class="hero">
-    <div class="wrapper">
-      <h1>{{ page.title }}</h1>
-      {% if page.score %}
-        <p>Severity: {{ page.score }}</p>
-      {% endif %}
+<html lang="{{ page.lang | default: site.lang | default: "en" }}">
+
+  {%- include head.html -%}
+
+  <body>
+
+    {%- include header.html -%}
+
+    <div class="py-5">
+      <div class="container page-content">
+          {{ content }}
+      </div>
     </div>
-  </div>
-  <div class="wrapper">
-    <a href="/" class="home">return home</a>
-
-    {{ content }}
 
-    <br>
-    <a href="/" class="home">return home</a> | <a href="https://github.com/Hacker0x01/hacker101/issues/new" class="edit">suggest changes</a>
-  </div>
-  <footer>
-    <p><a href="https://www.hackerone.com/start-hacking">🔨 Powered by HackerOne</a> | <a href="https://github.com/Hacker0x01/hacker101">💻 Open Source</a> | <a href="https://twitter.com/Hacker0x01">🎉 Follow us on Twitter</a></p>
-  </footer>
-  <script type="text/javascript">
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-    ga('create', '{{ site.google_analytics }}', 'auto');
-    ga('send', 'pageview');
-  </script>
-</body>
+    {%- include footer.html -%}
+
+    <script type="text/javascript">
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+      ga('create', 'UA-49905813-1', 'auto');
+      ga('send', 'pageview');
+    </script>
+  </body>
 </html>
diff --git a/_layouts/home.html b/_layouts/home.html
@@ -0,0 +1,41 @@
+---
+layout: default
+---
+
+<div>
+
+  {%- if page.title -%}
+  <header>
+    <h1>{{ page.title }}</h1>
+  </header>
+  {%- endif -%}
+
+  <section>
+    {{ content }}
+  </section>
+
+  {%- if site.posts.size > 0 -%}
+    <p class="h4">{{ page.list_title | default: "Posts" }}</p>
+    <ul class="list-unstyled">
+      {%- for post in site.posts -%}
+      <li>
+        <span class="text-muted">
+          {%- assign date_format = "%b %-d, %Y" -%}
+          {{ post.date | date: date_format }}
+        </span>
+        <p class="h5">
+          <a href="{{ post.url | relative_url }}">
+            {{ post.title | escape }}
+          </a>
+        </p>
+        {%- if site.show_excerpts -%}
+          {{ post.excerpt }}
+        {%- endif -%}
+      </li>
+      {%- endfor -%}
+    </ul>
+
+    <p class="rss-subscribe">subscribe <a href="{{ "/feed.xml" | relative_url }}">via RSS</a></p>
+  {%- endif -%}
+
+</div>
diff --git a/_layouts/landing.html b/_layouts/landing.html
diff --git a/_layouts/page.html b/_layouts/page.html
@@ -0,0 +1,16 @@
+---
+layout: default
+---
+<article>
+
+  {%- if page.title -%}
+  <header>
+    <h1>{{ page.title | escape }}</h1>
+  </header>
+  {%- endif -%}
+
+  <section>
+    {{ content }}
+  </section>
+
+</article>
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -0,0 +1,23 @@
+---
+layout: default
+---
+<article>
+
+  <header>
+    <h1>{{ page.title | escape }}</h1>
+    <p class="text-muted">
+      <time datetime="{{ page.date | date_to_xmlschema }}">
+        {%- assign date_format = "%b %-d, %Y" -%}
+        {{ page.date | date: date_format }}
+      </time>
+      {%- if page.author -%}
+        • {{ page.author }}
+      {%- endif -%}
+    </p>
+  </header>
+
+  <section>
+    {{ content }}
+  </section>
+
+</article>