Added a better way of setting/reading the app version; fixed some of the flexbox sizing
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed

This commit is contained in:
2025-07-28 10:23:51 -04:00
parent d59c75281e
commit 5cc3b8f824
7 changed files with 25 additions and 12 deletions

View File

@ -4,6 +4,10 @@
$primary-color: cornflowerblue $primary-color: cornflowerblue
$primary-color-highlight: color.adjust($primary-color, $lightness: -10%) $primary-color-highlight: color.adjust($primary-color, $lightness: -10%)
html
width: 100%
height: 100%
body body
background: rgb(240, 235, 248) background: rgb(240, 235, 248)

3
src/appinfo.rb Normal file
View File

@ -0,0 +1,3 @@
module AppInfo
VERSION = '0.1.0'
end

View File

@ -8,7 +8,7 @@ module Helpers
end end
def app_version() def app_version()
`git describe --tags`.strip return AppInfo::VERSION
end end
def date_format(date) def date_format(date)

View File

@ -5,6 +5,8 @@ require 'sinatra/json'
require 'sequel' require 'sequel'
require 'sqlite3' require 'sqlite3'
require_relative './appinfo'
# Load the Sequel timestamps plugin # Load the Sequel timestamps plugin
Sequel::Model.plugin(:timestamps) Sequel::Model.plugin(:timestamps)
# Initialize Sequel gem for database actions # Initialize Sequel gem for database actions

View File

@ -12,14 +12,16 @@
<script src="/js/edgeville.js" charset="utf-8"></script> <script src="/js/edgeville.js" charset="utf-8"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.4/Chart.min.js" charset="utf-8"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.4/Chart.min.js" charset="utf-8"></script>
</head> </head>
<body> <body class="d-flex flex-column min-vh-100">
<!-- main navigation --> <!-- main navigation -->
<%= erb :'partials/navbar', :locals => locals %> <%= erb :'partials/navbar', :locals => locals %>
<!-- main content --> <!-- main content -->
<div id="wrapper" class="container mb-4"> <main class="flex-grow-1 py-4">
<%= yield %> <div id="wrapper" class="container mb-4">
</div> <%= yield %>
</div>
</main>
<!-- site footer --> <!-- site footer -->
<%= erb :'partials/footer', :locals => locals %> <%= erb :'partials/footer', :locals => locals %>

View File

@ -1,8 +1,10 @@
<nav id="main-footer" class="container"> <footer id="main-footer" class="bg-light border-top py-3 text-center">
<div class="row"> <div class="container">
<div class="col-12"> <div class="row">
<p>Game Data version v<%= app_version() %></p> <div class="col-12">
<p>Running Ruby version v<%= ruby_version() %></p> <p>Game Data version v<%= app_version() %></p>
<p class="mb-0">Running Ruby version v<%= ruby_version() %></p>
</div>
</div> </div>
</div> </div>
</nav> </footer>

View File

@ -8,7 +8,7 @@
</div> </div>
<div class="col-12"> <div class="col-12">
<p>Hardware tested: <%= test.hardware.name %></p> <p>Hardware tested: <a href="/hardware/<%= test.hardware.id %>"><%= test.hardware.name %></a></p>
</div> </div>
<div class="col-12"> <div class="col-12">