Skip to content

Commit 71833d6

Browse files
sushilshindesushilshinde
committed
Merge branch 'notifications-analytics' of github.com:topcoder-platform/community-app into notifications-analytics
2 parents 6874bac + fcd5c26 commit 71833d6

File tree

4 files changed

+192
-2
lines changed

4 files changed

+192
-2
lines changed

‎.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
__coverage__/
22
.git/
3+
node_modules/

‎Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ ENV CONTENTFUL_EDU_PREVIEW_API_KEY=$CONTENTFUL_EDU_PREVIEW_API_KEY
119119
################################################################################
120120
# Testing and build of the application inside the container.
121121

122+
RUN npm config set unsafe-perm true
122123
RUN npm install
123124
RUN npm test
124125
RUN npm run build

‎__tests__/shared/components/Header/__snapshots__/index.jsx.snap

Lines changed: 189 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,191 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`Default render 1`] = `<div />`;
3+
exports[`Default render 1`] = `
4+
<div>
5+
<TopNav
6+
loggedIn={true}
7+
logo={
8+
<Logo
9+
height="20"
10+
viewBox="0 0 54 20"
11+
width="54"
12+
xmlns="http://www.w3.org/2000/svg"
13+
/>
14+
}
15+
menu={
16+
Array [
17+
Object {
18+
"href": "https://www.topcoder-dev.com",
19+
"id": "business",
20+
"title": "BUSINESS",
21+
},
22+
Object {
23+
"id": "community",
24+
"secondaryMenu": Array [
25+
Object {
26+
"href": "/my-dashboard",
27+
"logged": true,
28+
"title": "Dashboard",
29+
},
30+
Object {
31+
"href": "/members/willFilledByUserName",
32+
"id": "myprofile",
33+
"logged": true,
34+
"title": "My Profile",
35+
},
36+
Object {
37+
"href": "https://community.topcoder-dev.com/PactsMemberServlet?module=PaymentHistory&full_list=false",
38+
"logged": true,
39+
"openNewTab": true,
40+
"title": "Payments",
41+
},
42+
Object {
43+
"href": "/community/learn",
44+
"logged": false,
45+
"title": "Overview",
46+
},
47+
Object {
48+
"href": "/thrive/tracks?track=Topcoder",
49+
"logged": false,
50+
"title": "How It Works",
51+
},
52+
],
53+
"subMenu": Array [
54+
Object {
55+
"subMenu": Array [
56+
Object {
57+
"href": "/challenges",
58+
"title": "All Challenges",
59+
},
60+
Object {
61+
"href": "https://arena.topcoder-dev.com",
62+
"title": "Competitive Programming",
63+
},
64+
Object {
65+
"href": "/community/taas",
66+
"title": "Gig Work",
67+
},
68+
],
69+
"title": "Compete",
70+
},
71+
Object {
72+
"subMenu": Array [
73+
Object {
74+
"href": "/thrive/tracks?track=Competitive%20Programming",
75+
"title": "Competitive Programming",
76+
},
77+
Object {
78+
"href": "/thrive/tracks?track=Data%20Science&tax=",
79+
"title": "Data Science",
80+
},
81+
Object {
82+
"href": "/thrive/tracks?track=Design&tax=",
83+
"title": "Design",
84+
},
85+
Object {
86+
"href": "/thrive/tracks?track=Development&tax=",
87+
"title": "Development",
88+
},
89+
Object {
90+
"href": "/thrive/tracks?track=QA&tax=",
91+
"title": "QA",
92+
},
93+
],
94+
"title": "Tracks",
95+
},
96+
Object {
97+
"subMenu": Array [
98+
Object {
99+
"href": "/community/member-programs/topcoder-open",
100+
"title": "TCO",
101+
},
102+
Object {
103+
"href": "/community/member-programs",
104+
"title": "Programs",
105+
},
106+
Object {
107+
"href": "https://apps.topcoder-dev.com/forums",
108+
"openNewTab": true,
109+
"title": "Forums",
110+
},
111+
Object {
112+
"href": "/community/statistics",
113+
"title": "Statistics",
114+
},
115+
Object {
116+
"href": "https://www.topcoder-dev.com/blog",
117+
"title": "Blog",
118+
},
119+
Object {
120+
"href": "/thrive",
121+
"title": "Thrive",
122+
},
123+
],
124+
"title": "Explore",
125+
},
126+
],
127+
"title": "COMMUNITY",
128+
},
129+
]
130+
}
131+
onChangeLevel1Id={[Function]}
132+
openMore={true}
133+
profileHandle="huanner"
134+
rightMenu={
135+
<LoginNav
136+
accountMenu={
137+
Array [
138+
Object {
139+
"href": "/settings/profile",
140+
"title": "Settings",
141+
},
142+
Object {
143+
"separator": true,
144+
},
145+
Object {
146+
"href": "https://community-app.topcoder-dev.com/thrive/tracks?track=Topcoder&tax=Help%20Articles",
147+
"title": "Help",
148+
},
149+
Object {
150+
"separator": true,
151+
},
152+
Object {
153+
"href": "https://www.topcoder-dev.com/logout",
154+
"title": "Log Out",
155+
},
156+
]
157+
}
158+
auth={null}
159+
authURLs={
160+
Object {
161+
"href": "https://accounts.topcoder-dev.com/member/registration?utm_source=community-app-main",
162+
"location": "https://accounts.topcoder-dev.com/member?retUrl=%S&utm_source=community-app-main",
163+
}
164+
}
165+
loggedIn={true}
166+
notificationButtonState="new"
167+
notifications={Array []}
168+
onMenuOpen={[Function]}
169+
onSwitch={[Function]}
170+
profile={
171+
Object {
172+
"description": "devxxxxxx",
173+
"email": "liwanxiang@gmail.com",
174+
"handle": "huanner",
175+
"photoURL": "https://d1aahxkjiobka8.cloudfront.net/avatar/https%3A%2F%2Ftopcoder-dev-media.s3.amazonaws.com%2Fmember%2Fprofile%2Fhuanner-1552562543506.png?size=32",
176+
}
177+
}
178+
showNotification={true}
179+
switchText={
180+
Object {
181+
"href": "https://connect.topcoder-dev.com",
182+
"title": "Switch to BUSINESS",
183+
}
184+
}
185+
/>
186+
}
187+
setOpenMore={[Function]}
188+
theme="light"
189+
/>
190+
</div>
191+
`;

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"test": "npm run lint && npm run --runInBand jest",
1919
"commitlint": "commitlint -E HUSKY_GIT_PARAMS",
2020
"release:changelog": "npm run conventional-changelog -- -p angular -i CHANGELOG.md -s",
21-
"postinstall": "rimraf node_modules/navigation-component/node_modules/topcoder-react-utils && rimraf node_modules/topcoder-react-ui-kit/node_modules/topcoder-react-utils"
21+
"postinstall": "rimraf node_modules/navigation-component/node_modules/topcoder-react-utils && rimraf node_modules/navigation-component/node_modules/topcoder-react-lib && rimraf node_modules/topcoder-react-ui-kit/node_modules/topcoder-react-utils"
2222
},
2323
"repository": {
2424
"type": "git",

0 commit comments

Comments
 (0)