From 1b93de84e2bf6a6532bdb03e1ae75e47061a4dca Mon Sep 17 00:00:00 2001
From: Desmond Kyeremeh <elDekyfin@gmail.com>
Date: Sun, 11 Jul 2021 22:14:39 +0000
Subject: Fixed linting

---
 modern/src/common/converter.js   | 24 +++++++-------------
 modern/src/common/formatter.js   | 48 +++++++++++++++++-----------------------
 modern/src/common/preferences.js | 30 ++++++++++---------------
 modern/src/common/stringUtils.js |  8 ++-----
 4 files changed, 42 insertions(+), 68 deletions(-)

(limited to 'modern/src/common')

diff --git a/modern/src/common/converter.js b/modern/src/common/converter.js
index 9cdc623..d45db5d 100644
--- a/modern/src/common/converter.js
+++ b/modern/src/common/converter.js
@@ -1,4 +1,4 @@
-const speedConverter = unit => {
+const speedConverter = (unit) => {
   switch (unit) {
     case 'kmh':
       return 1.852;
@@ -10,7 +10,7 @@ const speedConverter = unit => {
   }
 };
 
-const distanceConverter = unit => {
+const distanceConverter = (unit) => {
   switch (unit) {
     case 'mi':
       return 0.000621371;
@@ -19,21 +19,13 @@ const distanceConverter = unit => {
     case 'km':
     default:
       return 0.001;
-  } 
-}
+  }
+};
 
-export const speedFromKnots = (value, unit) => {
-  return value * speedConverter(unit);
-}
+export const speedFromKnots = (value, unit) => value * speedConverter(unit);
 
-export const speedToKnots = (value, unit) => {
-  return value / speedConverter(unit);
-}
+export const speedToKnots = (value, unit) => value / speedConverter(unit);
 
-export const distanceFromMeters = (value, unit) => {
-  return value * distanceConverter(unit);
-}
+export const distanceFromMeters = (value, unit) => value * distanceConverter(unit);
 
-export const distanceToMeters = (value, unit) => {
-  return value / distanceConverter(unit);
-}
+export const distanceToMeters = (value, unit) => value / distanceConverter(unit);
diff --git a/modern/src/common/formatter.js b/modern/src/common/formatter.js
index 0d8ac4c..7441d01 100644
--- a/modern/src/common/formatter.js
+++ b/modern/src/common/formatter.js
@@ -1,5 +1,5 @@
 import moment from 'moment';
-import t from '../common/localization';
+import t from './localization';
 
 export const formatPosition = (value, key) => {
   if (value != null && typeof value === 'object') {
@@ -18,29 +18,22 @@ export const formatPosition = (value, key) => {
     case 'course':
       return value.toFixed(1);
     case 'batteryLevel':
-      return value + '%';
+      return `${value}%`;
     default:
       if (typeof value === 'number') {
         return formatNumber(value);
-      } else if (typeof value === 'boolean') {
+      } if (typeof value === 'boolean') {
         return formatBoolean(value);
-      } else {
-        return value;
       }
+      return value;
   }
 };
 
-export const formatBoolean = (value) => {
-  return value ? t('sharedYes') : t('sharedNo');
-};
+export const formatBoolean = (value) => (value ? t('sharedYes') : t('sharedNo'));
 
-export const formatNumber = (value, precision = 1) => {
-  return Number(value.toFixed(precision));
-};
+export const formatNumber = (value, precision = 1) => Number(value.toFixed(precision));
 
-export const formatDate = (value, format = 'YYYY-MM-DD HH:mm') => {
-  return moment(value).format(format);
-};
+export const formatDate = (value, format = 'YYYY-MM-DD HH:mm') => moment(value).format(format);
 
 export const formatDistance = (value, unit) => {
   switch (unit) {
@@ -50,7 +43,7 @@ export const formatDistance = (value, unit) => {
       return `${(value * 0.000539957).toFixed(2)} ${t('sharedNmi')}`;
     case 'km':
     default:
-        return `${(value * 0.001).toFixed(2)} ${t('sharedKm')}`;
+      return `${(value * 0.001).toFixed(2)} ${t('sharedKm')}`;
   }
 };
 
@@ -62,8 +55,8 @@ export const formatSpeed = (value, unit) => {
       return `${(value * 1.15078).toFixed(2)} ${t('sharedMph')}`;
     case 'kn':
     default:
-        return `${(value * 1).toFixed(2)} ${t('sharedKn')}`;
-  }  
+      return `${(value * 1).toFixed(2)} ${t('sharedKn')}`;
+  }
 };
 
 export const formatVolume = (value, unit) => {
@@ -74,16 +67,15 @@ export const formatVolume = (value, unit) => {
       return `${(value / 3.785).toFixed(2)} ${t('sharedGallonAbbreviation')}`;
     case 'ltr':
     default:
-        return `${(value / 1).toFixed(2)} ${t('sharedLiterAbbreviation')}`;
-  }  
-}
-
-export const formatHours = (value) => {
-  return moment.duration(value).humanize();
+      return `${(value / 1).toFixed(2)} ${t('sharedLiterAbbreviation')}`;
+  }
 };
 
+export const formatHours = (value) => moment.duration(value).humanize();
+
 export const formatCoordinate = (key, value, unit) => {
-  var hemisphere, degrees, minutes, seconds;
+  let hemisphere; let degrees; let minutes; let
+    seconds;
   if (key === 'latitude') {
     hemisphere = value >= 0 ? 'N' : 'S';
   } else {
@@ -95,14 +87,14 @@ export const formatCoordinate = (key, value, unit) => {
       value = Math.abs(value);
       degrees = Math.floor(value);
       minutes = (value - degrees) * 60;
-      return degrees + '° ' + minutes.toFixed(6) + '\' ' + hemisphere;
+      return `${degrees}° ${minutes.toFixed(6)}' ${hemisphere}`;
     case 'dms':
       value = Math.abs(value);
       degrees = Math.floor(value);
       minutes = Math.floor((value - degrees) * 60);
       seconds = Math.round((value - degrees - minutes / 60) * 3600);
-      return degrees + '° ' + minutes + '\' ' + seconds + '" ' + hemisphere;
+      return `${degrees}° ${minutes}' ${seconds}" ${hemisphere}`;
     default:
-      return value.toFixed(6) + '°';
-  }  
+      return `${value.toFixed(6)}°`;
+  }
 };
diff --git a/modern/src/common/preferences.js b/modern/src/common/preferences.js
index 24fe389..aba3c82 100644
--- a/modern/src/common/preferences.js
+++ b/modern/src/common/preferences.js
@@ -1,21 +1,15 @@
 import { useSelector } from 'react-redux';
 
-export const usePreference = (key, defaultValue) => {
-  return useSelector(state => {
-    if (state.session.server.forceSettings) {
-      return state.session.server[key] || state.session.user[key] || defaultValue;
-    } else {
-      return state.session.user[key] || state.session.server[key] || defaultValue;
-    }
-  });
-};
+export const usePreference = (key, defaultValue) => useSelector((state) => {
+  if (state.session.server.forceSettings) {
+    return state.session.server[key] || state.session.user[key] || defaultValue;
+  }
+  return state.session.user[key] || state.session.server[key] || defaultValue;
+});
 
-export const useAttributePreference = (key, defaultValue) => {
-  return useSelector(state => {
-    if (state.session.server.forceSettings) {
-      return state.session.server.attributes[key] || state.session.user.attributes[key] || defaultValue;
-    } else {
-      return state.session.user.attributes[key] || state.session.server.attributes[key] || defaultValue;
-    }
-  });
-};
+export const useAttributePreference = (key, defaultValue) => useSelector((state) => {
+  if (state.session.server.forceSettings) {
+    return state.session.server.attributes[key] || state.session.user.attributes[key] || defaultValue;
+  }
+  return state.session.user.attributes[key] || state.session.server.attributes[key] || defaultValue;
+});
diff --git a/modern/src/common/stringUtils.js b/modern/src/common/stringUtils.js
index 7bd68c8..fc997fe 100644
--- a/modern/src/common/stringUtils.js
+++ b/modern/src/common/stringUtils.js
@@ -1,7 +1,3 @@
-export const prefixString = (prefix, value) => {
-  return prefix + value.charAt(0).toUpperCase() + value.slice(1);
-}
+export const prefixString = (prefix, value) => prefix + value.charAt(0).toUpperCase() + value.slice(1);
 
-export const unprefixString = (prefix, value) => {
-  return value.charAt(prefix.length).toLowerCase() + value.slice(prefix.length + 1);
-}
+export const unprefixString = (prefix, value) => value.charAt(prefix.length).toLowerCase() + value.slice(prefix.length + 1);
-- 
cgit v1.2.3


From a7e1b5f5fd772d37f9777fec097f28411f13562f Mon Sep 17 00:00:00 2001
From: Desmond Kyeremeh <elDekyfin@gmail.com>
Date: Mon, 12 Jul 2021 03:12:10 +0000
Subject: moved selectors to common

---
 modern/src/MainToolbar.js                      | 2 +-
 modern/src/common/selectors.js                 | 3 +++
 modern/src/selectors.js                        | 3 ---
 modern/src/settings/OptionsLayout/useRoutes.js | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 modern/src/common/selectors.js
 delete mode 100644 modern/src/selectors.js

(limited to 'modern/src/common')

diff --git a/modern/src/MainToolbar.js b/modern/src/MainToolbar.js
index dacd668..8b6c22c 100644
--- a/modern/src/MainToolbar.js
+++ b/modern/src/MainToolbar.js
@@ -19,7 +19,7 @@ import DescriptionIcon from '@material-ui/icons/Description';
 import ReplayIcon from '@material-ui/icons/Replay';
 import { sessionActions } from './store';
 import t from './common/localization';
-import * as selectors from './selectors';
+import * as selectors from './common/selectors';
 
 const useStyles = makeStyles((theme) => ({
   flex: {
diff --git a/modern/src/common/selectors.js b/modern/src/common/selectors.js
new file mode 100644
index 0000000..44a0c54
--- /dev/null
+++ b/modern/src/common/selectors.js
@@ -0,0 +1,3 @@
+export const getIsAdmin = (state) => state.session.user?.administrator;
+
+export const getUserId = (state) => state.session.user?.id;
diff --git a/modern/src/selectors.js b/modern/src/selectors.js
deleted file mode 100644
index 44a0c54..0000000
--- a/modern/src/selectors.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const getIsAdmin = (state) => state.session.user?.administrator;
-
-export const getUserId = (state) => state.session.user?.id;
diff --git a/modern/src/settings/OptionsLayout/useRoutes.js b/modern/src/settings/OptionsLayout/useRoutes.js
index f2603dd..1832081 100644
--- a/modern/src/settings/OptionsLayout/useRoutes.js
+++ b/modern/src/settings/OptionsLayout/useRoutes.js
@@ -8,7 +8,7 @@ import StorageIcon from '@material-ui/icons/Storage';
 import BuildIcon from '@material-ui/icons/Build';
 import PeopleIcon from '@material-ui/icons/People';
 import BarChartIcon from '@material-ui/icons/BarChart';
-import { getIsAdmin, getUserId } from '../../selectors';
+import { getIsAdmin, getUserId } from '../../common/selectors';
 import t from '../../common/localization';
 
 const accountRoute = {
-- 
cgit v1.2.3