From 2fadee6afbb0f086c48b9c308a613a43d98c672d Mon Sep 17 00:00:00 2001
From: Rohan Deb Sarkar <rohandebsarkar@gmail.com>
Date: Tue, 26 Jul 2022 08:59:57 +0530
Subject: [PATCH 1/3] Adds support for GA4 Google Analytics (#727)

* Update `analytics.html`

* Update `config.yml`

* Update

* Update
---
 _config.yml                      | 2 +-
 _includes/scripts/analytics.html | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/_config.yml b/_config.yml
index f91243d46c2f..0dc116ecaa59 100644
--- a/_config.yml
+++ b/_config.yml
@@ -91,7 +91,7 @@ contact_note: >
 # Analytics and search engine verification
 # -----------------------------------------------------------------------------
 
-google_analytics:  # your google-analytics ID (format: UA-XXXXXXXXX)
+google_analytics:  # your Goole Analytics measurement ID (format: G-XXXXXXXXXX)
 panelbear_analytics:  # panelbear analytics site ID (format: XXXXXXXXX)
 
 google_site_verification:  # your google-site-verification ID (Google Search Console)
diff --git a/_includes/scripts/analytics.html b/_includes/scripts/analytics.html
index f59eacdc6a21..db2aeef96cd0 100644
--- a/_includes/scripts/analytics.html
+++ b/_includes/scripts/analytics.html
@@ -3,12 +3,12 @@
   <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics }}"></script>
   <script>
     window.dataLayer = window.dataLayer || [];
-    function gtag() { dataLayer.push(arguments); }
+    function gtag(){ window.dataLayer.push(arguments); }
     gtag('js', new Date());
     gtag('config', '{{ site.google_analytics }}');
   </script>
-  {%- endif -%}
-  {%- if site.enable_panelbear_analytics -%}
+{%- endif -%}
+{%- if site.enable_panelbear_analytics -%}
   <!-- Panelbear Analytics - We respect your privacy -->
   <script async src="https://cdn.panelbear.com/analytics.js?site={{site.panelbear_analytics}}"></script>
   <script>

From 96e794f257c5a240436b20edb2884854f57dddeb Mon Sep 17 00:00:00 2001
From: johanneshoerner <110042110+johanneshoerner@users.noreply.github.com>
Date: Thu, 28 Jul 2022 16:06:54 +0200
Subject: [PATCH 2/3] Added my webpage to the list (#788)

Added my webpage to the list.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index c9b9a71f970e..13bb4647484e 100644
--- a/README.md
+++ b/README.md
@@ -72,6 +72,7 @@ Feel free to add your own page(s) by sending a PR.
 <a href="https://tirtharajdash.github.io" target="_blank">★</a>
 <a href="https://carolinacarreira.github.io" target="_blank">★</a>
 <a href="https://manandey.github.io" target="_blank">★</a>
+<a href="https://johanneshoerner.github.io" target="_blank">★</a>
 </td>
 </tr>
 <tr>

From 4817639f3084f317455433ef033f9c3f05330589 Mon Sep 17 00:00:00 2001
From: Rohan Deb Sarkar <rohandebsarkar@gmail.com>
Date: Thu, 28 Jul 2022 21:54:58 +0530
Subject: [PATCH 3/3] Fix title spaces and a few links (#789)

* fix title

* fix a few links

* add line
---
 404.html              |  2 +-
 _includes/header.html | 16 ++++++++++++++--
 _includes/social.html |  4 ++--
 _layouts/default.html |  2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/404.html b/404.html
index 929fc572ae3e..0da4ee0bb54a 100644
--- a/404.html
+++ b/404.html
@@ -6,4 +6,4 @@
 redirect: true
 ---
 
-<p>You will be redirected to the main page within 3 seconds. If not redirected, please click <a href="{{ site.baseurl | prepend: site.url }}/">here</a>.</p>
+<p>You will be redirected to the main page within 3 seconds. If not redirected, please click <a href="{{ site.baseurl }}/">here</a>.</p>
diff --git a/_includes/header.html b/_includes/header.html
index 0bb012842a2c..29bb66c43290 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -5,8 +5,20 @@
       <nav id="navbar" class="navbar navbar-light navbar-expand-sm {% if site.navbar_fixed %}fixed-top{% else %}sticky-top{% endif %}">
         <div class="container">
           {% if page.permalink != '/' -%}
-          <a class="navbar-brand title font-weight-lighter" href="{{ site.baseurl | prepend: site.url }}/">
-              {%- if site.title == "blank" -%}<span class="font-weight-bold">{{ site.first_name }}</span> {{ site.middle_name }}  {{ site.last_name }}{%- else -%}{{ site.title }}{%- endif -%}
+          <a class="navbar-brand title font-weight-lighter" href="{{ site.baseurl }}/">
+            {%- if site.title == "blank" -%}
+              {%- if site.first_name -%}
+                <span class="font-weight-bold">{{- site.first_name -}}&nbsp;</span>
+              {%- endif -%}
+              {%- if site.middle_name -%}
+                {{- site.middle_name -}}&nbsp;
+              {%- endif -%}
+              {%- if site.last_name -%}
+                {{- site.last_name -}}
+              {%- endif -%}
+            {%- else -%}
+              {{- site.title -}}
+            {%- endif -%}
           </a>
           {%- elsif site.enable_navbar_social -%}
           <!-- Social Icons -->
diff --git a/_includes/social.html b/_includes/social.html
index 4ed62e1aeba7..1740326463ac 100644
--- a/_includes/social.html
+++ b/_includes/social.html
@@ -53,5 +53,5 @@
             <a href="https://stackoverflow.com/users/{{ site.stackoverflow_id }}" title="Stackoverflow"><i class="fab fa-stack-overflow"></i></a>
             {% endif %}
             {%- if site.rss_icon -%}
-            <a href="{{ site.baseurl | prepend: site.url }}/feed.xml" title="RSS Feed"><i class="fas fa-rss-square"></i></a>
-            {% endif %}
\ No newline at end of file
+            <a href="{{ site.baseurl }}/feed.xml" title="RSS Feed"><i class="fas fa-rss-square"></i></a>
+            {% endif %}
diff --git a/_layouts/default.html b/_layouts/default.html
index 669729f9a6a7..1d291e406fca 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -4,7 +4,7 @@
   <!-- Head -->
   <head>
   {%- if page.redirect -%}
-    <meta http-equiv="refresh" content="3; url={{ site.baseurl | prepend: site.url }}/" />
+    <meta http-equiv="refresh" content="3; url={{ site.baseurl }}/" />
   {%- endif -%}
   {% include head.html %}
   </head>