);
diff --git a/src/containers/BerlinClock.tsx b/src/containers/BerlinClock.tsx
index 5e9ff6f..31fb3dc 100644
--- a/src/containers/BerlinClock.tsx
+++ b/src/containers/BerlinClock.tsx
@@ -1,49 +1,24 @@
-import { useState } from 'react';
-import { Lamp } from '../components/Lamp';
-import { LampLine } from '../components/LampLine';
-import { useCurrentTime } from '../hooks/useCurrentTime';
-import { dateToBerlin } from '../utils';
+import { Lamp } from "../components/Lamp";
+import { LampLine } from "../components/LampLine";
+import type { BerlinClock as BerlinClockType } from "../types";
interface BerlinClockProps {
enabled: boolean;
+ clock: BerlinClockType;
}
-export function BerlinClock({ enabled }: BerlinClockProps) {
- const { currentTime } = useCurrentTime();
- const berlin = dateToBerlin(currentTime);
-
+export function BerlinClock({ enabled, clock }: BerlinClockProps) {
if (!enabled) return null;
return (
- {/* Seconds lamp */}
-
- {berlin.secondsRow.length > 0 && (
-
- {/* optional visual */}
-
- )}
-
-
- {/* Five hours row */}
-
-
-
-
- {/* Single hours row */}
-
-
-
-
- {/* Five minutes row */}
-
-
-
-
- {/* Single minutes row */}
-
);
}
diff --git a/src/containers/TimeConverter.tsx b/src/containers/TimeConverter.tsx
index d536573..1f558bc 100644
--- a/src/containers/TimeConverter.tsx
+++ b/src/containers/TimeConverter.tsx
@@ -1,15 +1,14 @@
-import { useState } from 'react';
-import { BerlinClock } from './BerlinClock';
-import { DigitalClock } from './DigitalClock';
-import { useCurrentTime } from '../hooks/useCurrentTime';
+import { useState } from "react";
+import { BerlinClock } from "./BerlinClock";
+import { DigitalClock } from "./DigitalClock";
+import { useCurrentTime } from "../hooks/useCurrentTime";
+import { dateToBerlin } from "../utils";
export function TimeConverter() {
const { currentTime, setCurrentTime } = useCurrentTime();
const [useSystemTime, setUseSystemTime] = useState(false);
-
- const handleTimeChange = (newTime: Date) => {
- setCurrentTime(newTime);
- };
+ const enabled = !useSystemTime;
+ const berlinClock = dateToBerlin(currentTime);
return (
@@ -22,11 +21,11 @@ export function TimeConverter() {
/>
Use system time
-
+
);
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 7ec0473..f497273 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,25 +1,74 @@
import type { BerlinClock } from '../types';
+import { LampState } from '../types';
export function dateToDigital(date: Date): string {
- // returns "HH:mm:ss"
- return '';
+ const pad = (n: number) => n.toString().padStart(2, '0');
+ return `${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`;
}
export function digitalToDate(digital: string): Date {
- // parses "HH:mm:ss"
- return new Date();
+ const parts = digital.split(':');
+ if (parts.length !== 3) return new Date(NaN);
+ const [h, m, s] = parts.map(Number);
+ if (isNaN(h) || isNaN(m) || isNaN(s)) return new Date(NaN);
+ const d = new Date();
+ d.setHours(h, m, s, 0);
+ return d;
}
export function dateToBerlin(date: Date): BerlinClock {
+ const hours = date.getHours();
+ const minutes = date.getMinutes();
+ const seconds = date.getSeconds();
+
+ const secondsLamp = seconds % 2 === 0 ? [LampState.Y] : [LampState.O];
+
+ const fiveHoursCount = Math.floor(hours / 5);
+ const fiveHours: LampState[] = Array.from({ length: 4 }, (_, i) =>
+ i < fiveHoursCount ? LampState.R : LampState.O,
+ );
+
+ const oneHourCount = hours % 5;
+ const oneHour: LampState[] = Array.from({ length: 4 }, (_, i) =>
+ i < oneHourCount ? LampState.R : LampState.O,
+ );
+
+ const fiveMinutesCount = Math.floor(minutes / 5);
+ const fiveMinutes: LampState[] = Array.from({ length: 11 }, (_, i) => {
+ if (i < fiveMinutesCount) {
+ // third, sixth, ninth positions (indices 2,5,8) are red (R)
+ return (i + 1) % 3 === 0 ? LampState.R : LampState.Y;
+ }
+ return LampState.O;
+ });
+
+ const oneMinuteCount = minutes % 5;
+ const oneMinute: LampState[] = Array.from({ length: 4 }, (_, i) =>
+ i < oneMinuteCount ? LampState.Y : LampState.O,
+ );
+
return {
- secondsRow: [],
- fiveHours: [],
- oneHour: [],
- fiveMinutes: [],
- oneMinute: [],
+ secondsRow: secondsLamp,
+ fiveHours,
+ oneHour,
+ fiveMinutes,
+ oneMinute,
};
}
export function berlinToDate(berlin: BerlinClock): Date {
- return new Date();
+ const countR = (arr: LampState[]) =>
+ arr.filter((s) => s === LampState.R).length;
+ const countY = (arr: LampState[]) =>
+ arr.filter((s) => s === LampState.Y).length;
+ const countYorR = (arr: LampState[]) =>
+ arr.filter((s) => s === LampState.R || s === LampState.Y).length;
+
+ const hours = countR(berlin.fiveHours) * 5 + countR(berlin.oneHour);
+ const minutes =
+ countYorR(berlin.fiveMinutes) * 5 + countY(berlin.oneMinute);
+
+ const d = new Date();
+ d.setHours(hours, minutes, 0, 0);
+ return d;
}