From 6a1483895a84fb47a75a6694c269c4225ebc8364 Mon Sep 17 00:00:00 2001 From: Krushi Raj Tula Date: Wed, 11 Sep 2019 19:33:55 +0530 Subject: [PATCH 1/7] WIP - Inital commit for #9 --- src/components/DataDetails.vue | 10 ++++++++++ src/components/DataFilter.vue | 10 ++++++++++ src/components/DataListContainer.vue | 10 ++++++++++ 3 files changed, 30 insertions(+) create mode 100644 src/components/DataDetails.vue create mode 100644 src/components/DataFilter.vue create mode 100644 src/components/DataListContainer.vue diff --git a/src/components/DataDetails.vue b/src/components/DataDetails.vue new file mode 100644 index 0000000..dd9f19d --- /dev/null +++ b/src/components/DataDetails.vue @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/src/components/DataFilter.vue b/src/components/DataFilter.vue new file mode 100644 index 0000000..924af94 --- /dev/null +++ b/src/components/DataFilter.vue @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/src/components/DataListContainer.vue b/src/components/DataListContainer.vue new file mode 100644 index 0000000..bdffdd1 --- /dev/null +++ b/src/components/DataListContainer.vue @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file From a91079ee4849459bf5a5249803ea76038be2a334 Mon Sep 17 00:00:00 2001 From: Krushi Raj Tula Date: Thu, 12 Sep 2019 01:58:27 +0530 Subject: [PATCH 2/7] DataListContainer added * DataListContainer: --A generic container that accepts the list of items and iterates over it to render a list. It also provides pagination options. --childComponent prop will accept a component class that will be rendered if the items in the list doesn't contain any property called `child`, which holds the component class. --Added QuestionListItem component to test. TODO: DataFilter which passes filtered data to the above component. DataDetails which will show the detailed view of the list item selected. --- src/components/DataDetails.vue | 25 ++++++- src/components/DataFilter.vue | 25 ++++++- src/components/DataListContainer.vue | 108 ++++++++++++++++++++++++++- src/components/QuestionListItem.vue | 57 ++++++++++++++ src/components/index.js | 1 + src/router/index.js | 6 ++ src/views/Dashboard.vue | 23 ++++++ src/views/index.js | 1 + 8 files changed, 234 insertions(+), 12 deletions(-) create mode 100644 src/components/QuestionListItem.vue create mode 100644 src/views/Dashboard.vue diff --git a/src/components/DataDetails.vue b/src/components/DataDetails.vue index dd9f19d..68815be 100644 --- a/src/components/DataDetails.vue +++ b/src/components/DataDetails.vue @@ -1,10 +1,27 @@ - + - \ No newline at end of file + diff --git a/src/components/DataFilter.vue b/src/components/DataFilter.vue index 924af94..68815be 100644 --- a/src/components/DataFilter.vue +++ b/src/components/DataFilter.vue @@ -1,10 +1,27 @@ - + - \ No newline at end of file + diff --git a/src/components/DataListContainer.vue b/src/components/DataListContainer.vue index bdffdd1..30a1079 100644 --- a/src/components/DataListContainer.vue +++ b/src/components/DataListContainer.vue @@ -1,10 +1,110 @@ - + - \ No newline at end of file + diff --git a/src/components/QuestionListItem.vue b/src/components/QuestionListItem.vue new file mode 100644 index 0000000..c759aae --- /dev/null +++ b/src/components/QuestionListItem.vue @@ -0,0 +1,57 @@ + + + + + diff --git a/src/components/index.js b/src/components/index.js index 35990f2..b7575c8 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -4,3 +4,4 @@ export { default as FormAlerts } from './FormAlerts'; export { default as FormFields } from './FormFields'; export { default as FormButtons } from './FormButtons'; export { default as CustomForm } from './CustomForm'; +export { default as DataListContainer } from './DataListContainer'; diff --git a/src/router/index.js b/src/router/index.js index 09c0baa..9e9e95d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -6,6 +6,7 @@ import { Register, Login, Profile, + Dashboard, } from '../views'; Vue.use(Router); @@ -39,5 +40,10 @@ export default new Router({ name: 'profile', component: Profile, }, + { + path: '/dashboard', + name: 'dashboard', + component: Dashboard, + }, ], }); diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue new file mode 100644 index 0000000..df86117 --- /dev/null +++ b/src/views/Dashboard.vue @@ -0,0 +1,23 @@ + + + diff --git a/src/views/index.js b/src/views/index.js index c514584..b26da58 100644 --- a/src/views/index.js +++ b/src/views/index.js @@ -3,3 +3,4 @@ export { default as About } from './About'; export { default as Login } from './Login'; export { default as Register } from './Register'; export { default as Profile } from './Profile'; +export { default as Dashboard } from './Dashboard'; From ac21f6b5c3a4fa7a817b064cf3ef6ab6efee49ad Mon Sep 17 00:00:00 2001 From: Krushi Raj Tula Date: Thu, 12 Sep 2019 02:18:41 +0530 Subject: [PATCH 3/7] Update DataDetails.vue Changed name, previous bane was not interfere for this. A left over work from copy paste --- src/components/DataDetails.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/DataDetails.vue b/src/components/DataDetails.vue index 68815be..9ef03cb 100644 --- a/src/components/DataDetails.vue +++ b/src/components/DataDetails.vue @@ -18,7 +18,7 @@ From a52ea0ff2bd99cf9c25b955f1d544c964fd28bd7 Mon Sep 17 00:00:00 2001 From: Krushi Raj Tula Date: Thu, 12 Sep 2019 02:19:09 +0530 Subject: [PATCH 4/7] Update DataFilter.vue Changed name, previous bane was not interfere for this. A left over work from copy paste --- src/components/DataFilter.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/DataFilter.vue b/src/components/DataFilter.vue index 68815be..a88f84a 100644 --- a/src/components/DataFilter.vue +++ b/src/components/DataFilter.vue @@ -18,7 +18,7 @@ From db51f229025dbffe3446feb4f6f24d3fcc914e90 Mon Sep 17 00:00:00 2001 From: Krushi Raj Tula Date: Fri, 13 Sep 2019 19:28:12 +0530 Subject: [PATCH 5/7] update 2 Worked on data filter to be as generic as possible. Added a search bar for data items container. --- public/index.html | 2 + src/components/DataDetails.vue | 19 ++- src/components/DataFilter.vue | 61 +++++++-- src/components/DataListContainer.vue | 115 ++++++----------- src/components/ORFilterSection.vue | 53 ++++++++ src/components/ORFilterSectionItems.vue | 122 ++++++++++++++++++ .../common/ThreeSectionContainer.vue | 47 +++++++ src/components/common/index.js | 3 + src/components/index.js | 5 + src/views/Dashboard.vue | 110 ++++++++++++++-- 10 files changed, 436 insertions(+), 101 deletions(-) create mode 100644 src/components/ORFilterSection.vue create mode 100644 src/components/ORFilterSectionItems.vue create mode 100644 src/components/common/ThreeSectionContainer.vue create mode 100644 src/components/common/index.js diff --git a/public/index.html b/public/index.html index 12856fa..79a121e 100644 --- a/public/index.html +++ b/public/index.html @@ -5,6 +5,8 @@ + openrank-frontend diff --git a/src/components/DataDetails.vue b/src/components/DataDetails.vue index 9ef03cb..45ff9ec 100644 --- a/src/components/DataDetails.vue +++ b/src/components/DataDetails.vue @@ -1,24 +1,35 @@ diff --git a/src/components/DataFilter.vue b/src/components/DataFilter.vue index a88f84a..1317c18 100644 --- a/src/components/DataFilter.vue +++ b/src/components/DataFilter.vue @@ -1,24 +1,61 @@ diff --git a/src/components/DataListContainer.vue b/src/components/DataListContainer.vue index 30a1079..af62076 100644 --- a/src/components/DataListContainer.vue +++ b/src/components/DataListContainer.vue @@ -1,10 +1,32 @@