From 8d2dcf376fe79ed8ec9414cc00c3e02ee45105f8 Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Sat, 4 Mar 2017 16:54:04 +0000 Subject: [PATCH] add section empty state --- app/app/components/document/document-page.js | 2 +- app/app/components/document/document-view.js | 44 +++++++----- app/app/components/document/page-wizard.js | 67 ------------------ app/app/pods/document/index/template.hbs | 2 +- app/app/pods/document/zwizard/controller.js | 54 -------------- app/app/pods/document/zwizard/route.js | 21 ------ app/app/pods/document/zwizard/template.hbs | 1 - app/app/styles/view/document/view.scss | 7 +- .../components/document/document-view.hbs | 62 ++++++++++------ .../components/document/page-wizard.hbs | 63 ---------------- .../assets/img/empty-state-document.gif | Bin 13047 -> 0 bytes core/api/endpoint/sections_endpoint.go | 5 ++ 12 files changed, 80 insertions(+), 248 deletions(-) delete mode 100644 app/app/components/document/page-wizard.js delete mode 100644 app/app/pods/document/zwizard/controller.js delete mode 100644 app/app/pods/document/zwizard/route.js delete mode 100644 app/app/pods/document/zwizard/template.hbs delete mode 100644 app/app/templates/components/document/page-wizard.hbs delete mode 100644 app/public/assets/img/empty-state-document.gif diff --git a/app/app/components/document/document-page.js b/app/app/components/document/document-page.js index 88729821..ca895655 100644 --- a/app/app/components/document/document-page.js +++ b/app/app/components/document/document-page.js @@ -21,7 +21,7 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { didReceiveAttrs() { let toEdit = this.get('toEdit'); - if (toEdit === this.get('page.id')) { + if (toEdit === this.get('page.id') && this.get('isEditor')) { this.send('onEdit'); } }, diff --git a/app/app/components/document/document-view.js b/app/app/components/document/document-view.js index 46584c5b..9d6a3563 100644 --- a/app/app/components/document/document-view.js +++ b/app/app/components/document/document-view.js @@ -22,7 +22,7 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { sectionService: Ember.inject.service('section'), appMeta: Ember.inject.service(), link: Ember.inject.service(), - + hasPages: computed.notEmpty('pages'), newSectionName: '', newSectionNameMissing: computed.empty('newSectionName'), newSectionLocation: '', @@ -38,6 +38,7 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { this.set('blocks', blocks); this.set('hasBlocks', blocks.get('length') > 0); + // to test blocks.forEach((b) => { b.set('deleteId', `delete-block-button-${b.id}`); }); @@ -54,12 +55,12 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { }, didInsertElement() { - $(".start-section").hoverIntent({interval: 100, over: function() { + $(".start-section:not(.start-section-empty-state)").hoverIntent({interval: 100, over: function() { // in - $(this).find('.start-button').css("display", "block").removeClass('fadeOut').addClass('fadeIn'); + $(this).find('.start-button').velocity("transition.slideDownIn", {duration: 300}); }, out: function() { - //out - $(this).find('.start-button').css("display", "none").removeClass('fadeIn').addClass('fadeOut'); + // out + $(this).find('.start-button').velocity("transition.slideUpOut", {duration: 300}); } }); }, @@ -109,12 +110,15 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { if (is.not.null(beforePage)) { // get any page before the beforePage so we can insert this new section between them let index = _.findIndex(this.get('pages'), function(p) { return p.get('id') === beforePage.get('id'); }); - let beforeBeforePage = this.get('pages')[index-1]; - if (is.not.undefined(beforeBeforePage)) { - sequence = (beforePage.get('sequence') + beforeBeforePage.get('sequence')) / 2; - } else { - sequence = beforePage.get('sequence') / 2; + if (index !== -1) { + let beforeBeforePage = this.get('pages')[index-1]; + + if (is.not.undefined(beforeBeforePage)) { + sequence = (beforePage.get('sequence') + beforeBeforePage.get('sequence')) / 2; + } else { + sequence = beforePage.get('sequence') / 2; + } } } @@ -124,7 +128,7 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { const promise = this.get('onInsertSection')(model); promise.then((id) => { - if (model.page.contentType === 'section') { + if (model.page.pageType === 'section') { this.set('toEdit', id); } else { this.get('onEditSection')(id); @@ -154,17 +158,26 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { }, // Section wizard related - onShowSectionWizard(page) { - let beforePage = this.get('beforePage'); + if (is.undefined(page)) { + page = { id: '0' }; + } + let beforePage = this.get('beforePage'); if (is.not.null(beforePage) && $("#new-section-wizard").is(':visible') && beforePage.get('id') === page.id) { this.send('onHideSectionWizard'); return; } this.set('newSectionLocation', page.id); - this.set('beforePage', page); + + if (page.id === '0') { + // this handles add section at the end of the document + // because we are not before another page + this.set('beforePage', null); + } else { + this.set('beforePage', page); + } $("#new-section-wizard").insertAfter(`#add-section-button-${page.id}`); $("#new-section-wizard").velocity("transition.slideDownIn", {duration: 300, complete: @@ -250,7 +263,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { // to test onDeleteBlock(id) { this.attrs.onDeleteBlock(id); - }, - + } } }); diff --git a/app/app/components/document/page-wizard.js b/app/app/components/document/page-wizard.js deleted file mode 100644 index 7c8848da..00000000 --- a/app/app/components/document/page-wizard.js +++ /dev/null @@ -1,67 +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 NotifierMixin from '../../mixins/notifier'; - -export default Ember.Component.extend(NotifierMixin, { - display: 'section', // which CSS to use - hasTemplates: false, - hasBlocks: false, - blockMode: false, - - didReceiveAttrs() { - let blocks = this.get('blocks'); - let blockMode = is.not.undefined(blocks); - - this.set('blockMode', blockMode); - if (!blockMode) { - return; - } - - this.set('hasBlocks', blocks.get('length') > 0); - - blocks.forEach((b) => { - b.set('deleteId', `delete-block-button-${b.id}`); - }); - }, - - didRender() { - let self = this; - - Mousetrap.bind('esc', function () { - if (self.get('isDestroyed') || self.get('isDestroying')) { - return; - } - - self.send('onCancel'); - return false; - }); - }, - - actions: { - onCancel() { - this.attrs.onCancel(); - }, - - addSection(section) { - this.attrs.onAddSection(section); - }, - - onDeleteBlock(id) { - this.attrs.onDeleteBlock(id); - }, - - onInsertBlock(block) { - this.attrs.onInsertBlock(block); - } - } -}); diff --git a/app/app/pods/document/index/template.hbs b/app/app/pods/document/index/template.hbs index 13ba291b..d81065c8 100644 --- a/app/app/pods/document/index/template.hbs +++ b/app/app/pods/document/index/template.hbs @@ -40,7 +40,7 @@
-
+
{{#if toggled}} diff --git a/app/app/pods/document/zwizard/controller.js b/app/app/pods/document/zwizard/controller.js deleted file mode 100644 index db12c927..00000000 --- a/app/app/pods/document/zwizard/controller.js +++ /dev/null @@ -1,54 +0,0 @@ -import Ember from 'ember'; -import NotifierMixin from '../../../mixins/notifier'; - -export default Ember.Controller.extend(NotifierMixin, { - documentService: Ember.inject.service('document'), - - actions: { - onCancel() { - this.transitionToRoute('document'); - }, - - onAddSection(section) { - this.audit.record("added-section-" + section.get('contentType')); - - let page = { - documentId: this.get('model.document.id'), - title: `${section.get('title')}`, - level: 1, - sequence: 0, - body: "", - contentType: section.get('contentType'), - pageType: section.get('pageType') - }; - - let meta = { - documentId: this.get('model.document.id'), - rawBody: "", - config: "", - externaleSource: true - }; - - let model = { - page: page, - meta: meta - }; - - this.get('documentService').addPage(this.get('model.document.id'), model).then((newPage) => { - let data = this.get('store').normalize('page', newPage); - this.get('store').push(data); - - this.get('documentService').getPages(this.get('model.document.id')).then((pages) => { - this.set('model.pages', pages.filterBy('pageType', 'section')); - this.set('model.tabs', pages.filterBy('pageType', 'tab')); - - this.get('documentService').getPageMeta(this.get('model.document.id'), newPage.id).then(() => { - let options = {}; - options['mode'] = 'edit'; - this.transitionToRoute('document.section', newPage.id, { queryParams: options }); - }); - }); - }); - } - } -}); diff --git a/app/app/pods/document/zwizard/route.js b/app/app/pods/document/zwizard/route.js deleted file mode 100644 index 465717f6..00000000 --- a/app/app/pods/document/zwizard/route.js +++ /dev/null @@ -1,21 +0,0 @@ -import Ember from 'ember'; -import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin'; - -export default Ember.Route.extend(AuthenticatedRouteMixin, { - documentService: Ember.inject.service('document'), - folderService: Ember.inject.service('folder'), - sectionService: Ember.inject.service('section'), - - model() { - return Ember.RSVP.hash({ - folders: this.modelFor('document').folders, - folder: this.modelFor('document').folder, - document: this.modelFor('document').document, - pages: this.modelFor('document').pages, - tabs: this.modelFor('document').tabs, - sections: this.get('sectionService').getAll().then(function (sections) { - return sections.filterBy('pageType', 'tab'); - }) - }); - } -}); diff --git a/app/app/pods/document/zwizard/template.hbs b/app/app/pods/document/zwizard/template.hbs deleted file mode 100644 index 37c5e05b..00000000 --- a/app/app/pods/document/zwizard/template.hbs +++ /dev/null @@ -1 +0,0 @@ -{{document/page-wizard display='tab' document=model.document folder=model.folder sections=model.sections onCancel=(action 'onCancel') onAddSection=(action 'onAddSection')}} diff --git a/app/app/styles/view/document/view.scss b/app/app/styles/view/document/view.scss index fc0da62f..de2dfc35 100644 --- a/app/app/styles/view/document/view.scss +++ b/app/app/styles/view/document/view.scss @@ -151,7 +151,6 @@ } .start-section { - @include ease-in(); @extend .no-select; height: 60px; background-color: transparent; @@ -194,6 +193,12 @@ } } + .start-section-empty-state { + > .start-button { + display: block; + } + } + .new-section-wizard { @include border-radius(2px); margin: 0 0 30px 0; diff --git a/app/app/templates/components/document/document-view.hbs b/app/app/templates/components/document/document-view.hbs index 9a9e6da9..dbbd92be 100644 --- a/app/app/templates/components/document/document-view.hbs +++ b/app/app/templates/components/document/document-view.hbs @@ -1,35 +1,51 @@
- {{#each pages key="id" as |page index|}} + {{#if hasPages}} + {{#each pages key="id" as |page index|}} + {{#if isEditor}} +
+
+
+ add +
+
section
+
+
+ {{else}} +
+ {{/if}} + {{#if (is-equal page.pageType 'section')}} + {{#document/document-page document=document folder=folder page=page isEditor=isEditor toEdit=toEdit + onSavePage=(action 'onSavePage') onSavePageAsBlock=(action 'onSavePageAsBlock') + onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onDeletePage')}} + {{/document/document-page}} + {{/if}} + {{#if (is-equal page.pageType 'tab')}} + {{#document/document-tab document=document folder=folder page=page isEditor=isEditor + onSavePage=(action 'onSavePage') onSavePageAsBlock=(action 'onSavePageAsBlock') + onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onDeletePage')}} + {{/document/document-tab}} + {{/if}} + {{/each}} +
+
+
+ add +
+
section
+
+
+ {{else}} {{#if isEditor}} -
-
+
+
add
section
- {{else}} -
{{/if}} - {{#if (is-equal page.pageType 'section')}} - {{#document/document-page document=document folder=folder page=page isEditor=isEditor toEdit=toEdit - onSavePage=(action 'onSavePage') onSavePageAsBlock=(action 'onSavePageAsBlock') - onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onDeletePage')}} - {{/document/document-page}} - {{/if}} - {{#if (is-equal page.pageType 'tab')}} - {{#document/document-tab document=document folder=folder page=page isEditor=isEditor - onSavePage=(action 'onSavePage') onSavePageAsBlock=(action 'onSavePageAsBlock') - onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onDeletePage')}} - {{/document/document-tab}} - {{/if}} - {{else}} - no sections! -
- -
- {{/each}} + {{/if}}
diff --git a/app/app/templates/components/document/page-wizard.hbs b/app/app/templates/components/document/page-wizard.hbs deleted file mode 100644 index caf91168..00000000 --- a/app/app/templates/components/document/page-wizard.hbs +++ /dev/null @@ -1,63 +0,0 @@ -
-
-
    - {{#each sections as |section|}} -
  • -
    - -
    -
    -
    - {{section.title}} - {{#if section.preview}} -
    coming soon
    - {{/if}} -
    -
    {{section.description}}
    -
    -
    -
    • - {{/each}} -
- {{#if blockMode}} - {{#if hasBlocks}} -
-
Reusable content
-
    - {{#each blocks as |block|}} -
  • -
    -
    - view_agenda -
    -
    - {{#link-to 'document.block' folder.id folder.slug document.id document.slug block.id}} - mode_edit - {{/link-to}} - delete -
    -
    -
    -
    - {{block.title}} -
    -
    {{block.excerpt}}
    -
    By {{block.firstname}} {{block.lastname}}, {{time-ago block.created}} (used: {{ block.used }})
    -
    -
    - {{#dropdown-dialog target=block.deleteId position="bottom left" button="Delete" color="flat-red" onAction=(action 'onDeleteBlock' block.id)}} -

    - Are you sure you want to delete block
    - {{block.title}}? -

    - {{/dropdown-dialog}} -
    • - {{/each}} -
- {{else}} -
-
Reusable content appears below
- {{/if}} - {{/if}} -
-
diff --git a/app/public/assets/img/empty-state-document.gif b/app/public/assets/img/empty-state-document.gif deleted file mode 100644 index 523b76a0b0ee9a55906fe220d478e059378fa5e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13047 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 diff --git a/core/api/endpoint/sections_endpoint.go b/core/api/endpoint/sections_endpoint.go index eaaf8045..8e6e5fbd 100644 --- a/core/api/endpoint/sections_endpoint.go +++ b/core/api/endpoint/sections_endpoint.go @@ -12,6 +12,7 @@ package endpoint import ( + "database/sql" "encoding/json" "io/ioutil" "net/http" @@ -121,6 +122,10 @@ func RefreshSections(w http.ResponseWriter, r *http.Request) { // Grab the page because we need content type and page, err2 := p.GetPage(pm.PageID) + if err2 == sql.ErrNoRows { + continue + } + if err2 != nil { writeGeneralSQLError(w, method, err2) log.IfErr(tx.Rollback())