diff --git a/src/Calendar.tsx b/src/Calendar.tsx
index c66a5d7..fd476d0 100644
--- a/src/Calendar.tsx
+++ b/src/Calendar.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import {Day, decadeNames, frJDN, Month} from './dates';
+import {Day, decadeNames, frJDN, jdnGregorian, Month} from './dates';
type MonthProps = {
year: number;
@@ -19,35 +19,34 @@ export type CalendarProps = DateProps & {
type CalendarState = {};
function DecadeName({name}: { name: string }): JSX.Element {
- return
{name} | ;
+ return {name}
;
}
function DayDetail({jdn}: { jdn: number }): JSX.Element {
return
-
{}
+
{jdnGregorian(jdn).toDateString()}
;
}
function NormalDay({year, month, day, isToday}: DateProps & { isToday: boolean }): JSX.Element {
- return
+ return
{day}
+ {decadeNames[(day - 1) % 10]}
- | ;
+ ;
}
function NormalMonth({year, month}: MonthProps): JSX.Element {
const decadeHeads = decadeNames.map(name => );
- return
-
- {decadeHeads}
-
- {
- Array.from(Array(3).keys()).map(i => {
+ return
+
{decadeHeads}
+
{
+ Array.from(Array(3).keys()).map(i =>
{
Array.from(Array(10).keys()).map(j =>
)
- }
)
- }
-
;
+ })
+ }
+ ;
}
export class Calendar extends React.Component {