Skip to content

New navigation PR #3485

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.

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

Merged
merged 66 commits into from
Dec 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
b993f89
New navigation component
ThomasKranitsas May 30, 2019
41eee4c
Deploying new nav on test and beta
sushilshinde May 31, 2019
ef02e52
Fix SSR
ThomasKranitsas Jun 2, 2019
25d2892
Sync with develop
ThomasKranitsas Jun 2, 2019
24a92b2
Deploying on test
sushilshinde Jun 7, 2019
366af9d
issue_2405 New Nav: User Menu popup is overlapping with the Sub Commu…
iversonLv Jun 8, 2019
b0b7822
Fix the community links in header menu configuration from hardcoded t…
gets0ul Jun 10, 2019
b4cd21b
Fix Header test
gets0ul Jun 10, 2019
004d3b8
Merge pull request #2610 from gets0ul/issue-2453
luizrrodrigues Jun 12, 2019
748ea5e
Merge pull request #2589 from iversonLv/issue_2405
luizrrodrigues Jun 13, 2019
af7f08b
fix links
nahidshahin Jun 13, 2019
1e47181
issue 2542 fix
rashmi73 Jun 13, 2019
12932a3
Addressed feedbacks
nahidshahin Jun 14, 2019
6f86ab4
Pass openMore shared variable between TopNav and LoginNav
nahidshahin Jun 14, 2019
064f12f
Fix linting
nahidshahin Jun 14, 2019
bae4744
Merge pull request #2620 from nahidshahin/issues-2395
luizrrodrigues Jun 14, 2019
1680bbd
text fix
nahidshahin Jun 14, 2019
e98fce4
Merge pull request #2624 from nahidshahin/issues-2519
luizrrodrigues Jun 14, 2019
b5651e2
issue 2542 window fix
rashmi73 Jun 14, 2019
8811551
fix issue 2640
marioskranitsas Jun 19, 2019
d7c49e7
Add roles to the profile in header
gets0ul Jun 19, 2019
743f207
fix test snapshot
gets0ul Jun 19, 2019
260d339
fix test snapshot
gets0ul Jun 19, 2019
a157b32
Merge pull request #2643 from gets0ul/issue-2639
luizrrodrigues Jun 19, 2019
507ac39
test fix
rashmi73 Jun 19, 2019
e5d780a
Merge branch 'feature-new-nav' into issue_2542
luizrrodrigues Jun 19, 2019
47b1c80
Merge pull request #2621 from rashmi73/issue_2542
luizrrodrigues Jun 19, 2019
9f2f676
deploy on test
sushilshinde Jun 20, 2019
c208b77
fix tests
marioskranitsas Jun 20, 2019
044ffd8
Merge pull request #2646 from topcoder-platform/fix-2640
luizrrodrigues Jun 20, 2019
d95fea4
issue 2396 fix_s3_1
ya3ya6 Jun 20, 2019
dff22b9
issue 2396 fix_s3_2
ya3ya6 Jun 20, 2019
91fa282
Fix Navbar is always in logged in state
luizrrodrigues Jun 20, 2019
e85ca21
Fix tests
luizrrodrigues Jun 20, 2019
506e7c9
issue 2396 fix_s3_3
ya3ya6 Jun 20, 2019
8576a47
Merge pull request #2648 from topcoder-platform/issue-2647
luizrrodrigues Jun 20, 2019
43fe9af
issue 2396 fix_s3_4
ya3ya6 Jun 21, 2019
640e2ba
Merge pull request #2649 from ya3ya6/feature-new-nav
luizrrodrigues Jun 21, 2019
686aab1
Issue #2406 Fix
luizrrodrigues Jun 25, 2019
15e9a77
Merge pull request #2660 from topcoder-platform/issue_2406
luizrrodrigues Jun 25, 2019
25b9541
deploying on test
sushilshinde Jun 25, 2019
4b12797
Nav - Fix font to capitalize
luizrrodrigues Jun 26, 2019
72c665e
Fix Business link
luizrrodrigues Jun 27, 2019
50f0cc4
Fix tests
luizrrodrigues Jun 27, 2019
1dfc88a
Merge pull request #2686 from topcoder-platform/issue_2669
luizrrodrigues Jun 27, 2019
e3209b3
Fix circleci branch
luizrrodrigues Jul 1, 2019
c7b50ea
Fix 2705
luizrrodrigues Jul 9, 2019
f692466
Fix tests
luizrrodrigues Jul 9, 2019
bf50297
Merge pull request #2724 from topcoder-platform/issue_2705
luizrrodrigues Jul 9, 2019
7209955
Merge with master
luizrrodrigues Nov 2, 2019
cb00a6b
Merge with master branch
luizrrodrigues Nov 2, 2019
977b854
Fix test CircleCI
luizrrodrigues Nov 2, 2019
e478cce
deploying on test env
sushilshinde Nov 4, 2019
730c5fb
updated snap
sushilshinde Nov 4, 2019
c8b75f4
deploying nav on beta
sushilshinde Nov 7, 2019
8dacaa3
Fix profile link to new nav
luizrrodrigues Nov 21, 2019
725f549
Merge branch 'feature-new-nav-master' of https://github.com/topcoder-…
luizrrodrigues Nov 21, 2019
7779f3f
Fix issue #3444 : Always show sub nav when page have your own menu.
luizrrodrigues Nov 21, 2019
7a85b9e
Fix lint
luizrrodrigues Nov 21, 2019
3cea927
Merge branch 'feature-new-nav-master' into issue_3444
luizrrodrigues Nov 21, 2019
d49ac7f
Fix CicleCI Test
luizrrodrigues Nov 21, 2019
ec57edf
Merge pull request #3466 from topcoder-platform/issue_3444
luizrrodrigues Nov 21, 2019
0c58b20
deploying on beta
sushilshinde Nov 25, 2019
c724148
deploying on beta
sushilshinde Nov 26, 2019
4ee7b4b
Merge branch 'develop' into feature-new-nav-master
luizrrodrigues Dec 3, 2019
2256e03
Merge branch 'feature-new-nav-master' of https://github.com/topcoder-…
luizrrodrigues Dec 3, 2019
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"description": "devxxxxxx",
"email": "[email protected]",
"handle": "huanner",
"photoURL": "https://topcoder-dev-media.s3.amazonaws.com/member/profile/huanner-1552562543506.png"
}
190 changes: 190 additions & 0 deletions __tests__/shared/components/Header/__snapshots__/index.jsx.snap
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Default render 1`] = `
<div>
<TopNav
loggedIn={true}
logo={
<Logo
height="20"
viewBox="0 0 54 20"
width="54"
xmlns="http://www.w3.org/2000/svg"
/>
}
menu={
Array [
Object {
"href": "https://www.topcoder-dev.com",
"id": "business",
"title": "BUSINESS",
},
Object {
"id": "community",
"secondaryMenuForGuest": Array [
Object {
"href": "https://www.topcoder-dev.com/about",
"title": "Overview",
},
Object {
"href": "https://www.topcoder-dev.com/how-it-works/faqs/",
"title": "How It Works",
},
Object {
"href": "/community/learn",
"title": "Tracks",
},
Object {
"href": "https://www.topcoder-dev.com/about/why-crowdsourcing/",
"title": "Why Join",
},
],
"secondaryMenuForLoggedInUser": Array [
Object {
"href": "/my-dashboard",
"title": "Dashboard",
},
Object {
"href": "/members/willFilledByUserName",
"id": "myprofile",
"title": "My Profile",
},
Object {
"href": "https://community.topcoder-dev.com/PactsMemberServlet?module=PaymentHistory&full_list=false",
"title": "Payments",
},
],
"subMenu": Array [
Object {
"subMenu": Array [
Object {
"href": "/challenges",
"title": "All Challenges",
},
Object {
"href": "https://arena.topcoder-dev.com",
"title": "Competitive Programming",
},
],
"title": "Compete",
},
Object {
"subMenu": Array [
Object {
"href": "/community/competitive-programming",
"title": "Competitive Programming",
},
Object {
"href": "/community/data-science",
"title": "Data Science",
},
Object {
"href": "/community/design",
"title": "Design",
},
Object {
"href": "/community/development",
"title": "Development",
},
Object {
"href": "/community/qa",
"title": "QA",
},
],
"title": "Tracks",
},
Object {
"subMenu": Array [
Object {
"href": "https://www.topcoder-dev.com/tco",
"title": "TCO",
},
Object {
"href": "/community/member-programs",
"title": "Programs",
},
Object {
"href": "https://apps.topcoder-dev.com/forums",
"title": "Forums",
},
Object {
"href": "/community/statistics",
"title": "Statistics",
},
Object {
"href": "/community/events",
"title": "Events",
},
Object {
"href": "https://www.topcoder-dev.com/blog",
"title": "Blog",
},
],
"title": "Explore",
},
],
"title": "COMMUNITY",
},
]
}
onChangeLevel1Id={[Function]}
openMore={true}
profileHandle="huanner"
rightMenu={
<LoginNav
accountMenu={
Array [
Object {
"href": "/settings/profile",
"title": "Settings",
},
Object {
"separator": true,
},
Object {
"href": "https://help.topcoder-dev.com/",
"title": "Help",
},
Object {
"href": "https://www.topcoder.com/about/",
"title": "About Topcoder",
},
Object {
"href": "https://www.topcoder-dev.com/logout",
"title": "Log Out",
},
]
}
authURLs={
Object {
"href": "https://accounts.topcoder-dev.com/member/registration?utm_source=community-app-main",
"location": "https://accounts.topcoder-dev.com/member?retUrl=%S&utm_source=community-app-main",
}
}
loggedIn={true}
notificationButtonState="none"
notifications={Array []}
onMenuOpen={[Function]}
onSwitch={[Function]}
profile={
Object {
"description": "devxxxxxx",
"email": "[email protected]",
"handle": "huanner",
"photoURL": "https://d1aahxkjiobka8.cloudfront.net/avatar/https%3A%2F%2Ftopcoder-dev-media.s3.amazonaws.com%2Fmember%2Fprofile%2Fhuanner-1552562543506.png?size=32",
}
}
showNotification={false}
switchText={
Object {
"href": "https://connect.topcoder-dev.com",
"title": "Switch to BUSINESS",
}
}
/>
}
setOpenMore={[Function]}
theme="light"
/>
</div>
`;
16 changes: 16 additions & 0 deletions __tests__/shared/components/Header/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import React from 'react';
import Renderer from 'react-test-renderer/shallow';

import Header from 'components/Header';

import profileState from './__mocks__/profile-state.json';


const rnd = new Renderer();

it('Default render', () => {
rnd.render((<Header
profile={profileState}
/>));
expect(rnd.getRenderOutput()).toMatchSnapshot();
});
16 changes: 0 additions & 16 deletions __tests__/shared/components/TopcoderHeader/Auth.jsx

This file was deleted.

This file was deleted.

Loading