”2016-04-07”

.jscsrc

@@ -39,8 +39,9 @@
         "beforeOpeningCurlyBrace": true
     },
     "requireTrailingComma": false,
-    "requireEarlyReturn": true,
+    "requireEarlyReturn": false,
     "validateIndentation": 2,
     "validateLineBreaks": "LF",
-    "validateQuoteMarks": "'"
+    "validateQuoteMarks": "'",
+
 }

.jshintrc

@@ -1,10 +1,14 @@
 {
-  "predef": [
+  "predef": {
-    "server",
+      "document": true,
-    "document",
+      "window": true,
-    "window",
+      "SprintStatusENV": true,
-    "-Promise"
+      "Ember": true, // Added
-  ],
+      "$": true, // ADDED
+      "Modernizr": true, // ADDED
+    "-Promise": true, // ADDED
+    "server": true // ADDED
+    },
   "browser": true,
   "boss": true,
   "curly": true,

app/authorizers/application.js

@@ -1,12 +1,3 @@
-/*
-import Base from 'ember-simple-auth/authorizers/base';
-
-export default Base.extend({
-  authorize(/!*data, block*!/) {
-  }
-});
-*/
-
 
 import OAuth2Bearer from 'ember-simple-auth/authorizers/oauth2-bearer';
 

app/controllers/company.js

@@ -1,5 +1,3 @@
-'use strict';
-
 import Ember from 'ember';
 const {service} = Ember.inject;
 export default Ember.Controller.extend({
@@ -10,6 +8,7 @@ export default Ember.Controller.extend({
     editCompany: function() {
       this.set('isEditing', true);
     }, saveCompany: function() {
+      'use strict';
       this.set('isEditing', false);
       var model = this.get('model');
 
@@ -19,6 +18,7 @@ export default Ember.Controller.extend({
         });
 
     }, cancelEdit: function() {
+      'use strict';
       var model = this.get('model');
       model.rollbackAttributes();
       this.set('isEditing', false);

app/controllers/newcompany.js

@@ -1,4 +1,3 @@
-'use strict';
 import Ember from 'ember';
 const { service } = Ember.inject;
 export default Ember.Controller.extend({
@@ -6,7 +5,7 @@ export default Ember.Controller.extend({
   sessionAccount: service('session-account'),
   actions: {
     saveCompany: function() {
-
+      'use strict';
       var model = this.get('model');
       var account = this.get('sessionAccount.account');
 

app/controllers/profile.js

@@ -1,4 +1,3 @@
-'use strict';
 import Ember from 'ember';
 const { service } = Ember.inject;
 export default Ember.Controller.extend({
@@ -9,7 +8,7 @@ export default Ember.Controller.extend({
     editProfile: function() {
       this.set('isEditing', true);
     }, saveProfile: function() {
-
+      'use strict';
       var model = this.get('model');
       this.set('sessionAccount.account.forename', model.get('forename'));
 

app/helpers/eq.js

@@ -1,9 +1,5 @@
 import Ember from 'ember';
 
-/*export function eq(params/!*, hash*!/) {
-  return params;
-}*/
-
 const eq = (params) => params[0] === params[1];
 
 export default Ember.Helper.helper(eq);

app/models/account.js

@@ -1,7 +1,5 @@
 import DS from 'ember-data';
 
-//const { attr } = DS;
-
 export default DS.Model.extend({
   uid: DS.attr('string'),
   login: DS.attr('string'),

app/models/application.js

@@ -1,5 +1,5 @@
 import DS from 'ember-data';
 
 export default DS.Model.extend({
-  
+
 });

app/models/page-content.js

@@ -1,6 +1,7 @@
 'use strict';
 
 import DS from 'ember-data';
+import Ember from 'ember';
 
 export default DS.Model.extend({
   page: DS.belongsTo('page'),

app/models/page.js

@@ -1,4 +1,5 @@
 import DS from 'ember-data';
+import Ember from 'ember';
 
 export default DS.Model.extend({
   cid: DS.attr('string'),

app/router.js

@@ -6,7 +6,7 @@ const Router = Ember.Router.extend({
 });
 
 Router.map(function() {
-  this.route('index', {path:'/'});
+  this.route('index', {path: '/'});
   this.route('login');
   this.route('auth-error');
   this.route('about');

app/serializers/useful.js

@@ -1,37 +1,38 @@
 import DS from 'ember-data';
+import Ember from 'ember';
 
 export default DS.JSONAPISerializer.extend({
-    serializeBelongsTo: function(record, json, relationship) {
+  serializeBelongsTo: function(record, json, relationship) {
-        var key = relationship.key,
+    var key = relationship.key;
-            belongsTo = Ember.get(record, key);
+    var belongsTo = Ember.get(record, key);
-        key = this.keyForRelationship ? this.keyForRelationship(key, "belongsTo") : key;
+    key = this.keyForRelationship ? this.keyForRelationship(key, 'belongsTo') : key;
 
-        if (relationship.options.embedded === 'always') {
+    if (relationship.options.embedded === 'always') {
-            json[key] = belongsTo.serialize();
+      json[key] = belongsTo.serialize();
-        }
+    }    else {
-        else {
+      return this._super(record, json, relationship);
-            return this._super(record, json, relationship);
-        }
-    },
-    serializeHasMany: function(record, json, relationship) {
-        var key = relationship.key,
-            hasMany = Ember.get(record, key),
-            relationshipType = DS.RelationshipChange.determineRelationshipType(record.constructor, relationship);
-
-        if (relationship.options.embedded === 'always') {
-            if (hasMany && relationshipType === 'manyToNone' || relationshipType === 'manyToMany' ||
-                relationshipType === 'manyToOne') {
-
-                json[key] = [];
-                hasMany.forEach(function(item, index){
-                    json[key].push(item.serialize());
-                });
-            }
-
-        }
-        else {
-            return this._super(record, json, relationship);
-        }
     }
+  },
+  serializeHasMany: function(record, json, relationship) {
+    var key = relationship.key;
+    var hasMany = Ember.get(record, key);
+    var relationshipType = DS.RelationshipChange.determineRelationshipType(
+      record.constructor,
+      relationship);
+
+    if (relationship.options.embedded === 'always') {
+      if (hasMany && relationshipType === 'manyToNone' || relationshipType === 'manyToMany' ||
+          relationshipType === 'manyToOne') {
+
+        json[key] = [];
+        hasMany.forEach(function(item) {
+          json[key].push(item.serialize());
+        });
+      }
+
+    }    else {
+      return this._super(record, json, relationship);
+    }
+  }
 });
 

app/styles/app.scss

@@ -47,9 +47,9 @@ body {
   width: 375px;
   height: 667px;
   border:1px solid grey;
-  -webkit-box-shadow: 0px 4px 5px 0px rgba(0,0,0,0.43);
+  -webkit-box-shadow: 0 4px 5px 0 rgba(0,0,0,0.43);
-  -moz-box-shadow: 0px 4px 5px 0px rgba(0,0,0,0.43);
+  -moz-box-shadow: 0 4px 5px 0 rgba(0,0,0,0.43);
-  box-shadow: 0px 4px 5px 0px rgba(0,0,0,0.43);
+  box-shadow: 0 4px 5px 0 rgba(0,0,0,0.43);
   border-radius: 0.25rem;
   }
 

app/styles/profile.scss

@@ -8,7 +8,7 @@ img.avatar {
 }
 
 .only-bottom-margin {
-  margin-top: 0px;
+  margin-top: 0;
 }
 
 .activity-mini {

app/styles/side-bar.scss

@@ -117,9 +117,8 @@ h1.page-header {
 	padding: 0;
 }
 .side-menu #search .panel-body .navbar-form {
-	padding: 0;
+  padding: 0 50px 0 0;
-	padding-right: 50px;
+  width: 100%;
-	width: 100%;
 	margin: 0;
 	position: relative;
 	border-top: 1px solid #e7e7e7;
@@ -162,7 +161,7 @@ h1.page-header {
 		position: relative;
 		height: 0;
 		min-height: 0;
-		background-color:none !important;
+		background-color: none !important;
 		border-color: none !important;
 	}
 	.side-menu .brand-name-wrapper .navbar-brand {

app/templates/application.hbs

@@ -5,10 +5,11 @@
   {{outlet}}
 
   <footer class="pull-left footer">
-      <p class="col-md-12">
+    <hr class="divider">
-      <hr class="divider">
+    <p class="col-md-12">
       Copyright &COPY; 2016 <a
-      href="http://www.obrand.info">Obrand Communications</a>      </p>
+      href="http://www.obrand.info">Obrand Communications</a>
+    </p>
     </footer>
 </div>
 

app/templates/login.hbs

@@ -1,3 +1,6 @@
+<div class="container">
+  <div class="col-sm-4 col-sm-offset-4">
+
 <form class="form-signin" {{action 'authenticate' on='submit'}}>
     <div>
     <h2 class="form-signin-heading">Please login</h2>
@@ -21,20 +24,5 @@
     {{/if}}
 </form>
 
-<!--
+  </div>
-
+</div>
-
-
-<h2 class="form-signin-heading">Please login</h2>
-   <label for="inputEmail" class="sr-only">Email address</label>
-   <input type="email" id="inputEmail" class="form-control" placeholder="Email address" required autofocus>
-   <label for="inputPassword" class="sr-only">Password</label>
-   <input type="password" id="inputPassword" class="form-control" placeholder="Password" required>
-   <div class="checkbox">
-       <label>
-           <input type="checkbox" value="remember-me"> Remember me
-       </label>
-   </div>
-   <button class="btn btn-lg btn-primary btn-block" type="submit"></button>
-
--->