diff --git a/README.md b/README.md index cb9f942..ff675ed 100644 --- a/README.md +++ b/README.md @@ -167,6 +167,25 @@ https://github.com/vladlenas Synology NAS packages repo source: https://grigi.lt +### Development + +#### Go server + +To run the Go server locally, just run + +```bash +cd server +go run ./cmd +``` + +#### Web development + +To run the web server locally, just run + +```bash +yarn start +``` + ### Build #### Server @@ -262,7 +281,7 @@ local:127.0.0.1 - [FaintGhost](https://github.com/FaintGhost) Zhang Yaowei for Simplified Chinese web translation - [Anton111111](https://github.com/Anton111111) Anton Potekhin for sleep on Windows fixes - [lieranderl](https://github.com/lieranderl) Evgeni for adding SSL support code -- [cocool97](https://github.com/cocool97) for openapi API documentation +- [cocool97](https://github.com/cocool97) for openapi API documentation and torrent categories - [shadeov](https://github.com/shadeov) for README improvements - [butaford](https://github.com/butaford) Pavel for make docker file and scripts - [filimonic](https://github.com/filimonic) Alexey D. Filimonov diff --git a/web/src/components/Add/RightSideComponent.jsx b/web/src/components/Add/RightSideComponent.jsx index d84f1bd..5fbd66e 100644 --- a/web/src/components/Add/RightSideComponent.jsx +++ b/web/src/components/Add/RightSideComponent.jsx @@ -11,7 +11,7 @@ import { TextField, useTheme, } from '@material-ui/core' -import { HighlightOff as HighlightOffIcon } from '@material-ui/icons' +import { HighlightOff as HighlightOffIcon, Clear } from '@material-ui/icons' import { TORRENT_CATEGORIES } from 'components/categories' import { @@ -148,7 +148,21 @@ export default function RightSideComponent({ onChange={handleCategoryChange} variant='outlined' fullWidth - defaultValue='other' + defaultValue='' + IconComponent={ + category.length > 1 + ? () => ( + { + setCategory(""); + }} + > + + + ) + : undefined + } > {TORRENT_CATEGORIES.map(category => ( diff --git a/web/src/components/App/Sidebar.jsx b/web/src/components/App/Sidebar.jsx index 06d3cef..4654c70 100644 --- a/web/src/components/App/Sidebar.jsx +++ b/web/src/components/App/Sidebar.jsx @@ -12,6 +12,7 @@ import AboutDialog from 'components/About' import CloseServer from 'components/CloseServer' import { memo } from 'react' import CheckIcon from '@material-ui/icons/Check' +import ClearIcon from '@material-ui/icons/Clear' import { TORRENT_CATEGORIES } from 'components/categories' import FilterByCategory from 'components/FilterByCategory' @@ -47,6 +48,13 @@ const Sidebar = ({ isDrawerOpen, setIsDonationDialogOpen, isOffline, isLoading, setGlobalFilterCategory={setGlobalFilterCategory} /> ))} + } + setGlobalFilterCategory={setGlobalFilterCategory} + /> diff --git a/web/src/locales/bg/translation.json b/web/src/locales/bg/translation.json index 0d20514..7ae1415 100644 --- a/web/src/locales/bg/translation.json +++ b/web/src/locales/bg/translation.json @@ -188,6 +188,7 @@ "TorrentStatus": "Статус на торента", "TorrentWorking": "Активен", "TurnOff": "Изключване", + "Uncategorized": "Некатегоризиран", "UploadFile": "Качи файл", "UploadSpeed": "Скорост на качване", "Viewed": "Гледан" diff --git a/web/src/locales/en/translation.json b/web/src/locales/en/translation.json index a072dcb..82af228 100644 --- a/web/src/locales/en/translation.json +++ b/web/src/locales/en/translation.json @@ -188,6 +188,7 @@ "TorrentStatus": "Torrent Status", "TorrentWorking": "Active", "TurnOff": "Turn Off", + "Uncategorized": "Uncategorized", "UploadFile": "Upload File", "UploadSpeed": "Upload speed", "Viewed": "Viewed" diff --git a/web/src/locales/ru/translation.json b/web/src/locales/ru/translation.json index f0cb999..83e016e 100644 --- a/web/src/locales/ru/translation.json +++ b/web/src/locales/ru/translation.json @@ -188,6 +188,7 @@ "TorrentStatus": "Состояние торрента", "TorrentWorking": "Активен", "TurnOff": "Выключить", + "Uncategorized": "Без категории", "UploadFile": "Загрузить файл", "UploadSpeed": "Скорость отдачи", "Viewed": "Просм." diff --git a/web/src/locales/ua/translation.json b/web/src/locales/ua/translation.json index 99c4de5..ce5c0f2 100644 --- a/web/src/locales/ua/translation.json +++ b/web/src/locales/ua/translation.json @@ -188,6 +188,7 @@ "TorrentStatus": "Статус торенту", "TorrentWorking": "Активний", "TurnOff": "Виключити", + "Uncategorized": "Без категорії", "UploadFile": "Завантажити файл", "UploadSpeed": "Швидкість відвантаження", "Viewed": "Перегл." diff --git a/web/src/locales/zh/translation.json b/web/src/locales/zh/translation.json index 1ad5e8f..86221f5 100644 --- a/web/src/locales/zh/translation.json +++ b/web/src/locales/zh/translation.json @@ -188,6 +188,7 @@ "TorrentStatus": "种子状态", "TorrentWorking": "活跃", "TurnOff": "关闭", + "Uncategorized": "未分类", "UploadFile": "上传文件", "UploadSpeed": "上传速度", "Viewed": "查看"