From 03e5604929424b18d68f4886bbbb4cb962671e05 Mon Sep 17 00:00:00 2001 From: Prabin Varma Date: Fri, 4 Apr 2014 12:36:13 -0500 Subject: [PATCH 1/2] Fixed dist build issues --- app/scripts/app.js | 3 ++- app/scripts/services/api-endpoint.js | 4 +--- app/scripts/services/api-provider.js | 9 +++------ config/env/prod.json | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/app/scripts/app.js b/app/scripts/app.js index 7365bd7..e0001e2 100644 --- a/app/scripts/app.js +++ b/app/scripts/app.js @@ -19,6 +19,7 @@ angular.module('volusionApp') $stateProvider, $urlRouterProvider, $locationProvider, + $injector, apiProvider, translateProvider, config) { @@ -39,7 +40,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 index acb2f32..59ec180 100644 --- 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 index 27b3ae3..e129a9e 100644 --- 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/config/env/prod.json b/config/env/prod.json index 2cfec95..268d74e 100644 --- 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" } } From 33f6aec9877bb5c5073c59bb9d9c82ecab8c19db Mon Sep 17 00:00:00 2001 From: Jed Mao Date: Fri, 4 Apr 2014 15:00:55 -0500 Subject: [PATCH 2/2] Remove container from i18n view --- app/views/about.html | 4 +- app/views/contact.html | 4 +- app/views/home.html | 4 +- app/views/i18n.html | 2 +- app/views/style-guide.html | 528 +++++++++++++++++++------------------ 5 files changed, 275 insertions(+), 267 deletions(-) diff --git a/app/views/about.html b/app/views/about.html index d21bf89..9954691 100644 --- a/app/views/about.html +++ b/app/views/about.html @@ -1 +1,3 @@ -

This is the about view.

+
+

This is the about view.

+
diff --git a/app/views/contact.html b/app/views/contact.html index 053f7a9..397b845 100644 --- a/app/views/contact.html +++ b/app/views/contact.html @@ -1 +1,3 @@ -

This is the contact view.

+
+

This is the contact view.

+
diff --git a/app/views/home.html b/app/views/home.html index 33c8572..dc709f8 100644 --- a/app/views/home.html +++ b/app/views/home.html @@ -1 +1,3 @@ -

This is the home view.

+
+

This is the home view.

+
diff --git a/app/views/i18n.html b/app/views/i18n.html index 45b4527..7c5a029 100644 --- a/app/views/i18n.html +++ b/app/views/i18n.html @@ -1 +1 @@ -
+
diff --git a/app/views/style-guide.html b/app/views/style-guide.html index 1148f35..dd74968 100644 --- a/app/views/style-guide.html +++ b/app/views/style-guide.html @@ -1,301 +1,303 @@ - -
-

Hello, world!

-

This is a template for a simple marketing or informational website. It includes a large callout called a jumbotron and three supporting pieces of content. Use it as a starting point to create something more unique.

-

»

-
+
+ +
+

Hello, world!

+

This is a template for a simple marketing or informational website. It includes a large callout called a jumbotron and three supporting pieces of content. Use it as a starting point to create something more unique.

+

»

+
-
-

-
-

- - - - - - - -

-

- - - - - - - -

-

- - - - - - - -

-

- - - - - - - -

+
+

+
+

+ + + + + + + +

+

+ + + + + + + +

+

+ + + + + + + +

+

+ + + + + + + +

-
-

Thumbnails

-
-200x200 +
+

Thumbnails

+
+ 200x200 -
-

Dropdown menus

-
-
- Dropdown - -
+
+

Dropdown menus

+
+
+ Dropdown + +
-
-

Navbars

-
+
+

Navbars

+
-
-
-
- - Project name +
+
+
+ + Project name +
+
+ +
-
- -
-
-
-
-
- - Project name +
+
+
+ + Project name +
+
+ +
-
- -
-
-
-

Alerts

-
-
- Well done! You successfully read this important alert message. -
-
- Heads up! This alert needs your attention, but it's not super important. -
-
- Warning! Best check yo self, you're not looking too good. -
-
- Oh snap! Change a few things up and try submitting again. -
+
+

Alerts

+
+
+ Well done! You successfully read this important alert message. +
+
+ Heads up! This alert needs your attention, but it's not super important. +
+
+ Warning! Best check yo self, you're not looking too good. +
+
+ Oh snap! Change a few things up and try submitting again. +
-
-

Progress bars

-
-
-
60% Complete
-
-
-
40% Complete (success)
-
-
-
20% Complete
-
-
-
60% Complete (warning)
-
-
-
80% Complete (danger)
-
-
-
35% Complete (success)
-
20% Complete (warning)
-
10% Complete (danger)
-
+
+

Progress bars

+
+
+
60% Complete
+
+
+
40% Complete (success)
+
+
+
20% Complete
+
+
+
60% Complete (warning)
+
+
+
80% Complete (danger)
+
+
+
35% Complete (success)
+
20% Complete (warning)
+
10% Complete (danger)
+
-
-

List groups

-
-
-
-
    -
  • Cras justo odio
    • -
  • Dapibus ac facilisis in
    • -
  • Morbi leo risus
    • -
  • Porta ac consectetur ac
    • -
  • Vestibulum at eros
    • -
-
-
-
- - Cras justo odio - - Dapibus ac facilisis in - Morbi leo risus - Porta ac consectetur ac - Vestibulum at eros -
-
-
-
- -

List group item heading

-

Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

- - -

List group item heading

-

Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

- - -

List group item heading

-

Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

- -
-
-
+
+

List groups

+
+
+
+
    +
  • Cras justo odio
    • +
  • Dapibus ac facilisis in
    • +
  • Morbi leo risus
    • +
  • Porta ac consectetur ac
    • +
  • Vestibulum at eros
    • +
+
+
+
+ + Cras justo odio + + Dapibus ac facilisis in + Morbi leo risus + Porta ac consectetur ac + Vestibulum at eros +
+
+
+
+ +

List group item heading

+

Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

+ + +

List group item heading

+

Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

+ + +

List group item heading

+

Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

+ +
+
+
-
-

Panels

-
-
-
-
-
-

Panel title

-
-
- Panel content -
-
-
-
-

Panel title

-
-
- Panel content -
-
-
-
-
-
-

Panel title

-
-
- Panel content +
+

Panels

+
+
+
+
+
+

Panel title

+
+
+ Panel content +
-
-
-
-

Panel title

+
+
+

Panel title

+
+
+ Panel content +
-
- Panel content +
+
+
+
+

Panel title

+
+
+ Panel content +
-
-
-
-
-
-

Panel title

+
+
+

Panel title

+
+
+ Panel content +
-
- Panel content +
+
+
+
+

Panel title

+
+
+ Panel content +
-
-
-
-

Panel title

+
+
+

Panel title

+
+
+ Panel content +
-
- Panel content -
-
-
-
+
+
-
-

Wells

-
-
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas sed diam eget risus varius blandit sit amet non magna. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Cras mattis consectetur purus sit amet fermentum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Aenean lacinia bibendum nulla sed consectetur.

-
+
+

Wells

+
+
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas sed diam eget risus varius blandit sit amet non magna. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Cras mattis consectetur purus sit amet fermentum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Aenean lacinia bibendum nulla sed consectetur.

+
+