Merge pull request #55 from bamr87/master

Master
bamr87 · Mar 13, 2024 · f2bf41a · f2bf41a
2 parents aec9d03 + 7570f2c
commit f2bf41a
Show file tree

Hide file tree

Showing 42 changed files with 1,705 additions and 623 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,38 +1,38 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: feature request
+assignees: bamr87
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md
@@ -1,10 +1,10 @@
----
-name: Custom issue template
-about: Describe this issue template's purpose here.
-title: ''
-labels: ''
-assignees: ''
-
----
-
-
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,20 +1,20 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-lastmod: '2021-10-27T17:33:19.923Z'
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
+---
+name: Feature request
+about: Suggest an idea for this project
+title: 'Feature Request - '
+labels: feature request
+assignees: bamr87
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/Gemfile b/Gemfile
@@ -9,7 +9,7 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem 'jekyll' , '3.9.2'
+gem 'jekyll' , '3.9.5'
 
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and

diff --git a/_config.yml b/_config.yml
@@ -310,7 +310,7 @@ defaults:
     scope:
       path: pages/_posts
     values:
-      layout: *pages
+      layout: journals
       show_date: true
       author_profile: true
       read_time: true

diff --git a/_data/navigation.yml b/_data/navigation.yml
@@ -86,6 +86,8 @@ main:
       url: /about/contributing
     - title: "Map"
       url: /about/sitemap
+    - title: "Features"
+      url: /about/features
 
 # # Notes
 # notes:

diff --git a/_includes/branding.html b/_includes/branding.html
@@ -23,20 +23,27 @@
     {% capture logo_path %}{{ site.logo }}{% endcapture %}
 
     <!-- <a class="navbar-brand p-0 me-0 me-lg-2 flex-grow-1" href="{{ site.logo_source}}{{ page.url }}"> -->
-    <a class="navbar-brand p-0 me-0 me-lg-2 flex-grow-1" href="/">
+    <a class="navbar-brand p-0" href="/">
         <img src="{{ logo_path | relative_url }}" alt="Logo" width="30" height="30">
 
         <!-- Title Section  -->
-        <div class="offcanvas-lg offcanvas-end flex-grow-1" tabindex="-1" id="bdNavbar" aria-labelledby="bdNavbarOffcanvasLabel" data-bs-scroll="true">
 
-                <!-- <a class="navbar-brand" href="https://{{ site.github_user}}.github.io{{ page.url }}"> -->
-                <a class="navbar-brand" href="  {{ site.logo_source}}{{ page.url }}">
+        <div class="flex-grow-1">
+            <a class="navbar-brand" href="  {{ site.logo_source}}{{ page.url }}">
+              <i class="{{ site.default_icon }} {{ power.icon | default: site.powered_by.default }}" aria-hidden="true"></i>
+              <!-- display name if there's enough space, else icon only -->
+                <span class="d-none d-md-inline"> 
                     {{ site.masthead_title | default: site.title }}
-                </a>
-                {%- if site.subtitle -%}
-                <a class="navbar-brand" href="http://localhost:{{ site.port }}{{ page.url }}">
+                </span>
+
+                <!-- If a subtitle exsits -->
+            {%- if site.subtitle -%}
+            <a class="navbar-brand" href="http://localhost:{{ site.port }}{{ page.url }}">
+                <i class="{{ site.default_icon }} {{ power.icon | default: site.powered_by.default }}" aria-hidden="true"></i>
+                <span class="d-none d-md-inline"> 
                     {{ site.subtitle }}
-                </a>
-                {% endif %}
+                </span>
+            </a>
+            {% endif %}
         </div>
     </a>
diff --git a/_includes/head.html b/_includes/head.html
@@ -3,6 +3,7 @@
 
 <!-- Custom JS Scripts -->
 <script src="/assets/js/myScript.js"></script>
+<script src="/assets/js/auto-hide-nav.js"></script>
 <script src="/assets/js/back-to-top.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/mermaid@8/dist/mermaid.min.js"></script>
 
@@ -24,8 +25,9 @@
     <link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}">
 
     <!-- Bootstrap -->
-    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-GLhlTQ8iRABdZLl6O3oVMWSktQOp6b7In1Zl3/Jr59b6EGGoI1aFkw7cmDA6j6gD" crossorigin="anonymous">
-    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-w76AqPfDkMBDXo30jS1Sgez6pr3x5MlQ1ZAGC+nuZB+EYdgRZgiwxhTBTkF7CXvN" crossorigin="anonymous"></script>
+    <!-- source: https://getbootstrap.com/ -->
+    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
 
     <!-- Tailwing CDN -->
 

diff --git a/_includes/header.html b/_includes/header.html
@@ -3,7 +3,7 @@
     _includes/branding.html, _includes/navbar.html
  -->
 
-<header class="bd-header navbar navbar-expand-lg navbar-dark bg-primary sticky-top bottom-shadow" role="banner">
+<header id="navbar" class="bd-header navbar navbar-expand-lg navbar-dark bg-body-tertiary sticky-top bottom-shadow" role="banner">
     <nav class="container-xxl bd-gutter flex-wrap flex-lg-nowrap">
 
         <!-- Collapse Button in mobile view -->
