Skip to content

Commit be06842

Browse files
hlavacmhlavacm
committed
Fixed correct BG from the Stop->Play button
+ Instant settings application after any quick button hit + Warning and Pulse Settings fields step 60->5 + Added ToolTips for Advanced Settings fields + GA script(s)
1 parent fee3c3c commit be06842

File tree

6 files changed

+43
-19
lines changed

6 files changed

+43
-19
lines changed

‎404.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
<link rel="mask-icon" href="static/safari-pinned-tab.svg" color="#5bbad5">
2020
<meta name="msapplication-TileColor" content="#ffffff">
2121
<meta name="theme-color" content="#ffffff">
22+
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-71841368-4"></script>
23+
<script>function gtag(){dataLayer.push(arguments)}window.dataLayer=window.dataLayer||[],gtag("js",new Date),gtag("config","UA-71841368-4");</script>
2224
</head>
2325
<body>
2426
<section class="hero is-primary is-fullheight">

‎docs/404.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
<link rel="mask-icon" href="static/safari-pinned-tab.svg" color="#5bbad5">
2020
<meta name="msapplication-TileColor" content="#ffffff">
2121
<meta name="theme-color" content="#ffffff">
22+
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-71841368-4"></script>
23+
<script>function gtag(){dataLayer.push(arguments)}window.dataLayer=window.dataLayer||[],gtag("js",new Date),gtag("config","UA-71841368-4");</script>
2224
</head>
2325
<body>
2426
<section class="hero is-primary is-fullheight">

‎index.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<link rel="mask-icon" href="static/safari-pinned-tab.svg" color="#5bbad5">
1919
<meta name="msapplication-TileColor" content="#ffffff">
2020
<meta name="theme-color" content="#ffffff">
21+
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-71841368-4"></script>
22+
<script>function gtag(){dataLayer.push(arguments)}window.dataLayer=window.dataLayer||[],gtag("js",new Date),gtag("config","UA-71841368-4");</script>
2123
</head>
2224
<body>
2325
<noscript>

