From 491c07ed67135edf7f5bfd715a86c50566e6b6ef Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Tue, 15 Jun 2021 14:22:22 +0100 Subject: [PATCH] Working on adding a workspace/ sidebar view --- src/components/LinkItems/ItemGroup.vue | 2 +- src/components/PageStrcture/Footer.vue | 3 ++ src/components/Workspace/SideBar.vue | 43 ++++++++++++++++++++++ src/components/Workspace/SideBarItem.vue | 47 ++++++++++++++++++++++++ src/components/Workspace/WebContent.vue | 30 +++++++++++++++ src/router.js | 19 +++++++--- src/styles/color-palette.scss | 2 + src/utils/ConfigAccumalator.js | 12 ++++-- src/utils/ConfigSchema.json | 21 ++++++++++- src/utils/defaults.js | 3 ++ src/views/Home.vue | 4 +- src/views/Workspace.vue | 31 ++++++++++++++++ 12 files changed, 203 insertions(+), 14 deletions(-) create mode 100644 src/components/Workspace/SideBar.vue create mode 100644 src/components/Workspace/SideBarItem.vue create mode 100644 src/components/Workspace/WebContent.vue create mode 100644 src/views/Workspace.vue diff --git a/src/components/LinkItems/ItemGroup.vue b/src/components/LinkItems/ItemGroup.vue index a375d7d6..e94a2794 100644 --- a/src/components/LinkItems/ItemGroup.vue +++ b/src/components/LinkItems/ItemGroup.vue @@ -70,7 +70,7 @@ export default { return this.displayData.itemSize || this.itemSize; }, isGridLayout() { - return this.displayData.layout === 'grid' + return this.displayData.sectionLayout === 'grid' || !!(this.displayData.itemCountX || this.displayData.itemCountY); }, gridStyle() { diff --git a/src/components/PageStrcture/Footer.vue b/src/components/PageStrcture/Footer.vue index 3debd4f6..2f97d23e 100644 --- a/src/components/PageStrcture/Footer.vue +++ b/src/components/PageStrcture/Footer.vue @@ -29,6 +29,9 @@ export default { diff --git a/src/components/Workspace/SideBarItem.vue b/src/components/Workspace/SideBarItem.vue new file mode 100644 index 00000000..cb0c33fb --- /dev/null +++ b/src/components/Workspace/SideBarItem.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/components/Workspace/WebContent.vue b/src/components/Workspace/WebContent.vue new file mode 100644 index 00000000..4831142b --- /dev/null +++ b/src/components/Workspace/WebContent.vue @@ -0,0 +1,30 @@ +