Skip to content
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

[platform] Overflow issues for small devices #1842

Merged
merged 1 commit into from
Feb 6, 2024
Merged

[platform] Overflow issues for small devices #1842

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
18 changes: 17 additions & 1 deletion platform/src/common/components/Map/components/Legend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Tippy from '@tippyjs/react';
import 'tippy.js/dist/tippy.css';
import 'tippy.js/animations/scale.css';
import 'tippy.js/themes/light.css';
import React, { useState } from 'react';
import React, { useState, useEffect } from 'react';
// Icons
import GoodAir from '@/icons/Charts/GoodAir';
import ModerateAir from '@/icons/Charts/Moderate';
Expand All @@ -15,6 +15,22 @@ import DownArrow from '@/icons/map/downArrow';

export const AirQualityLegend = () => {
const [show, setShow] = useState(true);

useEffect(() => {
const handleResize = () => {
if (window.innerWidth <= 768) {
setShow(false);
} else {
setShow(true);
}
};
handleResize();
window.addEventListener('resize', handleResize);
return () => {
window.removeEventListener('resize', handleResize);
};
}, []);

const levels = [
{
range: '0μg/m3 - 12μg/m3',
Expand Down
55 changes: 29 additions & 26 deletions platform/src/pages/map/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,20 @@ const index = () => {

useEffect(() => {
const handleResize = () => {
if (window.innerWidth < 768 && router.pathname === '/map') {
if (
(window.innerWidth < 768 || (window.innerWidth >= 600 && window.innerWidth <= 800)) &&
router.pathname === '/map'
) {
setShowSideBar(false);
} else {
localStorage.setItem('collapsed', true);
setShowSideBar(true);
}
};

window.addEventListener('resize', handleResize);
handleResize();

return () => window.removeEventListener('resize', handleResize);
}, [router.pathname]);

Expand Down Expand Up @@ -169,9 +174,9 @@ const index = () => {
return (
<Layout noTopNav={false}>
<div className='relative'>
<div>
<>
{showSideBar && (
<div className='absolute left-0 top-0 w-[280px] h-screen md:w-[400px] bg-white shadow-lg shadow-right space-y-4 z-50'>
<div className='absolute left-0 top-0 w-[280px] h-full md:w-[400px] bg-white shadow-lg shadow-right space-y-4 z-50 overflow-y-auto'>
<div className='px-4 pt-4'>
<div className='w-full flex justify-between items-center'>
<div>
Expand Down Expand Up @@ -202,28 +207,26 @@ const index = () => {
<div className='space-y-2'>
<label className='font-medium text-gray-600 text-sm'>Suggestions</label>
<hr />
<div className='overflow-y-auto'>
{locations.map((location) => (
<div
key={location.id}
className='flex flex-row justify-start items-center mb-0.5 text-sm w-full hover:cursor-pointer hover:bg-blue-100 p-2 rounded-lg'
onClick={() => {
handleLocationSelect();
}}>
<div className='p-2 rounded-full bg-gray-100'>
<LocationIcon />
</div>
<div className='ml-3 flex flex-col item-start border-b w-full'>
<span className='font-normal text-black capitalize text-lg'>
{location.name}
</span>
<span className='font-normal text-gray-500 capitalize text-sm mb-2'>
{location.country}
</span>
</div>
{locations.map((location) => (
<div
key={location.id}
className='flex flex-row justify-start items-center mb-0.5 text-sm w-full hover:cursor-pointer hover:bg-blue-100 p-2 rounded-lg'
onClick={() => {
handleLocationSelect();
}}>
<div className='p-2 rounded-full bg-gray-100'>
<LocationIcon />
</div>
))}
</div>
<div className='ml-3 flex flex-col item-start border-b w-full'>
<span className='font-normal text-black capitalize text-lg'>
{location.name}
</span>
<span className='font-normal text-gray-500 capitalize text-sm mb-2'>
{location.country}
</span>
</div>
</div>
))}
<hr />
</div>
</div>
Expand All @@ -235,8 +238,8 @@ const index = () => {
} z-50`}>
<AirQualityLegend />
</div>
</div>
<div className='h-auto w-full relative'>
</>
<div className='h-auto w-full relative bg-[#ebe7e1]'>
{!showSideBar && (
<div className='absolute top-4 left-3 z-50 '>
<div className='flex flex-col space-y-4'>
Expand Down
Loading