merge

Signed-off-by: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>

app.rb

@@ -5,7 +5,7 @@ require 'bundler'
 
 Bundler.require( :default, ENV[ 'RACK_ENV' ].to_sym )
 
-require_relative './config/options'
+require_relative './options'
 require_relative './lib/ledger'
 
 # Sinatra app serving API

config/options.rb

@@ -1,6 +0,0 @@
-# encoding: utf-8
-
-ENV[ 'LEDGER_FILE' ] ||= '/home/owncloud-data/cycojesus/files/org-files/comptes.ledger'
-
-CURRENCY = '€'
-SEPARATOR = ','

gems.locked

@@ -4,14 +4,15 @@ GEM
     coderay (1.1.2)
     method_source (0.9.0)
     mustermann (1.0.1)
-    pry (0.11.1)
+    pry (0.11.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     puma (3.10.0)
     rack (2.0.3)
     rack-protection (2.0.0)
       rack
-    rake (12.1.0)
+    rack-rewrite (1.5.1)
+    rake (12.2.1)
     sinatra (2.0.0)
       mustermann (~> 1.0)
       rack (~> 2.0)
@@ -25,8 +26,9 @@ PLATFORMS
 DEPENDENCIES
   pry
   puma
+  rack-rewrite
   rake
   sinatra
 
 BUNDLED WITH
-   1.14.3
+   1.14.6

options.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+
+ENV[ 'LEDGER_FILE' ] ||= '/home/nextcloud/data/cycojesus/files/org-files/comptes.ledger'
+
+CURRENCY = '€'
+SEPARATOR = ','

public/app/js/templates/dashboard.html

@@ -10,7 +10,7 @@
                           options="graphiques.monthly_values.options"></nvd3>
                 </md-card>
         </md-card>
-        <h1>{{period | amDateFormat:'MMMM YYYY'}}</h1>
+        <h1 style="text-align: center;">{{period | amDateFormat:'MMMM YYYY'}}</h1>
         <md-card flex="100" layout="column"
                  ng:repeat="bucket in balance.buckets">
             <md-toolbar>

tasks/pry.rake

@@ -2,13 +2,7 @@
 
 ENV['RACK_ENV'] = 'development'
 task :load_config do
-  require 'rubygems'
+  require_relative '../app'
-  require 'bundler'
-
-  Bundler.require( :default, ENV['RACK_ENV'].to_sym )     # require tout les gems définis dans Gemfile
-
-  require_relative '../lib/ledger'
-  require_relative '../config/options'
 end
 
 desc 'Open pry with DB environment setup'