Merge pull request #23 from clevertech/feature/auth

feat(auth), arch(requirejs)
CleverStack · Aug 7, 2013 · 950a999 · 950a999
2 parents 917d2bb + a08388e
commit 950a999
Show file tree

Hide file tree

Showing 25 changed files with 1,078 additions and 886 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,6 @@ dist
 app/components
 test-results.xml
 .DS_Store
-docs/*
+docs/*
+libpeerconnection.log
+*.jar
diff --git a/app/index.html b/app/index.html
@@ -2,21 +2,30 @@
 <!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
 <!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
 <!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" ng-app="app"> <!--<![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>Title</title>
+    <title>ngSeed</title>
+    <base href="/">
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0">
     <meta name="apple-mobile-web-app-capable" content="yes">
 
     <!-- build:css styles/screen.css -->
-    <link rel="stylesheet" href="styles/screen.css">
+    <link rel="stylesheet" href="styles/bootstrap.css">
+    <link rel="stylesheet" href="styles/application.css">
     <!-- endbuild -->
 
   </head>
   <body>
+    <div class="navbar">
+      <a class="navbar-brand" href="#">ngSeed</a>
+      <ul class="nav navbar-nav">
+        <li><a href="/users">Users</a></li>
+      </ul>
+    </div>
+
     <!--[if lt IE 7]>
       <p class="chromeframe">You are using an outdated browser. <a href="http://browsehappy.com/">Upgrade your browser today</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to better experience this site.</p>
     <![endif]-->
@@ -30,21 +39,7 @@
     <div class="container" ng-view></div>
 
     <!-- build:js scripts/scripts.js -->
-    <script src="components/underscore/underscore.js"></script>
-    <script src="components/async/lib/async.js"></script>
-    <script src="components/angular-unstable/angular.js"></script>
-    <script src="components/angular-resource-unstable/angular-resource.js"></script>
-    <script src="components/angular-http-auth/src/http-auth-interceptor.js"></script>
-
-    <script src="scripts/init.js"></script>
-    <script src="scripts/routes.js"></script>
-    <script src="scripts/controllers/home.js"></script>
-    <script src="scripts/directives/string-to-number.js"></script>
-    <script src="scripts/services/generic.js"></script>
-    <script src="scripts/services/session.js"></script>
-    <script src="scripts/services/http-options.js"></script>
-    <script src="scripts/services/country-list.js"></script>
-    <script src="scripts/filters/starts-with.js"></script>
+    <script data-main="scripts/main" src="components/requirejs/require.js"></script>
     <!-- endbuild -->
 
   </body>

diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -0,0 +1,30 @@
+define(['angular'],function (angular) {
+
+    'use strict';
+
+    var services = angular.module('app.services',
+      [ 'ngResource',
+        'http-auth-interceptor'
+      ]);
+
+    var directives = angular.module('app.directives',
+      [ 
+      ]);
+
+    var filters = angular.module('app.filters',
+      [
+      ]);
+
+    var resources = angular.module('app.resources',
+      [
+      ]);
+
+    var app = angular.module('app',
+      [ 'app.services',
+        'app.directives',
+        'app.filters',
+        'app.resources'
+      ]);
+
+    return app;
+});
diff --git a/app/scripts/config.js b/app/scripts/config.js
@@ -0,0 +1,25 @@
+define(['angular', 'app'], function (angular, app) {
+  'use strict';
+
+  app.config(
+    ['$locationProvider', '$httpProvider', '$authProvider',
+    function ($locationProvider, $httpProvider, $authProvider) {
+
+    $httpProvider.defaults.withCredentials = true;
+    $locationProvider.html5Mode( true );
+  }]);
+
+  // Initialize $auth
+  // app.run(['$auth', '$resourceFactory',
+  // function ($auth, $resourceFactory) {
+    // You can register your resources here
+    // $resourceFactory('Resource#1')
+    // $resourceFactory('Resource#2')
+    // After this, they will be available to be injected
+    // in your controllers like regular services.
+  // }]);
+  // 
+  app.run(['$auth', '$debug', function ($auth, $debug) {
+  }]);
+
+});
diff --git a/app/scripts/controllers.js b/app/scripts/controllers.js
@@ -0,0 +1 @@
+// Empty file
diff --git a/app/scripts/controllers/home.js b/app/scripts/controllers/home.js
@@ -1,13 +1,6 @@
-var app = angular.module('app');
-
-app.controller( 'HomeCtrl',
-  ['$scope',
-  function( $scope ) {
-
-  'use strict';  
-
-  $scope.welcome = 'Hello!';
-
-  $scope.awesomeThings = [1,2,3];
-
-}]);
+define(['app'], function (app) {
+  'use strict';
+  app.controller('Home', ['$scope', function ($scope) {
+    $scope.welcome = "Hello there!";
+  }]);
+});
diff --git a/app/scripts/controllers/login.js b/app/scripts/controllers/login.js
@@ -0,0 +1,17 @@
+define(['app'], function (app) {
+  'use strict';
+
+  app.controller('Login', ['$scope','$auth', function ($scope, $auth) {
+    $scope.login = function () {
+      $auth.login($scope.credentials);
+    }
+
+    $scope.$on('$auth:loginFailure', function (event, data) {
+      console.log("LoginController:",event,data);
+      if(data === '403') {
+        alert('Invalid username/password');
+      } 
+    });
+
+  }]);
+});
diff --git a/app/scripts/controllers/users.js b/app/scripts/controllers/users.js
@@ -0,0 +1,10 @@
+define(['app'], function (app) {
+  'use strict';
+
+  app.controller('Users', ['$scope', '$auth', function ($scope, $auth) {
+
+    $scope.welcome = "This is a private area.";
+
+  }]);
+
+});
diff --git a/app/scripts/directives.js b/app/scripts/directives.js
@@ -0,0 +1 @@
+// Empty file
diff --git a/app/scripts/directives/string-to-number.js b/app/scripts/directives/string-to-number.js
@@ -1,44 +1,47 @@
-var directives = angular.module('ngSeed.directives');
-
-/**
- * @ngdoc directive
- * @name ngSeed.directives:string2number
- * @description
- * Converts a string to a number. Useful in type="number" input
- * elements that bind to a stringified number model.
- */
-directives.directive('string2number', function() {
-
+define(['angular', 'app'], function (angular) {
   'use strict';
 
-  return {
-    restrict: 'A',
-    require: 'ngModel',
-    link: function(scope, element, attr, ngModel) {
+  /**
+   * @ngdoc directive
+   * @name ngSeed.directives:string2number
+   * @description
+   * Converts a string to a number. Useful in type="number" input
+   * elements that bind to a stringified number model.
+   */
+  angular
+    .module('app.directives')
+    .directive('string2number', function() {
+
+      return {
+        restrict: 'A',
+        require: 'ngModel',
+        link: function(scope, element, attr, ngModel) {
+
+          /**
+           * @ngdoc method
+           * @name fromField
+           * @methodOf ngSeed.directives:string2number
+           * @param  {Number, String} number Just the number that has been input.
+           * @return {Number}        The number.
+           */
+          function fromField(number) {
+              return Number(number);
+          }
 
-      /**
-       * @ngdoc method
-       * @name fromField
-       * @methodOf ngSeed.directives:string2number
-       * @param  {Number, String} number Just the number that has been input.
-       * @return {Number}        The number.
-       */
-      function fromField(number) {
-          return Number(number);
-      }
+          /**
+           * @ngdoc method
+           * @name toField
+           * @methodOf ngSeed.directives:string2number
+           * @param  {Number, String} number Just the number that has been input.
+           * @return {Number}        The number or 0.
+           */
+          function toField(text) {
+              return Number(text || 0);
+          }
+          ngModel.$parsers.push(fromField);
+          ngModel.$formatters.push(toField);
+        }
+      };
+  });
 
-      /**
-       * @ngdoc method
-       * @name toField
-       * @methodOf ngSeed.directives:string2number
-       * @param  {Number, String} number Just the number that has been input.
-       * @return {Number}        The number or 0.
-       */
-      function toField(text) {
-          return Number(text || 0);
-      }
-      ngModel.$parsers.push(fromField);
-      ngModel.$formatters.push(toField);
-    }
-  };
 });
diff --git a/app/scripts/filters.js b/app/scripts/filters.js
@@ -0,0 +1 @@
+// Empty file