remove API KEYS

client/src/components/Settings/WeatherSettings/WeatherSettings.tsx

@@ -42,10 +42,10 @@ export const WeatherSettings = (): JSX.Element => {
     e.preventDefault();
 
     // Check for api key input
-    if ((formData.lat || formData.long) && !formData.WEATHER_API_KEY) {
+    if ((formData.lat || formData.long) && !formData.weather_enabled) {
       createNotification({
         title: 'Warning',
-        message: 'API key is missing. Weather Module will NOT work',
+        message: 'You need to enable the weather module to use it',
       });
     }
 
@@ -97,25 +97,19 @@ export const WeatherSettings = (): JSX.Element => {
 
   return (
     <form onSubmit={(e) => formSubmitHandler(e)}>
-      <SettingsHeadline text="API" />
+      <SettingsHeadline text="Enabled" />
       {/* API KEY */}
       <InputGroup>
-        <label htmlFor="WEATHER_API_KEY">API key</label>
+        <label htmlFor="enabled">Enable weather module</label>
         <input
-          type="text"
+          type="checkbox"
-          id="WEATHER_API_KEY"
+          id="weather_enabled"
-          name="WEATHER_API_KEY"
+          name="weather_enabled"
-          placeholder="secret"
+          checked={formData.weather_enabled}
-          value={formData.WEATHER_API_KEY}
           onChange={(e) => inputChangeHandler(e)}
         />
         <span>
-          Using
+          Required for weather module to work.
-          <a href="https://www.weatherapi.com/pricing.aspx" target="blank">
-            {' '}
-            Weather API
-          </a>
-          . Key is required for weather module to work.
         </span>
       </InputGroup>
 

client/src/components/Widgets/WeatherWidget/WeatherWidget.tsx

@@ -58,7 +58,7 @@ export const WeatherWidget = (): JSX.Element => {
   return (
     <div className={classes.WeatherWidget}>
       {configLoading ||
-        (config.WEATHER_API_KEY && weather.id > 0 && (
+        (config.weather_enabled && weather.id > 0 && (
           <Fragment>
             <div className={classes.WeatherIcon}>
               <WeatherIcon

client/src/interfaces/Config.ts

@@ -1,7 +1,7 @@
 import { WeatherData } from '../types';
 
 export interface Config {
-  WEATHER_API_KEY: string;
+  weather_enabled: boolean;
   lat: number;
   long: number;
   isCelsius: boolean;

client/src/interfaces/Forms.ts

@@ -1,7 +1,7 @@
 import { WeatherData } from '../types';
 
 export interface WeatherForm {
-  WEATHER_API_KEY: string;
+  weather_enabled: boolean;
   lat: number;
   long: number;
   isCelsius: boolean;

client/src/utility/templateObjects/configTemplate.ts

@@ -1,7 +1,7 @@
 import { Config } from '../../interfaces';
 
 export const configTemplate: Config = {
-  WEATHER_API_KEY: '',
+  weather_enabled: false,
   lat: 0,
   long: 0,
   isCelsius: true,

client/src/utility/templateObjects/settingsTemplate.ts

@@ -23,7 +23,7 @@ export const uiSettingsTemplate: UISettingsForm = {
 };
 
 export const weatherSettingsTemplate: WeatherForm = {
-  WEATHER_API_KEY: '',
+  weather_enabled: false,
   lat: 0,
   long: 0,
   isCelsius: true,

utils/getExternalWeather.js

@@ -3,7 +3,7 @@ const axios = require('axios');
 const loadConfig = require('./loadConfig');
 
 const getExternalWeather = async () => {
-  const { WEATHER_API_KEY: secret, lat, long } = await loadConfig();
+  const { lat, long } = await loadConfig();
 
   // Fetch data from external API
   try {

utils/init/initialConfig.json

@@ -1,5 +1,5 @@
 {
-  "WEATHER_API_KEY": "",
+  "weather_enabled": false,
   "lat": 0,
   "long": 0,
   "isCelsius": true,

utils/jobs.js

@@ -7,9 +7,9 @@ const loadConfig = require('./loadConfig');
 const logger = new Logger();
 
 module.exports = async function () {
-  const { WEATHER_API_KEY } = await loadConfig();
+  const { weather_enabled } = await loadConfig();
 
-  if (WEATHER_API_KEY != '') {
+  if (weather_enabled) {
     // Update weather data every 15 minutes
     const weatherJob = schedule.scheduleJob(
       'updateWeather',
@@ -20,7 +20,7 @@ module.exports = async function () {
 
           Sockets.getSocket('weather').socket.send(JSON.stringify(weatherData));
         } catch (err) {
-          if (WEATHER_API_KEY) {
+          if (weather_enabled) {
             logger.log(err.message, 'ERROR');
           }
         }