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

Jump to bottom

Fixes related to search bar in mobile #799

Merged
merged 1 commit into from
Feb 7, 2022
Merged

Fixes related to search bar in mobile #799

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
4 changes: 0 additions & 4 deletions geonode_mapstore_client/client/js/api/geonode/v2/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,12 +749,10 @@ export const uploadDataset = ({
auxiliaryFiles,
ext,
charset = 'UTF-8',
permissions = { users: { AnonymousUser: [] }, groups: {} },
config
}) => {
const formData = new FormData();
formData.append('base_file', file);
formData.append('permissions', JSON.stringify(permissions));
formData.append('charset', charset);
const { timeEnabled } = getConfigProp('geoNodeSettings') || {};
if (timeEnabled) {
Expand All @@ -771,13 +769,11 @@ export const uploadDataset = ({
export const uploadDocument = ({
title,
file,
permissions = { users: { AnonymousUser: [] }, groups: {} },
config
}) => {
const formData = new FormData();
formData.append('title', title);
formData.append('doc_file', file);
formData.append('permissions', JSON.stringify(permissions));
return axios.post(`/documents/upload?no__redirect=true`, formData, config)
.then(({ data }) => (data));
};
Expand Down
18 changes: 16 additions & 2 deletions geonode_mapstore_client/client/js/routes/Viewer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,28 @@ function ViewerRoute({
const className = `page-${resourceType}-viewer`;

useEffect(() => {
// set the correct height of navbar
const mainHeader = document.querySelector('.gn-main-header');
const mainHeaderPlaceholder = document.querySelector('.gn-main-header-placeholder');
const topbar = document.querySelector('#gn-topbar');
function resize() {
if (mainHeaderPlaceholder && mainHeader) {
mainHeaderPlaceholder.style.height = mainHeader.clientHeight + 'px';
}
if (topbar && mainHeader) {
topbar.style.top = mainHeader.clientHeight + 'px';
}
}
// hide the naviagtion bar is a recource is being viewed
if (!loading) {
document.getElementById('gn-topbar')?.classList.add('hide-navigation');
document.querySelector('.gn-menu-content-bottom')?.classList.add('hide-search-bar');
document.getElementById('gn-brand-navbar-bottom')?.classList.add('hide-search-bar');
resize();
}
return () => {
document.getElementById('gn-topbar')?.classList.remove('hide-navigation');
document.querySelector('.gn-menu-content-bottom')?.classList.remove('hide-search-bar');
document.getElementById('gn-brand-navbar-bottom')?.classList.remove('hide-search-bar');
resize();
};
}, [loading]);

Expand Down
8 changes: 5 additions & 3 deletions geonode_mapstore_client/client/themes/geonode/less/_menu.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
.gn-menu-divider {
.background-color-var(@theme-vars[primary-contrast]);
}
.gn-main-header {
.background-color-var(@theme-vars[main-bg]);
}
.gn-menu {
.color-var(@theme-vars[main-color]);
.background-color-var(@theme-vars[main-bg]);
Expand Down Expand Up @@ -303,8 +306,7 @@ a.gn-action-navbar-breadcrumb-link {
}

@media (max-width: 748px) {
nav#gn-brand-navbar div.gn-menu-content-bottom.hide-search-bar {
#gn-brand-navbar-bottom.hide-search-bar {
display: none;
}

}
}
25 changes: 10 additions & 15 deletions geonode_mapstore_client/templates/geonode-mapstore-client/snippets/brand_navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,18 @@
{% endblock %}

<style>
.gn-menu-content-bottom {
#{{ id|default:'' }}-bottom {
display: none;
margin: 10px;
margin-bottom: 0;
}

@media (max-width: 748px) {
.gn-menu-content-center {
#{{ id|default:'' }} .gn-menu-content-center > * {
display: none;
}

.msgapi nav.gn-menu {
display: inline-block;
}

.gn-menu-content-bottom {
#{{ id|default:'' }}-bottom {
display: flex;
width: calc(100% - 16px);
margin: 8px;
}
}
</style>
Expand Down Expand Up @@ -62,12 +57,12 @@
</div>
</div>
</div>
<div class="gn-menu-content-bottom">
{% block bottom_menu %}
{% include './search_bar.html' %}
{% endblock %}
</div>
</nav>
<div id="{{ id|default:'' }}-bottom">
{% block bottom_menu %}
{% include './search_bar.html' %}
{% endblock %}
</div>
{% block extra_script %}
<script type="text/javascript">
(function() {
Expand Down