Skip to content

Commit a317a34

Browse files
committed
Timer fix
1 parent 79f1ddd commit a317a34

1 file changed

Lines changed: 21 additions & 7 deletions

File tree

src/App.tsx

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,26 @@ import christmasTreeUrl from './assets/christmas-tree.webp'
44

55
import { useState, useEffect } from "react";
66

7+
8+
function diff(d1: Date, d2: Date) {
9+
return { days, hours, minutes, seconds };
10+
}
11+
712
function diffStr(t: number) {
813
let diff = t - new Date().getTime()
9-
let diffT = new Date()
10-
diffT.setTime(diff)
11-
return diffT.getHours() + "h" + diffT.getMinutes() + "m" + diffT.getSeconds()
14+
15+
const days = Math.floor(diff / (1000 * 60 * 60 * 24));
16+
diff -= days * (1000 * 60 * 60 * 24);
17+
18+
const hours = Math.floor(diff / (1000 * 60 * 60));
19+
diff -= hours * (1000 * 60 * 60);
20+
21+
const minutes = Math.floor(diff / (1000 * 60));
22+
diff -= minutes * (1000 * 60);
23+
24+
const seconds = Math.floor(diff / 1000);
25+
// const diffDay = Math.round(diffMs / (1000 * 60 * 60 * 24));
26+
return hours + "h" + minutes + "m" + seconds + "s"
1227
}
1328

1429
function Timer({ targetDate }: { targetDate: Date }) {
@@ -33,10 +48,9 @@ function Timer({ targetDate }: { targetDate: Date }) {
3348
function ThreadLine({ day }: { day: number }) {
3449
const date: Date = new Date();
3550
const dateNextDay: Date = new Date()
36-
dateNextDay.setDate(date.getDate() + 1)
37-
dateNextDay.setHours(8)
38-
dateNextDay.setMinutes(0)
39-
dateNextDay.setSeconds(0)
51+
dateNextDay.setDate(day + 1)
52+
dateNextDay.setHours(0, 0, 0, 0)
53+
4054

4155
const currentDay = date.getDate()
4256
if(day == 24) {

0 commit comments

Comments
 (0)