Used the new sitebuild tool to generate stuff.

2 weeks ago · 9961915c8c
parent 49dc8cf330
commit 9961915c8c
15 changed files with 169 additions and 33 deletions
--- a/3
+++ b/3
@ -37,3 +37,6 @@ cover_report:
 	go tool cover -func=coverage.txt
 	go tool cover -html=coverage.txt -o coverage.html
 	open coverage.html
+
+site:
+	go run tools/cmd/sitebuild/main.go
--- a/main.go
+++ b/main.go
@ -14,7 +14,6 @@ import (

  "zedshaw.games/webapp/api"
  "zedshaw.games/webapp/data"
-  "zedshaw.games/webapp/zed"
 )


@ -30,8 +29,6 @@ func main() {
    StrictRouting: true,
  })

-  zed.RenderPages("./pages", "./public")
-
  app.Use(logger.New())
  app.Use(recov.New())

--- a/public/alpine_test.html
+++ b/public/alpine_test.html
@ -1,4 +1,15 @@
-<html>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="/global.css">
+    <link rel="stylesheet" href="/color.css">
+    <link rel="stylesheet" href="/blockstart.css">
+    <title>Hello</title>
+  </head>
+
+  <body>
+    <html>
 <head>
    <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js"></script>

@ -7,16 +18,10 @@
    <h1 x-data="{ message: 'I ❤️ Alpine' }" x-text="message"></h1>
 </body>
 </html>
-s">
-    <title>ZedShaw's Game Thing</title>
-    <script defer src="/js/alpine.js"></script>
-    <script src="/js/code.js"></script>
-    <script>
-      let req = new GetJson("/api/game/1/index.json");
-    </script>
-  </head>

-  <body x-init="Game = await req.theData()" x-data="{Game: {}}">
+  </body>
+</html>
+ {}}">
    <header>
      <a href="/">🏡</a> <span>Zed's Game Dev Website Yay</span>
    </header>
--- a/public/base.html
+++ b/public/base.html
@ -1,4 +1,15 @@
 <!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="/global.css">
+    <link rel="stylesheet" href="/color.css">
+    <link rel="stylesheet" href="/blockstart.css">
+    <title>Hello</title>
+  </head>
+
+  <body>
+    <!DOCTYPE html>
 <html lang="en">
  <head>
    <meta charset="utf-8" />
@ -23,18 +34,10 @@
    </footer>
  </body>
 </html>
-a()" x-data="{Game: {}}">
-    <header>
-      <a href="/">🏡</a> <span>Zed's Game Dev Website Yay</span>
-    </header>
-
-    <blockstart>
-    <shape style="--w: 100%; --h: 300px">Gameplay Demo Video</shape>
-
-    <block style="--value: 7">
-      <h1 x-text="Game.title">Title</h1>

-      <block class="horizontal">
+  </body>
+</html>
+    <block class="horizontal">
      <shape style="--w: 200px; --h: 200px;">Some Image</shape>

      <p x-text="Game.description">Description</p>
--- a/public/error/index.html
+++ b/public/error/index.html
@ -1,4 +1,15 @@
 <!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="/global.css">
+    <link rel="stylesheet" href="/color.css">
+    <link rel="stylesheet" href="/blockstart.css">
+    <title>Hello</title>
+  </head>
+
+  <body>
+    <!DOCTYPE html>
 <html lang="en">
  <head>
    <meta charset="utf-8" />
@ -24,3 +35,6 @@
    </footer>
  </body>
 </html>
+
+  </body>
+</html>
--- a/public/game/1/turings-tarpit/index.html
+++ b/public/game/1/turings-tarpit/index.html
@ -1,4 +1,15 @@
 <!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="/global.css">
+    <link rel="stylesheet" href="/color.css">
+    <link rel="stylesheet" href="/blockstart.css">
+    <title>Hello</title>
+  </head>
+
+  <body>
+    <!DOCTYPE html>
 <html lang="en">
  <head>
    <meta charset="utf-8" />
@ -59,3 +70,6 @@
    </footer>
  </body>
 </html>
+
+  </body>
+</html>
--- a/public/game/index.html
+++ b/public/game/index.html
@ -1,4 +1,15 @@
 <!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="/global.css">
