Merge pull request #259 from LL08-MathematicalModelling-dowell/fronte…

…nd-Norah Removed sidebar and header, border
LL08-MathematicalModelling-dowell · Jun 3, 2024 · 33097d3 · 33097d3
2 parents b080a85 + 23e7b13
commit 33097d3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/App.jsx b/src/App.jsx
@@ -13,9 +13,9 @@ function App() {
   const { search } = useLocation();
   const queryParams = new URLSearchParams(search);
   const publicLink = queryParams.get('scale_type');
-  const plinks = queryParams.get('booth');
   const location = useLocation();
   const isHome = location.pathname === '/100035-DowellScale-Function//home';
+  const masterLink = location.pathname === '/100035-DowellScale-Function/home/master-link';
   const [isSidebarVisible, setIsSidebarVisible] = useState(true);
 
   useEffect(() => {
@@ -31,11 +31,11 @@ function App() {
 
   return (
     <div>
-      {!publicLink &&  <Navbar />}
+      {!publicLink &&  !masterLink && <Navbar />}
     <div className='flex'>
       <ToastContainer />
       <FetchUserContextProvider>
-      {!publicLink &&  <SideBar />}
+      {!publicLink && !masterLink &&  <SideBar />}
         <Outlet />
       </FetchUserContextProvider>
     </div>

diff --git a/src/main.jsx b/src/main.jsx
@@ -120,7 +120,7 @@ const router = createBrowserRouter([
         element: <GenerateReport />,
       },
       {
-        path: `${basePath}/home/booth`,
+        path: `${basePath}/home/master-link`,
         element: <Booth />,
       },  
       {

diff --git a/src/pages/scales/report/Booth.jsx b/src/pages/scales/report/Booth.jsx
@@ -3,7 +3,7 @@ import dowellLogo from '../../../assets/dowell-logo.png';
 
 const Booth = () => {
   return (
-    <div className='flex flex-col rounded-lg items-center mt-10 w-[320px] h-[550px] m-auto border'>
+    <div className='flex flex-col items-center mt-10 w-[320px] h-[550px] m-auto'>
       <img className='mt-10' src='https://cdn.discordapp.com/attachments/1108341894162952192/1247115439675277424/image.png?ex=665eda43&is=665d88c3&hm=f56e39dc3fdcc0568aaa30ee96283958693cb3909acc5dea18373633d5fc9f07&' alt='booth image'/>
       <h3 className='mt-[140px]'>Please enter your booth number</h3>
       <input className='w-[150px] h-[30px] border-2 border-black mt-5' />