From ea78eb0e5230dd3e2360276cd528be445222cb1d Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Tue, 28 Mar 2023 21:10:25 +0300 Subject: [PATCH 1/6] Update style.js --- web/src/components/About/style.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/components/About/style.js b/web/src/components/About/style.js index 903bad6..ab52aff 100644 --- a/web/src/components/About/style.js +++ b/web/src/components/About/style.js @@ -20,7 +20,7 @@ export const HeaderSection = styled.section` } @media (max-width: 930px) { - font-size: 24px; + font-size: 22px; padding: 10px 20px; img { From f817d98b2c743ed1aeb7af3d0bbbff357a6eb6aa Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Tue, 28 Mar 2023 21:59:28 +0300 Subject: [PATCH 2/6] use switch for Pro-mode --- web/src/components/Settings/SettingsDialog.jsx | 5 +++-- web/src/style/materialUISetup.js | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/web/src/components/Settings/SettingsDialog.jsx b/web/src/components/Settings/SettingsDialog.jsx index 9190bad..3a27078 100644 --- a/web/src/components/Settings/SettingsDialog.jsx +++ b/web/src/components/Settings/SettingsDialog.jsx @@ -1,6 +1,6 @@ import axios from 'axios' import Button from '@material-ui/core/Button' -import Checkbox from '@material-ui/core/Checkbox' +import Switch from '@material-ui/core/Switch' import { FormControlLabel, useMediaQuery, useTheme } from '@material-ui/core' import { settingsHost } from 'utils/Hosts' import { useEffect, useState } from 'react' @@ -94,7 +94,7 @@ export default function SettingsDialog({ handleClose }) {
{t('SettingsDialog.Settings')}
{ setIsProMode(checked) @@ -105,6 +105,7 @@ export default function SettingsDialog({ handleClose }) { /> } label={t('SettingsDialog.ProMode')} + labelPlacement='start' /> diff --git a/web/src/style/materialUISetup.js b/web/src/style/materialUISetup.js index 6b1642d..8098d6c 100644 --- a/web/src/style/materialUISetup.js +++ b/web/src/style/materialUISetup.js @@ -53,6 +53,11 @@ export const useMaterialUITheme = () => { secondary: { main: mainColors[theme].secondary }, }, overrides: { + MuiTypography: { + h6: { + fontSize: '1.2rem', + }, + }, MuiInputBase: { input: { color: mainColors[theme].labels, From 6e57e9e4b425a4c9b9d602cadc4e9289a2d54196 Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Tue, 28 Mar 2023 23:07:02 +0300 Subject: [PATCH 3/6] add server settings hints --- .../components/Settings/MobileAppSettings.jsx | 16 +-- .../Settings/SecondarySettingsComponent.jsx | 102 +++++++++++------- web/src/locales/en/translation.json | 10 +- web/src/locales/ru/translation.json | 10 +- web/src/locales/ua/translation.json | 10 +- web/src/style/materialUISetup.js | 2 +- 6 files changed, 98 insertions(+), 52 deletions(-) diff --git a/web/src/components/Settings/MobileAppSettings.jsx b/web/src/components/Settings/MobileAppSettings.jsx index 80a036e..0c75a52 100644 --- a/web/src/components/Settings/MobileAppSettings.jsx +++ b/web/src/components/Settings/MobileAppSettings.jsx @@ -1,4 +1,4 @@ -import { FormControlLabel, Switch } from '@material-ui/core' +import { FormControlLabel, FormGroup, FormHelperText, Switch } from '@material-ui/core' import { useTranslation } from 'react-i18next' import { SecondarySettingsContent, SettingSectionLabel } from './style' @@ -9,12 +9,14 @@ export default function MobileAppSettings({ isVlcUsed, setIsVlcUsed }) { return ( {t('SettingsDialog.MobileAppSettings')} - - setIsVlcUsed(prev => !prev)} color='secondary' />} - label={t('SettingsDialog.UseVLC')} - labelPlacement='start' - /> + + setIsVlcUsed(prev => !prev)} color='secondary' />} + label={t('SettingsDialog.UseVLC')} + labelPlacement='start' + /> + {t('SettingsDialog.UseVLCHint')} + ) } diff --git a/web/src/components/Settings/SecondarySettingsComponent.jsx b/web/src/components/Settings/SecondarySettingsComponent.jsx index c8e01fc..f4df837 100644 --- a/web/src/components/Settings/SecondarySettingsComponent.jsx +++ b/web/src/components/Settings/SecondarySettingsComponent.jsx @@ -39,32 +39,46 @@ export default function SecondarySettingsComponent({ settings, inputForm }) { return ( {t('SettingsDialog.AdditionalSettings')} - - } - label='IPv6' - labelPlacement='start' - /> - } - label='TCP (Transmission Control Protocol)' - labelPlacement='start' - /> - } - label='μTP (Micro Transport Protocol)' - labelPlacement='start' - /> - } - label='PEX (Peer Exchange)' - labelPlacement='start' - /> - } - label={t('SettingsDialog.ForceEncrypt')} - labelPlacement='start' - /> + + } + label='IPv6' + labelPlacement='start' + /> + {t('SettingsDialog.EnableIPv6Hint')} + + + } + label='TCP (Transmission Control Protocol)' + labelPlacement='start' + /> + {t('SettingsDialog.DisableTCPHint')} + + + } + label='μTP (Micro Transport Protocol)' + labelPlacement='start' + /> + {t('SettingsDialog.DisableUTPHint')} + + + } + label='PEX (Peer Exchange)' + labelPlacement='start' + /> + {t('SettingsDialog.DisablePEXHint')} + + + } + label={t('SettingsDialog.ForceEncrypt')} + labelPlacement='start' + /> + {t('SettingsDialog.ForceEncryptHint')} +
- } - label={t('SettingsDialog.DHT')} - labelPlacement='start' - /> + + } + label={t('SettingsDialog.DHT')} + labelPlacement='start' + /> + {t('SettingsDialog.DisableDHTHint')} + - } - label='UPnP (Universal Plug and Play)' - labelPlacement='start' - /> + + } + label='UPnP (Universal Plug and Play)' + labelPlacement='start' + /> + {t('SettingsDialog.DisableUPNPHint')} + } label={t('SettingsDialog.DLNA')} @@ -164,11 +184,6 @@ export default function SecondarySettingsComponent({ settings, inputForm }) { variant='outlined' fullWidth /> - } - label={t('SettingsDialog.EnableDebug')} - labelPlacement='start' - /> } @@ -177,6 +192,11 @@ export default function SecondarySettingsComponent({ settings, inputForm }) { /> {t('SettingsDialog.EnableRutorSearchHint')} + } + label={t('SettingsDialog.EnableDebug')} + labelPlacement='start' + />
{t('SettingsDialog.RetrackersMode')}