From 4100585a60ec0978db4d6770c4954343508ca883 Mon Sep 17 00:00:00 2001 From: Kaj Forney Date: Tue, 2 May 2023 09:35:46 -0600 Subject: [PATCH] Homepage and game info pages presentable. --- .gitignore | 5 +- server/model/games.js | 5 +- server/public/css/main.css | 38 +++- server/public/edit.html | 2 +- server/public/game.html | 109 +++++++++++- server/public/index.html | 354 +++++++++++-------------------------- 6 files changed, 252 insertions(+), 261 deletions(-) diff --git a/.gitignore b/.gitignore index 9b50066..90a5fbb 100644 --- a/.gitignore +++ b/.gitignore @@ -104,4 +104,7 @@ dist .tern-port # Ignore credentials -server/model/creds.json \ No newline at end of file +server/model/creds.json + +#Ignore uploaded images +server/public/images/* diff --git a/server/model/games.js b/server/model/games.js index 084d18d..7d7a97b 100644 --- a/server/model/games.js +++ b/server/model/games.js @@ -95,7 +95,9 @@ async function getGame(id) { m.id AS appID, m.game_title AS title, d.name AS developer, + d.homepage AS devURL, p.name AS publisher, + p.homepage AS pubURL, m.release_date AS releaseDate, m.short_description AS summary, m.long_description AS longDescription, @@ -104,7 +106,8 @@ async function getGame(id) { m.linux_supported AS linux, m.cover_art_filename AS coverArt, m.short_description AS shortDescription, - m.long_description_markdown AS longDescription + m.long_description AS longDescription, + m.long_description_markdown AS markdown FROM games_master_table m INNER JOIN developers d ON m.developer_id = d.id INNER JOIN publishers p ON m.publisher_id = p.id`, diff --git a/server/public/css/main.css b/server/public/css/main.css index 155fe7b..8001dc0 100644 --- a/server/public/css/main.css +++ b/server/public/css/main.css @@ -88,11 +88,9 @@ textarea { ========================================================================== */ #header { background-color: #171a21; - color: #c6d4df; } #form { - background-image: linear-gradient(180deg, #171a21, #1b2838); min-height: 750px; color: #c6d4df; } @@ -111,6 +109,7 @@ hr{ } body, html { + background-image: linear-gradient(180deg, #171a21, #1b2838); margin: 0px; background-color: #171a21; transition: all 0.4s ease 0s; @@ -141,6 +140,41 @@ input, select, textarea { background-color: #316282; } +.gameEntry { + background-color: #22445b; + border-radius: 20px; +} + +.gameEntry:hover { + background-color: #316282; +} + +.gameEntry * { + text-decoration: none; + color: #b3d4fc; +} + +.gamePage { + background-color: #22445b; + color: #b3d4fc; + margin-top: 70px; + border-radius: 30px; + padding: 30px; +} + +.coverArtContainer{ + display: flex; + justify-content: center; + align-items: center; +} + +.coverArt { + margin-left: auto; + margin-right: auto; + width:100%; + min-width: 250px; +} + #submitButton { border-radius: 5px; border:0; diff --git a/server/public/edit.html b/server/public/edit.html index afcc31c..7457914 100644 --- a/server/public/edit.html +++ b/server/public/edit.html @@ -302,7 +302,7 @@ document.getElementById("currentArt").appendChild(coverImg); document.getElementById("shortDescription").value = gameData.shortDescription; - document.getElementById("longDescription").value = gameData.longDescription; + document.getElementById("longDescription").value = gameData.markdown; } else { document.getElementById("errorMessage").innerHTML = "Invalid App ID!"; document.getElementById("errorMessage").hidden = false; diff --git a/server/public/game.html b/server/public/game.html index 9182ca7..c651fb7 100644 --- a/server/public/game.html +++ b/server/public/game.html @@ -14,15 +14,68 @@ + + + -
+
+
+
+
+

-
+
+
+
-
+
+ +
+
+ +
+ +
+ +
+ +
+
+
+
+
+ +
+ + @@ -30,157 +32,55 @@ -