Skip to content

Commit 5eff5f5

Browse files
committed
fix: moved Activity view options into a folded 'Filters' section closer to the top
1 parent aee573f commit 5eff5f5

1 file changed

Lines changed: 24 additions & 19 deletions

File tree

src/views/activity/Activity.vue

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,33 @@ div
2929

3030
div.ml-auto
3131
b-button-group
32+
b-button.px-2(:pressed.sync="showOptions", variant="outline-dark")
33+
icon(name="filter")
34+
span.d-none.d-md-inline
35+
| Filters
3236
b-button.px-2(@click="refresh(true)", variant="outline-dark")
3337
icon(name="sync")
3438
span.d-none.d-md-inline
3539
| Refresh
3640

41+
div.row(v-if="showOptions" style="background-color: #EEE;").my-3.py-3
42+
div.col-md-12
43+
h5 Filters
44+
div.col-md-6
45+
b-form-checkbox(v-model="filterAFK" size="sm")
46+
| Exclude AFK time
47+
icon#filterAFKHelp(name="question-circle" style="opacity: 0.4")
48+
b-tooltip(target="filterAFKHelp" v-b-tooltip.hover title="Filter away time where the AFK watcher didn't detect any input.")
49+
b-form-checkbox(v-model="includeAudible" :disabled="!filterAFK" size="sm")
50+
| Count audible browser tab as active
51+
icon#includeAudibleHelp(name="question-circle" style="opacity: 0.4")
52+
b-tooltip(target="includeAudibleHelp" v-b-tooltip.hover title="If the active window is an audible browser tab, count as active. Requires a browser watcher.")
53+
54+
div.col-md-6.mt-2.mt-md-0
55+
b-form-group(label="Show category" label-cols="5" label-cols-lg="4" style="font-size: 0.88em")
56+
b-form-select(v-model="filterCategory", :options="categories" size="sm")
57+
58+
3759
aw-periodusage.mt-2(:periodusage_arr="periodusage", @update="setDate")
3860

3961
ul.row.nav.nav-tabs.mt-4
@@ -58,25 +80,6 @@ div
5880
div
5981
router-view
6082

61-
div
62-
hr
63-
h5 Options
64-
65-
div.row
66-
div.col-md-6
67-
b-form-checkbox(v-model="filterAFK" size="sm")
68-
| Exclude AFK time
69-
icon#filterAFKHelp(name="question-circle" style="opacity: 0.4")
70-
b-tooltip(target="filterAFKHelp" v-b-tooltip.hover title="Filter away time where the AFK watcher didn't detect any input.")
71-
b-form-checkbox(v-model="includeAudible" :disabled="!filterAFK" size="sm")
72-
| Count audible browser tab as active
73-
icon#includeAudibleHelp(name="question-circle" style="opacity: 0.4")
74-
b-tooltip(target="includeAudibleHelp" v-b-tooltip.hover title="If the active window is an audible browser tab, count as active. Requires a browser watcher.")
75-
76-
div.col-md-6.mt-2.mt-md-0
77-
b-form-group(label="Show category" label-cols="5" label-cols-lg="4" style="font-size: 0.88em")
78-
b-form-select(v-model="filterCategory", :options="categories" size="sm")
79-
8083
aw-devonly
8184
b-btn(id="load-demo", @click="load_demo")
8285
| Load demo data
@@ -140,6 +143,7 @@ import 'vue-awesome/icons/edit';
140143
import 'vue-awesome/icons/times';
141144
import 'vue-awesome/icons/save';
142145
import 'vue-awesome/icons/question-circle';
146+
import 'vue-awesome/icons/filter';
143147
144148
export default {
145149
name: 'Activity',
@@ -161,6 +165,7 @@ export default {
161165
data: function () {
162166
return {
163167
today: get_today(),
168+
showOptions: false,
164169
filterCategory: null,
165170
includeAudible: true,
166171
filterAFK: true,

0 commit comments

Comments
 (0)