diff --git a/src/components/Common/MenuItem.styled.ts b/src/components/Common/MenuItem.styled.ts new file mode 100644 index 0000000..eb73e53 --- /dev/null +++ b/src/components/Common/MenuItem.styled.ts @@ -0,0 +1,37 @@ +import styled, { css } from "styled-components"; +import { PadBox } from "@bedrock-layout/padbox"; + +const hoverRules = css` + background: ${p => p.theme.colors.darkGrey}; + color: white; +`; + +export type MenuItemProps = { + isHovered?: boolean, + isActive?: boolean, +}; +export const MenuItem = styled(PadBox).attrs(() => ({ + padding: ["sm", "lg"], +})) ` + border-radius: ${p => p.theme.design.button.borderRadius}; + color: ${p => p.theme.colors.darkGrey}; + font-family: ${p => p.theme.fonts.f1Regular}; + font-size: 0.8em; + + ${({ isActive }) => isActive && css` + background: ${p => p.theme.colors.lightGrey}; + `} + ${({ isHovered }) => { + // My cheap way of having uncontrolled hover behavior. + if (isHovered == null) { + return css` + &:hover { + ${hoverRules} + } + `; + } else if (isHovered === true) { + return hoverRules; + } + }} +`; + diff --git a/src/components/Menu/Menu.tsx b/src/components/Menu/Menu.tsx index a18d375..d5c68f3 100644 --- a/src/components/Menu/Menu.tsx +++ b/src/components/Menu/Menu.tsx @@ -3,7 +3,8 @@ import { Link, NavLink } from "react-router-dom"; import { InlineCluster } from "@bedrock-layout/inline-cluster"; import useForwardedRef from "@bedrock-layout/use-forwarded-ref"; -import { MenuBar, MenuItem, Title } from "./styles"; +import { MenuBar, Title } from "./styles"; +import { MenuItem } from "../Common/MenuItem.styled"; import f1Logo from "../../public/images/logos/f1-logo-red.svg"; diff --git a/src/components/Menu/styles.ts b/src/components/Menu/styles.ts index ea35d5e..e095306 100644 --- a/src/components/Menu/styles.ts +++ b/src/components/Menu/styles.ts @@ -1,6 +1,6 @@ import { InlineCluster } from "@bedrock-layout/inline-cluster"; import { PadBox } from "@bedrock-layout/padbox"; -import styled, { css } from "styled-components"; +import styled from "styled-components"; export const Title = styled.h3` font-family: ${p => p.theme.fonts.f1Bold}; @@ -16,25 +16,3 @@ export const MenuBar = styled(InlineCluster).attrs(() => ({ background-image: linear-gradient(to right, #f0f0f0, #fff); border-block-end: 1px solid ${p => p.theme.colors.darkGrey}; `; - -type MenuItemProps = { - isHovered?: boolean, - isActive?: boolean, -}; -export const MenuItem = styled(PadBox).attrs(() => ({ - padding: ["sm", "lg"], -}))` - border-radius: 0.25rem; - color: ${p => p.theme.colors.darkGrey}; - font-family: ${p => p.theme.fonts.f1Regular}; - font-size: 0.8em; - - ${({ isActive }) => isActive && css` - background: ${p => p.theme.colors.lightGrey}; - `} - - ${({ isHovered }) => isHovered && css` - background: ${p => p.theme.colors.darkGrey}; - color: white; - `} -`; diff --git a/src/components/Workspaces/Workspace/Workspace.tsx b/src/components/Workspaces/Workspace/Workspace.tsx new file mode 100644 index 0000000..d280c63 --- /dev/null +++ b/src/components/Workspaces/Workspace/Workspace.tsx @@ -0,0 +1,7 @@ +import { useParams } from "react-router-dom"; + +export const Workspace = () => { + const params = useParams(); + return

{params.workspaceName}

; + +}; diff --git a/src/components/Workspaces/Workspace/index.ts b/src/components/Workspaces/Workspace/index.ts new file mode 100644 index 0000000..4e8fed9 --- /dev/null +++ b/src/components/Workspaces/Workspace/index.ts @@ -0,0 +1 @@ +export * from "./Workspace"; diff --git a/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx b/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx index 84dc897..b3fb792 100644 --- a/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx +++ b/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx @@ -1,10 +1,32 @@ import { WorkspaceListBox } from "./styles"; +import { Stack } from "@bedrock-layout/stack"; +import { NavLink } from "react-router-dom"; +import { MenuItem } from "../../Common/MenuItem.styled"; export const WorkspaceList = () => ( -
    -
  • what
  • -
  • what
  • -
+ + + + + + +
); + +type WorkspaceListNavLinkProps = { + to: string, + label: string, +}; +const WorkspaceListNavLink = ({ to, label }: WorkspaceListNavLinkProps) => ( +
  • + + {({ isActive }) => ( + + {label} + + )} + +
  • +); diff --git a/src/components/Workspaces/WorkspaceList/styles.ts b/src/components/Workspaces/WorkspaceList/styles.ts index c1491bb..b35772c 100644 --- a/src/components/Workspaces/WorkspaceList/styles.ts +++ b/src/components/Workspaces/WorkspaceList/styles.ts @@ -2,7 +2,7 @@ import styled from "styled-components"; import { PadBox } from "@bedrock-layout/padbox"; export const WorkspaceListBox = styled(PadBox).attrs(() => ({ - padding: ["lg", "sm"], + padding: ["lg", "md"], }))` height: 100%; width: 100%; diff --git a/src/components/Workspaces/WorkspacesRoute.tsx b/src/components/Workspaces/WorkspacesRoute.tsx index 669f109..6ae8376 100644 --- a/src/components/Workspaces/WorkspacesRoute.tsx +++ b/src/components/Workspaces/WorkspacesRoute.tsx @@ -12,7 +12,7 @@ export default function Workspaces() { return ( - + diff --git a/src/index.tsx b/src/index.tsx index 1468da0..e9cb396 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -9,6 +9,7 @@ import "./clear.css"; import App from "./App"; import Broadcast from "./components/Broadcast/BroadcastRoute"; import Workspaces from "./components/Workspaces/WorkspacesRoute"; +import { Workspace } from "./components/Workspaces/Workspace"; import { GlobalStyle, theme } from "./shared/theme"; import { GlobalFonts } from "./fonts"; @@ -22,12 +23,15 @@ ReactDOM.render( - } > + }> + Home} /> } /> }> - What} /> + Workspaces Home} /> + } /> + Page Not Found} /> diff --git a/src/shared/theme.ts b/src/shared/theme.ts index c1a0fb9..5197434 100644 --- a/src/shared/theme.ts +++ b/src/shared/theme.ts @@ -19,6 +19,11 @@ export const theme = { darkGrey: "#303030", videoFrameBG: "#333", }, + design: { + button: { + borderRadius: "0.25rem", + }, + }, }; export type MainThemeProps = ThemeProps;