diff --git a/src/App.vue b/src/App.vue
index 356042a..50ebecc 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -103,12 +103,14 @@ button:disabled {
/* ********** */
@media (max-width: 835px) {
- #container{
+ #container {
flex-direction: column;
}
+
#todo-container {
width: 100%;
}
+
#right-side {
margin-right: 32px;
margin-left: 32px;
diff --git a/src/components/Infos.vue b/src/components/Infos.vue
index 4bbc98f..1448f0a 100644
--- a/src/components/Infos.vue
+++ b/src/components/Infos.vue
@@ -18,7 +18,7 @@
Total todo: {{ this.nbItemsFinished }}
- Total sessions: {{ this.$store.getters.nbSessions }}
+ Total sessions: {{ this.nbSessions }}
+
+
(last + current session)
+
+
@@ -56,6 +62,7 @@ export default {
definition: '',
},
displayWord: true,
+ resetDone: false
};
},
methods: {
@@ -134,6 +141,10 @@ export default {
console.log(error);
});
},
+ resetStats() {
+ this.resetDone = true;
+ this.$store.commit('resetStats');
+ },
},
mounted() {
this.generateDateOfTheDay();
@@ -141,15 +152,15 @@ export default {
this.getNewWordEveryday();
},
computed: {
- itemsFinished() {
- return this.$store.getters.itemsFinished;
- },
nbItemsFinished() {
- return this.$store.getters.itemsFinished.length;
+ return parseInt(this.$store.getters.globalState.nbItemsFinished) + this.$store.getters.itemsFinished.length
},
colorSelected() {
return this.$store.getters.colorSelected;
},
+ nbSessions() {
+ return parseInt(this.$store.getters.globalState.nbSessions) + this.$store.getters.nbSessions
+ }
},
watch: {
colorSelected: function(color) {
@@ -216,10 +227,19 @@ export default {
text-align: center;
}
-#see-words {
+#hint {
+ font-size: 18px;
+ font-weight: lighter;
+}
+
+#reset-stats {
margin-top: 16px;
}
+#see-words {
+ margin-top: 8px;
+}
+
/* ********** */
/* RESPONSIVE */
/* ********** */
diff --git a/src/components/Pomodoro.vue b/src/components/Pomodoro.vue
index 82e9f5b..dd98d71 100644
--- a/src/components/Pomodoro.vue
+++ b/src/components/Pomodoro.vue
@@ -18,11 +18,11 @@
-
{{minutes}}
+
{{ minutes }}
:
-
{{seconds}}
+
{{ seconds }}