Merge pull request #81 from getaclue/update_ember_to_211

Update ember to 2.11

Ember/.gitignore

@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
 /dist
@@ -13,5 +13,5 @@
 /connect.lock
 /coverage/*
 /libpeerconnection.log
-npm-debug.log
+npm-debug.log*
 testem.log

Ember/.travis.yml

@@ -7,14 +7,14 @@ sudo: false
 
 cache:
   directories:
-    - node_modules
+    - $HOME/.npm
+    - $HOME/.cache # includes bowers cache
 
 before_install:
   - npm config set spin false
-  - npm install -g bower
+  - npm install -g bower phantomjs-prebuilt
   - bower --version
-  - npm install phantomjs-prebuilt
-  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
+  - phantomjs --version
 
 install:
   - npm install

Ember/README.md

@@ -1,4 +1,4 @@
-# Ember2
+# ember2
 
 This README outlines the details of collaborating on this Ember application.
 A short introduction of this app could easily go here.
@@ -7,10 +7,10 @@ A short introduction of this app could easily go here.
 
 You will need the following things properly installed on your computer.
 
-* [Git](http://git-scm.com/)
-* [Node.js](http://nodejs.org/) (with NPM)
-* [Bower](http://bower.io/)
-* [Ember CLI](http://ember-cli.com/)
+* [Git](https://git-scm.com/)
+* [Node.js](https://nodejs.org/) (with NPM)
+* [Bower](https://bower.io/)
+* [Ember CLI](https://ember-cli.com/)
 * [PhantomJS](http://phantomjs.org/)
 
 ## Installation
@@ -46,8 +46,7 @@ Specify what it takes to deploy your app.
 ## Further Reading / Useful Links
 
 * [ember.js](http://emberjs.com/)
-* [ember-cli](http://ember-cli.com/)
+* [ember-cli](https://ember-cli.com/)
 * 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/)
-

Ember/app/components/navigation-bar.js

@@ -4,27 +4,34 @@ export default Ember.Component.extend({
   // sliding actions done via
   // http://www.w3schools.com/howto/howto_js_sidenav.asp
 
+  click(event) {
+    this._super(...arguments);
+    if(Ember.$(event.target).hasClass('nav-link')) {
+      this.$().find('.collapse').collapse('hide');
+    }
+  },
+
   actions: {
     invalidateSession() {
       this.get("session").invalidate();
     },
 
     openNav() {
       document.getElementById("mySidenav").style.width = "180px";
-      document.getElementById("navbar-toggle-button-small-screen").style.display = "none";
+      document.getElementById("navbar-toggle-button-left-small-screen").style.display = "none";
       document.body.style.backgroundColor = "rgba(0,0,0,0.2)";
     },
 
     closeNav() {
       document.getElementById("mySidenav").style.width = "0";
-      document.getElementById("navbar-toggle-button-small-screen").style.display = "";
+      document.getElementById("navbar-toggle-button-left-small-screen").style.display = "";
       document.body.style.backgroundColor = "";
     },
 
     handleAddNewAppointment() {
       this.get('handleNewAppointment')();
       document.getElementById("mySidenav").style.width = "0";
-      document.getElementById("navbar-toggle-button-small-screen").style.display = "";
+      document.getElementById("navbar-toggle-button-left-small-screen").style.display = "";
       document.body.style.backgroundColor = "";
     }
   }

Ember/app/controllers/my-calendar/appointments/show.js

@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
-const { Controller, isEmpty } = Ember;
+const { Controller } = Ember;
 
 export default Controller.extend({
   actions: {
@@ -41,12 +41,6 @@ export default Controller.extend({
       appointment.save()
        .then(transitionToPost)
        .catch(failure);
-    },
-
-    assignedEmployee(employee) {
-      if (!isEmpty(employee)) {
-        this.set('appointment.employee', employee);
-      }
     }
   }
 });

Ember/app/index.html

@@ -11,7 +11,6 @@
 
     <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
     <link rel="stylesheet" href="{{rootURL}}assets/ember2.css">
-    </script>
 
     {{content-for "head-footer"}}
   </head>

Ember/app/routes/my-account.js

@@ -3,8 +3,11 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout
 
 export default Ember.Route.extend(AuthenticatedRouteMixin, {
 
-	model(){
-		return this.get('store').find('user', this.get('session.data.authenticated.user_id'));
-	}
+  session: Ember.inject.service('session'),
+  currentUser: Ember.inject.service('current-user'),
 
+  model(){
+    const userId = this.get('session').get('data.authenticated.user_id');
+    return this.get('store').findRecord('user', userId);
+  }
 });

Ember/app/styles/administrator-styles/management-table.scss

@@ -145,7 +145,6 @@ $breakpoint-alpha: 660px;
     font-size: 2.8em;
     line-height: 130px;
     font-weight: normal;
-    margin-top: 50px;
     text-align: center;
     text-shadow: 0 1px 1px #fff;
   }

Ember/app/styles/app.scss

@@ -1,4 +1,4 @@
-@import "bootstrap";
+@import 'bootstrap';
 
 @import "administrator-styles/admin-info";
 @import "administrator-styles/appointment-history";
@@ -12,25 +12,13 @@
 $break-small: 320px;
 $break-large: 1024px;
 
-// Styling placed in this folder relates to styles present on multiple pages
-.container{
-  @media (min-width: $break-small) {
-    padding-top: 3.5em;
-  }
-
-  @media (min-width: $break-large) {
-    padding-top: 65px;
-  }
-}
-
 body {
   @media (min-width: $break-small) {
     transition: background-color .5s;
   }
 }
 
 .page-title {
-  padding-top: 50px;
   padding-bottom: 20px;
   text-align:center;
   font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
@@ -68,7 +56,6 @@ body {
 }
 
 .admin-container{
-  padding-top: 10%;
   margin-right: auto;
   margin-left: auto;
   padding-left: 2%;

Ember/app/styles/nav-menu.scss

@@ -1,100 +1,100 @@
 /*Style for the navigation bar*/
 
