salat 0.2.10 → 2.0.2

package/README.md

@@ -1,7 +1,3 @@
-<p align="center">
-  <img  src="images/logo.png"> 
-</p>
-
 # Salat [![npm version](https://badge.fury.io/js/salat.svg)](https://badge.fury.io/js/salat)
 
 ## Description
@@ -38,6 +34,8 @@ $ salat [cityName]
 ```
 ![screen 1](images/screenShot1.png)
 ![screen 2](images/screenShot2.png)
+![screen 3](images/screenShot3.png)
+
 
 ## Dependecies
 

package/{index.js → app.js}

@@ -10,6 +10,7 @@ const {
   getData,
   parsePrayerTimesFromResponse
 } = require("./utils.js");
+process.env.NODE_TLS_REJECT_UNAUTHORIZED="0"
 
 // Logging functioin
 const green = msg => console.log(chalk.green(msg));
@@ -41,7 +42,8 @@ const main = async () => {
       localStorage.setItem(storageKey, JSON.stringify(prayers));
     } catch (ex) {
       //TODO: Use a more descriptif error message
-      console.error("Someting bad happened");
+      console.error("Something went wrong!");
+      console.log(ex)
       // console.log(ex);
       return;
     }
@@ -51,7 +53,5 @@ const main = async () => {
 };
 
 (async () => {
-  console.time("Execution Time");
   await main();
-  console.timeEnd("Execution Time");
 })();

package/constants.js

@@ -1,20 +1,7 @@
 const API_URL =
-  "http://www.habous.gov.ma/horaire%20de%20priere/horaire-pub.php";
+  "http://www.habous.gov.ma/prieres/horaire-api.php";
 
-const BANNER = `
-  _______  _______  ___      _______  _______ 
-  |       ||   _   ||   |    |   _   ||       |
-  |  _____||  | |  ||   |    |  | |  ||_     _|
-  | |_____ |  |_|  ||   |    |  |_|  |  |   |  
-  |_____  ||       ||   |___ |       |  |   |  
-  _____|  ||   _   ||       ||   _   |  |   |  
-  |_______||__| |__||_______||__| |__|  |___|  v.${
-    require("./package.json").version
-  }
-  -------------------------------------------  by ${
-    require("./package.json").author.name
-  }
-  `;
+const BANNER = ``;
 
 const NOT_FOUND_ERROR = `
   Your city was not found in the list

package/data/cities.json

