Merge remote-tracking branch 'origin/master'

Author: rinriko

src/app/layout.tsx

@@ -2,8 +2,7 @@
 import './globals.css';
 import { ReactNode } from 'react';
 import Navbar from '@/components/Navbar/Navbar';
-// import Controller from '@/components/Controller';
-import SidebarLayout from '@/components/Sidebar/SidebarLayout';
+import Sidebar from '@/components/Sidebar/Sidebar';
 import { PlotSettingsProvider } from '@/context/PlotSettingsContext';
 export const metadata = {
   title: 'JWST Precision Timing',
@@ -18,8 +17,8 @@ export default function RootLayout({ children }: { children: ReactNode }) {
           <PlotSettingsProvider>
             <Navbar />
             <div className="flex flex-1 overflow-hidden">
-              <SidebarLayout />
-              <main className="flex-1 h-[calc(100vh-4rem)] overflow-auto">
+              <Sidebar />
+              <main className="flex-1 h-[calc(100vh-52px)] overflow-auto">
                 {children}
               </main>
             </div>

src/app/not-found.tsx

@@ -1,4 +1,6 @@
 import React from 'react';
+import Link from 'next/link';
+
 export default function NotFound() {
     return (
         <main className="grid min-h-full place-items-center bg-white px-6 py-24 sm:py-32 lg:px-8">
@@ -11,12 +13,12 @@ export default function NotFound() {
                     Sorry, we couldn’t find the page you’re looking for.
                 </p>
                 <div className="mt-10 flex items-center justify-center gap-x-6">
-                    <a
+                    <Link
                         href="/"
                         className="rounded-md bg-indigo-600 px-3.5 py-2.5 text-sm font-semibold text-white shadow-xs hover:bg-indigo-500 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
                     >
                         Go back home
-                    </a>
+                    </Link>
                     <a href="/contact" className="text-sm font-semibold text-gray-900">
                         Contact support <span aria-hidden="true">&rarr;</span>
                     </a>

src/app/page.tsx

@@ -2,7 +2,7 @@ import LightCurvePlot from '@/components/LightCurvePlot';
 
 export default function HomePage() {
   return (
-    <main className="min-h-screen bg-gray-50">
+    <main className="min-h-full bg-gray-50 overflow-auto">
       <LightCurvePlot />
     </main>
   );