Add iqamah times (#143)

* Iqamah times, refactoring, cleanup * Add blog posts * Update changelog
ragaeeb · Jul 2, 2020 · 8839edf · 8839edf
1 parent 1d42df5
commit 8839edf
Show file tree

Hide file tree

Showing 27 changed files with 710 additions and 147 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.5.0] - 2020-07-01
+
+### Added
+
+- [Add support for dynamic yearly iqamah times](https://github.com/ragaeeb/das-js/issues/139)
+- [Lower font-size of non-fard events](https://github.com/ragaeeb/das-js/issues/140)
+- [Add jumuah khutbah times](https://github.com/ragaeeb/das-js/issues/141)
+- [Make git hash clickable](https://github.com/ragaeeb/das-js/issues/142)
+- [Add ability to go to prev/next months/years](https://github.com/ragaeeb/das-js/issues/144)
+- Dependency upgrades and removal of unnecessary packages.
+- General code refactoring.
+- Added more blog posts.
+
 ## [0.4.0] - 2020-06-20
 
 ### Added

diff --git a/__tests__/utils/calculator.test.js b/__tests__/utils/calculator.test.js
@@ -1,15 +1,54 @@
 import { describe, expect, it } from '@jest/globals';
-import { daily, monthly } from '../../src/utils/calculator';
+import { daily, isFard, monthly } from '../../src/utils/calculator';
+
+const salatLabels = {
+  fajr: 'Fajr',
+  sunrise: 'Sunrise',
+  dhuhr: 'Dhuhr',
+  asr: 'ʿAṣr',
+  maghrib: 'Maġrib',
+  isha: 'ʿIshāʾ',
+  middleOfTheNight: '1/2 Night Begins',
+  lastThirdOfTheNight: 'Last 1/3 Night Begins',
+};
 
 describe('calculator', () => {
   describe('daily', () => {
     it('should calculate the proper time for Ottawa', () => {
       const result = daily(
+        salatLabels,
         '45.3506',
         '-75.793',
         'America/Toronto',
         new Date(2020, 5, 19, 10, 24, 0),
-        {}
+        {
+          fajr: '4:45 AM',
+          dhuhr: {
+            6: '12:30 PM',
+          },
+          asr: {
+            6: {
+              1: '5:00 PM',
+              22: '5:15 PM',
+              24: '5:20 PM',
+              28: '6:00 PM',
+            },
+          },
+          maghrib: {
+            6: {
+              1: '6:30 PM',
+              11: '6:45 PM',
+              18: '6:50 PM',
+            },
+          },
+          isha: {
+            6: {
+              1: '7:30 PM',
+              11: '7:45 PM',
+              21: '7:50 PM',
+            },
+          },
+        }
       );
       expect(result).toEqual({
         date: 'Friday, June 19, 2020',
@@ -18,6 +57,7 @@ describe('calculator', () => {
           {
             event: 'fajr',
             label: 'Fajr',
+            iqamah: '4:45 AM',
             time: '3:46 AM',
             value: new Date(2020, 5, 19, 7, 46, 0), // GMT-4
           },
@@ -30,25 +70,29 @@ describe('calculator', () => {
           {
             event: 'dhuhr',
             label: 'Dhuhr',
+            iqamah: '12:30 PM',
             time: '1:05 PM',
             value: new Date(2020, 5, 19, 17, 5, 0), // GMT-4
           },
           {
             event: 'asr',
             label: 'ʿAṣr',
             time: '5:15 PM',
+            iqamah: '5:00 PM',
             value: new Date(2020, 5, 19, 21, 15, 0), // GMT-4
           },
           {
             event: 'maghrib',
             label: 'Maġrib',
             time: '8:55 PM',
+            iqamah: '6:50 PM',
             value: new Date(2020, 5, 20, 0, 55, 0), // GMT-4
           },
           {
             event: 'isha',
             label: 'ʿIshāʾ',
             time: '10:23 PM',
+            iqamah: '7:45 PM',
             value: new Date(2020, 5, 20, 2, 23, 0), // GMT-4
           },
           {
@@ -67,9 +111,24 @@ describe('calculator', () => {
       });
     });
 
+    describe('isFard', () => {
+      it('should be true for fard prayers', () => {
+        ['fajr', 'dhuhr', 'asr', 'maghrib', 'isha'].forEach((key) =>
+          expect(isFard(key)).toBe(true)
+        );
+      });
+
+      it('should be false for sunnah prayers', () => {
+        ['jumuah', 'sunrise', 'middleOfTheNight', 'lastThirdOfTheNight'].forEach((key) =>
+          expect(isFard(key)).toBe(false)
+        );
+      });
+    });
+
     describe('monthly', () => {
       it('should have proper label and timings', () => {
         const result = monthly(
+          salatLabels,
           '45.3506',
           '-75.793',
           'America/Toronto',
@@ -179,8 +238,9 @@ describe('calculator', () => {
         ]);
       });
 
-      it('should have 30 days for July', () => {
+      it('should have 30 days for June', () => {
         const result = monthly(
+          salatLabels,
           '45.3506',
           '-75.793',
           'America/Toronto',
@@ -191,6 +251,7 @@ describe('calculator', () => {
 
       it('should have 31 days for July', () => {
         const result = monthly(
+          salatLabels,
           '45.3506',
           '-75.793',
           'America/Toronto',

diff --git a/.../blog/1st-day-of-ramadaan-1436-ah-thursday-june-18th-2015-in-sha-allah/index.md b/.../blog/1st-day-of-ramadaan-1436-ah-thursday-june-18th-2015-in-sha-allah/index.md
@@ -28,3 +28,5 @@ Al-Jumu’ah Prayer – 1:00pm
 The iqaamah times will remain so unless further advised. Due to limited space, 'jumu'ah, 'ishaa and taraweeh prayers will be for brothers only.
 
 Barakallahu feekum.
+
+[2015 Calendar](https://drive.google.com/file/d/1hbJgcitjihUf_a9oI6v4MXo_Fb4NhxyQ)
diff --git a/...une-29th-2014-in-sha-allah-and-attached-1435-ah-2014-ramadaan-calendar/index.md b/...une-29th-2014-in-sha-allah-and-attached-1435-ah-2014-ramadaan-calendar/index.md
@@ -0,0 +1,33 @@
+---
+title: '1st day of Ramaḍān'
+date: '2014-06-28T13:06:32.169Z'
+description: 'Sunday, June 29th, 2014, in shā’ Allāh and attached 1435 AH / 2014 Ramaḍān Calendar'
+imageUrl: https://encrypted-tbn0.gstatic.com/images?q=tbn%3AANd9GcQ4QUpi5A5LIMlvuqf26M1xPy2CIOQqXjGmjg&usqp=CAU
+thumbnailUrl: https://www.eatright.org/-/media/eatrightimages/health/lifestyle/cultureandtraditions/ramadan_the_practice_of_fasting-542563100.jpg
+---
+
+As-salāmu ʿalaykum wa raḥmatullāhi wa barakātuh,
+
+This is to inform you that the 1st day of Ramaḍān will be Sunday, June 29th, 2014, in shā’ Allāh. This means that we will start praying ṣalātut-tarāwīḥ the night of Saturday, June 28th, in shā’ Allāh.
+
+Since the moon of Ramaḍān was not sighted, we shall be completing thirty (30) days of Shaʿbān (1435 AH), in accordance with the ḥadīth of the Messenger of Allāh (sallAllāhu ʾalaihi wa sallam):
+
+(Fast when you see the crescent. If it is obscured to you, then complete thirty days of Shaʿbān. And break your fast when you see the crescent. If it is obscured to you then fast thirty days),
+
+[transmitted by al-Bukhārī and Muslim].
+
+The following are the iqāmah times at Muṣallá As-Ṣaḥāba (2835 Dumaurier Ave., Ramsey area):
+
+AL-FAJR PRAYER – 20 MIN. AFTER THE ADHAAN
+ADH-DHUHR PRAYER – 1:30PM
+AL-ʿAṢR PRAYER – 20 MIN. AFTER THE ADHAAN
+AL-MAĠRIB PRAYER – 10 MIN. AFTER THE ADHAAN
+AL-ʿISHĀʾA PRAYER & AT-TARĀWĪḤ PRAYERS – 5 MINUTES AFTER THE ADHAAN
+AL-JUMUʾAH PRAYER – 1:00PM
+The iqāmah times will remain so unless further advised. Due to limited space, jumu’ah, ʿishāʾ and tarāwīḥ prayers will be for brothers only.
+
+Please see the attached 1435 AH / 2014 Ramaḍān Calendar.
+
+Bārak Allāhu fīkum.
+
+[2014 Calendar](https://drive.google.com/file/d/1whYAKhj_by4SQ5kW55cmMs7_AnEDuhf8)
diff --git a/content/blog/arabic-class-usul-us-sitta/index.md b/content/blog/arabic-class-usul-us-sitta/index.md
@@ -0,0 +1,13 @@
+---
+title: 'ʾUṣūl al-Sittah'
+date: '2014-01-12T10:23:32.169Z'
+description: "Shaykh Abu 'Abdirrahman 'Ajjāl"
+imageUrl: https://i2.wp.com/masjidsalafibooks.com/wp-content/uploads/2017/04/20170429_190101.png
+thumbnailUrl: https://salafibookstore.com/wp-content/uploads/2020/02/r402jIjQIKlf8cYRgQCi_kashf_shuboohaat-960x960.jpg
+---
+
+assalaamu 'alaikum wa rahmatullahi wa barakatuhu,
+
+InshaAllaah we will be having a last class with Shaykh Abu 'Abdirrahman on Monday evening ('Usoolus-sitta - arabic) at the musalla on January 13, 2014, bi'idnillaah. I would encourage everyone to attend and ask those who may not have received this email to attend as well.
+
+BarakAllaahufeek.
diff --git a/content/blog/ash-shaykh-abu-abdullah-mahir-ibn-dhafir-al-qahtani:/index.md b/content/blog/ash-shaykh-abu-abdullah-mahir-ibn-dhafir-al-qahtani:/index.md
@@ -0,0 +1,51 @@
+---
+title: "ASH-SHAYKH ABU 'ABDULLAH MAHIR IBN DHAFIR AL-QAHTANI"
+date: '2012-11-18T21:06:32.169Z'
+description: 'LIVE IN PERSON'
+imageUrl: https://s7.gifyu.com/images/maher-1024x682.jpg
+thumbnailUrl: https://s7.gifyu.com/images/maher2.jpg
+---
+
+Dar As-Sahaba presents...
+
+ASH-SHAYKH ABU 'ABDULLAH MAHIR IBN DHAFIR AL-QAHTANI
+(hafidhahullah)
+
+LIVE IN PERSON
+IN OTTAWA, ONTARIO, CANADA...
+
+He is a Khateeb in Jami’ ul Bilaal in Jeddah, Saudi Arabia. The shaykh has studied under scholars such as Ash-Shaykh ‘Abdul-‘Azeez Bin Baz, Ash-Shaykh Muhammad Ibn 'Uthaymeen, Ash-Shaykh ‘Abdullaah al-Ghudayaan, Ash-Shaykh Saalih al-Fawzaan, Ash-Shaykh Waseullaah al-‘Abbaas, Ash-Shaykh Khidr ash-Shinqitee, Ash-Shaykh Muhammad Bazmool and others.
+
+Date & Time:
+From December 21st - 26th, 2012, in-sha-Allah (tentative)
+
+Location:
+TBA - Various Locations in Ottawa, Canada
+
+- These lectures are all FREE.
+- Lecture schedule to follow, with specific dates, times and venues. We encourage you to benefit from this blessed knowledge and attend.
+- For updated information please visit our website at http://dar-as-sahaba.com or join our mailing list at [email protected]
+
+---
+
+دار الصحابة تقدم...
+
+الشيخ أبو عبد الله ماهر بن ظافر القحطاني -حفظه الله-
+
+شخصيا في أوتاوا، أونتاريو، كندا...
+
+إمام وخطيب مسجد «بلال بن رباح» في مدينة «جدة» السعودية. درس الشيخ -حفظه الله- على عدد من المشايخ كالشيخ عبد العزيز بن باز -رحمه الله- والشيخ محمد بن صالح العثيمين -رحمه الله- والشيخ عبد الله الغديان -رحمه الله- والشيخ صالح الفوزان -حفظه الله- والشيخ وصي الله عباس -حفظه الله- والشيخ خضر الشنقيطي -رحمه الله- والشيخ محمد بازمول -حفظه الله- وآخرون.
+
+توقيت الدروس:
+
+ابتداء من 21 ديسمبر إلى 26 ديسمبر 2012 إن شاء الله (تجريبي. (
+
+مكان الدروس:
+
+سيعلن قريبا - مواقع شتى في أوتاوا، كندا.
+
+· كل هذه المحاضرات مجانا.
+
+· ترقبوا جدول الدروس (التاريخ والوقت والمكان المحدد لكل درس) كما نشجعكم على الحضور والاستفادة من هذا العلم المبارك.
+
+· للحصول على آخر المعلومات، الرجاء زيارة موقعنا http://dar-as-sahaba.com أو الانضمام إلى قائمة مراسلتنا [email protected]
diff --git a/content/blog/eid-ul-adha-prayer-1433ah/index.md b/content/blog/eid-ul-adha-prayer-1433ah/index.md
@@ -0,0 +1,19 @@
+---
+title: 'Eid-ul Adha 1433'
+date: '2016-09-08T00:19:45.169Z'
+description: 'October 26th, 2012'
+imageUrl: https://www1.cbn.com/sites/default/files/styles/video_ratio_16_9/public/media/slider/images/quran_hdv.jpg?itok=DSH9Q6gI
+thumbnailUrl: https://www.nestle-family.com/sites/site.prod1.nestle-family.com/files/2020-04/calendar%20-mob.png
+---
+
+assalaamu 'alaikum wa rahmatullahi wa barakatuhu,
+
+InshaAllaah 'Eid will be held on Friday, October 26th at the Boys & Girls Club
+
+(2825 Dumaurier Avenue)
+
+PRAYER/KHUTBAH:
+
+PLEASE LISTEN TO THE KHUTBAH AND REMAIN SILENT. For a number of years we've been having problems with people talking after the prayer during the 'Eid khutbah. Should you decide to stay while the khateeb is speaking, then you must show some respect for the Islamic knowledge, the khateeb and those who wish to listen to the khutbah by remaining silent. You may greet one another either outside of the prayer hall/area, or after the khutbah is completely finished. We also ask the sisters to be mindful about this and we ask the brothers who bring their families to please advise them in this.
+
+Jazaakumullahu khairan wa baarakallahu feekum.
diff --git a/content/blog/fundraising-bbq/index.md b/content/blog/fundraising-bbq/index.md
@@ -0,0 +1,20 @@
+---
+title: 'Fundraising BBQ'
+date: '2013-06-02T10:11:32.169Z'
+description: "All proceeds will support future da'wah projects"
+imageUrl: https://s7.gifyu.com/images/bbq-2011.jpg
+thumbnailUrl: https://chowhound1.cbsistatic.com/thumbnail/800/0/chowhound1.cbsistatic.com/blog-media/2019/05/best-grilling-bbq-cookbooks-chowhound.jpg
+---
+
+As-Salaamu 'alaykum wa rahmatullaahi wa barakaatuh,
+
+As-Sahaba Association would like to invite you to a fundraising BBQ, all proceeds will support future Da'wah projects insha'Allaah!
+
+There will be delicious beef burgers & sausages on the grill and cold refreshments on ice. Books and 'attar will also be for sale. Everyone is welcome.
+
+Designated areas for both brothers and sisters:
+Brothers section will be located at Picnic Site C3 (green gazebo on a small hill) and the sisters section will be down the hill insha'Allaah.
+
+The BBQ will be held at Andrew Haydon Park (3127 Carling Ave.) on Sunday May 15th, 2011 from 12-4pm.
+
+For more information please contact As-Sahaba Musalla at (613) 321-5459 or email [email protected]
diff --git a/...es-lecture-sunday-maghrib-isha-explanation-of-the-sufficiency-in-creed/index.md b/...es-lecture-sunday-maghrib-isha-explanation-of-the-sufficiency-in-creed/index.md
@@ -0,0 +1,18 @@
+---
+title: 'Explanation of the Sufficiency in Creed'
+date: '2014-04-18T22:59:32.169Z'
+description: 'by al-Shaykh Abu Hamza al-Zuwwāghī'
+imageUrl: https://i1.wp.com/www.emaanlibrary.com/wp-content/uploads/2017/11/Sufficiency.jpg
+thumbnailUrl: https://salafibookstore.com/wp-content/uploads/2020/06/d2nIqQBTMJumyUhfsXuw_ARB080304191200.jpg
+---
+
+assalaaamu 'alaikum wa rahmatullahi wa barakatuhu,
+
+Please note that this Sunday's class (topic below) with Abu Hamza will be postponed until next week, April 27, 2014 between maghrib and 'isha at Musalla As-Sahaba, bi'idnillaah.
+
+شرح لمعة الاعتقاد للإمام ابن قدامة المقدسي ـ الشيخ العثيمين
+Explanation of the Sufficiency in Creed
+Al-Imaam ibn Qudaamah al-Maqdisee (541- 620H)
+by the Imaam, al-Allamah, Muhammad bin Saalih al-'Uthaimeen
+
+InshaAllaah the class will be given in both Arabic and English; everyone is most welcome to attend.
diff --git a/...e-series-words-about-al-manhaj-the-methodology-musalla-as-sahaba-wiziq/index.md b/...e-series-words-about-al-manhaj-the-methodology-musalla-as-sahaba-wiziq/index.md
@@ -0,0 +1,45 @@
+---
+title: 'LECTURE SERIES - Words About Al-Manhaj (The Methodology)'
+date: '2011-12-17T22:19:32.169Z'
+description: "by Ash-Shaykh Abu 'Abdur-Rahman Muhammad 'Ali 'Ajaal"
+imageUrl: https://pbs.twimg.com/profile_images/880508130861477889/3R-RVbhL_400x400.jpg
+thumbnailUrl: https://introvertedniqabi.files.wordpress.com/2019/04/maxresdefault.jpg
+---
+
+As-salaamu 'alaikum wa rahmatullahi wa barakaatuh,
+
+Bismillahi walhamdulillah was-salaatu was-salaamu 'alaa Rasoolillah
+
+Alhamdulillah, as some of you probably know, Ash-Shaykh Abu 'Abdur-Rahman Muhammad 'Ali 'Ajaal is in town for a short while. We ask Allah to preserve him and allow us to benefit from him during his stay. That being said, in-sha-Allah, he will be giving a series of lectures entitled Words About Al-Manhaj (The Methodology) @ Musalla As-Sahaba on the following days unless otherwise advised.
+
+This lecture series is about the methodology of the salafus-saalih (pious predecessors) along with the proofs and evidences and an explanation concerning it. This lecture is taught by Ash-Shaykh Abu 'Abdur-Rahmaan Muhammad 'Ali.
+
+The WIZIQ classes can be found at the following links:
+
+Part 1 - Sunday, Dec. 18th at 6pm EST
+http://www.wiziq.com/online-class/694858-words-about-al-manhaj-the-methodology-part-1
+
+Part 2 - Friday, Dec. 23rd at 7:45pm EST
+http://www.wiziq.com/online-class/694861-words-about-al-manhaj-the-methodology-part-2
+
+Part 3 - Saturday, Dec. 24th at 6pm EST
+http://www.wiziq.com/online-class/694862-words-about-al-manhaj-the-methodology-part-3
+
+Part 4 - Sunday, Dec. 25th at 6pm EST
+http://www.wiziq.com/online-class/694865-words-about-al-manhaj-the-methodology-part-4
+
+If there are any technical difficulties, please be patient and we will try to get it fixed for the class the following class.
+
+We would like to mention a few points:
+
+1. NO RECORDING PLEASE! Recording is only permitted for Dar As-Sahaba Admin.
+2. Due to time restrictions and our attention on the lecture, we will not be able to entertain any questions/comments from our WIZIQ participants.
+   Barakallahu feekum, we appreciate your understanding and cooperation in the above matters.
+
+For our international WIZIQ participants, please consult the world clock (links below) to find out the lecture time in your local time zone.
+
+http://www.timeanddate.com/worldclock/full.html
+
+http://www.worldtimezone.com/
+
+Jazakumullahu khair.