Implemented strict linting standards and prettier formatting config. (#248)
* Implemented strict linting standards and prettier formatting config. * More linter fixes and type updates. * More linter updates and type fixes * Remove noisy comments * Linter and type updates * Linter, formatting and type updates. * Linter updates * Type updates * Type updates * fixed all linter errors * Fixed all linting, formatting and type issues. * Resolve merge conflicts.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import { Variable as VariableType } from "types/variable";
|
||||
import { Variable as VariableType } from 'types/variable';
|
||||
|
||||
const globalMousePosVar: VariableType<number[]> = Variable([0, 0]);
|
||||
|
||||
globalThis["globalMousePos"] = globalMousePosVar;
|
||||
globalThis['globalMousePos'] = globalMousePosVar;
|
||||
|
||||
@@ -1,16 +1,15 @@
|
||||
export const WIFI_STATUS_MAP = {
|
||||
unknown: "Status Unknown",
|
||||
unmanaged: "Unmanaged",
|
||||
unavailable: "Unavailable",
|
||||
disconnected: "Disconnected",
|
||||
prepare: "Preparing Connecting",
|
||||
config: "Connecting",
|
||||
need_auth: "Needs Authentication",
|
||||
ip_config: "Requesting IP",
|
||||
ip_check: "Checking Access",
|
||||
secondaries: "Waiting on Secondaries",
|
||||
activated: "Connected",
|
||||
deactivating: "Disconnecting",
|
||||
failed: "Connection Failed",
|
||||
unknown: 'Status Unknown',
|
||||
unmanaged: 'Unmanaged',
|
||||
unavailable: 'Unavailable',
|
||||
disconnected: 'Disconnected',
|
||||
prepare: 'Preparing Connecting',
|
||||
config: 'Connecting',
|
||||
need_auth: 'Needs Authentication',
|
||||
ip_config: 'Requesting IP',
|
||||
ip_check: 'Checking Access',
|
||||
secondaries: 'Waiting on Secondaries',
|
||||
activated: 'Connected',
|
||||
deactivating: 'Disconnecting',
|
||||
failed: 'Connection Failed',
|
||||
} as const;
|
||||
|
||||
|
||||
@@ -1,37 +1,37 @@
|
||||
import icons from "modules/icons/index";
|
||||
import { Notification } from "types/service/notifications";
|
||||
import icons from 'modules/icons/index';
|
||||
import { Notification } from 'types/service/notifications';
|
||||
|
||||
export const removingNotifications = Variable<boolean>(false);
|
||||
|
||||
export const getNotificationIcon = (app_name: string, app_icon: string, app_entry: string) => {
|
||||
export const getNotificationIcon = (app_name: string, app_icon: string, app_entry: string): string => {
|
||||
let icon: string = icons.fallback.notification;
|
||||
|
||||
if (Utils.lookUpIcon(app_name) || Utils.lookUpIcon(app_name.toLowerCase() || "")) {
|
||||
if (Utils.lookUpIcon(app_name) || Utils.lookUpIcon(app_name.toLowerCase() || '')) {
|
||||
icon = Utils.lookUpIcon(app_name)
|
||||
? app_name
|
||||
: Utils.lookUpIcon(app_name.toLowerCase())
|
||||
? app_name.toLowerCase()
|
||||
: "";
|
||||
? app_name.toLowerCase()
|
||||
: '';
|
||||
}
|
||||
|
||||
if (Utils.lookUpIcon(app_icon) && icon === "") {
|
||||
if (Utils.lookUpIcon(app_icon) && icon === '') {
|
||||
icon = app_icon;
|
||||
}
|
||||
|
||||
if (Utils.lookUpIcon(app_entry || "") && icon === "") {
|
||||
icon = app_entry || "";
|
||||
if (Utils.lookUpIcon(app_entry || '') && icon === '') {
|
||||
icon = app_entry || '';
|
||||
}
|
||||
|
||||
return icon;
|
||||
};
|
||||
|
||||
export const closeNotifications = async (notifications: Notification[]) => {
|
||||
export const closeNotifications = async (notifications: Notification[]): Promise<void> => {
|
||||
removingNotifications.value = true;
|
||||
for (const notif of notifications) {
|
||||
notif.close();
|
||||
await new Promise(resolve => setTimeout(resolve, 100));
|
||||
await new Promise((resolve) => setTimeout(resolve, 100));
|
||||
}
|
||||
removingNotifications.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
globalThis["removingNotifications"] = removingNotifications;
|
||||
globalThis['removingNotifications'] = removingNotifications;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import Gio from "gi://Gio"
|
||||
import { bash, Notify } from "lib/utils";
|
||||
import icons from "lib/icons"
|
||||
import { filterConfigForThemeOnly, loadJsonFile, saveConfigToFile } from "widget/settings/shared/FileChooser";
|
||||
import Gio from 'gi://Gio';
|
||||
import { bash, Notify } from 'lib/utils';
|
||||
import icons from 'lib/icons';
|
||||
import { filterConfigForThemeOnly, loadJsonFile, saveConfigToFile } from 'widget/settings/shared/FileChooser';
|
||||
|
||||
export const hexColorPattern = /^#([0-9A-Fa-f]{6}|[0-9A-Fa-f]{8})$/;
|
||||
|
||||
globalThis.useTheme = (filePath: string): void => {
|
||||
let importedConfig = loadJsonFile(filePath);
|
||||
const importedConfig = loadJsonFile(filePath);
|
||||
|
||||
if (!importedConfig) {
|
||||
return;
|
||||
@@ -16,22 +16,22 @@ globalThis.useTheme = (filePath: string): void => {
|
||||
summary: `Importing Theme`,
|
||||
body: `Importing: ${filePath}`,
|
||||
iconName: icons.ui.info,
|
||||
timeout: 7000
|
||||
timeout: 7000,
|
||||
});
|
||||
|
||||
let tmpConfigFile = Gio.File.new_for_path(`${TMP}/config.json`);
|
||||
let optionsConfigFile = Gio.File.new_for_path(OPTIONS);
|
||||
const tmpConfigFile = Gio.File.new_for_path(`${TMP}/config.json`);
|
||||
const optionsConfigFile = Gio.File.new_for_path(OPTIONS);
|
||||
|
||||
let [tmpSuccess, tmpContent] = tmpConfigFile.load_contents(null);
|
||||
let [optionsSuccess, optionsContent] = optionsConfigFile.load_contents(null);
|
||||
const [tmpSuccess, tmpContent] = tmpConfigFile.load_contents(null);
|
||||
const [optionsSuccess, optionsContent] = optionsConfigFile.load_contents(null);
|
||||
|
||||
if (!tmpSuccess || !optionsSuccess) {
|
||||
console.error("Failed to read existing configuration files.");
|
||||
console.error('Failed to read existing configuration files.');
|
||||
return;
|
||||
}
|
||||
|
||||
let tmpConfig = JSON.parse(new TextDecoder("utf-8").decode(tmpContent));
|
||||
let optionsConfig = JSON.parse(new TextDecoder("utf-8").decode(optionsContent));
|
||||
let tmpConfig = JSON.parse(new TextDecoder('utf-8').decode(tmpContent));
|
||||
let optionsConfig = JSON.parse(new TextDecoder('utf-8').decode(optionsContent));
|
||||
|
||||
const filteredConfig = filterConfigForThemeOnly(importedConfig);
|
||||
tmpConfig = { ...tmpConfig, ...filteredConfig };
|
||||
@@ -39,6 +39,5 @@ globalThis.useTheme = (filePath: string): void => {
|
||||
|
||||
saveConfigToFile(tmpConfig, `${TMP}/config.json`);
|
||||
saveConfigToFile(optionsConfig, OPTIONS);
|
||||
bash("pkill ags && ags");
|
||||
}
|
||||
|
||||
bash('pkill ags && ags');
|
||||
};
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
import { Opt } from "lib/option";
|
||||
import { HexColor, RecursiveOptionsObject } from "lib/types/options";
|
||||
import { Opt } from 'lib/option';
|
||||
import { HexColor, RecursiveOptionsObject } from 'lib/types/options';
|
||||
|
||||
export const isOpt = <T>(value: unknown): value is Opt<T> =>
|
||||
typeof value === 'object' && value !== null && 'value' in value && value instanceof Opt;
|
||||
|
||||
export const isRecursiveOptionsObject = (value: unknown): value is RecursiveOptionsObject => {
|
||||
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
||||
}
|
||||
};
|
||||
|
||||
export const isHexColor = (value: string): value is HexColor => {
|
||||
return /^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/.test(value);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import options from "options";
|
||||
import { UnitType, Weather, WeatherIconTitle, WeatherIcon } from "lib/types/weather.js";
|
||||
import { DEFAULT_WEATHER } from "lib/types/defaults/weather.js";
|
||||
import GLib from "gi://GLib?version=2.0";
|
||||
import { weatherIcons } from "modules/icons/weather.js";
|
||||
import options from 'options';
|
||||
import { UnitType, Weather, WeatherIconTitle, WeatherIcon } from 'lib/types/weather.js';
|
||||
import { DEFAULT_WEATHER } from 'lib/types/defaults/weather.js';
|
||||
import GLib from 'gi://GLib?version=2.0';
|
||||
import { weatherIcons } from 'modules/icons/weather.js';
|
||||
|
||||
const { key, interval, location } = options.menus.clock.weather;
|
||||
|
||||
@@ -10,12 +10,12 @@ export const globalWeatherVar = Variable<Weather>(DEFAULT_WEATHER);
|
||||
|
||||
let weatherIntervalInstance: null | number = null;
|
||||
|
||||
const weatherIntervalFn = (weatherInterval: number, loc: string, weatherKey: string) => {
|
||||
const weatherIntervalFn = (weatherInterval: number, loc: string, weatherKey: string): void => {
|
||||
if (weatherIntervalInstance !== null) {
|
||||
GLib.source_remove(weatherIntervalInstance);
|
||||
}
|
||||
|
||||
const formattedLocation = loc.replace(" ", "%20");
|
||||
const formattedLocation = loc.replace(' ', '%20');
|
||||
|
||||
weatherIntervalInstance = Utils.interval(weatherInterval, () => {
|
||||
Utils.execAsync(
|
||||
@@ -23,13 +23,13 @@ const weatherIntervalFn = (weatherInterval: number, loc: string, weatherKey: str
|
||||
)
|
||||
.then((res) => {
|
||||
try {
|
||||
if (typeof res !== "string") {
|
||||
if (typeof res !== 'string') {
|
||||
return (globalWeatherVar.value = DEFAULT_WEATHER);
|
||||
}
|
||||
|
||||
const parsedWeather = JSON.parse(res);
|
||||
|
||||
if (Object.keys(parsedWeather).includes("error")) {
|
||||
if (Object.keys(parsedWeather).includes('error')) {
|
||||
return (globalWeatherVar.value = DEFAULT_WEATHER);
|
||||
}
|
||||
|
||||
@@ -46,43 +46,41 @@ const weatherIntervalFn = (weatherInterval: number, loc: string, weatherKey: str
|
||||
});
|
||||
};
|
||||
|
||||
Utils.merge([key.bind("value"), interval.bind("value"), location.bind("value")], (weatherKey, weatherInterval, loc) => {
|
||||
Utils.merge([key.bind('value'), interval.bind('value'), location.bind('value')], (weatherKey, weatherInterval, loc) => {
|
||||
if (!weatherKey) {
|
||||
return (globalWeatherVar.value = DEFAULT_WEATHER);
|
||||
}
|
||||
weatherIntervalFn(weatherInterval, loc, weatherKey);
|
||||
});
|
||||
|
||||
export const getTemperature = (wthr: Weather, unt: UnitType) => {
|
||||
if (unt === "imperial") {
|
||||
export const getTemperature = (wthr: Weather, unt: UnitType): string => {
|
||||
if (unt === 'imperial') {
|
||||
return `${Math.ceil(wthr.current.temp_f)}° F`;
|
||||
} else {
|
||||
return `${Math.ceil(wthr.current.temp_c)}° C`;
|
||||
}
|
||||
};
|
||||
|
||||
export const getWeatherIcon = (fahren: number) => {
|
||||
export const getWeatherIcon = (fahren: number): Record<string, string> => {
|
||||
const icons = {
|
||||
100: "",
|
||||
75: "",
|
||||
50: "",
|
||||
25: "",
|
||||
0: "",
|
||||
100: '',
|
||||
75: '',
|
||||
50: '',
|
||||
25: '',
|
||||
0: '',
|
||||
} as const;
|
||||
const colors = {
|
||||
100: "weather-color red",
|
||||
75: "weather-color orange",
|
||||
50: "weather-color lavender",
|
||||
25: "weather-color blue",
|
||||
0: "weather-color sky",
|
||||
100: 'weather-color red',
|
||||
75: 'weather-color orange',
|
||||
50: 'weather-color lavender',
|
||||
25: 'weather-color blue',
|
||||
0: 'weather-color sky',
|
||||
} as const;
|
||||
|
||||
type IconKeys = keyof typeof icons;
|
||||
|
||||
const threshold: IconKeys =
|
||||
fahren < 0
|
||||
? 0
|
||||
: ([100, 75, 50, 25, 0] as IconKeys[]).find((threshold) => threshold <= fahren) || 0;
|
||||
fahren < 0 ? 0 : ([100, 75, 50, 25, 0] as IconKeys[]).find((threshold) => threshold <= fahren) || 0;
|
||||
|
||||
const icon = icons[threshold || 50];
|
||||
const color = colors[threshold || 50];
|
||||
@@ -93,35 +91,32 @@ export const getWeatherIcon = (fahren: number) => {
|
||||
};
|
||||
};
|
||||
|
||||
export const getWindConditions = (wthr: Weather, unt: UnitType) => {
|
||||
if (unt === "imperial") {
|
||||
export const getWindConditions = (wthr: Weather, unt: UnitType): string => {
|
||||
if (unt === 'imperial') {
|
||||
return `${Math.floor(wthr.current.wind_mph)} mph`;
|
||||
}
|
||||
return `${Math.floor(wthr.current.wind_kph)} kph`;
|
||||
};
|
||||
|
||||
export const getRainChance = (wthr: Weather) => `${wthr.forecast.forecastday[0].day.daily_chance_of_rain}%`;
|
||||
export const getRainChance = (wthr: Weather): string => `${wthr.forecast.forecastday[0].day.daily_chance_of_rain}%`;
|
||||
|
||||
export const isValidWeatherIconTitle = (title: string): title is WeatherIconTitle => {
|
||||
return title in weatherIcons;
|
||||
};
|
||||
|
||||
export const getWeatherStatusTextIcon = (wthr: Weather): WeatherIcon => {
|
||||
let iconQuery = wthr.current.condition.text
|
||||
.trim()
|
||||
.toLowerCase()
|
||||
.replaceAll(" ", "_");
|
||||
let iconQuery = wthr.current.condition.text.trim().toLowerCase().replaceAll(' ', '_');
|
||||
|
||||
if (!wthr.current.is_day && iconQuery === "partly_cloudy") {
|
||||
iconQuery = "partly_cloudy_night";
|
||||
if (!wthr.current.is_day && iconQuery === 'partly_cloudy') {
|
||||
iconQuery = 'partly_cloudy_night';
|
||||
}
|
||||
|
||||
if (isValidWeatherIconTitle(iconQuery)) {
|
||||
return weatherIcons[iconQuery];
|
||||
} else {
|
||||
console.warn(`Unknown weather icon title: ${iconQuery}`);
|
||||
return weatherIcons["warning"];
|
||||
return weatherIcons['warning'];
|
||||
}
|
||||
};
|
||||
|
||||
globalThis["globalWeatherVar"] = globalWeatherVar;
|
||||
globalThis['globalWeatherVar'] = globalWeatherVar;
|
||||
|
||||
@@ -6,5 +6,5 @@ export const WINDOW_LAYOUTS: string[] = [
|
||||
'top-left',
|
||||
'bottom-left',
|
||||
'bottom-center',
|
||||
'bottom-right'
|
||||
'bottom-right',
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user