@@ -1,466 +1,766 @@
 [
     {
         "id": 1,
-        "name": "Feguig"
+        "name": "Rabat"
     },
     {
         "id": 2,
-        "name": "Oujda"
+        "name": "Khémissat"
     },
     {
         "id": 3,
-        "name": "Bouâarfa"
+        "name": "Tiflet"
     },
     {
         "id": 4,
-        "name": "Jrada"
+        "name": "Remani"
     },
     {
         "id": 5,
-        "name": "Berkane"
+        "name": "Oulmes"
     },
     {
         "id": 6,
-        "name": "Ain châir"
+        "name": "Bouznika"
     },
     {
         "id": 7,
-        "name": "Taourirt"
+        "name": "Kénitra"
     },
     {
         "id": 8,
-        "name": "Nador"
+        "name": "Sidi Kacém"
     },
     {
         "id": 9,
-        "name": "Melilla"
+        "name": "Sidi Yahya Gharb"
     },
     {
         "id": 10,
-        "name": "Bouânane"
+        "name": "Sidi Slimane"
     },
     {
         "id": 11,
-        "name": "Guersif"
+        "name": "Souq Arbiâ Gharb"
     },
     {
         "id": 12,
-        "name": "Boutagit"
+        "name": "Arbaoua"
     },
     {
         "id": 13,
-        "name": "Tandit"
+        "name": "Moulay Bousselham"
     },
     {
         "id": 14,
-        "name": "Aknoul"
+        "name": "Tanger"
     },
     {
         "id": 15,
-        "name": "Alhoceima"
+        "name": "Tetouan"
     },
     {
         "id": 16,
-        "name": "Missour"
+        "name": "Araich"
     },
     {
         "id": 17,
-        "name": "Taza"
+        "name": "Assila"
     },
     {
         "id": 18,
-        "name": "Bourd"
+        "name": "Chefchaouan"
     },
     {
         "id": 19,
-        "name": "Arfoud"
+        "name": "Martil"
     },
     {
         "id": 20,
-        "name": "Rissani"
+        "name": "Mediek"
     },
     {
         "id": 21,
-        "name": "Oued Amlil"
+        "name": "Ksar El Kebir"
     },
     {
         "id": 22,
-        "name": "Tehla"
+        "name": "Ksar El Sghir"
     },
     {
         "id": 23,
-        "name": "Errachidia"
+        "name": "Hoceima"
     },
     {
         "id": 24,
-        "name": "Rich"
+        "name": "Sebta"
     },
     {
         "id": 25,
-        "name": "Menzal beni yazgha"
+        "name": "Fnideq"
     },
     {
         "id": 26,
-        "name": "Taounat"
+        "name": "El Jabha"
     },
     {
         "id": 27,
-        "name": "Tissa"
+        "name": "Oued Law"
     },
     {
         "id": 28,
-        "name": "Boulemane"
+        "name": "Bab Bared"
     },
     {
         "id": 29,
-        "name": "Midelet"
+        "name": "Ouazane"
     },
     {
         "id": 30,
-        "name": "Sefrou"
+        "name": "Bouskoura"
     },
     {
         "id": 31,
-        "name": "Guelmima"
+        "name": "Oujda"
     },
     {
         "id": 32,
-        "name": "Fes"
+        "name": "Berkane"
     },
     {
         "id": 33,
-        "name": "Imouzar Kandar"
+        "name": "Figuig"
     },
     {
         "id": 34,
-        "name": "Tinjdad"
+        "name": "Bouarfa"
     },
     {
         "id": 35,
-        "name": "Ifrane"
+        "name": "Guercif"
     },
     {
         "id": 36,
-        "name": "Moulay Yaâgoub"
+        "name": "Jerada"
     },
     {
         "id": 37,
-        "name": "Azrou"
+        "name": "Aïn Chaïr"
     },
     {
         "id": 38,
-        "name": "Chefchaouan"
+        "name": "Taourirt"
     },
     {
         "id": 39,
-        "name": "Sebta"
+        "name": "Nador"
     },
     {
         "id": 40,
-        "name": "Tetouan"
+        "name": "Melilla"
     },
     {
         "id": 41,
-        "name": "Hajb"
+        "name": "Debdou"
     },
     {
         "id": 42,
-        "name": "Zerhoune"
+        "name": "Selouane"
     },
     {
         "id": 43,
-        "name": "Meknes"
+        "name": "Beni Ansar"
     },
     {
         "id": 44,
-        "name": "Ouazane"
+        "name": "Ferkhana"
     },
     {
         "id": 45,
-        "name": "Khénifra"
+        "name": "Talsint"
     },
     {
         "id": 46,
-        "name": "Sidi kacém"
+        "name": "Tendrara"
     },
     {
         "id": 47,
-        "name": "Tizi ousli"
+        "name": "Laayoune Sidi Mellouk"
     },
     {
         "id": 48,
-        "name": "Tanger"
+        "name": "Beni Adrar"
     },
     {
         "id": 49,
-        "name": "Zagoura"
+        "name": "Saïdia"
     },
     {
         "id": 50,
-        "name": "Laksar lakbire"
+        "name": "Ras Alma"
     },
     {
         "id": 51,
-        "name": "Arbaoua"
+        "name": "Tafougalt"
     },
     {
         "id": 52,
-        "name": "Sidi Slimane"
+        "name": "Fezouane"
     },
     {
         "id": 53,
-        "name": "Souq Arbiâ Gharb"
+        "name": "Ahfir"
     },
     {
         "id": 54,
-        "name": "Assila"
+        "name": "Zayou"
     },
     {
         "id": 55,
-        "name": "Khémissat"
+        "name": "Deryouche"
     },
     {
         "id": 56,
-        "name": "Kalâa Megouna "
+        "name": "Beni Tejit"
     },
     {
         "id": 57,
-        "name": "Araich"
+        "name": "Bouanan"
     },
     {
         "id": 58,
-        "name": "Moulay Bouâaza"
+        "name": "Casablanca"
     },
     {
         "id": 59,
-        "name": "Kesbat Tadla"
+        "name": "Mohammedia"
     },
     {
         "id": 60,
-        "name": "Sidi yahya lgharb"
+        "name": "Ben Slimane"
     },
     {
         "id": 61,
-        "name": "Tiflet"
+        "name": "Settat"
     },
     {
         "id": 62,
-        "name": "Beni Mellal"
+        "name": "El Gara"
     },
     {
         "id": 63,
-        "name": "Meskoura"
+        "name": "El Brouj"
     },
     {
         "id": 64,
-        "name": "Oued Zam"
+        "name": "Ben Ahmed"
     },
     {
         "id": 65,
-        "name": "Azilal"
+        "name": "Berrchid"
     },
     {
         "id": 66,
-        "name": "Oued zam"
+        "name": "El Jadida"
     },
     {
         "id": 67,
-        "name": "Kénitra"
+        "name": "Azemmour"
     },
     {
         "id": 68,
-        "name": "Remani"
+        "name": "Sidi Benour"
     },
     {
-        "id": "69",
-        "name": "Rabat Salé"
+        "id": 69,
+        "name": "Khemis Zemamra"
     },
     {
         "id": 70,
-        "name": "Khouribga"
+        "name": "Khenifra"
     },
     {
         "id": 71,
-        "name": "Ouerzazat"
+        "name": "Moulay Bouaza"
     },
     {
         "id": 72,
-        "name": "Demnat"
+        "name": "Zaouiat Ahansal"
     },
     {
         "id": 73,
-        "name": "Ben slimane"
+        "name": "Beni Mellal"
     },
     {
         "id": 74,
-        "name": "Bouznika"
+        "name": "Azilal"
     },
     {
         "id": 75,
-        "name": "Lgara"
+        "name": "Fquih Ben Salah"
     },
     {
         "id": 76,
-        "name": "Mohammedia"
+        "name": "Demnat"
     },
     {
         "id": 77,
-        "name": "kelâat Esraghna"
+        "name": "El Kasba"
     },
     {
         "id": 78,
-        "name": "Berrchid"
+        "name": "Kasbah Tadla"
     },
     {
         "id": 79,
-        "name": "Settat"
+        "name": "Khouribga"
     },
     {
         "id": 80,
-        "name": "Casablanca"
+        "name": "Oued Zam"
     },
     {
         "id": 81,
-        "name": "Talouine"
+        "name": "Fes"
     },
     {
         "id": 82,
-        "name": "Bengrire"
+        "name": "Sefrou"
     },
     {
         "id": 83,
-        "name": "Tata"
+        "name": "Moulay Yacoub"
     },
     {
         "id": 84,
-        "name": "Marrakech"
+        "name": "Boulmane"
     },
     {
         "id": 85,
-        "name": "Akka"
+        "name": "Misour"
     },
     {
         "id": 86,
-        "name": "Azemour"
+        "name": "Ribate El Kheir"
     },
     {
         "id": 87,
-        "name": "Aghram"
+        "name": "El Menzel"
     },
     {
         "id": 88,
-        "name": "Eljadida"
+        "name": "Imouzzer Kandar"
     },
     {
         "id": 89,
-        "name": "Youssoufia"
+        "name": "Taza"
     },
     {
         "id": 90,
-        "name": "Taroudent"
+        "name": "Taounat"
     },
     {
         "id": 91,
-        "name": "Tafraout"
+        "name": "Aknoul"
     },
     {
         "id": 92,
-        "name": "Safi"
+        "name": "Tizi Ousli"
     },
     {
         "id": 93,
-        "name": "Zag"
+        "name": "Bourd"
     },
     {
         "id": 94,
-        "name": "Assa"
+        "name": "Tahla"
     },
     {
         "id": 95,
-        "name": "Agadir"
+        "name": "Tisa"
     },
     {
         "id": 96,
-        "name": "Tiznit"
+        "name": "Kariat Ba Mohammed"
     },
     {
         "id": 97,
-        "name": "Essaouira"
+        "name": "Ketama"
     },
     {
         "id": 98,
-        "name": "Gelmim"
+        "name": "Oued Amlil"
     },
     {
         "id": 99,
-        "name": "Sidi Ifni"
+        "name": "Meknes"
     },
     {
         "id": 100,
-        "name": "Tantan"
+        "name": "Yefrin"
     },
     {
         "id": 101,
-        "name": "Smara"
+        "name": "El Hajeb"
     },
     {
         "id": 102,
-        "name": "Terfaya"
+        "name": "Zerhoune"
     },
     {
         "id": 103,
-        "name": "Laayoune"
+        "name": "Azrou"
     },
     {
         "id": 104,
-        "name": "Boujdour"
+        "name": "Marrakech"
     },
     {
         "id": 105,
-        "name": "Dakhla"
+        "name": "Kalaat Sraghna"
     },
     {
         "id": 106,
-        "name": "Lagouira"
+        "name": "Essaouira"
     },
     {
         "id": 107,
-        "name": "ألنيف"
+        "name": "Chichaoua"
     },
     {
         "id": 108,
-        "name": "الجعد"
+        "name": "Bengrir"
     },
     {
         "id": 109,
-        "name": "أوسرد"
+        "name": "Rhamna"
     },
     {
         "id": 110,
-        "name": "Tinghir"
+        "name": "Temnar"
     },
     {
         "id": 111,
-        "name": "Baha"
+        "name": "Safi"
     },
     {
         "id": 112,
-        "name": "Fnideq"
+        "name": "Oualidia"
     },
     {
         "id": 113,
-        "name": "Skhour Rhamna"
+        "name": "Yousofia"
     },
     {
         "id": 114,
-        "name": "Ifni"
+        "name": "Tasltanet"
     },
     {
         "id": 115,
-        "name": "Ouazane"
+        "name": "Tamslouhet"
     },
     {
         "id": 116,
-        "name": "Fqih Ben Saleh"
+        "name": "Katara"
+    },
+    {
+        "id": 117,
+        "name": "Agadir"
+    },
+    {
+        "id": 118,
+        "name": "Taroudant"
+    },
+    {
+        "id": 119,
+        "name": "Tiznit"
+    },
+    {
+        "id": 120,
+        "name": "Igherem"
+    },
+    {
+        "id": 121,
+        "name": "Talouine"
+    },
+    {
+        "id": 122,
+        "name": "Tafraouet"
+    },
+    {
+        "id": 123,
+        "name": "Tata"
+    },
+    {
+        "id": 124,
+        "name": "Akka"
+    },
+    {
+        "id": 125,
+        "name": "Fem Lehsan"
+    },
+    {
+        "id": 126,
+        "name": "Bouikra"
+    },
+    {
+        "id": 127,
+        "name": "Oulad Tayma"
+    },
+    {
+        "id": 128,
+        "name": "Errachidia"
+    },
+    {
+        "id": 129,
+        "name": "Risani"
+    },
+    {
+        "id": 130,
+        "name": "Arfoud"
+    },
+    {
+        "id": 131,
+        "name": "Tindit"
+    },
+    {
+        "id": 132,
+        "name": "Kelmima"
+    },
+    {
+        "id": 133,
+        "name": "Imelchil"
+    },
+    {
+        "id": 134,
+        "name": "Tenjedad"
+    },
+    {
+        "id": 135,
+        "name": "Erich"
+    },
+    {
+        "id": 136,
+        "name": "Midelt"
+    },
+    {
+        "id": 137,
+        "name": "Zagoura"
+    },
+    {
+        "id": 138,
+        "name": "Ourzazate"
+    },
+    {
+        "id": 139,
+        "name": "Tenghir"
+    },
+    {
+        "id": 140,
+        "name": "Meskoura"
+    },
+    {
+        "id": 141,
+        "name": "Kalaat Megouna"
+    },
+    {
+        "id": 142,
+        "name": "Akdez"
+    },
+    {
+        "id": 143,
+        "name": "Boumalen Dadas"
+    },
+    {
+        "id": 144,
+        "name": "Enif"
+    },
+    {
+        "id": 145,
+        "name": "Asoul"
+    },
+    {
+        "id": 146,
+        "name": "Amsmrir"
+    },
+    {
+        "id": 147,
+        "name": "Tazarin"
+    },
+    {
+        "id": 148,
+        "name": "Sidi Ifni"
+    },
+    {
+        "id": 149,
+        "name": "Guelmim"
+    },
+    {
+        "id": 150,
+        "name": "Asa"
+    },
+    {
+        "id": 151,
+        "name": "Ezak"
+    },
+    {
+        "id": 152,
+        "name": "Tantan"
+    },
+    {
+        "id": 153,
+        "name": "Bouizkaren"
+    },
+    {
+        "id": 154,
+        "name": "El Mahbes"
+    },
+    {
+        "id": 155,
+        "name": "L'msid"
+    },
+    {
+        "id": 156,
+        "name": "Laayoune"
+    },
+    {
+        "id": 157,
+        "name": "Smara"
+    },
+    {
+        "id": 158,
+        "name": "Boujdour"
+    },
+    {
+        "id": 159,
+        "name": "Tarfaya"
+    },
+    {
+        "id": 160,
+        "name": "Tefariti"
+    },
+    {
+        "id": 161,
+        "name": "Boukrae"
+    },
+    {
+        "id": 162,
+        "name": "Geltat Zamour"
+    },
+    {
+        "id": 163,
+        "name": "Amkala"
+    },
+    {
+        "id": 164,
+        "name": "Akhefnir"
+    },
+    {
+        "id": 165,
+        "name": "Dakhla"
+    },
+    {
+        "id": 166,
+        "name": "Lagouira"
+    },
+    {
+        "id": 167,
+        "name": "Ousered"
+    },
+    {
+        "id": 168,
+        "name": "Bir Kandour"
+    },
+    {
+        "id": 169,
+        "name": "Bir Anzaran"
+    },
+    {
+        "id": 301,
+        "name": "Khemis Sidi Abd Jelil"
+    },
+    {
+        "id": 302,
+        "name": "Oulad Ayad"
+    },
+    {
+        "id": 303,
+        "name": "Tahla"
+    },
+    {
+        "id": 304,
+        "name": "Metmata"
+    },
+    {
+        "id": 305,
+        "name": "Imntanout"
+    },
+    {
+        "id": 306,
+        "name": "Sidi Ghanem"
+    },
+    {
+        "id": 307,
+        "name": "Tafntan"
+    },
+    {
+        "id": 308,
+        "name": "Ait El Kak"
+    },
+    {
+        "id": 309,
+        "name": "Akdal Amelchil"
+    },
+    {
+        "id": 310,
+        "name": "Akoudal Amelchil Midelt"
+    },
+    {
+        "id": 311,
+        "name": "Akayouar"
+    },
+    {
+        "id": 312,
+        "name": "Ain Aouda"
+    },
+    {
+        "id": 313,
+        "name": "Askin"
+    },
+    {
+        "id": 314,
+        "name": "Ait Ourir"
+    },
+    {
+        "id": 315,
+        "name": "Zaouiat Moulay Ibrahim"
+    },
+    {
+        "id": 316,
+        "name": "Toulkoult"
+    },
+    {
+        "id": 317,
+        "name": "Ikes"
+    },
+    {
+        "id": 318,
+        "name": "Kares"
+    },
+    {
+        "id": 319,
+        "name": "Tisenet"
+    },
+    {
+        "id": 320,
+        "name": "Fem Zkid"
+    },
+    {
+        "id": 321,
+        "name": "Ksar Ich"
+    },
+    {
+        "id": 322,
+        "name": "Imin Telat"
     }
-]
+]

