Skip to content

fix: prevent sidebar from overlapping torrent cards on mobile #695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
staners2 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: prevent sidebar from overlapping torrent cards on mobile #695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions server/web/pages/template/html.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,20 +118,20 @@ var Mstile150x150png []byte
//go:embed pages/site.webmanifest
var Sitewebmanifest []byte

//go:embed pages/static/js/2.d0681903.chunk.js
var Staticjs2d0681903chunkjs []byte
//go:embed pages/static/js/2.ae436bd7.chunk.js
var Staticjs2ae436bd7chunkjs []byte

//go:embed pages/static/js/2.d0681903.chunk.js.LICENSE.txt
var Staticjs2d0681903chunkjsLICENSEtxt []byte
//go:embed pages/static/js/2.ae436bd7.chunk.js.LICENSE.txt
var Staticjs2ae436bd7chunkjsLICENSEtxt []byte

//go:embed pages/static/js/2.d0681903.chunk.js.map
var Staticjs2d0681903chunkjsmap []byte
//go:embed pages/static/js/2.ae436bd7.chunk.js.map
var Staticjs2ae436bd7chunkjsmap []byte

//go:embed pages/static/js/main.53e2dc27.chunk.js
var Staticjsmain53e2dc27chunkjs []byte
//go:embed pages/static/js/main.a02babbf.chunk.js
var Staticjsmaina02babbfchunkjs []byte

//go:embed pages/static/js/main.53e2dc27.chunk.js.map
var Staticjsmain53e2dc27chunkjsmap []byte
//go:embed pages/static/js/main.a02babbf.chunk.js.map
var Staticjsmaina02babbfchunkjsmap []byte

//go:embed pages/static/js/runtime-main.5ed86a79.js
var Staticjsruntimemain5ed86a79js []byte
Expand Down
14 changes: 7 additions & 7 deletions server/web/pages/template/pages/asset-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"files": {
"main.js": "./static/js/main.53e2dc27.chunk.js",
"main.js.map": "./static/js/main.53e2dc27.chunk.js.map",
"main.js": "./static/js/main.a02babbf.chunk.js",
"main.js.map": "./static/js/main.a02babbf.chunk.js.map",
"runtime-main.js": "./static/js/runtime-main.5ed86a79.js",
"runtime-main.js.map": "./static/js/runtime-main.5ed86a79.js.map",
"static/js/2.d0681903.chunk.js": "./static/js/2.d0681903.chunk.js",
"static/js/2.d0681903.chunk.js.map": "./static/js/2.d0681903.chunk.js.map",
"static/js/2.ae436bd7.chunk.js": "./static/js/2.ae436bd7.chunk.js",
"static/js/2.ae436bd7.chunk.js.map": "./static/js/2.ae436bd7.chunk.js.map",
"index.html": "./index.html",
"static/js/2.d0681903.chunk.js.LICENSE.txt": "./static/js/2.d0681903.chunk.js.LICENSE.txt"
"static/js/2.ae436bd7.chunk.js.LICENSE.txt": "./static/js/2.ae436bd7.chunk.js.LICENSE.txt"
},
"entrypoints": [
"static/js/runtime-main.5ed86a79.js",
"static/js/2.d0681903.chunk.js",
"static/js/main.53e2dc27.chunk.js"
"static/js/2.ae436bd7.chunk.js",
"static/js/main.a02babbf.chunk.js"
]
}
2 changes: 1 addition & 1 deletion server/web/pages/template/pages/index.html
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions server/web/pages/template/pages/static/js/2.ae436bd7.chunk.js
View file
Open in desktop

Large diffs are not rendered by default.

