added 30 using layouts now

jagottsicher · Mar 3, 2023 · 7d6fe86 · 7d6fe86
1 parent e8c805e
commit 7d6fe86
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 26 deletions.
diff --git a/pkg/render/render.go b/pkg/render/render.go
@@ -7,9 +7,9 @@ import (
 )
 
 // rendernTemplate serves as a wrapper and renders
-// a template from folder /templates to a desired writer
+// a layout and a template from folder /templates to a desired writer
 func RenderTemplate(w http.ResponseWriter, tpml string) {
-	parsedTemplate, _ := template.ParseFiles("./templates/" + tpml)
+	parsedTemplate, _ := template.ParseFiles("./templates/"+tpml, "./templates/base-layout.tpml")
 	err := parsedTemplate.Execute(w, nil)
 	if err != nil {
 		fmt.Println("error parsing template:", err)

diff --git a/templates/about-page.tpml b/templates/about-page.tpml
@@ -1,13 +1,6 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-GLhlTQ8iRABdZLl6O3oVMWSktQOp6b7In1Zl3/Jr59b6EGGoI1aFkw7cmDA6j6gD" crossorigin="anonymous">
-    <title>Document</title>
-</head>
-<body>
+{{template "base" .}}
+
+{{define "content"}}
     <div class="container">
         <div class="row">
             <div class="col">
@@ -16,5 +9,4 @@
             </div>
         </div>
     </div>
-</body>
-</html>
+{{end}}
diff --git a/templates/base-layout.tpml b/templates/base-layout.tpml
@@ -0,0 +1,24 @@
+{{define "base"}}
+    <!DOCTYPE html>
+    <html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-GLhlTQ8iRABdZLl6O3oVMWSktQOp6b7In1Zl3/Jr59b6EGGoI1aFkw7cmDA6j6gD" crossorigin="anonymous">
+        <title>Document</title>
+        {{block "css" .}}
+
+        {{end}}
+    </head>
+    <body>
+        {{block "content" .}}
+
+        {{end}}
+
+        {{block "js" .}}
+
+        {{end}}
+    </body>
+    </html>
+{{end}}
diff --git a/templates/home-page.tpml b/templates/home-page.tpml
@@ -1,13 +1,6 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-GLhlTQ8iRABdZLl6O3oVMWSktQOp6b7In1Zl3/Jr59b6EGGoI1aFkw7cmDA6j6gD" crossorigin="anonymous">
-    <title>Document</title>
-</head>
-<body>
+{{template "base" .}}
+
+{{define "content"}}
     <div class="container">
         <div class="row">
             <div class="col">
@@ -16,5 +9,4 @@
             </div>
         </div>
     </div>
-</body>
-</html>
+{{end}}