salat 0.2.9 → 2.0.2

package/README.md

@@ -1,79 +1,77 @@
-<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
-
-> Daily prayer time in all the cities in [Morocco](https://www.google.com/search?q=morocco) :morocco:, directly in your terminal, at the tip of your fingers
-
-
-**A stupid simple Command line utility to get the daily prayers time for all the citiy in Morocco**
-
-The source of the data is [the Moroccan Ministery Website](http://www.habous.gov.ma)
-
-## Getting started
-
-```bash
-# Install
-
-$ npm i -g salat
-
-# Run with default city
-
-$ salat
-
-# Run with custom city
-
-$ salat [cityName]
-```
-
-`City name should be provided the same way it's written in the cities.json`
-
-## Output
-
-```bash
-# The programs prints to the console the prayers' time for the current day in the default city as shown bellow:
-```
-![screen 1](images/screenShot1.png)
-![screen 2](images/screenShot2.png)
-
-## Dependecies
-
-The code behind depends on :
-
-- [axios](https://github.com/axios/axios) to make an http request ( fetch the data).
-- [jsdom](https://github.com/jsdom/jsdom) to parse the html result.
-- [chalk](https://github.com/chalk/chalk) to avoid boring styles and colors.
-- [node-localstorage](https://github.com/lmaccherone/node-localstorage) to read and write from localstorage.
-
-## Change the default city
-
-- The default city is :heart: [Marrakech](https://www.google.com/search?q=marrakech) :heart:, set as a value for the `DEFAULT_CITY` variable in `./constants.js`
-
-- You can change it by replacing `Marrakech` by your city name according to the values from `./data/cities.json`
-
-## Help
-
-- Please keep in mind that this is a work in progress in a very early stages, any help is appreciated and more than welcome.
-
-- If you think this piece of code is anyhow useful, please feel free to `contribute`, `star` :star::star: and `share` 🙏 🙏
-
-## Todo
-
-- [x] Use a default city
-- [x] Use localstorage-like api for caching purposes
-- [x] Display execution time
-- [ ] Improve performance
-- [ ] Add unit tests
-- [ ] Add a documentation site
-- [ ] Command to set the default city
-- [ ] Command to display the list of available cities
-- [ ] Command to display the time table for the whole month
-
-## License
-
-This project is under the MIT license.
-
-### Built With :heart: in Ramadan
+# Salat [![npm version](https://badge.fury.io/js/salat.svg)](https://badge.fury.io/js/salat)
+
+## Description
+
+> Daily prayer time in all the cities in [Morocco](https://www.google.com/search?q=morocco) :morocco:, directly in your terminal, at the tip of your fingers
+
+
+**A stupid simple Command line utility to get the daily prayers time for all the citiy in Morocco**
+
+The source of the data is [the Moroccan Ministery Website](http://www.habous.gov.ma)
+
+## Getting started
+
+```bash
+# Install
+
+$ npm i -g salat
+
+# Run with default city
+
+$ salat
+
+# Run with custom city
+
+$ salat [cityName]
+```
+
+`City name should be provided the same way it's written in the cities.json`
+
+## Output
+
+```bash
+# The programs prints to the console the prayers' time for the current day in the default city as shown bellow:
+```
+![screen 1](images/screenShot1.png)
+![screen 2](images/screenShot2.png)
+![screen 3](images/screenShot3.png)
+
+
+## Dependecies
+
+The code behind depends on :
+
+- [axios](https://github.com/axios/axios) to make an http request ( fetch the data).
+- [jsdom](https://github.com/jsdom/jsdom) to parse the html result.
+- [chalk](https://github.com/chalk/chalk) to avoid boring styles and colors.
+- [node-localstorage](https://github.com/lmaccherone/node-localstorage) to read and write from localstorage.
+
+## Change the default city
+
+- The default city is :heart: [Marrakech](https://www.google.com/search?q=marrakech) :heart:, set as a value for the `DEFAULT_CITY` variable in `./constants.js`
+
+- You can change it by replacing `Marrakech` by your city name according to the values from `./data/cities.json`
+
+## Help
+
+- Please keep in mind that this is a work in progress in a very early stages, any help is appreciated and more than welcome.
+
+- If you think this piece of code is anyhow useful, please feel free to `contribute`, `star` :star::star: and `share` 🙏 🙏
+
+## Todo
+
+- [x] Use a default city
+- [x] Use localstorage-like api for caching purposes
+- [x] Display execution time
+- [ ] Improve performance
+- [ ] Add unit tests
+- [ ] Add a documentation site
+- [ ] Command to set the default city
+- [ ] Command to display the list of available cities
+- [ ] Command to display the time table for the whole month
+
+## License
+
+This project is under the MIT license.
+
+### Built With :heart: in Ramadan

package/_config.yml

@@ -1 +1 @@
-theme: jekyll-theme-slate
+theme: jekyll-theme-cayman

package/{index.js → app.js}

@@ -1,57 +1,57 @@
-#!/usr/bin/env node
-
-// Project's dependencies
-const chalk = require("chalk");
-const args = process.argv;
-const {
-  getCityId,
-  getCityName,
-  displayResult,
-  getData,
-  parsePrayerTimesFromResponse
-} = require("./utils.js");
-
-// Logging functioin
-const green = msg => console.log(chalk.green(msg));
-
-// Project's data
-const { BANNER, LOCAL_STORAGE_PATH } = require("./constants");
-const cities = require("./data/cities.json");
-
-// Setting up localStorage
-const { LocalStorage } = require("node-localstorage");
-localStorage = new LocalStorage(LOCAL_STORAGE_PATH);
-
-const cityName = getCityName(args[2], cities);
-const cityId = getCityId(cityName, cities);
-
-const main = async () => {
-  // Prinitng a banner ('cause I'm cool and I can do it XD)
-  green(BANNER);
-
-  const storageKey = `${cityName.toLowerCase()}_${new Date().toLocaleDateString()}`;
-  const item = localStorage.getItem(storageKey);
-  let prayers;
-
-  if (item) {
-    prayers = JSON.parse(item);
-  } else {
-    try {
-      prayers = parsePrayerTimesFromResponse(await getData(cityId));
-      localStorage.setItem(storageKey, JSON.stringify(prayers));
-    } catch (ex) {
-      //TODO: Use a more descriptif error message
-      console.error("Someting bad happened");
-      // console.log(ex);
-      return;
-    }
-  }
-
-  displayResult(prayers, cityName);
-};
-
-(async () => {
-  console.time("Execution Time");
-  await main();
-  console.timeEnd("Execution Time");
-})();
+#!/usr/bin/env node
+
+// Project's dependencies
+const chalk = require("chalk");
+const args = process.argv;
+const {
+  getCityId,
+  getCityName,
+  displayResult,
+  getData,
+  parsePrayerTimesFromResponse
+} = require("./utils.js");
+process.env.NODE_TLS_REJECT_UNAUTHORIZED="0"
+
+// Logging functioin
+const green = msg => console.log(chalk.green(msg));
+
+// Project's data
+const { BANNER, LOCAL_STORAGE_PATH } = require("./constants");
+const cities = require("./data/cities.json");
+
+// Setting up localStorage
+const { LocalStorage } = require("node-localstorage");
+localStorage = new LocalStorage(LOCAL_STORAGE_PATH);
+
+const cityName = getCityName(args[2], cities);
+const cityId = getCityId(cityName, cities);
+
+const main = async () => {
+  // Prinitng a banner ('cause I'm cool and I can do it XD)
+  green(BANNER);
+
+  const storageKey = `${cityName.toLowerCase()}_${new Date().toLocaleDateString()}`;
+  const item = localStorage.getItem(storageKey);
+  let prayers;
+
+  if (item) {
+    prayers = JSON.parse(item);
+  } else {
+    try {
+      prayers = parsePrayerTimesFromResponse(await getData(cityId));
+      localStorage.setItem(storageKey, JSON.stringify(prayers));
+    } catch (ex) {
+      //TODO: Use a more descriptif error message
+      console.error("Something went wrong!");
+      console.log(ex)
+      // console.log(ex);
+      return;
+    }
+  }
+
+  displayResult(prayers, cityName);
+};
+
+(async () => {
+  await main();
+})();

package/constants.js

@@ -1,32 +1,19 @@
-const API_URL =
-  "http://www.habous.gov.ma/horaire%20de%20priere/horaire-pub.php";
-
-const BANNER = `
-  _______  _______  ___      _______  _______ 
-  |       ||   _   ||   |    |   _   ||       |
-  |  _____||  | |  ||   |    |  | |  ||_     _|
-  | |_____ |  |_|  ||   |    |  |_|  |  |   |  
-  |_____  ||       ||   |___ |       |  |   |  
-  _____|  ||   _   ||       ||   _   |  |   |  
-  |_______||__| |__||_______||__| |__|  |___|  v.${
-    require("./package.json").version
-  }
-  -------------------------------------------  by ${
-    require("./package.json").author.name
-  }
-  `;
-
-const NOT_FOUND_ERROR = `
-  Your city was not found in the list
-  Using the default city
-  ----------------------
-  You may need to check the spelling
-  `;
-
-module.exports = {
-  API_URL,
-  BANNER,
-  NOT_FOUND_ERROR,
-  DEFAULT_CITY: "Marrakech",
-  LOCAL_STORAGE_PATH: "./storage"
-};
+const API_URL =
+  "http://www.habous.gov.ma/prieres/horaire-api.php";
+
+const BANNER = ``;
+
+const NOT_FOUND_ERROR = `
+  Your city was not found in the list
+  Using the default city
+  ----------------------
+  You may need to check the spelling
+  `;
+
+module.exports = {
+  API_URL,
+  BANNER,
+  NOT_FOUND_ERROR,
+  DEFAULT_CITY: "Marrakech",
+  LOCAL_STORAGE_PATH: "./storage"
+};