fixed dependencies in coffeescript files

.gitignore

@@ -7,4 +7,7 @@ target/
 RUNNING_PID
 *.deb
 root_env/
-public/bower_components
+public
+!public/images
+bower_components
+node_modules

app/assets/javascripts/app.coffee

@@ -1,6 +1,3 @@
-### define
-backbone.marionette : Marionette
-###
+Marionette = require("marionette")
 
-window.app = app = new Backbone.Marionette.Application()
-return app
+module.exports = window.app = app = new Marionette.Application()

app/assets/javascripts/config.coffee

@@ -13,15 +13,15 @@ requirejs
     "moment"              : "../bower_components/momentjs/moment"
     "underscore"          : "../bower_components/lodash/dist/lodash"
     "backbone"            : "../bower_components/backbone/backbone"
-    "backbone.marionette" : "../bower_components/backbone.marionette/lib/backbone.marionette"
+    "marionette" : "../bower_components/marionette/lib/marionette"
     "bootstrap"           : "../bower_components/bootstrap/dist/js/bootstrap"
     "datepicker"          : "bootstrap-datepicker"
 
   shim :
     "moment" :
       exports : "moment"
     "bootstrap" : ["jquery"]
-    "backbone.marionette" :
+    "marionette" :
       deps : ["backbone"]
       exports : "Marionette"
     "datepicker" :

app/assets/javascripts/libs/toast.coffee

@@ -1,7 +1,5 @@
-### define
-jquery : $
-bootstrap : Bootstrap
-###
+Bootstrap = require("bootstrap")
+_ = require("underscore")
 
 $.fn.alertWithTimeout = (timeout = 3000) ->
 
@@ -22,7 +20,7 @@ $.fn.alertWithTimeout = (timeout = 3000) ->
     )
     $(window).one "mousemove", -> $this.mouseout()
 
-Toast =
+module.exports = Toast =
 
   message : (type, message, sticky = false) ->
 

app/assets/javascripts/main.coffee

@@ -1,11 +1,10 @@
-### define
-jquery : $
-backbone.marionette : Marionette
-app : app
-router : Router
-bootstrap : bootstrap
-models/settings/user_settings_model : UserSettingsModel
-###
+UserSettingsModel = require("models/settings/user_settings_model")
+Router = require("./router")
+Backbone = require("backbone")
+$ = require("jquery")
+app = require("app")
+require("./vendor/alert")
+require("./vendor/bootstrap-datepicker")
 
 $ ->
 

app/assets/javascripts/marionette.coffee

@@ -0,0 +1,4 @@
+require("backbone.marionette")
+Backbone = require("backbone")
+
+module.exports = Backbone.Marionette

app/assets/javascripts/models/admin/active_repositories_collection.coffee

@@ -1,9 +1,7 @@
-### define
-underscore : _
-backbone : Backbone
-###
+Backbone = require("backbone")
 
 class ActiveRepositoriesCollection extends Backbone.Collection
 
   url : "/api/repos"
 
+module.exports = ActiveRepositoriesCollection

app/assets/javascripts/models/admin/available_repositories_collection.coffee

@@ -1,9 +1,7 @@
-### define
-underscore : _
-backbone : Backbone
-###
+Backbone = require("backbone")
 
 class AvailableRepositoriesCollection extends Backbone.Collection
 
   url : "/api/user/repos"
 
+module.exports = AvailableRepositoriesCollection

app/assets/javascripts/models/admin/billing_rates_collection.coffee

@@ -1,7 +1,4 @@
-### define
-underscore : _
-backbone : Backbone
-###
+Backbone = require("backbone")
 
 class BillingRatesCollection extends Backbone.Collection
 
@@ -11,3 +8,5 @@ class BillingRatesCollection extends Backbone.Collection
     # $.ajax or Backbone.Model.fetch ....
     data = [{project: "ABC", rate: 20}, {project: "Test", rate: 40}]
     super(data)
+
+module.exports = BillingRatesCollection

app/assets/javascripts/models/log/log_time_model.coffee

@@ -1,8 +1,6 @@
-### define
-underscore : _
-backbone: backbone
-moment: moment
-###
+_ = require("underscore")
+Backbone = require("backbone")
+moment = require("moment")
 
 class LogTimeModel extends Backbone.Model
 
@@ -23,3 +21,4 @@ class LogTimeModel extends Backbone.Model
         issueNumber : issueNumber
       )
 
+module.exports = LogTimeModel

app/assets/javascripts/models/log/repository_model.coffee

@@ -1,9 +1,8 @@
-### define
-underscore : _
-backbone : backbone
-###
+Backbone = require("backbone")
 
 class RepositoryModel extends Backbone.Model
 
   url : ->
     "/api/repos/#{@get("id")}"
+
+module.exports = RepositoryModel

app/assets/javascripts/models/project/project_viewmodel.coffee

@@ -1,10 +1,9 @@
-### define
-backbone : Backbone
-moment : moment
-utils: Utils
-models/team_time_collection : TeamTimeCollection
-models/viewmodel : ViewModel
-###
+Backbone = require("backbone")
+moment = require("moment")
+Utils = require("utils")
+TeamTimeCollection = require("models/team_time_collection")
+ViewModel = require("models/viewmodel")
+_ = require("underscore")
 
 # #############
 # Project ViewModel
@@ -85,4 +84,4 @@ class ProjectViewModel extends ViewModel
       )
     )
 
-
+module.exports = ProjectViewModel

app/assets/javascripts/models/settings/user_settings_model.coffee

@@ -1,7 +1,5 @@
-### define
-backbone : Backbone
-utils : Utils
-###
+Utils = require("utils")
+Backbone = require("backbone")
 
 class UserSettingsModel extends Backbone.Model
 
