salat 2.0.2 → 3.0.0

package/README.md

@@ -25,6 +25,12 @@ $ salat
 $ salat [cityName]
 ```
 
+Alternatively, if you don't want to install it globally, you can just use:
+
+```bash
+npx salat
+```
+
 `City name should be provided the same way it's written in the cities.json`
 
 ## Output

package/app.js

@@ -8,12 +8,12 @@ const {
   getCityName,
   displayResult,
   getData,
-  parsePrayerTimesFromResponse
+  parsePrayerTimesFromResponse,
 } = require("./utils.js");
-process.env.NODE_TLS_REJECT_UNAUTHORIZED="0"
+process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
 
 // Logging functioin
-const green = msg => console.log(chalk.green(msg));
+const green = (msg) => console.log(chalk.green(msg));
 
 // Project's data
 const { BANNER, LOCAL_STORAGE_PATH } = require("./constants");
@@ -31,7 +31,13 @@ const main = async () => {
   green(BANNER);
 
   const storageKey = `${cityName.toLowerCase()}_${new Date().toLocaleDateString()}`;
-  const item = localStorage.getItem(storageKey);
+  let item = localStorage.getItem(storageKey);
+
+  // Disable localStorage for local development
+  if (process.env.NODE_ENV === "development") {
+    console.log("development mode: localStorage is disabled");
+    item = null;
+  }
   let prayers;
 
   if (item) {
@@ -43,12 +49,13 @@ const main = async () => {
     } catch (ex) {
       //TODO: Use a more descriptif error message
       console.error("Something went wrong!");
-      console.log(ex)
+      console.log(ex);
       // console.log(ex);
       return;
     }
   }
 
+  console.clear();
   displayResult(prayers, cityName);
 };
 

package/constants.js

@@ -1,5 +1,4 @@
-const API_URL =
-  "http://www.habous.gov.ma/prieres/horaire-api.php";
+const API_URL = "http://www.habous.gov.ma/prieres/horaire-api.php";
 
 const BANNER = ``;
 
@@ -15,5 +14,5 @@ module.exports = {
   BANNER,
   NOT_FOUND_ERROR,
   DEFAULT_CITY: "Marrakech",
-  LOCAL_STORAGE_PATH: "./storage"
+  LOCAL_STORAGE_PATH: "./storage",
 };

package/data/prayers.json

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

package/package.json

@@ -1,23 +1,20 @@
 {
   "name": "salat",
-  "version": "2.0.2",
+  "version": "3.0.0",
   "description": "Daily Moroccan prayers time, right in your console, at the tip of your fingers",
-  "homepage": "https://github.com/Kafiil/salat",
+  "homepage": "https://github.com/kafiln/salat-cli",
   "main": "app.js",
   "bin": {
     "salat": "app.js"
   },
   "dependencies": {
-    "axios": ">=0.19.0",
     "chalk": "^2.4.2",
-    "jsdom": "^14.0.0",
+    "jsdom": "^24.0.0",
+    "node-fetch": "^2.7.0",
     "node-localstorage": "^1.3.1"
   },
-  "devDependencies": {
-    "nodemon": "^2.0.2"
-  },
   "scripts": {
-    "dev": "nodemon app.js",
+    "dev": "env NODE_ENV=development  nodemon app.js",
     "start": "node app"
   },
   "keywords": [
@@ -30,5 +27,8 @@
     "name": "Kafil NASDAMI",
     "email": "kafil.nasdami@gmail.com"
   },
-  "license": "MIT"
-}
+  "license": "MIT",
+  "devDependencies": {
+    "nodemon": "^3.1.0"
+  }
+}

package/utils.js

@@ -1,12 +1,13 @@
-const axios = require("axios");
 const { JSDOM } = require("jsdom");
 
 const prayers = require("./data/prayers.json");
 const chalk = require("chalk");
 const { API_URL, DEFAULT_CITY } = require("./constants");
 const { NOT_FOUND_ERROR } = require("./constants");
+const fetch = require("node-fetch");
+const cheerio = require("cheerio");
 
-const error = msg => console.log(chalk.red(msg));
+const error = (msg) => console.log(chalk.red(msg));
 
 const getCityId = (arg, cities) => {
   const parsed = parseInt(arg);
@@ -23,57 +24,58 @@ module.exports.getCityName = (arg, cities) => {
   const index = getCityIndex(arg, cities);
   if (index == -1) {
     error(NOT_FOUND_ERROR);
+    return DEFAULT_CITY;
   }
-  return index == -1 ? DEFAULT_CITY : arg;
+  return arg;
 };
 
 const getCityIndex = (city, cities) =>
-  cities.map(e => e.name.toLowerCase()).indexOf(city.toLowerCase());
+  cities.map((e) => e.name.toLowerCase()).indexOf(city.toLowerCase());
 
-module.exports.getData = async cityId =>
-  await axios.get(`${API_URL}?ville=${cityId}`);
+module.exports.getData = async (cityId) => {
+  const response = await fetch(`${API_URL}?ville=${cityId}`);
+  return await response.text();
+};
 
-module.exports.parsePrayerTimesFromResponse = response => {
-  const dom = new JSDOM(`${response.data}`);
+module.exports.parsePrayerTimesFromResponse = (response) => {
+  const dom = new JSDOM(response);
   const tds = dom.window.document.getElementsByTagName("td");
 
   let j = 0;
-  for (let i = 0; i < tds.length; i++) {
-    if (i % 2) {
-      prayers[j].Time = tds[i].textContent.trim();
-      j++;
-    }
+  for (let i = 1; i < tds.length; i += 2) {
+    prayers[j].time = tds[i].textContent.trim();
+    j++;
   }
+
   // Transorm array to object and return it
-  return prayers.reduce((acc, { Prayer, Time }) => {
-    acc[Prayer] = 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;
-};
+  const [hours, minutes] = time24.split(":");
+  const hour = Number(hours);
+  const formattedHour = hour % 12 || 12;
+  const formattedHourWithZero = (formattedHour + "").padStart(2, "0");
+  const formattedMinutes = minutes.padStart(2, "0");
+  const formattedTime = `${formattedHourWithZero}:${formattedMinutes}`;
+  const ampm = hour < 12 ? "AM" : "PM";
+  return `${formattedTime} ${ampm}`;
+}
 
 module.exports.displayResult = (prayers, city) => {
+  if (!prayers) return;
   if (prayers) {
-    console.log(
-      ` 🧭 ${city}, Morocco\n\n 📆 ${new Date().toDateString()}`
-    );
-    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))}`
-);
+    console.log(` 🧭 ${city}, Morocco\n\n 📆 ${new Date().toDateString()}\n`);
+    Object.keys(prayers).forEach((key) => {
+      console.log(
+        ` ${chalk.cyan(key.padEnd(7, " "))} --> ${chalk.green(
+          tConv24(prayers[key])
+        )}`
+      );
+    });
+    console.log("\n");
   }
 };