LESA/custum-hyprpanel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added the ability to specify location in the weather settings.

Browse Source
This commit is contained in:
Jas Singh
2024-07-26 19:25:37 -07:00
parent b293d0b060
commit 936405d9d2
3 changed files with 80 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
modules/menus/calendar/weather/index.js
View File

@@ -4,89 +4,94 @@ import { TodayStats } from "./stats/index.js";
import { TodayTemperature } from "./temperature/index.js"; import { TodayTemperature } from "./temperature/index.js";
import { Hourly } from "./hourly/index.js"; import { Hourly } from "./hourly/index.js";
const { key, interval } = options.menus.clock.weather; const { key, interval, location } = options.menus.clock.weather;
const defaultWeather = { const defaultWeather = {
location: { location: {
localtime_epoch: 1719471600, localtime_epoch: 1719471600,
},
current: {
temp_f: 0,
wind_mph: 0,
condition: {
text: "Clear",
}, },
}, current: {
forecast: { temp_f: 0,
forecastday: [ wind_mph: 0,
{ condition: {
day: { text: "Clear",
daily_chance_of_rain: 0,
}, },
hour: [ },
{ forecast: {
time_epoch: 1719471600, forecastday: [
temp_f: 0, {
condition: { day: {
text: "Clear", daily_chance_of_rain: 0,
},
hour: [
{
time_epoch: 1719471600,
temp_f: 0,
condition: {
text: "Clear",
},
},
],
}, },
},
], ],
}, },
],
},
}; };
const theWeather = Variable(defaultWeather); const theWeather = Variable(defaultWeather);
const WeatherWidget = () => { const WeatherWidget = () => {
return Widget.Box({ return Widget.Box({
class_name: "calendar-menu-item-container weather", class_name: "calendar-menu-item-container weather",
child: Widget.Box({ child: Widget.Box({
class_name: "weather-container-box", class_name: "weather-container-box",
setup: (self) => { setup: (self) => {
Utils.merge( Utils.merge(
[key.bind("value"), interval.bind("value")], [key.bind("value"), interval.bind("value"), location.bind("value")],
(weatherKey, weatherInterval) => { (weatherKey, weatherInterval, loc) => {
Utils.interval(weatherInterval, () => { Utils.interval(weatherInterval, () => {
Utils.execAsync( const formattedLocation = loc.replace(" ", "%20");
`curl "https://api.weatherapi.com/v1/forecast.json?key=${weatherKey}&q=93722&days=1&aqi=no&alerts=no"`, Utils.execAsync(
) `curl "https://api.weatherapi.com/v1/forecast.json?key=${weatherKey}&q=${formattedLocation}&days=1&aqi=no&alerts=no"`,
.then((res) => { )
if (typeof res === "string") { .then((res) => {
theWeather.value = JSON.parse(res); try {
} if (typeof res === "string") {
}) theWeather.value = JSON.parse(res);
.catch((err) => { }
console.error(`Failed to fetch weather: ${err}`); } catch (error) {
theWeather.value = defaultWeather; console.error(`Failed to parse weather data: ${error}`);
}); }
}); })
}, .catch((err) => {
); console.error(`Failed to fetch weather: ${err}`);
theWeather.value = defaultWeather;
});
});
},
);
return (self.child = Widget.Box({ return (self.child = Widget.Box({
vertical: true, vertical: true,
hexpand: true, hexpand: true,
children: [ children: [
Widget.Box({ Widget.Box({
class_name: "calendar-menu-weather today", class_name: "calendar-menu-weather today",
hexpand: true, hexpand: true,
children: [ children: [
TodayIcon(theWeather), TodayIcon(theWeather),
TodayTemperature(theWeather), TodayTemperature(theWeather),
TodayStats(theWeather), TodayStats(theWeather),
], ],
}), }),
Widget.Separator({ Widget.Separator({
class_name: "menu-separator weather", class_name: "menu-separator weather",
}), }),
Hourly(theWeather), Hourly(theWeather),
], ],
})); }));
}, },
}), }),
}); });
}; };
export { WeatherWidget }; export { WeatherWidget };

1
options.ts
View File

@@ -691,6 +691,7 @@ const options = mkOptions(OPTIONS, {
weather: { weather: {
interval: opt(60000), interval: opt(60000),
unit: opt<"metric" | "imperial">("imperial"), unit: opt<"metric" | "imperial">("imperial"),
location: opt("Los Angeles"),
key: opt<string>( key: opt<string>(
JSON.parse(Utils.readFile(`${App.configDir}/.weather.json`) || "{}")?.weather_api_key || "", JSON.parse(Utils.readFile(`${App.configDir}/.weather.json`) || "{}")?.weather_api_key || "",
), ),

5
widget/settings/pages/config/menus/clock.ts
View File

@@ -12,9 +12,10 @@ export const ClockMenuSettings = () => {
Option({ opt: options.menus.clock.time.military, title: 'Use 24hr time', type: 'boolean' }), Option({ opt: options.menus.clock.time.military, title: 'Use 24hr time', type: 'boolean' }),
Header('Weather'), Header('Weather'),
Option({ opt: options.menus.clock.weather.interval, title: 'Weather Fetching Interval (ms)', subtitle: 'May require AGS restart.', type: 'number' }), Option({ opt: options.menus.clock.weather.location, title: 'Location', subtitle: 'Zip Code, Postal Code, City, etc.', type: 'string' }),
Option({ opt: options.menus.clock.weather.unit, title: 'Units', type: 'enum', enums: ['imperial', 'metric'] }),
Option({ opt: options.menus.clock.weather.key, title: 'Weather API Key', subtitle: 'May require AGS restart. https://weatherapi.com/', type: 'string' }), Option({ opt: options.menus.clock.weather.key, title: 'Weather API Key', subtitle: 'May require AGS restart. https://weatherapi.com/', type: 'string' }),
Option({ opt: options.menus.clock.weather.unit, title: 'Units', type: 'enum', enums: ['imperial', 'metric'] }),
Option({ opt: options.menus.clock.weather.interval, title: 'Weather Fetching Interval (ms)', subtitle: 'May require AGS restart.', type: 'number' }),
] ]
}) })
} }