1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-21 14:19:43 +02:00

[WIP] using new components

This commit is contained in:
Harvey Kandola 2017-11-17 11:31:54 +00:00
parent b31ab712c1
commit ec5d21be4a
23 changed files with 439 additions and 224 deletions

View file

@ -42,7 +42,7 @@ Integrations for embedding SaaS data within documents.
## Latest version
v1.54.1
v1.55.0
## OS support
@ -56,8 +56,8 @@ Documize runs on the following:
Documize is built with the following technologies:
- EmberJS (v2.15.0)
- Go (v1.9.0)
- EmberJS (v2.16.2)
- Go (v1.9.2)
...and supports the following databases:

View file

@ -41,8 +41,8 @@ func main() {
// product details
rt.Product = env.ProdInfo{}
rt.Product.Major = "1"
rt.Product.Minor = "54"
rt.Product.Patch = "1"
rt.Product.Minor = "55"
rt.Product.Patch = "0"
rt.Product.Version = fmt.Sprintf("%s.%s.%s", rt.Product.Major, rt.Product.Minor, rt.Product.Patch)
rt.Product.Edition = "Community"
rt.Product.Title = fmt.Sprintf("%s Edition", rt.Product.Edition)

View file

@ -0,0 +1,85 @@
// Copyright 2016 Documize Inc. <legal@documize.com>. 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 <sales@documize.com>.
//
// https://documize.com
import Component from '@ember/component';
import { notEmpty } from '@ember/object/computed';
import { inject as service } from '@ember/service';
import constants from '../../utils/constants';
export default Component.extend({
folderService: service('folder'),
appMeta: service(),
session: service(),
store: service(),
pinned: service(),
enableLogout: true,
pins: [],
hasPins: notEmpty('pins'),
hasSpacePins: notEmpty('spacePins'),
hasDocumentPins: notEmpty('documentPins'),
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);
this.set('spacePins', pins.filterBy('isSpace', true));
this.set('documentPins', pins.filterBy('isDocument', true));
});
},
willDestroyElement() {
this._super(...arguments);
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');
}
}
}
});

View file

@ -8,74 +8,7 @@
// by contacting <sales@documize.com>.
//
// https://documize.com
import { notEmpty } from '@ember/object/computed';
import Component from '@ember/component';
import { inject as service } from '@ember/service';
import constants from '../../utils/constants';
export default Component.extend({
folderService: service('folder'),
appMeta: service(),
session: service(),
store: service(),
pinned: service(),
enableLogout: true,
pins: [],
hasPins: 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');
}
}
}
});

View file

@ -0,0 +1,54 @@
// Copyright 2016 Documize Inc. <legal@documize.com>. 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 <sales@documize.com>.
//
// https://documize.com
import Component from '@ember/component';
import constants from '../../utils/constants';
import TooltipMixin from '../../mixins/tooltip';
import NotifierMixin from '../../mixins/notifier';
import AuthMixin from '../../mixins/auth';
export default Component.extend(TooltipMixin, NotifierMixin, AuthMixin, {
publicFolders: [],
protectedFolders: [],
privateFolders: [],
hasPublicFolders: false,
hasProtectedFolders: false,
hasPrivateFolders: false,
didReceiveAttrs() {
let folders = this.get('spaces');
let publicFolders = [];
let protectedFolders = [];
let privateFolders = [];
_.each(folders, folder => {
if (folder.get('folderType') === constants.FolderType.Public) {
publicFolders.pushObject(folder);
}
if (folder.get('folderType') === constants.FolderType.Private) {
privateFolders.pushObject(folder);
}
if (folder.get('folderType') === constants.FolderType.Protected) {
protectedFolders.pushObject(folder);
}
});
this.set('publicFolders', publicFolders);
this.set('protectedFolders', protectedFolders);
this.set('privateFolders', privateFolders);
this.set('hasPublicFolders', this.get('publicFolders.length') > 0);
this.set('hasPrivateFolders', this.get('privateFolders.length') > 0);
this.set('hasProtectedFolders', this.get('protectedFolders.length') > 0);
},
actions: {
}
});

