From ddbc2ec70053cc552cf34b3ab58cd6724ff2cb93 Mon Sep 17 00:00:00 2001 From: Geoffrey Schorkopf Date: Tue, 2 Aug 2016 16:52:51 -0400 Subject: [PATCH 1/3] Transitions from Brocfile.js to ember-cli-build.js See https://github.com/ember-cli/ember-cli/blob/master/TRANSITION.md#user-co ntent-brocfile-transition --- Brocfile.js | 39 --------------------------------------- ember-cli-build.js | 20 ++++++++++++++++++-- 2 files changed, 18 insertions(+), 41 deletions(-) delete mode 100644 Brocfile.js diff --git a/Brocfile.js b/Brocfile.js deleted file mode 100644 index 8e007b1..0000000 --- a/Brocfile.js +++ /dev/null @@ -1,39 +0,0 @@ -/* global require, module */ - -var EmberApp = require('ember-cli/lib/broccoli/ember-app'); - -var app = new EmberApp({ - fingerprint: { - prepend: "http://s3.amazonaws.com/frolfr-assets/" - } -}); -var pickFiles = require('broccoli-static-compiler'); - -// Use `app.import` to add additional libraries to the generated -// output files. -// -// If you need to use different assets in different -// environments, specify an object as the first parameter. That -// object's keys should be the environment name and the values -// should be the asset to use in that environment. -// -// If the library that you are including contains AMD or ES6 -// modules that you would like to import into your application -// please specify an object with the list of modules as keys -// along with the exports of each module as its value. -app.import('bower_components/moment/moment.js'); -app.import('bower_components/jquery-cookie/jquery.cookie.js'); -app.import('bower_components/typeahead.js/dist/typeahead.jquery.js'); -app.import('bower_components/highcharts/highcharts.js'); -app.import('bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js'); -app.import('bower_components/components-font-awesome/css/font-awesome.css'); -app.import('bower_components/ember-uploader/dist/ember-uploader.js'); -app.import('bower_components/floatThead/dist/jquery.floatThead.js'); - - -var fontAwesome = pickFiles('bower_components/components-font-awesome/fonts', { - srcDir: '/', - destDir: '/fonts' -}); - -module.exports = app.toTree([fontAwesome]); diff --git a/ember-cli-build.js b/ember-cli-build.js index 2537ce2..93a33d2 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -4,8 +4,11 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app'); module.exports = function(defaults) { var app = new EmberApp(defaults, { - // Add options here + fingerprint: { + prepend: "http://s3.amazonaws.com/frolfr-assets/" + } }); + var pickFiles = require('broccoli-static-compiler'); // Use `app.import` to add additional libraries to the generated // output files. @@ -19,6 +22,19 @@ module.exports = function(defaults) { // modules that you would like to import into your application // please specify an object with the list of modules as keys // along with the exports of each module as its value. + app.import('bower_components/moment/moment.js'); + app.import('bower_components/jquery-cookie/jquery.cookie.js'); + app.import('bower_components/typeahead.js/dist/typeahead.jquery.js'); + app.import('bower_components/highcharts/highcharts.js'); + app.import('bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js'); + app.import('bower_components/components-font-awesome/css/font-awesome.css'); + app.import('bower_components/ember-uploader/dist/ember-uploader.js'); + app.import('bower_components/floatThead/dist/jquery.floatThead.js'); - return app.toTree(); + var fontAwesome = pickFiles('bower_components/components-font-awesome/fonts', { + srcDir: '/', + destDir: '/fonts' + }); + + return app.toTree([fontAwesome]); }; From 4d063210a49a06f5c337378c738e0094e9f90adc Mon Sep 17 00:00:00 2001 From: Geoffrey Schorkopf Date: Tue, 2 Aug 2016 17:12:19 -0400 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=91=8B=20bind-attr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/templates/application.hbs | 2 +- app/templates/components/scorecards-table-cell.hbs | 2 +- app/templates/components/scorecards-table.hbs | 2 +- app/templates/course-rounds.hbs | 6 +++--- app/templates/course/index.hbs | 2 +- app/templates/friendable-users.hbs | 2 +- app/templates/friends.hbs | 2 +- app/templates/profile/settings.hbs | 6 +++--- app/templates/review/edit.hbs | 4 ++-- app/templates/reviews/index.hbs | 2 +- app/templates/round/settings.hbs | 2 +- app/templates/rounds/new.hbs | 6 +++--- app/templates/turns.hbs | 10 +++++----- app/templates/user.hbs | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app/templates/application.hbs b/app/templates/application.hbs index e2f0de9..0eeddf5 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -1,4 +1,4 @@ -
+
{{#if currentUser.isAuthenticated}}