add r.js (still not working, don't worrie)

Author: shulamyt

Diff for: .gitignore

@@ -6,4 +6,5 @@ tmp
 .DS_Store
 .idea
 .npm-debug.log
-app_requir
+app_requir
+target/

Diff for: README.md

@@ -24,6 +24,10 @@ https://github.com/siddii/angular-timer
 https://github.com/EvanHahn/HumanizeDuration.js
 http://momentjs.com/
 https://github.com/fshost/node-dir
+--------------------------------------------------
+build
+r.js -o build.js
+
 
 --------------------------------------------------
 

Diff for: app/app.js

@@ -4,7 +4,7 @@ define([
 	'angularResource',
 	'angularCookies',
 	'checklistModel'
-], function(angular, angularRoute) {
+], function() {
 	angular.module('BreakTheCode', ['ngRoute','ngResource', 'ngCookies', 'timer', 'checklist-model']);
 });
 

Diff for: app/main.js

@@ -25,5 +25,5 @@ define([
 	// 'momentWithLocales',
 	// 'checklistModel'
 ], function() {
-	console.log("shula");
+	console.log("app loaded!");
 });

Diff for: app/routes.js

@@ -2,8 +2,8 @@ define([
 	'angular',
 	'angularRoute',
 	'./app',
-	'../login/loginController',
-	'../questions/questionsController'
+	'login/loginController',
+	'questions/questionsController'
 ], function(app) {
 	angular.module('BreakTheCode').config(function($routeProvider){
 	  $routeProvider

Diff for: build.js

@@ -0,0 +1,16 @@
+({
+    // reusing runtime requireJs config
+    mainConfigFile: "./app/require-config.js",
+    baseUrl: "app",
+    // output directory for optimized project (build)
+    dir: "./target",
+    // do not include combined files in output directory, only the resulting files
+    removeCombined: false,
+    // minification and obfuscation
+    optimize: 
+    "none",
+    // "uglify2"
+
+    // modules to be optimized
+    name: "main"
+})