Merge branch 'master' into use-auto-dark-palette-and-About

web/src/components/Add/AddDialog.jsx

@@ -46,10 +46,7 @@ export default function AddDialog({
   const [skipDebounce, setSkipDebounce] = useState(false)
   const [isCustomTitleEnabled, setIsCustomTitleEnabled] = useState(false)
 
-  const { data: torrents } = useQuery('torrents', getTorrents, {
-    retry: 1,
-    refetchInterval: 1000,
-  })
+  const { data: torrents } = useQuery('torrents', getTorrents, { retry: 1, refetchInterval: 1000 })
 
   useEffect(() => {
     const allHashes = torrents.map(({ hash }) => hash)

web/src/components/Add/index.jsx

@@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next'
 
 import AddDialog from './AddDialog'
 
-export default function AddDialogButton() {
+export default function AddDialogButton({ isOffline, isLoading }) {
   const { t } = useTranslation()
   const [isDialogOpen, setIsDialogOpen] = useState(false)
   const handleClickOpen = () => setIsDialogOpen(true)
@@ -15,7 +15,7 @@ export default function AddDialogButton() {
 
   return (
     <div>
-      <ListItem button key='Add' onClick={handleClickOpen}>
+      <ListItem disabled={isOffline || isLoading} button key='Add' onClick={handleClickOpen}>
         <ListItemIcon>
           <LibraryAddIcon />
         </ListItemIcon>

web/src/components/App/Sidebar.jsx

@@ -10,24 +10,26 @@ import SettingsDialog from 'components/Settings'
 import RemoveAll from 'components/RemoveAll'
 import AboutDialog from 'components/About'
 import CloseServer from 'components/CloseServer'
+import { memo } from 'react'
 
 import { AppSidebarStyle } from './style'
 
-export default function Sidebar({ isDrawerOpen, setIsDonationDialogOpen }) {
+const Sidebar = ({ isDrawerOpen, setIsDonationDialogOpen, isOffline, isLoading }) => {
   const { t } = useTranslation()
 
   return (
     <AppSidebarStyle isDrawerOpen={isDrawerOpen}>
       <List>
-        <AddDialogButton />
-        <RemoveAll />
+        <AddDialogButton isOffline={isOffline} isLoading={isLoading} />
+
+        <RemoveAll isOffline={isOffline} isLoading={isLoading} />
       </List>
 
       <Divider />
 
       <List>
         <SettingsDialog />
-        <CloseServer />
+        <CloseServer isOffline={isOffline} isLoading={isLoading} />
       </List>
 
       <Divider />
@@ -45,3 +47,5 @@ export default function Sidebar({ isDrawerOpen, setIsDonationDialogOpen }) {
     </AppSidebarStyle>
   )
 }
+
+export default memo(Sidebar)

web/src/components/App/index.jsx

@@ -13,6 +13,8 @@ import DonateSnackbar from 'components/Donate'
 import DonateDialog from 'components/Donate/DonateDialog'
 import useChangeLanguage from 'utils/useChangeLanguage'
 import { ThemeProvider } from '@material-ui/core/styles'
+import { useQuery } from 'react-query'
+import { getTorrents } from 'utils/Utils'
 
 import { AppWrapper, AppHeader, LanguageSwitch } from './style'
 import Sidebar from './Sidebar'
@@ -56,6 +58,13 @@ export default function App() {
     [prefersDarkMode],
   )
   const [currentLang, changeLang] = useChangeLanguage()
+  const [isOffline, setIsOffline] = useState(false)
+  const { data: torrents, isLoading } = useQuery('torrents', getTorrents, {
+    retry: 1,
+    refetchInterval: 1000,
+    onError: () => setIsOffline(true),
+    onSuccess: () => setIsOffline(false),
+  })
 
   useEffect(() => {
     axios.get(echoHost()).then(({ data }) => setTorrServerVersion(data))

web/src/components/CloseServer.jsx

@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next'
 import { ThemeProvider } from '@material-ui/core/styles'
 import { lightTheme } from 'components/App'
 
-export default function CloseServer() {
+export default function CloseServer({ isOffline, isLoading }) {
   const { t } = useTranslation()
   const [open, setOpen] = useState(false)
   const closeDialog = () => setOpen(false)
@@ -14,7 +14,7 @@ export default function CloseServer() {
 
   return (
     <>
-      <ListItem button key={t('CloseServer')} onClick={openDialog}>
+      <ListItem disabled={isOffline || isLoading} button key={t('CloseServer')} onClick={openDialog}>
         <ListItemIcon>
           <PowerSettingsNewIcon />
         </ListItemIcon>

web/src/components/RemoveAll.jsx

@@ -33,14 +33,15 @@ const fnRemoveAll = () => {
     })
 }
 
-export default function RemoveAll() {
+export default function RemoveAll({ isOffline, isLoading }) {
   const { t } = useTranslation()
   const [open, setOpen] = useState(false)
   const closeDialog = () => setOpen(false)
   const openDialog = () => setOpen(true)
+
   return (
     <>
-      <ListItem button key={t('RemoveAll')} onClick={openDialog}>
+      <ListItem disabled={isOffline || isLoading} button key={t('RemoveAll')} onClick={openDialog}>
         <ListItemIcon>
           <DeleteIcon />
         </ListItemIcon>

web/src/components/TorrentList.jsx

@@ -1,41 +0,0 @@
-import { useState } from 'react'
-import { Typography } from '@material-ui/core'
-import TorrentCard from 'components/TorrentCard'
-import CircularProgress from '@material-ui/core/CircularProgress'
-import { TorrentListWrapper, CenteredGrid } from 'components/App/style'
-import { useTranslation } from 'react-i18next'
-import { useQuery } from 'react-query'
-import { getTorrents } from 'utils/Utils'
-
-export default function TorrentList() {
-  const { t } = useTranslation()
-  const [isOffline, setIsOffline] = useState(false)
-  const { data: torrents, isLoading } = useQuery('torrents', getTorrents, {
-    retry: 1,
-    refetchInterval: 1000,
-    onError: () => setIsOffline(true),
-    onSuccess: () => setIsOffline(false),
-  })
-
-  if (isLoading || isOffline || !torrents.length) {
-    return (
-      <CenteredGrid>
-        {isOffline ? (
-          <Typography>{t('Offline')}</Typography>
-        ) : isLoading ? (
-          <CircularProgress />
-        ) : (
-          !torrents.length && <Typography>{t('NoTorrentsAdded')}</Typography>
-        )}
-      </CenteredGrid>
-    )
-  }
-
-  return (
-    <TorrentListWrapper>
-      {torrents.map(torrent => (
-        <TorrentCard key={torrent.hash} torrent={torrent} />
-      ))}
-    </TorrentListWrapper>
-  )
-}

web/src/components/TorrentList/AddFirstTorrent.jsx

@@ -0,0 +1,29 @@
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import AddDialog from '../Add/AddDialog'
+import IconWrapper from './style'
+
+export default function AddFirstTorrent() {
+  const { t } = useTranslation()
+  const [isDialogOpen, setIsDialogOpen] = useState(false)
+  const handleClickOpen = () => setIsDialogOpen(true)
+  const handleClose = () => setIsDialogOpen(false)
+
+  return (
+    <>
+      <IconWrapper onClick={() => handleClickOpen(true)} isButton>
+        <lord-icon
+          src='https://cdn.lordicon.com/bbnkwdur.json'
+          trigger='loop'
+          colors='primary:#121331,secondary:#00A572'
+          stroke='26'
+          scale='60'
+        />
+        <div className='icon-label'>{t('NoTorrentsAdded')}</div>
+      </IconWrapper>
+
+      {isDialogOpen && <AddDialog handleClose={handleClose} />}
+    </>
+  )
+}

web/src/components/TorrentList/NoServerConnection.jsx

@@ -0,0 +1,20 @@
+import { useTranslation } from 'react-i18next'
+
+import IconWrapper from './style'
+
+export default function NoServerConnection() {
+  const { t } = useTranslation()
+
+  return (
+    <IconWrapper>
+      <lord-icon
+        src='https://cdn.lordicon.com/wrprwmwt.json'
+        trigger='loop'
+        colors='primary:#121331,secondary:#00A572'
+        stroke='26'
+        scale='60'
+      />
+      <div className='icon-label'>{t('Offline')}</div>
+    </IconWrapper>
+  )
+}

web/src/components/TorrentList/index.jsx

@@ -0,0 +1,30 @@
+import TorrentCard from 'components/TorrentCard'
+import CircularProgress from '@material-ui/core/CircularProgress'
+import { TorrentListWrapper, CenteredGrid } from 'components/App/style'
+
+import NoServerConnection from './NoServerConnection'
+import AddFirstTorrent from './AddFirstTorrent'
+
+export default function TorrentList({ isOffline, isLoading, torrents }) {
+  if (isLoading || isOffline || !torrents.length) {
+    return (
+      <CenteredGrid>
+        {isOffline ? (
+          <NoServerConnection />
+        ) : isLoading ? (
+          <CircularProgress />
+        ) : (
+          !torrents.length && <AddFirstTorrent />
+        )}
+      </CenteredGrid>
+    )
+  }
+
+  return (
+    <TorrentListWrapper>
+      {torrents.map(torrent => (
+        <TorrentCard key={torrent.hash} torrent={torrent} />
+      ))}
+    </TorrentListWrapper>
+  )
+}

web/src/components/TorrentList/style.js

@@ -0,0 +1,30 @@
+import styled, { css } from 'styled-components'
+
+export default styled.div`
+  ${({ isButton }) => css`
+    display: grid;
+    place-items: center;
+    padding: 20px 40px;
+    border-radius: 5px;
+
+    ${isButton &&
+    css`
+      background: #93d7b4;
+      transition: 0.2s;
+
+      cursor: pointer;
+      :hover {
+        background: #71cc9d;
+      }
+    `}
+
+    lord-icon {
+      width: 200px;
+      height: 200px;
+    }
+
+    .icon-label {
+      font-size: 20px;
+    }
+  `}
+`