From 523e33363c08aef283d2c0de2a703f708bac3d1b Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.matthew@metzger.cc>
Date: Thu, 21 Mar 2024 15:16:19 -0500
Subject: [PATCH] Worked on Homepage game creation UI

---
 app.lua                |  31 +++++++++++++++++++++++++++++++
 config.lua             |   1 +
 database.sqlite3       | Bin 28672 -> 28672 bytes
 lua_scripts/map.lua    |  17 ++---------------
 setup_db               |   2 +-
 static/incertitude.css |   4 ++++
 views/game.etlua       |   6 +++++-
 views/index.etlua      |  25 ++++++++++++++++---------
 views/layout.etlua     |   3 ++-
 views/player_ui.etlua  |   3 +++
 10 files changed, 65 insertions(+), 27 deletions(-)
 create mode 100644 views/player_ui.etlua

diff --git a/app.lua b/app.lua
index 16dc4d9..d353f97 100644
--- a/app.lua
+++ b/app.lua
@@ -8,6 +8,7 @@ local db = require("lapis.db")
 local Model = require("lapis.db.model").Model
 
 local map = Model:extend('map')
+local games = Model:extend('games')
 
 app:enable("etlua")
 app.layout = require "views.layout"
@@ -38,6 +39,17 @@ app:get("/game", function(self)
 	}
 end)
 
