Merge branch 'dev'

data/constants.ts

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "homarr",
-  "version": "0.10.7",
+  "version": "0.10.6",
   "description": "Homarr - A homepage for your server.",
   "license": "MIT",
   "repository": {

public/locales/da/settings/common.json

@@ -10,6 +10,5 @@
   },
   "credits": {
     "madeWithLove": "Lavet med ❤️ af @"
-  },
+  }
-  "grow": ""
 }

public/locales/de/settings/common.json

@@ -10,6 +10,5 @@
   },
   "credits": {
     "madeWithLove": "Gemacht mit ❤️ von @"
-  },
+  }
-  "grow": ""
 }

public/locales/en/settings/common.json

@@ -10,6 +10,5 @@
   },
   "credits": {
     "madeWithLove": "Made with ❤️ by @"
-  },
+  }
-  "grow": "Grow grid (take all space)"
 }

public/locales/es/settings/common.json

@@ -10,6 +10,5 @@
   },
   "credits": {
     "madeWithLove": "Hecho con ❤️ por @"
-  },
+  }
-  "grow": "Aumentar cuadrícula (toma todo el espacio)"
 }

public/locales/fr/settings/common.json

@@ -10,6 +10,5 @@
   },
   "credits": {
     "madeWithLove": "Fait avec ❤️ par @"
-  },
+  }
-  "grow": ""
 }

public/locales/he/settings/common.json

@@ -10,6 +10,5 @@
   },
   "credits": {
     "madeWithLove": "נעשה ב- ❤️ ע״י @"
-  },
+  }
-  "grow": ""
 }

public/locales/it/settings/common.json

@@ -10,6 +10,5 @@
   },
   "credits": {
     "madeWithLove": "Realizzato con ❤️ da @"
-  },
+  }
-  "grow": ""
 }

public/locales/ja/settings/common.json

@@ -10,6 +10,5 @@
   },
   "credits": {
     "madeWithLove": "で作った❤️ by @さん"
-  },
+  }
-  "grow": ""
 }

public/locales/ko/settings/common.json

@@ -10,6 +10,5 @@
   },
   "credits": {
     "madeWithLove": "Made with ❤️ by @"
-  },
+  }
-  "grow": ""
 }

public/locales/lol/settings/common.json

@@ -10,6 +10,5 @@
   },
   "credits": {
     "madeWithLove": "Maded wif ❤️ by @"
-  },
+  }
-  "grow": ""
 }

public/locales/nl/settings/common.json

@@ -10,6 +10,5 @@
   },
   "credits": {
     "madeWithLove": "Gemaakt met ❤️ door @"
-  },
+  }
-  "grow": ""
 }

public/locales/pl/settings/common.json

@@ -10,6 +10,5 @@
   },
   "credits": {
     "madeWithLove": "Wykonane z ❤️ przez @"
-  },
+  }
-  "grow": ""
 }

public/locales/pt/settings/common.json

@@ -10,6 +10,5 @@
   },
   "credits": {
     "madeWithLove": "Feito com ❤️ por @"
-  },
+  }
-  "grow": ""
 }

public/locales/ru/settings/common.json

@@ -10,6 +10,5 @@
   },
   "credits": {
     "madeWithLove": "Сделано с ❤️ по @."
-  },
+  }
-  "grow": ""
 }

public/locales/sl/settings/common.json

@@ -10,6 +10,5 @@
   },
   "credits": {
     "madeWithLove": "Narejeno s ❤️ od @"
-  },
+  }
-  "grow": ""
 }

public/locales/sv/modules/search.json

@@ -6,25 +6,25 @@
   "input": {
     "placeholder": "Sök på webben..."
   },
-  "switched-to": "Växlade till",
+  "switched-to": "",
   "searchEngines": {
     "search": {
-      "name": "Webb",
+      "name": "",
-      "description": "Sök med din sökmotor (definierad i inställningar)"
+      "description": ""
     },
     "youtube": {
-      "name": "YouTube",
+      "name": "",
-      "description": "Sök på YouTube"
+      "description": ""
     },
     "torrents": {
-      "name": "Torrents",
+      "name": "",
-      "description": "Sök torrents"
+      "description": ""
     },
     "overseerr": {
       "name": "Overseerr",
-      "description": "Sök efter filmer och TV-program med Overseerr (modulen måste vara aktiverad)"
+      "description": ""
     }
   },
