Permalink
Browse files

Merge pull request #41 from ga-wdi-boston/022/master

022/master
  • Loading branch information...
payne-chris-r committed Feb 14, 2018
2 parents dc48723 + 5363757 commit 490e1e1277d693cbc516c44ba371a08008215eef

This file was deleted.

Oops, something went wrong.
@@ -54,7 +54,6 @@ Temporary Items

# dependencies
/node_modules
/bower_components

# misc
/.sass-cache
@@ -8,17 +8,15 @@ sudo: false
cache:
directories:
- $HOME/.npm
- $HOME/.cache # includes bowers cache
- $HOME/.cache

before_install:
- npm config set spin false
- npm install -g bower phantomjs-prebuilt
- bower --version
- npm install -g phantomjs-prebuilt
- phantomjs --version

install:
- npm install
- bower install

script:
- npm test
@@ -0,0 +1,14 @@
## Module Report
### Unknown Global

**Global**: `Ember.MODEL_FACTORY_INJECTIONS`

**Location**: `app/app.js` at line 8

```js
let App;
Ember.MODEL_FACTORY_INJECTIONS = true;
App = Ember.Application.extend({
```
@@ -15,34 +15,19 @@ At the beginning of each cohort update [`package.json`](package.json):
- `npm update --save-dev`.
- `npm install`

### bower
Currently bower [cannot automatically save updated versions](https://github.com/bower/bower/issues/2348) to `bower.json`.

- `rm -r bower_components`
- `bower update`
- `bower list`
- Take the new version numbers from the top level of the list and paste
them into `bower.json`
- `bower install`
- `ember test`

Fix errors and conflicts as necessary.

## Dependencies

Install build dependencies with `npm install`. Install runtime dependencies with
`bower install`.
Install build dependencies with `npm install`.
If you have not installed phantomjs, you will need to install it globally:
`npm install --global phantomjs-prebuil`
`npm install --global phantomjs-prebuilt`

- [ember.js](http://emberjs.com/)
- [ember-cli](http://www.ember-cli.com/)
- [Bootstrap](http://getbootstrap.com)

At the beginning of each cohort, update this template by upgrading `ember-cli`
and generating a new Ember application in another location. Copy files over a
handful at a time and check diffs. You should preserve the pods structure and
other customizations, including Bootstrap.
handful at a time and check diffs.

## Installation

@@ -51,28 +36,24 @@ other customizations, including Bootstrap.
1. Empty [`README.md`](README.md) and fill with your own content.
1. Move into the new project and `git init`.
1. Replace all instances of `'ga-wdi-boston.ember-template'` with your app name. This
includes [`package.json`](package.json), [`bower.json`](bower.json),
includes [`package.json`](package.json),
[`app/index.html`](app/index.html), [`tests/index.html`](tests/index.html),
[`app/adapters/application.js`](app/adapters/application.js),
and [`config/environment.js`](config/environment.js), possibly others.
1. Install dependencies with `npm install` and `bower install`.
1. Install dependencies with `npm install`.
1. Run the development server with `ember server`. Use the `--proxy` flag to
avoid writing development-specific CORS and CSP settings.

## Structure

Build dependencies are stored in [`package.json`](package.json). Client
dependencies are stored in [`bower.json`](bower.json).
Build dependencies are stored in [`package.json`](package.json).

Do not configure `grunt` packages directly in the
[`Gruntfile.js`](Gruntfile.js). Instead, store configurations in the
[`grunt`](grunt) directory. You won't need a top-level key, since that's
generated by the `Gruntfile.js` based on the filename of the configuration
object stored in the `grunt` directory.

Developers should store source code following Ember conventions. This template
uses the "pods" layout for organizing code. For an introduction, see [Organize
Your Ember App with Pods](http://cball.me/organize-your-ember-app-with-pods/).

## Tasks

Developers should run these often!
@@ -1,3 +1,4 @@
import Application from '@ember/application';
import Ember from 'ember';
import Resolver from './resolver';
import loadInitializers from 'ember-load-initializers';
@@ -7,7 +8,7 @@ let App;

Ember.MODEL_FACTORY_INJECTIONS = true;

App = Ember.Application.extend({
App = Application.extend({
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix,
Resolver
@@ -1,7 +1,7 @@
import Ember from 'ember';
import EmberRouter from '@ember/routing/router';
import config from './config/environment';

const Router = Ember.Router.extend({
const Router = EmberRouter.extend({
location: config.locationType,
rootURL: config.rootURL
});
@@ -1,4 +1,4 @@
import Ember from 'ember';
import Service from '@ember/service';

export default Ember.Service.extend({
export default Service.extend({
});
@@ -1,2 +1 @@
@import 'bootstrap';
@import 'bootstrap/theme';
@import "ember-bootstrap/bootstrap";

This file was deleted.

Oops, something went wrong.
@@ -4,14 +4,11 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app');

module.exports = function(defaults) {
var app = new EmberApp(defaults, {
sassOptions: {
includePaths: [
'bower_components/bootstrap-sass/assets/stylesheets'
]
'ember-bootstrap': {
'bootstrapVersion': 3,
'importBootstrapFont': true,
'importBootstrapCSS': false
}
});

app.import('bower_components/bootstrap-sass/assets/javascripts/bootstrap.js');

return app.toTree();
};
@@ -38,7 +38,7 @@ module.exports = {
].join(' && ')
},
'clean-gh-pages': {
command: 'git clean -x -d --force --exclude=node_modules --exclude=bower_components'
command: 'git clean -x -d --force --exclude=node_modules'
},
'return-to-master': {
command: 'git checkout master'
Oops, something went wrong.

0 comments on commit 490e1e1

Please sign in to comment.