From 2e4f608a72a93e735f5afa39953c4c97b67562b3 Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Thu, 17 Jun 2021 08:03:11 +0300 Subject: [PATCH 01/15] use auto dark palette and About --- web/src/components/About.jsx | 78 ++++++++++++++-------- web/src/components/App/index.jsx | 25 +++++-- web/src/components/Donate/DonateDialog.jsx | 2 +- 3 files changed, 70 insertions(+), 35 deletions(-) diff --git a/web/src/components/About.jsx b/web/src/components/About.jsx index 58cae8a..9f579e6 100644 --- a/web/src/components/About.jsx +++ b/web/src/components/About.jsx @@ -9,11 +9,13 @@ import InfoIcon from '@material-ui/icons/Info' import ListItem from '@material-ui/core/ListItem' import ListItemIcon from '@material-ui/core/ListItemIcon' import ListItemText from '@material-ui/core/ListItemText' +import { createMuiTheme, ThemeProvider } from '@material-ui/core/styles' import { useTranslation } from 'react-i18next' import { echoHost } from 'utils/Hosts' export default function AboutDialog() { const { t } = useTranslation() + const darkTheme = createMuiTheme({ palette: { type: 'dark', primary: { main: '#00a572' } } }) const [open, setOpen] = useState(false) const [torrServerVersion, setTorrServerVersion] = useState('') useEffect(() => { @@ -29,39 +31,61 @@ export default function AboutDialog() { - setOpen(false)} aria-labelledby='form-dialog-title' fullWidth maxWidth='lg'> - {t('About')} + + setOpen(false)} + aria-labelledby='form-dialog-title' + fullWidth='true' + maxWidth='sm' + > + {t('About')} - -
-

TorrServer {torrServerVersion}

- https://github.com/YouROK/TorrServer -
-

{t('ThanksToEveryone')}

+

TorrServer {torrServerVersion}

+ + https://github.com/YouROK/TorrServer +
-
-

{t('SpecialThanks')}

- anacrolix Matt Joiner github.com/anacrolix -
- nikk github.com/tsynik -
- dancheskus github.com/dancheskus -
- tw1cker Руслан Пахнев github.com/Nemiroff -
- SpAwN_LMG -
+ +
+

{t('ThanksToEveryone')}

+
+
+

{t('SpecialThanks')}

+ anacrolix Matt Joiner + + github.com/anacrolix + +
+ nikk + + github.com/tsynik + +
+ dancheskus + + github.com/dancheskus + +
+ tw1cker Руслан Пахнев + + github.com/Nemiroff + +
+ SpAwN_LMG +
+ - - - - - + + + + + ) } diff --git a/web/src/components/App/index.jsx b/web/src/components/App/index.jsx index e212c60..f7d4bac 100644 --- a/web/src/components/App/index.jsx +++ b/web/src/components/App/index.jsx @@ -1,6 +1,7 @@ -import CssBaseline from '@material-ui/core/CssBaseline' +import useMediaQuery from '@material-ui/core/useMediaQuery' import { createMuiTheme, MuiThemeProvider } from '@material-ui/core' -import { useEffect, useState } from 'react' +import CssBaseline from '@material-ui/core/CssBaseline' +import { useEffect, useMemo, useState } from 'react' import Typography from '@material-ui/core/Typography' import IconButton from '@material-ui/core/IconButton' import { Menu as MenuIcon, Close as CloseIcon } from '@material-ui/icons' @@ -14,15 +15,25 @@ import DonateDialog from 'components/Donate/DonateDialog' import { AppWrapper, AppHeader } from './style' import Sidebar from './Sidebar' -const baseTheme = createMuiTheme({ - overrides: { MuiCssBaseline: { '@global': { html: { WebkitFontSmoothing: 'auto' } } } }, - palette: { primary: { main: '#00a572' }, secondary: { main: '#ffa724' }, tonalOffset: 0.2 }, -}) - export default function App() { + const prefersDarkMode = useMediaQuery('(prefers-color-scheme: dark)') const [isDrawerOpen, setIsDrawerOpen] = useState(false) const [isDonationDialogOpen, setIsDonationDialogOpen] = useState(false) const [torrServerVersion, setTorrServerVersion] = useState('') + // https://material-ui.com/ru/customization/palette/ + const baseTheme = useMemo( + () => + createMuiTheme({ + overrides: { MuiCssBaseline: { '@global': { html: { WebkitFontSmoothing: 'auto' } } } }, + palette: { + type: prefersDarkMode ? 'dark' : 'light', + primary: { main: '#00a572' }, + secondary: { main: '#ffa724' }, + tonalOffset: 0.2, + }, + }), + [prefersDarkMode], + ) useEffect(() => { axios.get(echoHost()).then(({ data }) => setTorrServerVersion(data)) diff --git a/web/src/components/Donate/DonateDialog.jsx b/web/src/components/Donate/DonateDialog.jsx index 4c5c98c..ccd2d28 100644 --- a/web/src/components/Donate/DonateDialog.jsx +++ b/web/src/components/Donate/DonateDialog.jsx @@ -15,7 +15,7 @@ export default function DonateDialog({ onClose }) { const { t } = useTranslation() return ( - + {t('Donate')} From a7cc82d8f48ad0f0b4f5623802d3764449747de6 Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Thu, 17 Jun 2021 08:36:45 +0300 Subject: [PATCH 02/15] Update About.jsx --- web/src/components/About.jsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/web/src/components/About.jsx b/web/src/components/About.jsx index 9f579e6..8f43eb0 100644 --- a/web/src/components/About.jsx +++ b/web/src/components/About.jsx @@ -15,7 +15,14 @@ import { echoHost } from 'utils/Hosts' export default function AboutDialog() { const { t } = useTranslation() - const darkTheme = createMuiTheme({ palette: { type: 'dark', primary: { main: '#00a572' } } }) + // https://material-ui.com/ru/customization/default-theme/ + const darkTheme = createMuiTheme({ + palette: { + type: 'dark', + primary: { main: '#00a572' }, + background: { paper: '#575757' }, + }, + }) const [open, setOpen] = useState(false) const [torrServerVersion, setTorrServerVersion] = useState('') useEffect(() => { From 1c07216431846d13d46d80fc79f299fc43438933 Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Thu, 17 Jun 2021 10:59:57 +0300 Subject: [PATCH 03/15] Update About.jsx --- web/src/components/About.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/src/components/About.jsx b/web/src/components/About.jsx index 8f43eb0..a9db4c6 100644 --- a/web/src/components/About.jsx +++ b/web/src/components/About.jsx @@ -61,22 +61,22 @@ export default function AboutDialog() {

{t('SpecialThanks')}

- anacrolix Matt Joiner + anacrolix Matt Joiner  github.com/anacrolix
- nikk + nikk  github.com/tsynik
- dancheskus + dancheskus  github.com/dancheskus
- tw1cker Руслан Пахнев + tw1cker Руслан Пахнев  github.com/Nemiroff From 22d1f733f867060ebc96c16ab8073eab738b4553 Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Thu, 17 Jun 2021 14:41:45 +0300 Subject: [PATCH 04/15] update lang switch --- web/src/components/App/index.jsx | 2 +- web/src/components/App/style.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/web/src/components/App/index.jsx b/web/src/components/App/index.jsx index 1a605a1..6d0d64d 100644 --- a/web/src/components/App/index.jsx +++ b/web/src/components/App/index.jsx @@ -64,7 +64,7 @@ export default function App() {
(currentLang === 'en' ? changeLang('ru') : changeLang('en'))}> - {currentLang === 'en' ? 'RU' : 'EN'} + {currentLang === 'en' ? 'ru' : 'en'}
diff --git a/web/src/components/App/style.js b/web/src/components/App/style.js index b940905..7d94e80 100644 --- a/web/src/components/App/style.js +++ b/web/src/components/App/style.js @@ -76,7 +76,7 @@ export const LanguageSwitch = styled.div` font-weight: 500; display: grid; place-items: center; - color: #44795e; + color: #eee; :hover { background: #7ec9a3; @@ -85,6 +85,5 @@ export const LanguageSwitch = styled.div` @media (max-width: 700px) { height: 28px; width: 28px; - font-size: 12px; } ` From 545432678be718c03c1587672abdb8115ff27329 Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Thu, 17 Jun 2021 16:11:30 +0300 Subject: [PATCH 05/15] dark sidebar and dialogs --- web/src/components/About.jsx | 105 +++++++++++------------ web/src/components/Add/AddDialog.jsx | 120 ++++++++++++++------------- web/src/components/App/Sidebar.jsx | 1 - web/src/components/App/index.jsx | 28 +++++-- web/src/components/App/style.js | 5 +- 5 files changed, 135 insertions(+), 124 deletions(-) diff --git a/web/src/components/About.jsx b/web/src/components/About.jsx index a9db4c6..1bfe33e 100644 --- a/web/src/components/About.jsx +++ b/web/src/components/About.jsx @@ -9,20 +9,11 @@ import InfoIcon from '@material-ui/icons/Info' import ListItem from '@material-ui/core/ListItem' import ListItemIcon from '@material-ui/core/ListItemIcon' import ListItemText from '@material-ui/core/ListItemText' -import { createMuiTheme, ThemeProvider } from '@material-ui/core/styles' import { useTranslation } from 'react-i18next' import { echoHost } from 'utils/Hosts' export default function AboutDialog() { const { t } = useTranslation() - // https://material-ui.com/ru/customization/default-theme/ - const darkTheme = createMuiTheme({ - palette: { - type: 'dark', - primary: { main: '#00a572' }, - background: { paper: '#575757' }, - }, - }) const [open, setOpen] = useState(false) const [torrServerVersion, setTorrServerVersion] = useState('') useEffect(() => { @@ -38,61 +29,59 @@ export default function AboutDialog() { - - setOpen(false)} - aria-labelledby='form-dialog-title' - fullWidth='true' - maxWidth='sm' - > - {t('About')} + setOpen(false)} + aria-labelledby='form-dialog-title' + fullWidth='true' + maxWidth='sm' + > + {t('About')} + +
+

TorrServer {torrServerVersion}

+ + https://github.com/YouROK/TorrServer + +
-

TorrServer {torrServerVersion}

- - https://github.com/YouROK/TorrServer - +

{t('ThanksToEveryone')}

- -
-

{t('ThanksToEveryone')}

-
-
-

{t('SpecialThanks')}

- anacrolix Matt Joiner  - - github.com/anacrolix - -
- nikk  - - github.com/tsynik - -
- dancheskus  - - github.com/dancheskus - -
- tw1cker Руслан Пахнев  - - github.com/Nemiroff - -
- SpAwN_LMG -
- +
+

{t('SpecialThanks')}

+ anacrolix Matt Joiner  + + github.com/anacrolix + +
+ nikk  + + github.com/tsynik + +
+ dancheskus  + + github.com/dancheskus + +
+ tw1cker Руслан Пахнев  + + github.com/Nemiroff + +
+ SpAwN_LMG +
+ - - - - - + + + + ) } diff --git a/web/src/components/Add/AddDialog.jsx b/web/src/components/Add/AddDialog.jsx index 9aac84d..2e0c460 100644 --- a/web/src/components/Add/AddDialog.jsx +++ b/web/src/components/Add/AddDialog.jsx @@ -12,6 +12,8 @@ import usePreviousState from 'utils/usePreviousState' import { useQuery } from 'react-query' import { getTorrents } from 'utils/Utils' import parseTorrent from 'parse-torrent' +import { ThemeProvider } from '@material-ui/core/styles' +import { lightTheme } from 'components/App' import { checkImageURL, getMoviePosters, chechTorrentSource, parseTorrentTitle } from './helpers' import { ButtonWrapper, Content, Header } from './style' @@ -207,69 +209,71 @@ export default function AddDialog({ } return ( - -
{t(isEditMode ? 'EditTorrent' : 'AddNewTorrent')}
+ + +
{t(isEditMode ? 'EditTorrent' : 'AddNewTorrent')}
- - {!isEditMode && ( - + {!isEditMode && ( + + )} + + - )} + - - + + - - - - - - + + + + ) } diff --git a/web/src/components/App/Sidebar.jsx b/web/src/components/App/Sidebar.jsx index e25b5ea..1c76c86 100644 --- a/web/src/components/App/Sidebar.jsx +++ b/web/src/components/App/Sidebar.jsx @@ -27,7 +27,6 @@ export default function Sidebar({ isDrawerOpen, setIsDonationDialogOpen }) { - diff --git a/web/src/components/App/index.jsx b/web/src/components/App/index.jsx index 6d0d64d..21d8c69 100644 --- a/web/src/components/App/index.jsx +++ b/web/src/components/App/index.jsx @@ -12,10 +12,27 @@ import TorrentList from 'components/TorrentList' import DonateSnackbar from 'components/Donate' import DonateDialog from 'components/Donate/DonateDialog' import useChangeLanguage from 'utils/useChangeLanguage' +import { ThemeProvider } from '@material-ui/core/styles' import { AppWrapper, AppHeader, LanguageSwitch } from './style' import Sidebar from './Sidebar' +// https://material-ui.com/ru/customization/default-theme/ +export const darkTheme = createMuiTheme({ + palette: { + type: 'dark', + primary: { main: '#00a572' }, + background: { paper: '#575757' }, + }, +}) +export const lightTheme = createMuiTheme({ + palette: { + type: 'light', + primary: { main: '#00a572' }, + background: { paper: '#cbe8d9' }, + }, +}) + export default function App() { const prefersDarkMode = useMediaQuery('(prefers-color-scheme: dark)') const [isDrawerOpen, setIsDrawerOpen] = useState(false) @@ -68,12 +85,13 @@ export default function App() { - - - + + + - - {isDonationDialogOpen && setIsDonationDialogOpen(false)} />} + + {isDonationDialogOpen && setIsDonationDialogOpen(false)} />} + {!JSON.parse(localStorage.getItem('snackbarIsClosed')) && } diff --git a/web/src/components/App/style.js b/web/src/components/App/style.js index 7d94e80..420ce83 100644 --- a/web/src/components/App/style.js +++ b/web/src/components/App/style.js @@ -19,7 +19,7 @@ export const CenteredGrid = styled.div` export const AppHeader = styled.div` background: #00a572; - color: rgba(0, 0, 0, 0.87); + color: #1a1a1a; grid-area: head; display: grid; grid-auto-flow: column; @@ -37,7 +37,8 @@ export const AppSidebarStyle = styled.div` overflow-x: hidden; transition: width 195ms cubic-bezier(0.4, 0, 0.6, 1) 0ms; border-right: 1px solid rgba(0, 0, 0, 0.12); - background: #eee; + background: #575757; + color: #eee; white-space: nowrap; `} ` From e61b946b115f2dc868abcbd84499b9e474d7bb43 Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Thu, 17 Jun 2021 16:27:20 +0300 Subject: [PATCH 06/15] use font in themes --- web/src/components/App/index.jsx | 2 ++ web/src/components/App/style.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/web/src/components/App/index.jsx b/web/src/components/App/index.jsx index a80aa96..665b0e3 100644 --- a/web/src/components/App/index.jsx +++ b/web/src/components/App/index.jsx @@ -24,6 +24,7 @@ export const darkTheme = createMuiTheme({ primary: { main: '#00a572' }, background: { paper: '#575757' }, }, + typography: { fontFamily: 'Open Sans, sans-serif' }, }) export const lightTheme = createMuiTheme({ palette: { @@ -31,6 +32,7 @@ export const lightTheme = createMuiTheme({ primary: { main: '#00a572' }, background: { paper: '#cbe8d9' }, }, + typography: { fontFamily: 'Open Sans, sans-serif' }, }) export default function App() { diff --git a/web/src/components/App/style.js b/web/src/components/App/style.js index ac1e845..71e9e8a 100644 --- a/web/src/components/App/style.js +++ b/web/src/components/App/style.js @@ -19,7 +19,7 @@ export const CenteredGrid = styled.div` export const AppHeader = styled.div` background: #00a572; - color: #1a1a1a; + color: #eee; grid-area: head; display: grid; grid-auto-flow: column; From f62d8cc709144e8bcb068685e3b9cd92141713a8 Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Thu, 17 Jun 2021 17:48:51 +0300 Subject: [PATCH 07/15] fix bools --- web/src/components/About.jsx | 2 +- web/src/components/Donate/DonateDialog.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/src/components/About.jsx b/web/src/components/About.jsx index 1bfe33e..64afa40 100644 --- a/web/src/components/About.jsx +++ b/web/src/components/About.jsx @@ -33,7 +33,7 @@ export default function AboutDialog() { open={open} onClose={() => setOpen(false)} aria-labelledby='form-dialog-title' - fullWidth='true' + fullWidth maxWidth='sm' > {t('About')} diff --git a/web/src/components/Donate/DonateDialog.jsx b/web/src/components/Donate/DonateDialog.jsx index ccd2d28..d3902f5 100644 --- a/web/src/components/Donate/DonateDialog.jsx +++ b/web/src/components/Donate/DonateDialog.jsx @@ -15,7 +15,7 @@ export default function DonateDialog({ onClose }) { const { t } = useTranslation() return ( - + {t('Donate')} From 5f543b4738782a9d4589c7879ddacf436968120f Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Thu, 17 Jun 2021 20:29:21 +0300 Subject: [PATCH 08/15] use dark bar with light dialogs --- web/src/components/About.jsx | 92 ++++--- web/src/components/Add/AddDialog.jsx | 6 +- web/src/components/App/index.jsx | 4 +- web/src/components/CloseServer.jsx | 42 +-- web/src/components/RemoveAll.jsx | 42 +-- web/src/components/Settings.jsx | 374 ++++++++++++++------------- 6 files changed, 287 insertions(+), 273 deletions(-) diff --git a/web/src/components/About.jsx b/web/src/components/About.jsx index 64afa40..2b6b0aa 100644 --- a/web/src/components/About.jsx +++ b/web/src/components/About.jsx @@ -11,6 +11,8 @@ import ListItemIcon from '@material-ui/core/ListItemIcon' import ListItemText from '@material-ui/core/ListItemText' import { useTranslation } from 'react-i18next' import { echoHost } from 'utils/Hosts' +import { ThemeProvider } from '@material-ui/core/styles' +import { lightTheme } from 'components/App' export default function AboutDialog() { const { t } = useTranslation() @@ -29,59 +31,55 @@ export default function AboutDialog() { - setOpen(false)} - aria-labelledby='form-dialog-title' - fullWidth - maxWidth='sm' - > - {t('About')} + + setOpen(false)} aria-labelledby='form-dialog-title' fullWidth maxWidth='sm'> + {t('About')} - -
-

TorrServer {torrServerVersion}

- - https://github.com/YouROK/TorrServer - -
-

{t('ThanksToEveryone')}

+

TorrServer {torrServerVersion}

+ + https://github.com/YouROK/TorrServer +
-
-

{t('SpecialThanks')}

- anacrolix Matt Joiner  - - github.com/anacrolix - -
- nikk  - - github.com/tsynik - -
- dancheskus  - - github.com/dancheskus - -
- tw1cker Руслан Пахнев  - - github.com/Nemiroff - -
- SpAwN_LMG -
+ +
+

{t('ThanksToEveryone')}

+
+
+

{t('SpecialThanks')}

+ anacrolix Matt Joiner  + + github.com/anacrolix + +
+ nikk  + + github.com/tsynik + +
+ dancheskus  + + github.com/dancheskus + +
+ tw1cker Руслан Пахнев  + + github.com/Nemiroff + +
+ SpAwN_LMG +
+ - - - - - + + + + + ) } diff --git a/web/src/components/Add/AddDialog.jsx b/web/src/components/Add/AddDialog.jsx index 2e0c460..71d0e96 100644 --- a/web/src/components/Add/AddDialog.jsx +++ b/web/src/components/Add/AddDialog.jsx @@ -270,7 +270,11 @@ export default function AddDialog({ onClick={handleSave} color='primary' > - {isLoadingButton ? : t(isEditMode ? 'Save' : 'Add')} + {isLoadingButton ? ( + + ) : ( + t(isEditMode ? 'Save' : 'Add' ) + )} diff --git a/web/src/components/App/index.jsx b/web/src/components/App/index.jsx index 665b0e3..a4fdb1a 100644 --- a/web/src/components/App/index.jsx +++ b/web/src/components/App/index.jsx @@ -30,7 +30,7 @@ export const lightTheme = createMuiTheme({ palette: { type: 'light', primary: { main: '#00a572' }, - background: { paper: '#cbe8d9' }, + background: { paper: '#f1f1f1' }, }, typography: { fontFamily: 'Open Sans, sans-serif' }, }) @@ -92,7 +92,7 @@ export default function App() { - + {isDonationDialogOpen && setIsDonationDialogOpen(false)} />} {!JSON.parse(localStorage.getItem('snackbarIsClosed')) && } diff --git a/web/src/components/CloseServer.jsx b/web/src/components/CloseServer.jsx index 004f29a..eefa178 100644 --- a/web/src/components/CloseServer.jsx +++ b/web/src/components/CloseServer.jsx @@ -3,6 +3,8 @@ import { Button, Dialog, DialogActions, DialogTitle, ListItem, ListItemIcon, Lis import { PowerSettingsNew as PowerSettingsNewIcon } from '@material-ui/icons' import { shutdownHost } from 'utils/Hosts' import { useTranslation } from 'react-i18next' +import { ThemeProvider } from '@material-ui/core/styles' +import { lightTheme } from 'components/App' export default function CloseServer() { const { t } = useTranslation() @@ -20,26 +22,28 @@ export default function CloseServer() { - - {t('CloseServer?')} - - + + + {t('CloseServer?')} + + - - - + + + + ) } diff --git a/web/src/components/RemoveAll.jsx b/web/src/components/RemoveAll.jsx index be9c719..f9b90d5 100644 --- a/web/src/components/RemoveAll.jsx +++ b/web/src/components/RemoveAll.jsx @@ -6,6 +6,8 @@ import DeleteIcon from '@material-ui/icons/Delete' import { useState } from 'react' import { torrentsHost } from 'utils/Hosts' import { useTranslation } from 'react-i18next' +import { ThemeProvider } from '@material-ui/core/styles' +import { lightTheme } from 'components/App' const fnRemoveAll = () => { fetch(torrentsHost(), { @@ -46,26 +48,28 @@ export default function RemoveAll() { - - {t('DeleteTorrents?')} - - + + + {t('DeleteTorrents?')} + + - - - + + + + ) } diff --git a/web/src/components/Settings.jsx b/web/src/components/Settings.jsx index 3e5cb5c..d84a0aa 100644 --- a/web/src/components/Settings.jsx +++ b/web/src/components/Settings.jsx @@ -13,6 +13,8 @@ import Button from '@material-ui/core/Button' import { FormControlLabel, InputLabel, Select, Switch } from '@material-ui/core' import { settingsHost, setTorrServerHost, getTorrServerHost } from 'utils/Hosts' import { useTranslation } from 'react-i18next' +import { ThemeProvider } from '@material-ui/core/styles' +import { lightTheme } from 'components/App' export default function SettingsDialog() { const { t } = useTranslation() @@ -100,193 +102,195 @@ export default function SettingsDialog() { - - {t('Settings')} - - - {show && ( - <> - -
- -
- } - label={t('PreloadBuffer')} - /> -
- } - label={t('UseDisk')} - /> -
- {t('UseDiskDesc')} -
- - } - label={t('RemoveCacheOnDrop')} - /> -
- {t('RemoveCacheOnDropDesc')} -
- -
- } - label={t('EnableIPv6')} - /> -
- } - label={t('TCP')} - /> -
- } - label={t('UTP')} - /> -
- } - label={t('PEX')} - /> -
- } - label={t('ForceEncrypt')} - /> -
- -
- -
- } - label={t('DHT')} - /> -
- -
- -
- } - label={t('Upload')} - /> -
- -
- -
- } - label={t('UPNP')} - /> -
- {t('RetrackersMode')} - -
- - )} - + + + {t('Settings')} + + + {show && ( + <> + +
+ +
+ } + label={t('PreloadBuffer')} + /> +
+ } + label={t('UseDisk')} + /> +
+ {t('UseDiskDesc')} +
+ + } + label={t('RemoveCacheOnDrop')} + /> +
+ {t('RemoveCacheOnDropDesc')} +
+ +
+ } + label={t('EnableIPv6')} + /> +
+ } + label={t('TCP')} + /> +
+ } + label={t('UTP')} + /> +
+ } + label={t('PEX')} + /> +
+ } + label={t('ForceEncrypt')} + /> +
+ +
+ +
+ } + label={t('DHT')} + /> +
+ +
+ +
+ } + label={t('Upload')} + /> +
+ +
+ +
+ } + label={t('UPNP')} + /> +
+ {t('RetrackersMode')} + +
+ + )} + - - + + - - - + + + + ) } From 3ec9b58ebc4f67ad7ae633a5d20f7bb192bdbeec Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Thu, 17 Jun 2021 22:18:48 +0300 Subject: [PATCH 09/15] fix merge errors --- web/src/components/Add/AddDialog.jsx | 2 +- web/src/components/App/Sidebar.jsx | 9 +-------- web/src/components/App/index.jsx | 11 ++++++++--- web/src/components/App/style.js | 1 + 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/web/src/components/Add/AddDialog.jsx b/web/src/components/Add/AddDialog.jsx index 6ebed6e..ea516bb 100644 --- a/web/src/components/Add/AddDialog.jsx +++ b/web/src/components/Add/AddDialog.jsx @@ -270,7 +270,7 @@ export default function AddDialog({ {isLoadingButton ? ( ) : ( - t(isEditMode ? 'Save' : 'Add' ) + t(isEditMode ? 'Save' : 'Add') )} diff --git a/web/src/components/App/Sidebar.jsx b/web/src/components/App/Sidebar.jsx index 949a0c5..3ba02c3 100644 --- a/web/src/components/App/Sidebar.jsx +++ b/web/src/components/App/Sidebar.jsx @@ -21,28 +21,21 @@ const Sidebar = ({ isDrawerOpen, setIsDonationDialogOpen, isOffline, isLoading } - - - - - - - - setIsDonationDialogOpen(true)}> + ) diff --git a/web/src/components/App/index.jsx b/web/src/components/App/index.jsx index f62489f..2d9c0bf 100644 --- a/web/src/components/App/index.jsx +++ b/web/src/components/App/index.jsx @@ -93,14 +93,19 @@ export default function App() {
(currentLang === 'en' ? changeLang('ru') : changeLang('en'))}> - {currentLang === 'en' ? 'ru' : 'en'} + {currentLang === 'en' ? 'RU' : 'EN'}
- + - + {isDonationDialogOpen && setIsDonationDialogOpen(false)} />} diff --git a/web/src/components/App/style.js b/web/src/components/App/style.js index 71e9e8a..f01e6f6 100644 --- a/web/src/components/App/style.js +++ b/web/src/components/App/style.js @@ -86,5 +86,6 @@ export const LanguageSwitch = styled.div` @media (max-width: 700px) { height: 28px; width: 28px; + font-size: 12px; } ` From 73a96e2b250f1b934647eb4c59ec9158cce9292b Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Thu, 17 Jun 2021 22:19:06 +0300 Subject: [PATCH 10/15] fix build --- build-all.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/build-all.sh b/build-all.sh index 55ce596..d27e829 100755 --- a/build-all.sh +++ b/build-all.sh @@ -56,7 +56,6 @@ for PLATFORM in "${PLATFORMS[@]}"; do set_goarm "$GOARCH" BIN_FILENAME="${OUTPUT}-${GOOS}-${GOARCH}${GOARM}" if [[ "${GOOS}" == "windows" ]]; then BIN_FILENAME="${BIN_FILENAME}.exe"; fi - CMD="GOOS=${GOOS} GOARCH=${GOARCH} ${GO_ARM} CGO_ENABLED=1 ${GOBIN} build ${BUILD_FLAGS} -o ${BIN_FILENAME} ./cmd" echo "${CMD}" eval "$CMD" || FAILURES="${FAILURES} ${GOOS}/${GOARCH}${GOARM}" done From 7fe945a1f0c1a4c90ae671c73fec528d1e0bcd51 Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Thu, 17 Jun 2021 22:26:10 +0300 Subject: [PATCH 11/15] fix build --- build-all.sh | 1 + web/src/components/App/style.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build-all.sh b/build-all.sh index d27e829..15ce480 100755 --- a/build-all.sh +++ b/build-all.sh @@ -56,6 +56,7 @@ for PLATFORM in "${PLATFORMS[@]}"; do set_goarm "$GOARCH" BIN_FILENAME="${OUTPUT}-${GOOS}-${GOARCH}${GOARM}" if [[ "${GOOS}" == "windows" ]]; then BIN_FILENAME="${BIN_FILENAME}.exe"; fi + CMD="GOOS=${GOOS} GOARCH=${GOARCH} ${GO_ARM} ${GOBIN} build ${BUILD_FLAGS} -o ${BIN_FILENAME} ./cmd" echo "${CMD}" eval "$CMD" || FAILURES="${FAILURES} ${GOOS}/${GOARCH}${GOARM}" done diff --git a/web/src/components/App/style.js b/web/src/components/App/style.js index f01e6f6..884a860 100644 --- a/web/src/components/App/style.js +++ b/web/src/components/App/style.js @@ -86,6 +86,6 @@ export const LanguageSwitch = styled.div` @media (max-width: 700px) { height: 28px; width: 28px; - font-size: 12px; + font-size: 6px; } ` From 3c85c70f37b256a148eaa936be5d873d2705ace2 Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Thu, 17 Jun 2021 22:37:13 +0300 Subject: [PATCH 12/15] Update style.js --- web/src/components/App/style.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/components/App/style.js b/web/src/components/App/style.js index 884a860..f01e6f6 100644 --- a/web/src/components/App/style.js +++ b/web/src/components/App/style.js @@ -86,6 +86,6 @@ export const LanguageSwitch = styled.div` @media (max-width: 700px) { height: 28px; width: 28px; - font-size: 6px; + font-size: 12px; } ` From 704e3671952d9a0537063adbdd7edfd3adf931a7 Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Thu, 17 Jun 2021 23:15:02 +0300 Subject: [PATCH 13/15] align icons --- web/src/components/App/Sidebar.jsx | 2 -- web/src/components/App/style.js | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/web/src/components/App/Sidebar.jsx b/web/src/components/App/Sidebar.jsx index 3ba02c3..36a17ec 100644 --- a/web/src/components/App/Sidebar.jsx +++ b/web/src/components/App/Sidebar.jsx @@ -26,8 +26,6 @@ const Sidebar = ({ isDrawerOpen, setIsDonationDialogOpen, isOffline, isLoading } - - setIsDonationDialogOpen(true)}> diff --git a/web/src/components/App/style.js b/web/src/components/App/style.js index f01e6f6..6e31860 100644 --- a/web/src/components/App/style.js +++ b/web/src/components/App/style.js @@ -19,14 +19,14 @@ export const CenteredGrid = styled.div` export const AppHeader = styled.div` background: #00a572; - color: #eee; + color: #fff; grid-area: head; display: grid; grid-auto-flow: column; align-items: center; grid-template-columns: repeat(2, max-content) 1fr; box-shadow: 0px 2px 4px -1px rgb(0 0 0 / 20%), 0px 4px 5px 0px rgb(0 0 0 / 14%), 0px 1px 10px 0px rgb(0 0 0 / 12%); - padding: 0 24px; + padding: 0 16px; z-index: 3; ` export const AppSidebarStyle = styled.div` @@ -77,7 +77,7 @@ export const LanguageSwitch = styled.div` font-weight: 600; display: grid; place-items: center; - color: #eee; + color: #fff; :hover { background: #7ec9a3; From 11d141c0b242f764ef5556f21c59c88dd5cbae49 Mon Sep 17 00:00:00 2001 From: Daniel Shleifman Date: Thu, 17 Jun 2021 23:54:18 +0300 Subject: [PATCH 14/15] html fix --- web/public/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/public/index.html b/web/public/index.html index 9b978ad..234e20a 100644 --- a/web/public/index.html +++ b/web/public/index.html @@ -21,8 +21,8 @@
- -