grunt build:dev working

epfremmer · Feb 16, 2014 · d7dfa03 · d7dfa03
1 parent 171517d
commit d7dfa03
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 31 deletions.
diff --git a/src/app/modules/home/HomeController.js b/src/app/modules/home/HomeController.js
@@ -8,10 +8,9 @@ define(/** @lends HomeController */function(require) {
         /**
          * @constructor
          * @param {$log} Angular's wrapper for window.console.log
-         * @param {$alert} Angular's wrapper for window.alert
          */
-        function($log, $alert) {
-            $log($alert);
+        function($log) {
+            $log.info('application is running!');
         }
     );
 

diff --git a/src/app/modules/home/HomeModule.js b/src/app/modules/home/HomeModule.js
@@ -9,12 +9,12 @@ define(/** @lends HomeModule */function(require) {
     'use strict';
 
     var ng = require('angular');
+    require('angular-route');
 
     /**
      * @requires HomeController
      */
     var homeControllerTemplate = require('text!./HomeControllerTemplate.html');
-    require('./HomeController');
 
     /**
      * @namespace {ng.Module} HomeModule

diff --git a/src/app/requireConfigSettings.js b/src/app/requireConfigSettings.js
@@ -10,16 +10,18 @@ require.config({
 
     // shim settings for files that are not AMD compliant
     // this tells require.js how to handle non-modular files
-    angular: {
-        exports: 'angular'/*,
-        // only use jquery if you have an absolute need to do so
-        // don't forget to add it to bower and the paths config above
-        deps: ['jquery'] */
-    },
-    'angular-route': {
-        deps: ['angular']
-    },
-    'angular-bindonce': {
-        deps: ['angular']
-    },
+    shim: {
+        angular: {
+            exports: 'angular'/*,
+            // only use jquery if you have an absolute need to do so
+            // don't forget to add it to bower and the paths config above
+            deps: ['jquery'] */
+        },
+        'angular-route': {
+            deps: ['angular']
+        },
+        'angular-bindonce': {
+            deps: ['angular']
+        }
+    }
 });
diff --git a/www/index.html b/www/index.html
@@ -18,25 +18,13 @@
     <!-- build:css assets/styles/screen.css -->
     <!-- bower:css -->
     <!-- endbower -->
-    <link rel="stylesheet" media="screen, projection" href="assets/styles/screen.css" />
+    <link rel="stylesheet" media="screen, projection" href="css/screen.css" />
     <!-- endbuild -->
 </head>
 <body>
     <!-- CONTENT -->
-    <div class="site">
-        <div class="site-hd" role="banner">
-            <h1 class="brand">
-                <a href="//www.example.com">CLIENT.Project</a>
-            </h1>
-        </div> <!-- /site-hd -->
+    <div data-ng-view>
 
-        <div class="site-bd" role="main">
-
-        </div> <!-- /site-bd -->
-
-        <div class="site-ft" role="contentinfo">
-            <p><small>&copy;2014</small></p>
-        </div> <!-- /site-ft -->
     </div> <!-- /site -->
 
     <!-- JAVASCRIPT -->
@@ -101,7 +89,7 @@ <h1 class="brand">
          * @type String
          * @final
          */
-        SETTINGS.SCRIPT_PATH = 'assets/scripts/';
+        SETTINGS.SCRIPT_PATH = 'js/';
 
         /**
          * Set any RequireJs configuration that is dependent on dynamic