Skip to content
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

Split "manage single video" page into multiple pages #595

Merged
merged 10 commits into from
Dec 12, 2022
Merged

Split "manage single video" page into multiple pages #595

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0257824
Slightly improve separation of both parts in the burger menu
LukasKalbertodt Nov 21, 2022
f2e7b74
Extract CSS logic for "multiline text-overflow: ellipsis" into function
LukasKalbertodt Nov 24, 2022
392adc8
Make `LinkWithIcon` font bold when active
LukasKalbertodt Nov 21, 2022
2faa88c
Restructure "manage single video" page into a multi-page UI
LukasKalbertodt Nov 21, 2022
74ff38d
Add links to track URIs in "technical details" on manage video page
LukasKalbertodt Nov 24, 2022
fb58a32
Fix inconsistent API by making `search::Realm` return "/" as root path
LukasKalbertodt Nov 24, 2022
3d769e2
Use "in page" link in "manage video" sidebar in the trivial case
LukasKalbertodt Nov 24, 2022
06d59f3
Move some translation strings related to "my videos" around
LukasKalbertodt Nov 24, 2022
1b428f7
Improve and fix translations according to code review
LukasKalbertodt Dec 12, 2022
8867a07
Get rid of type assertion
LukasKalbertodt Dec 12, 2022
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
18 changes: 11 additions & 7 deletions frontend/src/layout/Burger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import { ReactNode } from "react";


type BurgerMenuProps = {
hide: () => void;
children: ReactNode;
items: [] | [JSX.Element] | [JSX.Element, JSX.Element];
};

export const BurgerMenu: React.FC<BurgerMenuProps> = ({ hide, children }) => (
export const BurgerMenu: React.FC<BurgerMenuProps> = ({ hide, items }) => (
<div
onClick={e => {
if (e.target === e.currentTarget) {
Expand Down Expand Up @@ -35,11 +32,18 @@ export const BurgerMenu: React.FC<BurgerMenuProps> = ({ hide, children }) => (
width: "clamp(260px, 75%, 450px)",
overflowY: "auto",
borderTop: "1px solid var(--grey80)",
gap: 16,
"& > *:first-child": {
borderBottom: "1px solid var(--grey80)",
borderBottom: "1px dashed var(--grey80)",
},
"& > *:last-child": {
borderTop: "1px dashed var(--grey80)",
},
}}>
{children}
{items.length > 0 && <div>{items[0]}</div>}
{items.length > 1 && <>
<div>{items[1]}</div>
</>}
</div>
</div>
);
6 changes: 2 additions & 4 deletions frontend/src/layout/Root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,14 @@ type Props = {

export const Root: React.FC<Props> = ({ nav, children }) => {
const menu = useMenu();
const navElements = Array.isArray(nav) ? nav : [nav];
const navElements = Array.isArray(nav) ? nav : [nav] as [JSX.Element];
JulianKniephoff marked this conversation as resolved.
Show resolved Hide resolved
const navExists = navElements.length > 0;

return (
<Outer disableScrolling={menu.state === "burger"}>
<Header hideNavIcon={!navExists} />
{menu.state === "burger" && navExists && (
<BurgerMenu hide={() => menu.close()}>
{navElements.map((elem, i) => <div key={i}>{elem}</div>)}
</BurgerMenu>
<BurgerMenu items={navElements} hide={() => menu.close()} />
)}
<div css={{ margin: OUTER_CONTAINER_MARGIN }}>
<div css={{
Expand Down