+    <link rel="stylesheet" href="/color.css">
+    <link rel="stylesheet" href="/blockstart.css">
+    <title>Hello</title>
+  </head>
+
+  <body>
+    <!DOCTYPE html>
 <html lang="en">
  <head>
    <meta charset="utf-8" />
@ -74,3 +85,6 @@ x DIY microdosing. Pickled selvage bespoke small batch, blue bottle twee tacos j
    </footer>
  </body>
 </html>
+
+  </body>
+</html>
--- a/public/index.html
+++ b/public/index.html
@ -1,4 +1,15 @@
 <!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="/global.css">
+    <link rel="stylesheet" href="/color.css">
+    <link rel="stylesheet" href="/blockstart.css">
+    <title>Hello</title>
+  </head>
+
+  <body>
+    <!DOCTYPE html>
 <html lang="en">
  <head>
    <meta charset="utf-8" />
@ -85,3 +96,6 @@
    </footer>
  </body>
 </html>
+
+  </body>
+</html>
--- a/public/live/index.html
+++ b/public/live/index.html
@ -1,4 +1,15 @@
 <!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="/global.css">
+    <link rel="stylesheet" href="/color.css">
+    <link rel="stylesheet" href="/blockstart.css">
+    <title>Hello</title>
+  </head>
+
+  <body>
+    <!DOCTYPE html>
 <html lang="en">
  <head>
    <meta charset="utf-8" />
@ -55,3 +66,6 @@
    </footer>
  </body>
 </html>
+
+  </body>
+</html>
--- a/public/login/index.html
+++ b/public/login/index.html
@ -1,4 +1,15 @@
 <!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="/global.css">
+    <link rel="stylesheet" href="/color.css">
+    <link rel="stylesheet" href="/blockstart.css">
+    <title>Hello</title>
+  </head>
+
+  <body>
+    <!DOCTYPE html>
 <html lang="en">
  <head>
    <meta charset="utf-8" />
@ -42,3 +53,6 @@
    </footer>
  </body>
 </html>
+
+  </body>
+</html>
--- a/public/register/index.html
+++ b/public/register/index.html
@ -1,4 +1,15 @@
 <!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="/global.css">
+    <link rel="stylesheet" href="/color.css">
+    <link rel="stylesheet" href="/blockstart.css">
+    <title>Hello</title>
+  </head>
+
+  <body>
+    <!DOCTYPE html>
 <html lang="en">
  <head>
    <meta charset="utf-8" />
@ -44,3 +55,6 @@
    </footer>
  </body>
 </html>
+
+  </body>
+</html>
--- a/public/stream/1/index.html
+++ b/public/stream/1/index.html
@ -1,4 +1,15 @@
 <!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="/global.css">
+    <link rel="stylesheet" href="/color.css">
+    <link rel="stylesheet" href="/blockstart.css">
+    <title>Hello</title>
+  </head>
+
+  <body>
+    <!DOCTYPE html>
 <html lang="en">
  <head>
    <meta charset="utf-8" />
@ -79,3 +90,6 @@ i poutine jianbing chambray.</p>
    </footer>
  </body>
 </html>
+
+  </body>
+</html>
--- a/public/stream/index.html
+++ b/public/stream/index.html
@ -1,4 +1,15 @@
 <!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="/global.css">
+    <link rel="stylesheet" href="/color.css">
+    <link rel="stylesheet" href="/blockstart.css">
+    <title>Hello</title>
+  </head>
+
+  <body>
+    <!DOCTYPE html>
 <html lang="en">
  <head>
    <meta charset="utf-8" />
@ -66,3 +77,6 @@ ral chicharrones typewriter chartreuse vice Brooklyn. Adaptogen pour-over vibece
    </footer>
  </body>
 </html>
+
+  </body>
+</html>
--- a/tools/cmd/dothing/main.go
+++ b/tools/cmd/dothing/main.go
@ -1,9 +0,0 @@
-package main
-
-import (
-  "log"
-)
-
-func main() {
-  log.Println("I DO THING!")
-}
--- a/tools/cmd/sitebuild/main.go
+++ b/tools/cmd/sitebuild/main.go
@ -0,0 +1,11 @@
+package main
+
+import (
+  "log"
+  "zedshaw.games/webapp/zed"
+)
+
+func main() {
+  log.Println("Generating site from pages to public.")
+  zed.RenderPages("./pages", "./public", "layouts/main")
+}