diff --git a/domain/category/endpoint.go b/domain/category/endpoint.go index 4c93131b..ef54ab40 100644 --- a/domain/category/endpoint.go +++ b/domain/category/endpoint.go @@ -279,7 +279,7 @@ func (h *Handler) Delete(w http.ResponseWriter, r *http.Request) { } /* - 7. link/unlink document to category 6. add category view permission !!! + 7. link/unlink document to category 8. filter space documents by category -- URL param? nested route? */ diff --git a/gui/app/components/document/tab-heading.js b/gui/app/components/document/tab-heading.js index e560f7e9..435d4dbb 100644 --- a/gui/app/components/document/tab-heading.js +++ b/gui/app/components/document/tab-heading.js @@ -77,7 +77,7 @@ export default Ember.Component.extend(TooltipMixin, { let permissions = this.get('permissions'); return permissions.get('documentDelete') || permissions.get('documentCopy') || - permissions.get('documentMove') || permissions.get('documentTemplate');; + permissions.get('documentMove') || permissions.get('documentTemplate'); }), didRender() { diff --git a/gui/app/components/layout/zone-navigation.js b/gui/app/components/layout/zone-navigation.js deleted file mode 100644 index e0cf20c6..00000000 --- a/gui/app/components/layout/zone-navigation.js +++ /dev/null @@ -1,172 +0,0 @@ -// Copyright 2016 Documize Inc. . All rights reserved. -// -// This software (Documize Community Edition) is licensed under -// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html -// -// You can operate outside the AGPL restrictions by purchasing -// Documize Enterprise Edition and obtaining a commercial license -// by contacting . -// -// https://documize.com - -import Ember from 'ember'; -import netUtil from '../../utils/net'; -import constants from '../../utils/constants'; -import TooltipMixin from '../../mixins/tooltip'; - -const { - inject: { service } -} = Ember; - -export default Ember.Component.extend(TooltipMixin, { - folderService: service('folder'), - appMeta: service(), - session: service(), - store: service(), - folder: null, - view: { - folder: false, - search: false, - settings: false, - profile: false - }, - pinned: service(), - pins: [], - enableLogout: true, - - init() { - this._super(...arguments); - - if (this.get("session.authenticated") && this.get("session.user.id") !== '0') { - this.get("session.accounts").forEach((account) => { - // TODO: do not mutate account.active here - account.active = account.orgId === this.get("appMeta.orgId"); - }); - } - - this.set('pins', this.get('pinned').get('pins')); - - if (this.get('appMeta.authProvider') === constants.AuthProvider.Keycloak) { - let config = this.get('appMeta.authConfig'); - config = JSON.parse(config); - this.set('enableLogout', !config.disableLogout); - } - }, - - didReceiveAttrs() { - if (this.get('folder') === null) { - this.set("folder", this.get('folderService.currentFolder')); - } - - let route = this.get('router.currentRouteName'); - this.set('view.folder', (is.startWith(route, 'folder')) ? true : false); - this.set('view.settings', (is.startWith(route, 'customize')) ? true : false); - this.set('view.profile', (route === 'profile') ? true : false); - this.set('view.search', (route === 'search') ? true : false); - }, - - didInsertElement() { - this._super(...arguments); - - // Size the pinned items zone - if (this.get("session.authenticated")) { - this.eventBus.subscribe('resized', this, 'sizePinnedZone'); - this.eventBus.subscribe('pinChange', this, 'setupPins'); - this.sizePinnedZone(); - this.setupPins(); - - let self = this; - - var sortable = Sortable.create(document.getElementById('pinned-zone'), { - animation: 150, - onEnd: function () { - self.get('pinned').updateSequence(this.toArray()).then((pins) => { - self.set('pins', pins); - }); - } - }); - - this.set('sortable', sortable); - } - }, - - didRender() { - if (this.get('session.isAdmin')) { - this.addTooltip(document.getElementById("workspace-settings")); - } - if (this.get("session.authenticated") && this.get('enableLogout')) { - this.addTooltip(document.getElementById("workspace-logout")); - } else { - this.addTooltip(document.getElementById("workspace-login")); - } - if (this.get("session.authenticated")) { - this.addTooltip(document.getElementById("user-profile-button")); - } - if (this.get('session.hasAccounts')) { - this.addTooltip(document.getElementById("accounts-button")); - } - - this.addTooltip(document.getElementById("home-button")); - this.addTooltip(document.getElementById("search-button")); - }, - - setupPins() { - if (this.get('isDestroyed') || this.get('isDestroying')) { - return; - } - - this.get('pinned').getUserPins().then((pins) => { - if (this.get('isDestroyed') || this.get('isDestroying')) { - return; - } - - this.set('pins', pins); - - pins.forEach((pin) => { - this.addTooltip(document.getElementById(`pin-${pin.id}`)); - }); - }); - }, - - // set height for pinned zone so ti scrolls on spill - sizePinnedZone() { - let topofBottomZone = parseInt($('#bottom-zone').css("top").replace("px", "")); - let heightOfTopZone = parseInt($('#top-zone').css("height").replace("px", "")); - let size = topofBottomZone - heightOfTopZone - 40; - $('#pinned-zone').css('height', size + "px"); - }, - - willDestroyElement() { - let sortable = this.get('sortable'); - - if (!_.isUndefined(sortable)) { - sortable.destroy(); - } - - this.eventBus.unsubscribe('resized'); - this.eventBus.unsubscribe('pinChange'); - - this.destroyTooltips(); - }, - - actions: { - switchAccount(domain) { - window.location.href = netUtil.getAppUrl(domain); - }, - - jumpToPin(pin) { - let folderId = pin.get('folderId'); - let documentId = pin.get('documentId'); - - if (_.isEmpty(documentId)) { - // jump to space - let folder = this.get('store').peekRecord('folder', folderId); - this.get('router').transitionTo('folder', folderId, folder.get('slug')); - } else { - // jump to doc - let folder = this.get('store').peekRecord('folder', folderId); - this.get('router').transitionTo('document', folderId, folder.get('slug'), documentId, 'document'); - } - } - } -}); diff --git a/gui/app/components/layout/zone-sidebar.js b/gui/app/components/layout/zone-sidebar.js index cb25c125..3a698cb9 100644 --- a/gui/app/components/layout/zone-sidebar.js +++ b/gui/app/components/layout/zone-sidebar.js @@ -10,6 +10,74 @@ // https://documize.com import Ember from 'ember'; +import constants from '../../utils/constants'; + +const { + computed, + inject: { service } +} = Ember; export default Ember.Component.extend({ + folderService: service('folder'), + appMeta: service(), + session: service(), + store: service(), + pinned: service(), + enableLogout: true, + pins: [], + hasPins: computed.notEmpty('pins'), + + init() { + this._super(...arguments); + + if (this.get('appMeta.authProvider') === constants.AuthProvider.Keycloak) { + let config = this.get('appMeta.authConfig'); + config = JSON.parse(config); + this.set('enableLogout', !config.disableLogout); + } + }, + + didInsertElement() { + this._super(...arguments); + + if (this.get("session.authenticated")) { + this.eventBus.subscribe('pinChange', this, 'setupPins'); + this.setupPins(); + } + }, + + setupPins() { + if (this.get('isDestroyed') || this.get('isDestroying')) { + return; + } + + this.get('pinned').getUserPins().then((pins) => { + if (this.get('isDestroyed') || this.get('isDestroying')) { + return; + } + + this.set('pins', pins); + }); + }, + + willDestroyElement() { + this.eventBus.unsubscribe('pinChange'); + }, + + actions: { + jumpToPin(pin) { + let folderId = pin.get('folderId'); + let documentId = pin.get('documentId'); + + if (_.isEmpty(documentId)) { + // jump to space + let folder = this.get('store').peekRecord('folder', folderId); + this.get('router').transitionTo('folder', folderId, folder.get('slug')); + } else { + // jump to doc + let folder = this.get('store').peekRecord('folder', folderId); + this.get('router').transitionTo('document', folderId, folder.get('slug'), documentId, 'document'); + } + } + } }); diff --git a/gui/app/pods/customize/template.hbs b/gui/app/pods/customize/template.hbs index cf815854..396789b8 100644 --- a/gui/app/pods/customize/template.hbs +++ b/gui/app/pods/customize/template.hbs @@ -1,4 +1,3 @@ -{{layout/zone-navigation}} {{#layout/zone-container}} {{#layout/zone-sidebar}}
diff --git a/gui/app/pods/document/template.hbs b/gui/app/pods/document/template.hbs index 6583eac5..c24cd689 100644 --- a/gui/app/pods/document/template.hbs +++ b/gui/app/pods/document/template.hbs @@ -1,2 +1 @@ -{{layout/zone-navigation}} {{outlet}} diff --git a/gui/app/pods/folder/template.hbs b/gui/app/pods/folder/template.hbs index 6583eac5..c24cd689 100644 --- a/gui/app/pods/folder/template.hbs +++ b/gui/app/pods/folder/template.hbs @@ -1,2 +1 @@ -{{layout/zone-navigation}} {{outlet}} diff --git a/gui/app/pods/folders/template.hbs b/gui/app/pods/folders/template.hbs index 8b3f2432..a29d8212 100644 --- a/gui/app/pods/folders/template.hbs +++ b/gui/app/pods/folders/template.hbs @@ -1,4 +1,3 @@ -{{layout/zone-navigation}} {{#layout/zone-container}} {{#layout/zone-sidebar}} {{folder/sidebar-zone folders=model noFolder=true onAddSpace=(action 'onAddSpace')}} diff --git a/gui/app/pods/profile/template.hbs b/gui/app/pods/profile/template.hbs index f5392885..60033775 100644 --- a/gui/app/pods/profile/template.hbs +++ b/gui/app/pods/profile/template.hbs @@ -1,4 +1,3 @@ -{{layout/zone-navigation}} {{#layout/zone-container}} {{#layout/zone-sidebar}}
diff --git a/gui/app/pods/search/template.hbs b/gui/app/pods/search/template.hbs index f7277a4b..190f0c6b 100644 --- a/gui/app/pods/search/template.hbs +++ b/gui/app/pods/search/template.hbs @@ -1,5 +1,3 @@ -{{layout/zone-navigation}} - {{#layout/zone-container}} {{#layout/zone-sidebar}}
diff --git a/gui/app/styles/app.scss b/gui/app/styles/app.scss index 1434b597..2d17b7d5 100644 --- a/gui/app/styles/app.scss +++ b/gui/app/styles/app.scss @@ -13,8 +13,8 @@ @import "mixins.scss"; @import "base.scss"; @import "widget/widget.scss"; -@import "view/layout-right-nav.scss"; -@import "view/layout-left-sidebar.scss"; +@import "view/layout-navigation.scss"; +@import "view/layout-sidebar.scss"; @import "view/page-search.scss"; @import "view/page-profile.scss"; @import "view/page-customize.scss"; diff --git a/gui/app/styles/view/layout-right-nav.scss b/gui/app/styles/view/layout-navigation.scss similarity index 100% rename from gui/app/styles/view/layout-right-nav.scss rename to gui/app/styles/view/layout-navigation.scss diff --git a/gui/app/styles/view/layout-left-sidebar.scss b/gui/app/styles/view/layout-sidebar.scss similarity index 87% rename from gui/app/styles/view/layout-left-sidebar.scss rename to gui/app/styles/view/layout-sidebar.scss index 7df8ce8b..9b2c79da 100644 --- a/gui/app/styles/view/layout-left-sidebar.scss +++ b/gui/app/styles/view/layout-sidebar.scss @@ -31,7 +31,7 @@ $sidebar-width: 400px; margin-right: auto; margin-left: auto; padding-left: 30px; - padding-right: 30px; + padding-right: 0; max-width: 1200px; } @@ -39,7 +39,7 @@ $sidebar-width: 400px; width: 100%; position: relative; // position: absolute; - padding: 30px; + padding: 30px 0 30px 30px; margin: 0 auto; margin-top: 30px; @@ -158,3 +158,30 @@ $sidebar-width: 400px; } } } + +.navigation { + margin: 15px 0 0 0; + text-align: center; + + .round-button-mono { + > .material-icons { + color: $color-gray; + @include ease-in(); + } + + &:hover { + > .material-icons { + color: $color-link; + } + } + } + + .profile-link { + color: $color-primary; + text-align: center; + font-size: 1rem; + font-style: normal; + font-family: $font-regular; + vertical-align: top; + } +} diff --git a/gui/app/templates/components/layout/zone-navigation.hbs b/gui/app/templates/components/layout/zone-navigation.hbs deleted file mode 100644 index 6b5e19ad..00000000 --- a/gui/app/templates/components/layout/zone-navigation.hbs +++ /dev/null @@ -1,75 +0,0 @@ -
-
    - {{#if session.hasAccounts}} -
  • -
    - apps -
    -
    • - {{/if}} -
  • - {{#link-to 'folders' tagName="div" class="round-button-mono button-white"}} - home - {{/link-to}} -
    • -
  • - {{#link-to 'search' tagName="div" class="round-button-mono button-white"}} - search - {{/link-to}} -
    • -
- -
    - {{#each pins as |pin|}} -
  • {{pin.pin}}
    • - {{/each}} -
- -
    - {{#if session.session.content.authenticated.user.admin}} -
  • - {{#link-to 'customize.general'}} -
    - tune -
    - {{/link-to}} -
    • - {{/if}} - {{#if session.authenticated}} -
  • - {{#link-to 'profile'}} -
    - {{session.user.initials}} -
    - {{/link-to}} -
    • - {{#if enableLogout}} -
  • - {{#link-to 'auth.logout'}} -
    - exit_to_app -
    - {{/link-to}} -
    • - {{/if}} - {{else}} -
  • - {{#link-to 'auth.login'}} -
    - lock_open -
    - {{/link-to}} -
    • - {{/if}} -
- - {{#if session.hasAccounts}} - {{#dropdown-menu target="accounts-button" position="bottom right" open="click" }} -
    - {{#each session.accounts as |account|}} -
  • {{account.title}}
    • - {{/each}} -
- {{/dropdown-menu}} - {{/if}} -
diff --git a/gui/app/templates/components/layout/zone-sidebar.hbs b/gui/app/templates/components/layout/zone-sidebar.hbs index e7ea4f38..8c970af2 100644 --- a/gui/app/templates/components/layout/zone-sidebar.hbs +++ b/gui/app/templates/components/layout/zone-sidebar.hbs @@ -1,3 +1,51 @@