mirror of
https://github.com/documize/community.git
synced 2025-07-24 07:39:43 +02:00
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.
This commit is contained in:
parent
0f04be4ea1
commit
b31ab712c1
229 changed files with 1610 additions and 3181 deletions
|
@ -9,14 +9,12 @@
|
|||
//
|
||||
// https://documize.com
|
||||
|
||||
import Ember from 'ember';
|
||||
import { Promise as EmberPromise } from 'rsvp';
|
||||
|
||||
import Service, { inject as service } from '@ember/service';
|
||||
import netUtil from '../utils/net';
|
||||
|
||||
const {
|
||||
inject: { service }
|
||||
} = Ember;
|
||||
|
||||
export default Ember.Service.extend({
|
||||
export default Service.extend({
|
||||
sessionService: service('session'),
|
||||
ajax: service(),
|
||||
appMeta: service(),
|
||||
|
@ -24,7 +22,7 @@ export default Ember.Service.extend({
|
|||
config: {},
|
||||
|
||||
boot() {
|
||||
return new Ember.RSVP.Promise((resolve, reject) => {
|
||||
return new EmberPromise((resolve, reject) => {
|
||||
if (is.not.undefined(this.get('keycloak')) && is.not.null(this.get('keycloak')) ) {
|
||||
resolve(this.get('keycloak'));
|
||||
return;
|
||||
|
@ -50,7 +48,7 @@ export default Ember.Service.extend({
|
|||
},
|
||||
|
||||
login() {
|
||||
return new Ember.RSVP.Promise((resolve, reject) => {
|
||||
return new EmberPromise((resolve, reject) => {
|
||||
this.boot().then((keycloak) => {
|
||||
let url = netUtil.getAppUrl(netUtil.getSubdomain()) + '/auth/keycloak?mode=login';
|
||||
|
||||
|
@ -64,7 +62,7 @@ export default Ember.Service.extend({
|
|||
},
|
||||
|
||||
logout() {
|
||||
return new Ember.RSVP.Promise((resolve, reject) => {
|
||||
return new EmberPromise((resolve, reject) => {
|
||||
this.boot().then((keycloak) => {
|
||||
keycloak.logout(JSON.parse(this.get('appMeta.authConfig'))).success(() => {
|
||||
this.get('keycloak').clearToken();
|
||||
|
@ -78,7 +76,7 @@ export default Ember.Service.extend({
|
|||
},
|
||||
|
||||
fetchProfile() {
|
||||
return new Ember.RSVP.Promise((resolve, reject) => {
|
||||
return new EmberPromise((resolve, reject) => {
|
||||
this.boot().then((keycloak) => {
|
||||
keycloak.loadUserProfile().success((profile) => {
|
||||
resolve(profile);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue