From 02132bdbe296f8087c3e8a529d3681c44428d7f9 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Thu, 6 Jan 2022 18:40:59 -0500 Subject: [PATCH] ISSUE-005 - Initial work commit. Have some basic routing done and some mocked-up design of how the pay may look. Made improvements to the LayoutGrid component, supporting richer definition of grid columns and rows. --- package.json | 1 + .../Broadcast}/BroadcastRoute.tsx | 6 +-- src/components/Broadcast/Layout/Layout.tsx | 2 +- src/components/Broadcast/Layout/styles.ts | 31 ----------- .../Common/FullScreenContainer.styled.ts} | 4 +- src/components/Common/LayoutGrid.styled.ts | 53 +++++++++++++++++++ src/components/Menu/Menu.tsx | 1 + .../WorkspaceList/WorkspaceList.tsx | 10 ++++ .../Workspaces/WorkspaceList/index.ts | 1 + .../Workspaces/WorkspaceList/styles.ts | 11 ++++ src/components/Workspaces/WorkspacesRoute.tsx | 25 +++++++++ src/index.tsx | 9 +++- yarn.lock | 7 +++ 13 files changed, 122 insertions(+), 39 deletions(-) rename src/{routes => components/Broadcast}/BroadcastRoute.tsx (58%) delete mode 100644 src/components/Broadcast/Layout/styles.ts rename src/{routes/styles.ts => components/Common/FullScreenContainer.styled.ts} (98%) create mode 100644 src/components/Common/LayoutGrid.styled.ts create mode 100644 src/components/Workspaces/WorkspaceList/WorkspaceList.tsx create mode 100644 src/components/Workspaces/WorkspaceList/index.ts create mode 100644 src/components/Workspaces/WorkspaceList/styles.ts create mode 100644 src/components/Workspaces/WorkspacesRoute.tsx diff --git a/package.json b/package.json index 8dc2600..13b7adc 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "dependencies": { "@bedrock-layout/appboundary": "^2.2.4", "@bedrock-layout/columns": "^2.3.4", + "@bedrock-layout/cover": "^2.2.5", "@bedrock-layout/frame": "^2.2.4", "@bedrock-layout/inline": "^2.3.3", "@bedrock-layout/inline-cluster": "^2.4.2", diff --git a/src/routes/BroadcastRoute.tsx b/src/components/Broadcast/BroadcastRoute.tsx similarity index 58% rename from src/routes/BroadcastRoute.tsx rename to src/components/Broadcast/BroadcastRoute.tsx index dd6b436..1040288 100644 --- a/src/routes/BroadcastRoute.tsx +++ b/src/components/Broadcast/BroadcastRoute.tsx @@ -1,8 +1,8 @@ import { useSelector } from "react-redux"; -import { FullScreenContainer } from "./styles"; -import { Layout } from "../components/Broadcast/Layout"; -import { menuSelector } from "../features/pageDimensions/pageDimensionsSelector"; +import { FullScreenContainer } from "../Common/FullScreenContainer.styled"; +import { Layout } from "./Layout"; +import { menuSelector } from "../../features/pageDimensions/pageDimensionsSelector"; export default function Broadcast() { const { height } = useSelector(menuSelector); diff --git a/src/components/Broadcast/Layout/Layout.tsx b/src/components/Broadcast/Layout/Layout.tsx index daaaaed..1e1f818 100644 --- a/src/components/Broadcast/Layout/Layout.tsx +++ b/src/components/Broadcast/Layout/Layout.tsx @@ -1,6 +1,6 @@ import { MockupBlock } from "../../Common/MockupBlock.styled"; import VideoFeed from "../VideoFeed/VideoFeed"; -import { LayoutGrid, LayoutGridItem } from "./styles"; +import { LayoutGrid, LayoutGridItem } from "../../Common/LayoutGrid.styled"; type LayoutProps = { headerHeight?: number, diff --git a/src/components/Broadcast/Layout/styles.ts b/src/components/Broadcast/Layout/styles.ts deleted file mode 100644 index 8026b74..0000000 --- a/src/components/Broadcast/Layout/styles.ts +++ /dev/null @@ -1,31 +0,0 @@ -import styled from "styled-components"; - -type LayoutGridProps = { - columns?: number, - rows?: number, - headerOffset?: number, -}; -export const LayoutGrid = styled.div` - --columns: ${({ columns = 1 }) => columns}; - --rows: ${({ rows = 1 }) => rows}; - display: grid; - grid-template-columns: repeat(var(--columns), 1fr); - grid-template-rows: repeat(var(--rows), 1fr); - height: calc(100% - ${({ headerOffset = 0 }) => headerOffset}px); - width: 100%; -`; -LayoutGrid.displayName = "LayoutGrid"; - -type LayoutGridItemProps = { - column: number, - columnSpan?: number, - row: number, - rowSpan?: number, -}; -export const LayoutGridItem = styled.div` - grid-column: ${({ column }) => column} - / span ${({ columnSpan = 1 }) => columnSpan}; - grid-row: ${({ row }) => row} - / span ${({ rowSpan = 1 }) => rowSpan};; -`; -LayoutGridItem.displayName = "LayoutGridItem"; diff --git a/src/routes/styles.ts b/src/components/Common/FullScreenContainer.styled.ts similarity index 98% rename from src/routes/styles.ts rename to src/components/Common/FullScreenContainer.styled.ts index c81523a..0173b27 100644 --- a/src/routes/styles.ts +++ b/src/components/Common/FullScreenContainer.styled.ts @@ -10,8 +10,8 @@ type FullScreenContainerProps = { export const FullScreenContainer = styled.div` --minHeight: ${({ minHeight = 0 }) => `${minHeight}px`}; --minWidth: ${({ minWidth = 0 }) => `${minWidth}px`}; - --overflowY: ${({ minHeight }) => minHeight ? "scroll" : "hidden" }; - --overflowX: ${({ minWidth }) => minWidth ? "scroll" : "hidden" }; + --overflowY: ${({ minHeight }) => minHeight ? "scroll" : "hidden"}; + --overflowX: ${({ minWidth }) => minWidth ? "scroll" : "hidden"}; --heightCutoff: ${({ heightCutoff = 0 }) => `${heightCutoff}px`}; --widthCutoff: ${({ widthCutoff = 0 }) => `${widthCutoff}px`}; diff --git a/src/components/Common/LayoutGrid.styled.ts b/src/components/Common/LayoutGrid.styled.ts new file mode 100644 index 0000000..cc8bd40 --- /dev/null +++ b/src/components/Common/LayoutGrid.styled.ts @@ -0,0 +1,53 @@ +import styled from "styled-components"; + +type SizeProp = number | Array; + +/** + * Slickly handle different values + * @param prop a number will use 1fr repeated. An array will interpret numbers + * as fractions. Else you can define anything with strings (such as "100px"). + * @returns + */ +const parseSize = (prop: SizeProp): string => { + if (typeof prop === "number") { + return `repeat(${prop}, 1fr)`; + } + if (Array.isArray(prop)) { + return prop.map(value => { + if (typeof value === "number") { + return value + "fr"; + } else { + return value; + } + }).join(" "); + } + return "1"; +}; + +type LayoutGridProps = { + columns?: SizeProp, + rows?: SizeProp, + headerOffset?: number, +}; +export const LayoutGrid = styled.div` + display: grid; + grid-template-columns: ${({ columns = 1 }) => parseSize(columns)}; + grid-template-rows: ${({ rows = 1 }) => parseSize(rows)}; + height: calc(100% - ${({ headerOffset = 0 }) => headerOffset}px); + width: 100%; +`; +LayoutGrid.displayName = "LayoutGrid"; + +type LayoutGridItemProps = { + column: number, + columnSpan?: number, + row: number, + rowSpan?: number, +}; +export const LayoutGridItem = styled.div` + grid-column: ${({ column }) => column} + / span ${({ columnSpan = 1 }) => columnSpan}; + grid-row: ${({ row }) => row} + / span ${({ rowSpan = 1 }) => rowSpan};; +`; +LayoutGridItem.displayName = "LayoutGridItem"; diff --git a/src/components/Menu/Menu.tsx b/src/components/Menu/Menu.tsx index 5241e18..a18d375 100644 --- a/src/components/Menu/Menu.tsx +++ b/src/components/Menu/Menu.tsx @@ -15,6 +15,7 @@ export const MainMenu = React.forwardRef( links={[ { label: "Home", to: "/" }, { label: "Broadcast Page", to: "/broadcast" }, + { label: "Workspaces", to: "/workspaces" }, ]} /> ), diff --git a/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx b/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx new file mode 100644 index 0000000..84dc897 --- /dev/null +++ b/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx @@ -0,0 +1,10 @@ +import { WorkspaceListBox } from "./styles"; + +export const WorkspaceList = () => ( + +
    +
  • what
  • +
  • what
  • +
+
+); diff --git a/src/components/Workspaces/WorkspaceList/index.ts b/src/components/Workspaces/WorkspaceList/index.ts new file mode 100644 index 0000000..3b1890b --- /dev/null +++ b/src/components/Workspaces/WorkspaceList/index.ts @@ -0,0 +1 @@ +export * from "./WorkspaceList"; diff --git a/src/components/Workspaces/WorkspaceList/styles.ts b/src/components/Workspaces/WorkspaceList/styles.ts new file mode 100644 index 0000000..c1491bb --- /dev/null +++ b/src/components/Workspaces/WorkspaceList/styles.ts @@ -0,0 +1,11 @@ +import styled from "styled-components"; +import { PadBox } from "@bedrock-layout/padbox"; + +export const WorkspaceListBox = styled(PadBox).attrs(() => ({ + padding: ["lg", "sm"], +}))` + height: 100%; + width: 100%; + background-image: linear-gradient(to bottom, #f0f0f0, #fff); + border-right: 1px solid ${p => p.theme.colors.darkGrey}; +`; diff --git a/src/components/Workspaces/WorkspacesRoute.tsx b/src/components/Workspaces/WorkspacesRoute.tsx new file mode 100644 index 0000000..669f109 --- /dev/null +++ b/src/components/Workspaces/WorkspacesRoute.tsx @@ -0,0 +1,25 @@ +import { useSelector } from "react-redux"; +import { Outlet } from "react-router-dom"; + +import { menuSelector } from "../../features/pageDimensions/pageDimensionsSelector"; + +import { FullScreenContainer } from "../Common/FullScreenContainer.styled"; +import { WorkspaceList } from "./WorkspaceList"; +import { LayoutGrid, LayoutGridItem } from "../Common/LayoutGrid.styled"; + +export default function Workspaces() { + const { height } = useSelector(menuSelector); + + return ( + + + + + + + + + + + ); +} diff --git a/src/index.tsx b/src/index.tsx index 20efb90..1468da0 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -7,7 +7,9 @@ import { ThemeProvider } from "styled-components"; import "./clear.css"; import App from "./App"; -import Broadcast from "./routes/BroadcastRoute"; +import Broadcast from "./components/Broadcast/BroadcastRoute"; +import Workspaces from "./components/Workspaces/WorkspacesRoute"; + import { GlobalStyle, theme } from "./shared/theme"; import { GlobalFonts } from "./fonts"; import { store } from "./store"; @@ -21,7 +23,10 @@ ReactDOM.render( } > - } /> + } /> + }> + What} /> + diff --git a/yarn.lock b/yarn.lock index da70954..1d64612 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1092,6 +1092,13 @@ "@bedrock-layout/use-container-query" "^1.2.14" "@bedrock-layout/use-forwarded-ref" "^1.1.11" +"@bedrock-layout/cover@^2.2.5": + version "2.2.5" + resolved "https://registry.yarnpkg.com/@bedrock-layout/cover/-/cover-2.2.5.tgz#281d90719924a3e7bfa6d228b0c44235fede57ca" + integrity sha512-M2r8aZE7dCvluaSCBQ8kGktZ4L00LlF2Uxp3kZA1lAO/Y3fAocqVnp4apxZW5Wvmh7QPDZb4Ll+qE+d9YlxcNQ== + dependencies: + "@bedrock-layout/spacing-constants" "^2.5.1" + "@bedrock-layout/frame@^2.2.4": version "2.2.4" resolved "https://registry.yarnpkg.com/@bedrock-layout/frame/-/frame-2.2.4.tgz#7c124718e0543ec1b53903788d040d05a9e8e1de"