View file

@ -11,6 +11,7 @@
import Model from 'ember-data/model';
import attr from 'ember-data/attr';
import { computed } from '@ember/object';
export default Model.extend({
orgId: attr('string'),
@ -20,5 +21,12 @@ export default Model.extend({
sequence: attr('number', { defaultValue: 99 }),
pin: attr('string'),
created: attr(),
revised: attr()
revised: attr(),
isSpace: computed('documentId', function() {
return this.get('documentId') === '';
}),
isDocument: computed('documentId', function() {
return this.get('documentId') !== '';
})
});

View file

@ -10,7 +10,6 @@
// https://documize.com
import Route from '@ember/routing/route';
import { inject as service } from '@ember/service';
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';

View file

@ -1,7 +1,22 @@
{{layout/nav-bar}}
<div class="container">
<div class="row">
<div class="col-12">
<div class="mt-5 mb-5">
{{spaces/space-list spaces=model}}
</div>
</div>
</div>
</div>
<div class="d-none">
{{#layout/zone-container}}
{{#layout/zone-sidebar}}
{{folder/sidebar-zone folders=model noFolder=true onAddSpace=(action 'onAddSpace')}}
{{/layout/zone-sidebar}}
{{#layout/zone-content}}
{{/layout/zone-content}}
{{/layout/zone-container}}
</div>

View file

@ -14,7 +14,7 @@
@import "base.scss";
@import "bootstrap.scss";
@import "widget/widget.scss";
@import "view/layout-sidebar.scss";
@import "view/layout.scss";
@import "view/page-search.scss";
@import "view/page-profile.scss";
@import "view/page-customize.scss";
@ -24,6 +24,9 @@
@import "view/folder/all.scss";
@import "view/document/all.scss";
@import "view/common.scss";
@import "view/views.scss";
@import "vendor.scss";
@import "responsive.scss";
@import "print.scss";

View file

@ -14,6 +14,9 @@
// Variable overrides
//
// font
// $font-family-sans-serif: "Helvetica", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
// colors
$blue: $color-primary;
$red: $color-red;
@ -36,24 +39,21 @@ $modal-backdrop-opacity: 0.7;
$modal-header-border-color: $color-white;
$modal-footer-border-color: $color-white;
.modal-header {
background-color: $color-gray;
background-color: $color-primary;
color: $color-off-white;
font-size: 1.2rem;
}
// rounded corners
// $border-radius: 0rem;
// $border-radius-lg: 0rem;
// $border-radius-sm: 0rem;
$border-radius: .125rem;
$border-radius-lg: .15rem;
$border-radius-sm: .1rem;
// dropdown
$dropdown-link-color: $color-off-black;
$dropdown-link-hover-color: $color-primary;
$dropdown-link-hover-color: $color-link;
$dropdown-link-hover-bg: $color-white;
$dropdown-link-active-color: $color-primary;
$dropdown-link-active-color: $color-link;
$dropdown-link-active-bg: $color-white;
// form
@ -65,10 +65,13 @@ $input-focus-color: $color-off-black;
$input-placeholder-color: $color-gray;
$input-focus-border-color: $color-stroke;
$input-btn-focus-width: .2rem;
$input-btn-focus-color: rgba($color-gray, .25);
$input-btn-focus-color: rgba($color-primary, .25);
// font
// $font-family-sans-serif: "Helvetica", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
// links
$link-color: $color-link;
$link-decoration: none;
$link-hover-color: darken($link-color, 15%) !default;
$link-hover-decoration: none;
//

View file

@ -10,20 +10,22 @@
// https://documize.com
// Theme colors
$color-primary: #2667af;
$color-link: #0092d3;
$color-border: #f3f5f8;
$color-primary: #351056;
$color-primary-light: #F7F2FF;
$color-link: #1b701e;
// Theme-neutral colors
$color-off-white: #f5f5f5;
$color-off-black: #111111;
$color-black: #000000;
$color-white: #ffffff;
$color-off-black: #111111;
$color-dark: #434343;
$color-gray: #8b9096;
$color-red: #d04134;
$color-green: #4caf50;
$color-white: #ffffff;
$color-off-white: #f5f5f5;
$color-red: #b1251b;
$color-green: #1b701e;
$color-blue: #2667af;
$color-gray: #8e969e; //8b9096
$color-goldy: #cc9933;
$color-table-border: #e1e1e1;
@ -31,6 +33,8 @@ $color-table-header: #f5f5f5;
$color-toolbar: #eeeeee;
$color-wysiwyg: #3c3c3c;
$color-card: #F9F9F9;
$color-border: #f3f5f8;
$color-input: #5a5a5a;
$color-stroke: #e1e1e1;
$color-tooltip: #a1a1a1;
@ -39,7 +43,7 @@ $color-symbol-box: #dce5e8;
$color-symbol-icon: #a4b8be;
$color-checkbox: #0092d3;
// gray sidebar
// gray sidebar -- DEAD
$color-sidebar: #f5f5f5;
$color-sidebar-border: #e1e1e1;
$color-sidebar-text: $color-black;
@ -52,31 +56,6 @@ $color-sidebar-navigation: #f2faff;
$color-sidebar-navigation-border: #dff0f9;
$color-sidebar-toolbar: $color-sidebar-border;
// lightblue sidebar
// $color-sidebar: #f2faff;
// $color-sidebar-border: #dff0f9;
// $color-sidebar-text: $color-black;
// $color-sidebar-link: $color-link;
// $color-nav-button: $color-sidebar;
// $color-nav-button-text: #2667af;
// $color-nav-button-border: #dff0f9;
// $color-selected-item: $color-sidebar;
// $color-sidebar-navigation: $color-gray;
// $color-sidebar-toolbar: $color-sidebar-border;
// black sidebar
// $color-sidebar: $color-off-black;
// $color-sidebar-border: $color-black;
// $color-sidebar-text: $color-white;
// $color-sidebar-link: orange;
// $color-nav-button: orange;
// $color-nav-button-text: $color-off-black;
// $color-nav-button-border: $color-black;
// $color-selected-item: orange;
// $color-sidebar-navigation: orange;
// $color-sidebar-navigation-border: orange;
// $color-sidebar-toolbar: orange;
// Color utility classes for direct usage in HTML
.color-white {
color: $color-white !important;

View file

@ -33,3 +33,13 @@
box-shadow: 0 0 0 0.75pt $color-stroke,0 0 3pt 0.75pt $color-stroke;
background-color: $color-white;
}
@mixin card() {
background-color: $color-card;
box-shadow: 1px 1px 3px 0px rgba(211,211,211,1);
&:hover {
background-color: darken($color-card, 3%);
color: $color-link;
}
}

View file

@ -1,4 +1,3 @@
@import "document.scss";
@import "folder.scss";
@import "wizard.scss";
@import "settings.scss";

View file

@ -1,45 +0,0 @@
.folders-list {
> .section {
margin: 30px 0 10px;
> .heading {
font-size: 0.9rem;
font-weight: bold;
color: $color-gray;
padding-bottom: 5px;
}
> .message {
font-size: 0.8rem;
color: $color-gray;
margin-top: 10px;
}
> .list {
padding: 0;
margin: 5px 0 0 15px;
> .link {
font-size: 1rem;
color: $color-sidebar-text;
text-decoration: none;
&:hover {
color: $color-sidebar-link;
}
> .item {
list-style-type: none;
list-style: none;
margin: 0 0 5px;
padding: 0;
}
}
> .selected {
color: $color-sidebar-link;
font-weight: bold;
}
}
}
}

View file

@ -1,3 +1,35 @@
.nav-bar {
background-color: $color-primary;
padding: 10px 20px;
color: $color-white;
font-size: 1rem;
.nav-link, .nav-link:visited {
color: $color-white;
&:hover {
color: darken($color-white, 15%);
}
}
.nav-title {
font-size: 1.4rem;
font-weight: bold;
}
.nav-msg {
font-size: 0.875rem;
}
.nav-right {
float: right;
}
}
// pre-nov17 UX
$sidebar-width: 400px;
#wrapper {

View file

@ -0,0 +1,38 @@
.view-spaces {
> .heading {
font-size: 1.3rem;
font-weight: bold;
color: $color-dark;
text-transform: uppercase;
> .counter {
font-size: 0.9rem;
font-weight: normal;
color: $color-gray;
display: inline-block;
margin-left: 10px;
}
}
> .list {
margin: 30px 0;
padding: 0;
> a {
color: $color-black;
> .item {
@include card();
@include ease-in();
list-style-type: none;
float: left;
margin: 0 20px 20px 0;
padding: 10px;
width: 250px;
height: 100px;
font-size: 1.1rem;
overflow: hidden;
}
}
}
}

View file

@ -0,0 +1 @@
@import "spaces.scss";

View file

@ -320,3 +320,46 @@
display: inline-block;
@extend .no-select;
}
.button-icon-white {
display: inline-block;
cursor: default;
@include ease-in();
> i {
color: $color-white;
font-size: 2rem;
@include ease-in();
}
&:hover {
> i {
color: darken($color-white, 15%);
}
}
}
.button-icon-gap {
display: inline-block;
margin-left: 5px;
}
.button-gravatar-white {
display: inline-block;
cursor: default;
position: relative;
overflow: hidden;
width: 35px;
height: 35px;
line-height: 34px;
padding: 0;
border-radius: 50%;
text-align: center;
color: $color-primary;
background-color: $color-white;
@include ease-in();
&:hover {
background-color: darken($color-white, 15%);
}
}

View file

@ -0,0 +1,68 @@
<div id="nav-bar" class="nav-bar clearfix">
<div class="row no-gutters">
<div class="col col-sm-9">
{{#link-to "profile" class='nav-link'}}
<div class="nav-title">{{appMeta.title}}</div>
<div class="nav-msg text-truncate">{{appMeta.message}}</div>
{{/link-to}}
</div>
<div class="col col-sm-3">
<div class="nav-right">
<div class="btn-group">
{{#link-to "search" class="button-icon-white"}}
<i class="material-icons">search</i>
{{/link-to}}
</div>
{{#if session.authenticated}}
{{#if hasPins}}
<div class="button-icon-gap" />
<div class="btn-group">
<div class="button-icon-white" id="user-pins-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="material-icons">star</i>
</div>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="user-pins-button">
{{#if hasSpacePins}}
<h6 class="dropdown-header">Spaces</h6>
{{#each spacePins as |pin|}}
<a class="dropdown-item" href="#" {{action 'jumpToPin' pin}} data-id={{pin.id}} id="pin-{{pin.id}}">{{pin.pin}}</a>
{{/each}}
{{/if}}
{{#if hasDocumentPins}}
<h6 class="dropdown-header">Documents</h6>
{{#each documentPins as |pin|}}
<a class="dropdown-item" href="#" {{action 'jumpToPin' pin}} data-id={{pin.id}} id="pin-{{pin.id}}">{{pin.pin}}</a>
{{/each}}
{{/if}}
</div>
</div>
{{/if}}
<div class="button-icon-gap" />
<div class="btn-group">
<div class="button-gravatar-white align-text-bottom" id="profile-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{session.user.initials}}
</div>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="profile-button">
{{#link-to 'profile' class="dropdown-item"}}Profile{{/link-to}}
{{#if session.isAdmin}}
{{#link-to 'customize.general' class="dropdown-item"}}Settings{{/link-to}}
{{/if}}
{{#if enableLogout}}
<div class="dropdown-divider"></div>
{{#link-to 'auth.logout' class="dropdown-item"}}Logout{{/link-to}}
{{/if}}
</div>
</div>
{{else}}
<div class="button-icon-gap" />
<div class="btn-group">
{{#link-to 'auth.login' class="button-icon-white "}}
<i class="material-icons">lock_open</i>
{{/link-to}}
</div>
{{/if}}
</div>
</div>
</div>
</div>

View file

@ -1,52 +1 @@
<div id="sidebar-wrapper">
<div class="navigation">
{{#link-to 'folders' tagName="div" class="round-button-mono button-white"}}
<i class="material-icons">home</i>
{{/link-to}}
<div class="button-gap" />
{{#link-to 'search' tagName="div" class="round-button-mono button-white"}}
<i class="material-icons icon-tool">search</i>
{{/link-to}}
{{#if session.authenticated}}
{{#if hasPins}}
<div class="button-gap" />
<div class="round-button-mono button-white" id="user-pins-button">
<i class="material-icons">favorite</i>
</div>
{{/if}}
<div class="button-gap" />
<div class="round-button-mono button-white" id="profile-button">
<i class="material-icons profile-link">{{session.user.initials}}</i>
</div>
{{#dropdown-menu target="profile-button" position="bottom left" open="click"}}
<ul class="menu">
{{#link-to 'profile' tagName="li" class="item"}}Profile{{/link-to}}
{{#if session.isAdmin}}
{{#link-to 'customize.general' tagName="li" class="item"}}Settings{{/link-to}}
{{/if}}
{{#if enableLogout}}
<li class="divider"></li>
{{#link-to 'auth.logout' tagName="li" class="item"}}Logout{{/link-to}}
{{/if}}
</ul>
{{/dropdown-menu}}
{{#if hasPins}}
{{#dropdown-menu target="user-pins-button" position="bottom left" open="click"}}
<ul class="menu">
{{#each pins as |pin|}}
<li {{action 'jumpToPin' pin}} data-id={{pin.id}} id="pin-{{pin.id}}" class="item">{{pin.pin}}</li>
{{/each}}
</ul>
{{/dropdown-menu}}
{{/if}}
{{else}}
{{#link-to 'auth.login'}}
<div class="button-gap" />
<div class="round-button-mono button-white">
<i class="material-icons">lock_open</i>
</div>
{{/link-to}}
{{/if}}
</div>
{{yield}}
</div>

View file

@ -0,0 +1,41 @@
<div class="view-spaces">
<div class="heading">EVERYONE <div class="counter">({{publicFolders.length}})</div></div>
{{#unless hasPublicFolders}}
<p>No global spaces</p>
{{/unless}}
<ul class="list clearfix">
{{#each publicFolders as |folder|}}
{{#link-to 'folder.index' folder.id folder.slug}}
<li class="item">{{ folder.name }}</li>
{{/link-to}}
{{/each}}
</ul>
{{#if session.authenticated}}
<div class="heading">TEAM <div class="counter">({{protectedFolders.length}})</div></div>
{{#unless hasProtectedFolders}}
<p>No team spaces</p>
{{/unless}}
<ul class="list clearfix">
{{#each protectedFolders as |folder|}}
{{#link-to 'folder.index' folder.id folder.slug}}
<li class="item">{{ folder.name }}</li>
{{/link-to}}
{{/each}}
</ul>
<div class="heading">PERSONAL <div class="counter">({{privateFolders.length}})</div></div>
{{#unless hasPrivateFolders}}
<p>No personal spaces</p>
{{/unless}}
<ul class="list clearfix">
{{#each privateFolders as |folder|}}
{{#link-to 'folder.index' folder.id folder.slug}}
<li class="item">{{ folder.name }}</li>
{{/link-to}}
{{/each}}
</ul>
{{/if}}
</div>

View file

@ -1,6 +1,6 @@
{
"name": "documize",
"version": "1.57.0",
"version": "1.55.0",
"description": "The Document IDE",
"private": true,
"repository": "",

View file

@ -1,16 +1,16 @@
{
"community":
{
"version": "1.54.1",
"version": "1.55.0",
"major": 1,
"minor": 54,
"patch": 1
"minor": 55,
"patch": 0
},
"enterprise":
{
"version": "1.56.1",
"version": "1.57.0",
"major": 1,
"minor": 56,
"patch": 1
"minor": 57,
"patch": 0
}
}