package/data/prayers.json

@@ -1,20 +1,20 @@
 [
     {
-        "name": "Fajr"
+        "Prayer": "Fajr"
     },
     {
-        "name": "Chorouq"
+        "Prayer": "Chorouq"
     },
     {
-        "name": "Dhuhr"
+        "Prayer": "Dhuhr"
     },
     {
-        "name": "Asr"
+        "Prayer": "Asr"
     },
     {
-        "name": "Maghrib"
+        "Prayer": "Maghrib"
     },
     {
-        "name": "Ishae"
+        "Prayer": "Ishae"
     }
-]
+]

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "salat",
-  "version": "0.2.10",
-  "description": "Daily moroccan prayers time, right in your console, at the tip of your fingers",
+  "version": "2.0.2",
+  "description": "Daily Moroccan prayers time, right in your console, at the tip of your fingers",
   "homepage": "https://github.com/Kafiil/salat",
-  "main": "index.js",
+  "main": "app.js",
   "bin": {
-    "salat": "index.js"
+    "salat": "app.js"
   },
   "dependencies": {
     "axios": ">=0.19.0",
@@ -17,8 +17,8 @@
     "nodemon": "^2.0.2"
   },
   "scripts": {
-    "dev": "nodemon index.js",
-    "start": "node index"
+    "dev": "nodemon app.js",
+    "start": "node app"
   },
   "keywords": [
     "prayers",
@@ -31,4 +31,4 @@
     "email": "kafil.nasdami@gmail.com"
   },
   "license": "MIT"
