From 2fd7db9c18d28b1c99a90f9b90c620ce01a5163d Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Sun, 18 Jul 2021 13:25:41 +0300 Subject: [PATCH] fix web --- server/web/api/utils/link.go | 3 - server/web/pages/route.go | 1 - server/web/pages/template/pages/index.html | 2 +- server/web/pages/template/route.go | 124 ++++---- web/.env.development | 1 - web/.env_example | 2 +- web/src/App/Sidebar.jsx | 65 ---- web/src/App/index.jsx | 63 ---- web/src/App/style.js | 65 ---- web/src/components/About.jsx | 67 ---- .../TorrentCache/DefaultSnake.jsx | 125 -------- .../TorrentCache/LargeSnake.jsx | 58 ---- .../TorrentCache/SingleBlock.jsx | 55 ---- .../TorrentCache/colors.js | 26 -- .../DialogTorrentDetailsContent/widgets.jsx | 101 ------ web/src/components/Settings.jsx | 292 ------------------ web/src/components/TorrentList.jsx | 59 ---- web/src/components/Upload.jsx | 33 -- 18 files changed, 64 insertions(+), 1078 deletions(-) delete mode 100644 web/.env.development delete mode 100644 web/src/App/Sidebar.jsx delete mode 100644 web/src/App/index.jsx delete mode 100644 web/src/App/style.js delete mode 100644 web/src/components/About.jsx delete mode 100644 web/src/components/DialogTorrentDetailsContent/TorrentCache/DefaultSnake.jsx delete mode 100644 web/src/components/DialogTorrentDetailsContent/TorrentCache/LargeSnake.jsx delete mode 100644 web/src/components/DialogTorrentDetailsContent/TorrentCache/SingleBlock.jsx delete mode 100644 web/src/components/DialogTorrentDetailsContent/TorrentCache/colors.js delete mode 100644 web/src/components/DialogTorrentDetailsContent/widgets.jsx delete mode 100644 web/src/components/Settings.jsx delete mode 100644 web/src/components/TorrentList.jsx delete mode 100644 web/src/components/Upload.jsx diff --git a/server/web/api/utils/link.go b/server/web/api/utils/link.go index 119afa2..91625cf 100644 --- a/server/web/api/utils/link.go +++ b/server/web/api/utils/link.go @@ -24,7 +24,6 @@ func ParseFile(file multipart.File) (*torrent.TorrentSpec, error) { return nil, err } - // mag := minfo.Magnet(info.Name, minfo.HashInfoBytes()) mag := minfo.Magnet(nil, &info) return &torrent.TorrentSpec{ InfoBytes: minfo.InfoBytes, @@ -106,7 +105,6 @@ func fromHttp(link string) (*torrent.TorrentSpec, error) { if err != nil { return nil, err } - // mag := minfo.Magnet(info.Name, minfo.HashInfoBytes()) mag := minfo.Magnet(nil, &info) return &torrent.TorrentSpec{ @@ -130,7 +128,6 @@ func fromFile(path string) (*torrent.TorrentSpec, error) { return nil, err } - // mag := minfo.Magnet(info.Name, minfo.HashInfoBytes()) mag := minfo.Magnet(nil, &info) return &torrent.TorrentSpec{ InfoBytes: minfo.InfoBytes, diff --git a/server/web/pages/route.go b/server/web/pages/route.go index aa5001c..a079e0a 100644 --- a/server/web/pages/route.go +++ b/server/web/pages/route.go @@ -28,7 +28,6 @@ func getTorrents(c *gin.Context) { mi := metainfo.MetaInfo{ AnnounceList: ts.Trackers, } - // mag := mi.Magnet(ts.DisplayName, ts.InfoHash) mag := mi.Magnet(&ts.InfoHash, &metainfo.Info{Name: ts.DisplayName}) http += "

magnet:?xt=urn:btih:" + mag.InfoHash.HexString() + "

