sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

grid view improvements, remembering grid/list status

pull/255/head
zadam 2020-10-24 23:50:32 +07:00
parent aeb6c34d27
commit d0efd67d5e
4 changed files with 87 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/public/app/services/attributes.js
Unescape Escape View File

@ -8,11 +8,20 @@ async function addLabel(noteId, name, value = "") {
});
}
async function setLabel(noteId, name, value = "") {
await server.put(`notes/${noteId}/set-attribute`, {
type: 'label',
name: name,
value: value
});
}
async function removeAttributeById(noteId, attributeId) {
await server.remove(`notes/${noteId}/attributes/${attributeId}`);
}
export default {
addLabel,
setLabel,
removeAttributeById
}

100
src/public/app/services/note_list_renderer.js
Unescape Escape View File

@ -12,18 +12,23 @@ const TPL = `
height: 100%;
}
.note-list.card-view .note-list-container {
.note-list.grid-view .note-list-container {
display: flex;
flex-wrap: wrap;
}
.note-list.card-view .note-book-card {
width: 300px;
.note-list.grid-view .note-book-card {
flex-basis: 300px;
}
.note-list.card-view .note-expander {
.note-list.grid-view .note-expander {
display: none;
}
.note-list.grid-view .note-book-card {
max-height: 300px;
}
.note-book-card {
border-radius: 10px;
background-color: var(--accented-background-color);
@ -33,10 +38,11 @@ const TPL = `
display: flex;
flex-direction: column;
flex-shrink: 0;
flex-grow: 1;
}
.note-book-card .note-book-content {
display: none;
.note-book-card:not(.expanded) .note-book-content {
display: none !important;
padding: 10px
}
@ -57,6 +63,7 @@ const TPL = `
align-items: center;
justify-content: center;
text-align: center;
padding: 10px;
}
.note-book-card.type-image .note-book-content img, .note-book-card.type-text .note-book-content img {
@ -125,8 +132,14 @@ class NoteListRenderer {
this.parentNote = parentNote;
this.notes = notes;
this.page = 1;
this.pageSize = 2;
this.viewType = 'list';
this.pageSize = 6;
this.viewType = parentNote.getLabelValue('viewType');
if (!['list', 'grid'].includes(this.viewType)) {
this.viewType = 'list'; // default
}
this.$noteList.addClass(this.viewType + '-view');
this.$noteList.find('.list-view-button').on('click', () => this.toggleViewType('list'));
this.$noteList.find('.grid-view-button').on('click', () => this.toggleViewType('grid'));
@ -171,6 +184,8 @@ class NoteListRenderer {
.removeClass('list-view')
.addClass(this.viewType + '-view');
await attributeService.setLabel(this.parentNote.noteId, 'viewType', type);
await this.renderList();
}
@ -202,8 +217,11 @@ class NoteListRenderer {
renderPager() {
const $pager = this.$noteList.find('.note-list-pager').empty();
const pageCount = Math.ceil(this.notes.length / this.pageSize);
for (let i = 1; i <= Math.ceil(this.notes.length / this.pageSize); i++) {
$pager.toggle(pageCount > 1);
for (let i = 1; i <= pageCount; i++) {
$pager.append(
i === this.page
? $('<span>').text(i).css('text-decoration', 'underline').css('font-weight', "bold")
@ -228,34 +246,8 @@ class NoteListRenderer {
}
}
async renderNoteContent(note) {
const $content = $('<div class="note-book-content">');
try {
const {renderedContent, type} = await noteContentRenderer.getRenderedContent(note);
$content.append(renderedContent);
$content.addClass("type-" + type);
} catch (e) {
console.log(`Caught error while rendering note ${note.noteId} of type ${note.type}: ${e.message}, stack: ${e.stack}`);
$content.append("rendering error");
}
const imageLinks = note.getRelations('imageLink');
const childNotes = (await note.getChildNotes())
.filter(childNote => !imageLinks.find(rel => rel.value === childNote.noteId));
for (const childNote of childNotes) {
$content.append(await this.renderNote(childNote, false));
}
return $content;
}
// TODO: we should also render (promoted) attributes
async renderNote(note, expand) {
async renderNote(note) {
const notePath = /*this.notePath + '/' + */ note.noteId;
const $expander = $('<span class="note-expander bx bx-chevron-right"></span>');
@ -268,9 +260,9 @@ class NoteListRenderer {
.append(await linkService.createNoteLink(notePath, {showTooltip: false}))
);
$expander.on('click', () => toggleContent($card, note, !$card.hasClass("expanded")));
$expander.on('click', () => this.toggleContent($card, note, !$card.hasClass("expanded")));
await this.toggleContent($card, note, expand);
await this.toggleContent($card, note, this.parentNote.hasLabel('expanded'));
return $card;
}
@ -282,7 +274,7 @@ class NoteListRenderer {
const $expander = $card.find('> .note-book-title .note-expander');
if (expand) {
if (expand || this.viewType === 'grid') {
$card.addClass("expanded");
$expander.addClass("bx-chevron-down").removeClass("bx-chevron-right");
}
@ -291,10 +283,38 @@ class NoteListRenderer {
$expander.addClass("bx-chevron-right").removeClass("bx-chevron-down");
}
if (expand && $card.find('.note-book-content').length === 0) {
if ((expand || this.viewType === 'grid') && $card.find('.note-book-content').length === 0) {
$card.append(await this.renderNoteContent(note));
}
}
async renderNoteContent(note) {
const $content = $('<div class="note-book-content">');
try {
const {renderedContent, type} = await noteContentRenderer.getRenderedContent(note);
$content.append(renderedContent);
$content.addClass("type-" + type);
} catch (e) {
console.log(`Caught error while rendering note ${note.noteId} of type ${note.type}: ${e.message}, stack: ${e.stack}`);
$content.append("rendering error");
}
if (this.viewType === 'list') {
const imageLinks = note.getRelations('imageLink');
const childNotes = (await note.getChildNotes())
.filter(childNote => !imageLinks.find(rel => rel.value === childNote.noteId));
for (const childNote of childNotes) {
$content.append(await this.renderNote(childNote));
}
}
return $content;
}
}
export default NoteListRenderer;

19
src/routes/api/attributes.js
Unescape Escape View File

@ -62,13 +62,27 @@ function updateNoteAttribute(req) {
attribute.save();
console.log("Saving", attribute);
return {
attributeId: attribute.attributeId
};
}
function setNoteAttribute(req) {
const noteId = req.params.noteId;
const body = req.body;
let attr = repository.getEntity(`SELECT * FROM attributes WHERE isDeleted = 0 AND noteId = ? AND type = ? AND name = ?`, [noteId, body.type, body.name]);
if (attr) {
attr.value = body.value;
} else {
attr = new Attribute(body);
attr.noteId = noteId;
}
attr.save();
}
function deleteNoteAttribute(req) {
const noteId = req.params.noteId;
const attributeId = req.params.attributeId;
@ -200,6 +214,7 @@ function deleteRelation(req) {
module.exports = {
updateNoteAttributes,
updateNoteAttribute,
setNoteAttribute,
deleteNoteAttribute,
getAttributeNames,
getValuesForAttribute,

1
src/routes/routes.js
Unescape Escape View File

@ -176,6 +176,7 @@ function register(app) {
apiRoute(GET, '/api/notes/:noteId/attributes', attributesRoute.getEffectiveNoteAttributes);
apiRoute(PUT, '/api/notes/:noteId/attributes', attributesRoute.updateNoteAttributes);
apiRoute(PUT, '/api/notes/:noteId/attribute', attributesRoute.updateNoteAttribute);
apiRoute(PUT, '/api/notes/:noteId/set-attribute', attributesRoute.setNoteAttribute);
apiRoute(PUT, '/api/notes/:noteId/relations/:name/to/:targetNoteId', attributesRoute.createRelation);
apiRoute(DELETE, '/api/notes/:noteId/relations/:name/to/:targetNoteId', attributesRoute.deleteRelation);
apiRoute(DELETE, '/api/notes/:noteId/attributes/:attributeId', attributesRoute.deleteNoteAttribute);