diff --git a/package.json b/package.json index 8dc2600..df8943c 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,11 @@ "private": true, "dependencies": { "@bedrock-layout/appboundary": "^2.2.4", + "@bedrock-layout/center": "^2.2.5", "@bedrock-layout/columns": "^2.3.4", + "@bedrock-layout/cover": "^2.2.5", "@bedrock-layout/frame": "^2.2.4", + "@bedrock-layout/grid": "^2.2.5", "@bedrock-layout/inline": "^2.3.3", "@bedrock-layout/inline-cluster": "^2.4.2", "@bedrock-layout/padbox": "^2.1.4", 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/Inputs/Toggle/Toggle.tsx b/src/components/Common/Inputs/Toggle/Toggle.tsx new file mode 100644 index 0000000..8273ede --- /dev/null +++ b/src/components/Common/Inputs/Toggle/Toggle.tsx @@ -0,0 +1,51 @@ +import { useState } from "react"; +import { AnimatedBG } from "../../../../types/state"; +import { + ToggleContainer, + ToggleBody, + ToggleInput, + ToggleLabel, + ToggleBackground, + ToggleCircle, +} from "./styles"; + +export type ToggleProps = { + label: string, + toggled: boolean, + onToggle: (value: AnimatedBG) => void, + showIndicators?: boolean, +}; +/** + * This is my attempt at making a iOS-style toggle switch. + */ +export const Toggle = ({ + label, + toggled, + onToggle, + showIndicators = false, +}: ToggleProps) => { + const [hovered, setHovered] = useState(false); + return ( + + {label}{" "} + + onToggle(e.target.checked)} + /> + setHovered(true)} + onMouseUp={() => setHovered(false)} + > + + + + + + + ); +}; diff --git a/src/components/Common/Inputs/Toggle/index.ts b/src/components/Common/Inputs/Toggle/index.ts new file mode 100644 index 0000000..f99c198 --- /dev/null +++ b/src/components/Common/Inputs/Toggle/index.ts @@ -0,0 +1 @@ +export * from "./Toggle"; diff --git a/src/components/Common/Inputs/Toggle/styles.ts b/src/components/Common/Inputs/Toggle/styles.ts new file mode 100644 index 0000000..d706654 --- /dev/null +++ b/src/components/Common/Inputs/Toggle/styles.ts @@ -0,0 +1,94 @@ +import styled, { css } from "styled-components"; + +type ToggleContainerProps = { + fontSize?: string; +} +export const ToggleContainer = styled.div` + text-align: center; + font-size: ${({ fontSize = "inherit" }) => fontSize}; +`; +ToggleContainer.displayName = "ToggleContainer"; + +export const ToggleBody = styled.div` + position: relative; + display: inline-block; + text-align: left; + top: 0.5em; +`; +ToggleBody.displayName = "ToggleBody"; + +export const ToggleInput = styled.input` + display: none; +`; +ToggleInput.displayName = "ToggleInput"; + +export const ToggleLabel = styled.label` + display: block; + overflow: hidden; + border-radius: .75em; + height: 1.5em; + width: 2.7em; + cursor: pointer; +`; +ToggleLabel.displayName = "ToggleLabel"; + +type ToggleBackgroundProps = { + toggled: boolean, + toggledColor?: string, + showIndicators?: boolean, +}; +export const ToggleBackground = styled.div` + background-color: ${({ + toggledColor, + toggled, + }) => ( + toggled ? + (toggledColor ?? (p => p.theme.colors.activeGreen)) : + p => p.theme.colors.lightGrey + )}; + width: 100%; + height: 100%; + transition: background-color 300ms; + + ${({ toggled }) => toggled && css` + box-shadow: inset 0 0 24px -16px black; + `} + + ${({ toggled, showIndicators }) => showIndicators && (toggled ? + css` + div:before { + position: absolute; + right: 26px; + bottom: -2px; + content: "I"; + color: ${p => p.theme.colors.darkGrey}; + } + ` : + css` + div:after { + position: absolute; + left: 23px; + bottom: -2px; + content: "O"; + color: ${p => p.theme.colors.grey}; + } + `)} +`; +ToggleBackground.displayName = "ToggleBackground"; + +type ToggleCircleProps = { + toggled: boolean, + stretched: boolean, +}; +export const ToggleCircle = styled.div` + position: absolute; + height: 1.3em; + width: ${({ stretched }) => stretched ? "1.6em": "1.3em"}; + border-radius: 0.65em; + margin: 0.1em; + background-color: white; + top: 0; + ${({ toggled }) => toggled ? css`right: 0;` : css`left: 0;`} +`; +ToggleCircle.displayName = "ToggleCircle"; + 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/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 5241e18..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"; @@ -15,6 +16,7 @@ export const MainMenu = React.forwardRef( links={[ { label: "Home", to: "/" }, { label: "Broadcast Page", to: "/broadcast" }, + { label: "Workspaces", to: "/workspaces" }, ]} /> ), diff --git a/src/components/Menu/styles.ts b/src/components/Menu/styles.ts index ea35d5e..5dee8cb 100644 --- a/src/components/Menu/styles.ts +++ b/src/components/Menu/styles.ts @@ -1,10 +1,11 @@ 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}; `; +Title.displayName = "Title"; export const MenuBar = styled(InlineCluster).attrs(() => ({ as: PadBox, @@ -16,25 +17,4 @@ 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; - `} -`; +MenuBar.displayName = "MenuBar"; diff --git a/src/components/Workspaces/Workspace/Workspace.tsx b/src/components/Workspaces/Workspace/Workspace.tsx new file mode 100644 index 0000000..398c8d7 --- /dev/null +++ b/src/components/Workspaces/Workspace/Workspace.tsx @@ -0,0 +1,37 @@ +import { useParams } from "react-router-dom"; +import { useSelector } from "react-redux"; +import { Center } from "@bedrock-layout/center"; +import { Stack } from "@bedrock-layout/stack"; + +import { workspaceSelector } from "../../../features/workspace/workspaceSelector"; + +import { PreviewWindow, H2, ControlsContainer } from "./styles"; +import { WorkspaceControls } from "./WorkspaceControls"; +import { MockupBlock } from "../../Common/MockupBlock.styled"; + +import { workspaceObject } from "../workspaces"; + +export const Workspace = () => { + const { workspaceId } = useParams(); + const { animatedBG } = useSelector(workspaceSelector); + return ( + +