" } diff --git a/server/web/pages/template/pages/index.html b/server/web/pages/template/pages/index.html index c6b7d01..ef9ff29 100644 --- a/server/web/pages/template/pages/index.html +++ b/server/web/pages/template/pages/index.html @@ -1 +1 @@ -TorrServer
+TorrServer
\ No newline at end of file diff --git a/server/web/pages/template/route.go b/server/web/pages/template/route.go index aa3a4e6..da47211 100644 --- a/server/web/pages/template/route.go +++ b/server/web/pages/template/route.go @@ -9,6 +9,51 @@ func RouteWebPages(route *gin.RouterGroup) { c.Data(200, "text/html; charset=utf-8", Indexhtml) }) + route.GET("/favicon-16x16.png", func(c *gin.Context) { + c.Data(200, "image/png", Favicon16x16png) + }) + + + route.GET("/static/js/main.2dd9f580.chunk.js.map", func(c *gin.Context) { + c.Data(200, "application/json", Staticjsmain2dd9f580chunkjsmap) + }) + + + route.GET("/android-chrome-512x512.png", func(c *gin.Context) { + c.Data(200, "image/png", Androidchrome512x512png) + }) + + + route.GET("/apple-touch-icon.png", func(c *gin.Context) { + c.Data(200, "image/png", Appletouchiconpng) + }) + + + route.GET("/index.html", func(c *gin.Context) { + c.Data(200, "text/html; charset=utf-8", Indexhtml) + }) + + + route.GET("/static/js/main.2dd9f580.chunk.js", func(c *gin.Context) { + c.Data(200, "application/javascript", Staticjsmain2dd9f580chunkjs) + }) + + + route.GET("/static/js/runtime-main.8bda5920.js", func(c *gin.Context) { + c.Data(200, "application/javascript", Staticjsruntimemain8bda5920js) + }) + + + route.GET("/static/js/runtime-main.8bda5920.js.map", func(c *gin.Context) { + c.Data(200, "application/json", Staticjsruntimemain8bda5920jsmap) + }) + + + route.GET("/android-chrome-192x192.png", func(c *gin.Context) { + c.Data(200, "image/png", Androidchrome192x192png) + }) + + route.GET("/asset-manifest.json", func(c *gin.Context) { c.Data(200, "application/json", Assetmanifestjson) }) @@ -19,71 +64,11 @@ func RouteWebPages(route *gin.RouterGroup) { }) - route.GET("/mstile-150x150.png", func(c *gin.Context) { - c.Data(200, "image/png", Mstile150x150png) - }) - - - route.GET("/static/js/2.9044ecaa.chunk.js", func(c *gin.Context) { - c.Data(200, "application/javascript", Staticjs29044ecaachunkjs) - }) - - - route.GET("/android-chrome-512x512.png", func(c *gin.Context) { - c.Data(200, "image/png", Androidchrome512x512png) - }) - - - route.GET("/favicon-16x16.png", func(c *gin.Context) { - c.Data(200, "image/png", Favicon16x16png) - }) - - - route.GET("/index.html", func(c *gin.Context) { - c.Data(200, "text/html; charset=utf-8", Indexhtml) - }) - - - route.GET("/static/js/runtime-main.8bda5920.js", func(c *gin.Context) { - c.Data(200, "application/javascript", Staticjsruntimemain8bda5920js) - }) - - - route.GET("/android-chrome-192x192.png", func(c *gin.Context) { - c.Data(200, "image/png", Androidchrome192x192png) - }) - - route.GET("/favicon-32x32.png", func(c *gin.Context) { c.Data(200, "image/png", Favicon32x32png) }) - route.GET("/favicon.ico", func(c *gin.Context) { - c.Data(200, "image/x-icon", Faviconico) - }) - - - route.GET("/static/js/main.2dd9f580.chunk.js", func(c *gin.Context) { - c.Data(200, "application/javascript", Staticjsmain2dd9f580chunkjs) - }) - - - route.GET("/static/js/runtime-main.8bda5920.js.map", func(c *gin.Context) { - c.Data(200, "application/json", Staticjsruntimemain8bda5920jsmap) - }) - - - route.GET("/apple-touch-icon.png", func(c *gin.Context) { - c.Data(200, "image/png", Appletouchiconpng) - }) - - - route.GET("/site.webmanifest", func(c *gin.Context) { - c.Data(200, "application/manifest+json", Sitewebmanifest) - }) - - route.GET("/static/js/2.9044ecaa.chunk.js.LICENSE.txt", func(c *gin.Context) { c.Data(200, "text/plain; charset=utf-8", Staticjs29044ecaachunkjsLICENSEtxt) }) @@ -94,8 +79,23 @@ func RouteWebPages(route *gin.RouterGroup) { }) - route.GET("/static/js/main.2dd9f580.chunk.js.map", func(c *gin.Context) { - c.Data(200, "application/json", Staticjsmain2dd9f580chunkjsmap) + route.GET("/favicon.ico", func(c *gin.Context) { + c.Data(200, "image/x-icon", Faviconico) + }) + + + route.GET("/mstile-150x150.png", func(c *gin.Context) { + c.Data(200, "image/png", Mstile150x150png) + }) + + + route.GET("/site.webmanifest", func(c *gin.Context) { + c.Data(200, "application/manifest+json", Sitewebmanifest) + }) + + + route.GET("/static/js/2.9044ecaa.chunk.js", func(c *gin.Context) { + c.Data(200, "application/javascript", Staticjs29044ecaachunkjs) }) } \ No newline at end of file diff --git a/web/.env.development b/web/.env.development deleted file mode 100644 index e162e5c..0000000 --- a/web/.env.development +++ /dev/null @@ -1 +0,0 @@ -REACT_APP_SERVER_HOST=http://127.0.0.1:8090 \ No newline at end of file diff --git a/web/.env_example b/web/.env_example index 03bb0ee..9a8259f 100644 --- a/web/.env_example +++ b/web/.env_example @@ -1,2 +1,2 @@ REACT_APP_SERVER_HOST= -REACT_APP_TMDB_API_KEY= +REACT_APP_TMDB_API_KEY= \ No newline at end of file diff --git a/web/src/App/Sidebar.jsx b/web/src/App/Sidebar.jsx deleted file mode 100644 index a999a84..0000000 --- a/web/src/App/Sidebar.jsx +++ /dev/null @@ -1,65 +0,0 @@ -import { playlistAllHost } from 'utils/Hosts' -import Divider from '@material-ui/core/Divider' -import ListItem from '@material-ui/core/ListItem' -import ListItemIcon from '@material-ui/core/ListItemIcon' -import ListItemText from '@material-ui/core/ListItemText' -import AddDialogButton from 'components/Add' -import RemoveAll from 'components/RemoveAll' -import SettingsDialog from 'components/Settings' -import AboutDialog from 'components/About' -import UploadDialog from 'components/Upload' -import { CreditCard as CreditCardIcon, List as ListIcon, Language as LanguageIcon } from '@material-ui/icons' -import List from '@material-ui/core/List' -import CloseServer from 'components/CloseServer' -import { useTranslation } from 'react-i18next' -import useChangeLanguage from 'utils/useChangeLanguage' - -import { AppSidebarStyle } from './style' - -export default function Sidebar({ isDrawerOpen, setIsDonationDialogOpen }) { - const [currentLang, changeLang] = useChangeLanguage() - const { t } = useTranslation() - - return ( - - - - - - - - - - - - - - - - - - - (currentLang === 'en' ? changeLang('ru') : changeLang('en'))}> - - - - - - - - - - - - - - setIsDonationDialogOpen(true)}> - - - - - - - - ) -} diff --git a/web/src/App/index.jsx b/web/src/App/index.jsx deleted file mode 100644 index 3cfe795..0000000 --- a/web/src/App/index.jsx +++ /dev/null @@ -1,63 +0,0 @@ -import CssBaseline from '@material-ui/core/CssBaseline' -import { createMuiTheme, MuiThemeProvider } from '@material-ui/core' -import { useEffect, 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' -import { echoHost } from 'utils/Hosts' -import TorrentList from 'components/TorrentList' -import DonateSnackbar from 'components/Donate' -import DonateDialog from 'components/Donate/DonateDialog' -import Div100vh from 'react-div-100vh' -import axios from 'axios' - -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 [isDrawerOpen, setIsDrawerOpen] = useState(false) - const [isDonationDialogOpen, setIsDonationDialogOpen] = useState(false) - const [torrServerVersion, setTorrServerVersion] = useState('') - - useEffect(() => { - axios.get(echoHost()).then(({ data }) => setTorrServerVersion(data)) - }, []) - - return ( - - - - {/* Div100vh - iOS WebKit fix */} - - - - setIsDrawerOpen(!isDrawerOpen)} - edge='start' - > - {isDrawerOpen ? : } - - - - TorrServer {torrServerVersion} - - - - - - - - {isDonationDialogOpen && setIsDonationDialogOpen(false)} />} - {!JSON.parse(localStorage.getItem('snackbarIsClosed')) && } - - - - ) -} diff --git a/web/src/App/style.js b/web/src/App/style.js deleted file mode 100644 index 436b758..0000000 --- a/web/src/App/style.js +++ /dev/null @@ -1,65 +0,0 @@ -import styled, { css } from 'styled-components' - -export const AppWrapper = styled.div` - height: 100%; - background: #cbe8d9; - display: grid; - grid-template-columns: 60px 1fr; - grid-template-rows: 60px 1fr; - grid-template-areas: - 'head head' - 'side content'; -` - -export const CenteredGrid = styled.div` - height: 100%; - display: grid; - place-items: center; -` - -export const AppHeader = styled.div` - background: #00a572; - color: rgba(0, 0, 0, 0.87); - grid-area: head; - display: flex; - align-items: center; - 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; - z-index: 3; -` -export const AppSidebarStyle = styled.div` - ${({ isDrawerOpen }) => css` - grid-area: side; - width: ${isDrawerOpen ? '400%' : '100%'}; - z-index: 2; - 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; - white-space: nowrap; - `} -` -export const TorrentListWrapper = styled.div` - grid-area: content; - padding: 20px; - overflow: auto; - - display: grid; - place-content: start; - grid-template-columns: repeat(auto-fit, minmax(max-content, 570px)); - gap: 20px; - - @media (max-width: 1260px), (max-height: 500px) { - padding: 10px; - gap: 15px; - grid-template-columns: repeat(3, 1fr); - } - - @media (max-width: 1100px) { - grid-template-columns: repeat(2, 1fr); - } - - @media (max-width: 700px) { - grid-template-columns: 1fr; - } -` diff --git a/web/src/components/About.jsx b/web/src/components/About.jsx deleted file mode 100644 index 58cae8a..0000000 --- a/web/src/components/About.jsx +++ /dev/null @@ -1,67 +0,0 @@ -import axios from 'axios' -import { useEffect, useState } from 'react' -import Button from '@material-ui/core/Button' -import Dialog from '@material-ui/core/Dialog' -import DialogActions from '@material-ui/core/DialogActions' -import DialogContent from '@material-ui/core/DialogContent' -import DialogTitle from '@material-ui/core/DialogTitle' -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 { useTranslation } from 'react-i18next' -import { echoHost } from 'utils/Hosts' - -export default function AboutDialog() { - const { t } = useTranslation() - const [open, setOpen] = useState(false) - const [torrServerVersion, setTorrServerVersion] = useState('') - useEffect(() => { - axios.get(echoHost()).then(({ data }) => setTorrServerVersion(data)) - }, []) - - return ( -
- setOpen(true)}> - - - - - - - setOpen(false)} aria-labelledby='form-dialog-title' fullWidth maxWidth='lg'> - {t('About')} - - -
-

