From f885cdbaf1fa309d4510757fbd5beb0e61e7934b Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Sun, 31 Mar 2019 02:33:02 +0700 Subject: [PATCH] Add notes rendering and styles --- src/store/modules/reports.js | 21 +++++--- src/views/reports/components/TimelineItem.vue | 50 ++++++++++++++++++- src/views/reports/index.vue | 2 +- 3 files changed, 65 insertions(+), 8 deletions(-) diff --git a/src/store/modules/reports.js b/src/store/modules/reports.js index 9638ca02..983c16b8 100644 --- a/src/store/modules/reports.js +++ b/src/store/modules/reports.js @@ -3,30 +3,39 @@ const reports = { fetchedReports: [ { id: '1', - timestamp: '2018/4/12', + timestamp: '2019/4/12', local: true, from: 'John', // actor nickname object: 'Bob', // user nickname header: 'Report #1', // content - content: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.' + content: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.', + notes: [ + { author: 'Nick', text: 'Lorem ipsum', timestamp: '2019/4/13' }, + { author: 'Val', text: 'dolor sit amet', timestamp: '2019/4/13' } + ] }, { id: '2', - timestamp: '2018/4/1', + timestamp: '2019/4/1', local: true, from: 'Max', object: 'Vic', header: 'Report #2', - content: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.' + content: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.', + notes: [ + { author: 'Tony', text: 'consectetur adipiscing elit', timestamp: '2019/4/2' }, + { author: 'Zac', text: 'sed do eiusmod tempor incididunt', timestamp: '2019/4/3' } + ] }, { id: '3', - timestamp: '2018/2/28', + timestamp: '2019/2/28', local: true, from: 'Tim', object: 'Jen', header: 'Report #3', - content: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.' + content: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.', + notes: [{ author: 'Bruce', text: 'ut labore et dolore magna aliqua', timestamp: '2019/3/1' }] } ] }, diff --git a/src/views/reports/components/TimelineItem.vue b/src/views/reports/components/TimelineItem.vue index aa334806..39ef5d5d 100644 --- a/src/views/reports/components/TimelineItem.vue +++ b/src/views/reports/components/TimelineItem.vue @@ -1,8 +1,19 @@ @@ -15,6 +26,43 @@ export default { type: Object, required: true } + }, + data() { + return { + showNotes: [] + } } } + + diff --git a/src/views/reports/index.vue b/src/views/reports/index.vue index 895f0b10..83393c5c 100644 --- a/src/views/reports/index.vue +++ b/src/views/reports/index.vue @@ -28,7 +28,7 @@ export default { margin: 22px 0 0 15px; } .el-timeline { - margin: 45px; + margin: 45px 45px 45px 19px; padding: 0px; } }