From 2cd9094dc56b9f3937a6ba58f24f9a52941f609e Mon Sep 17 00:00:00 2001
From: curben <2809763-curben@users.noreply.gitlab.com>
Date: Tue, 3 Sep 2019 16:39:19 +0100
Subject: [PATCH] fix: move /about/ page to homepage

---
 _config.yml                    | 7 ++++---
 scripts/sitemap/.sitemap.xml   | 2 +-
 source/_redirects              | 4 ++--
 themes/typing/layout/index.ejs | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/_config.yml b/_config.yml
index 7c534f7..091e9ad 100644
--- a/_config.yml
+++ b/_config.yml
@@ -98,8 +98,8 @@ theme_config:
 
   # Header
   menu:
-    Home: /blog/
-    About: /about/
+    Home: /
+    Blog: /blog/
     Feed: /atom.xml
     GitLab: https://gitlab.com/curben/blog
 
@@ -119,6 +119,7 @@ theme_config:
   # If "icons: true" link names will interpreted as fontawesome icon names
   # Use the forkawesome icon names (https://forkaweso.me/Fork-Awesome/icons/) without the fa- prefix
   links:
-    Home: /blog/
+    Home: /
+    Blog: /blog/
     Feed: /atom.xml
     GitLab: https://gitlab.com/curben/blog
diff --git a/scripts/sitemap/.sitemap.xml b/scripts/sitemap/.sitemap.xml
index 246cfd2..9c233cd 100644
--- a/scripts/sitemap/.sitemap.xml
+++ b/scripts/sitemap/.sitemap.xml
@@ -13,7 +13,7 @@
 
   {# home page #}
   <url>
-      <loc>{{ config.url + '/' + config.archive_dir + '/' | uriencode }}</loc>
+      <loc>{{ config.url + '/' | uriencode }}</loc>
       <lastmod>{{ sNow }}</lastmod>
       <changefreq>daily</changefreq>
       <priority>1.0</priority>
diff --git a/source/_redirects b/source/_redirects
index 2b4bc47..214d9e6 100644
--- a/source/_redirects
+++ b/source/_redirects
@@ -1,5 +1,5 @@
-# Temporarily set the homepage to /blog
-/ /blog/ 302
+# Move about page to homepage
+/about/ / 302
 # Redirect post to /blog/
 /:year/:month/:date/:slug /blog/:year/:month/:date/:slug/ 301
 
diff --git a/themes/typing/layout/index.ejs b/themes/typing/layout/index.ejs
index ff16854..3f76472 120000
--- a/themes/typing/layout/index.ejs
+++ b/themes/typing/layout/index.ejs
@@ -1 +1 @@
-archive.ejs
\ No newline at end of file
+about.ejs
\ No newline at end of file