+app:post("/character-create", function(self)
+	self.text = "Created new player"
+	self.game = games:create({
+		player_id = self.params.playername
+		})
+	self.session.gameref = self.game
+	return {
+		self.text, layout = false
+	}
+end)
+
 app:match("/map/render", function(self)
 	self.tiles = {}
 	for h = 1, 10 do
@@ -53,3 +65,22 @@ app:match("/map/render", function(self)
 end)
 
 return app
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/config.lua b/config.lua
index 0f958a8..8d86a35 100644
--- a/config.lua
+++ b/config.lua
@@ -4,6 +4,7 @@ config("development", {
   server = "nginx",
   code_cache = "off",
   num_workers = "1",
+  secret = "M2KisAmerican",
   sqlite = {
     database = "database.sqlite3",
     -- open_flags = ...
diff --git a/database.sqlite3 b/database.sqlite3
index 2096b119fda4e0bc2a6589c59acab6369575e12d..8ae02752a44eb68cbc12a31ed3e270754df856ca 100644
GIT binary patch
delta 135
zcmZp8z}WDBae_2s)<hX+$t(uFWJX>F1_m~sO$_`2eE;~Yczbx2c{XhpRIuWiypE@k
zGo6)PTwI*7QFpQiZzM~IYedNAPTp!E4krG$4E*2u-vU)W<mcjGVixC2Ps~j%-uzvk
mSAmU@|2+f$d!XD?enEalW(L)eqWrwXoD`SR+=8@41_A()P$hi;

delta 98
zcmV-o0G<DU-~oW(0gxL3X^|X58EF76V*w2S000IIt^f~E4*m{04U7#R46d^gAT|t>
zvJ7zvYXt`v7Z(A6HIpn2SqMo^R7FQcQVFw(4SNy>0T1^85BIYXFzpYs_b&|~vji~w
EANi6SWB>pF

diff --git a/lua_scripts/map.lua b/lua_scripts/map.lua
index 6a48e05..9da9245 100644
--- a/lua_scripts/map.lua
+++ b/lua_scripts/map.lua
@@ -16,22 +16,15 @@ local map = {
         db = { "floor_stone,", "floor_wood", "wall_stone", "wall_wood" }
     },
     mapCrypt = function(self, tile)
+        -- stores tiles as detailed names within the DB
         for i=1, #self.tileset.display do
             if self.tileset.display[i] == tile then
                return self.tileset.db[i]
            end
         end
-        --if tile == "-" then
-        --   return "floor_stone"
-        --elseif tile == "_" then
-        --    return "floor_wood"
-        --elseif tile == "w" then
-        --    return "wall_stone"
-        --end
     end,
     mapDecrypt = function(self, tile)
-        -- TODO: Rework function so it returns both char and mat type
-        -- This introduces breaking changes
+        -- Decodes tiles into their type (represented by char) and their material
         local tileset = {}
         if string.find(tile, "wall") then
             tileset.char = "w"
@@ -44,12 +37,6 @@ local map = {
             tileset.material = "wood"
         end
         return tileset
-
-        -- if tile == "floor_stone" then
-        --     return "-"
-        -- elseif tile == "wall_stone" then
-        --    return "w"
-        -- end
     end,
     -- Map Populate / check if map exists
     populate = function(self, map, game)
diff --git a/setup_db b/setup_db
index 0bc4302..982216f 100755
--- a/setup_db
+++ b/setup_db
@@ -25,7 +25,7 @@ sqlite3 database.sqlite3 "
 	);
 	CREATE TABLE IF NOT EXISTS games (
 		id INTEGER PRIMARY KEY AUTOINCREMENT,
-		player_id INTEGER	
+		player_id TEXT
 	);
 	CREATE TABLE IF NOT EXISTS players (
 		id INTEGER PRIMARY KEY AUTOINCREMENT,
diff --git a/static/incertitude.css b/static/incertitude.css
index 65c7ed1..4f393f3 100644
--- a/static/incertitude.css
+++ b/static/incertitude.css
@@ -5,3 +5,7 @@
 .stone {
     color: gray;
 }
+
+h1 {
+    --pico-font-family: Pacifico, cursive;
+}
diff --git a/views/game.etlua b/views/game.etlua
index dd5d26c..6def7a1 100644
--- a/views/game.etlua
+++ b/views/game.etlua
@@ -5,7 +5,11 @@
     <button hx-post="/clickme" hx-target="#clickable">Start</button>
 </div>
 <% end %>
-<article>
+<article class="container-fluid">
     <p style="text-align: center;">Game</p>
     <main style="width: 50%;" class="container" id="map" hx-get="/map/render" hx-trigger="every 1s,load">
+    </main>
+    <div>
+        <% render("views.player_ui") %>
+    </div>
 </article>
diff --git a/views/index.etlua b/views/index.etlua
index 8b4de5e..59709e6 100644
--- a/views/index.etlua
+++ b/views/index.etlua
@@ -1,4 +1,5 @@
 <!-- views/index.etlua -->
+<!DOCTYPE HTML>
 <script src="/static/htmx.min.js"></script>
 <% if not isPopulated then %>
 <div id="clickable">
@@ -6,15 +7,21 @@
 </div>
 <% end %>
 
-<a href="/game">Play Now</a>
+<article style="text-align: center;">
+    <h3>Log In / Create Game</h3>
+    <p>Player will be created if player name does not already exist.</p>
+    <form>
+    <div class="grid">
+        <input type="text" name="playername">
+        <input type="submit" hx-post="/character-create" hx-trigger="click" value="Execute" hx-target="#replace">
+    </div>
+    </form>
+    <div>
+        <p id="replace"></p>
+    </div>
+</article>
 
+<a href="/game">Play Now</a>
 </main>
 
-<!--
-<ol>
-<p><% for i, thing in pairs(text) do %>
-     <li><%= thing %></li>
-     <% end %>
-</p>
-</ol>
--->
+<!-- TODO: On player create use Model to make new game_ref and append game_ref to self_session -->
diff --git a/views/layout.etlua b/views/layout.etlua
index 98883e8..cc55ba4 100644
--- a/views/layout.etlua
+++ b/views/layout.etlua
@@ -5,10 +5,11 @@
 	<title><%= page_title or "My Page" %></title>
 	<link rel="stylesheet" href="/static/css/pico/pico.min.css" />
 	<link rel="stylesheet" href="/static/incertitude.css" />
+	<link rel="stylesheet" href="/static/css/pico.colors.css" />
 </head>
 
 <body>
-	<h1 style="text-align: center; margin-top: 3rem;">Peradventure</h1>
+	<h1 style="text-align: center; margin-top: 3rem;" >Peradventure</h1>
 	<% content_for("inner") %>
 </body>
 </html>
diff --git a/views/player_ui.etlua b/views/player_ui.etlua
new file mode 100644
index 0000000..70af281
--- /dev/null
+++ b/views/player_ui.etlua
@@ -0,0 +1,3 @@
+<!DOCTYPE HTML>
+
+<p>Look at me!</p>