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

DUOS-810 [risk=no] Swapped out ResponsiveMenu for conditional rendering of navbar #885

Merged
merged 21 commits into from
Feb 22, 2021
Merged

DUOS-810 [risk=no] Swapped out ResponsiveMenu for conditional rendering of navbar #885

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f52dcc9
DUOS-765 added init search filter functionality
JVThomas Feb 1, 2021
e01bc8d
DUOS-765 more init styes, fleshed out pagination and search functions
JVThomas Feb 3, 2021
2f2d79f
DUOS-765 finishied up search and pagination functionality, need to do…
JVThomas Feb 3, 2021
87538a0
DUOS-765 made pagination bar its own component, init adjustments, sty…
JVThomas Feb 4, 2021
ab30e2e
DUOS-765 minor code refactor for formatting dates, minor styling update
JVThomas Feb 5, 2021
cc5fbd3
DUOS-765 codacy fixes
JVThomas Feb 5, 2021
2aa37c5
DUOS-810 building out navbar drawer for smaller screens
JVThomas Feb 10, 2021
9d6d95b
DUOS-810 added skeletal structure for dropdown component
JVThomas Feb 11, 2021
218851d
DUOS-810 adjustments of menu item popover mechanism (still need to ad…
JVThomas Feb 12, 2021
a832699
DUOS-810 finished up adding links, modified conditionals for inital s…
JVThomas Feb 16, 2021
653fc51
DUOS-810 resolved merge conflicts with current develop branch
JVThomas Feb 16, 2021
6d6a8b4
DUOS-810 corrected targetLink spelling, corrected role render condition
JVThomas Feb 17, 2021
9f9b3e1
DUOS-810 removed old link selection from navbar, corrected isRendered…
JVThomas Feb 17, 2021
20e54b8
DUOS-810 reverted import statement double-quote change, cleaned up ro…
JVThomas Feb 17, 2021
a6c916c
DUOS-810 additional adjustments to quote syntax
JVThomas Feb 17, 2021
9bdb4eb
DUOS-810 added ids to material-ui menu links, updated about page test…
JVThomas Feb 17, 2021
b785735
DUOS-810 corrected test descriptions, created split desktop and mobil…
JVThomas Feb 17, 2021
07fb59d
DUOS-810 corrected test descriptions for mobile view
JVThomas Feb 17, 2021
e0fd16b
DUOS-810 removed conditional for FAQs on mobile navbar
JVThomas Feb 17, 2021
30fb082
DUOS-810 removed react-responsive-navbar from package.json
JVThomas Feb 22, 2021
9e7445e
DUOS-810 added cursor style for DUOS logo
JVThomas Feb 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 19 additions & 2 deletions cypress/integration/about_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,35 @@

describe('About', function() {

it('About page loads from home', function() {
it('About page loads from home - Desktop', function() {
cy.viewport(2000, 2000);
cy.visit('');
cy.contains('About');
cy.contains('About').click();
cy.url().should('include', 'home_about');
});

it('About page shows content', function() {
it('About page loads from home - Mobile', function() {
cy.viewport(600, 600);
cy.visit('');
cy.get('#navbar-menu-icon').click();
cy.get('#menu-link-About').click();
cy.url().should('include', 'home_about');
});

it('About page shows content - Desktop', function() {
cy.viewport(2000, 2000);
cy.visit('');
cy.contains('About');
cy.contains('About').click();
cy.contains('Data Use Oversight System');
});

it('About page shows content - Mobile', function() {
cy.viewport(600, 600);
cy.visit('');
cy.get('#navbar-menu-icon').click();
cy.get('#menu-link-About').click();
cy.contains('Data Use Oversight System');
});
});
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"react-modal": "3.12.1",
"react-paginating": "1.4.0",
"react-protected-mailto": "1.0.3",
"react-responsive-navbar": "1.0.11",
"react-router": "5.2.0",
"react-router-bootstrap": "0.25.0",
"react-router-dom": "5.2.0",
Expand Down
3 changes: 1 addition & 2 deletions src/components/DuosHeader.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
font-family: "Montserrat", sans-serif;
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.26), 0 2px 10px 0 rgba(0, 0, 0, 0.16);
position: relative;
z-index: 10000;
z-index: 500;
}

.navbar-duos li {
Expand Down Expand Up @@ -142,7 +142,6 @@
}
.cTMEws .navbar-public,
.cTMEws .navbar-logged {
float: left;
text-align: left !important;
display: inline-block !important;
}
Expand Down