Merge branch 'theme' into theme-ecomm

volusion-angular-themes · Apr 4, 2014 · bd9b183 · bd9b183
2 parents ba25a80 + 5b0f0fb
commit bd9b183
Show file tree

Hide file tree

Showing 9 changed files with 282 additions and 278 deletions.
diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -19,6 +19,7 @@ angular.module('volusionApp')
     $stateProvider,
     $urlRouterProvider,
     $locationProvider,
+    $injector,
     apiProvider,
     translateProvider,
     config) {
@@ -48,7 +49,7 @@ angular.module('volusionApp')
       $state.go('i18n.home', translateOptions, { location: 'replace' });
     }]);
 
-    $urlRouterProvider.otherwise(function($injector) {
+    $urlRouterProvider.otherwise(function() {
       var $window = $injector.get('$window');
       $window.location.replace('/404.html');
     });

diff --git a/app/scripts/services/api-endpoint.js b/app/scripts/services/api-endpoint.js
@@ -7,12 +7,10 @@
  * @param {string} baseRoute The server api's base route.
  * @param {app.ApiEndpointConfig} endpointConfig Configuration object for the
  *     endpoint.
- * @param {!Object} $injector The angular $injector service.
  * @param {!Function} $resource The angular $resource service.
  */
-var ApiEndpoint = function(baseRoute, endpointConfig, $injector, $resource) {
+var ApiEndpoint = function(baseRoute, endpointConfig, $resource) {
   this.config = endpointConfig;
-  this.$injector = $injector;
   this.resource = $resource(baseRoute + endpointConfig.route, {},
     endpointConfig.actions);
 

diff --git a/app/scripts/services/api-provider.js b/app/scripts/services/api-provider.js
@@ -41,17 +41,14 @@ ApiProvider.prototype.endpoint = function(name) {
 
 // Method for instantiating
 ApiProvider.prototype.$get = [
-  '$injector',
+  '$resource',
   function(
-    $injector) {
+    $resource) {
     var api = {};
 
     var self = this;
     angular.forEach(self.endpoints, function(endpointConfig, name) {
-      api[name] = $injector.instantiate(ApiEndpoint, {
-        baseRoute: self.baseRoute,
-        endpointConfig: endpointConfig
-      });
+      api[name] = new ApiEndpoint(self.baseRoute, endpointConfig, $resource);
     });
 
     return api;

diff --git a/app/views/about.html b/app/views/about.html
@@ -1 +1,3 @@
-<p>This is the about view.</p>
+<section class="container">
+  <p>This is the about view.</p>
+</section>
diff --git a/app/views/contact.html b/app/views/contact.html
@@ -1 +1,3 @@
-<p>This is the contact view.</p>
+<section class="container">
+  <p>This is the contact view.</p>
+</section>
diff --git a/app/views/home.html b/app/views/home.html
@@ -1 +1,3 @@
-<p>This is the home view.</p>
+<section class="container">
+  <p>This is the home view.</p>
+</section>
diff --git a/app/views/i18n.html b/app/views/i18n.html
@@ -1 +1 @@
-<div class="container" data-ui-view=""></div>
+<div data-ui-view=""></div>
diff --git a/app/views/style-guide.html b/app/views/style-guide.html
diff --git a/config/env/prod.json b/config/env/prod.json
@@ -1,5 +1,5 @@
 {
   "config": {
-    "API_URL": "/api/v1"
+    "API_URL": "http://volusion.apiary.io"
   }
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<div class="container" data-ui-view=""></div>
		<div data-ui-view=""></div>