Skip to content
Snippets Groups Projects
Commit b10aba6f authored by Daniel Pettersson's avatar Daniel Pettersson
Browse files

SearchComponent has been updated now displaying varieties of options depending on initial choice

parent 7cafbd06
No related branches found
No related tags found
1 merge request!6MultiSelectText component added offering adaptable selection views depending...
import React from 'react'; import React from 'react';
import '../../Css/Navbar.css' import '../../Css/Navbar.css'
function TopNavBar() { function TopNavBar({toggleDisplay, displayMap}) {
return ( return (
<div className="top-nav"> <div className="top-nav">
<button className='sign_out_button'>Sign Out</button> <button className='sign_out_button'>Sign Out</button>
{/* Toggle button to switch between Map and Visualiser */}
<button className='sign_out_button' onClick={toggleDisplay}>
{displayMap ? 'Switch to Visualiser' : 'Switch to Map'}
</button>
<h1 className='h1'>DASHBOARD</h1> <h1 className='h1'>DASHBOARD</h1>
</div> </div>
); );
......
...@@ -6,9 +6,14 @@ ...@@ -6,9 +6,14 @@
border-style: solid; border-style: solid;
box-shadow: 0 0 10px rgba(0, 0, 0, .2); box-shadow: 0 0 10px rgba(0, 0, 0, .2);
} }
.sign_out_button{
margin: 5px;
height: 50px;
}
.h1{ .h1{
margin-left: auto; top: 4%;
margin-right: auto; left: 40%;
margin-top: auto; right: 50%;
margin-bottom: auto; position:absolute;
} }
\ No newline at end of file
...@@ -12,6 +12,6 @@ ...@@ -12,6 +12,6 @@
} }
.h1{ .h2{
text-align: center; text-align: center;
} }
\ No newline at end of file
import '../../Css/Dashboard.css' import '../../Css/Dashboard.css';
import React, { useState } from 'react' import React, { useState } from 'react';
import TopNavBar from '../../Components/Navbar/Navbar'; import TopNavBar from '../../Components/Navbar/Navbar';
import Map from './Map'; import Map from './Map';
import Visualiser from './Visualiser'; import Visualiser from './Visualiser';
import { SearchComponent } from '../../Components/Search/SearchComponent'; import { SearchComponent } from '../../Components/Search/SearchComponent';
export const Dashboard = () => { export const Dashboard = () => {
const [data, setData] = useState({ label: "", id: "" }); const [data, setData] = useState({ label: "", id: "" });
const [region, setRegion] = useState({}); const [region, setRegion] = useState({});
const [displayMap, setDisplayMap] = useState(true); // State variable to track the currently displayed component
const handlerFunction = (Region_data) => { const handlerFunction = (Region_data) => {
setData(Region_data) setData(Region_data);
} };
const changeRegion = (regionName) => { const changeRegion = (regionName) => {
// Update the region state to trigger re-render and change the color of the specified region's path // Update the region state to trigger re-render and change the color of the specified region's path
setRegion(regionName); setRegion(regionName);
handlerFunction(data); handlerFunction(data);
};
const toggleDisplay = () => {
setDisplayMap(!displayMap); // Toggle the displayMap state
}; };
return ( return (
<div className='dashboard'> <div className='dashboard'>
<TopNavBar /> <TopNavBar toggleDisplay = {toggleDisplay} displayMap = {displayMap} />
<div className='container'> <div className='container'>
<div className='search_container'> <div className='search_container'>
<SearchComponent data={data.label} changeRegion={changeRegion} /> <SearchComponent data={data.label} changeRegion={changeRegion} />
</div> </div>
<div className='map_container' id="d3_map"> <div className='map_container' id="d3_map">
<Map handlerFunction={handlerFunction} selectedRegion={region} /> <Map handlerFunction={handlerFunction} selectedRegion={region} />
</div> </div>
<div className='table_container'> <div className='table_container'>
<Visualiser Regiondata={data} /> <Visualiser Regiondata={data} />
</div> </div>
</div> </div>
</div> </div>
) );
} };
/*
<div className='content_container'>
{/* Conditional rendering based on the displayMap state */
/*
}
{displayMap ? (
<div className='map_container' id="d3_map">
<Map handlerFunction={handlerFunction} selectedRegion={region} />
</div>
) : (
<div className='table_container'>
<Visualiser Regiondata={data} />
</div>
)}
</div>
*/
\ No newline at end of file
...@@ -9,9 +9,9 @@ const Visualiser = ({Regiondata}) => { ...@@ -9,9 +9,9 @@ const Visualiser = ({Regiondata}) => {
return ( return (
<div > <div >
<h1 className='h1'> <h2 >
Visualiser Visualiser
</h1> </h2>
<h2> LÄN: <h2> LÄN:
{Regiondata.label} {Regiondata.label}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment