From b266dc31eb07a850876fb8b4363a9bda46a87231 Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Sat, 30 Mar 2019 22:37:44 +0700 Subject: [PATCH] Add timeline component --- package.json | 2 +- src/lang/en.js | 3 ++ src/store/index.js | 2 + src/store/modules/reports.js | 37 ++++++++++++++++ src/views/reports/components/TimelineItem.vue | 20 +++++++++ src/views/reports/index.vue | 44 +++++++++++++++++++ yarn.lock | 8 ++-- 7 files changed, 111 insertions(+), 5 deletions(-) create mode 100644 src/store/modules/reports.js create mode 100644 src/views/reports/components/TimelineItem.vue diff --git a/package.json b/package.json index 097c291f..532a58ea 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "driver.js": "0.8.1", "dropzone": "5.2.0", "echarts": "4.1.0", - "element-ui": "2.4.11", + "element-ui": "^2.7.0", "file-saver": "1.3.8", "fuse.js": "3.4.2", "js-cookie": "2.2.0", diff --git a/src/lang/en.js b/src/lang/en.js index b9a59015..657732be 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -199,5 +199,8 @@ export default { byStatus: 'By status', active: 'Active', deactivated: 'Deactivated' + }, + reports: { + reports: 'Reports' } } diff --git a/src/store/index.js b/src/store/index.js index 24dd7d66..119c4c97 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -3,6 +3,7 @@ import Vuex from 'vuex' import app from './modules/app' import errorLog from './modules/errorLog' import permission from './modules/permission' +import reports from './modules/reports' import tagsView from './modules/tagsView' import user from './modules/user' import users from './modules/users' @@ -15,6 +16,7 @@ const store = new Vuex.Store({ app, errorLog, permission, + reports, tagsView, user, users diff --git a/src/store/modules/reports.js b/src/store/modules/reports.js new file mode 100644 index 00000000..9638ca02 --- /dev/null +++ b/src/store/modules/reports.js @@ -0,0 +1,37 @@ +const reports = { + state: { + fetchedReports: [ + { + id: '1', + timestamp: '2018/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.' + }, + { + id: '2', + timestamp: '2018/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.' + }, + { + id: '3', + timestamp: '2018/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.' + } + ] + }, + mutations: {}, + actions: {} +} + +export default reports diff --git a/src/views/reports/components/TimelineItem.vue b/src/views/reports/components/TimelineItem.vue new file mode 100644 index 00000000..aa334806 --- /dev/null +++ b/src/views/reports/components/TimelineItem.vue @@ -0,0 +1,20 @@ + + + diff --git a/src/views/reports/index.vue b/src/views/reports/index.vue index e69de29b..895f0b10 100644 --- a/src/views/reports/index.vue +++ b/src/views/reports/index.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/yarn.lock b/yarn.lock index a4c90db2..1f7a8a5b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3446,10 +3446,10 @@ elegant-spinner@^1.0.1: resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= -element-ui@2.4.11: - version "2.4.11" - resolved "https://registry.yarnpkg.com/element-ui/-/element-ui-2.4.11.tgz#db6a2d37001b8fe5fff9f176fb58bb3908cfa9c9" - integrity sha512-RtgK0t840NAFTajGMWvylzZRSX1EkZ7V4YgAoBxhv4TtkeMscLuk/IdYOzPdlQq6IN0byx1YVBxCX+u4yYkGvw== +element-ui@^2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/element-ui/-/element-ui-2.7.0.tgz#6bfcdfa5c75bfc4cda835186f2a1f98b93cd5d14" + integrity sha512-FalWzOmT/K4w4C/8tw2kGvzzQnRJ5MqEvSL5rEKNa081PFGIcUS9exyVpYrNPKF8ua/W6qaqrXPC6DQ8sNcmOQ== dependencies: async-validator "~1.8.1" babel-helper-vue-jsx-merge-props "^2.0.0"