@@ -11,3 +9,4 @@ class UserSettingsModel extends Backbone.Model
 
   url : "/api/user/settings"
 
+module.exports = UserSettingsModel

app/assets/javascripts/models/team/team_viewmodel.coffee

@@ -1,11 +1,9 @@
-### define
-underscore : _
-backbone : Backbone
-moment : moment
-utils: Utils
-models/team_time_collection : TeamTimeCollection
-models/viewmodel : ViewModel
-###
+_ = require("underscore")
+Backbone = require("backbone")
+moment = require("moment")
+Utils = require("utils")
+TeamTimeCollection = require("models/team_time_collection")
+ViewModel = require("models/viewmodel")
 
 # #############
 # Team ViewModel
@@ -81,5 +79,5 @@ class TeamViewModel extends ViewModel
       )
     )
 
-
+module.exports = TeamViewModel
 

app/assets/javascripts/models/team_time_collection.coffee

@@ -1,8 +1,6 @@
-### define
-backbone : backbone
-moment : moment
-utils : Utils
-###
+Utils = require("utils")
+Backbone = require("backbone")
+moment = require("moment")
 
 class TeamTimeCollection extends Backbone.Collection
 
@@ -33,3 +31,5 @@ class TeamTimeCollection extends Backbone.Collection
               return sumTotal
         , 0)
     )
+
+module.exports = TeamTimeCollection

app/assets/javascripts/models/user/user_viewmodel.coffee

@@ -1,10 +1,9 @@
-### define
-backbone : backbone
-moment : moment
-utils : Utils
-models/user_time_collection : UserTimeCollection
-models/viewmodel : ViewModel
-###
+ViewModel = require("models/viewmodel")
+UserTimeCollection = require("models/user_time_collection")
+Backbone = require("backbone")
+moment = require("moment")
+Utils = require("utils")
+_ = require("underscore")
 
 # #############
 # User ViewModel
@@ -87,4 +86,4 @@ class UserViewModel extends ViewModel
       )
     )
 
-
+module.exports = UserViewModel

app/assets/javascripts/models/user_time_collection.coffee

@@ -1,8 +1,6 @@
-### define
-backbone : backbone
-moment : moment
-utils : Utils
-###
+Backbone = require("backbone")
+Utils = require("utils")
+moment = require("moment")
 
 class UserTimeCollection extends Backbone.Collection
 
@@ -33,3 +31,5 @@ class UserTimeCollection extends Backbone.Collection
               return sumTotal
         , 0)
     )
+
+module.exports = UserTimeCollection

app/assets/javascripts/models/users_collection.coffee

@@ -1,7 +1,4 @@
-### define
-underscore : _
-backbone : backbone
-###
+Backbone = require("backbone")
 
 class UsersCollection extends Backbone.Collection
 
@@ -20,4 +17,6 @@ class UsersCollection extends Backbone.Collection
       return user.get("githubLogin")
     else
       #in rare cases user could be delete from the server
-      "<Deleted User>"
+      "<Deleted User>"
+
+module.exports = UsersCollection

app/assets/javascripts/models/viewmodel.coffee

@@ -1,10 +1,6 @@
-### define
-underscore : _
-jquery : $
-backbone : Backbone
-moment : moment
-models/users_collection : UsersCollection
-###
+Backbone = require("backbone")
+UsersCollection = require("models/users_collection")
+moment = require("moment")
 
 class ViewModel extends Backbone.Model
 
@@ -31,4 +27,6 @@ class ViewModel extends Backbone.Model
         }
         @transformData()
         @trigger("sync", @)
-    )
+    )
+
+module.exports = ViewModel

app/assets/javascripts/router.coffee

@@ -1,19 +1,17 @@
-### define
-underscore : _
-backbone : Backbone
-views/report_view  : ReportView
-views/spinner_view  : SpinnerView
-views/admin/admin_panel_view  : AdminPanelView
-views/month_picker_view : MonthPickerView
-views/log/log_time_local_view  : LogTimeLocalView
-views/log/log_time_github_view  : LogTimeGithubView
-views/settings/user_settings_view  : UserSettingsView
-models/team/team_viewmodel : TeamViewModel
-models/project/project_viewmodel : ProjectViewModel
-models/user/user_viewmodel : UserViewModel
-models/settings/user_settings_model : UserSettingsModel
-models/log/log_time_model : LogTimeModel
-###
+LogTimeModel = require("models/log/log_time_model")
+ProjectViewModel = require("models/project/project_viewmodel")
+UserViewModel = require("models/user/user_viewmodel")
+TeamViewModel = require("models/team/team_viewmodel")
+LogTimeLocalView = require("views/log/log_time_local_view")
+LogTimeGithubView = require("views/log/log_time_github_view")
+AdminPanelView = require("views/admin/admin_panel_view")
+UserSettingsView = require("views/settings/user_settings_view")
+SpinnerView = require("views/spinner_view")
+MonthPickerView = require("views/month_picker_view")
+ReportView = require("views/report_view")
+Backbone = require("backbone")
+app = require("app")
+_ = require("underscore")
 
 class Router extends Backbone.Router
 
@@ -206,3 +204,5 @@ class Router extends Backbone.Router
 
     super(callback, args.map( (a) -> a or undefined ))
     return
+
+module.exports = Router

app/assets/javascripts/utils.coffee

@@ -1,8 +1,6 @@
-### define
-underscore : _
-###
+_ = require("underscore")
 
-Utils =
+module.exports = Utils =
 
   zeroPad : (number, digits = 2) ->