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/auth/forgot/controller.js

@@ -9,10 +9,12 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
 
-export default Ember.Controller.extend({
-	userService: Ember.inject.service('user'),
+import Controller from '@ember/controller';
+
+export default Controller.extend({
+	userService: service('user'),
 
 	actions: {
 		forgot: function (email) {

gui/app/pods/auth/forgot/route.js

@@ -9,11 +9,13 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+
+import Route from '@ember/routing/route';
 import constants from '../../../utils/constants';
 
-export default Ember.Route.extend({
-    appMeta: Ember.inject.service(),
+export default Route.extend({
+    appMeta: service(),
 
 	beforeModel() {
 		if (this.get('appMeta.authProvider') === constants.AuthProvider.Keycloak) {

gui/app/pods/auth/forgot/template.hbs

@@ -1,6 +1,6 @@
 <div class="auth-box">
     <div class="logo">
-        <img src="/assets/img/logo-color.png" title="Documize" alt="Documize" class="responsive-img" />
+        <img src="/assets/img/logo-color.png" title="Documize" alt="Documize" class="img-fluid" />
     </div>
     <div class="login-form">
         {{forgot-password forgot=(action 'forgot')}}

gui/app/pods/auth/keycloak/controller.js

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

gui/app/pods/auth/keycloak/route.js

@@ -9,14 +9,17 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { Promise as EmberPromise } from 'rsvp';
+
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import constants from '../../../utils/constants';
 
-export default Ember.Route.extend({
-	session: Ember.inject.service(),
-	appMeta: Ember.inject.service(),
-	kcAuth: Ember.inject.service(),
-	localStorage: Ember.inject.service(),
+export default Route.extend({
+	session: service(),
+	appMeta: service(),
+	kcAuth: service(),
+	localStorage: service(),
 	queryParams: {
 		mode: {
 			refreshModel: true
@@ -25,7 +28,7 @@ export default Ember.Route.extend({
 	message: '',
 
 	beforeModel(transition) {
-		return new Ember.RSVP.Promise((resolve) => {
+		return new EmberPromise((resolve) => {
 			this.set('mode', is.not.undefined(transition.queryParams.mode) ? transition.queryParams.mode : 'reject');
 
 			if (this.get('mode') === 'reject' || this.get('appMeta.authProvider') !== constants.AuthProvider.Keycloak) {

gui/app/pods/auth/login/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 AuthProvider from '../../../mixins/auth';
 
-export default Ember.Controller.extend(AuthProvider, {
-	appMeta: Ember.inject.service('app-meta'),
-	session: Ember.inject.service('session'),
+export default Controller.extend(AuthProvider, {
+	appMeta: service('app-meta'),
+	session: service('session'),
 	invalidCredentials: false,
 
 	reset() {

gui/app/pods/auth/login/route.js

@@ -9,17 +9,20 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { Promise as EmberPromise } from 'rsvp';
+
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import constants from '../../../utils/constants';
 
-export default Ember.Route.extend({
-    appMeta: Ember.inject.service(),
-	kcAuth: Ember.inject.service(),
-	localStorage: Ember.inject.service(),
+export default Route.extend({
+    appMeta: service(),
+	kcAuth: service(),
+	localStorage: service(),
 	showLogin: false,
 
 	beforeModel(transition) {
-		return new Ember.RSVP.Promise((resolve) => {
+		return new EmberPromise((resolve) => {
 			let authProvider = this.get('appMeta.authProvider');
 
 			switch (authProvider) {

gui/app/pods/auth/login/template.hbs

@@ -1,7 +1,7 @@
 {{#if model.showLogin}}
     <div class="auth-box">
         <div class="logo">
-            <img src="/assets/img/logo-color.png" title="Documize" alt="Documize" class="responsive-img" />
+            <img src="/assets/img/logo-color.png" title="Documize" alt="Documize" class="img-fluid" />
         </div>
         <div class="login-form">
             <form id="login-form" {{action 'login' on="submit"}}>

gui/app/pods/auth/logout/controller.js

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

gui/app/pods/auth/logout/route.js

@@ -9,12 +9,14 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+
+import Route from '@ember/routing/route';
 import config from 'documize/config/environment';
 
-export default Ember.Route.extend({
-	session: Ember.inject.service(),
-	appMeta: Ember.inject.service(),
+export default Route.extend({
+	session: service(),
+	appMeta: service(),
 
 	activate: function () {
 		this.get('session').invalidate().then(() => { 

gui/app/pods/auth/reset/controller.js

@@ -9,10 +9,12 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
 
-export default Ember.Controller.extend({
-	userService: Ember.inject.service('user'),
+import Controller from '@ember/controller';
+
+export default Controller.extend({
+	userService: service('user'),
 	password: "",
 	passwordConfirm: "",
 	mustMatch: false,

gui/app/pods/auth/reset/route.js

@@ -9,9 +9,9 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
 	model: function (params) {
 		return params.token;
 	},

gui/app/pods/auth/reset/template.hbs

@@ -1,6 +1,6 @@
 <div class="auth-box">
     <div class="logo">
-        <img src="/assets/img/logo-color.png" title="Documize" alt="Documize" class="responsive-img" />
+        <img src="/assets/img/logo-color.png" title="Documize" alt="Documize" class="img-fluid" />
     </div>
     {{password-reset reset=(action 'reset')}}
 </div>

gui/app/pods/auth/route.js

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

gui/app/pods/auth/share/controller.js

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

gui/app/pods/auth/share/route.js

@@ -9,12 +9,14 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+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, {
-	session: Ember.inject.service(),
-	localStorage: Ember.inject.service(),
+export default Route.extend(AuthenticatedRouteMixin, {
+	session: service(),
+	localStorage: service(),
 
 	beforeModel() {
 		this.get('localStorage').clearAll();

gui/app/pods/auth/sso/controller.js

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

gui/app/pods/auth/sso/route.js

@@ -9,11 +9,13 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
 
-export default Ember.Route.extend({
-	session: Ember.inject.service(),
-	localStorage: Ember.inject.service(),
+import Route from '@ember/routing/route';
+
+export default Route.extend({
+	session: service(),
+	localStorage: service(),
 
 	beforeModel() {
 		this.get('localStorage').clearAll();