Add yearly graphs (#129)

* Add graph for timings * Generate yearly graph * Add yearly schedule in graph and blog posts * Fix quote issue
ragaeeb · Jun 21, 2020 · ad8a8a3 · ad8a8a3
1 parent 3f3e1ab
commit ad8a8a3
Show file tree

Hide file tree

Showing 26 changed files with 708 additions and 50 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -5,6 +5,18 @@ 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.4.0] - 2020-06-20
+
+### Added
+
+- [Added yearly graph page](https://github.com/ragaeeb/das-js/issues/126)
+- Added some new blog posts.
+
+### Fixed
+
+- Fixed up meta tags for monthly schedule page for SEO.
+- Minor bug-fixes.
+
 ## [0.3.9] - 2020-06-20
 
 ### Updated
@@ -15,7 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Added route to generate monthly schedule.
+- [Added route to generate monthly schedule](https://github.com/ragaeeb/das-js/issues/71)
 - Reduce size of date.
 - Package upgrades.
 

diff --git a/__tests__/utils/calculator.test.js b/__tests__/utils/calculator.test.js
@@ -19,41 +19,49 @@ describe('calculator', () => {
             event: 'fajr',
             label: 'Fajr',
             time: '3:46 AM',
+            value: new Date(2020, 5, 19, 7, 46, 0), // GMT-4
           },
           {
             event: 'sunrise',
             label: 'Sunrise',
             time: '5:15 AM',
+            value: new Date(2020, 5, 19, 9, 15, 0), // GMT-4
           },
           {
             event: 'dhuhr',
             label: 'Dhuhr',
             time: '1:05 PM',
+            value: new Date(2020, 5, 19, 17, 5, 0), // GMT-4
           },
           {
             event: 'asr',
             label: 'ʿAṣr',
             time: '5:15 PM',
+            value: new Date(2020, 5, 19, 21, 15, 0), // GMT-4
           },
           {
             event: 'maghrib',
             label: 'Maġrib',
             time: '8:55 PM',
+            value: new Date(2020, 5, 20, 0, 55, 0), // GMT-4
           },
           {
             event: 'isha',
             label: 'ʿIshāʾ',
             time: '10:23 PM',
+            value: new Date(2020, 5, 20, 2, 23, 0), // GMT-4
           },
           {
             event: 'middleOfTheNight',
             label: '1/2 Night Begins',
             time: '12:21 AM',
+            value: new Date(2020, 5, 20, 4, 21, 0), // GMT-4
           },
           {
             event: 'lastThirdOfTheNight',
             label: 'Last 1/3 Night Begins',
             time: '1:30 AM',
+            value: new Date(2020, 5, 20, 5, 30, 0), // GMT-4
           },
         ],
       });
@@ -73,41 +81,49 @@ describe('calculator', () => {
             event: 'fajr',
             label: 'Fajr',
             time: '3:53 AM',
+            value: new Date(2020, 5, 1, 7, 53, 0), // GMT-4
           },
           {
             event: 'sunrise',
             label: 'Sunrise',
             time: '5:18 AM',
+            value: new Date(2020, 5, 1, 9, 18, 0), // GMT-4
           },
           {
             event: 'dhuhr',
             label: 'Dhuhr',
             time: '1:01 PM',
+            value: new Date(2020, 5, 1, 17, 1, 0), // GMT-4
           },
           {
             event: 'asr',
             label: 'ʿAṣr',
             time: '5:10 PM',
+            value: new Date(2020, 5, 1, 21, 10, 0), // GMT-4
           },
           {
             event: 'maghrib',
             label: 'Maġrib',
             time: '8:45 PM',
+            value: new Date(2020, 5, 2, 0, 45, 0), // GMT-4
           },
           {
             event: 'isha',
             label: 'ʿIshāʾ',
             time: '10:10 PM',
+            value: new Date(2020, 5, 2, 2, 10, 0), // GMT-4
           },
           {
             event: 'middleOfTheNight',
             label: '1/2 Night Begins',
             time: '12:19 AM',
+            value: new Date(2020, 5, 2, 4, 19, 0), // GMT-4
           },
           {
             event: 'lastThirdOfTheNight',
             label: 'Last 1/3 Night Begins',
             time: '1:30 AM',
+            value: new Date(2020, 5, 2, 5, 30, 0), // GMT-4
           },
         ]);
 