TorrServer {torrServerVersion}

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

{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/DialogTorrentDetailsContent/TorrentCache/DefaultSnake.jsx b/web/src/components/DialogTorrentDetailsContent/TorrentCache/DefaultSnake.jsx deleted file mode 100644 index 0937ff2..0000000 --- a/web/src/components/DialogTorrentDetailsContent/TorrentCache/DefaultSnake.jsx +++ /dev/null @@ -1,125 +0,0 @@ -import { useEffect, useState } from 'react' -import DialogContent from '@material-ui/core/DialogContent' -import { Stage, Layer } from 'react-konva' -import Measure from 'react-measure' -import { v4 as uuidv4 } from 'uuid' -import styled from 'styled-components' - -import SingleBlock from './SingleBlock' -import getShortCacheMap from './getShortCacheMap' - -const ScrollNotification = styled.div` - margin-top: 10px; - text-transform: uppercase; - color: rgba(0, 0, 0, 0.5); - align-self: center; -` - -export default function DefaultSnake({ isMini, cacheMap, preloadPiecesAmount }) { - const [dimensions, setDimensions] = useState({ width: 0, height: 0 }) - const [stageSettings, setStageSettings] = useState({ - boxHeight: null, - strokeWidth: null, - marginBetweenBlocks: null, - stageOffset: null, - }) - const updateStageSettings = (boxHeight, strokeWidth) => { - setStageSettings({ - boxHeight, - strokeWidth, - marginBetweenBlocks: strokeWidth, - stageOffset: strokeWidth * 2, - }) - } - - useEffect(() => { - // initializing stageSettings - if (isMini) return dimensions.width < 500 ? updateStageSettings(20, 3) : updateStageSettings(24, 4) - updateStageSettings(12, 2) - }, [isMini, dimensions.width]) - - const miniCacheMaxHeight = 340 - - const { boxHeight, strokeWidth, marginBetweenBlocks, stageOffset } = stageSettings - - const blockSizeWithMargin = boxHeight + strokeWidth + marginBetweenBlocks - const piecesInOneRow = Math.floor((dimensions.width * 0.9) / blockSizeWithMargin) - - const shortCacheMap = isMini ? getShortCacheMap({ cacheMap, preloadPiecesAmount, piecesInOneRow }) : [] - - const amountOfRows = Math.ceil((isMini ? shortCacheMap.length : cacheMap.length) / piecesInOneRow) - - const getItemCoordinates = blockOrder => { - const currentRow = Math.floor(blockOrder / piecesInOneRow) - const x = (blockOrder % piecesInOneRow) * blockSizeWithMargin || 0 - const y = currentRow * blockSizeWithMargin || 0 - - return { x, y } - } - - return ( - setDimensions(bounds)}> - {({ measureRef }) => ( -
- - - - {isMini - ? shortCacheMap.map(({ percentage, isComplete, inProgress, isActive, isReaderRange }, i) => { - const { x, y } = getItemCoordinates(i) - - return ( - - ) - }) - : cacheMap.map(({ id, percentage, isComplete, inProgress, isActive, isReaderRange }) => { - const { x, y } = getItemCoordinates(id) - - return ( - - ) - })} - - - - - {isMini && - (stageOffset + blockSizeWithMargin * amountOfRows || 0) >= miniCacheMaxHeight && - dimensions.height >= miniCacheMaxHeight && scroll down} -
- )} - - ) -} diff --git a/web/src/components/DialogTorrentDetailsContent/TorrentCache/LargeSnake.jsx b/web/src/components/DialogTorrentDetailsContent/TorrentCache/LargeSnake.jsx deleted file mode 100644 index e2d8dbe..0000000 --- a/web/src/components/DialogTorrentDetailsContent/TorrentCache/LargeSnake.jsx +++ /dev/null @@ -1,58 +0,0 @@ -import { FixedSizeGrid as Grid } from 'react-window' -import AutoSizer from 'react-virtualized-auto-sizer' - -import { getLargeSnakeColors } from './colors' - -const Cell = ({ columnIndex, rowIndex, style, data }) => { - const { columnCount, cacheMap, gutterSize, borderSize, pieces } = data - const itemIndex = rowIndex * columnCount + columnIndex - - const { borderColor, backgroundColor } = getLargeSnakeColors(cacheMap[itemIndex] || {}) - - const newStyle = { - ...style, - left: style.left + gutterSize, - top: style.top + gutterSize, - width: style.width - gutterSize, - height: style.height - gutterSize, - border: `${borderSize}px solid ${borderColor}`, - display: itemIndex >= pieces ? 'none' : null, - background: backgroundColor, - } - - return
-} - -const gutterSize = 2 -const borderSize = 1 -const pieceSize = 12 -const pieceSizeWithSpacing = pieceSize + gutterSize - -export default function LargeSnake({ cacheMap }) { - const pieces = cacheMap.length - - return ( -
- - {({ height, width }) => { - const columnCount = Math.floor(width / (gutterSize + pieceSize)) - 1 - const rowCount = pieces / columnCount + 1 - - return ( - - {Cell} - - ) - }} - -
- ) -} diff --git a/web/src/components/DialogTorrentDetailsContent/TorrentCache/SingleBlock.jsx b/web/src/components/DialogTorrentDetailsContent/TorrentCache/SingleBlock.jsx deleted file mode 100644 index 3951532..0000000 --- a/web/src/components/DialogTorrentDetailsContent/TorrentCache/SingleBlock.jsx +++ /dev/null @@ -1,55 +0,0 @@ -import { Rect } from 'react-konva' - -import { activeColor, completeColor, defaultBorderColor, progressColor, rangeColor } from './colors' - -export default function SingleBlock({ - x, - y, - percentage, - isActive = false, - inProgress = false, - isReaderRange = false, - isComplete = false, - boxHeight, - strokeWidth, -}) { - const strokeColor = isActive - ? activeColor - : isComplete - ? completeColor - : inProgress - ? progressColor - : isReaderRange - ? rangeColor - : defaultBorderColor - const backgroundColor = inProgress ? progressColor : defaultBorderColor - const percentageProgressColor = completeColor - const processCompletedColor = completeColor - - return ( - - ) -} diff --git a/web/src/components/DialogTorrentDetailsContent/TorrentCache/colors.js b/web/src/components/DialogTorrentDetailsContent/TorrentCache/colors.js deleted file mode 100644 index 235be1d..0000000 --- a/web/src/components/DialogTorrentDetailsContent/TorrentCache/colors.js +++ /dev/null @@ -1,26 +0,0 @@ -export const defaultBorderColor = '#eef2f4' -export const defaultBackgroundColor = '#fff' -export const completeColor = '#00a572' -export const progressColor = '#ffa724' -export const activeColor = '#000' -export const rangeColor = '#9a9aff' - -export const getLargeSnakeColors = ({ isActive, isComplete, inProgress, isReaderRange, percentage }) => { - const gradientBackgroundColor = inProgress ? progressColor : defaultBackgroundColor - const gradient = `linear-gradient(to top, ${completeColor} 0%, ${completeColor} ${ - percentage * 100 - }%, ${gradientBackgroundColor} ${percentage * 100}%, ${gradientBackgroundColor} 100%)` - - const borderColor = isActive - ? activeColor - : isComplete - ? completeColor - : inProgress - ? progressColor - : isReaderRange - ? rangeColor - : defaultBorderColor - const backgroundColor = isComplete ? completeColor : inProgress ? gradient : defaultBackgroundColor - - return { borderColor, backgroundColor } -} diff --git a/web/src/components/DialogTorrentDetailsContent/widgets.jsx b/web/src/components/DialogTorrentDetailsContent/widgets.jsx deleted file mode 100644 index c3d65e3..0000000 --- a/web/src/components/DialogTorrentDetailsContent/widgets.jsx +++ /dev/null @@ -1,101 +0,0 @@ -import { - ArrowDownward as ArrowDownwardIcon, - ArrowUpward as ArrowUpwardIcon, - SwapVerticalCircle as SwapVerticalCircleIcon, - ViewAgenda as ViewAgendaIcon, - Widgets as WidgetsIcon, - PhotoSizeSelectSmall as PhotoSizeSelectSmallIcon, - Build as BuildIcon, -} from '@material-ui/icons' -import { getPeerString, humanizeSize } from 'utils/Utils' -import { useTranslation } from 'react-i18next' - -import StatisticsField from './StatisticsField' - -export const DownlodSpeedWidget = ({ data }) => { - const { t } = useTranslation() - return ( - - ) -} - -export const UploadSpeedWidget = ({ data }) => { - const { t } = useTranslation() - return ( - - ) -} - -export const PeersWidget = ({ data }) => { - const { t } = useTranslation() - return ( - - ) -} - -export const PiecesCountWidget = ({ data }) => { - const { t } = useTranslation() - return -} - -export const PiecesLengthWidget = ({ data }) => { - const { t } = useTranslation() - return ( - - ) -} - -export const StatusWidget = ({ data }) => { - const { t } = useTranslation() - let i18nd = data - if (data.toLowerCase() === 'torrent added') - i18nd = t('TorrentAdded') - else if (data.toLowerCase() === 'torrent getting info') - i18nd = t('TorrentGettingInfo') - else if (data.toLowerCase() === 'torrent preload') - i18nd = t('TorrentPreload') - else if (data.toLowerCase() === 'torrent working') - i18nd = t('TorrentWorking') - else if (data.toLowerCase() === 'torrent closed') - i18nd = t('TorrentClosed') - else if (data.toLowerCase() === 'torrent in db') - i18nd = t('TorrentInDb') - return -} - -export const SizeWidget = ({ data }) => { - const { t } = useTranslation() - return ( - - ) -} diff --git a/web/src/components/Settings.jsx b/web/src/components/Settings.jsx deleted file mode 100644 index f54a944..0000000 --- a/web/src/components/Settings.jsx +++ /dev/null @@ -1,292 +0,0 @@ -import axios from 'axios' -import ListItem from '@material-ui/core/ListItem' -import ListItemIcon from '@material-ui/core/ListItemIcon' -import ListItemText from '@material-ui/core/ListItemText' -import { useEffect, useState } from 'react' -import SettingsIcon from '@material-ui/icons/Settings' -import Dialog from '@material-ui/core/Dialog' -import DialogTitle from '@material-ui/core/DialogTitle' -import DialogContent from '@material-ui/core/DialogContent' -import TextField from '@material-ui/core/TextField' -import DialogActions from '@material-ui/core/DialogActions' -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' - -export default function SettingsDialog() { - const { t } = useTranslation() - const [open, setOpen] = useState(false) - const [settings, setSets] = useState({}) - const [show, setShow] = useState(false) - const [tsHost, setTSHost] = useState(getTorrServerHost()) - - const handleClickOpen = () => setOpen(true) - const handleClose = () => setOpen(false) - const handleSave = () => { - setOpen(false) - const sets = JSON.parse(JSON.stringify(settings)) - sets.CacheSize *= 1024 * 1024 - axios.post(settingsHost(), { action: 'set', sets }) - } - - useEffect(() => { - axios - .post(settingsHost(), { action: 'get' }) - .then(({ data }) => { - setSets({ ...data, CacheSize: data.CacheSize / (1024 * 1024) }) - setShow(true) - }) - .catch(() => setShow(false)) - }, [tsHost]) - - const onInputHost = event => { - const host = event.target.value - setTorrServerHost(host) - setTSHost(host) - } - - const inputForm = ({ target: { type, value, checked, id } }) => { - const sets = JSON.parse(JSON.stringify(settings)) - if (type === 'number' || type === 'select-one') { - sets[id] = Number(value) - } else if (type === 'checkbox') { - if ( - id === 'DisableTCP' || - id === 'DisableUTP' || - id === 'DisableUPNP' || - id === 'DisableDHT' || - id === 'DisablePEX' || - id === 'DisableUpload' - ) - sets[id] = Boolean(!checked) - else sets[id] = Boolean(checked) - } else if (type === 'url') { - sets[id] = value - } - setSets(sets) - } - - const { - CacheSize, - PreloadBuffer, - ReaderReadAHead, - RetrackersMode, - TorrentDisconnectTimeout, - EnableIPv6, - ForceEncrypt, - DisableTCP, - DisableUTP, - DisableUPNP, - DisableDHT, - DisablePEX, - DisableUpload, - DownloadRateLimit, - UploadRateLimit, - ConnectionsLimit, - DhtConnectionLimit, - PeersListenPort, - UseDisk, - TorrentsSavePath, - RemoveCacheOnDrop, - } = settings - - return ( -
- - - - - - - - - {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')} - -
- - )} - - - - - - - - -
- ) -} diff --git a/web/src/components/TorrentList.jsx b/web/src/components/TorrentList.jsx deleted file mode 100644 index 4168b22..0000000 --- a/web/src/components/TorrentList.jsx +++ /dev/null @@ -1,59 +0,0 @@ -import { useEffect, useRef, useState } from 'react' -import { Typography } from '@material-ui/core' -import { torrentsHost } from 'utils/Hosts' -import TorrentCard from 'components/TorrentCard' -import axios from 'axios' -import CircularProgress from '@material-ui/core/CircularProgress' -import { TorrentListWrapper, CenteredGrid } from 'App/style' -import { useTranslation } from 'react-i18next' - -export default function TorrentList() { - const { t } = useTranslation() - const [torrents, setTorrents] = useState([]) - const [isLoading, setIsLoading] = useState(true) - const [isOffline, setIsOffline] = useState(true) - const timerID = useRef(-1) - - useEffect(() => { - timerID.current = setInterval(() => { - // getting torrent list - axios - .post(torrentsHost(), { action: 'list' }) - .then(({ data }) => { - // updating torrent list - setTorrents(data) - setIsOffline(false) - }) - .catch(() => { - // resetting torrent list - setTorrents([]) - setIsOffline(true) - }) - .finally(() => setIsLoading(false)) - }, 1000) - - return () => clearInterval(timerID.current) - }, []) - - if (isLoading || isOffline || !torrents.length) { - return ( - - {isLoading ? ( - - ) : isOffline ? ( - {t('Offline')} - ) : ( - !torrents.length && {t('NoTorrentsAdded')} - )} - - ) - } - - return ( - - {torrents.map(torrent => ( - - ))} - - ) -} diff --git a/web/src/components/Upload.jsx b/web/src/components/Upload.jsx deleted file mode 100644 index 8f460d8..0000000 --- a/web/src/components/Upload.jsx +++ /dev/null @@ -1,33 +0,0 @@ -import ListItemIcon from '@material-ui/core/ListItemIcon' -import ListItemText from '@material-ui/core/ListItemText' -import ListItem from '@material-ui/core/ListItem' -import PublishIcon from '@material-ui/icons/Publish' -import { torrentUploadHost } from 'utils/Hosts' -import axios from 'axios' -import { useTranslation } from 'react-i18next' - -export default function UploadDialog() { - const { t } = useTranslation() - const handleCapture = ({ target: { files } }) => { - const [file] = files - const data = new FormData() - data.append('save', 'true') - data.append('file', file) - axios.post(torrentUploadHost(), data) - } - return ( -
- -
- ) -}