Merge master & fix conflict

mentors-ember-app/.bowerrc

@@ -0,0 +1,4 @@
+{
+  "directory": "bower_components",
+  "analytics": false
+}

mentors-ember-app/.editorconfig

@@ -0,0 +1,34 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.hbs]
+insert_final_newline = false
+indent_style = space
+indent_size = 2
+
+[*.css]
+indent_style = space
+indent_size = 2
+
+[*.html]
+indent_style = space
+indent_size = 2
+
+[*.{diff,md}]
+trim_trailing_whitespace = false

mentors-ember-app/.ember-cli

@@ -0,0 +1,9 @@
+{
+  /**
+    Ember CLI sends analytics information by default. The data is completely
+    anonymous, but there are times when you might want to disable this behavior.
+
+    Setting `disableAnalytics` to true will prevent any data from being sent.
+  */
+  "disableAnalytics": false
+}

mentors-ember-app/.gitignore

@@ -0,0 +1,17 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+
+# dependencies
+/node_modules
+/bower_components
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage/*
+/libpeerconnection.log
+npm-debug.log
+testem.log

mentors-ember-app/.jshintrc

@@ -0,0 +1,33 @@
+{
+  "predef": [
+    "server",
+    "document",
+    "window",
+    "-Promise"
+  ],
+  "browser": true,
+  "boss": true,
+  "curly": true,
+  "debug": false,
+  "devel": true,
+  "eqeqeq": true,
+  "evil": true,
+  "forin": false,
+  "immed": false,
+  "laxbreak": false,
+  "newcap": true,
+  "noarg": true,
+  "noempty": false,
+  "nonew": false,
+  "nomen": false,
+  "onevar": false,
+  "plusplus": false,
+  "regexp": false,
+  "undef": true,
+  "sub": true,
+  "strict": false,
+  "white": false,
+  "eqnull": true,
+  "esnext": true,
+  "unused": true
+}

mentors-ember-app/.travis.yml

@@ -0,0 +1,22 @@
+---
+language: node_js
+node_js:
+  - "4"
+
+sudo: false
+
+cache:
+  directories:
+    - node_modules
+
+before_install:
+  - npm config set spin false
+  - npm install -g bower
+  - npm install phantomjs-prebuilt
+
+install:
+  - npm install
+  - bower install
+
+script:
+  - npm test

mentors-ember-app/.watchmanconfig

@@ -0,0 +1,3 @@
+{
+  "ignore_dirs": ["tmp", "dist"]
+}

mentors-ember-app/README.md

@@ -0,0 +1,53 @@
+# Mentors-ember-app
+
+This README outlines the details of collaborating on this Ember application.
+A short introduction of this app could easily go here.
+
+## Prerequisites
+
+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/)
+* [PhantomJS](http://phantomjs.org/)
+
+## Installation
+
+* `git clone <repository-url>` this repository
+* change into the new directory
+* `npm install`
+* `bower install`
+
+## Running / Development
+
+* `ember server`
+* Visit your app at [http://localhost:4200](http://localhost:4200).
+
+### Code Generators
+
+Make use of the many generators for code, try `ember help generate` for more details
+
+### Running Tests
+
+* `ember test`
+* `ember test --server`
+
+### Building
+
+* `ember build` (development)
+* `ember build --environment production` (production)
+
+### Deploying
+
+Specify what it takes to deploy your app.
+
+## Further Reading / Useful Links
+
+* [ember.js](http://emberjs.com/)
+* [ember-cli](http://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/)
+

mentors-ember-app/app/adapters/application.js

@@ -0,0 +1,7 @@
+import DS from 'ember-data';
+
+export default DS.JSONAPIAdapter.extend({
+    pathForType: function (type) {
+    return type.dasherize().toLowerCase();
+  }
+});

mentors-ember-app/app/app.js

@@ -0,0 +1,18 @@
+import Ember from 'ember';
+import Resolver from './resolver';
+import loadInitializers from 'ember-load-initializers';
+import config from './config/environment';
+
+let App;
+
+Ember.MODEL_FACTORY_INJECTIONS = true;
+
+App = Ember.Application.extend({
+  modulePrefix: config.modulePrefix,
+  podModulePrefix: config.podModulePrefix,
+  Resolver
+});
+
+loadInitializers(App, config.modulePrefix);
+
+export default App;

mentors-ember-app/app/components/mentor-profile.js

@@ -0,0 +1,17 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+
+  classNameBindings: ['favorited:is-favorited'],
+  classNames: ['mentor-profile'],
+
+  actions: {
+    toggleProperty: function(prop){
+      this.toggleProperty(prop);
+    },
+
+    addToFavorites: function(){
+      this.toggleProperty("favorited");
+    }
+  }
+});

mentors-ember-app/app/controllers/application.js

@@ -0,0 +1,5 @@
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+  windowSize: Ember.inject.service()
+});

mentors-ember-app/app/controllers/apply.js

@@ -0,0 +1,11 @@
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+  model: Ember.Object.create({}),
+
+  actions: {
+    submitApplicationForm: function(){
+      this.set('model.submitted', true);
+    }
+  }
+});

mentors-ember-app/app/controllers/mentor.js

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

mentors-ember-app/app/controllers/mentors.js

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

mentors-ember-app/app/index.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>MentorsEmberApp</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    {{content-for "head"}}
+
+    <link rel="stylesheet" href="assets/vendor.css">
+    <link rel="stylesheet" href="assets/mentors-ember-app.css">
+
+    {{content-for "head-footer"}}
+  </head>
+  <body>
+    {{content-for "body"}}
+
+    <script src="assets/vendor.js"></script>
+    <script src="assets/mentors-ember-app.js"></script>
+
+    {{content-for "body-footer"}}
+  </body>
+</html>

mentors-ember-app/app/mirage/config.js

@@ -0,0 +1,26 @@
+import Mirage from 'ember-cli-mirage';
+
+//Mock your API
+
+export default function() {
+    this.get('/mentor/:id', function(db, request){
+        var params = request.params;
+        return db['mentor'].find(params.id);
+    });
+ this.get('/mentor/', function(db, request){
+        var params = request.params;
+        return db['mentor'];
+    });
+
+    this.put('/mentor/:id', function(db, request){
+        var id = request.params.id;
+        var attrs = JSON.parse(request.requestBody);
+        delete attrs.id
+        return db['mentor'].update(id, attrs);
+    });
+
+    this.post('/mentor', function(db, request){
+        var params = JSON.parse(request.requestBody);
+        return db['mentor'].insert(params);
+    });
+}

mentors-ember-app/app/mirage/factories/contact.js

@@ -0,0 +1,20 @@
+/*
+  This is an example factory definition.
+
+  Create more files in this directory to define additional factories.
+*/
+import Mirage/*, {faker} */ from 'ember-cli-mirage';
+
+export default Mirage.Factory.extend({
+  // name: 'Pete',                         // strings
+  // age: 20,                              // numbers
+  // tall: true,                           // booleans
+
+  // email: function(i) {                  // and functions
+  //   return 'person' + i + '@test.com';
+  // },
+
+  // firstName: faker.name.firstName,       // using faker
+  // lastName: faker.name.firstName,
+  // zipCode: faker.address.zipCode
+});

