diff --git a/resources/scripts/routers/AdminRouter.tsx b/resources/scripts/routers/AdminRouter.tsx index ce7868e7b..325560760 100644 --- a/resources/scripts/routers/AdminRouter.tsx +++ b/resources/scripts/routers/AdminRouter.tsx @@ -1,3 +1,4 @@ +import { breakpoint } from '@/theme'; import React, { useState } from 'react'; import { NavLink, Route, RouteComponentProps, Switch } from 'react-router-dom'; import { State, useStoreState } from 'easy-peasy'; @@ -32,7 +33,7 @@ import MountsContainer from '@/components/admin/mounts/MountsContainer'; import MountEditContainer from '@/components/admin/mounts/MountEditContainer'; const Sidebar = styled.div<{ collapsed?: boolean }>` - ${tw`fixed h-screen flex flex-col items-center flex-shrink-0 bg-neutral-900 overflow-x-hidden transition-all duration-250 ease-linear`}; + ${tw`fixed h-screen hidden md:flex flex-col items-center flex-shrink-0 bg-neutral-900 overflow-x-hidden transition-all duration-250 ease-linear`}; ${props => props.collapsed ? 'width: 70px' : 'width: 287px'}; & > div.header { @@ -88,6 +89,14 @@ const Sidebar = styled.div<{ collapsed?: boolean }>` } `; +const Container = styled.div<{ collapsed?: boolean }>` + ${tw`w-full flex flex-col items-center transition-all duration-250 ease-linear`}; + ${props => props.collapsed ? + breakpoint('md')`padding-left: 70px` + : + breakpoint('md')`padding-left: 287px`}; +`; + const AdminRouter = ({ location, match }: RouteComponentProps) => { const user = useStoreState((state: State) => state.user.data); const applicationName = useStoreState((state: ApplicationStore) => state.settings.data!.name); @@ -95,7 +104,7 @@ const AdminRouter = ({ location, match }: RouteComponentProps) => { const [ collapsed, setCollapsed ] = useState(); return ( -
+
{ setCollapsed(!collapsed); } }> { !collapsed ? @@ -178,8 +187,20 @@ const AdminRouter = ({ location, match }: RouteComponentProps) => {
-
-
+
+

{applicationName}

+ +
+ +
+
+ + +
{/* */} @@ -255,7 +276,7 @@ const AdminRouter = ({ location, match }: RouteComponentProps) => { {/* */}
-
+
); };