upgraded Ember and integrated Bootstrap 4

Upgraded to Ember JS 2.16.x release. This upgrade uses the new JavaScript modules API syntax.

Integrated Bootstrap 4 Beta 2 via package.json and associated popper.js library. Overridden Bootstrap styles using bootstrap.scss -- this file selectively imports the modules we need.

gui/app/pods/folder/controller.js

@@ -9,7 +9,7 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
 });

gui/app/pods/folder/index/controller.js

@@ -9,14 +9,12 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Controller from '@ember/controller';
+
+import { inject as service } from '@ember/service';
 import NotifierMixin from '../../../mixins/notifier';
 
-const {
-	inject: { service }
-} = Ember;
-
-export default Ember.Controller.extend(NotifierMixin, {
+export default Controller.extend(NotifierMixin, {
 	documentService: service('document'),
 	folderService: service('folder'),
 	localStorage: service('localStorage'),

gui/app/pods/folder/index/route.js

@@ -9,14 +9,17 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { Promise as EmberPromise, hash } from 'rsvp';
+
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
-	categoryService: Ember.inject.service('category'),
+export default Route.extend(AuthenticatedRouteMixin, {
+	categoryService: service('category'),
 
 	beforeModel() {
-		return new Ember.RSVP.Promise((resolve) => {
+		return new EmberPromise((resolve) => {
 			this.get('categoryService').fetchSpaceData(this.modelFor('folder').folder.get('id')).then((data) => {
 				this.set('categories', data.category);
 				this.set('categorySummary', data.summary);
@@ -30,7 +33,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 	model() {
 		this.get('browser').setTitle(this.modelFor('folder').folder.get('name'));
 
-		return Ember.RSVP.hash({
+		return hash({
 			folder: this.modelFor('folder').folder,
 			permissions: this.modelFor('folder').permissions,
 			folders: this.modelFor('folder').folders,

gui/app/pods/folder/route.js

@@ -9,20 +9,23 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { Promise as EmberPromise, hash } from 'rsvp';
+
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
-	documentService: Ember.inject.service('document'),
-	folderService: Ember.inject.service('folder'),
-	templateService: Ember.inject.service('template'),
-	session: Ember.inject.service(''),
+export default Route.extend(AuthenticatedRouteMixin, {
+	documentService: service('document'),
+	folderService: service('folder'),
+	templateService: service('template'),
+	session: service(''),
 	folder: {},
 
 	beforeModel() {
 		this.set('folderId', this.paramsFor('folder').folder_id)
 
-		return new Ember.RSVP.Promise((resolve) => {
+		return new EmberPromise((resolve) => {
 			this.get('folderService').getFolder(this.get('folderId')).then((folder) => {
 				this.set('folder', folder);
 
@@ -35,7 +38,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 	},
 
 	model(params) {
-		return Ember.RSVP.hash({
+		return hash({
 			folder: this.get('folder'),
 			permissions: this.get('permissions'),
 			folders: this.get('folderService').getAll(),

gui/app/pods/folder/settings/category/controller.js

@@ -9,7 +9,7 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
 });

gui/app/pods/folder/settings/category/route.js

@@ -9,14 +9,16 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { hash } from 'rsvp';
+
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
+export default Route.extend(AuthenticatedRouteMixin, {
 	model() {
 		this.get('browser').setTitle(this.modelFor('folder').folder.get('name'));
 
-		return Ember.RSVP.hash({
+		return hash({
 			folder: this.modelFor('folder').folder,
 			permissions: this.modelFor('folder').permissions,
 			folders: this.modelFor('folder').folders

gui/app/pods/folder/settings/controller.js

@@ -9,12 +9,14 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+
+import Controller from '@ember/controller';
 import NotifierMixin from '../../../mixins/notifier';
 import AuthProvider from '../../../mixins/auth';
 
-export default Ember.Controller.extend(AuthProvider, NotifierMixin, {
-	documentService: Ember.inject.service('document'),
-	folderService: Ember.inject.service('folder'),
-	localStorage: Ember.inject.service('localStorage'),
+export default Controller.extend(AuthProvider, NotifierMixin, {
+	documentService: service('document'),
+	folderService: service('folder'),
+	localStorage: service('localStorage'),
 });

gui/app/pods/folder/settings/invitation/controller.js

@@ -9,7 +9,7 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
 });

gui/app/pods/folder/settings/invitation/route.js

@@ -9,14 +9,16 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { hash } from 'rsvp';
+
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
+export default Route.extend(AuthenticatedRouteMixin, {
 	model() {
 		this.get('browser').setTitle(this.modelFor('folder').folder.get('name'));
 
-		return Ember.RSVP.hash({
+		return hash({
 			folder: this.modelFor('folder').folder,
 			permissions: this.modelFor('folder').permissions,
 			folders: this.modelFor('folder').folders

gui/app/pods/folder/settings/route.js

@@ -9,10 +9,12 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { hash } from 'rsvp';
+
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
+export default Route.extend(AuthenticatedRouteMixin, {
 	beforeModel: function (transition) {
 		if (is.equal(transition.targetName, 'folder.settings.index')) {
 			this.transitionTo('folder.settings.security');
@@ -22,7 +24,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 	model() {
 		this.get('browser').setTitle(this.modelFor('folder').folder.get('name'));
 
-		return Ember.RSVP.hash({
+		return hash({
 			folder: this.modelFor('folder').folder,
 			permissions: this.modelFor('folder').permissions,
 			folders: this.modelFor('folder').folders

gui/app/pods/folder/settings/security/controller.js

@@ -9,7 +9,7 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
 });

gui/app/pods/folder/settings/security/route.js

@@ -9,14 +9,16 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { hash } from 'rsvp';
+
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
+export default Route.extend(AuthenticatedRouteMixin, {
 	model() {
 		this.get('browser').setTitle(this.modelFor('folder').folder.get('name'));
 
-		return Ember.RSVP.hash({
+		return hash({
 			folder: this.modelFor('folder').folder,
 			permissions: this.modelFor('folder').permissions,
 			folders: this.modelFor('folder').folders