Skip to content

Commit

Permalink
Merge pull request #258 from LL08-MathematicalModelling-dowell/fronte…
Browse files Browse the repository at this point in the history
…nd-Norah

Frontend norah
  • Loading branch information
norahwinda authored Jun 3, 2024
2 parents 2657dfd + 725e3e9 commit b080a85
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 3 deletions.
5 changes: 3 additions & 2 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ 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 [isSidebarVisible, setIsSidebarVisible] = useState(true);
Expand All @@ -30,11 +31,11 @@ function App() {

return (
<div>
{!publicLink && <Navbar />}
{!publicLink && <Navbar />}
<div className='flex'>
<ToastContainer />
<FetchUserContextProvider>
{!publicLink && <SideBar />}
{!publicLink && <SideBar />}
<Outlet />
</FetchUserContextProvider>
</div>
Expand Down
5 changes: 5 additions & 0 deletions src/main.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ import {
Report,
ScaleReportSettings,
ReportAnalyis,
Booth,
} from './pages/scales/report';

import {
Expand Down Expand Up @@ -117,6 +118,10 @@ const router = createBrowserRouter([
{
path: `${basePath}/home/generate-report/:slug`,
element: <GenerateReport />,
},
{
path: `${basePath}/home/booth`,
element: <Booth />,
},
{
path: `${basePath}/home/pc-scale`,
Expand Down
15 changes: 15 additions & 0 deletions src/pages/scales/report/Booth.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from 'react'
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'>
<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' />
<button className='w-[70px] h-[30px] rounded-lg mt-[100px] bg-[#FEC39C]'>Go</button>
</div>
)
}

export default Booth
3 changes: 2 additions & 1 deletion src/pages/scales/report/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

export { default as Report } from './Report';
export { default as ScaleReportSettings } from './ScaleReportSettings';
export { default as ReportAnalyis } from './ReportAnalysis'
export { default as ReportAnalyis } from './ReportAnalysis';
export { default as Booth } from './Booth'

0 comments on commit b080a85

Please sign in to comment.