Skip to content

Commit 783733b

Browse files
committed
feat: continued work on customizable views, fixing a few bugs
1 parent 382308f commit 783733b

7 files changed

Lines changed: 15 additions & 197 deletions

File tree

src/components/SelectableVisualization.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ export default {
172172
timeline_barchart: {
173173
title: 'Timeline (barchart)',
174174
// TODO
175+
available: true,
175176
//available: this.$store.state.activity.category.available,
176177
},
177178
};

src/route.js

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ const Home = () => import('./views/Home.vue');
66
// Activity views for desktop
77
const Activity = () => import('./views/activity/Activity.vue');
88
const ActivityView = () => import('./views/activity/ActivityView.vue');
9-
const ActivitySummary = () => import('./views/activity/ActivitySummary.vue');
10-
const ActivityWindow = () => import('./views/activity/ActivityWindow.vue');
11-
const ActivityBrowser = () => import('./views/activity/ActivityBrowser.vue');
129
const ActivityEditor = () => import('./views/activity/ActivityEditor.vue');
1310

1411
const Buckets = () => import('./views/Buckets.vue');
@@ -36,26 +33,6 @@ const router = new VueRouter({
3633
component: ActivityView,
3734
props: true,
3835
},
39-
{
40-
path: 'summary',
41-
meta: { subview: 'summary' },
42-
name: 'activity-summary',
43-
component: ActivitySummary,
44-
props: true,
45-
},
46-
{
47-
path: 'window',
48-
meta: { subview: 'window' },
49-
name: 'activity-window',
50-
component: ActivityWindow,
51-
props: true,
52-
},
53-
{
54-
path: 'browser',
55-
meta: { subview: 'browser' },
56-
name: 'activity-browser',
57-
component: ActivityBrowser,
58-
},
5936
{
6037
path: 'editor',
6138
meta: { subview: 'editor' },

src/store/modules/settings.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@ const mutations = {
9090
}
9191
console.log('Loaded views:', state.views);
9292
},
93+
editView(state, { view_id, el_id, type }) {
94+
console.log(view_id, el_id, type);
95+
console.log(state.views);
96+
state.views.find(v => v.id == view_id).elements[el_id].type = type;
97+
},
9398
loadClasses(state, classes) {
9499
let i = 0;
95100
state.classes = classes.map(c => Object.assign(c, { id: i++ }));

src/views/activity/ActivityBrowser.vue

Lines changed: 0 additions & 56 deletions
This file was deleted.

src/views/activity/ActivitySummary.vue

Lines changed: 0 additions & 57 deletions
This file was deleted.

src/views/activity/ActivityView.vue

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<template lang="pug">
2-
div
2+
div(v-if="view")
33
div.row.mb-4
44
div.col-md-6.col-lg-4.p-3(v-for="el, index in view.elements")
55
aw-selectable-vis(:id="index" :type="el.type" @onTypeChange="onTypeChange")
66

7-
div
7+
b-button(@click="addVisualization")
88
icon(name="plus")
99
span Add visualization to view
1010
</template>
@@ -29,12 +29,13 @@ export default {
2929
},
3030
},
3131
methods: {
32-
onTypeChange(id, type) {
33-
// TODO: Use vuex store
34-
console.log(this.$store.state.settings.views);
35-
//this.elements[id] = type;
36-
// Needed to emit the change to the child component
37-
//this.$set(this.elements, this.elements);
32+
addVisualization: function () {
33+
alert('not implemented');
34+
},
35+
async onTypeChange(id, type) {
36+
const view_id =
37+
this.view_id == 'default' ? this.$store.state.settings.views[0].id : this.view_id;
38+
await this.$store.commit('settings/editView', { view_id: view_id, el_id: id, type });
3839
},
3940
},
4041
};

src/views/activity/ActivityWindow.vue

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)