Merge pull request #1 from Authmaker/feature/emberCliUpgrade

Feature/ember cli upgrade
Authmaker · Nov 27, 2015 · 96d3b8f · 96d3b8f
2 parents 0fb85b3 + 65fe4cd
commit 96d3b8f
Show file tree

Hide file tree

Showing 68 changed files with 623 additions and 403 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -18,6 +18,7 @@ indent_style = space
 indent_size = 2
 
 [*.hbs]
+insert_final_newline = false
 indent_style = space
 indent_size = 2
 

diff --git a/.jshintrc b/.jshintrc
@@ -4,8 +4,8 @@
     "window",
     "-Promise"
   ],
-  "browser" : true,
-  "boss" : true,
+  "browser": true,
+  "boss": true,
   "curly": true,
   "debug": false,
   "devel": true,

diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,12 @@
+app/
+bower_components/
+config/
+node_modules/
+public/
+tests/
+vendor/
+tmp/
+bower.json
+testem.json
+Brocfile.js
+ember-cli-build.js
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,7 @@
 ---
 language: node_js
+node_js:
+  - "0.12"
 
 sudo: false
 
@@ -8,6 +10,7 @@ cache:
     - node_modules
 
 before_install:
+  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
   - "npm config set spin false"
   - "npm install -g npm@^2"
 

diff --git a/.watchmanconfig b/.watchmanconfig
@@ -0,0 +1,3 @@
+{
+  "ignore_dirs": ["tmp", "dist"]
+}
diff --git a/Brocfile.js b/Brocfile.js
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Oauthscopesapp
+# authmaker-scopes-app
 
 This README outlines the details of collaborating on this Ember application.
 A short introduction of this app could easily go here.
@@ -50,4 +50,3 @@ Specify what it takes to deploy your app.
 * Development Browser Extensions
   * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
   * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
-
diff --git a/app/adapters/application.js b/app/adapters/application.js
@@ -0,0 +1,5 @@
+import DS from 'ember-data';
+
+export default DS.RESTAdapter.extend({
+    namespace: 'api'
+});
diff --git a/app/app.js b/app/app.js
@@ -3,12 +3,14 @@ import Resolver from 'ember/resolver';
 import loadInitializers from 'ember/load-initializers';
 import config from './config/environment';
 
+let App;
+
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
-var App = Ember.Application.extend({
+App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
-  Resolver: Resolver
+  Resolver
 });
 
 loadInitializers(App, config.modulePrefix);

diff --git a/app/components/blooie-modal.js b/app/components/blooie-modal.js
@@ -4,15 +4,15 @@ export default Ember.Component.extend({
 
   hasBeenInserted: false,
 
-  onDidInsertElement: function() {
+  onDidInsertElement: Ember.on('didInsertElement', function() {
     // Make sure <body> can't scroll
     Ember.$('body').addClass('modal-open');
 
     setTimeout(function() {
       this.set('hasBeenInserted', true);
     }.bind(this), 1);
 
-  }.on('didInsertElement'),
+  }),
 
   transitionEnd: function() {
     if (!this.get('hasBeenInserted')) {

diff --git a/app/controllers/.gitkeep b/app/controllers/.gitkeep
diff --git a/app/helpers/.gitkeep b/app/helpers/.gitkeep
diff --git a/app/index.html b/app/index.html
@@ -3,22 +3,23 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>Blooie</title>
+    <title>Authmaker Scopes App</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <script type="text/javascript" src="//use.typekit.net/eid7zra.js"></script>
-    <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
-
     {{content-for 'head'}}
 
     <link rel="stylesheet" href="assets/vendor.css">
-    <link rel="stylesheet" href="assets/oauthscopesapp.css">
+    <link rel="stylesheet" href="assets/authmaker-scopes-app.css">
+
+
+    {{content-for 'head-footer'}}
   </head>
   <body class="narrow fill-grey">
     {{content-for 'body'}}
 
     <script src="assets/vendor.js"></script>
-    <script src="assets/oauthscopesapp.js"></script>
+    <script src="assets/authmaker-scopes-app.js"></script>
+    {{content-for 'body-footer'}}
   </body>
 </html>
diff --git a/app/models/.gitkeep b/app/models/.gitkeep
diff --git a/app/pods/application/controller.js b/app/pods/application/controller.js
@@ -0,0 +1,14 @@
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+
+  queryParams: ['response_type', 'display', 'client_id', 'redirect_uri', 'scope', 'state', 'previous_location'],
+
+  response_type: '',
+  display: '',
+  client_id: '',
+  redirect_uri: '',
+  scope: '',
+  state: '',
+  previous_location: ''
+});
diff --git a/app/pods/application/route.js b/app/pods/application/route.js
@@ -1,4 +1,13 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
+  model: function(){
+    return Ember.$.getJSON('/settings/scopes');
+  },
+
+  actions: {
+    transitionTo: function (route, model) {
+      this.transitionTo(route, model);
+    }
+  }
 });
