Improve weather module

This commit is contained in:
Thomas "ajnart" Camlong
2022-05-17 21:22:14 +02:00
parent 471a9f7407
commit 2ba9d517a8
5 changed files with 8 additions and 9 deletions

View File

@@ -1,7 +1,5 @@
import { Aside as MantineAside, Group } from '@mantine/core'; import { Aside as MantineAside, Group } from '@mantine/core';
import { DateModule } from '../modules'; import { WeatherModule, DateModule, ModuleWrapper, CalendarModule } from '../modules';
import { CalendarModule } from '../modules/calendar/CalendarModule';
import ModuleWrapper from '../modules/moduleWrapper';
export default function Aside(props: any) { export default function Aside(props: any) {
return ( return (
@@ -18,6 +16,7 @@ export default function Aside(props: any) {
<Group mt="sm" grow direction="column"> <Group mt="sm" grow direction="column">
<ModuleWrapper module={CalendarModule} /> <ModuleWrapper module={CalendarModule} />
<ModuleWrapper module={DateModule} /> <ModuleWrapper module={DateModule} />
<ModuleWrapper module={WeatherModule} />
</Group> </Group>
</MantineAside> </MantineAside>
); );

View File

@@ -1,7 +1,5 @@
import { Group, Navbar as MantineNavbar } from '@mantine/core'; import { Group, Navbar as MantineNavbar } from '@mantine/core';
import { WeatherModule } from '../modules'; import { WeatherModule, DateModule, ModuleWrapper } from '../modules';
import { DateModule } from '../modules/date/DateModule';
import ModuleWrapper from '../modules/moduleWrapper';
export default function Navbar() { export default function Navbar() {
return ( return (
@@ -17,8 +15,9 @@ export default function Navbar() {
> >
<Group mt="sm" direction="column" align="center"> <Group mt="sm" direction="column" align="center">
<ModuleWrapper module={DateModule} /> <ModuleWrapper module={DateModule} />
<ModuleWrapper module={WeatherModule} />
</Group> </Group>
<ModuleWrapper module={WeatherModule} />
<ModuleWrapper module={WeatherModule} />
</MantineNavbar> </MantineNavbar>
); );
} }

View File

@@ -1,3 +1,4 @@
export * from './moduleWrapper';
export * from './date'; export * from './date';
export * from './calendar'; export * from './calendar';
export * from './search'; export * from './search';

View File

@@ -2,7 +2,7 @@ import { Card, useMantineTheme } from '@mantine/core';
import { useConfig } from '../../tools/state'; import { useConfig } from '../../tools/state';
import { IModule } from './modules'; import { IModule } from './modules';
export default function ModuleWrapper(props: any) { export function ModuleWrapper(props: any) {
const { module }: { module: IModule } = props; const { module }: { module: IModule } = props;
const { config } = useConfig(); const { config } = useConfig();
const enabledModules = config.settings.enabledModules ?? []; const enabledModules = config.settings.enabledModules ?? [];

View File

@@ -17,7 +17,7 @@ import { IModule } from '../modules';
import { WeatherResponse } from './WeatherInterface'; import { WeatherResponse } from './WeatherInterface';
export const WeatherModule: IModule = { export const WeatherModule: IModule = {
title: 'Weather', title: 'Weather (beta)',
description: 'Look up the current weather in your location', description: 'Look up the current weather in your location',
icon: Sun, icon: Sun,
component: WeatherComponent, component: WeatherComponent,