@@ -18,13 +18,23 @@
                 <span class="navbar-toggler-icon"></span>
             </button>
         </div>
-
-        <!-- include branding.html -->
-        {% include branding.html %}
-
-        <!-- include navbar.html -->
-        {% include navbar.html %}
-
+
+        <!-- Home Link -->
+        {%- for home in site.data.navigation.home -%}
+        <a class="btn flex-grow-1" href="{{ home.url | relative_url }}">
+            <i class="{{ site.default_icon}} {{ home.icon }}" ></i>
+        </a>
+        {% endfor %}
+
+            <!-- include branding.html -->
+            {% include branding.html %}
+
+        <div class="offcanvas offcanvas-end" tabindex="-1" id="bdNavbar" aria-labelledby="bdNavbarOffcanvasLabel" data-bs-scroll="true">
+
+            <!-- include navbar.html -->
+            {% include navbar.html %}
+        </div>
+
         <!-- Settings Collapse button -->
         <div class="btn flex-grow-1"
         data-toggle="collapse" 
@@ -41,5 +51,19 @@
 
     {% include halfmoon.html %}
 
+      <div class="bd-navbar-toggle flex-grow-1">
+
+    <!-- offcanvas button for nav links -->
+        <button class="navbar-toggler p-2" 
+            type="button" 
+            data-bs-toggle="offcanvas" 
+            data-bs-target="#bdNavbar" 
+            aria-controls="bdNavbar" 
+            aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+    </div>
+
+
     </nav>
 </header>
diff --git a/_includes/navbar.html b/_includes/navbar.html
@@ -2,15 +2,9 @@
   navbar.html
  -->
 
-<!-- Home Link -->
-    {%- for home in site.data.navigation.home -%}
-    <a class="btn flex-grow-1" href="{{ home.url | relative_url }}">
-        <i class="{{ site.default_icon}} {{ home.icon }}" ></i>
-    </a>
-    {% endfor %}
 <!-- Navigation Links -->
-  <div class="collapse navbar-collapse" id="navbarSupportedContent"> 
-    <ul class="visible-links navbar-nav">
+  <div class="collapse navbar-collapse offcanvas offcanvas-end" id="bdNavbar" tabindex="-1" id="bdNavbar" aria-labelledby="bdNavbar"> 
+    <div class="offcanvas offcanvas-body navbar-nav">
         {%- for link in site.data.navigation.main -%}
             <li class="nav-item dropdown">
                 <a {% if link.sublinks %} 
@@ -32,5 +26,5 @@
                 {% endif %}
             </li>
         {%- endfor -%}
-    </ul>
+    </div>
 </div>
diff --git a/_includes/sidebar-right.html b/_includes/sidebar-right.html
@@ -30,7 +30,9 @@
 
   <!-- Back to Top -->
 
-  <button onclick="backToTopBtn()" id="backToTopBtn" title="Go to top" class="btn btn-primary">{{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} &uarr;
+  <button onclick="topFunction()" id="backToTopBtn" title="Go to top">
+    <span class="arrow">&uarr;</span>
+    <span class="text">Back to Top</span>
   </button>
 
 </div>

diff --git a/_layouts/home.html b/_layouts/home.html
@@ -2,6 +2,8 @@
 layout: default
 ---
 
+<!-- Home Layout -->
+
 <div class="home">
   {%- if page.title -%}
     <h1 class="page-heading">{{ page.title }}</h1>

diff --git a/_layouts/journals.html b/_layouts/journals.html
@@ -2,6 +2,8 @@
 layout: default
 ---
 
+<!-- Journals Layout -->
+
 <div id="main" role="main">
 
 
@@ -13,20 +15,19 @@ <h1 id="page-title" class="page__title">{{ page.title }}</h1>
   </div>
 </div>
 
+<!-- giscus app - Feature # FR000001 -->
 
-{% assign entries_layout = page.entries_layout | default: 'list' %}
-<div class="entries-{{ entries_layout }}">
-  {% collection=page.collection sort_by=page.sort_by sort_order=page.sort_order type=entries_layout %}
-  {% assign entries = site[include.collection] %}
-
-  {% if include.sort_by %}
-    {% assign entries = entries | sort: include.sort_by %}
-  {% endif %}
-
-  {% if include.sort_order == 'reverse' %}
-    {% assign entries = entries | reverse %}
-  {% endif %}
-
-
-
-</div>
+<script src="https://giscus.app/client.js"
+        data-repo="bamr87/it-journey"
+        data-repo-id="MDEwOlJlcG9zaXRvcnkyODM4MjI1NzM="
+        data-category-id="DIC_kwDOEOrJ7c4CAn8D"
+        data-mapping="pathname"
+        data-strict="1"
+        data-reactions-enabled="1"
+        data-emit-metadata="0"
+        data-input-position="top"
+        data-theme="preferred_color_scheme"
+        data-lang="en"
+        crossorigin="anonymous"
+        async>
+</script>