-}
+}

package/utils.js

@@ -40,22 +40,40 @@ module.exports.parsePrayerTimesFromResponse = response => {
   let j = 0;
   for (let i = 0; i < tds.length; i++) {
     if (i % 2) {
-      prayers[j].time = tds[i].textContent.trim();
+      prayers[j].Time = tds[i].textContent.trim();
       j++;
     }
   }
   // Transorm array to object and return it
-  return prayers.reduce((acc, { name, time }) => {
-    acc[name] = time;
+  return prayers.reduce((acc, { Prayer, Time }) => {
+    acc[Prayer] = Time;
     return acc;
   }, {});
+
+};
+
+function tConv24(time24) {
+  var ts = time24;
+  var H = +ts.substr(0, 2);
+  var h = (H % 12) || 12;
+  h = (h < 10)?("0"+h):h;  // leading 0 at the left for 1 digit hours
+  var ampm = H < 12 ? ` ${chalk.hex('#a6c9de').visible('AM')}` : ` ${chalk.hex('#debfa6').visible('PM')}`;
+  ts = h + ts.substr(2, 3) + ampm;
+  return ts;
 };
 
 module.exports.displayResult = (prayers, city) => {
   if (prayers) {
     console.log(
-      `Prayer's time in ${city}, Morocco\nOn the day : ${new Date().toDateString()}`
+      ` 🧭 ${city}, Morocco\n\n 📆 ${new Date().toDateString()}`
     );
-    console.table(prayers);
+    console.log(`
+ ◽ ${chalk.cyan('Fajr')}     -->   ${chalk.green(tConv24(prayers.Fajr))}
+ ◽ ${chalk.cyan('Chorouq')}  -->   ${chalk.green(tConv24(prayers.Chorouq))}
+ ◽ ${chalk.cyan('Dhuhr')}    -->   ${chalk.green(tConv24(prayers.Dhuhr))}
+ ◽ ${chalk.cyan('Asr')}      -->   ${chalk.green(tConv24(prayers.Asr))}
+ ◽ ${chalk.cyan('Maghrib')}  -->   ${chalk.green(tConv24(prayers.Maghrib))}
+ ◽ ${chalk.cyan('Ishae')}    -->   ${chalk.green(tConv24(prayers.Ishae))}`
+);
   }
 };