{workspaceId ? workspaceObject[workspaceId] : "Unknown"}

+ + Preview Item + + + + +
+ ); +}; diff --git a/src/components/Workspaces/Workspace/WorkspaceControls.tsx b/src/components/Workspaces/Workspace/WorkspaceControls.tsx new file mode 100644 index 0000000..a88c1f9 --- /dev/null +++ b/src/components/Workspaces/Workspace/WorkspaceControls.tsx @@ -0,0 +1,24 @@ +import { Grid } from "@bedrock-layout/grid"; +import { useDispatch, useSelector } from "react-redux"; + +import { workspaceSelector } from "../../../features/workspace/workspaceSelector"; +import { setAnimatedBG } from "../../../features/workspace/workspaceSlice"; +import { AnimatedBG } from "../../../types/state"; + +import { Toggle } from "../../Common/Inputs/Toggle"; + +export const WorkspaceControls = () => { + const dispatch = useDispatch(); + const { animatedBG } = useSelector(workspaceSelector); + + return( + + { + dispatch(setAnimatedBG(value)); + }} /> + + ); +}; 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/Workspace/styles.ts b/src/components/Workspaces/Workspace/styles.ts new file mode 100644 index 0000000..17de027 --- /dev/null +++ b/src/components/Workspaces/Workspace/styles.ts @@ -0,0 +1,52 @@ +import styled, { css, keyframes } from "styled-components"; +import { PadBox } from "@bedrock-layout/padbox"; + +import bg from "../../../public/images/misc/checker-40x40.png"; + +const scrollAnimation = keyframes` + from { background-position: 0 0; } + to { background-position: 80px -40px; } +`; + +export type PreviewWindowProps = { + height: number, + width: number, + animatedBG?: boolean, +}; +export const PreviewWindow = styled(PadBox).attrs(() => ({ + padding: "lg", +}))` + display: flex; + justify-content: center; + align-items: center; + + height: ${({ height }) => height}px; + width: ${({ width }) => width}px; + + border-radius: 1em; + + background-image: url("${bg}"); + background-position: 0px 0px; + background-repeat: repeat; + + ${({ animatedBG }) => animatedBG && css` + animation: ${scrollAnimation} 5s linear infinite; + `} +`; +PreviewWindow.displayName = "PreviewWindow"; + +export const H2 = styled.h2` + margin: 0.2em; + color: ${p => p.theme.colors.darkGrey}; + font-family: ${p => p.theme.fonts.f1Regular}; + max-inline-size: 600px; +`; +H2.displayName = "H2"; + +export const ControlsContainer = styled(PadBox).attrs(() => ({ + padding: "lg", +}))` + background-color: ${p => p.theme.colors.faintGrey}; + border-radius: 1em; +`; +ControlsContainer.displayName = "ControlsContainer"; diff --git a/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx b/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx new file mode 100644 index 0000000..1c805d2 --- /dev/null +++ b/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx @@ -0,0 +1,34 @@ +import { WorkspaceListBox } from "./styles"; +import { Stack } from "@bedrock-layout/stack"; +import { NavLink } from "react-router-dom"; +import { MenuItem } from "../../Common/MenuItem.styled"; +import { workspaceList } from "../workspaces"; + +type WorkspaceListProps = { + headerOffset?: number, +}; +export const WorkspaceList = ({ headerOffset }: WorkspaceListProps) => ( + + + {workspaceList.map((workspace, i) => ( + + ))} + + +); + +type WorkspaceListNavLinkProps = { + to: string, + label: string, +}; +const WorkspaceListNavLink = ({ to, label }: WorkspaceListNavLinkProps) => ( +
  • + + {({ isActive }) => ( + + {label} + + )} + +
  • +); 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..9e1f838 --- /dev/null +++ b/src/components/Workspaces/WorkspaceList/styles.ts @@ -0,0 +1,16 @@ +import styled from "styled-components"; +import { PadBox } from "@bedrock-layout/padbox"; + +type WorkspaceListBoxProps = { + headerOffset?: number, +}; +export const WorkspaceListBox = styled(PadBox).attrs(() => ({ + padding: ["lg", "md"], +}))` + height: calc(100vh - ${({ headerOffset = 0 }) => `${headerOffset}px`}); + width: 100%; + background-image: linear-gradient(to bottom, #f0f0f0, #fff); + border-right: 1px solid ${p => p.theme.colors.darkGrey}; + overflow-y: scroll; +`; +WorkspaceListBox.displayName = "WorkspaceListBox"; diff --git a/src/components/Workspaces/WorkspacesRoute.tsx b/src/components/Workspaces/WorkspacesRoute.tsx new file mode 100644 index 0000000..0a5de85 --- /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/components/Workspaces/workspaces.ts b/src/components/Workspaces/workspaces.ts new file mode 100644 index 0000000..d10fb05 --- /dev/null +++ b/src/components/Workspaces/workspaces.ts @@ -0,0 +1,56 @@ +export const workspaceList = [ + { + name: "Workspace 1", + id: "workspace1", + }, + { + name: "Workspace 2", + id: "workspace2", + }, + { + name: "Workspace 3", + id: "workspace3", + }, + { + name: "Workspace 4 has a longer name than the rest", + id: "workspace4", + }, + { name: "blah", id: "blah0" }, + { name: "blah", id: "blah1" }, + { name: "blah", id: "blah2" }, + { name: "blah", id: "blah3" }, + { name: "blah", id: "blah4" }, + { name: "blah", id: "blah5" }, + { name: "blah", id: "blah6" }, + { name: "blah", id: "blah7" }, + { name: "blah", id: "blah8" }, + { name: "blah", id: "blah9" }, + { name: "blah", id: "blah10" }, + { name: "blah", id: "blah11" }, + { name: "blah", id: "blah12" }, + { name: "blah", id: "blah13" }, + { name: "blah", id: "blah14" }, + { name: "blah", id: "blah15" }, + { name: "blah", id: "blah16" }, + { name: "blah", id: "blah17" }, + { name: "blah", id: "blah18" }, + { name: "blah", id: "blah19" }, + { name: "blah", id: "blah20" }, + { name: "blah", id: "blah21" }, + { name: "blah", id: "blah22" }, + { name: "blah", id: "blah23" }, + { name: "blah", id: "blah24" }, + { name: "blah", id: "blah25" }, + { name: "blah", id: "blah26" }, + { name: "blah", id: "blah27" }, + { name: "blah", id: "blah28" }, + { name: "blah", id: "blah29" }, +]; + +export const workspaceObject = ((list: typeof workspaceList) => { + const obj: {[key: string]: string} = {}; + list.forEach(item => { + obj[item.id] = item.name; + }); + return obj; +})(workspaceList); diff --git a/src/features/workspace/workspaceSelector.ts b/src/features/workspace/workspaceSelector.ts new file mode 100644 index 0000000..2fcc78d --- /dev/null +++ b/src/features/workspace/workspaceSelector.ts @@ -0,0 +1,3 @@ +import { RootState } from "../../types/state"; + +export const workspaceSelector = (state: RootState) => state.workspace; diff --git a/src/features/workspace/workspaceSlice.ts b/src/features/workspace/workspaceSlice.ts new file mode 100644 index 0000000..eeb9e13 --- /dev/null +++ b/src/features/workspace/workspaceSlice.ts @@ -0,0 +1,23 @@ +import { createSlice, PayloadAction } from "@reduxjs/toolkit"; +import { RootState, WorkspaceId, AnimatedBG } from "../../types/state"; + +const initialState: RootState["workspace"] = { + workspaceId: "", + animatedBG: true, +}; + +export const workspaceSlice = createSlice({ + name: "workspace", + initialState, + reducers: { + setWorkspaceId: (state, action: PayloadAction) => { + state.workspaceId = action.payload; + }, + setAnimatedBG: (state, action: PayloadAction) => { + state.animatedBG = action.payload; + }, + }, +}); + +export const { setWorkspaceId, setAnimatedBG } = workspaceSlice.actions; +export default workspaceSlice.reducer; diff --git a/src/index.tsx b/src/index.tsx index 20efb90..735b07f 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -7,7 +7,10 @@ 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 { Workspace } from "./components/Workspaces/Workspace"; + import { GlobalStyle, theme } from "./shared/theme"; import { GlobalFonts } from "./fonts"; import { store } from "./store"; @@ -20,9 +23,15 @@ ReactDOM.render( - } > - } /> + }> + Home} /> + } /> + }> + Workspaces Home} /> + } /> + + Page Not Found} /> diff --git a/src/public/images/misc/checker-40x40.png b/src/public/images/misc/checker-40x40.png new file mode 100644 index 0000000..1b21321 Binary files /dev/null and b/src/public/images/misc/checker-40x40.png differ diff --git a/src/shared/theme.ts b/src/shared/theme.ts index c1a0fb9..4ee114a 100644 --- a/src/shared/theme.ts +++ b/src/shared/theme.ts @@ -14,11 +14,18 @@ export const theme = { orange: "#f4ae40", blue: "#387af5", pink: "#eb57a3", + activeGreen: "#65c466", grey: "#aaa", lightGrey: "#ddd", + faintGrey: "#eee", darkGrey: "#303030", videoFrameBG: "#333", }, + design: { + button: { + borderRadius: "0.25rem", + }, + }, }; export type MainThemeProps = ThemeProps; @@ -41,9 +48,4 @@ export const GlobalStyle = createGlobalStyle` button { font-family: ${p => p.theme.fonts.basic}; } - - .main { - padding: 70px 0 20px; - min-height: calc(100vh - 50px); - } `; diff --git a/src/store.ts b/src/store.ts index 862f533..ff421a5 100644 --- a/src/store.ts +++ b/src/store.ts @@ -1,9 +1,11 @@ import { configureStore, combineReducers } from "@reduxjs/toolkit"; import pageDimensions from "./features/pageDimensions/pageDimensionsSlice"; +import workspace from "./features/workspace/workspaceSlice"; export const store = configureStore({ reducer: combineReducers({ pageDimensions, + workspace, }), }); diff --git a/src/types/state.d.ts b/src/types/state.d.ts index 0dbc95b..07edffe 100644 --- a/src/types/state.d.ts +++ b/src/types/state.d.ts @@ -1,7 +1,9 @@ export type RootState = { pageDimensions: PageDimensions, + workspace: Workspace, }; +// Page Dimensions export type PageDimensions = { menu: MenuDimensions, }; @@ -9,3 +11,12 @@ export type PageDimensions = { export type MenuDimensions = { height: number, }; + +// Workspace +export type Workspace = { + workspaceId: WorkspaceId, + animatedBG: AnimatedBG, +}; + +export type WorkspaceId = string; +export type AnimatedBG = boolean; diff --git a/yarn.lock b/yarn.lock index da70954..a72fe20 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1081,6 +1081,13 @@ dependencies: "@bedrock-layout/spacing-constants" "^2.5.1" +"@bedrock-layout/center@^2.2.5": + version "2.2.5" + resolved "https://registry.yarnpkg.com/@bedrock-layout/center/-/center-2.2.5.tgz#a559215267ae6e008cadc790b8b287c74d99dcd0" + integrity sha512-Y3fXSFdwcxZh1A+VED/itwT5gAmlfuD0+5/hGV1/iHPvR8qCtZ7fbx/YyjA3Jb0P+NRX6sXrq5dCWv54fxvNMQ== + dependencies: + "@bedrock-layout/spacing-constants" "^2.5.1" + "@bedrock-layout/columns@^2.3.4": version "2.3.4" resolved "https://registry.yarnpkg.com/@bedrock-layout/columns/-/columns-2.3.4.tgz#805de442f9c5962dd9609d8ef8a05dd9768d7bd1" @@ -1092,6 +1099,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" @@ -1099,6 +1113,13 @@ dependencies: "@bedrock-layout/spacing-constants" "^2.5.1" +"@bedrock-layout/grid@^2.2.5": + version "2.2.5" + resolved "https://registry.yarnpkg.com/@bedrock-layout/grid/-/grid-2.2.5.tgz#36b622481c5d8b3bfb5a0fd76e5e0986ed69b098" + integrity sha512-5HteSi7BEWU7RTEBG9dRanqsKxf18aOcFj0V12S1muGki6Xc1yxw1V4O/GH/wGppvU1NH5ICxGuUBBqmXMPoyQ== + dependencies: + "@bedrock-layout/spacing-constants" "^2.5.1" + "@bedrock-layout/inline-cluster@^2.4.2": version "2.4.2" resolved "https://registry.yarnpkg.com/@bedrock-layout/inline-cluster/-/inline-cluster-2.4.2.tgz#0019482153b61f63a85cc0c22133f3ecac1e2821"