weight-recorder 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 675171b9d1a15a19c2fad53ec54d99ab5621e729
-  data.tar.gz: e2480e90f74f880db2773215f615f9e593dd9f74
+  metadata.gz: 877da1c39f46b47849815309a9b92379a6489cbd
+  data.tar.gz: 19ed5f3143e47d7c055ec05a205fa41cddc9abcc
 SHA512:
-  metadata.gz: b0f41879966bafc7bc242b40b5c32d9e989a7b48803423e34605523dfec67a5ef05cb6f189c8bf0d51ff5a6331d9aa18b653aeb7ac7b789a23555b97c80cc6ea
-  data.tar.gz: 326879e3756a7af61f6236272712ea8758eb30f7f5200524347483b34cc1a1e4bf6a4e690655d90111d42ffca1a1dae3ff04aae50c950b3f5327a9f8c3912921
+  metadata.gz: 365f6b7df0047810ea16234d62c8691fada29fd58b418a7ece19f1707b8438086745a9a05950f8e0a0eb5a5dde5f6bf8089aa4d360c17501f7bb837029f39638
+  data.tar.gz: 1f86ec64faf7dde1bf1ea84904071ddcdaa2abc60eec62c76febaba5002be3c50b7fb70422109fb936f0d3d53a7492671c4f329ab1564a7c1d71f4f6cd470f10

data/lib/application.rb

@@ -23,7 +23,7 @@ module Recorder
     end
 
     get '/' do
-      redirect 'data'
+      redirect 'chart'
     end
 
     get '/data' do
@@ -82,6 +82,7 @@ module Recorder
 
     get '/chart' do
       @weight_options = {min: 84, max: 90}
+      @bodyfat_options = {min: 15, max: 30}
       @weight_data,@bodyfat_data = get_data
       haml :chart
     end

data/lib/recorder/db.rb

@@ -5,12 +5,8 @@ require 'active_record'
 
 module Recorder
 
-  # データベースへの接続処理を扱うモジュール
-  # @author sugamasao
   module DB
 
-    #データベースへの接続とテーブルの作成を行う
-    # @return [void]
     def self.prepare
       database_path = File.join(ENV['HOME'], '.recorder','recorder.sqlite3')
 

data/lib/recorder/version.rb

@@ -1,3 +1,3 @@
 module Recorder
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/views/#layout.haml#

@@ -0,0 +1,17 @@
+!!!
+%html
+  %head
+    %meta(charset='utf-8')
+    %meta(name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1,user-scalable=no")
+    %title Weight Recorder
+    /%link(href='/css/bootstrap.min.css' rel='stylesheet' type='text/css')
+    %link(rel='stylesheet' type='text/css'){href: uri('css/bootstrap.min.css')}
+
+                %a(class="glyphicon glyphicon-plus-sign" href='data/new') new
+          %button{class: ('btn btn-default navbar-btn')}
+            %a(class="glyphicon glyphicon-asterisk" href='chart') chart
+            %a(class="glyphicon glyphicon-asterisk" href='data') data
+          %button{class: ('btn btn-default navbar-btn')}
+
+      .container
+        !=yield

data/lib/views/chart.haml

@@ -1,8 +1,5 @@
-%h1 Charts
-
-%div
-  %a{href: uri('/')} List
+%h2 Total Charts
 
 %p
   != line_chart @weight_data, @weight_options
-  != line_chart @bodyfat_data
+  != line_chart @bodyfat_data, @bodyfat_options

data/lib/views/index.haml

@@ -18,14 +18,15 @@
         %td= d.date
         %td= d.created_at.strftime('%Y/%m/%d %H:%M')
         %td
-          %a{href: uri("/data/#{d.id}/edit")} Edit
+          %button{class: ('btn btn-default navbar-btn')}
+            %a(class="glyphicon glyphicon-edit"){href: uri("/data/#{d.id}/edit")} edit
         %td
           %form.form-inline(method='post'){action: uri("/data/#{d.id}")}
             %input(name='_method' type='hidden' value='delete')
             .form-group
-              %button(class='btn btn-default')
-                %a(class='glyphicon glyphicon-minus-sign')
-                  %a(type='submit' onclick='return confirm("Delete data?")') Delete
+              %button(class='btn btn-default navbar-btn')
+                %a(class='glyphicon glyphicon-trash')
+                  %a(type='submit' onclick='return confirm("Delete data?")') delete
 
 
 

data/lib/views/layout.haml

@@ -13,11 +13,14 @@
     %nav.navbar.navbar-default
       .container-fluid
         .navbar-header
-          %a.navbar-brand{href: uri('/data')} Weight Recorder
+          /%a.navbar-brand{href: uri('/data')} Weight Recorder
+          %a.navbar-brand Bob's weight
           %button{class: ('btn btn-default navbar-btn')}
-            %a(class="glyphicon glyphicon-plus-sign" href='data/new') new
+            %a(class="glyphicon glyphicon-pencil"){href: uri('data/new')} new
           %button{class: ('btn btn-default navbar-btn')}
-            %a(class="glyphicon glyphicon-plus-sign" href='chart') chart
+            %a(class="glyphicon glyphicon-picture"){href: uri('chart')} chart
+          %button{class: ('btn btn-default navbar-btn')}
+            %a(class="glyphicon glyphicon-th-list"){href: uri('data')} data
 
       .container
         !=yield

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weight-recorder
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Shigeto R. Nishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -196,6 +196,7 @@ files:
 - lib/recorder/data.rb
 - lib/recorder/db.rb
 - lib/recorder/version.rb
+- lib/views/#layout.haml#
 - lib/views/_errors.haml
 - lib/views/_form.haml
 - lib/views/chart.haml