From 5cc3b8f824a6363ae663f62c186f650ef90b7b4c Mon Sep 17 00:00:00 2001 From: Gregory Ballantine Date: Mon, 28 Jul 2025 10:23:51 -0400 Subject: [PATCH] Added a better way of setting/reading the app version; fixed some of the flexbox sizing --- assets/styles/rimmington.sass | 4 ++++ src/appinfo.rb | 3 +++ src/helpers.rb | 2 +- src/server.rb | 2 ++ views/layout.erb | 10 ++++++---- views/partials/footer.erb | 14 ++++++++------ views/test/view.erb | 2 +- 7 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 src/appinfo.rb diff --git a/assets/styles/rimmington.sass b/assets/styles/rimmington.sass index 8ccf59a..d13a0f3 100644 --- a/assets/styles/rimmington.sass +++ b/assets/styles/rimmington.sass @@ -4,6 +4,10 @@ $primary-color: cornflowerblue $primary-color-highlight: color.adjust($primary-color, $lightness: -10%) +html + width: 100% + height: 100% + body background: rgb(240, 235, 248) diff --git a/src/appinfo.rb b/src/appinfo.rb new file mode 100644 index 0000000..451c13f --- /dev/null +++ b/src/appinfo.rb @@ -0,0 +1,3 @@ +module AppInfo + VERSION = '0.1.0' +end diff --git a/src/helpers.rb b/src/helpers.rb index 82dc838..75b12d7 100644 --- a/src/helpers.rb +++ b/src/helpers.rb @@ -8,7 +8,7 @@ module Helpers end def app_version() - `git describe --tags`.strip + return AppInfo::VERSION end def date_format(date) diff --git a/src/server.rb b/src/server.rb index a8f1612..b01c180 100755 --- a/src/server.rb +++ b/src/server.rb @@ -5,6 +5,8 @@ require 'sinatra/json' require 'sequel' require 'sqlite3' +require_relative './appinfo' + # Load the Sequel timestamps plugin Sequel::Model.plugin(:timestamps) # Initialize Sequel gem for database actions diff --git a/views/layout.erb b/views/layout.erb index fe644d7..dde1f16 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -12,14 +12,16 @@ - + <%= erb :'partials/navbar', :locals => locals %> -
- <%= yield %> -
+
+
+ <%= yield %> +
+
<%= erb :'partials/footer', :locals => locals %> diff --git a/views/partials/footer.erb b/views/partials/footer.erb index 661bf3d..93c54e0 100644 --- a/views/partials/footer.erb +++ b/views/partials/footer.erb @@ -1,8 +1,10 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/views/test/view.erb b/views/test/view.erb index ae9a03e..001ac24 100644 --- a/views/test/view.erb +++ b/views/test/view.erb @@ -8,7 +8,7 @@
-

Hardware tested: <%= test.hardware.name %>

+

Hardware tested: <%= test.hardware.name %>