‎src/components/ControlPanel.vue‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,13 @@ export default {
8686
play: function () {
8787
this.tick()
8888
this.ticker = setInterval(this.tick, 1000)
89-
this.$emit('colored', this.$store.state.countdownSeconds > 0 ? 'is-success' : 'is-danger')
89+
let colorClass = 'is-success'
90+
if (this.$store.state.countdownSeconds < 0) {
91+
colorClass = 'is-danger'
92+
} else if (this.$store.state.warningEnabled && this.$store.state.countdownSeconds <= this.$store.state.warningSeconds) {
93+
colorClass = 'is-warning'
94+
}
95+
this.$emit('colored', colorClass)
9096
},
9197
stop: function () {
9298
clearInterval(this.ticker)

‎src/components/SettingsPopup.vue‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<div class="columns">
4040
<div class="column">
4141
<p class="control">
42-
<input type="time" v-model="warningTimeValue" placeholder="Time" min="00:00" max="23:59:59" step="60" class="input is-medium is-rounded" @change.prevent="warningTimeChanged" :disabled="!warningEnabled" required>
42+
<input type="time" v-model="warningTimeValue" placeholder="Time" min="00:00" max="23:59:59" step="5" class="input is-medium is-rounded" @change.prevent="warningTimeChanged" :disabled="!warningEnabled" required>
4343
</p>
4444
</div>
4545
<div class="column">
@@ -54,7 +54,7 @@
5454
<div class="columns">
5555
<div class="column">
5656
<p class="control">
57-
<input type="time" v-model="pulseTimeValue" placeholder="Time" min="00:00" max="23:59:59" step="60" class="input is-medium is-rounded" @change.prevent="pulseTimeChanged" :disabled="!pulseEnabled" required>
57+
<input type="time" v-model="pulseTimeValue" placeholder="Time" min="00:00" max="23:59:59" step="5" class="input is-medium is-rounded" @change.prevent="pulseTimeChanged" :disabled="!pulseEnabled" required>
5858
</p>
5959
</div>
6060
<div class="column">
@@ -71,38 +71,50 @@
7171
<b-field label="Time Format">
7272
<div class="field is-grouped is-grouped-multiline">
7373
<p class="control">
74-
<b-radio-button v-model="currentFormatValue" native-value="HH:mm:ss" size="is-medium" type="is-info">
75-
<span>HH:mm:ss</span>
76-
</b-radio-button>
74+
<b-tooltip label="Countdown long time format with seconds" position="is-bottom" size="is-small" type="is-info" multilined>
75+
<b-radio-button v-model="currentFormatValue" native-value="HH:mm:ss" size="is-medium" type="is-info">
76+
<span>HH:mm:ss</span>
77+
</b-radio-button>
78+
</b-tooltip>
7779
</p>
7880
<p class="control">
79-
<b-radio-button v-model="currentFormatValue" native-value="mm:ss" size="is-medium" type="is-info">
80-
<span>mm:ss</span>
81-
</b-radio-button>
81+
<b-tooltip label="Countdown short time format without seconds" position="is-bottom" size="is-small" type="is-info" multilined>
82+
<b-radio-button v-model="currentFormatValue" native-value="mm:ss" size="is-medium" type="is-info">
83+
<span>mm:ss</span>
84+
</b-radio-button>
85+
</b-tooltip>
8286
</p>
8387
</div>
8488
</b-field>
8589
<b-field label="Font Size">
86-
<div class="control has-icons-right">
87-
<input type="number" v-model="fontSizeValue" min="1" max="50" placeholder="Font Size" class="input is-medium is-rounded" required>
88-
<span class="icon is-right">vw</span>
89-
</div>
90+
<b-tooltip label="Countdown font size in VW" position="is-bottom" size="is-small" type="is-info" multilined>
91+
<div class="control has-icons-right">
92+
<input type="number" v-model="fontSizeValue" min="1" max="50" placeholder="Font Size" class="input is-medium is-rounded" required>
93+
<span class="icon is-right">vw</span>
94+
</div>
95+
</b-tooltip>
9096
</b-field>
9197
<b-field label="Visual Notification">
9298
<div class="columns">
9399
<div class="column">
94100
<div class="field">
95-
<b-switch v-model="warningEnabled" size="is-medium" type="is-info">Warning</b-switch>
101+
<b-tooltip label="Orange background after the Warning time" size="is-small" type="is-info" multilined>
102+
<b-switch v-model="warningEnabled" size="is-medium" type="is-info">Warning</b-switch>
103+
</b-tooltip>
96104
</div>
97105
</div>
98106
<div class="column">
99107
<div class="field">
100-
<b-switch v-model="pulseEnabled" size="is-medium" type="is-info">Pulse</b-switch>
108+
<b-tooltip label="Countdown pulsing after the Pulse time" size="is-small" type="is-info" multilined>
109+
<b-switch v-model="pulseEnabled" size="is-medium" type="is-info">Pulse</b-switch>
110+
</b-tooltip>
101111
</div>
102112
</div>
103113
<div class="column">
104114
<div class="field">
105-
<b-switch v-model="stopwatchEnabled" size="is-medium" type="is-info">Elapsed</b-switch>
115+
<b-tooltip label="Elapsed time in the top-left corner" size="is-small" type="is-info" multilined>
116+
<b-switch v-model="stopwatchEnabled" size="is-medium" type="is-info">Elapsed</b-switch>
117+
</b-tooltip>
106118
</div>
107119
</div>
108120
</div>
@@ -211,7 +223,7 @@ export default {
211223
this.warningPercentageValue = 10
212224
this.pulsePercentageValue = 5
213225
this.countdownChanged()
214-
this.currentTabIndex = 1
226+
this.applySettings()
215227
},
216228
applySettings: function () {
217229
this.$dialog.confirm({

‎static/site.webmanifest‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"short_name": "Events Timer",
44
"icons": [
55
{
6-
"src": "/android-chrome-192x192.png",
6+
"src": "/static/android-chrome-192x192.png",
77
"sizes": "192x192",
88
"type": "image/png"
99
},
1010
{
11-
"src": "/android-chrome-512x512.png",
11+
"src": "/static/android-chrome-512x512.png",
1212
"sizes": "512x512",
1313
"type": "image/png"
1414
}

0 commit comments

Comments
 (0)