Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
Asc Geostac
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
aflab
astrogeology
Asc Geostac
Commits
6a9b7380
Commit
6a9b7380
authored
1 year ago
by
BrittainJackson7
Browse files
Options
Downloads
Patches
Plain Diff
Move HelpBox to Menubar
parent
5037a06f
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/components/presentational/Menubar.jsx
+19
-1
19 additions, 1 deletion
src/components/presentational/Menubar.jsx
src/components/presentational/SearchAndFilterInput.jsx
+0
-16
0 additions, 16 deletions
src/components/presentational/SearchAndFilterInput.jsx
src/styles.css
+1
-0
1 addition, 0 deletions
src/styles.css
with
20 additions
and
17 deletions
src/components/presentational/Menubar.jsx
+
19
−
1
View file @
6a9b7380
...
...
@@ -4,6 +4,7 @@ import OpenInFullIcon from "@mui/icons-material/OpenInFull";
import
CloseFullscreenIcon
from
"
@mui/icons-material/CloseFullscreen
"
;
import
HelpOutlineIcon
from
"
@mui/icons-material/HelpOutline
"
;
import
GeoStacWhiteIcon
from
"
../../images/logos/geostac-logo-white.svg
"
;
import
HelpBox
from
"
./HelpBox.jsx
"
;
import
Button
from
"
@mui/material/Button
"
;
import
Dialog
from
"
@mui/material/Dialog
"
;
...
...
@@ -23,6 +24,16 @@ export default function Menubar(props) {
setShowAbout
(
false
);
};
const
handleOpenHelpBox
=
()
=>
{
setShowHelpBox
(
true
);
};
const
handleCloseHelpBox
=
()
=>
{
setShowHelpBox
(
false
);
}
const
[
showHelpBox
,
setShowHelpBox
]
=
React
.
useState
(
false
);
return
(
<
div
id
=
"menu-bar"
>
<
div
className
=
"menu-item"
onClick
=
{
handleOpenAbout
}
>
...
...
@@ -47,6 +58,13 @@ export default function Menubar(props) {
<
span
className
=
"menu-item-text"
>
Help
</
span
>
</
div
>
</
a
>
<
div
className
=
"menu-item"
onClick
=
{
handleOpenHelpBox
}
>
<
span
className
=
"menu-item-text"
>
Interactions
</
span
>
</
div
>
<
HelpBox
isOpen
=
{
showHelpBox
}
onClose
=
{
handleCloseHelpBox
}
/>
<
div
className
=
"menu-item"
onClick
=
{
props
.
handleOpenCloseHeader
}
>
{
props
.
showHeaderFooter
?
(
<>
...
...
This diff is collapsed.
Click to expand it.
src/components/presentational/SearchAndFilterInput.jsx
+
0
−
16
View file @
6a9b7380
...
...
@@ -19,8 +19,6 @@ import ArrowUpwardIcon from "@mui/icons-material/ArrowUpward";
import
{
Collapse
,
Divider
}
from
"
@mui/material
"
;
import
ListItemText
from
"
@mui/material/ListItemText
"
;
//help box
import
HelpBox
from
"
./HelpBox.jsx
"
;
/**
* Controls css styling for this component using js to css
...
...
@@ -87,9 +85,6 @@ export default function SearchAndFilterInput(props) {
const
[
dateFromVal
,
setDateFromVal
]
=
React
.
useState
(
null
);
// From Date
const
[
dateToVal
,
setDateToVal
]
=
React
.
useState
(
null
);
// To Date
// help box
const
[
showHelpBox
,
setShowHelpBox
]
=
React
.
useState
(
false
);
//const for callback
const
{
UpdateQueryableTitles
}
=
props
;
const
handleExpandFilterClick
=
()
=>
{
...
...
@@ -304,15 +299,6 @@ export default function SearchAndFilterInput(props) {
},
[
props
.
targetName
]);
//help box
const
handleOpenHelpBox
=
()
=>
{
setShowHelpBox
(
true
);
};
const
handleCloseHelpBox
=
()
=>
{
setShowHelpBox
(
false
);
}
/* Control IDs for reference:
sortBySelect
sortAscCheckBox
...
...
@@ -455,8 +441,6 @@ export default function SearchAndFilterInput(props) {
</
Collapse
>
</
div
>
</
Collapse
>
<
button
onClick
=
{
handleOpenHelpBox
}
style
=
{
{
marginTop
:
"
20px
"
}
}
>
Help
</
button
>
<
HelpBox
isOpen
=
{
showHelpBox
}
onClose
=
{
handleCloseHelpBox
}
/>
</
div
>
);
}
This diff is collapsed.
Click to expand it.
src/styles.css
+
1
−
0
View file @
6a9b7380
...
...
@@ -508,6 +508,7 @@ Help Box Inside Search and Filter
}
.helpBoxContent
,
.subPopup
{
color
:
#000
;
width
:
300px
;
padding
:
20px
;
background-color
:
#fff
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment