From 273834b13e0b362bb2871e547f42a3755d687d3a Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Sat, 4 Jul 2020 12:40:27 +0200 Subject: [PATCH] - feat: Style tweaks. - feat: footer links on dashboard. - feat: Inactive accounts view. --- .../components/Dashboard/DashboardContent.js | 3 ++ .../components/Dashboard/DashboardFooter.js | 24 ++++++++++++++ client/src/config/footerLinks.js | 33 +++++++++++++++++++ client/src/style/pages/dashboard.scss | 24 ++++++++++++++ client/src/style/views/Sidebar.scss | 2 +- server/src/database/seeds/seed_views.js | 2 +- server/src/database/seeds/seed_views_roles.js | 5 +-- 7 files changed, 89 insertions(+), 4 deletions(-) create mode 100644 client/src/components/Dashboard/DashboardFooter.js create mode 100644 client/src/config/footerLinks.js diff --git a/client/src/components/Dashboard/DashboardContent.js b/client/src/components/Dashboard/DashboardContent.js index b660a06ca..01b3ae95e 100644 --- a/client/src/components/Dashboard/DashboardContent.js +++ b/client/src/components/Dashboard/DashboardContent.js @@ -1,12 +1,15 @@ import React from 'react'; import DashboardTopbar from 'components/Dashboard/DashboardTopbar'; import DashboardContentRoute from 'components/Dashboard/DashboardContentRoute'; +import DashboardFooter from 'components/Dashboard/DashboardFooter'; export default function() { return (
+ +
); } \ No newline at end of file diff --git a/client/src/components/Dashboard/DashboardFooter.js b/client/src/components/Dashboard/DashboardFooter.js new file mode 100644 index 000000000..c7fcefde1 --- /dev/null +++ b/client/src/components/Dashboard/DashboardFooter.js @@ -0,0 +1,24 @@ +import React from 'react'; + +import footerLinks from 'config/footerLinks'; +import { For } from 'components'; + +function FooterLinkItem({ title, link }) { + return ( +
+ + {title} + +
+ ); +} + +export default function DashboardFooter({}) { + return ( + + ); +} diff --git a/client/src/config/footerLinks.js b/client/src/config/footerLinks.js new file mode 100644 index 000000000..ecfb05f94 --- /dev/null +++ b/client/src/config/footerLinks.js @@ -0,0 +1,33 @@ + + + +export default [ + { + title: 'Blog', + link: '#', + }, + { + title: 'Support', + link: '#', + }, + { + title: 'Status', + link: '#', + }, + { + title: 'Pricing', + link: '#', + }, + { + title: 'Solution Partner Program', + link: '#', + }, + { + title: 'Docs', + link: '#', + }, + { + title: 'Bigcapital', + link: '#', + } +] \ No newline at end of file diff --git a/client/src/style/pages/dashboard.scss b/client/src/style/pages/dashboard.scss index b1f2730ae..6ff243c98 100644 --- a/client/src/style/pages/dashboard.scss +++ b/client/src/style/pages/dashboard.scss @@ -301,6 +301,30 @@ color: #555; } } + + &__footer{ + margin-top: auto; + padding: 8px 0; + border-top: 1px solid #ececec; + + .footer-links{ + text-align: center; + + > div{ + font-size: 12px; + margin-right: 20px; + display: inline; + + a{ + color: #8c8c8c; + + &:hover{ + color: $blue2; + } + } + } + } + } } .tabs--dashboard-views{ diff --git a/client/src/style/views/Sidebar.scss b/client/src/style/views/Sidebar.scss index 170d27dcf..5b6290406 100644 --- a/client/src/style/views/Sidebar.scss +++ b/client/src/style/views/Sidebar.scss @@ -1,7 +1,7 @@ $sidebar-background: #01194e; $sidebar-text-color: #fff; $sidebar-width: 100%; -$sidebar-menu-item-color: rgba(255, 255, 255, 0.85); +$sidebar-menu-item-color: rgba(255, 255, 255, 0.9); $sidebar-popover-submenu-bg: rgb(1, 20, 62); $sidebar-menu-label-color: rgba(255, 255, 255, 0.5); $sidebar-submenu-item-color: rgba(255, 255, 255, 0.55); diff --git a/server/src/database/seeds/seed_views.js b/server/src/database/seeds/seed_views.js index b07466c01..f46042ddc 100644 --- a/server/src/database/seeds/seed_views.js +++ b/server/src/database/seeds/seed_views.js @@ -5,8 +5,8 @@ exports.seed = (knex) => { .then(() => { // Inserts seed entries return knex('views').insert([ - // Accounts + { id: 15, name: 'Inactive', roles_logic_expression: '1', resource_id: 1, predefined: true }, { id: 1, name: 'Assets', roles_logic_expression: '1', resource_id: 1, predefined: true }, { id: 2, name: 'Liabilities', roles_logic_expression: '1', resource_id: 1, predefined: true }, { id: 3, name: 'Equity', roles_logic_expression: '1', resource_id: 1, predefined: true }, diff --git a/server/src/database/seeds/seed_views_roles.js b/server/src/database/seeds/seed_views_roles.js index 444f8f2a2..7441e7cbe 100644 --- a/server/src/database/seeds/seed_views_roles.js +++ b/server/src/database/seeds/seed_views_roles.js @@ -11,13 +11,14 @@ exports.seed = (knex) => { { id: 3, field_id: 6, index: 1, comparator: 'equals', value: 'equity', view_id: 3 }, { id: 4, field_id: 6, index: 1, comparator: 'equals', value: 'income', view_id: 4 }, { id: 5, field_id: 6, index: 1, comparator: 'equals', value: 'expense', view_id: 5 }, + { id: 12, field_id: 17, index: 1, comparator: 'is', value: 1, view_id: 15 }, - // Items + // Items. { id: 6, field_id: 12, index: 1, comparator: 'equals', value: 'service', view_id: 6 }, { id: 7, field_id: 12, index: 1, comparator: 'equals', value: 'inventory', view_id: 7 }, { id: 8, field_id: 12, index: 1, comparator: 'equals', value: 'non-inventory', view_id: 8 }, - // Manual Journals + // Manual Journals. { id: 9, field_id: 26, index: 1, comparator: 'equals', value: 'Journal', view_id: 9 }, { id: 10, field_id: 26, index: 1, comparator: 'equals', value: 'CreditNote', view_id: 10 }, { id: 11, field_id: 26, index: 1, comparator: 'equals', value: 'Reconciliation', view_id: 11 },