Skip to content

Commit 509f055

Browse files
committed
Change repeatFrequency to repeatInterval and repeatOften to repeatEvery to improve grammar and make it easier to read and more clear
1 parent fc74184 commit 509f055

File tree

3 files changed

+114
-124
lines changed

3 files changed

+114
-124
lines changed

src/components/NewTodo.vue

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,22 @@
3232
<option value="2">Medium</option>
3333
<option value="3">Hard</option></select
3434
><br />
35-
Repeat often:<br />
35+
Repeat every:<br />
3636
<input
3737
class="todo-input"
38-
id="repeat-often"
38+
id="repeat-every"
3939
type="number"
4040
placeholder="Enter number of days/weeks/months/years to repeat"
41-
v-model="repeatOften"
41+
v-model="repeatEvery"
4242
required
4343
min="1"
4444
step="1"
4545
/><br />
46-
Repeat frequency:<br />
46+
Repeat interval:<br />
4747
<select
4848
class="todo-input"
49-
id="repeat-frequency"
50-
v-model="repeatFrequency"
49+
id="repeat-interval"
50+
v-model="repeatInterval"
5151
required
5252
>
5353
<option value="1">Daily</option>
@@ -62,16 +62,16 @@
6262

6363
<script lang="ts">
6464
import store from "@/store";
65-
import { difficulty, priority, repeatFrequency } from "./TodoList.vue";
65+
import { difficulty, priority, repeatInterval } from "./TodoList.vue";
6666
import { defineComponent } from "vue";
6767
6868
export interface todoTask {
6969
task: string; //task name
7070
dueDate: Date; //task due date
7171
priority: number; //task priority
7272
difficulty: number; //task difficulty
73-
repeatOften: number; //task repetition number of days/weeks/months/years
74-
repeatFrequency: number; //task repetition frequency
73+
repeatEvery: number; //task repetition number of days/weeks/months/years
74+
repeatInterval: number; //task repetition interval
7575
newId: number; //task id
7676
completed: boolean; //task completed or not
7777
timesCompleted: number; //number of times tasks has been completed
@@ -81,8 +81,8 @@ export interface todoTask {
8181
const currentUtcDate: Date = new Date();
8282
const currentLocalDate: Date = new Date(
8383
currentUtcDate.setMinutes(
84-
currentUtcDate.getMinutes() - currentUtcDate.getTimezoneOffset()
85-
)
84+
currentUtcDate.getMinutes() - currentUtcDate.getTimezoneOffset(),
85+
),
8686
);
8787
8888
export default defineComponent({
@@ -92,8 +92,8 @@ export default defineComponent({
9292
dueDate: currentLocalDate.toISOString().split("T")[0], //set default due date to today
9393
priority: priority.Low, //set default priority is low
9494
difficulty: difficulty.Easy, //set default difficulty is easy
95-
repeatOften: 1,
96-
repeatFrequency: repeatFrequency.Once, //set default task repetition to one-time
95+
repeatEvery: 1, // set default task repetition number to 1
96+
repeatInterval: repeatInterval.Once, //set default task repetition interval to one-time
9797
newId: 0, //initial task id is 0
9898
completed: false, //task not completed if a task is created
9999
timesCompleted: 0,
@@ -103,7 +103,7 @@ export default defineComponent({
103103
},
104104
mounted() {
105105
const dueDateInput = document.getElementById(
106-
"due-date"
106+
"due-date",
107107
) as HTMLInputElement;
108108
dueDateInput.min = currentLocalDate.toISOString().split("T")[0]; //task minimum due date must be today
109109
},
@@ -119,8 +119,8 @@ export default defineComponent({
119119
this.dueDate = currentLocalDate.toISOString().split("T")[0];
120120
this.priority = priority.Low;
121121
this.difficulty = difficulty.Easy;
122-
this.repeatOften = 1;
123-
this.repeatFrequency = repeatFrequency.Once;
122+
this.repeatEvery = 1;
123+
this.repeatInterval = repeatInterval.Once;
124124
this.completed = false;
125125
this.timesCompleted = 0;
126126
this.streak = 0;

src/components/TodoList.vue

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
{{ todo.streak.toLocaleString("en-US") }} <br />Due date:
3333
{{ todo.dueDate }} <br />Priority: {{ todo.priority }}
3434
<br />Difficulty: {{ todo.difficulty }} <br />Repeat:
35-
<span v-if="todo.repeatFrequency != 5">{{
36-
todo.repeatOften.toLocaleString("en-US")
35+
<span v-if="todo.repeatInterval != 5">{{
36+
todo.repeatEvery.toLocaleString("en-US")
3737
}}</span
38-
>&nbsp;<span v-if="todo.repeatFrequency == 1">Day</span
39-
><span v-if="todo.repeatFrequency == 2">Week</span
40-
><span v-if="todo.repeatFrequency == 3">Month</span
41-
><span v-if="todo.repeatFrequency == 4">Year</span
42-
><span v-if="todo.repeatFrequency == 5">Once</span
43-
><span v-if="todo.repeatOften > 1 && todo.repeatFrequency != 5"
38+
>&nbsp;<span v-if="todo.repeatInterval == 1">Day</span
39+
><span v-if="todo.repeatInterval == 2">Week</span
40+
><span v-if="todo.repeatInterval == 3">Month</span
41+
><span v-if="todo.repeatInterval == 4">Year</span
42+
><span v-if="todo.repeatInterval == 5">Once</span
43+
><span v-if="todo.repeatEvery > 1 && todo.repeatInterval != 5"
4444
>s</span
4545
></span
4646
>
@@ -60,7 +60,7 @@
6060
import store from "@/store";
6161
import { defineComponent } from "vue";
6262
63-
export enum repeatFrequency {
63+
export enum repeatInterval {
6464
Daily = 1, //daily gets 1x XP, weekly gets 2x XP, monthly gets 3x XP, yearly gets 4x XP, one-time gets 5x XP multiplier
6565
Weekly = 2,
6666
Monthly = 3,
@@ -86,8 +86,8 @@ export default defineComponent({
8686
dueDate: Date,
8787
priority: Number,
8888
difficulty: Number,
89-
repeatFrequency: String,
90-
repeatOften: Number,
89+
repeatInterval: String,
90+
repeatEvery: Number,
9191
level: Number,
9292
xp: Number,
9393
completed: Boolean,

0 commit comments

Comments
 (0)