diff --git a/assets/styles/rimmington.sass b/assets/styles/rimmington.sass index 3b3628e..f138c7d 100644 --- a/assets/styles/rimmington.sass +++ b/assets/styles/rimmington.sass @@ -5,42 +5,9 @@ $primary-color: cornflowerblue $primary-color-highlight: color.adjust($primary-color, $lightness: -10%) body - background: #eee - -a - color: $primary-color - transition: color 225ms ease-in-out - &:hover - color: $primary-color-highlight - -input[type=submit], -button - background: $primary-color - color: #eee - border-radius: 8px - transition: all 225ms ease-in-out - &:hover - background: $primary-color-highlight - color: white + background: rgb(240, 235, 248) #wrapper background: white - padding: 1rem 2rem + padding: 1.5rem 2rem border-radius: 8px - -#main-nav - margin-bottom: 15px - background: $primary-color - border-bottom: 1px solid #eee - - ul - background: none - - a - color: #eee - font-weight: bold - &:hover - color: white - -h1.invalid - color: red diff --git a/src/helpers.rb b/src/helpers.rb index dacac4f..9e0e5a0 100644 --- a/src/helpers.rb +++ b/src/helpers.rb @@ -3,6 +3,14 @@ # Helpers - view helper functions module Helpers + def ruby_version() + return RUBY_VERSION + end + + def app_version() + return `git describe --tags` + end + def date_format(date) dt = date.to_datetime return dt.strftime('%B %d, %Y @ %I:%M:%S %p %Z') diff --git a/src/routes/init.rb b/src/routes/init.rb index c1158d7..4d2fdec 100644 --- a/src/routes/init.rb +++ b/src/routes/init.rb @@ -3,8 +3,8 @@ require_relative 'index' require_relative 'hardware' require_relative 'benchmark' -require_relative 'result' require_relative 'reports' +require_relative 'result' require_relative 'test' require_relative 'api1' diff --git a/src/routes/reports.rb b/src/routes/reports.rb index 66a68f2..bab6aa6 100644 --- a/src/routes/reports.rb +++ b/src/routes/reports.rb @@ -3,7 +3,7 @@ # /reports routes class GameData < Sinatra::Base - get '/reports' do + get '/report' do benchmarks = Benchmark.order(:name).all() tests = Test.order(:name).all() @@ -14,7 +14,7 @@ class GameData < Sinatra::Base } end - post '/reports' do + post '/report' do report_type = params[:type] report_choice = params[:choice] report_compare = params[:compare] diff --git a/src/routes/result.rb b/src/routes/result.rb index 4331ebc..5d488f3 100644 --- a/src/routes/result.rb +++ b/src/routes/result.rb @@ -3,25 +3,6 @@ # /result routes class GameData < Sinatra::Base - get '/result' do - results = Result.reverse(:updated_at).limit(10).all() - - erb :'result/index', locals: { - title: 'List of Results', - results: results - } - end - - get '/result/add' do - hardware = Hardware.all() - benchmarks = Benchmark.all() - - erb :'result/add', locals: { - title: 'Add Result', - hardware: hardware, - benchmarks: benchmarks - } - end post '/result/add' do result_minimum = params[:result_minimum] if params.key?(:result_minimum) result_maximum = params[:result_maximum] if params.key?(:result_maximum) diff --git a/views/benchmark/add.erb b/views/benchmark/add.erb index 6929f6c..a6014b2 100644 --- a/views/benchmark/add.erb +++ b/views/benchmark/add.erb @@ -1,43 +1,36 @@ -
-
+
+

Add new benchmark

-
+
-
-
-
- + +
+
+ +
-
- +
+ +
-
-
- +
+
+ +
-
-
- -
-
+
diff --git a/views/benchmark/edit.erb b/views/benchmark/edit.erb index d149549..07d0946 100644 --- a/views/benchmark/edit.erb +++ b/views/benchmark/edit.erb @@ -1,43 +1,36 @@ -
-
+
+

Editing: <%= benchmark.name %>

