Skip to content

Commit d8c311c

Browse files
committed
Add progress bar
1 parent c44f6d1 commit d8c311c

File tree

4 files changed

+40
-12
lines changed

4 files changed

+40
-12
lines changed

src/assets/css/main.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
:root {
2+
--main-color: #6ebf5d;
3+
}
14
::-webkit-scrollbar-track {
25
border-radius: 10px;
36
background-color: #F5F5F5;

src/components/Favicon.vue

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
11
<template>
22
<img
3-
v-if="favicon == undefined"
3+
v-if="favicon == undefined || favicon == ''"
44
class="favicon"
55
height="22"
66
:src="NO_FAVICON_URL"
77
/>
8-
<img v-else class="favicon" height="30" :src="favicon" />
8+
<img
9+
v-else
10+
class="favicon"
11+
height="30"
12+
:src="favicon"
13+
/>
914
</template>
1015

1116
<script lang="ts">
1217
export default {
13-
name: "Favicon",
18+
name: 'Favicon',
1419
};
1520
</script>
1621

1722
<script lang="ts" setup>
18-
import { NO_FAVICON_URL } from "../utils/consts";
23+
import { NO_FAVICON_URL } from '../utils/consts';
1924
2025
const props = defineProps<{
2126
favicon: string | undefined;

src/components/TabItem.vue

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@
66
<p>{{ sessions }}</p>
77
</div>
88
<div class="display-inline-block float-right">
9-
<p class="time">{{ summaryTimeForTab }}</p>
10-
<p class="text-right">{{ percent }}</p>
9+
<p class="text-right time">{{ summaryTimeForTab }}</p>
10+
<p class="text-right">{{ percent }} %</p>
11+
</div>
12+
<div class="progress-bar">
13+
<div :style="styleForProgressBar"></div>
1114
</div>
1215
</div>
1316
</template>
@@ -40,15 +43,17 @@ const sessions = computed(() => {
4043
});
4144
4245
const summaryTimeForTab = convertSummaryTimeToString(currentDayValue?.summary);
43-
const percent = `${getPercentage(currentDayValue?.summary, props.summaryTime)} %`;
46+
const percent = getPercentage(currentDayValue?.summary, props.summaryTime);
47+
48+
const styleForProgressBar = computed(() => `width: ${percent}%`);
4449
</script>
4550

4651
<style scoped>
4752
.tab-item {
4853
padding: 7px;
4954
border: 1px transparent solid;
5055
border-radius: 10px;
51-
margin: 7px;
56+
margin: 10px;
5257
}
5358
.tab-item:hover {
5459
border: 1px rgb(202, 202, 202) solid;
@@ -68,4 +73,13 @@ const percent = `${getPercentage(currentDayValue?.summary, props.summaryTime)} %
6873
font-size: 14px;
6974
font-weight: 600;
7075
}
76+
.tab-item .progress-bar {
77+
margin: 5px 0 0 45px;
78+
border-radius: 10px;
79+
border: 1px rgb(225 224 224) solid;
80+
}
81+
.tab-item .progress-bar div {
82+
height: 6px;
83+
background-color: var(--main-color);
84+
}
7185
</style>

src/pages/Popup.vue

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,21 @@
22
<div class="headerBlock">
33
<p class="header">Web Activity Time Tracker</p>
44
<div class="float-right">
5-
<img height="20" src="../assets/icons/dark-mode.svg" />
6-
<img height="20" src="../assets/icons/settings.svg" />
5+
<img
6+
height="20"
7+
src="../assets/icons/dark-mode.svg"
8+
/>
9+
<img
10+
height="20"
11+
src="../assets/icons/settings.svg"
12+
/>
713
</div>
814
</div>
915
<TabList />
1016
</template>
1117

1218
<script lang="ts" setup>
13-
import TabList from "../components/TabList.vue";
19+
import TabList from '../components/TabList.vue';
1420
</script>
1521

1622
<style>
@@ -24,7 +30,7 @@ body {
2430
2531
.headerBlock {
2632
height: 50px;
27-
background-color: #6ebf5d;
33+
background-color: var(--main-color);
2834
}
2935
3036
.headerBlock .header {

0 commit comments

Comments
 (0)