-  "tip": "Du kan välja sökfältet med kortkommandot ",
+  "tip": "",
-  "switchedSearchEngine": "Växlade till att söka med {{searchEngine}}"
+  "switchedSearchEngine": ""
 }

public/locales/sv/settings/common.json

@@ -10,6 +10,5 @@
   },
   "credits": {
     "madeWithLove": "Gjort med ❤️ av @"
-  },
+  }
-  "grow": "Växande rutnät (ta allt utrymme)"
 }

public/locales/uk/settings/common.json

@@ -10,6 +10,5 @@
   },
   "credits": {
     "madeWithLove": "Зроблено з ❤️ by @"
-  },
+  }
-  "grow": ""
 }

public/locales/vi/settings/common.json

@@ -10,6 +10,5 @@
   },
   "credits": {
     "madeWithLove": "From @ with ❤️"
-  },
+  }
-  "grow": ""
 }

public/locales/zh/settings/common.json

@@ -10,6 +10,5 @@
   },
   "credits": {
     "madeWithLove": "用❤️创造，出品于"
-  },
+  }
-  "grow": ""
 }

src/components/AppShelf/AppShelf.tsx

@@ -95,7 +95,7 @@ const AppShelf = (props: any) => {
         onDragEnd={handleDragEnd}
       >
         <SortableContext items={config.services}>
-          <Grid gutter="lg" grow={config.settings.grow}>
+          <Grid gutter="lg" align="center">
             {filtered.map((service) => (
               <Grid.Col key={service.id} span="content">
                 <SortableItem service={service} key={service.id} id={service.id}>
@@ -143,14 +143,7 @@ const AppShelf = (props: any) => {
             value={idx.toString()}
           >
             <Accordion.Control>
-              <Title
+              <Title order={5}>{category}</Title>
-                order={5}
-                style={{
-                  minWidth: 0,
-                }}
-              >
-                {category}
-              </Title>
             </Accordion.Control>
             <Accordion.Panel>{getItems(category)}</Accordion.Panel>
           </Accordion.Item>

src/components/Settings/AdvancedSettings.tsx

@@ -6,7 +6,6 @@ import { ColorSelector } from './ColorSelector';
 import { OpacitySelector } from './OpacitySelector';
 import { AppCardWidthSelector } from './AppCardWidthSelector';
 import { ShadeSelector } from './ShadeSelector';
-import { GrowthSelector } from './GrowthSelector';
 
 export default function TitleChanger() {
   const { config, setConfig } = useConfig();
@@ -75,7 +74,6 @@ export default function TitleChanger() {
           <Button type="submit">{t('buttons.submit')}</Button>
         </Stack>
       </form>
-      <GrowthSelector />
       <ColorSelector type="primary" />
       <ColorSelector type="secondary" />
       <ShadeSelector />

src/components/Settings/GrowthSelector.tsx

@@ -1,30 +0,0 @@
-import { Switch } from '@mantine/core';
-import { useTranslation } from 'next-i18next';
-import { useState } from 'react';
-import { useConfig } from '../../tools/state';
-
-export function GrowthSelector() {
-  const { config, setConfig } = useConfig();
-  const defaultPosition = config?.settings?.grow || false;
-  const [growState, setGrowState] = useState(defaultPosition);
-  const { t } = useTranslation('settings/common.json');
-  const toggleGrowState = () => {
-    setGrowState(!growState);
-    setConfig({
-      ...config,
-      settings: {
-        ...config.settings,
-        grow: !growState,
-      },
-    });
-  };
-
-  return (
-    <Switch
-      label={t('settings/common:grow')}
-      checked={growState === true}
-      onChange={() => toggleGrowState()}
-      size="md"
-    />
-  );
-}

src/components/WidgetsPositionSwitch/WidgetsPositionSwitch.tsx

@@ -48,11 +48,15 @@ export function WidgetsPositionSwitch() {
   };
 
   return (
-    <Switch
+    <Group>
-      label={t('label')}
+      <div className={classes.root}>
-      checked={widgetPosition === 'left'}
+        <Switch
-      onChange={() => toggleWidgetPosition()}
+          checked={widgetPosition === 'left'}
-      size="md"
+          onChange={() => toggleWidgetPosition()}
-    />
+          size="md"
+        />
+      </div>
+      {t('label')}
+    </Group>
   );
 }

src/modules/search/SearchModule.tsx

@@ -1,6 +1,5 @@
 import {
   ActionIcon,
-  Autocomplete,
   Box,
   createStyles,
   Divider,
@@ -12,7 +11,7 @@ import {
   Tooltip,
 } from '@mantine/core';
 import { IconSearch, IconBrandYoutube, IconDownload, IconMovie } from '@tabler/icons';
-import React, { forwardRef, useEffect, useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { useDebouncedValue, useHotkeys } from '@mantine/hooks';
 import { showNotification } from '@mantine/notifications';
 import { useTranslation } from 'next-i18next';
@@ -22,7 +21,6 @@ import { useConfig } from '../../tools/state';
 import { OverseerrModule } from '../overseerr';
 import Tip from '../../components/layout/Tip';
 import { OverseerrMediaDisplay } from '../common';
-import SmallServiceItem from '../../components/AppShelf/SmallServiceItem';
 
 export const SearchModule: IModule = {
   title: 'Search',
@@ -99,25 +97,6 @@ export function SearchModuleComponent() {
     },
   ];
   const [selectedSearchEngine, setSearchEngine] = useState<ItemProps>(searchEnginesList[0]);
-  const matchingServices = config.services.filter((service) => {
-    if (searchQuery === '' || searchQuery === undefined) {
-      return false;
-    }
-    return service.name.toLowerCase().includes(searchQuery.toLowerCase());
-  });
-  const autocompleteData = matchingServices.map((service) => ({
-    label: service.name,
-    value: service.name,
-    icon: service.icon,
-    url: service.openedUrl ?? service.url,
-  }));
-  const AutoCompleteItem = forwardRef<HTMLDivElement, any>(
-    ({ label, value, icon, url, ...others }: any, ref) => (
-      <div ref={ref} {...others}>
-        <SmallServiceItem service={{ label, value, icon, url }} />
-      </div>
-    )
-  );
   useEffect(() => {
     // Refresh the default search engine every time the config for it changes #521
     setSearchEngine(searchEnginesList[0]);
@@ -144,7 +123,7 @@ export function SearchModuleComponent() {
   //TODO: Fix the bug where clicking anything inside the Modal to ask for a movie
   // will close it (Because it closes the underlying Popover)
   return (
-    <Box style={{ width: '100%', maxWidth: 400 }}>
+    <Box style={{ width: '100%', maxWidth: 400, minWidth: 300 }}>
       <Popover
         opened={OverseerrResults.length > 0 && opened && searchQuery.length > 3}
         position="bottom"
@@ -155,30 +134,17 @@ export function SearchModuleComponent() {
         transition="pop-top-right"
       >
         <Popover.Target>
-          <Autocomplete
+          <TextInput
             ref={textInput}
             onFocusCapture={() => setOpened(true)}
             autoFocus
             rightSection={<SearchModuleMenu />}
             placeholder={t(`searchEngines.${selectedSearchEngine.value}.description`)}
             value={searchQuery}
-            onChange={(currentString) => tryMatchSearchEngine(currentString, setSearchQuery)}
+            onChange={(event) => tryMatchSearchEngine(event.currentTarget.value, setSearchQuery)}
-            itemComponent={AutoCompleteItem}
-            data={autocompleteData}
-            onItemSubmit={(item) => {
-              setOpened(false);
-              if (item.url) {
-                setSearchQuery('');
-                window.open(item.openedUrl ? item.openedUrl : item.url, openInNewTab);
-              }
-            }}
             // Replace %s if it is in selectedSearchEngine.url with searchQuery, otherwise append searchQuery at the end of it
             onKeyDown={(event) => {
-              if (
+              if (event.key === 'Enter' && searchQuery.length > 0) {
-                event.key === 'Enter' &&
-                searchQuery.length > 0 &&
-                autocompleteData.length === 0
-              ) {
                 if (selectedSearchEngine.url.includes('%s')) {
                   window.open(selectedSearchEngine.url.replace('%s', searchQuery), openInNewTab);
                 } else {
@@ -186,8 +152,6 @@ export function SearchModuleComponent() {
                 }
               }
             }}
-            radius="md"
-            size="md"
           />
         </Popover.Target>
         <Popover.Dropdown>

src/tools/types.ts

@@ -14,7 +14,6 @@ export interface Settings {
   customCSS?: string;
   appOpacity?: number;
   widgetPosition?: string;
-  grow?: boolean;
   appCardWidth?: number;
 }