0 ...static/js/2.d0681903.chunk.js.LICENSE.txt → ...static/js/2.ae436bd7.chunk.js.LICENSE.txt
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions server/web/pages/template/pages/static/js/2.ae436bd7.chunk.js.map
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions server/web/pages/template/pages/static/js/2.d0681903.chunk.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion server/web/pages/template/pages/static/js/2.d0681903.chunk.js.map
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions server/web/pages/template/pages/static/js/main.53e2dc27.chunk.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion server/web/pages/template/pages/static/js/main.53e2dc27.chunk.js.map
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions server/web/pages/template/pages/static/js/main.a02babbf.chunk.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions server/web/pages/template/pages/static/js/main.a02babbf.chunk.js.map
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions server/web/pages/template/route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ func RouteWebPages(route gin.IRouter) {
etag := fmt.Sprintf("%x", md5.Sum(Browserconfigxml))
c.Header("Cache-Control", "public, max-age=31536000")
c.Header("ETag", etag)
c.Data(200, "text/xml; charset=utf-8", Browserconfigxml)
c.Data(200, "application/xml; charset=utf-8", Browserconfigxml)
})

route.GET("/dlnaicon-120.png", func(c *gin.Context) {
Expand Down Expand Up @@ -280,39 +280,39 @@ func RouteWebPages(route gin.IRouter) {
c.Data(200, "application/manifest+json", Sitewebmanifest)
})

route.GET("/static/js/2.d0681903.chunk.js", func(c *gin.Context) {
etag := fmt.Sprintf("%x", md5.Sum(Staticjs2d0681903chunkjs))
route.GET("/static/js/2.ae436bd7.chunk.js", func(c *gin.Context) {
etag := fmt.Sprintf("%x", md5.Sum(Staticjs2ae436bd7chunkjs))
c.Header("Cache-Control", "public, max-age=31536000")
c.Header("ETag", etag)
c.Data(200, "text/javascript; charset=utf-8", Staticjs2d0681903chunkjs)
c.Data(200, "text/javascript; charset=utf-8", Staticjs2ae436bd7chunkjs)
})

route.GET("/static/js/2.d0681903.chunk.js.LICENSE.txt", func(c *gin.Context) {
etag := fmt.Sprintf("%x", md5.Sum(Staticjs2d0681903chunkjsLICENSEtxt))
route.GET("/static/js/2.ae436bd7.chunk.js.LICENSE.txt", func(c *gin.Context) {
etag := fmt.Sprintf("%x", md5.Sum(Staticjs2ae436bd7chunkjsLICENSEtxt))
c.Header("Cache-Control", "public, max-age=31536000")
c.Header("ETag", etag)
c.Data(200, "text/plain; charset=utf-8", Staticjs2d0681903chunkjsLICENSEtxt)
c.Data(200, "text/plain; charset=utf-8", Staticjs2ae436bd7chunkjsLICENSEtxt)
})

route.GET("/static/js/2.d0681903.chunk.js.map", func(c *gin.Context) {
etag := fmt.Sprintf("%x", md5.Sum(Staticjs2d0681903chunkjsmap))
route.GET("/static/js/2.ae436bd7.chunk.js.map", func(c *gin.Context) {
etag := fmt.Sprintf("%x", md5.Sum(Staticjs2ae436bd7chunkjsmap))
c.Header("Cache-Control", "public, max-age=31536000")
c.Header("ETag", etag)
c.Data(200, "application/json", Staticjs2d0681903chunkjsmap)
c.Data(200, "application/json", Staticjs2ae436bd7chunkjsmap)
})

route.GET("/static/js/main.53e2dc27.chunk.js", func(c *gin.Context) {
etag := fmt.Sprintf("%x", md5.Sum(Staticjsmain53e2dc27chunkjs))
route.GET("/static/js/main.a02babbf.chunk.js", func(c *gin.Context) {
etag := fmt.Sprintf("%x", md5.Sum(Staticjsmaina02babbfchunkjs))
c.Header("Cache-Control", "public, max-age=31536000")
c.Header("ETag", etag)
c.Data(200, "text/javascript; charset=utf-8", Staticjsmain53e2dc27chunkjs)
c.Data(200, "text/javascript; charset=utf-8", Staticjsmaina02babbfchunkjs)
})

route.GET("/static/js/main.53e2dc27.chunk.js.map", func(c *gin.Context) {
etag := fmt.Sprintf("%x", md5.Sum(Staticjsmain53e2dc27chunkjsmap))
route.GET("/static/js/main.a02babbf.chunk.js.map", func(c *gin.Context) {
etag := fmt.Sprintf("%x", md5.Sum(Staticjsmaina02babbfchunkjsmap))
c.Header("Cache-Control", "public, max-age=31536000")
c.Header("ETag", etag)
c.Data(200, "application/json", Staticjsmain53e2dc27chunkjsmap)
c.Data(200, "application/json", Staticjsmaina02babbfchunkjsmap)
})

route.GET("/static/js/runtime-main.5ed86a79.js", func(c *gin.Context) {
Expand Down
6 changes: 4 additions & 2 deletions web/src/components/App/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import getStyledComponentsTheme from 'style/getStyledComponentsTheme'
import checkIsIOS from 'utils/checkIsIOS'
import SearchDialog from 'components/Search/SearchDialog'

import { AppWrapper, AppHeader, HeaderToggle, StyledIconButton } from './style'
import { AppWrapper, AppHeader, HeaderToggle, StyledIconButton, SidebarOverlay } from './style'
import Sidebar from './Sidebar'
import PWAFooter from './PWAFooter'
import { PWAInstallationGuide } from './PWAInstallationGuide'
Expand Down Expand Up @@ -74,7 +74,7 @@ export default function App() {

{/* Div100vh - iOS WebKit fix */}
<Div100vh>
<AppWrapper>
<AppWrapper isDrawerOpen={isDrawerOpen}>
<AppHeader>
<StyledIconButton edge='start' color='inherit' onClick={() => setIsDrawerOpen(!isDrawerOpen)}>
{isDrawerOpen ? <CloseIcon /> : <MenuIcon />}
Expand Down Expand Up @@ -140,6 +140,8 @@ export default function App() {
</div>
</AppHeader>

<SidebarOverlay isDrawerOpen={isDrawerOpen} onClick={() => setIsDrawerOpen(false)} />

<Sidebar
isOffline={isOffline}
isLoading={isLoading}
Expand Down
36 changes: 33 additions & 3 deletions web/src/components/App/style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,24 @@ import { pwaFooterHeight } from './PWAFooter/style'

export const AppWrapper = styled.div`
${({
isDrawerOpen,
theme: {
app: { appSecondaryColor },
},
}) => css`
height: 100%;
background: ${rgba(appSecondaryColor, 0.8)};
display: grid;
grid-template-columns: 60px 1fr;
grid-template-columns: ${isDrawerOpen ? '240px' : '60px'} 1fr;
grid-template-rows: 60px 1fr;
grid-template-areas:
'head head'
'side content';
transition: grid-template-columns 195ms cubic-bezier(0.4, 0, 0.6, 1) 0ms;

@media (max-width: 700px) {
grid-template-columns: 0 1fr;
}

${standaloneMedia(css`
grid-template-columns: 0 1fr;
Expand Down Expand Up @@ -69,10 +75,8 @@ export const AppSidebarStyle = styled.div`
},
}) => 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(appSecondaryColor, 0.12)};
background: ${sidebarBGColor};
color: ${sidebarFillColor};
Expand All @@ -91,6 +95,17 @@ export const AppSidebarStyle = styled.div`
fill: ${sidebarFillColor};
}

@media (max-width: 700px) {
position: fixed;
top: 60px;
left: 0;
bottom: 0;
width: 240px;
transform: translateX(${isDrawerOpen ? '0' : '-100%'});
transition: transform 195ms cubic-bezier(0.4, 0, 0.6, 1) 0ms;
box-shadow: ${isDrawerOpen ? '2px 0 8px rgba(0,0,0,0.3)' : 'none'};
}

${standaloneMedia(css`
display: none;
`)}
Expand Down Expand Up @@ -159,6 +174,21 @@ export const HeaderToggle = styled.div`
`}
`

export const SidebarOverlay = styled.div`
display: none;

@media (max-width: 700px) {
display: ${({ isDrawerOpen }) => (isDrawerOpen ? 'block' : 'none')};
position: fixed;
top: 60px;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.5);
z-index: 1;
}
`

export const StyledIconButton = styled(IconButton)`
margin-right: 6px;

Expand Down