Dockery/Homarr
1
0
Fork 0
mirror of https://github.com/ajnart/homarr.git synced 2026-02-23 06:50:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

🔖 v0.7.2

Browse Source
This commit is contained in:
Thomas Camlong
2022-06-25 17:53:20 +02:00
committed by GitHub
parent b758df9f44 1ae074db8f
commit aab1492934
16 changed files with 190 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.dockerignore
View File

@@ -2,5 +2,8 @@ Dockerfile
.dockerignore
node_modules
npm-debug.log
README.md
*.md
.git
.github
LICENSE
docs/

2
README.md
View File

@@ -33,7 +33,7 @@ Homarr is a simple and lightweight homepage for your server, that helps you easi
It integrates with the services you use to display information on the homepage (E.g. Show upcoming Sonarr/Radarr releases).
For a full list of integrations look at: [wiki/integrations](#).
For a full list of integrations look at: [wiki/integrations](https://github.com/ajnart/homarr/wiki/Integrations)
If you have any questions about Homarr or want to share information with us, please go to one of the following places:

2
data/constants.ts
View File

@@ -1,2 +1,2 @@
export const REPO_URL = 'ajnart/homarr';
export const CURRENT_VERSION = 'v0.7.1';
export const CURRENT_VERSION = 'v0.7.2';

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "homarr",
"version": "0.7.1",
"version": "0.7.2",
"description": "Homarr - A homepage for your server.",
"repository": {
"type": "git",

29
src/components/AppShelf/AddAppShelfItem.tsx
View File

@@ -123,13 +123,9 @@ export function AddAppShelfItemForm(props: { setOpened: (b: boolean) => void } &
validate: {
apiKey: () => null,
// Validate icon with a regex
icon: (value: string) => {
// Regex to match everything that ends with and icon extension
if (!value.match(/\.(png|jpg|jpeg|gif|svg)$/)) {
return 'Please enter a valid icon URL';
}
return null;
},
icon: (value: string) =>
// Disable matching to allow any values
null,
// Validate url with a regex http/https
url: (value: string) => {
try {
@@ -321,9 +317,20 @@ export function AddAppShelfItemForm(props: { setOpened: (b: boolean) => void } &
/>
</>
)}
{(form.values.type === 'Deluge' ||
form.values.type === 'Transmission' ||
form.values.type === 'qBittorrent') && (
{form.values.type === 'Deluge' && (
<>
<TextInput
label="Password"
placeholder="password"
value={form.values.password}
onChange={(event) => {
form.setFieldValue('password', event.currentTarget.value);
}}
error={form.errors.password && 'Invalid password'}
/>
</>
)}
{form.values.type === 'Transmission' && (
<>
<TextInput
label="Username"
@@ -336,7 +343,7 @@ export function AddAppShelfItemForm(props: { setOpened: (b: boolean) => void } &
/>
<TextInput
label="Password"
placeholder="password"
placeholder="adminadmin"
value={form.values.password}
onChange={(event) => {
form.setFieldValue('password', event.currentTarget.value);

30
src/components/AppShelf/AppShelf.tsx
View File

@@ -20,15 +20,30 @@ import DownloadComponent from '../modules/downloads/DownloadsModule';
const useStyles = createStyles((theme, _params) => ({
item: {
borderBottom: 0,
overflow: 'hidden',
border: '1px solid transparent',
borderRadius: theme.radius.lg,
borderLeft: '3px solid transparent',
borderRight: '3px solid transparent',
borderBottom: '3px solid transparent',
borderRadius: '20px',
borderColor: theme.colorScheme === 'dark' ? theme.colors.dark[5] : theme.colors.gray[1],
marginTop: theme.spacing.md,
},
itemOpened: {
borderColor: theme.colorScheme === 'dark' ? theme.colors.dark[5] : theme.colors.gray[3],
control: {
backgroundColor: theme.colorScheme === 'dark' ? theme.colors.dark[5] : theme.colors.gray[1],
borderRadius: theme.spacing.md,
'&:hover': {
backgroundColor: theme.colorScheme === 'dark' ? theme.colors.dark[5] : theme.colors.gray[1],
},
},
content: {
margin: theme.spacing.md,
},
label: {
overflow: 'visible',
},
}));
@@ -147,11 +162,6 @@ const AppShelf = (props: any) => {
order={2}
iconPosition="right"
multiple
styles={{
item: {
borderRadius: '20px',
},
}}
initialState={toggledCategories}
onChange={(idx) => settoggledCategories(idx)}
>

6
src/components/AppShelf/AppShelfMenu.tsx
View File

@@ -20,11 +20,7 @@ export default function AppShelfMenu(props: any) {
onClose={() => setOpened(false)}
title="Modify a service"
>
<AddAppShelfItemForm
setOpened={setOpened}
{...service}
message="Save service"
/>
<AddAppShelfItemForm setOpened={setOpened} {...service} message="Save service" />
</Modal>
<Menu
position="right"

46
src/components/Settings/CommonSettings.tsx
View File

@@ -1,6 +1,6 @@
import { ActionIcon, Group, Text, SegmentedControl, TextInput, Anchor } from '@mantine/core';
import { useState } from 'react';
import { IconBrandGithub as BrandGithub } from '@tabler/icons';
import { IconBrandGithub as BrandGithub, IconBrandDiscord as BrandDiscord } from '@tabler/icons';
import { CURRENT_VERSION } from '../../../data/constants';
import { useConfig } from '../../tools/state';
import { ColorSchemeSwitch } from '../ColorSchemeToggle/ColorSchemeSwitch';
@@ -28,6 +28,15 @@ export default function CommonSettings(args: any) {
<Group direction="column" grow>
<Group grow direction="column" spacing={0}>
<Text>Search engine</Text>
<Text
style={{
fontSize: '0.75rem',
color: 'gray',
marginBottom: '0.5rem',
}}
>
Tip: %s can be used as a placeholder for the query.
</Text>
<SegmentedControl
fullWidth
title="Search engine"
@@ -53,7 +62,7 @@ export default function CommonSettings(args: any) {
{searchUrl === 'Custom' && (
<TextInput
label="Query URL"
placeholder="Custom query url"
placeholder="Custom query URL"
value={customSearchUrl}
onChange={(event) => {
setCustomSearchUrl(event.currentTarget.value);
@@ -98,21 +107,26 @@ export default function CommonSettings(args: any) {
{CURRENT_VERSION}
</Text>
</Group>
<Text
style={{
fontSize: '0.90rem',
textAlign: 'center',
color: 'gray',
}}
>
Made with ❤️ by @
<Anchor
href="https://github.com/ajnart"
style={{ color: 'inherit', fontStyle: 'inherit', fontSize: 'inherit' }}
<Group spacing={1}>
<Text
style={{
fontSize: '0.90rem',
textAlign: 'center',
color: 'gray',
}}
>
ajnart
</Anchor>
</Text>
Made with ❤️ by @
<Anchor
href="https://github.com/ajnart"
style={{ color: 'inherit', fontStyle: 'inherit', fontSize: 'inherit' }}
>
ajnart
</Anchor>
</Text>
<ActionIcon<'a'> component="a" href="https://discord.gg/aCsmEV5RgA" size="lg">
<BrandDiscord size={18} />
</ActionIcon>
</Group>
</Group>
</Group>
);

2
src/components/layout/Header.tsx
View File

@@ -78,7 +78,7 @@ export function Header(props: any) {
>
{(styles) => (
<div style={styles}>
<ScrollArea style={{ height: '90vh' }}>
<ScrollArea offsetScrollbars style={{ height: '90vh' }}>
<Group my="sm" grow direction="column" style={{ width: 300 }}>
<ModuleWrapper module={CalendarModule} />
<ModuleWrapper module={TotalDownloadsModule} />

48
src/components/modules/calendar/CalendarModule.tsx
View File

@@ -71,11 +71,13 @@ export default function CalendarComponent(props: any) {
const currentSonarrMedias: any[] = [];
Promise.all(
sonarrServices.map((service) =>
getMedias(service, 'sonarr').then((res) => {
currentSonarrMedias.push(...res.data);
}).catch(() => {
currentSonarrMedias.push([]);
})
getMedias(service, 'sonarr')
.then((res) => {
currentSonarrMedias.push(...res.data);
})
.catch(() => {
currentSonarrMedias.push([]);
})
)
).then(() => {
setSonarrMedias(currentSonarrMedias);
@@ -83,11 +85,13 @@ export default function CalendarComponent(props: any) {
const currentRadarrMedias: any[] = [];
Promise.all(
radarrServices.map((service) =>
getMedias(service, 'radarr').then((res) => {
currentRadarrMedias.push(...res.data);
}).catch(() => {
currentRadarrMedias.push([]);
})
getMedias(service, 'radarr')
.then((res) => {
currentRadarrMedias.push(...res.data);
})
.catch(() => {
currentRadarrMedias.push([]);
})
)
).then(() => {
setRadarrMedias(currentRadarrMedias);
@@ -95,11 +99,13 @@ export default function CalendarComponent(props: any) {
const currentLidarrMedias: any[] = [];
Promise.all(
lidarrServices.map((service) =>
getMedias(service, 'lidarr').then((res) => {
currentLidarrMedias.push(...res.data);
}).catch(() => {
currentLidarrMedias.push([]);
})
getMedias(service, 'lidarr')
.then((res) => {
currentLidarrMedias.push(...res.data);
})
.catch(() => {
currentLidarrMedias.push([]);
})
)
).then(() => {
setLidarrMedias(currentLidarrMedias);
@@ -107,11 +113,13 @@ export default function CalendarComponent(props: any) {
const currentReadarrMedias: any[] = [];
Promise.all(
readarrServices.map((service) =>
getMedias(service, 'readarr').then((res) => {
currentReadarrMedias.push(...res.data);
}).catch(() => {
currentReadarrMedias.push([]);
})
getMedias(service, 'readarr')
.then((res) => {
currentReadarrMedias.push(...res.data);
})
.catch(() => {
currentReadarrMedias.push([]);
})
)
).then(() => {
setReadarrMedias(currentReadarrMedias);

2
src/components/modules/downloads/DownloadsModule.tsx
View File

@@ -59,7 +59,7 @@ export default function DownloadComponent() {
setIsLoading(false);
});
}, 5000);
}, [config.services]);
}, []);
if (downloadServices.length === 0) {
return (

14
src/components/modules/ping/PingModule.tsx
View File

@@ -23,19 +23,19 @@ export default function PingComponent(props: any) {
const exists = config.modules?.[PingModule.title]?.enabled ?? false;
function statusCheck(response: AxiosResponse) {
const { status }: {status: string[]} = props;
const { status }: { status: string[] } = props;
//Default Status
let acceptableStatus = ['200'];
if (status !== undefined && status.length) {
acceptableStatus = status;
}
// Checks if reported status is in acceptable status array
if (acceptableStatus.indexOf((response.status).toString()) >= 0) {
if (acceptableStatus.indexOf(response.status.toString()) >= 0) {
setOnline('online');
setResponse(response.status);
} else {
setOnline('down');
setResponse(response.status)
setResponse(response.status);
}
}
@@ -59,7 +59,13 @@ export default function PingComponent(props: any) {
<Tooltip
radius="lg"
style={{ position: 'absolute', bottom: 20, right: 20 }}
label={isOnline === 'loading' ? 'Loading...' : isOnline === 'online' ? `Online - ${response}` : `Offline - ${response}`}
label={
isOnline === 'loading'
? 'Loading...'
: isOnline === 'online'
? `Online - ${response}`
: `Offline - ${response}`
}
>
<motion.div
animate={{

9
src/components/modules/search/SearchModule.tsx
View File

@@ -96,7 +96,13 @@ export default function SearchBar(props: any) {
} else if (isTorrent) {
window.open(`https://bitsearch.to/search?q=${query.substring(3)}`);
} else {
window.open(`${queryUrl}${values.query}`);
window.open(
`${
queryUrl.includes('%s')
? queryUrl.replace('%s', values.query)
: queryUrl + values.query
}`
);
}
}, 20);
})}
@@ -114,6 +120,7 @@ export default function SearchBar(props: any) {
onBlurCapture={() => setOpened(false)}
target={
<Autocomplete
autoFocus
variant="filled"
data={autocompleteData}
icon={icon}

6
src/pages/api/modules/calendar.ts
View File

@@ -44,9 +44,9 @@ async function Post(req: NextApiRequest, res: NextApiResponse) {
});
}
// Get the origin URL
var { href: origin } = new URL(service.url);
if (origin.endsWith("/")) {
origin = origin.slice(0, -1)
let { href: origin } = new URL(service.url);
if (origin.endsWith('/')) {
origin = origin.slice(0, -1);
}
const pined = `${origin}${url?.url}?apiKey=${service.apiKey}&end=${nextMonth}&start=${lastMonth}`;
const data = await axios.get(

83
src/pages/api/modules/downloads.ts
View File

@@ -7,53 +7,52 @@ import { Config } from '../../../tools/types';
async function Post(req: NextApiRequest, res: NextApiResponse) {
// Get the type of service from the request url
const torrents: NormalizedTorrent[] = [];
const { config }: { config: Config } = req.body;
const qBittorrentService = config.services
.filter((service) => service.type === 'qBittorrent')
.at(0);
const delugeService = config.services.filter((service) => service.type === 'Deluge').at(0);
const transmissionService = config.services
.filter((service) => service.type === 'Transmission')
.at(0);
if (!qBittorrentService && !delugeService && !transmissionService) {
const qBittorrentServices = config.services.filter((service) => service.type === 'qBittorrent');
const delugeServices = config.services.filter((service) => service.type === 'Deluge');
const transmissionServices = config.services.filter((service) => service.type === 'Transmission');
const torrents: NormalizedTorrent[] = [];
if (!qBittorrentServices && !delugeServices && !transmissionServices) {
return res.status(500).json({
statusCode: 500,
message: 'Missing service',
message: 'Missing services',
});
}
if (qBittorrentService) {
torrents.push(
...(
await new QBittorrent({
baseUrl: qBittorrentService.url,
username: qBittorrentService.username,
password: qBittorrentService.password,
}).getAllData()
).torrents
);
}
if (delugeService) {
torrents.push(
...(
await new Deluge({
baseUrl: delugeService.url,
password: 'password' in delugeService ? delugeService.password : '',
}).getAllData()
).torrents
);
}
if (transmissionService) {
torrents.push(
...(
await new Transmission({
baseUrl: transmissionService.url,
username: transmissionService.username,
password: 'password' in transmissionService ? transmissionService.password : '',
}).getAllData()
).torrents
);
}
await Promise.all(
qBittorrentServices.map((service) =>
new QBittorrent({
baseUrl: service.url,
username: service.username,
password: service.password,
})
.getAllData()
.then((e) => torrents.push(...e.torrents))
)
);
await Promise.all(
delugeServices.map((service) =>
new Deluge({
baseUrl: service.url,
password: 'password' in service ? service.password : '',
})
.getAllData()
.then((e) => torrents.push(...e.torrents))
)
);
// Map transmissionServices
await Promise.all(
transmissionServices.map((service) =>
new Transmission({
baseUrl: service.url,
username: 'username' in service ? service.username : '',
password: 'password' in service ? service.password : '',
})
.getAllData()
.then((e) => torrents.push(...e.torrents))
)
);
res.status(200).json(torrents);
}

44
src/tools/types.ts
View File

@@ -33,30 +33,30 @@ interface ConfigModule {
}
export const StatusCodes = [
{value: '200', label: '200 - OK', group:'Sucessful responses'},
{value: '204', label: '204 - No Content', group:'Sucessful responses'},
{value: '301', label: '301 - Moved Permanently', group:'Redirection responses'},
{value: '302', label: '302 - Found / Moved Temporarily', group:'Redirection responses'},
{value: '304', label: '304 - Not Modified', group:'Redirection responses'},
{value: '307', label: '307 - Temporary Redirect', group:'Redirection responses'},
{value: '308', label: '308 - Permanent Redirect', group:'Redirection responses'},
{value: '400', label: '400 - Bad Request', group:'Client error responses'},
{value: '401', label: '401 - Unauthorized', group:'Client error responses'},
{value: '403', label: '403 - Forbidden', group:'Client error responses'},
{value: '404', label: '404 - Not Found', group:'Client error responses'},
{value: '408', label: '408 - Request Timeout', group:'Client error responses'},
{value: '410', label: '410 - Gone', group:'Client error responses'},
{value: '429', label: '429 - Too Many Requests', group:'Client error responses'},
{value: '500', label: '500 - Internal Server Error', group:'Server error responses'},
{value: '502', label: '502 - Bad Gateway', group:'Server error responses'},
{value: '503', label: '503 - Service Unavailable', group:'Server error responses'},
{value: '054', label: '504 - Gateway Timeout Error', group:'Server error responses'},
];
{ value: '200', label: '200 - OK', group: 'Sucessful responses' },
{ value: '204', label: '204 - No Content', group: 'Sucessful responses' },
{ value: '301', label: '301 - Moved Permanently', group: 'Redirection responses' },
{ value: '302', label: '302 - Found / Moved Temporarily', group: 'Redirection responses' },
{ value: '304', label: '304 - Not Modified', group: 'Redirection responses' },
{ value: '307', label: '307 - Temporary Redirect', group: 'Redirection responses' },
{ value: '308', label: '308 - Permanent Redirect', group: 'Redirection responses' },
{ value: '400', label: '400 - Bad Request', group: 'Client error responses' },
{ value: '401', label: '401 - Unauthorized', group: 'Client error responses' },
{ value: '403', label: '403 - Forbidden', group: 'Client error responses' },
{ value: '404', label: '404 - Not Found', group: 'Client error responses' },
{ value: '408', label: '408 - Request Timeout', group: 'Client error responses' },
{ value: '410', label: '410 - Gone', group: 'Client error responses' },
{ value: '429', label: '429 - Too Many Requests', group: 'Client error responses' },
{ value: '500', label: '500 - Internal Server Error', group: 'Server error responses' },
{ value: '502', label: '502 - Bad Gateway', group: 'Server error responses' },
{ value: '503', label: '503 - Service Unavailable', group: 'Server error responses' },
{ value: '054', label: '504 - Gateway Timeout Error', group: 'Server error responses' },
];
export const Targets = [
{value: '_blank', label: 'New Tab'},
{value: '_top', label: 'Same Window'}
]
{ value: '_blank', label: 'New Tab' },
{ value: '_top', label: 'Same Window' },
];
export const ServiceTypeList = [
'Other',