@@ -116,41 +132,49 @@ describe('calculator', () => {
             event: 'fajr',
             label: 'Fajr',
             time: '3:51 AM',
+            value: new Date(2020, 5, 30, 7, 51, 0), // GMT-4
           },
           {
             event: 'sunrise',
             label: 'Sunrise',
             time: '5:19 AM',
+            value: new Date(2020, 5, 30, 9, 19, 0), // GMT-4
           },
           {
             event: 'dhuhr',
             label: 'Dhuhr',
             time: '1:07 PM',
+            value: new Date(2020, 5, 30, 17, 7, 0), // GMT-4
           },
           {
             event: 'asr',
             label: 'ʿAṣr',
             time: '5:16 PM',
+            value: new Date(2020, 5, 30, 21, 16, 0), // GMT-4
           },
           {
             event: 'maghrib',
             label: 'Maġrib',
             time: '8:55 PM',
+            value: new Date(2020, 6, 1, 0, 55, 0), // GMT-4
           },
           {
             event: 'isha',
             label: 'ʿIshāʾ',
             time: '10:22 PM',
+            value: new Date(2020, 6, 1, 2, 22, 0), // GMT-4
           },
           {
             event: 'middleOfTheNight',
             label: '1/2 Night Begins',
             time: '12:24 AM',
+            value: new Date(2020, 6, 1, 4, 24, 0), // GMT-4
           },
           {
             event: 'lastThirdOfTheNight',
             label: 'Last 1/3 Night Begins',
             time: '1:33 AM',
+            value: new Date(2020, 6, 1, 5, 33, 0), // GMT-4
           },
         ]);
       });

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
@@ -0,0 +1,30 @@
+---
+title: '1st day of Ramaḍān 1436 AH'
+date: '2015-06-16T23:53:32.169Z'
+description: 'Thursday, June 18th, 2015, in shā’ Allāh'
+imageUrl: https://images.thestar.com/PYXxLHk_4VgZr7xZfMkCYCn9J4s=/1086x688/smart/filters:cb(2700061000)/https://www.thespec.com/content/dam/thespec/opinion/contributors/2017/06/06/for-muslims-ramadan-is-a-month-of-charity-and-forgiveness/B823387220Z.1_20170606141630_000_GAE1T5VV7.2_Gallery.jpg
+thumbnailUrl: https://kawa-news.com/wp-content/uploads/2020/04/Arabic-Asia-ConvertImage-820x500.jpg
+---
+
+As-salaamu 'alaikum wa rahmatullahi wa barakaatuh,
+
+This is to inform you that the 1st day of Ramadaan will be Thursday, June 18th, 2015, in-sha-Allah. This means that we will start praying salaatut-taraweeh the night of Wednesday, June 17th, in-sha-Allah.
+
+Since the moon of Ramadaan was not sighted, we shall be completing thirty (30) days of Sha'baan, in accordance with the hadeeth of the Messenger of Allaah (sallAllaahu 'alaihi wa sallam):
+
+(Fast when you see the crescent. If it is obscured to you, then complete thirty days of Sha'baan. And break your fast when you see the crescent. If it is obscured to you then fast thirty days),
+
+[transmitted by al-Bukhaaree and Muslim].
+
+The following are the iqaamah times at Musalla As-Sahaba (2835 Dumaurier Ave., Ramsey area):
+
+Al-Fajr Prayer – 20 min. after the adhaan
+Adh-Dhuhr Prayer – 1:30pm
+Al-‘Asr Prayer – 20 min. after the adhaan
+Al-Maghrib Prayer – 10 min. after the adhaan
+Al-‘Ishaa Prayer & At-Taraweeh Prayers – 5 minutes after the adhaan
+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.
diff --git a/...ent/blog/1st-day-of-ramadaan-1437-ah-monday-june-6th-2016-in-sha-allah/index.md b/...ent/blog/1st-day-of-ramadaan-1437-ah-monday-june-6th-2016-in-sha-allah/index.md
@@ -0,0 +1,28 @@
+---
+title: '1st day of Ramaḍān 1437 AH'
+date: '2016-06-05T20:42:32.169Z'
+description: 'Monday, June 6th, 2016, in shā’ Allāh'
+imageUrl: https://vid.alarabiya.net/images/2015/06/17/7cedcaa6-c299-4eca-baf0-4d39183a269d/7cedcaa6-c299-4eca-baf0-4d39183a269d_16x9_600x338.jpg
+thumbnailUrl: https://aboutislam.net/wp-content/uploads/2020/04/Ramadan-lanterns-on-the-table-with-moon.jpg
+---
+
+As-salaamu 'alaikum wa rahmatullahi wa barakaatuh,
+
+As the crescent of Ramadaan has been sighted, this is to inform you that the 1st day of Ramadaan will be Monday, June 6th, 2016, in-sha-Allah. This means that we will start praying salaatut-taraweeh tonight (the night of Sunday, June 5th, 2016, in-sha-Allah.
+
+(Fast when you see the crescent. If it is obscured to you, then complete thirty days of Sha'baan. And break your fast when you see the crescent. If it is obscured to you then fast thirty days),
+
+[transmitted by al-Bukhaaree and Muslim].
+
+The following are the iqaamah times at Musalla As-Sahaba (2835 Dumaurier Ave., Ramsey area):
+
+Al-Fajr Prayer – 4:05am (fixed)
+Adh-Dhuhr Prayer – 1:30pm (fixed)
+Al-‘Asr Prayer – 20 min. after the adhaan
+Al-Maghrib Prayer – 10 min. after the adhaan
+Al-‘Ishaa Prayer & At-Taraweeh Prayers – 10:30pm (fixed)
+Al-Jumu’ah Khutbah/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.
diff --git a/content/blog/classes-resuming-tonight/index.md b/content/blog/classes-resuming-tonight/index.md
@@ -0,0 +1,19 @@
+---
+title: 'CLASSES RESUMING TONIGHT'
+date: '2014-11-14T08:15:32.169Z'
+description: 'Friday, Nov. 14th, in-sha-Allah'
+imageUrl: https://i.hurimg.com/i/hdn/75/0x0/5aeef64dd3806c239c0b4a46.jpg
+thumbnailUrl: https://quranacademy.io/blog/wp-content/uploads/2017/01/attain.jpg
+---
+
+As-salaamu 'alaikum wa Rahmatullaahi wa Barakaatuh,
+
+This is to inform you that Ash-Shaykh Abu 'Abdir-Rahmaan's classes will resume starting tonight Friday, November 14th, 2014 after the 'ishaa prayer at approximately 7:45pm - 8:00pm EST @ Musalla As-Sahaba, in-sha-Allah.
+
+Please note that original topic of Tafseer of Sooratul-Baqarah will be replaced with the continuation of Wasiyyah for the Student of Knowledge, in-sha-Allah. The remaining classes will continue as orignally scheduled with the same topic and times unless advised otherwise.
+
+You can also listen online at:
+
+mixlr.com/dar-as-sahaba/
+
+Please pass on this message. Baarakallahu feekum.
diff --git a/content/blog/eid-ul-fitr-prayer-1435-ah/index.md b/content/blog/eid-ul-fitr-prayer-1435-ah/index.md
@@ -0,0 +1,47 @@
+---
+title: "'Eidul-Fitr Prayer"
+date: '2014-07-26T15:09:32.169Z'
+description: '1435 AH / 2014'
+imageUrl: https://en.wataninet.com/wp-content/uploads/2019/06/eid-ul-fitr-mubarak-wallpaper.jpg
+thumbnailUrl: https://www.icna.org/wp-content/uploads/2014/07/etiquettes-eid.jpg
+---
+
+As-salaamu 'alaikum wa rahmatullahi wa barakaatuh,
+
+'Eid will either be on Monday, July 28th OR Tuesday, July 29th, 2014. We will inform you exactly when Sunday night, in-sha-Allah. We will be praying the 'Eidul-Fitr prayer at:
+
+Ruth Wildgens Park (outside)
+(1099 Grenon Avenue, behind Boys & Girls Club)
+
+ONLY 1 jama'ah - 9:30 am SHARP!!!
+
+In case of rain, we will be praying inside at:
+
+Boys & Girls Club of Ottawa
+(2825 Dumaurier Avenue)
+
+1st jama'ah - 9:30 am SHARP!!!
+2nd jama'ah - 10:30 am SHARP!!!
+
+Please bring your own rugs, blankets, etc.
+
+---
+
+PLEASE READ THE IMPORTANT POINTS BELOW:
+
+PARKING:
+
+Parking will be available at the following locations:
+
+1. Abraar School
+2. Church parking lot
+3. Across the street at the baseball diamonds and
+4. On Dumaurier and Grenon Avenue (the other side of Abraar School).
+
+Please mind the parking. There will be parking attendants guiding the vehicles at the designated parking lots. We ask you to pay attention to them, follow their instructions and please park as well as leave in an organized manner before and after the 'Eid prayer/khutbah.
+
+PRAYER/KHUTBAH:
+
+PLEASE LISTEN TO THE KHUTBAH AND REMAIN SILENT. For a number of years we've been having problems with people (especially from the sisters' side) 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, or after the khutbah is completely finished. We 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/...edge-of-the-khalaf-taught-by-ash-shaykh-abu-abdir-rahmaan-muhammad-ali/index.md b/...edge-of-the-khalaf-taught-by-ash-shaykh-abu-abdir-rahmaan-muhammad-ali/index.md
@@ -0,0 +1,58 @@
+---
+title: 'NEW CLASS: Benefits of the Knowledge of the Salaf over the Knowledge of the Khalaf'
+date: '2014-12-05T16:23:32.169Z'
+description: "taught by Ash-Shaykh Abu 'Abdir-Rahmaan Muhammad 'Ali"
+imageUrl: https://cdn11.bigcommerce.com/s-jwsaz/images/stencil/1280x1280/products/1097/2546/super1_2__67058.1388488544.jpg
+thumbnailUrl: https://i0.wp.com/thethinkingmuslim.com/wp-content/uploads/2013/04/fiqh.jpg
+---
+
+As-salaamu 'alaikum wa rahmatullahi wa barakaatuh,
+
+Bismillahi walhamdulillah was-salaatu was-salaamu 'alaa Rasoolillah
+
+Dar As-Sahaba presents...
+
+Benefits of the Knowledge of the Salaf over the Knowledge of the Khalaf
+
+By: Imaam ibn Rajab al-Hanbali (Raheemahullaah)
+
+Taught by:
+Ash-Shaykh Abu 'Abdir-Rahmaan Muhammad 'Ali
+(Graduate of the Islamic University of Madeenah, Faculty of Hadeeth)
+
+Date & Time:
+
+- Every Sunday at 6:30pm EST
+
+- Every Monday, Wednesday and Friday at approx. 7:45-8:00pm EST (after 'Ishaa Prayer)
+
+Location:
+Musalla As-Sahaba
+
+(2835 Dumaurier Ave., Ramsey)
+
+This class is free for both brothers and sisters and we encourage you to benefit from this blessed knowledge and attend. Due to the small size of the Musalla, we ask you to please refrain from distracting others so we can all benefit from the lectures.
+
+Please pass on this message.
+
+Jazakumullahu khair.
+
+To Listen Online:
+
+MIXLR:
+
+mixlr.com/dar-as-sahaba
+
+Regarding the online broadcasting, we would like to mention a few points:
+
+1. No recording please. Recording is only permitted for Dar As-Sahaba Admin.
+2. If there are any technical difficulties, please be patient and we will try to get it fixed for the following class.
+3. Due to time restrictions and our attention on the lecture, we will not be able to entertain any questions/comments from our online participants.
+
+Barakallahu feekum, we appreciate your understanding and cooperation in the above matters.
+
+For our international online 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/