From f584aea883f0a9008e56abcddc224a0cb869b4ba Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Tue, 25 Feb 2020 10:44:28 +0100 Subject: [PATCH] packages/core/api/time: remove time based greeting --- .../time/locales/goodAfternoon.locales.json | 134 ------------------ .../api/time/locales/goodEvening.locales.json | 97 ------------- .../api/time/locales/goodMorning.locales.json | 61 -------- .../packages/core/src/api/time/timeUtil.js | 23 --- .../core/src/api/time/timeUtil.test.js | 20 --- frontend/packages/core/src/index.ts | 1 - .../src/components/HomePage/HomePage.tsx | 9 +- 7 files changed, 1 insertion(+), 344 deletions(-) delete mode 100644 frontend/packages/core/src/api/time/locales/goodAfternoon.locales.json delete mode 100644 frontend/packages/core/src/api/time/locales/goodEvening.locales.json delete mode 100644 frontend/packages/core/src/api/time/locales/goodMorning.locales.json delete mode 100644 frontend/packages/core/src/api/time/timeUtil.test.js diff --git a/frontend/packages/core/src/api/time/locales/goodAfternoon.locales.json b/frontend/packages/core/src/api/time/locales/goodAfternoon.locales.json deleted file mode 100644 index 9f344e9e57..0000000000 --- a/frontend/packages/core/src/api/time/locales/goodAfternoon.locales.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "English": "Good afternoon", - "Abkhaz": "Уа, мшы бзиа", - "Adyghe": "Уимафэ шІу", - "Afrikaans": "Goeie middag", - "Albanian": "Mirëdita", - "Aleut": "Angaliichxizax̂", - "Aklan": "Mayad nga hapon", - "Alsatian": "Güete Nàchmittag", - "Arabic": "مساء الخير", - "Armenian": "Բարի կէսօր:", - "Assamese": "শুভ আবেলি", - "Asturian": "Bones tardes", - "Azerbaijani": "Salam", - "Bashkir": "хәйерле көн", - "Basque": "Arratsalde on", - "Bavarian": "Guadn åmd", - "Bengali": "শুভ বিকাল", - "Bhojpuri": "राम राम", - "Bosnian": "Dobar dan", - "Breton": "Demat", - "Bulgarian": "Добър ден", - "Cebuano": "Maayong Hapon", - "Chamorro": "Buenas tåtdes", - "Chinese": "午安", - "Cornish": "Dohajydh da", - "Corsican": "Bonghjornu", - "Croatian": "Dobar dan", - "Cuyonon": "Mayad nga apon", - "Czech": "Dobré odpoledne", - "Danish": "God eftermiddag", - "Dutch": "Goedemiddag", - "Estonian": "Tere päevast", - "Ewe": "Ŋdɔ", - "Faroese": "Góðan dagin", - "Fijian": "Bula", - "Finnish": "Hyvää päivää", - "Flemish": "Ghoeie middagh", - "French": "Bon après-midi", - "Frisian (North)": "Moin", - "Frisian (West)": "Goeie middei", - "Friulian": "Bundì", - "Galician": "Boa tarde", - "Georgian": "დილა მშვიდობისა", - "German": "Guten Tag", - "Greek": "Καλό απόγευμα", - "Greenlandic": "Inuugujaq", - "Haitian Creole": "Bon apre-midi", - "Hausa": "Barka da yamma", - "Hawaiian": "Aloha ʻauinalā", - "Hebrew": "אחר צהריים טובים", - "Hindi": "नमस्कार", - "Icelandic": "Góðan dag", - "Iloko": "Naimbag a malem", - "Indonesian": "Selamat sore", - "Iñupiaq": "Unnusatkun", - "Gaelic": "Tráthnóna maith duit", - "Italian": "Buongiorno", - "Japanese": "こんにちは", - "Javanese": "Sugeng siang", - "Jèrriais": "Bouônjour", - "Kannada": "ಶುಭ ಮಧ್ಯಾಹ್ನ", - "Kazakh": "Қайырлы күн!", - "Khmer": "ទិវាសួស្ដី", - "Korean": "안녕하세요", - "Kurdish": "Rojbash", - "Kyrgyz": "Кутмандуу күнүңүз менен", - "Latvian": "Labdien", - "Limburgish": "Gojemiddig", - "Lithuanian": "Laba diena", - "Lozi": "Ki musihali", - "Lule Sámi": "Buorre biejvve", - "Luxembourgish": "Gudde Mëtteg", - "Macedonian": "Добар ден", - "Malagasy": "Manao ahoana e", - "Maltese": "Wara nofsinhar it-tajjeb", - "Mam": "Qa’lte", - "Manx": "Fastyr mie", - "Māori": "Kia ora", - "Middle Egyptian Hieroglyphs": "𓄤 𓅓𓈙𓂋𓅱𓇰", - "Nepali": "नमस्कार", - "Newari": "भिं न्हि", - "Northern Sámi": "Buorre beaivvi", - "Northern Sotho": "Dumêlang", - "Norwegian": "God ettermiddag", - "Occitan": "Bon vèspre", - "Odia": "ସୁଭ ଖରା ବେଳ", - "Papiamento": "Bon tardi", - "Pashto": "ورځ مو په خير", - "Polish": "Dzień dobry", - "Portuguese": "Boa tarde", - "Romanian": "Bună ziua", - "Russian": "Добрый день", - "Sakha": "Үтүө күнүнэн", - "Sardinian": "Bona sera", - "Scottish Gaelic": "Feasgar math", - "Scots": "Guid efternuin", - "Serbian": "Добар дан", - "Shona": "Masikati", - "Sicilian": "Bon jornu", - "Sinhala": "සුභ දවාලක්", - "Slovenian": "Dober dan", - "Somali": "Galab wanaagsan", - "Southern Sámi": "Buerie biejjie", - "Sumerian": "𒄭𒌓𒁀", - "Swahili": "Habari ya mchana", - "Swedish": "God eftermiddag", - "Swiss German": "Gueten Abig", - "Tagalog": "Magandang hapon po", - "Tamil": "மதிய வணக்கம்", - "Tatar": "Xäyerle kön", - "Telugu": "శుభ దినం", - "Tetum": "Botarde", - "Thai": "สวัสดีครับ", - "Tibetan": "ཉིན་གུང་བདེ་ལེགས།", - "Tok Pisin": "Apinum", - "Tongan": "Mālō tau ma‘u e ho‘ata ni", - "Tsonga": "Indzengha", - "Tswana": "Thupama e e monate", - "Turkish": "Tünaydın", - "Ukrainian": "Доброго дня", - "Urdu": "روز بخير", - "Uzbek": "Hayirli kun", - "Venetian": "Bondì", - "Vietnamese": "Xin chào", - "Võro": "Hüvvä lõunaaigo", - "Welsh": "P'nawn da", - "Xhosa": "Uben' emva kwemini entle", - "Yapese": "Fal'e misii", - "Yiddish": "א גוט אָוונט", - "Yucatec Maya": "Ma'lob chi'inil K'iin", - "Zazaki": "Perocê şıma xeyr bo", - "Zulu": "Sawubona" -} diff --git a/frontend/packages/core/src/api/time/locales/goodEvening.locales.json b/frontend/packages/core/src/api/time/locales/goodEvening.locales.json deleted file mode 100644 index caee290936..0000000000 --- a/frontend/packages/core/src/api/time/locales/goodEvening.locales.json +++ /dev/null @@ -1,97 +0,0 @@ -{ - "Afrikaans": "Goeienaand", - "Aklanon": "Mayad nga gabi-i", - "Albanian": "Mirëmbrëma", - "Anglo-Saxon": "God æfen", - "Arabic": "Masaa al-khair", - "Aragonese": "Buena nuei", - "Armenian": "Pari yerego", - "Aromunian": "Bunã seara", - "Asante": "Maadwó", - "Asturian": "Bona nuechi", - "Ateso": "Akwar najokan", - "Aymara": "Winas tartis", - "Azerbaijani": "Axsaminiz xeyir", - "Basque": "Arratsalde on", - "Belorussian": "Dobry viechar", - "Bemba": "Cungulopo mukwai", - "Bengali": "Shuvo shandhya", - "Bilen": "Aja kunduKw’ma?", - "Breton": "Noz vat", - "Bulgarian": "Dobar vecher", - "Cantonese": "Maan ngon", - "Cassubian": "Dobri wieczór", - "Catalan": "Bona tarda", - "Chamorro": "Pupuengin maolek", - "Chechen": "Sürea dika yoila", - "Comoran": "Bariza massihou", - "Cornish": "Gorthugher da", - "Croatian": "Dobra večer", - "Czech": "Dobrý večer", - "Danish": "God aften", - "Dutch": "Goedenavond", - "Edo": "Ób’ótà", - "English": "Good evening", - "Esperanto": "Bonan vesperon", - "Estonian": "Tere õhtust", - "Faroese": "Gott kvøld", - "Farsi": "Shab beh'khayr", - "Fijian": "Ni sa bogi", - "Finnish": "Hyvää iltaa", - "French": "Bonsoir", - "Galician": "Boas noites", - "Georgian": "Saghamo mshvidobisa", - "German": "Guten Abend", - "Greek": "Kalinishta", - "Guarani": "Mba’éichapa ndepyhare", - "Hebrew": "Erev tov", - "Hungarian": "Jó estét", - "Icelandic": "Gott kvöld", - "Indonesian": "Selamat malam", - "Irish Gaelic": "Tráthnóna", - "Italian": "Buona sera", - "Japanese": "こんばんは", - "Japanese (Romanji)": "Konban wa", - "Kazakh": "Khayrly kesh", - "Kurdi": "Evarbash", - "Latvian": "Labvakar", - "Lithuanian": "Labas vakaras", - "Luganda": "Osiibye otya nno", - "Luo": "Oimore", - "Luxembourgish": "Gudden Owend", - "Macedonian": "Dobra vecher", - "Malay": "Selamat malam", - "Maltese": "Il-lejla t-tajba", - "Mandarin": "Wan shang hao", - "Maori": "Kia orana ‘i teia a’ia’i", - "Marshallese": "Yokwe in jota", - "Mawe": "Awãe aiko", - "Middle Egyptian Hieroglyphs": "𓄤 𓅱𓃉𓇰", - "Mongolian": "Odoin mend", - "Norwegian [Bokmaal]": "God kveld", - "Odia": "ସୁଭସନ୍ଧ୍ୟା", - "Polish": "Dobry wieczór", - "Portuguese": "Boa noite", - "Quiché": "Xe q’ij", - "Romani [Sinte]": "Lashi rachi", - "Romanian": "Bunã seara", - "Russian": "Dobry vyecher", - "Scottish Gaelic": "Feasgar mhath", - "Scots": "Guid eenin", - "Sesotho": "Fonane", - "Serbian": "Добро вече", - "Slovak": "Dober vecher", - "Slovenian": "Dober vecher", - "Somali": "Habeen wanaagsan", - "Spanish": "Buenas tardes", - "Sumerian": "𒄭𒈪", - "Swedish": "God afton", - "Tagalog": "Magandang gabi", - "Thai": "Sawat-dii torn khum", - "Turkish": "Iyi aksamlar", - "Ukrainian": "Dobry vechir", - "Welsh": "Noswaith dda", - "Yiddish": "Ah gutn ovnt", - "Chinese": "晚安", - "Valyrian": "sȳz bantis" -} diff --git a/frontend/packages/core/src/api/time/locales/goodMorning.locales.json b/frontend/packages/core/src/api/time/locales/goodMorning.locales.json deleted file mode 100644 index bf728664c0..0000000000 --- a/frontend/packages/core/src/api/time/locales/goodMorning.locales.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "English": "Good morning", - "Afrikaans": "Goeiemôre, Môre", - "Albanian": "Mirëmëngjes", - "Arabic": "صباح الخير", - "Armenian": "Paree looys", - "Azerbaijani": "Sabahınız xeyir", - "Bengali": "shuprobhat", - "Bulgarian": "Dobro utro", - "Catalan": "Bon dia", - "Chinese": "早安", - "Croatian": "Dobro jutro", - "Czech": "Dobré ráno", - "Danish": "God morgen", - "Dutch": "Goedemorgen", - "Esperanto": "Bonan matenon", - "Estonian": "Tere hommikust", - "Finnish": "Hyvää huomenta", - "French": "Bonjour", - "German": "Guten Morgen", - "Greek": "Kaliméra", - "Kalaallisut": "Iterluarit", - "Hawaiian": "Aloha kakahiaka", - "Hebrew": "boker tov", - "Hindi": "Namaste", - "Hungarian": "Jó reggelt", - "Indonesian": "Selamat pagi", - "Irish": "Dia dhuit", - "Italian": "Buongiorno", - "Japanese": "お早う", - "Korean": "안녕하세요", - "Kurdish": "Beyanî baş", - "Lithuanian": "Labas rytas", - "Macedonian": "Добро утро", - "Malay": "Selamat pagi", - "Maltese": "Bonġu", - "Middle Egyptian Hieroglyphs": "𓄤 𓃀 𓂓 𓇳𓐅", - "Nepali": "subha prabhat", - "Norwegian": "God morgen", - "Odia": "ସୁପ୍ରଭାତ", - "Polish": "Dzień dobry", - "Portuguese": "Bom dia", - "Romanian": "Bună dimineaţa", - "Russian": "Доброе утро", - "Serbian": "Добро јутро", - "Spanish": "Buenos días", - "Sumerian": "𒄭𒌓", - "Swahili": "Habari ya asubuhi", - "Swedish": "God morgon", - "Tagalog": "Magandang umaga po", - "Taiwanese": "爻早", - "Thai": "สวัสดีครับ", - "Turkish": "Günaydın", - "Ukrainian": "Доброго ранку", - "Urdu": "صبح بخير", - "Uzbek": "Hayirli tong", - "Vietnamese": "Chào buổi sáng", - "Welsh": "Bore da", - "Latvian": "Labrīt", - "Valyrian": "Sȳz ñāqes" -} diff --git a/frontend/packages/core/src/api/time/timeUtil.js b/frontend/packages/core/src/api/time/timeUtil.js index 5500979b8c..501ea3c5f4 100644 --- a/frontend/packages/core/src/api/time/timeUtil.js +++ b/frontend/packages/core/src/api/time/timeUtil.js @@ -28,26 +28,3 @@ export function relativeTime(timestamp) { // Select a large random integer at startup, to prevent the greetings to change every time the user // navigates. const greetingRandomSeed = Math.floor(Math.random() * 1000000); - -export function getTimeBasedGreeting() { - const random = array => array[greetingRandomSeed % array.length]; - - const hour = new Date(Date.now()).getHours(); - if (hour >= 23) { - return { - language: 'Seriously', - greeting: 'Get some rest', - }; - } - const timeOfDay = hour => { - if (hour < 12) return 'goodMorning'; - if (hour < 17) return 'goodAfternoon'; - if (hour < 23) return 'goodEvening'; - }; - const greetings = require(`./locales/${timeOfDay(hour)}.locales.json`); - const greetingsKey = random(Object.keys(greetings)); - return { - language: greetingsKey, - greeting: greetings[greetingsKey], - }; -} diff --git a/frontend/packages/core/src/api/time/timeUtil.test.js b/frontend/packages/core/src/api/time/timeUtil.test.js deleted file mode 100644 index 61c70bcb9c..0000000000 --- a/frontend/packages/core/src/api/time/timeUtil.test.js +++ /dev/null @@ -1,20 +0,0 @@ -import { isValidDateAndFormat, getTimeBasedGreeting } from './timeUtil'; - -it('validates time format', () => { - const valid = isValidDateAndFormat('1970-01-01T00:00:00', 'YYYY-MM-DD[T]HH:mm:ss'); - const invalid = isValidDateAndFormat('1970/01/01T00:00:00', 'YYYY-MM-DD[T]HH:mm:ss'); - expect(valid).toBe(true); - expect(invalid).toBe(false); -}); - -it('has greeting and language', () => { - const greeting = getTimeBasedGreeting(); - expect(greeting).toHaveProperty('greeting'); - expect(greeting).toHaveProperty('language'); -}); - -it('greets late at night', () => { - jest.spyOn(global.Date, 'now').mockImplementationOnce(() => new Date('1970-01-01T23:00:00').valueOf()); - const greeting = getTimeBasedGreeting(); - expect(greeting.greeting).toBe('Get some rest'); -}); diff --git a/frontend/packages/core/src/index.ts b/frontend/packages/core/src/index.ts index 80fcfbb077..32467adfc3 100644 --- a/frontend/packages/core/src/index.ts +++ b/frontend/packages/core/src/index.ts @@ -1,4 +1,3 @@ -export { getTimeBasedGreeting } from './api/time/timeUtil'; export * from './api'; export { default as EntityLink, diff --git a/frontend/packages/plugins/home-page/src/components/HomePage/HomePage.tsx b/frontend/packages/plugins/home-page/src/components/HomePage/HomePage.tsx index 26060f93cd..edec2112ed 100644 --- a/frontend/packages/plugins/home-page/src/components/HomePage/HomePage.tsx +++ b/frontend/packages/plugins/home-page/src/components/HomePage/HomePage.tsx @@ -9,7 +9,6 @@ import { Page, theme, Progress, - getTimeBasedGreeting, } from '@spotify-backstage/core'; import SquadTechHealth from './SquadTechHealth'; import { useAsync } from 'react-use'; @@ -81,19 +80,13 @@ const HomePage: FC<{}> = () => { }; }); - const greeting = getTimeBasedGreeting(); const profile = { givenName: 'Suzy' }; return (