-
+
-
-
- +
+
+ +
-
- +
+ +
-
-
- +
+
+ +
-
-
- -
-
+
diff --git a/views/benchmark/index.erb b/views/benchmark/index.erb index 8da5cb3..319f7aa 100644 --- a/views/benchmark/index.erb +++ b/views/benchmark/index.erb @@ -1,20 +1,20 @@ -
-
+
+

List of benchmarks

-
+

Add new benchmark

-
+
<% if benchmarks.length > 0 %> -
- - +
+
+ @@ -24,7 +24,7 @@ <% benchmarks.each do |b| %> - @@ -33,7 +33,7 @@
Benchmark name Scoring type
<%= b.name %> + <%= b.name %> <%= b.scoring %> <%= b.description %>
<% else %> -
+

I'm sorry, there doesn't appear to be any benchmarks added yet. Check again later!

<% end %> diff --git a/views/benchmark/view.erb b/views/benchmark/view.erb index 32add88..7b4dd44 100644 --- a/views/benchmark/view.erb +++ b/views/benchmark/view.erb @@ -1,17 +1,17 @@ -
-
+
+

<%= benchmark.name %>

-
+

Edit

-
+
Benchmark scoring type: <%= benchmark.scoring %>
-
+
Description:

<%= benchmark.description %>

diff --git a/views/hardware/add.erb b/views/hardware/add.erb index f56415f..52d7ba2 100644 --- a/views/hardware/add.erb +++ b/views/hardware/add.erb @@ -1,32 +1,28 @@ -
-
+
+

Add new hardware

-
+
-
-
-
- + +
+
+ +
-
- +
+ +
- +
diff --git a/views/hardware/edit.erb b/views/hardware/edit.erb index de842b3..b4e83cd 100644 --- a/views/hardware/edit.erb +++ b/views/hardware/edit.erb @@ -1,32 +1,28 @@ -
-
-

Editing: <%= hardware.name %>

+
+
+

Add new hardware

-
+
-
-
-
- + +
+
+ +
-
- +
- +
diff --git a/views/hardware/index.erb b/views/hardware/index.erb index a0340d0..13c3950 100644 --- a/views/hardware/index.erb +++ b/views/hardware/index.erb @@ -1,20 +1,20 @@ -
-
+
+

List of hardware

-
+

Add new hardware

-
+
<% if hardware.length > 0 %> -
- - +
+
+ @@ -35,7 +35,7 @@
Hardware name Type
<% else %> -
+

I'm sorry, there doesn't appear to be any hardware added yet. Check again later!

<% end %> diff --git a/views/hardware/view.erb b/views/hardware/view.erb index ed2ec76..041d0b3 100644 --- a/views/hardware/view.erb +++ b/views/hardware/view.erb @@ -1,13 +1,13 @@ -
-
+
+

<%= hardware.name %>

-
+

Edit

-
+
Hardware type: <%= hardware.type %>
diff --git a/views/index/index.erb b/views/index/index.erb index aafc89c..60f7116 100644 --- a/views/index/index.erb +++ b/views/index/index.erb @@ -1,9 +1,10 @@ -
+
<% if tests.length > 0 %> -
+

Latest benchmark results:

-
+ +
@@ -24,7 +25,7 @@
<% else %> -
+

I'm sorry, there don't appear to be any benchmark results logged yet. Check again later!

<% end %> diff --git a/views/layout.erb b/views/layout.erb index c8f5061..fe644d7 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -5,10 +5,10 @@ <%= title %> | Game Data - + - - + + @@ -17,8 +17,11 @@ <%= erb :'partials/navbar', :locals => locals %> -
+
<%= yield %>
+ + + <%= erb :'partials/footer', :locals => locals %> diff --git a/views/partials/footer.erb b/views/partials/footer.erb new file mode 100644 index 0000000..661bf3d --- /dev/null +++ b/views/partials/footer.erb @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/views/partials/navbar.erb b/views/partials/navbar.erb index e29b002..f978df5 100644 --- a/views/partials/navbar.erb +++ b/views/partials/navbar.erb @@ -1,11 +1,29 @@ -