From 9b262458ea262942e7896b23142b39d5025998ec Mon Sep 17 00:00:00 2001
From: Santiago Lo Coco <santilococo.01@gmail.com>
Date: Sat, 7 Oct 2023 01:12:29 +0000
Subject: [PATCH] Fix more bugs and replace github icon

---
 _config.yml                        |  1 +
 _includes/projects.html            |  2 +-
 _includes/projects_horizontal.html |  2 +-
 _includes/social.html              | 15 +++++++++------
 _layouts/page.html                 |  2 +-
 docker/Dockerfile                  |  2 +-
 docker/docker-compose.yml          |  1 -
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/_config.yml b/_config.yml
index 4b06327..373bcbc 100644
--- a/_config.yml
+++ b/_config.yml
@@ -38,6 +38,7 @@ github_username: santilococo
 gitlab_username: slococo
 linkedin_username: santilococo
 codeberg_username: slococo
+forgejo_username: slococo
 work_url:
 
 contact_note:
diff --git a/_includes/projects.html b/_includes/projects.html
index 7b4332c..829dbfa 100644
--- a/_includes/projects.html
+++ b/_includes/projects.html
@@ -17,7 +17,7 @@
               {%- if project.github -%}
               <div class="github-icon">
                 <div class="icon" data-toggle="tooltip" title="Code repository">
-                  <a href="{{ project.github }}" class="stretched-link"><i class="fab fa-lg fa-github gh-icon"></i></a>
+                  <a href="{{ project.github }}" class="stretched-link"><i class="fab fa-lg fa-git gh-icon"></i></a>
                 </div>
                 {%- if project.github_stars -%}
                 <span class="stars" data-toggle="tooltip" title="GitHub Stars">
diff --git a/_includes/projects_horizontal.html b/_includes/projects_horizontal.html
index 00299a3..214b9ae 100644
--- a/_includes/projects_horizontal.html
+++ b/_includes/projects_horizontal.html
@@ -11,7 +11,7 @@
         {%- if project.github -%}
         <div class="github-icon">
           <div class="icon" data-toggle="tooltip" title="Code repository">
-            <a href="{{ project.github }}" class="stretched-link"><i class="fab fa-lg fa-github gh-icon"></i></a>
+            <a href="{{ project.github }}" class="stretched-link"><i class="fab fa-lg fa-git gh-icon"></i></a>
           </div>
           {%- if project.github_stars -%}
           <span class="stars" data-toggle="tooltip" title="GitHub Stars">
diff --git a/_includes/social.html b/_includes/social.html
index 5d484f3..9d1b8d7 100644
--- a/_includes/social.html
+++ b/_includes/social.html
@@ -1,6 +1,15 @@
             {%- if site.email -%}
             <a href="mailto:{{ site.email | encode_email }}" title="email" class="rel-1z"><i class="fas fa-envelope"></i></a>
             {% endif %}
+            {%- if site.forgejo_username -%}
+            <a href="https://git.slc.ar/{{ site.forgejo_username }}" title="Git" class="rel-1z"><i class="fab fa-git"></i></a>
+            {% endif %}
+            {%- if site.codeberg_username -%}
+            <a href="https://codeberg.org/{{ site.codeberg_username }}" title="Codeberg" class="rel-1z"><i class="fab fa-git-alt"></i></a>
+            {% endif %}
+            {%- if site.gitlab_username -%}
+            <a href="https://gitlab.com/{{ site.gitlab_username }}" title="GitLab" class="rel-1z"><i class="fab fa-gitlab"></i></a>
+            {% endif %}
             {%- if site.github_username -%}
             <a href="https://github.com/{{ site.github_username }}" title="GitHub" class="rel-1z"><i class="fab fa-github"></i></a>
             {% endif %}
@@ -10,9 +19,3 @@
             {%- if site.work_url -%}
             <a href="{{ site.work_url }}" title="Work" class="rel-1z"><i class="fas fa-briefcase"></i></a>
             {% endif %}
-            {%- if site.gitlab_username -%}
-            <a href="https://gitlab.com/{{ site.gitlab_username }}" title="GitLab" class="rel-1z"><i class="fab fa-gitlab"></i></a>
-            {% endif %}
-            {%- if site.github_username -%}
-            <a href="https://codeberg.org/{{ site.codeberg_username }}" title="Codeberg" class="rel-1z"><i class="fab fa-git"></i></a>
-            {% endif %}
\ No newline at end of file
diff --git a/_layouts/page.html b/_layouts/page.html
index 5ad3f16..eb923c7 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -12,7 +12,7 @@ layout: default
               </div>
               <div style="float:right;">
                 <div class="icon" data-toggle="tooltip" title="Code Repository">
-                  <a href="{{ page.github }}"><i class="fab fa-3x fa-github"></i></a>
+                  <a href="{{ page.github }}"><i class="fab fa-3x fa-git"></i></a>
                 </div>
               </div>
             </div>
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7a1260e..62fc059 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -30,7 +30,7 @@ RUN find . -maxdepth 1 ! -name '_site' -exec rm -rf {} \;
 
 RUN mv _site/* .
 
-RUN rm -R _site/ docker README.md LICENSE.md
+RUN rm -R _site docker README.md LICENSE.md
 
 FROM cupcakearmy/static
 
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 8135535..36bf25b 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -9,5 +9,4 @@ services:
       ports:
         - 9998:80
       volumes:
-        - ../_site:/srv:ro
         - ./default.conf:/usr/local/nginx/conf/sites/default.conf