Skip to content

Functionality: Search bar icon/Sidebar hide-show #49

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Functionality: Search bar icon/Sidebar hide-show #49

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
17 changes: 16 additions & 1 deletion src/components/main-app/ol-init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { URL_SHAPE, URL_TILES, URL_COLORS, URL_OPACITY } from 'config';
import { useQueryParam, StringParam } from 'use-query-params';
import { usePrevious } from 'react-use';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faCompass } from '@fortawesome/free-solid-svg-icons';
import { faCompass, faSearch } from '@fortawesome/free-solid-svg-icons';
import { handleLocationButton } from 'utils';
import { setSource } from '../../api/map-data';

Expand Down Expand Up @@ -47,6 +47,14 @@ export default function OlInit() {
}
}, [shape, tiles, colors, opacity, prevTiles, prevShape]);

//Display the search bar after click on the search icon for small screens only
const displaysearchbar=(e)=>
{
let div=document.getElementsByClassName('gcd-gl-control')[0];
div.classList.add('show-results');

}

return (
<>
<div>
Expand All @@ -56,6 +64,13 @@ export default function OlInit() {
<FontAwesomeIcon icon={faCompass} />
</button>
</div>

{/* //Search bar icon */}
<div className="ol-control search">
<button onClick={displaysearchbar}>
<FontAwesomeIcon icon={faSearch} />
</button>
</div>
</div>
</div>
</>
Expand Down
88 changes: 59 additions & 29 deletions src/components/main-app/sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ import JSONPretty from 'react-json-pretty';
import { CopyToClipboard } from 'react-copy-to-clipboard';
import * as JSONPrettyMon from 'react-json-pretty/dist/acai';

import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faPlus, faMinus } from '@fortawesome/free-solid-svg-icons'

export default function Sidebar({ setTheme, theme }) {
const [colors] = useQueryParam(URL_COLORS, StringParam);
const [opacity] = useQueryParam(URL_OPACITY, StringParam);
Expand All @@ -33,6 +36,22 @@ export default function Sidebar({ setTheme, theme }) {
setColorFormat(event.target.value);
};

//Changes needed for hiding sidebar-input
const hideDiv=(e)=>{
document.getElementsByClassName('sidebar-input')[0].style.display='none';
document.getElementsByClassName('sidebar')[0].style.height='auto';
document.getElementsByClassName('hide')[0].style.display='none';
document.getElementsByClassName('show')[0].style.display='block';
}

//Changes needed for display sidebar-input
const showDiv=(e)=>{
document.getElementsByClassName('sidebar-input')[0].style.display='block';
document.getElementsByClassName('sidebar')[0].style.height='100vh';
document.getElementsByClassName('hide')[0].style.display='block';
document.getElementsByClassName('show')[0].style.display='none';
}

return (
<ThemeProvider theme={theme === 'light' ? lightTheme : darkTheme}>
<GlobalStyles />
Expand All @@ -56,36 +75,47 @@ export default function Sidebar({ setTheme, theme }) {
<div class="toggle-moon">🌙</div>
</label>
</div>

{/* Icons to hide and show sidebar-input div */}
<div className='hide-show'>
<FontAwesomeIcon className='hide' onClick={hideDiv} icon={faMinus}/>
<FontAwesomeIcon className='show' onClick={showDiv} icon={faPlus}/>
</div>

<hr />
<ShapeInput />
<br />
<br />
<TilesInput />
<br />
<br />
<ColorsInput />
<br />
<AlphaInput />
<br />
<br />
<select
id="color-format"
defaultValue="rgba"
onChange={event => handleColorFormatChange(event)}
>
<option value="hex">HEX</option>
<option value="rgba">RGBA</option>
<option value="hsla">HSLA</option>
</select>
<CopyToClipboard text={text}>
<button className="copy-btn">Copy</button>
</CopyToClipboard>
<br />
<JSONPretty
id="json-pretty"
data={text}
theme={JSONPrettyMon}
></JSONPretty>
{/* Create a new div and add class sidebar-input */}
<div className="sidebar-input">
<ShapeInput />
<br />
<br />
<TilesInput />
<br />
<br />
<ColorsInput />
<br />
<AlphaInput />
<br />
<br />
<select
id="color-format"
defaultValue="rgba"
onChange={event => handleColorFormatChange(event)}
>
<option value="hex">HEX</option>
<option value="rgba">RGBA</option>
<option value="hsla">HSLA</option>
</select>
<CopyToClipboard text={text}>
<button className="copy-btn">Copy</button>
</CopyToClipboard>
<br />
<JSONPretty
id="json-pretty"
data={text}
theme={JSONPrettyMon}
></JSONPretty>
</div>

</div>
</div>
</ThemeProvider>
Expand Down
2 changes: 1 addition & 1 deletion src/components/main-app/themes/global-styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const GlobalStyles = createGlobalStyle`
color: ${({ theme }) => theme.text};
}

.fa.iconButton, #color-format, .copy-btn{
.fa.iconButton, #color-format, .copy-btn, .hide-show{
background-color: ${({ theme }) => theme.btnBgColor};
color: ${({ theme }) => theme.btnColor};
}
Expand Down
28 changes: 28 additions & 0 deletions src/sass/_app.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
margin-bottom: 10px
span
font-weight: 300

.sidebar-game
display: none

.theme-toggle
.switch
Expand Down Expand Up @@ -190,6 +193,31 @@
align-items: center
margin-top: 2%

//For the button to show and hide sidebar-input
.hide-show
width: 30px
height: 15px
color: #FFF
background-color: #000
padding: 6px 0px
display: flex
align-items: center
justify-content: center
font-size: 15px
border-radius: 6px
margin-left: 90%

.show
display: none

.show:hover
cursor: pointer

.hide:hover
cursor: pointer



@media only screen and (max-width: 1440px)
.sidebar
width: 400px
Expand Down
31 changes: 29 additions & 2 deletions src/sass/_map.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,18 @@
z-index: 1
margin-top: 0.5rem

//For search-icon
.search
position: fixed
top: 6.4rem
right: 0.5rem
z-index: 1
margin-top: 0.5rem
display: none !important

.gcd-gl-control.ol-control
padding: 0
width: 20rem
width: inherit

.ol-geocoder
position: absolute
Expand Down Expand Up @@ -58,4 +67,22 @@
background: #ccc

.hide-results
display: none
display: none !important


//Show block used to display search bar
.show-results
display: block !important

//To display search icon and hide search bar
@media only screen and (max-width: 1000px)
.search
display: block !important

.gcd-gl-control
display: none