Merge pull request #16 from rox163/master

comsume frost-core. update ember imports

addon/components/frost-login/component.js

@@ -3,7 +3,9 @@ import layout from '../../templates/components/frost-login'
 import {default as loginFormModel} from './form-model'
 import {default as loginFormView} from './form-view'
 
-export default Ember.Component.extend({
+const {Component, computed} = Ember
+
+export default Component.extend({
   layout: layout,
   classNames: ['frost-login'],
 
@@ -15,9 +17,9 @@ export default Ember.Component.extend({
     form: {form: true},
     actions: {actions: true}
   },
-  hasError: Ember.computed.notEmpty('error'),
+  hasError: computed.notEmpty('error'),
 
-  _product: Ember.computed('product', function () {
+  _product: computed('product', function () {
     if (this.get('product')) {
       return this.get('product').toUpperCase()
     }
@@ -26,7 +28,7 @@ export default Ember.Component.extend({
 
   didInsertElement () {
     // Fetch a list of all login input fields
-    let loginInputFields = this.$('.login input')
+    let loginInputFields = this.$('.frost-bunsen-form input')
 
     // Auto-focus the first empty login input field
     loginInputFields.each(function () {
@@ -40,7 +42,7 @@ export default Ember.Component.extend({
     loginInputFields.keypress((e) => {
       if (e.which === 13) {
         this.send('submitLogin')      // send an action to the local submitLogin handler
-        this.sendAction('on-enter')  // send an action to custom forms
+        this.sendAction('onEnter')  // send an action to custom forms
       }
     })
   },
@@ -50,13 +52,13 @@ export default Ember.Component.extend({
       this.set('loginFormValue', value)
     },
 
-    onValidation (e) {
+    onValidationHandler (e) {
       this.set('valid', e.valid)
     },
 
     submitLogin: function () {
       let data = this.get('loginFormValue')
-      this.sendAction('on-submit', data)
+      this.sendAction('onSubmit', data)
       this.set('loginFormValue', {})
     }
   }

addon/styles/addon.scss

@@ -1,4 +1,4 @@
-@import 'node_modules/ember-frost-theme/scss/frost-theme';
+@import 'node_modules/ember-frost-core/addon/styles/frost-theme';
 
 $frost-login-width: 500px;
 $frost-login-separator-width: 5px;

addon/templates/components/frost-login.hbs

@@ -26,15 +26,15 @@
   {{else}}
     {{frost-bunsen-form
       model=loginFormModel
-      on-change=(action "loginFormValueChanged")
-      on-validation=(action 'onValidation')
+      onChange=(action "loginFormValueChanged")
+      onValidation=(action 'onValidationHandler')
       view=loginFormView
     }}
     <div class="submission-error">{{error}}</div>
     <div class="footer">
       {{frost-button
         disabled=(not valid)
-        on-click=(action "submitLogin")
+        onClick=(action "submitLogin")
         priority="primary"
         size="medium"
         text="Log in"

blueprints/ember-frost-login/index.js

@@ -11,9 +11,7 @@ module.exports = {
   afterInstall: function () {
     return this.addAddonsToProject({
       packages: [
-        {name: 'ember-frost-theme', target: '^1.3.1'},
-        {name: 'ember-frost-icons', target: '^1.4.0'},
-        {name: 'ember-frost-bunsen', target: '^2.1.5'}
+        {name: 'ember-frost-core', target: '>=0.0.14 <2.0.0'}
       ]
     })
   }

ember-cli-build.js

@@ -8,12 +8,6 @@ module.exports = function (defaults) {
     },
     'ember-cli-mocha': {
       useLintTree: false
-    },
-    sassOptions: {
-      includePaths: [
-        'node_modules/ember-frost-css-core/scss/frost-core',
-        'node_modules/ember-frost-theme/scss'
-      ]
     }
   })
 

package.json

@@ -37,15 +37,8 @@
     "ember-data": "~2.3.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.4",
-    "ember-frost-bunsen": "^2.1.5",
-    "ember-frost-button": "^1.4.1",
-    "ember-frost-checkbox": "^1.1.1",
-    "ember-frost-css-core": "^1.1.3",
-    "ember-frost-icons": "^1.4.0",
-    "ember-frost-link": "^1.0.0",
-    "ember-frost-select": "^1.3.1",
-    "ember-frost-text": "^1.3.0",
-    "ember-frost-theme": "^1.3.1",
+    "ember-frost-bunsen": "^3.1.0",
+    "ember-frost-core": ">=0.0.14 <2.0.0",
     "ember-load-initializers": "^0.5.0",
     "ember-lodash": "~0.0.6",
     "ember-resolver": "^2.0.3",
@@ -70,4 +63,4 @@
   "ember-addon": {
     "configPath": "tests/dummy/config"
   }
-}
+}

tests/dummy/app/pods/custom-login/controller.js

@@ -1,7 +1,9 @@
 import Ember from 'ember'
 import {default as loginFormModel} from './model'
 
-export default Ember.Controller.extend({
+const {Controller} = Ember
+
+export default Controller.extend({
   loginFormModel,
   valid: false,
 
@@ -10,15 +12,16 @@ export default Ember.Controller.extend({
       this.set('loginFormValue', value)
     },
 
-    onValidation (e) {
+    onValidationHandler (e) {
       this.set('valid', e.valid)
     },
 
-    submitLogin: function () {
+    submitLogin () {
       let data = this.get('loginFormValue')
       this.notifications.addNotification({
-        message: 'server: ' + data.server + ', username: ' + data.username +
-          ', password: ' + data.password + ', rememberme: ' + data.rememberMe,
+        message: 'username: ' + data.username +
+          ', password: ' + data.password + ', rememberme: ' + data.rememberMe +
+          ', server: ' + data.server,
         type: 'success',
         autoClear: true,
         clearDuration: 2000

tests/dummy/app/pods/custom-login/template.hbs

@@ -1,19 +1,19 @@
-{{#frost-login logo='' brandingStrip='' on-enter='submitLogin' as |section|}}
+{{#frost-login logo='' brandingStrip='' onEnter='submitLogin' as |section|}}
   {{#if section.form}}
   {{frost-bunsen-form
     model=loginFormModel
-    on-change=(action "loginFormValueChanged")
-    on-validation=(action 'onValidation')
+    onChange=(action 'loginFormValueChanged')
+    onValidation=(action 'onValidationHandler')
     value=loginFormValue
   }}
   {{/if}}
   {{#if section.actions}}
     {{frost-button
       disabled=(not valid)
-      on-click=(action "submitLogin")
-      priority="primary"
-      size="medium"
-      text="Login"
+      onClick=(action 'submitLogin')
+      priority='primary'
+      size='medium'
+      text='Login'
     }}
   {{/if}}
 {{/frost-login}}

tests/dummy/app/pods/demo/controller.js

@@ -1,4 +1,5 @@
 import Ember from 'ember'
+const {Controller} = Ember
 
-export default Ember.Controller.extend({
+export default Controller.extend({
 })

tests/dummy/app/pods/demo/template.hbs

@@ -1,5 +1,7 @@
 <div class="dummy-header">
-  {{#frost-link 'custom-login' class='medium secondary'}}
+  {{#frost-link 'custom-login'
+    priority='secondary'
+    size='medium'}}
       Custom login form
   {{/frost-link}}
 </div>

tests/dummy/app/styles/app.scss

@@ -1,5 +1,5 @@
-@import 'node_modules/ember-frost-css-core/scss/frost-core';
-@import 'frost-theme';
+@import 'node_modules/ember-frost-core/addon/styles/frost-theme';
+@import 'node_modules/ember-frost-core/addon/styles/frost-app';
 
 .dummy-body {
   margin-left: 20px;