Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-02 20:15:26 +02:00
Code Releases Activity

upgraded Ember and integrated Bootstrap 4

Browse source 
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:
Harvey Kandola 2017-11-16 13:28:05 +00:00
parent 0f04be4ea1
commit b31ab712c1
229 changed files with 1610 additions and 3181 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gui/app/pods/customize/auth/controller.js
View file

@ -9,18 +9,21 @@
//
// https://documize.com
import Ember from 'ember';
import { Promise as EmberPromise } from 'rsvp';
import { inject as service } from '@ember/service';
import Controller from '@ember/controller';
import NotifierMixin from "../../../mixins/notifier";
// import constants from '../../../utils/constants';
export default Ember.Controller.extend(NotifierMixin, {
global: Ember.inject.service(),
appMeta: Ember.inject.service(),
session: Ember.inject.service(),
export default Controller.extend(NotifierMixin, {
global: service(),
appMeta: service(),
session: service(),
actions: {
onSave(data) {
return new Ember.RSVP.Promise((resolve) => {
return new EmberPromise((resolve) => {
if(!this.get('session.isGlobalAdmin')) {
resolve();
} else {
@ -32,7 +35,7 @@ export default Ember.Controller.extend(NotifierMixin, {
},
onSync() {
return new Ember.RSVP.Promise((resolve) => {
return new EmberPromise((resolve) => {
this.get('global').syncExternalUsers().then((response) => {
resolve(response);
});

15
gui/app/pods/customize/auth/route.js
View file

@ -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 AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
import constants from '../../../utils/constants';
export default Ember.Route.extend(AuthenticatedRouteMixin, {
appMeta: Ember.inject.service(),
session: Ember.inject.service(),
global: Ember.inject.service(),
export default Route.extend(AuthenticatedRouteMixin, {
appMeta: service(),
session: service(),
global: service(),
beforeModel() {
if (!this.get("session.isGlobalAdmin")) {
@ -30,7 +33,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
authConfig: null,
};
return new Ember.RSVP.Promise((resolve) => {
return new EmberPromise((resolve) => {
this.get('global').getAuthConfig().then((config) => {
switch (data.authProvider) {
case constants.AuthProvider.Keycloak:

4
gui/app/pods/customize/controller.js
View file

@ -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({});

8
gui/app/pods/customize/folders/controller.js
View file

@ -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 DropdownMixin from '../../../mixins/dropdown';
export default Ember.Controller.extend(NotifierMixin, DropdownMixin, {
folderService: Ember.inject.service('folder'),
export default Controller.extend(NotifierMixin, DropdownMixin, {
folderService: service('folder'),
folders: [],
dropdown: null,
deleteSpace: {

8
gui/app/pods/customize/folders/route.js
View file

@ -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 AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
export default Ember.Route.extend(AuthenticatedRouteMixin, {
folderService: Ember.inject.service('folder'),
export default Route.extend(AuthenticatedRouteMixin, {
folderService: service('folder'),
beforeModel() {
if (!this.session.isAdmin) {

8
gui/app/pods/customize/general/controller.js
View file

@ -9,11 +9,13 @@
//
// https://documize.com
import Ember from 'ember';
import { inject as service } from '@ember/service';
import Controller from '@ember/controller';
import NotifierMixin from "../../../mixins/notifier";
export default Ember.Controller.extend(NotifierMixin, {
orgService: Ember.inject.service('organization'),
export default Controller.extend(NotifierMixin, {
orgService: service('organization'),
actions: {
save() {

12
gui/app/pods/customize/general/route.js
View file

@ -9,14 +9,16 @@
//
// https://documize.com
import Ember from 'ember';
import { inject as service } from '@ember/service';
import Route from '@ember/routing/route';
import RSVP from 'rsvp';
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
export default Ember.Route.extend(AuthenticatedRouteMixin, {
orgService: Ember.inject.service('organization'),
appMeta: Ember.inject.service(),
session: Ember.inject.service(),
export default Route.extend(AuthenticatedRouteMixin, {
orgService: service('organization'),
appMeta: service(),
session: service(),
beforeModel() {
if (!this.get("session.isAdmin")) {

8
gui/app/pods/customize/global/controller.js
View file

@ -9,11 +9,13 @@
//
// https://documize.com
import Ember from 'ember';
import { inject as service } from '@ember/service';
import Controller from '@ember/controller';
import NotifierMixin from "../../../mixins/notifier";
export default Ember.Controller.extend(NotifierMixin, {
global: Ember.inject.service(),
export default Controller.extend(NotifierMixin, {
global: service(),
actions: {
saveSMTP() {

12
gui/app/pods/customize/global/route.js
View file

@ -9,14 +9,16 @@
//
// https://documize.com
import Ember from 'ember';
import { inject as service } from '@ember/service';
import Route from '@ember/routing/route';
import RSVP from 'rsvp';
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
export default Ember.Route.extend(AuthenticatedRouteMixin, {
appMeta: Ember.inject.service(),
session: Ember.inject.service(),
global: Ember.inject.service(),
export default Route.extend(AuthenticatedRouteMixin, {
appMeta: service(),
session: service(),
global: service(),
beforeModel() {
if (!this.get("session.isGlobalAdmin")) {

4
gui/app/pods/customize/route.js
View file

@ -9,10 +9,10 @@
//
// https://documize.com
import Ember from 'ember';
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, 'customize.index')) {
this.transitionTo('customize.general');

11
gui/app/pods/customize/users/controller.js
View file

@ -9,16 +9,19 @@
//
// https://documize.com
import Ember from 'ember';
import { set } from '@ember/object';
import { inject as service } from '@ember/service';
import Controller from '@ember/controller';
import NotifierMixin from '../../../mixins/notifier';
export default Ember.Controller.extend(NotifierMixin, {
userService: Ember.inject.service('user'),
export default Controller.extend(NotifierMixin, {
userService: service('user'),
newUser: { firstname: "", lastname: "", email: "", active: true },
actions: {
add(user) {
Ember.set(this, 'newUser', user);
set(this, 'newUser', user);
return this.get('userService')
.add(this.get('newUser'))

15
gui/app/pods/customize/users/route.js
View file

@ -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 AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
import constants from '../../../utils/constants';
export default Ember.Route.extend(AuthenticatedRouteMixin, {
userService: Ember.inject.service('user'),
global: Ember.inject.service('global'),
appMeta: Ember.inject.service(),
export default Route.extend(AuthenticatedRouteMixin, {
userService: service('user'),
global: service('global'),
appMeta: service(),
beforeModel () {
if (!this.session.isAdmin) {
@ -25,7 +28,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
},
model() {
return new Ember.RSVP.Promise((resolve) => {
return new EmberPromise((resolve) => {
if (this.get('appMeta.authProvider') == constants.AuthProvider.Keycloak) {
this.get('global').syncExternalUsers().then(() => {
this.get('userService').getComplete().then((users) =>{