Update greeter.tsx

This commit is contained in:
phntxx 2021-05-15 16:09:12 +02:00
parent 007567a6d0
commit 947e6778d9

View file

@ -43,20 +43,21 @@ interface IGreeterComponentProps {
* @param b the minimum
* @param c the maximum
*/
const isBetween = (a: number, b: number, c: number): boolean => (a > b && a < c)
const isBetween = (a: number, b: number, c: number): boolean =>
a >= b && a <= c;
/**
* Returns a greeting based on the current time
* @returns {string} - A greeting
*/
const getGreeting = (greetings: Array<IGreetingProps>): string => {
let hours = Math.floor(new Date().getHours())
let hours = Math.floor(new Date().getHours());
let result = "";
greetings.forEach(greeting => {
if (isBetween(hours, greeting.start, greeting.end)) result = greeting.greeting;
})
greetings.forEach((greeting) => {
if (isBetween(hours, greeting.start, greeting.end))
result = greeting.greeting;
});
return result;
};
@ -87,7 +88,11 @@ const getExtension = (day: number) => {
* @param {string} format - The format of the date string
* @returns {string} - The current date as a string
*/
const getDateString = (weekdays: Array<string>, months: Array<string>, format: string) => {
const getDateString = (
weekdays: Array<string>,
months: Array<string>,
format: string
) => {
let currentDate = new Date();
let weekday = weekdays[currentDate.getUTCDay()];
@ -96,7 +101,12 @@ const getDateString = (weekdays: Array<string>, months: Array<string>, format: s
let extension = getExtension(day);
let year = currentDate.getFullYear();
return format.replace("%wd", weekday).replace("%d", day.toString()).replace("%e", extension).replace("%m", month).replace("%y", year.toString());
return format
.replace("%wd", weekday)
.replace("%d", day.toString())
.replace("%e", extension)
.replace("%m", month)
.replace("%y", year.toString());
};
/**
@ -104,7 +114,9 @@ const getDateString = (weekdays: Array<string>, months: Array<string>, format: s
*/
const Greeter = ({ data }: IGreeterComponentProps) => (
<GreeterContainer>
<DateText>{getDateString(data.days, data.months, data.dateformat)}</DateText>
<DateText>
{getDateString(data.days, data.months, data.dateformat)}
</DateText>
<GreetText>{getGreeting(data.greetings)}</GreetText>
</GreeterContainer>
);