-.navbar-toggler {
-  padding-top: 10px;
-  color: #fffaef;
-  border-color: #fffaef;
-  border-style: solid;
-  border-width: thin;
-  margin-bottom: 15px;
-  margin-top: 10px;
-}
-
-.navbar {
-  background-color: black;
-  padding: 0;
-}
-
-.nav-list-item {
-  color:#e3e3e3 !important;
-}
-.nav-list-item:hover {
-  color:#fffaef ;
-}
-
-.logo{
-  float: right;
-}
-
-.menu {
-  width:100%;
-  margin:0px auto;
-  float: right;
-}
-
-.nav-item {
-  list-style:none;
-  padding: 1%;
-  height: 55px;
-}
-
-.menu a {
-  transition:all linear 0.15s;
-  color:#fffaef;
-  font-weight: normal;
-}
-
-.menu .nav-item:hover {
-  background-color: #EE2C2C;
-}
-
-.menu > ul > li {
-  float:left;
-  display:inline-block;
-  position:relative;
-  font-size:19px;
-}
-
-.menu > ul > li > a {
-  padding:10px 40px;
-  display:inline-block;
-  text-shadow:0px 1px 0px rgba(0,0,0,0.4);
-}
-
-.dropdown-menu {
-  padding:5px 0px;
-  position:absolute;
-  top:100%;
-  left:0px;
-  z-index:-1;
-  transition:opacity linear 0.15s;
-  box-shadow:0px 2px 3px rgba(0,0,0,0.2);
-  background:#959595;
-  display: block;
-  display: none;
-  margin: 0;
-  z-index:1;
-}
-
-.dropdown-item.active {
-  background-color: #EE2C2C;
-}
-
-.dropdown-item.active {
-  background-color: #EE2C2C;
-}
-
-.dropdown-item:hover, .dropdown-item.active:hover{
-  background-color: #fffaef;
-  color: #EE2C2C;
-}
+// .navbar-toggler {
+//   padding-top: 10px;
+//   color: #fffaef;
+//   border-color: #fffaef;
+//   border-style: solid;
+//   border-width: thin;
+//   margin-bottom: 15px;
+//   margin-top: 10px;
+// }
+//
+// .navbar {
+//   background-color: black;
+//   padding: 0;
+// }
+//
+// .nav-list-item {
+//   color:#e3e3e3 !important;
+// }
+// .nav-list-item:hover {
+//   color:#fffaef ;
+// }
+//
+// .logo{
+//   float: right;
+// }
+//
+// .menu {
+//   width:100%;
+//   margin:0px auto;
+//   float: right;
+// }
+//
+// .nav-item {
+//   list-style:none;
+//   padding: 1%;
+//   height: 55px;
+// }
+//
+// .menu a {
+//   transition:all linear 0.15s;
+//   color:#fffaef;
+//   font-weight: normal;
+// }
+//
+// .menu .nav-item:hover {
+//   background-color: #EE2C2C;
+// }
+//
+// .menu > ul > li {
+//   float:left;
+//   display:inline-block;
+//   position:relative;
+//   font-size:19px;
+// }
+//
+// .menu > ul > li > a {
+//   padding:10px 40px;
+//   display:inline-block;
+//   text-shadow:0px 1px 0px rgba(0,0,0,0.4);
+// }
+//
+// .dropdown-menu {
+//   padding:5px 0px;
+//   position:absolute;
+//   top:100%;
+//   left:0px;
+//   z-index:-1;
+//   transition:opacity linear 0.15s;
+//   box-shadow:0px 2px 3px rgba(0,0,0,0.2);
+//   background:#959595;
+//   display: block;
+//   display: none;
+//   margin: 0;
+//   z-index:1;
+// }
+//
+// .dropdown-item.active {
+//   background-color: #EE2C2C;
+// }
+//
+// .dropdown-item.active {
+//   background-color: #EE2C2C;
+// }
+//
+// .dropdown-item:hover, .dropdown-item.active:hover{
+//   background-color: #fffaef;
+//   color: #EE2C2C;
+// }
 
 /* The side navigation menu */
 .sidenav {
     height: 100%; /* 100% Full-height */
     width: 0; /* 0 width - change this with JavaScript */
     position: fixed; /* Stay in place */
-    z-index: 1; /* Stay on top */
+    z-index: 1000; /* Stay on top */
     top: 0;
     right: 0;
     background-color: #111; /* Black*/