Merge branch 'gridstack' of https://github.com/manuel-rw/homarr into gridstack

src/components/Dashboard/Modals/ChangePosition/ChangePositionModal.tsx

@@ -1,5 +1,6 @@
 import { Button, Flex, Grid, NumberInput, Select, SelectItem } from '@mantine/core';
 import { useForm } from '@mantine/form';
+import { useTranslation } from 'next-i18next';
 import { useConfigContext } from '../../../../config/provider';
 
 interface ChangePositionModalProps {
@@ -44,6 +45,8 @@ export const ChangePositionModal = ({
     onSubmit(form.values.x, form.values.y, form.values.width, form.values.height);
   };
 
+  const { t } = useTranslation('common');
+
   return (
     <form onSubmit={form.onSubmit(handleSubmit)}>
       <Grid>
@@ -94,9 +97,9 @@ export const ChangePositionModal = ({
 
       <Flex justify="end" gap="sm" mt="md">
         <Button onClick={() => onCancel()} variant="light" color="gray">
-          Cancel
+          {t('cancel')}
         </Button>
-        <Button type="submit">Save</Button>
+        <Button type="submit">{t('save')}</Button>
       </Flex>
     </form>
   );

src/components/Dashboard/Modals/ChangePosition/ChangeWidgetPositionModal.tsx

@@ -22,7 +22,7 @@ export const ChangeWidgetPositionModal = ({
     updateConfig(
       configName,
       (prev) => {
-        let currentWidget = prev.widgets.find((x) => x.id === innerProps.widgetId);
+        const currentWidget = prev.widgets.find((x) => x.id === innerProps.widgetId);
         currentWidget!.shape = {
           location: {
             x,

src/components/Dashboard/Modals/EditAppModal/EditAppModal.tsx

@@ -1,4 +1,4 @@
-import { Alert, Button, createStyles, Group, Stack, Tabs, Text, ThemeIcon } from '@mantine/core';
+import { Alert, Button, Group, Stack, Tabs, Text, ThemeIcon } from '@mantine/core';
 import { useForm } from '@mantine/form';
 import { ContextModalProps } from '@mantine/modals';
 import {
@@ -30,7 +30,7 @@ export const EditAppModal = ({
   id,
   innerProps,
 }: ContextModalProps<{ app: AppType; allowAppNamePropagation: boolean }>) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation(['layout/modals/add-app', 'common']);
   const { name: configName, config } = useConfigContext();
   const updateConfig = useConfigStore((store) => store.updateConfig);
   const [allowAppNamePropagation, setAllowAppNamePropagation] = useState<boolean>(
@@ -137,68 +137,76 @@ export const EditAppModal = ({
       </Stack>
 
       <form onSubmit={form.onSubmit(onSubmit)}>
-        <Tabs
-          value={activeTab}
-          onTabChange={(tab) => setActiveTab(tab as EditAppModalTab)}
-          defaultValue="general"
+        <Stack
+          justify="space-between"
+          style={{
+            minHeight: 300,
+          }}
         >
-          <Tabs.List grow>
-            <Tabs.Tab
-              rightSection={<ValidationErrorIndicator keys={['name', 'url']} />}
-              icon={<IconAdjustments size={14} />}
-              value="general"
-            >
-              General
-            </Tabs.Tab>
-            <Tabs.Tab
-              rightSection={<ValidationErrorIndicator keys={['behaviour.onClickUrl']} />}
-              icon={<IconClick size={14} />}
-              value="behaviour"
-            >
-              Behaviour
-            </Tabs.Tab>
-            <Tabs.Tab
-              rightSection={<ValidationErrorIndicator keys={[]} />}
-              icon={<IconAccessPoint size={14} />}
-              value="network"
-            >
-              Network
-            </Tabs.Tab>
-            <Tabs.Tab
-              rightSection={<ValidationErrorIndicator keys={['appearance.iconUrl']} />}
-              icon={<IconBrush size={14} />}
-              value="appearance"
-            >
-              Appearance
-            </Tabs.Tab>
-            <Tabs.Tab
-              rightSection={<ValidationErrorIndicator keys={[]} />}
-              icon={<IconPlug size={14} />}
-              value="integration"
-            >
-              Integration
-            </Tabs.Tab>
-          </Tabs.List>
+          <Tabs
+            value={activeTab}
+            onTabChange={(tab) => setActiveTab(tab as EditAppModalTab)}
+            defaultValue="general"
+            radius="md"
+          >
+            <Tabs.List grow>
+              <Tabs.Tab
+                rightSection={<ValidationErrorIndicator keys={['name', 'url']} />}
+                icon={<IconAdjustments size={14} />}
+                value="general"
+              >
+                {t('tabs.general')}
+              </Tabs.Tab>
+              <Tabs.Tab
+                rightSection={<ValidationErrorIndicator keys={['behaviour.onClickUrl']} />}
+                icon={<IconClick size={14} />}
+                value="behaviour"
+              >
+                {t('tabs.behaviour')}
+              </Tabs.Tab>
+              <Tabs.Tab
+                rightSection={<ValidationErrorIndicator keys={[]} />}
+                icon={<IconAccessPoint size={14} />}
+                value="network"
+              >
+                {t('tabs.network')}
+              </Tabs.Tab>
+              <Tabs.Tab
+                rightSection={<ValidationErrorIndicator keys={['appearance.iconUrl']} />}
+                icon={<IconBrush size={14} />}
+                value="appearance"
+              >
+                {t('tabs.appearance')}
+              </Tabs.Tab>
+              <Tabs.Tab
+                rightSection={<ValidationErrorIndicator keys={[]} />}
+                icon={<IconPlug size={14} />}
+                value="integration"
+              >
+                {t('tabs.integration')}
+              </Tabs.Tab>
+            </Tabs.List>
 
-          <GeneralTab form={form} openTab={(targetTab) => setActiveTab(targetTab)} />
-          <BehaviourTab form={form} />
-          <NetworkTab form={form} />
-          <AppearanceTab
-            form={form}
-            disallowAppNameProgagation={() => setAllowAppNamePropagation(false)}
-            allowAppNamePropagation={allowAppNamePropagation}
-          />
-          <IntegrationTab form={form} />
-        </Tabs>
+            <GeneralTab form={form} openTab={(targetTab) => setActiveTab(targetTab)} />
+            <BehaviourTab form={form} />
+            <NetworkTab form={form} />
+            <AppearanceTab
+              form={form}
+              disallowAppNameProgagation={() => setAllowAppNamePropagation(false)}
+              allowAppNamePropagation={allowAppNamePropagation}
+            />
+            <IntegrationTab form={form} />
+          </Tabs>
 
-        <Group position="right" mt={100}>
-          <Button onClick={closeModal} px={50} variant="light" color="gray">
-            Cancel
-          </Button>
-          <Button disabled={!form.isValid()} px={50} type="submit">
-            Save
-          </Button>
-        </Group>
+          <Group position="right" mt="md">
+            <Button onClick={closeModal} px={50} variant="light" color="gray">
+              {t('common:actions.cancel')}
+            </Button>
+            <Button disabled={!form.isValid()} px={50} type="submit">
+              {t('common:actions.save')}
+            </Button>
+          </Group>
+        </Stack>
       </form>
     </>
   );

src/components/Dashboard/Modals/EditAppModal/Tabs/AppereanceTab/AppereanceTab.tsx

@@ -16,7 +16,7 @@ export const AppearanceTab = ({
   disallowAppNameProgagation,
   allowAppNamePropagation,
 }: AppearanceTabProps) => {
-  const { t } = useTranslation('');
+  const { t } = useTranslation('layout/modals/add-app');
   const { classes } = useStyles();
 
   return (
@@ -26,8 +26,8 @@ export const AppearanceTab = ({
           defaultValue={form.values.appearance.iconUrl}
           className={classes.textInput}
           icon={<DebouncedAppIcon form={form} width={20} height={20} />}
-          label="App Icon"
-          description="Logo of your app displayed in your dashboard. Must return a body content containg an image"
+          label={t('appearance.icon.label')}
+          description={t('appearance.icon.description')}
           variant="default"
           withAsterisk
           required

src/components/Dashboard/Modals/EditAppModal/Tabs/AppereanceTab/IconSelector/IconSelector.tsx

@@ -29,11 +29,7 @@ interface IconSelectorProps {
   allowAppNamePropagation: boolean;
 }
 
-export const IconSelector = ({
-  onChange,
-  allowAppNamePropagation,
-  form,
-}: IconSelectorProps) => {
+export const IconSelector = ({ onChange, allowAppNamePropagation, form }: IconSelectorProps) => {
   const { data, isLoading } = useRepositoryIconsQuery<WalkxcodeRepositoryIcon>({
     url: 'https://api.github.com/repos/walkxcode/Dashboard-Icons/contents/png',
     converter: (item) => ({

src/components/Dashboard/Modals/EditAppModal/Tabs/BehaviourTab/BehaviourTab.tsx

@@ -1,6 +1,5 @@
-import { Tabs, TextInput, Switch, Text } from '@mantine/core';
+import { Tabs, Switch } from '@mantine/core';
 import { UseFormReturnType } from '@mantine/form';
-import { IconClick } from '@tabler/icons';
 import { useTranslation } from 'next-i18next';
 import { AppType } from '../../../../../../types/app';
 
@@ -9,21 +8,13 @@ interface BehaviourTabProps {
 }
 
 export const BehaviourTab = ({ form }: BehaviourTabProps) => {
-  const { t } = useTranslation('');
+  const { t } = useTranslation('layout/modals/add-app');
+
   return (
     <Tabs.Panel value="behaviour" pt="xs">
-      <TextInput
-        icon={<IconClick size={16} />}
-        label="On click url"
-        description="Overrides the app URL when clicking on the app"
-        placeholder="URL that should be opened instead when clicking on the app"
-        variant="default"
-        mb="md"
-        {...form.getInputProps('behaviour.onClickUrl')}
-      />
-
       <Switch
-        label="Open in new tab"
+        label={t('behaviour.isOpeningNewTab.label')}
+        description={t('behaviour.isOpeningNewTab.description')}
         {...form.getInputProps('behaviour.isOpeningNewTab', { type: 'checkbox' })}
       />
     </Tabs.Panel>

src/components/Dashboard/Modals/EditAppModal/Tabs/GeneralTab/GeneralTab.tsx

@@ -1,6 +1,6 @@
-import { Tabs, Text, TextInput } from '@mantine/core';
+import { Tabs, TextInput } from '@mantine/core';
 import { UseFormReturnType } from '@mantine/form';
-import { IconCursorText, IconLink } from '@tabler/icons';
+import { IconClick, IconCursorText, IconLink } from '@tabler/icons';
 import { useTranslation } from 'next-i18next';
 import { AppType } from '../../../../../../types/app';
 import { EditAppModalTab } from '../type';
@@ -11,43 +11,42 @@ interface GeneralTabProps {
 }
 
 export const GeneralTab = ({ form, openTab }: GeneralTabProps) => {
-  const { t } = useTranslation('');
+  const { t } = useTranslation('layout/modals/add-app');
   return (
-    <Tabs.Panel value="general" pt="lg">
+    <Tabs.Panel value="general" pt="sm">
       <TextInput
         icon={<IconCursorText size={16} />}
-        label="App name"
-        description="Used for displaying the app on the dashboard"
+        label={t('general.appname.label')}
+        description={t('general.appname.description')}
         placeholder="My example app"
         variant="default"
         mb="md"
         withAsterisk
+        required
         {...form.getInputProps('name')}
       />
       <TextInput
         icon={<IconLink size={16} />}
-        label="App url"
-        description={
-          <Text>
-            URL that will be opened when clicking on the app. Can be overwritten using
-            <Text
-              onClick={() => openTab('behaviour')}
-              variant="link"
-              span
-              style={{
-                cursor: 'pointer',
-              }}
-            >
-              {' '}
-              on click URL{' '}
-            </Text>
-            when using external URLs to enhance security.
-          </Text>
-        }
+        label={t('general.internalAddress.label')}
+        description={t('general.internalAddress.description')}
         placeholder="https://google.com"
         variant="default"
         withAsterisk
+        required
         {...form.getInputProps('url')}
+        onChange={(e) => {
+          form.setFieldValue('behaviour.onClickUrl', e.target.value);
+          form.setFieldValue('url', e.target.value);
+        }}
+      />
+      <TextInput
+        icon={<IconClick size={16} />}
+        label={t('general.externalAddress.label')}
+        description={t('general.externalAddress.description')}
+        placeholder="https://homarr.mywebsite.com/"
+        variant="default"
+        mb="md"
+        {...form.getInputProps('behaviour.onClickUrl')}
       />
     </Tabs.Panel>
   );

src/components/Dashboard/Modals/EditAppModal/Tabs/IntegrationTab/Components/InputElements/GenericSecretInput.tsx

@@ -11,6 +11,7 @@ import {
   Title,
 } from '@mantine/core';
 import { TablerIcon } from '@tabler/icons';
+import { useTranslation } from 'next-i18next';
 import { useState } from 'react';
 
 interface GenericSecretInputProps {
@@ -32,6 +33,7 @@ export const GenericSecretInput = ({
   const Icon = setIcon;
 
   const [displayUpdateField, setDisplayUpdateField] = useState<boolean>(false);
+  const { t } = useTranslation(['layout/modals/add-app', 'common']);
 
   return (
     <Card withBorder>
@@ -43,7 +45,7 @@ export const GenericSecretInput = ({
             </ThemeIcon>
             <Stack spacing={0}>
               <Title className={classes.subtitle} order={6}>
-                {label}
+                {t(label)}
               </Title>
             </Stack>
           </Group>
@@ -51,13 +53,13 @@ export const GenericSecretInput = ({
         <Grid.Col xs={12} md={6}>
           <Flex gap={10} justify="end" align="end">
             <Button variant="subtle" color="gray" px="xl">
-              Clear Secret
+              {t('integration.secrets.clear')}
             </Button>
             {displayUpdateField === true ? (
               <PasswordInput placeholder="new secret" width={200} {...props} />
             ) : (
               <Button onClick={() => setDisplayUpdateField(true)} variant="light">
-                Set Secret
+                {t('integration.secrets.update')}
               </Button>
             )}
           </Flex>

src/components/Dashboard/Modals/EditAppModal/Tabs/IntegrationTab/Components/InputElements/IntegrationSelector.tsx

@@ -17,7 +17,7 @@ interface IntegrationSelectorProps {
 }
 
 export const IntegrationSelector = ({ form }: IntegrationSelectorProps) => {
-  const { t } = useTranslation('');
+  const { t } = useTranslation('layout/modals/add-app');
 
   // TODO: read this out from integrations dynamically.
   const data: SelectItem[] = [
@@ -76,9 +76,9 @@ export const IntegrationSelector = ({ form }: IntegrationSelectorProps) => {
 
   return (
     <Select
-      label="Integration configuration"
-      description="Treats this app as the selected integration and provides you with per-app configuration"
-      placeholder="Select your desired configuration"
+      label={t('integration.type.label')}
+      description={t('integration.type.description')}
+      placeholder={t('integration.type.placeholder')}
       itemComponent={SelectItemComponent}
       data={data}
       maxDropdownHeight={400}

src/components/Dashboard/Modals/EditAppModal/Tabs/IntegrationTab/Components/IntegrationOptionsRenderer/IntegrationOptionsRenderer.tsx

@@ -31,9 +31,9 @@ export const IntegrationOptionsRenderer = ({ form }: IntegrationOptionsRendererP
         let indexInFormValue =
           form.values.integration?.properties.findIndex((p) => p.field === property) ?? -1;
         if (indexInFormValue === -1) {
-          const type = Object.entries(integrationFieldDefinitions).find(
+          const { type } = Object.entries(integrationFieldDefinitions).find(
             ([k, v]) => k === property
-          )![1].type;
+          )![1];
           const newProperty: AppIntegrationPropertyType = {
             type,
             field: property as IntegrationField,

src/components/Dashboard/Modals/EditAppModal/Tabs/IntegrationTab/IntegrationTab.tsx

@@ -1,7 +1,7 @@
 import { Alert, Divider, Tabs, Text } from '@mantine/core';
 import { UseFormReturnType } from '@mantine/form';
 import { IconAlertTriangle } from '@tabler/icons';
-import { useTranslation } from 'next-i18next';
+import { Trans, useTranslation } from 'next-i18next';
 import { AppType } from '../../../../../../types/app';
 import { IntegrationSelector } from './Components/InputElements/IntegrationSelector';
 import { IntegrationOptionsRenderer } from './Components/IntegrationOptionsRenderer/IntegrationOptionsRenderer';
@@ -11,7 +11,7 @@ interface IntegrationTabProps {
 }
 
 export const IntegrationTab = ({ form }: IntegrationTabProps) => {
-  const { t } = useTranslation('');
+  const { t } = useTranslation('layout/modals/add-app');
   const hasIntegrationSelected = form.values.integration?.type;
 
   return (
@@ -20,18 +20,14 @@ export const IntegrationTab = ({ form }: IntegrationTabProps) => {
 
       {hasIntegrationSelected && (
         <>
-          <Divider label="Integration Configuration" labelPosition="center" mt="xl" mb="md" />
+          <Divider label={t('integration.type.label')} labelPosition="center" mt="xl" mb="md" />
           <Text size="sm" color="dimmed" mb="lg">
-            To update a secret, enter a value and click the save button. To remove a secret, use the
-            clear button.
+            {t('integration.secrets.description')}
           </Text>
           <IntegrationOptionsRenderer form={form} />
           <Alert icon={<IconAlertTriangle />} color="yellow">
             <Text>
-              Please note that Homarr removes secrets from the configuration for security reasons.
-              Thus, you can only either define or unset any credentials. Your credentials act as the
-              main access for your integrations and you should <b>never</b> share them with anybody
-              else. Make sure to <b>store and manage your secrets safely</b>.
+              <Trans i18nKey="integration.secrets.warning" />
             </Text>
           </Alert>
         </>

src/components/Dashboard/Modals/EditAppModal/Tabs/NetworkTab/NetworkTab.tsx

@@ -9,12 +9,12 @@ interface NetworkTabProps {
 }
 
 export const NetworkTab = ({ form }: NetworkTabProps) => {
-  const { t } = useTranslation('');
+  const { t } = useTranslation('layout/modals/add-app');
   return (
     <Tabs.Panel value="network" pt="lg">
       <Switch
-        label="Enable status checker"
-        description="Sends a simple HTTP / HTTPS request to check if your app is online"
+        label={t('network.statusChecker.label')}
+        description={t('network.statusChecker.description')}
         mb="md"
         defaultChecked={form.values.network.enabledStatusChecker}
         {...form.getInputProps('network.enabledStatusChecker')}
@@ -22,8 +22,8 @@ export const NetworkTab = ({ form }: NetworkTabProps) => {
       {form.values.network.enabledStatusChecker && (
         <MultiSelect
           required
-          label="HTTP status codes"
-          description="Determines what response codes are allowed for this app to be 'Online'"
+          label={t('network.statusCodes.label')}
+          description={t('network.statusCodes.description')}
           data={StatusCodes}
           clearable
           searchable

src/components/Dashboard/Modals/EditAppModal/Tabs/type.ts

@@ -1,6 +1 @@
-export type EditAppModalTab =
-  | 'general'
-  | 'behaviour'
-  | 'network'
-  | 'appereance'
-  | 'integration';
+export type EditAppModalTab = 'general' | 'behaviour' | 'network' | 'appereance' | 'integration';

src/components/Dashboard/Modals/SelectElement/Components/WidgetsTab/WidgetElementType.tsx

@@ -21,9 +21,7 @@ export const WidgetElementType = ({ id, image, disabled, widget }: WidgetElement
 
   if (!configName) return null;
 
-  const getLowestWrapper = () => {
-    return config?.wrappers.sort((a, b) => a.position - b.position)[0];
-  };
+  const getLowestWrapper = () => config?.wrappers.sort((a, b) => a.position - b.position)[0];
 
   const handleAddition = async () => {
     updateConfig(