diff --git a/.storybook/main.js b/.storybook/main.js index 6449361d8..80bc56834 100644 --- a/.storybook/main.js +++ b/.storybook/main.js @@ -3,6 +3,7 @@ module.exports = { addons: [ 'storybook-dark-mode', '@storybook/addon-links', + 'storybook-addon-mock/register', '@storybook/addon-essentials', { name: 'storybook-addon-turbo-build', diff --git a/README.md b/README.md index 10e33c9c0..221858ee8 100644 --- a/README.md +++ b/README.md @@ -169,10 +169,13 @@ Icons are requested in the following way:
Modules are blocks shown on the sides of the Homarr dashboard that display information. They can be enabled in settings. **Clock Module** -The clock module will display your current time and date. +The Clock Module will display your current time and date. **Calendar Module** -The Calendar module uses [integrations](#--integrations-1) to display new content. +The Calendar Module uses [integrations](#--integrations-1) to display new content. + +**Weather Module** +The Weather Module uses your devices location to display the current, highest, and lowest temperature. **[⤴️ Back to Top](#-table-of-contents)** diff --git a/package.json b/package.json index 906cc3701..8b110f68e 100644 --- a/package.json +++ b/package.json @@ -79,9 +79,13 @@ "eslint-plugin-unused-imports": "^2.0.0", "jest": "^27.5.1", "prettier": "^2.6.2", + "storybook-addon-mock": "^2.3.2", "storybook-addon-turbo-build": "^1.1.0", "storybook-dark-mode": "^1.0.9", "ts-jest": "^27.1.4", "typescript": "4.6.3" + }, + "resolutions": { + "@types/react": "17.0.30" } } diff --git a/src/components/AppShelf/AddAppShelfItem.tsx b/src/components/AppShelf/AddAppShelfItem.tsx index d6101b223..ccc6569f2 100644 --- a/src/components/AppShelf/AddAppShelfItem.tsx +++ b/src/components/AppShelf/AddAppShelfItem.tsx @@ -154,7 +154,14 @@ export function AddAppShelfItemForm(props: { setOpened: (b: boolean) => void } & return ( <>
- Placeholder + Placeholder
{ diff --git a/src/components/layout/Aside.tsx b/src/components/layout/Aside.tsx index 912b231ac..6cef6eb4e 100644 --- a/src/components/layout/Aside.tsx +++ b/src/components/layout/Aside.tsx @@ -1,7 +1,6 @@ import { Aside as MantineAside, Group } from '@mantine/core'; -import { DateModule } from '../modules'; -import { CalendarModule } from '../modules/calendar/CalendarModule'; -import ModuleWrapper from '../modules/moduleWrapper'; +import { WeatherModule, DateModule, CalendarModule } from '../modules'; +import { ModuleWrapper } from '../modules/moduleWrapper'; export default function Aside(props: any) { return ( @@ -18,6 +17,7 @@ export default function Aside(props: any) { + ); diff --git a/src/components/layout/Layout.tsx b/src/components/layout/Layout.tsx index 8b82b4a74..ac2c3c742 100644 --- a/src/components/layout/Layout.tsx +++ b/src/components/layout/Layout.tsx @@ -10,11 +10,7 @@ const useStyles = createStyles((theme) => ({ export default function Layout({ children, style }: any) { const { classes, cx } = useStyles(); return ( - } - header={
} - footer={