Skip to content

Commit c229459

Browse files
ThomasKranitsasThomasKranitsas
committed
Resolve conflicts
2 parents d00cae2 + e54612c commit c229459

37 files changed

+5253
-2274
lines changed

‎.DS_Store

0 Bytes
Binary file not shown.

‎.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- attach_workspace:
2929
at: .
3030
- run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
31-
- run: npm publish --tag=stable-v0.7.11
31+
- run: npm publish --tag=ssf
3232

3333
workflows:
3434
version: 2
@@ -45,4 +45,4 @@ workflows:
4545
tags:
4646
only: /v[0-9]+(\.[0-9]+)*(-[0-9]+)?/
4747
requires:
48-
- test
48+
- test

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
__coverage__
22
.build-info
33
.sass-cache
4-
#dist
4+
dist
55
node_modules
66
_auto_doc_
77
.vscode

‎__tests__/__snapshots__/index.js.snap

Lines changed: 225 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,31 @@ Object {
3131
"updateChallengeDone": [Function],
3232
"updateChallengeInit": [Function],
3333
},
34+
"challengeListing": Object {
35+
"dropChallenges": [Function],
36+
"expandTag": [Function],
37+
"getActiveChallengesDone": [Function],
38+
"getActiveChallengesInit": [Function],
39+
"getAllActiveChallengesDone": [Function],
40+
"getAllActiveChallengesInit": [Function],
41+
"getChallengeSubtracksDone": [Function],
42+
"getChallengeSubtracksInit": [Function],
43+
"getChallengeTagsDone": [Function],
44+
"getChallengeTagsInit": [Function],
45+
"getMoreChallenges": [Function],
46+
"getPastChallengesDone": [Function],
47+
"getPastChallengesInit": [Function],
48+
"getRestActiveChallengesDone": [Function],
49+
"getRestActiveChallengesInit": [Function],
50+
"getReviewOpportunitiesDone": [Function],
51+
"getReviewOpportunitiesInit": [Function],
52+
"getSrmsDone": [Function],
53+
"getSrmsInit": [Function],
54+
"selectCommunity": [Function],
55+
"setDatepickerStatus": [Function],
56+
"setFilter": [Function],
57+
"setSort": [Function],
58+
},
3459
"direct": Object {
3560
"dropAll": [Function],
3661
"getProjectDetailsDone": [Function],
@@ -175,13 +200,145 @@ Object {
175200
},
176201
},
177202
"challenge": Object {
203+
"buckets": Object {
204+
"BUCKETS": Object {
205+
"ALL": "all",
206+
"MY": "my",
207+
"ONGOING": "ongoing",
208+
"OPEN_FOR_REGISTRATION": "openForRegistration",
209+
"PAST": "past",
210+
"REVIEW_OPPORTUNITIES": "reviewOpportunities",
211+
"SAVED_FILTER": "saved-filter",
212+
"SAVED_REVIEW_OPPORTUNITIES_FILTER": "savedReviewOpportunitiesFilter",
213+
"UPCOMING": "upcoming",
214+
},
215+
"BUCKET_DATA": Object {
216+
"all": Object {
217+
"filter": Object {
218+
"started": true,
219+
"status": Array [
220+
"ACTIVE",
221+
],
222+
},
223+
"hideCount": false,
224+
"name": "All Challenges",
225+
"sorts": Array [],
226+
},
227+
"my": Object {
228+
"filter": Object {
229+
"started": true,
230+
"status": Array [
231+
"ACTIVE",
232+
],
233+
},
234+
"hideCount": false,
235+
"name": "My Challenges",
236+
"sorts": Array [
237+
"most-recent",
238+
"time-to-submit",
239+
"num-registrants",
240+
"num-submissions",
241+
"prize-high-to-low",
242+
"title-a-to-z",
243+
],
244+
},
245+
"ongoing": Object {
246+
"filter": Object {
247+
"registrationOpen": false,
248+
"started": true,
249+
"status": Array [
250+
"ACTIVE",
251+
],
252+
},
253+
"hideCount": false,
254+
"name": "Ongoing challenges",
255+
"sorts": Array [
256+
"most-recent",
257+
"current-phase",
258+
"title-a-to-z",
259+
"prize-high-to-low",
260+
],
261+
},
262+
"openForRegistration": Object {
263+
"filter": Object {
264+
"registrationOpen": true,
265+
"started": true,
266+
"status": Array [
267+
"ACTIVE",
268+
],
269+
},
270+
"hideCount": false,
271+
"name": "Open for registration",
272+
"sorts": Array [
273+
"most-recent",
274+
"time-to-register",
275+
"time-to-submit",
276+
"num-registrants",
277+
"num-submissions",
278+
"prize-high-to-low",
279+
"title-a-to-z",
280+
],
281+
},
282+
"past": Object {
283+
"filter": Object {
284+
"status": Array [
285+
"COMPLETED",
286+
"PAST",
287+
],
288+
},
289+
"hideCount": true,
290+
"name": "Past challenges",
291+
"sorts": Array [
292+
"most-recent",
293+
"prize-high-to-low",
294+
"title-a-to-z",
295+
],
296+
},
297+
"reviewOpportunities": Object {
298+
"filter": Object {},
299+
"hideCount": true,
300+
"name": "Open for review",
301+
"sorts": Array [
302+
"review-opportunities-start-date",
303+
"review-opportunities-payment",
304+
"review-opportunities-title-a-to-z",
305+
],
306+
},
307+
"savedReviewOpportunitiesFilter": Object {
308+
"filter": Object {},
309+
"sorts": Array [
310+
"review-opportunities-start-date",
311+
"review-opportunities-payment",
312+
"review-opportunities-title-a-to-z",
313+
],
314+
},
315+
"upcoming": Object {
316+
"filter": Object {
317+
"upcoming": true,
318+
},
319+
"hideCount": true,
320+
"name": "Upcoming challenges",
321+
"sorts": Array [
322+
"most-recent",
323+
"prize-high-to-low",
324+
"title-a-to-z",
325+
],
326+
},
327+
},
328+
"default": undefined,
329+
"getBuckets": [Function],
330+
"isReviewOpportunitiesBucket": [Function],
331+
"registerBucket": [Function],
332+
},
178333
"filter": Object {
179334
"addTrack": [Function],
180335
"combine": [Function],
181336
"default": undefined,
337+
"filterByDate": [Function],
182338
"getFilterFunction": [Function],
183339
"getReviewOpportunitiesFilterFunction": [Function],
184340
"mapToBackend": [Function],
341+
"newMeta": [Function],
185342
"removeTrack": [Function],
186343
"setEndDate": [Function],
187344
"setReviewOpportunityType": [Function],
@@ -190,6 +347,67 @@ Object {
190347
"setTags": [Function],
191348
"setText": [Function],
192349
},
350+
"sort": Object {
351+
"SORTS": Object {
352+
"CURRENT_PHASE": "current-phase",
353+
"MOST_RECENT": "most-recent",
354+
"NUM_REGISTRANTS": "num-registrants",
355+
"NUM_SUBMISSIONS": "num-submissions",
356+
"PRIZE_HIGH_TO_LOW": "prize-high-to-low",
357+
"REVIEW_OPPORTUNITIES_PAYMENT": "review-opportunities-payment",
358+
"REVIEW_OPPORTUNITIES_START_DATE": "review-opportunities-start-date",
359+
"REVIEW_OPPORTUNITIES_TITLE_A_TO_Z": "review-opportunities-title-a-to-z",
360+
"TIME_TO_REGISTER": "time-to-register",
361+
"TIME_TO_SUBMIT": "time-to-submit",
362+
"TITLE_A_TO_Z": "title-a-to-z",
363+
},
364+
"SORTS_DATA": Object {
365+
"current-phase": Object {
366+
"func": [Function],
367+
"name": "Current phase",
368+
},
369+
"most-recent": Object {
370+
"func": [Function],
371+
"name": "Most recent",
372+
},
373+
"num-registrants": Object {
374+
"func": [Function],
375+
"name": "# of registrants",
376+
},
377+
"num-submissions": Object {
378+
"func": [Function],
379+
"name": "# of submissions",
380+
},
381+
"prize-high-to-low": Object {
382+
"func": [Function],
383+
"name": "Prize high to low",
384+
},
385+
"review-opportunities-payment": Object {
386+
"func": [Function],
387+
"name": "Payment",
388+
},
389+
"review-opportunities-start-date": Object {
390+
"func": [Function],
391+
"name": "Review start date",
392+
},
393+
"review-opportunities-title-a-to-z": Object {
394+
"func": [Function],
395+
"name": "Title A-Z",
396+
},
397+
"time-to-register": Object {
398+
"func": [Function],
399+
"name": "Time to register",
400+
},
401+
"time-to-submit": Object {
402+
"func": [Function],
403+
"name": "Time to submit",
404+
},
405+
"title-a-to-z": Object {
406+
"func": [Function],
407+
"name": "Title A-Z",
408+
},
409+
},
410+
},
193411
},
194412
"errors": Object {
195413
"ERROR_ICON_TYPES": Object {
@@ -229,6 +447,7 @@ Object {
229447
"reducers": Object {
230448
"auth": [Function],
231449
"challenge": [Function],
450+
"challengeListing": [Function],
232451
"direct": [Function],
233452
"errors": [Function],
234453
"groups": [Function],
@@ -334,11 +553,17 @@ Object {
334553
},
335554
"getApiResponsePayload": [Function],
336555
"getLookerApiResponsePayload": [Function],
556+
"processSRM": [Function],
337557
},
338558
"time": Object {
339559
"default": undefined,
340560
"delay": [Function],
341561
"formatDuration": [Function],
342562
},
563+
"url": Object {
564+
"default": undefined,
565+
"removeTrailingSlash": [Function],
566+
"updateQuery": [Function],
567+
},
343568
}
344569
`;

‎__tests__/actions/__snapshots__/profile.js.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ Object {
166166
},
167167
},
168168
"handle": "tcscoder",
169+
"preferences": Object {},
169170
},
170171
"type": "PROFILE/SAVE_EMAIL_PREFERENCES_DONE",
171172
}

‎__tests__/reducers/__snapshots__/profile.js.snap

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ Object {
740740
"deletingPhoto": false,
741741
"deletingWebLink": false,
742742
"emailPreferences": Object {
743-
"TOPCODER_NL_DATA": true,
743+
"Dev Newsletter": true,
744744
},
745745
"externalLinks": Array [
746746
Object {
@@ -939,7 +939,7 @@ Object {
939939
"deletingPhoto": false,
940940
"deletingWebLink": false,
941941
"emailPreferences": Object {
942-
"TOPCODER_NL_DATA": true,
942+
"Dev Newsletter": true,
943943
},
944944
"externalLinks": Array [
945945
Object {
@@ -989,7 +989,7 @@ Object {
989989
"deletingPhoto": false,
990990
"deletingWebLink": false,
991991
"emailPreferences": Object {
992-
"TOPCODER_NL_DATA": true,
992+
"Dev Newsletter": true,
993993
},
994994
"externalLinks": Array [
995995
Object {
@@ -1926,7 +1926,7 @@ Object {
19261926
"deletingPhoto": false,
19271927
"deletingWebLink": false,
19281928
"emailPreferences": Object {
1929-
"TOPCODER_NL_DATA": true,
1929+
"Dev Newsletter": true,
19301930
},
19311931
"externalLinks": Array [
19321932
Object {
@@ -2125,7 +2125,7 @@ Object {
21252125
"deletingPhoto": false,
21262126
"deletingWebLink": false,
21272127
"emailPreferences": Object {
2128-
"TOPCODER_NL_DATA": true,
2128+
"Dev Newsletter": true,
21292129
},
21302130
"externalLinks": Array [
21312131
Object {
@@ -2175,7 +2175,7 @@ Object {
21752175
"deletingPhoto": false,
21762176
"deletingWebLink": false,
21772177
"emailPreferences": Object {
2178-
"TOPCODER_NL_DATA": true,
2178+
"Dev Newsletter": true,
21792179
},
21802180
"externalLinks": Array [
21812181
Object {

‎__tests__/reducers/profile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const mockActions = {
3333
deleteWebLinkInit: mockAction('DELETE_WEB_LINK_INIT'),
3434
deleteWebLinkDone: mockAction('DELETE_WEB_LINK_DONE', { handle, data: webLink }),
3535
saveEmailPreferencesInit: mockAction('SAVE_EMAIL_PREFERENCES_INIT'),
36-
saveEmailPreferencesDone: mockAction('SAVE_EMAIL_PREFERENCES_DONE', { handle, data: { subscriptions: { TOPCODER_NL_DATA: true } } }),
36+
saveEmailPreferencesDone: mockAction('SAVE_EMAIL_PREFERENCES_DONE', { handle, preferences: { 'Dev Newsletter': true } }),
3737
linkExternalAccountInit: mockAction('LINK_EXTERNAL_ACCOUNT_INIT'),
3838
linkExternalAccountDone: mockAction('LINK_EXTERNAL_ACCOUNT_DONE', { handle, data: linkedAccount2 }),
3939
unlinkExternalAccountInit: mockAction('UNLINK_EXTERNAL_ACCOUNT_INIT'),

‎config/test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ module.exports = {
22
API: {
33
V2: 'https://api.topcoder-dev.com/v2',
44
V3: 'https://api.topcoder-dev.com/v3',
5+
V5: 'https://api.topcoder-dev.com/v5',
56
},
67
dummyConfigKey: 'Dummy config value',
78
};

‎dist/dev/index.js

Lines changed: 93 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)