From a8bdc99757fce228ed46d42e275e9f054c4793d8 Mon Sep 17 00:00:00 2001 From: Hoang Nguyen Date: Thu, 26 Dec 2019 02:43:11 +0700 Subject: [PATCH] project: dashboard, custom actions and tabs (#73) This fixes #41 Adds project specific dashboard tabs, custom actions and tabs for project view. Also adds quickview and other list/details view improvements. Co-authored-by: hoangnm Co-authored-by: Rohit Yadav Signed-off-by: Rohit Yadav --- ui/src/assets/logo.svg | 315 +++++++++-------- ui/src/components/header/ProjectMenu.vue | 2 +- ui/src/components/menu/SideMenu.vue | 22 +- ui/src/components/page/GlobalFooter.vue | 8 +- ui/src/components/view/ActionButton.vue | 170 +++++++++ ui/src/components/view/DetailSettings.vue | 45 +-- ui/src/components/view/InfoCard.vue | 6 +- ui/src/components/view/ListView.vue | 6 +- ui/src/components/view/ResourceView.vue | 3 +- ui/src/components/widgets/Breadcrumb.vue | 32 +- ui/src/components/widgets/Status.vue | 2 + ui/src/config/router.js | 22 +- ui/src/config/section/project.js | 38 ++ ui/src/locales/en.json | 19 + ui/src/store/getters.js | 1 + ui/src/store/modules/user.js | 13 +- ui/src/views/AutogenView.vue | 87 ++--- ui/src/views/auth/Login.vue | 3 +- ui/src/views/compute/InstanceHardware.vue | 13 +- ui/src/views/dashboard/Dashboard.vue | 2 +- ui/src/views/dashboard/UsageDashboard.vue | 91 +++-- .../views/dashboard/UsageDashboardChart.vue | 59 ++++ ui/src/views/infra/InfraSummary.vue | 6 +- ui/src/views/project/AccountsTab.vue | 267 ++++++++++++++ .../views/project/InvitationTokenTemplate.vue | 132 +++++++ ui/src/views/project/InvitationsTemplate.vue | 326 ++++++++++++++++++ ui/src/views/project/ResourcesTab.vue | 178 ++++++++++ 27 files changed, 1595 insertions(+), 273 deletions(-) create mode 100644 ui/src/components/view/ActionButton.vue create mode 100644 ui/src/views/dashboard/UsageDashboardChart.vue create mode 100644 ui/src/views/project/AccountsTab.vue create mode 100644 ui/src/views/project/InvitationTokenTemplate.vue create mode 100644 ui/src/views/project/InvitationsTemplate.vue create mode 100644 ui/src/views/project/ResourcesTab.vue diff --git a/ui/src/assets/logo.svg b/ui/src/assets/logo.svg index 095b86646f5..ed6cb8980e1 100644 --- a/ui/src/assets/logo.svg +++ b/ui/src/assets/logo.svg @@ -8,9 +8,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - viewBox="0 0 1484.4133 362.9483" - height="362.9483" - width="1484.4133" + viewBox="0 0 256 64" + height="64" + width="256" xml:space="preserve" id="svg2" version="1.1" @@ -28,159 +28,171 @@ inkscape:window-height="704" id="namedview93" showgrid="false" - inkscape:zoom="0.41" - inkscape:cx="640.72071" - inkscape:cy="181.47415" + inkscape:zoom="4.61" + inkscape:cx="70.146228" + inkscape:cy="46.916542" inkscape:window-x="58" inkscape:window-y="27" inkscape:window-maximized="1" - inkscape:current-layer="g116" />image/svg+xml + + +TM - + y="309.22644" + x="241.4295 242.70193" + style="stroke-width:0.17386755">TM .project { &-select { - width: 40%; + width: 30vw; } &-icon { diff --git a/ui/src/components/menu/SideMenu.vue b/ui/src/components/menu/SideMenu.vue index f12dad2e805..20c76daddab 100644 --- a/ui/src/components/menu/SideMenu.vue +++ b/ui/src/components/menu/SideMenu.vue @@ -85,7 +85,23 @@ export default { height: auto; /deep/ .ant-layout-sider-children { - overflow-y: auto; + overflow-y: hidden; + &:hover { + overflow-y: auto; + } + } + + /deep/ .ant-menu-vertical .ant-menu-item { + margin-top: 0px; + margin-bottom: 0px; + } + + /deep/ .ant-menu-inline .ant-menu-item:not(:last-child) { + margin-bottom: 0px; + } + + /deep/ .ant-menu-inline .ant-menu-item { + margin-top: 0px; } &.ant-fixed-sidemenu { @@ -99,14 +115,14 @@ export default { .ant-menu-light { border-right-color: transparent; - padding: 10px 0; + padding: 14px 0; } } &.dark { .ant-menu-dark { border-right-color: transparent; - padding: 10px 0; + padding: 14px 0; } } } diff --git a/ui/src/components/page/GlobalFooter.vue b/ui/src/components/page/GlobalFooter.vue index ccc868ffb73..94384949819 100644 --- a/ui/src/components/page/GlobalFooter.vue +++ b/ui/src/components/page/GlobalFooter.vue @@ -18,8 +18,11 @@ diff --git a/ui/src/views/dashboard/UsageDashboard.vue b/ui/src/views/dashboard/UsageDashboard.vue index 5b361eaf37f..79c02ba23eb 100644 --- a/ui/src/views/dashboard/UsageDashboard.vue +++ b/ui/src/views/dashboard/UsageDashboard.vue @@ -17,24 +17,43 @@