yolokube/dashboard
yolokube/dashboard
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages 1 Wiki Activity

Merge pull request #44 from cinderblockgames/master

Browse source 
greeter.tsx fixes
This commit is contained in:
Bastian Meissner 2021-11-18 17:46:44 +01:00 committed by GitHub
commit be93940a50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/greeter.tsx
View file

@ -70,11 +70,11 @@ export const getGreeting = (greetings: Array<IGreetingProps>): string => {
export const getExtension = (day: number) => {
let extension = "th";
if (day % 10 === 1) {
if (day % 10 === 1 && day !== 11) {
extension = "st";
} else if (day % 10 === 2) {
} else if (day % 10 === 2 && day !== 12) {
extension = "nd";
} else if (day % 10 === 3) {
} else if (day % 10 === 3 && day !== 13) {
extension = "rd";
}
@ -93,9 +93,9 @@ export const getDateString = (
) => {
let currentDate = new Date();
let weekday = weekdays[currentDate.getUTCDay()];
let weekday = weekdays[currentDate.getDay()];
let day = currentDate.getDate();
let month = months[currentDate.getUTCMonth()];
let month = months[currentDate.getMonth()];
let extension = getExtension(day);
let year = currentDate.getFullYear();
let isodate = currentDate.toISOString().slice(0,10);

27
src/test/components/greeter.spec.tsx
View file

@ -68,7 +68,34 @@ it("getExtension test", () => {
expect(getExtension(1)).toEqual("st");
expect(getExtension(2)).toEqual("nd");
expect(getExtension(3)).toEqual("rd");
expect(getExtension(4)).toEqual("th");
expect(getExtension(5)).toEqual("th");
expect(getExtension(6)).toEqual("th");
expect(getExtension(7)).toEqual("th");
expect(getExtension(8)).toEqual("th");
expect(getExtension(9)).toEqual("th");
expect(getExtension(10)).toEqual("th");
expect(getExtension(11)).toEqual("th");
expect(getExtension(12)).toEqual("th");
expect(getExtension(13)).toEqual("th");
expect(getExtension(14)).toEqual("th");
expect(getExtension(15)).toEqual("th");
expect(getExtension(16)).toEqual("th");
expect(getExtension(17)).toEqual("th");
expect(getExtension(18)).toEqual("th");
expect(getExtension(19)).toEqual("th");
expect(getExtension(20)).toEqual("th");
expect(getExtension(21)).toEqual("st");
expect(getExtension(22)).toEqual("nd");
expect(getExtension(23)).toEqual("rd");
expect(getExtension(24)).toEqual("th");
expect(getExtension(25)).toEqual("th");
expect(getExtension(26)).toEqual("th");
expect(getExtension(27)).toEqual("th");
expect(getExtension(28)).toEqual("th");
expect(getExtension(29)).toEqual("th");
expect(getExtension(30)).toEqual("th");
expect(getExtension(31)).toEqual("st");
});
it("Greeter snapshot test", () => {