diff --git a/app/pods/application/template.hbs b/app/pods/application/template.hbs
@@ -1,27 +1,27 @@
+<div class="c-notification__container">
+  {{#each notifications as |notification|}}
+    {{notification-message notification=notification}}
+  {{/each}}
+</div>
 <div class="container">
   <div class="main spacing-bottom4">
     <header class="auth-header text-center pad-y4">
       <h1 class="spacing0">
-        <a class="text-hide" href="#">Blooie</a>
+        <a class="text-hide">Authmaker Scopes App</a>
       </h1>
     </header>
-    {{{outlet}}}
+    {{outlet}}
   </div>
   <footer class="auth-footer text-center text-small">
-    <div class="spacing-bottom4">
-      <p>Welcome back
-        {{#if user.username}}
-        <strong>{{user.username}}</strong>
-        {{else}}
-        <strong>{{user.email}}</strong>
-        {{/if}}
-      </p>
-      <a class="btn hollow small" href="/auth/logout">Sign out</a>
-    </div>
     <ul class="list-inline">
-      <li>&copy; Blooie, 2014</li>
-      <li><a href="//{{urlPrefix}}{{#if urlPrefix}}.{{/if}}bloo.ie/privacy">Privacy</a></li>
-      <li><a href="//{{urlPrefix}}{{#if urlPrefix}}.{{/if}}bloo.ie/terms">Terms</a></li>
+      {{#if privacyLink}}
+        <li><a href={{privacyLink}}>Privacy</a></li>
+      {{/if}}
+
+      {{#if termsLink}}
+        <li><a href={{termsLink}}>Terms</a></li>
+      {{/if}}
     </ul>
+    <a href="http://authmaker.com">Simple authentication powered by AuthMaker</a>
   </footer>
 </div>
diff --git a/app/pods/auth/route.js b/app/pods/auth/route.js
diff --git a/app/pods/authorize/route.js b/app/pods/authorize/route.js
@@ -0,0 +1,7 @@
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+    redirect: function(model, transition) {
+        this.transitionTo('plans', {queryParams: transition.queryParams});
+    }
+});
diff --git a/app/pods/card/model.js b/app/pods/card/model.js
@@ -0,0 +1,17 @@
+import DS from 'ember-data';
+import Ember from 'ember';
+
+var attr = DS.attr;
+
+export default DS.Model.extend({
+  default: attr('boolean'),
+  name: attr('string'),
+  brand: attr('string'),
+  country: attr('string'),
+  last4: attr('string'),
+  exp_month: attr('string'),
+  exp_year: attr('string'),
+  logo: Ember.computed('brand', function(){
+    return this.get('brand').toLowerCase();
+  })
+});
diff --git a/app/pods/cart/route.js b/app/pods/cart/route.js
diff --git a/app/pods/cart/template.hbs b/app/pods/cart/template.hbs
diff --git a/app/pods/payment/route.js b/app/pods/payment/route.js