Skip to content

Adjust sidebar layout to prevent overflow on mobile devices #687

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

Open
Kinder0102 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Adjust sidebar layout to prevent overflow on mobile devices #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions ui/src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import { Suspense } from 'react';
import AuthWrapper from '@/components/AuthWrapper';
import DocModal from '@/components/DocModal';

import { FaBars } from 'react-icons/fa6';

export const dynamic = 'force-dynamic';

const inter = Inter({ subsets: ['latin'] });
Expand All @@ -29,9 +31,11 @@ export default function RootLayout({ children }: { children: React.ReactNode })
<body className={inter.className}>
<ThemeProvider>
<AuthWrapper authRequired={authRequired}>
<div className="flex h-screen bg-gray-950">
<Sidebar />
<main className="flex-1 overflow-auto bg-gray-950 text-gray-100 relative">
<div className="flex h-screen bg-gray-950 group">
<label htmlFor="sidebar-toggle" className="hidden fixed inset-0 z-30 bg-gray-900/75 group-has-[#sidebar-toggle:checked]:block">
</label>
<Sidebar className="fixed top-0 left-0 z-40 w-56 h-screen transition-transform -translate-x-full sm:translate-x-0 group-has-[#sidebar-toggle:checked]:translate-x-0" />
<main className="flex-1 overflow-auto bg-gray-950 text-gray-100 relative sm:ml-56">
<Suspense>{children}</Suspense>
</main>
</div>
Expand Down
8 changes: 6 additions & 2 deletions ui/src/components/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Link from 'next/link';
import classNames from 'classnames';
import { Home, Settings, BrainCircuit, Images, Plus } from 'lucide-react';
import { FaXTwitter, FaDiscord, FaYoutube } from 'react-icons/fa6';

const Sidebar = () => {
const Sidebar = ({ className }) => {
const navigation = [
{ name: 'Dashboard', href: '/dashboard', icon: Home },
{ name: 'New Job', href: '/jobs/new', icon: Plus },
Expand All @@ -16,7 +17,10 @@ const Sidebar = () => {
const socialIconClass = 'w-5 h-5 text-gray-400 hover:text-white';

return (
<div className="flex flex-col w-59 bg-gray-900 text-gray-100">
<div className={classNames(
'flex flex-col bg-gray-900 text-gray-100',
className,
)}>
<div className="px-4 py-3">
<h1 className="text-l">
<img src="/ostris_logo.png" alt="Ostris AI Toolkit" className="w-auto h-7 mr-3 inline" />
Expand Down
6 changes: 6 additions & 0 deletions ui/src/components/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import classNames from 'classnames';
import { FaBars } from "react-icons/fa";

interface Props {
className?: string;
Expand All @@ -13,6 +14,11 @@ export const TopBar: React.FC<Props> = ({ children, className }) => {
className,
)}
>
<label className="mr-2 cursor-pointer sm:hidden">
<input id="sidebar-toggle" type="checkbox" hidden />
<FaBars />
</label>

{children ? children : null}
</div>
);
Expand Down