Skip to content

Commit

Permalink
fix: moved Activity view options into a folded 'Filters' section clos…
Browse files Browse the repository at this point in the history
…er to the top
  • Loading branch information
ErikBjare committed Jun 10, 2021
1 parent aee573f commit 5eff5f5
Showing 1 changed file with 24 additions and 19 deletions.
43 changes: 24 additions & 19 deletions src/views/activity/Activity.vue
Expand Up @@ -29,11 +29,33 @@ div

div.ml-auto
b-button-group
b-button.px-2(:pressed.sync="showOptions", variant="outline-dark")
icon(name="filter")
span.d-none.d-md-inline
| Filters
b-button.px-2(@click="refresh(true)", variant="outline-dark")
icon(name="sync")
span.d-none.d-md-inline
| Refresh

div.row(v-if="showOptions" style="background-color: #EEE;").my-3.py-3
div.col-md-12
h5 Filters
div.col-md-6
b-form-checkbox(v-model="filterAFK" size="sm")
| Exclude AFK time
icon#filterAFKHelp(name="question-circle" style="opacity: 0.4")
b-tooltip(target="filterAFKHelp" v-b-tooltip.hover title="Filter away time where the AFK watcher didn't detect any input.")
b-form-checkbox(v-model="includeAudible" :disabled="!filterAFK" size="sm")
| Count audible browser tab as active
icon#includeAudibleHelp(name="question-circle" style="opacity: 0.4")
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.")

div.col-md-6.mt-2.mt-md-0
b-form-group(label="Show category" label-cols="5" label-cols-lg="4" style="font-size: 0.88em")
b-form-select(v-model="filterCategory", :options="categories" size="sm")


aw-periodusage.mt-2(:periodusage_arr="periodusage", @update="setDate")

ul.row.nav.nav-tabs.mt-4
Expand All @@ -58,25 +80,6 @@ div
div
router-view

div
hr
h5 Options

div.row
div.col-md-6
b-form-checkbox(v-model="filterAFK" size="sm")
| Exclude AFK time
icon#filterAFKHelp(name="question-circle" style="opacity: 0.4")
b-tooltip(target="filterAFKHelp" v-b-tooltip.hover title="Filter away time where the AFK watcher didn't detect any input.")
b-form-checkbox(v-model="includeAudible" :disabled="!filterAFK" size="sm")
| Count audible browser tab as active
icon#includeAudibleHelp(name="question-circle" style="opacity: 0.4")
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.")

div.col-md-6.mt-2.mt-md-0
b-form-group(label="Show category" label-cols="5" label-cols-lg="4" style="font-size: 0.88em")
b-form-select(v-model="filterCategory", :options="categories" size="sm")

aw-devonly
b-btn(id="load-demo", @click="load_demo")
| Load demo data
Expand Down Expand Up @@ -140,6 +143,7 @@ import 'vue-awesome/icons/edit';
import 'vue-awesome/icons/times';
import 'vue-awesome/icons/save';
import 'vue-awesome/icons/question-circle';
import 'vue-awesome/icons/filter';
export default {
name: 'Activity',
Expand All @@ -161,6 +165,7 @@ export default {
data: function () {
return {
today: get_today(),
showOptions: false,
filterCategory: null,
includeAudible: true,
filterAFK: true,
Expand Down

1 comment on commit 5eff5f5

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here are screenshots of this commit:

Screenshots using aw-server v0.10.0 (click to expand)

Screenshots using aw-server-rust master (click to expand)

Screenshots using aw-server-rust v0.10.0 (click to expand)

CML watermark

Please sign in to comment.