Merge branch 'main' of https://github.com/Gsvd/gsvd.dev

.air.toml

@@ -1,11 +1,11 @@
 root = "."
 testdata_dir = "testdata"
-tmp_dir = "./cmd/gsvd.dev/tmp"
+tmp_dir = "./dist/tmp"
 
 [build]
   args_bin = []
-  bin = "./cmd/gsvd.dev/tmp/main"
-  cmd = "go build -o ./cmd/gsvd.dev/tmp/main ./cmd/gsvd.dev"
+  bin = "./dist/tmp/main"
+  cmd = "go build -o ./dist/tmp/main ./cmd/gsvd.dev"
   delay = 1000
   exclude_dir = ["assets", "tmp", "vendor", "testdata", "node_modules"]
   exclude_file = []

.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch Server with Debug",
+            "type": "go",
+            "request": "launch",
+            "mode": "debug",
+            "program": "${workspaceFolder}/cmd/gsvd.dev",
+            "env": {},
+            "args": [],
+            "buildFlags": "",
+            "dlvFlags": ["--log"]
+        }
+    ]
+}

cmd/gsvd.dev/main.go

@@ -1,12 +1,13 @@
 package main
 
 import (
-	"github.com/gofiber/fiber/v2/middleware/logger"
 	"log"
 	"net/http"
 
+	"github.com/gofiber/fiber/v2/middleware/logger"
+
 	embeded "github.com/Gsvd/gsvd.dev"
-	"github.com/Gsvd/gsvd.dev/handlers"
+	"github.com/Gsvd/gsvd.dev/internal/handlers"
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/filesystem"
 	"github.com/gofiber/template/html/v2"

embeded.go

@@ -8,11 +8,11 @@ var PublicFiles embed.FS
 //go:embed dist/css/*
 var DistFiles embed.FS
 
-//go:embed templates/*
+//go:embed internal/templates/*
 var TemplateFiles embed.FS
 
-//go:embed articles/*
-var ArticleFiles embed.FS
+//go:embed internal/content/*
+var ContentFiles embed.FS
 
 //go:embed sitemap.xml
 var SiteMapFile embed.FS

handlers/blog.go → internal/handlers/blog.go

@@ -7,29 +7,30 @@ import (
 	"net/http"
 
 	embeded "github.com/Gsvd/gsvd.dev"
-	"github.com/Gsvd/gsvd.dev/internal"
+	"github.com/Gsvd/gsvd.dev/internal/models"
+	"github.com/Gsvd/gsvd.dev/internal/services"
 	"github.com/gernest/front"
 	"github.com/gofiber/fiber/v2"
 	"github.com/mitchellh/mapstructure"
 	"github.com/russross/blackfriday/v2"
 )
 
 func BlogHandler(c *fiber.Ctx) error {
-	articlesMetadata, err := internal.LoadArticlesMetadata()
+	articlesMetadata, err := services.LoadArticles()
 	if err != nil {
 		panic(err)
 	}
-	return c.Render("templates/blog", fiber.Map{
+	return c.Render("internal/templates/blog", fiber.Map{
 		"Title":     "Blog Articles - Gsvd",
 		"Articles":  articlesMetadata,
 		"Canonical": "blog",
-	}, "templates/layouts/main")
+	}, "internal/templates/layouts/main")
 }
 
 func BlogPostHandler(c *fiber.Ctx) error {
-	filename := fmt.Sprintf("articles/%s.md", c.Params("title"))
+	filename := fmt.Sprintf("internal/content/%s.md", c.Params("title"))
 
-	fileContent, err := embeded.ArticleFiles.ReadFile(filename)
+	fileContent, err := embeded.ContentFiles.ReadFile(filename)
 	if err != nil {
 		return c.SendStatus(http.StatusNotFound)
 	}
@@ -41,21 +42,21 @@ func BlogPostHandler(c *fiber.Ctx) error {
 		panic(err)
 	}
 
-	metadata := &internal.ArticleMetadata{}
+	metadata := &models.Metadata{}
 	if err := mapstructure.Decode(f, metadata); err != nil {
 		panic(err)
 	}
 
 	htmlContent := blackfriday.Run([]byte(body))
 
-	article := internal.Article{
+	article := models.Article{
 		Metadata: *metadata,
 		Content:  template.HTML(htmlContent),
 	}
 
-	return c.Render("templates/post", fiber.Map{
+	return c.Render("internal/templates/post", fiber.Map{
 		"Title":     metadata.Title + " - Gsvd",
 		"Article":   article,
 		"Canonical": "blog/" + metadata.Slug,
-	}, "templates/layouts/post")
+	}, "internal/templates/layouts/post")
 }

handlers/contact.go → internal/handlers/contact.go

@@ -5,8 +5,8 @@ import (
 )
 
 func ContactHandler(c *fiber.Ctx) error {
-	return c.Render("templates/contact", fiber.Map{
+	return c.Render("internal/templates/contact", fiber.Map{
 		"Title":     "Contact - Gsvd",
 		"Canonical": "contact",
-	}, "templates/layouts/main")
+	}, "internal/templates/layouts/main")
 }

handlers/home.go → internal/handlers/home.go

@@ -1,21 +1,21 @@
 package handlers
 
 import (
-	"github.com/Gsvd/gsvd.dev/internal"
+	"github.com/Gsvd/gsvd.dev/internal/services"
 	"github.com/gofiber/fiber/v2"
 )
 
 func HomeHandler(c *fiber.Ctx) error {
-	articlesMetadata, err := internal.LoadArticlesMetadata()
+	articlesMetadata, err := services.LoadArticles()
 	if err != nil {
 		panic(err)
 	}
 	if len(articlesMetadata) > 5 {
 		articlesMetadata = articlesMetadata[:5]
 	}
-	return c.Render("templates/index", fiber.Map{
+	return c.Render("internal/templates/index", fiber.Map{
 		"Title":     "Gsvd - People-Focused Software Developer",
 		"Articles":  articlesMetadata,
 		"Canonical": "",
-	}, "templates/layouts/main")
+	}, "internal/templates/layouts/main")
 }

handlers/resume.go → internal/handlers/resume.go

@@ -5,8 +5,8 @@ import (
 )
 
 func ResumeHandler(c *fiber.Ctx) error {
-	return c.Render("templates/resume", fiber.Map{
+	return c.Render("internal/templates/resume", fiber.Map{
 		"Title":     "Resume - Gsvd",
 		"Canonical": "resume",
-	}, "templates/layouts/main")
+	}, "internal/templates/layouts/main")
 }

internal/article.go → internal/models/article.go

@@ -1,8 +1,8 @@
-package internal
+package models
 
 import "html/template"
 
 type Article struct {
-	Metadata ArticleMetadata
+	Metadata Metadata
 	Content  template.HTML
 }

internal/articleMetadata.go → internal/models/metadata.go

@@ -1,9 +1,9 @@
-package internal
+package models
 
-type ArticleMetadata struct {
+type Metadata struct {
+	Id          int
 	Slug        string
 	Title       string
 	Description string
-	Id       int
 	Date        string
 }

internal/loader.go → internal/services/article_loader.go

@@ -1,4 +1,4 @@
-package internal
+package services
 
 import (
 	"bytes"
@@ -7,13 +7,14 @@ import (
 	"strings"
 
 	embeded "github.com/Gsvd/gsvd.dev"
+	"github.com/Gsvd/gsvd.dev/internal/models"
 	"github.com/gernest/front"
 	"github.com/mitchellh/mapstructure"
 )
 
-func LoadArticlesMetadata() ([]ArticleMetadata, error) {
-	var articlesMetadata []ArticleMetadata
-	articles, err := embeded.ArticleFiles.ReadDir("articles")
+func LoadArticles() ([]models.Metadata, error) {
+	var metadatas []models.Metadata
+	articles, err := embeded.ContentFiles.ReadDir("internal/content")
 	if err != nil {
 		panic(err)
 	}
@@ -24,7 +25,7 @@ func LoadArticlesMetadata() ([]ArticleMetadata, error) {
 			continue
 		}
 
-		fileContent, err := embeded.ArticleFiles.ReadFile("articles/" + article.Name())
+		fileContent, err := embeded.ContentFiles.ReadFile("internal/content/" + article.Name())
 		if err != nil {
 			return nil, err
 		}
@@ -33,17 +34,17 @@ func LoadArticlesMetadata() ([]ArticleMetadata, error) {
 			return nil, err
 		}
 
-		metadata := &ArticleMetadata{}
+		metadata := &models.Metadata{}
 		metadata.Slug = strings.TrimSuffix(article.Name(), filepath.Ext(article.Name()))
 		if err := mapstructure.Decode(f, metadata); err != nil {
 			return nil, err
 		}
-		articlesMetadata = append(articlesMetadata, *metadata)
+		metadatas = append(metadatas, *metadata)
 	}
 
-	sort.Slice(articlesMetadata, func(i, j int) bool {
-		return articlesMetadata[i].Id > articlesMetadata[j].Id
+	sort.Slice(metadatas, func(i, j int) bool {
+		return metadatas[i].Id > metadatas[j].Id
 	})
 
-	return articlesMetadata, nil
+	return metadatas, nil
 }

templates/blog.html → internal/templates/blog.html

@@ -1,4 +1,4 @@
-{{template "templates/partials/header" .}}
+{{template "internal/templates/partials/header" .}}
 
 <div class="flex flex-col gap-y-4">
     <h1 class="text-2xl">Blog Articles</h1>
@@ -12,4 +12,4 @@ <h1 class="text-2xl">Blog Articles</h1>
     </ul>
 </div>
 
-{{template "templates/partials/footer" .}}
+{{template "internal/templates/partials/footer" .}}

templates/contact.html → internal/templates/contact.html

@@ -1,4 +1,4 @@
-{{template "templates/partials/header" .}}
+{{template "internal/templates/partials/header" .}}
 
 <h1 class="text-2xl mb-4">Contact</h1>
 <div class="flex flex-row flex-wrap-reverse gap-y-4">
@@ -23,4 +23,4 @@ <h3 class="text-lg">Quick Links</h3>
     </div>
 </div>
 
-{{template "templates/partials/footer" .}}
+{{template "internal/templates/partials/footer" .}}

templates/index.html → internal/templates/index.html

@@ -1,4 +1,4 @@
-{{template "templates/partials/header" .}}
+{{template "internal/templates/partials/header" .}}
 
 <div class="flex flex-col gap-y-4">
     <div>
@@ -24,7 +24,7 @@ <h2 class="text-lg">People-Focused Software Developer - Montréal, QC, CA</h2>
     <ul class="list-disc ml-4">
         <li><a href="https://github.com/Gsvd/gsvd.dev" target="_blank" rel="noopener noreferrer">This website</a></li>
     </ul>
-    {{template "templates/partials/skills" .}}
+    {{template "internal/templates/partials/skills" .}}
 </div>
 
-{{template "templates/partials/footer" .}}
+{{template "internal/templates/partials/footer" .}}

templates/post.html → internal/templates/post.html

@@ -1,7 +1,7 @@
-{{template "templates/partials/header" .}}
+{{template "internal/templates/partials/header" .}}
 
 <h1 class="text-2xl underline underline-offset-2 mb-2">{{.Article.Metadata.Title}}</h1>
 <h2 class="text-lg mb-8 italic">{{.Article.Metadata.Date}}</h2>
 <article class="prose dark:prose-dark max-w-none">{{.Article.Content}}</article>
 
-{{template "templates/partials/footer" .}}
+{{template "internal/templates/partials/footer" .}}

templates/resume.html → internal/templates/resume.html

@@ -1,12 +1,12 @@
-{{template "templates/partials/header" .}}
+{{template "internal/templates/partials/header" .}}
 
 <div class="flex flex-col gap-y-4">
     <h1 class="text-2xl">Meet Guillaume: crafting code, creating solutions</h1>
     <p>
         People-Focused Software Developer with a proven track record in leading impactful technology projects and
         driving digital transformation across multiple sectors.
     </p>
-    {{template "templates/partials/skills" .}}
+    {{template "internal/templates/partials/skills" .}}
     <h1 class="text-2xl">Experience</h1>
     <h2 class="text-xl">[Optable] – Software Developer</h2>
     <div class="flex flex-col gap-y-2">
@@ -74,4 +74,4 @@ <h2 class="text-xl">[Capgemini] – Software Developer Intern</h2>
     </div>
 </div>
 
-{{template "templates/partials/footer" .}}
+{{template "internal/templates/partials/footer" .}}