@@ -39,17 +47,8 @@ function DashboardTopbar({
{ pageTitle }
-
- { pageSubtitle && (
- <>
-
- { pageSubtitle }
- }
- onClick={handlerClickEditView} />
- >
- )}
+ {maybleRenderPageSubtitle}
+ {maybeRenderEditViewBtn}
diff --git a/client/src/static/json/icons.js b/client/src/static/json/icons.js
index 12536ad7b..8a199dc15 100644
--- a/client/src/static/json/icons.js
+++ b/client/src/static/json/icons.js
@@ -74,5 +74,9 @@ export default {
"archive": {
path: ['M464 32H48C21.5 32 0 53.5 0 80v80c0 8.8 7.2 16 16 16h16v272c0 17.7 14.3 32 32 32h384c17.7 0 32-14.3 32-32V176h16c8.8 0 16-7.2 16-16V80c0-26.5-21.5-48-48-48zm-32 400H80V176h352v256zm32-304H48V80h416v48zM204 272h104c6.6 0 12-5.4 12-12v-24c0-6.6-5.4-12-12-12H204c-6.6 0-12 5.4-12 12v24c0 6.6 5.4 12 12 12'],
viewBox: '0 0 512 512',
+ },
+ "pen": {
+ path: ['M493.26 56.26l-37.51-37.51C443.25 6.25 426.87 0 410.49 0s-32.76 6.25-45.25 18.74l-74.49 74.49L256 127.98 12.85 371.12.15 485.34C-1.45 499.72 9.88 512 23.95 512c.89 0 1.79-.05 2.69-.15l114.14-12.61L384.02 256l34.74-34.74 74.49-74.49c25-25 25-65.52.01-90.51zM118.75 453.39l-67.58 7.46 7.53-67.69 231.24-231.24 31.02-31.02 60.14 60.14-31.02 31.02-231.33 231.33zm340.56-340.57l-44.28 44.28-60.13-60.14 44.28-44.28c4.08-4.08 8.84-4.69 11.31-4.69s7.24.61 11.31 4.69l37.51 37.51c6.24 6.25 6.24 16.4 0 22.63z'],
+ viewBox: '0 0 512 512',
}
}
\ No newline at end of file
diff --git a/client/src/store/dashboard/dashboard.reducer.js b/client/src/store/dashboard/dashboard.reducer.js
index 144f76ff2..e806b529e 100644
--- a/client/src/store/dashboard/dashboard.reducer.js
+++ b/client/src/store/dashboard/dashboard.reducer.js
@@ -41,7 +41,7 @@ export default createReducer(initialState, {
},
[t.SET_TOPBAR_EDIT_VIEW]: (state, action) => {
- state.topbarEditViewId = action.id;
+ state.topbarEditViewId = action.id;
}
});
diff --git a/client/src/style/pages/dashboard.scss b/client/src/style/pages/dashboard.scss
index ee27fd513..3264aa960 100644
--- a/client/src/style/pages/dashboard.scss
+++ b/client/src/style/pages/dashboard.scss
@@ -162,22 +162,34 @@
font-weight: 100;
margin: 0;
}
-
- .sep{
- margin-left: 12px;
- margin-right: 12px;
- color: #999;
- border-left: 1px solid #d9d9d9;
- width: 1px;
- height: 25px;
- }
-
h3{
+ border-left: 1px solid #d9d9d9;
+ padding-left: 10px;
font-size: 16px;
font-weight: 300;
color: #777;
- margin: 0;
+ margin: 0 0 0 12px;
+ padding-top: 4px;
+ padding-bottom: 4px;
}
+
+ .button--view-edit{
+
+ svg{
+ color: #929699;
+ }
+
+ &:hover,
+ &:focus{
+ svg{
+ color: #5c7080;
+ }
+ }
+ }
+ }
+
+ &__subtitle{
+
}
&-content{
diff --git a/server/src/database/migrations/20190423085240_create_resources_table.js b/server/src/database/migrations/20190423085240_create_resources_table.js
index 1f9b99d40..21070b573 100644
--- a/server/src/database/migrations/20190423085240_create_resources_table.js
+++ b/server/src/database/migrations/20190423085240_create_resources_table.js
@@ -3,6 +3,10 @@ exports.up = function (knex) {
return knex.schema.createTable('resources', (table) => {
table.increments();
table.string('name');
+ }).then(() => {
+ return knex.seed.run({
+ specific: 'seed_resources.js',
+ });
});
};
diff --git a/server/src/database/migrations/20190822214242_create_users_table.js b/server/src/database/migrations/20190822214242_create_users_table.js
index dd4260bcc..09f200924 100644
--- a/server/src/database/migrations/20190822214242_create_users_table.js
+++ b/server/src/database/migrations/20190822214242_create_users_table.js
@@ -12,6 +12,10 @@ exports.up = function (knex) {
table.string('language');
table.date('last_login_at');
table.timestamps();
+ }).then(() => {
+ knex.seed.run({
+ specific: 'seed_users.js',
+ })
});
};
diff --git a/server/src/database/migrations/20190822214304_create_accounts_table.js b/server/src/database/migrations/20190822214304_create_accounts_table.js
index 8b0d108e6..f448d6b1b 100644
--- a/server/src/database/migrations/20190822214304_create_accounts_table.js
+++ b/server/src/database/migrations/20190822214304_create_accounts_table.js
@@ -10,6 +10,10 @@ exports.up = function (knex) {
table.boolean('active').defaultTo(true);
table.integer('index').unsigned();
table.timestamps();
+ }).then(() => {
+ return knex.seed.run({
+ specific: 'seed_accounts.js',
+ });
});
};
diff --git a/server/src/database/migrations/20190822214904_create_account_types_table.js b/server/src/database/migrations/20190822214904_create_account_types_table.js
index df89a2782..c91fb96fe 100644
--- a/server/src/database/migrations/20190822214904_create_account_types_table.js
+++ b/server/src/database/migrations/20190822214904_create_account_types_table.js
@@ -6,6 +6,10 @@ exports.up = (knex) => {
table.string('normal');
table.boolean('balance_sheet');
table.boolean('income_sheet');
+ }).then(() => {
+ return knex.seed.run({
+ specific: 'seed_account_types.js',
+ });
});
};
diff --git a/server/src/database/migrations/20190822214905_create_resource_fields_table.js b/server/src/database/migrations/20190822214905_create_resource_fields_table.js
index d8fbe2d32..82b3137d5 100644
--- a/server/src/database/migrations/20190822214905_create_resource_fields_table.js
+++ b/server/src/database/migrations/20190822214905_create_resource_fields_table.js
@@ -14,6 +14,10 @@ exports.up = function (knex) {
table.integer('index');
table.json('options');
table.integer('resource_id').unsigned();
+ }).then(() => {
+ return knex.seed.run({
+ specific: 'seed_resources_fields.js',
+ });
});
};
diff --git a/server/src/database/migrations/20190822214905_create_views_roles_table.js b/server/src/database/migrations/20190822214905_create_views_roles_table.js
index 79a2bb0cd..c67bfadf8 100644
--- a/server/src/database/migrations/20190822214905_create_views_roles_table.js
+++ b/server/src/database/migrations/20190822214905_create_views_roles_table.js
@@ -7,6 +7,10 @@ exports.up = function (knex) {
table.string('comparator');
table.string('value');
table.integer('view_id').unsigned();
+ }).then(() => {
+ return knex.seed.run({
+ specific: 'seed_views_role.js',
+ });
});
};
diff --git a/server/src/database/migrations/20190822214905_create_views_table.js b/server/src/database/migrations/20190822214905_create_views_table.js
index f1f33307c..2c91ddf04 100644
--- a/server/src/database/migrations/20190822214905_create_views_table.js
+++ b/server/src/database/migrations/20190822214905_create_views_table.js
@@ -7,6 +7,10 @@ exports.up = function (knex) {
table.integer('resource_id').unsigned().references('id').inTable('resources');
table.boolean('favourite');
table.string('roles_logic_expression');
+ }).then(() => {
+ return knex.seed.run({
+ specific: 'seed_views.js',
+ });
});
};
diff --git a/server/src/database/seeds/account_types.js b/server/src/database/seeds/seed_account_types.js
similarity index 100%
rename from server/src/database/seeds/account_types.js
rename to server/src/database/seeds/seed_account_types.js
diff --git a/server/src/database/seeds/accounts.js b/server/src/database/seeds/seed_accounts.js
similarity index 100%
rename from server/src/database/seeds/accounts.js
rename to server/src/database/seeds/seed_accounts.js
diff --git a/server/src/database/seeds/users.js b/server/src/database/seeds/seed_users.js
similarity index 100%
rename from server/src/database/seeds/users.js
rename to server/src/database/seeds/seed_users.js
diff --git a/server/src/database/seeds/seed_views.js b/server/src/database/seeds/seed_views.js
new file mode 100644
index 000000000..64daa86e5
--- /dev/null
+++ b/server/src/database/seeds/seed_views.js
@@ -0,0 +1,15 @@
+
+exports.seed = (knex) => {
+ // Deletes ALL existing entries
+ return knex('views').del()
+ .then(() => {
+ // Inserts seed entries
+ return knex('views').insert([
+ {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 },
+ {id: 4, name: 'Income', roles_logic_expression: '1', resource_id: 1, predefined: true },
+ {id: 5, name: 'Expenses', 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
new file mode 100644
index 000000000..b8ab744e8
--- /dev/null
+++ b/server/src/database/seeds/seed_views_roles.js
@@ -0,0 +1,15 @@
+
+exports.seed = (knex) => {
+ // Deletes ALL existing entries
+ return knex('view_roles').del()
+ .then(() => {
+ // Inserts seed entries
+ return knex('view_roles').insert([
+ {id: 1, field_id: 3, comparator: 'equals', value: '', view_id: 1},
+ {id: 2, field_id: 3, comparator: 'equals', value: '', view_id: 2},
+ {id: 3, field_id: 3, comparator: 'equals', value: '', view_id: 3},
+ {id: 4, field_id: 3, comparator: 'equals', value: '', view_id: 4},
+ {id: 5, field_id: 3, comparator: 'equals', value: '', view_id: 5},
+ ]);
+ });
+};