mentors-ember-app/app/mirage/fixtures/mentor.js

@@ -0,0 +1,27 @@
+export default [
+  {
+    id: 1,
+    firstName: "Joe",
+    lastName: "Smith"
+  }, {
+    id: 2,
+    firstName: "John",
+    lastName: "Smith"
+  }, {
+    id: 3,
+    firstName: "Joan",
+    lastName: "Rivers"
+  }, {
+    id: 4,
+    firstName: "Jim",
+    lastName: "Smith"
+  }, {
+    id: 5,
+    firstName: "Jerry",
+    lastName: "Seinfeld"
+  }, {
+    id: 6,
+    firstName: "Jeff",
+    lastName: "Gordon"
+  },
+];

mentors-ember-app/app/mirage/scenarios/default.js

@@ -0,0 +1,7 @@
+export default function (server) {
+  server.loadFixtures();
+  // Seed your development database using your factories. This
+  // data will not be loaded in your tests.
+
+  // server.createList('contact', 10);
+}

mentors-ember-app/app/models/mentor.js

@@ -0,0 +1,6 @@
+import DS from 'ember-data';
+
+export default DS.Model.extend({
+  firstName: DS.attr('string'),
+  lastName: DS.attr('string')
+});

mentors-ember-app/app/resolver.js

@@ -0,0 +1,3 @@
+import Resolver from 'ember-resolver';
+
+export default Resolver;