Skip to content

Commit 576872a

Browse files
1 parent 17c0c96 commit 576872a

3 files changed

Lines changed: 198 additions & 6 deletions

File tree

app/assets/javascripts/discourse/components/user-card-contents.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, {
141141
this.setProperties({ visible: true, loading: true });
142142

143143
const args = {
144-
forCard: this.siteSettings.enable_new_user_card_route,
144+
forCard: true,
145145
include_post_count_for: this.get("topic.id")
146146
};
147147

config/site_settings.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2012,11 +2012,6 @@ uncategorized:
20122012
default: ""
20132013
hidden: true
20142014

2015-
enable_new_user_card_route:
2016-
default: false
2017-
client: true
2018-
hidden: true
2019-
20202015
user_preferences:
20212016
default_email_digest_frequency:
20222017
enum: "DigestEmailSiteSetting"

test/javascripts/fixtures/user_fixtures.js

Lines changed: 197 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,125 @@ export default {
278278
]
279279
}
280280
},
281+
"/u/eviltrout/card.json": {
282+
user_badges: [
283+
{
284+
id: 5870,
285+
granted_at: "2014-05-16T02:39:38.388Z",
286+
badge_id: 4,
287+
user_id: 19,
288+
granted_by_id: -1
289+
},
290+
{
291+
id: 40673,
292+
granted_at: "2014-03-31T14:23:18.060Z",
293+
post_id: 7241,
294+
post_number: 19,
295+
badge_id: 23,
296+
user_id: 19,
297+
granted_by_id: -1,
298+
topic_id: 3153
299+
},
300+
{
301+
id: 5868,
302+
granted_at: "2014-05-16T02:39:38.380Z",
303+
badge_id: 3,
304+
user_id: 19,
305+
granted_by_id: -1
306+
}
307+
],
308+
badges: [
309+
{
310+
id: 4,
311+
name: "Leader",
312+
description: null,
313+
grant_count: 7,
314+
allow_title: true,
315+
multiple_grant: false,
316+
icon: "fa-user",
317+
image: null,
318+
listable: true,
319+
enabled: true,
320+
badge_grouping_id: 4,
321+
system: true,
322+
badge_type_id: 1
323+
},
324+
{
325+
id: 23,
326+
name: "Great Share",
327+
description: null,
328+
grant_count: 14,
329+
allow_title: false,
330+
multiple_grant: true,
331+
icon: "fa-certificate",
332+
image: null,
333+
listable: true,
334+
enabled: true,
335+
badge_grouping_id: 2,
336+
system: true,
337+
badge_type_id: 1
338+
},
339+
{
340+
id: 3,
341+
name: "Regular",
342+
description: null,
343+
grant_count: 30,
344+
allow_title: true,
345+
multiple_grant: false,
346+
icon: "fa-user",
347+
image: null,
348+
listable: true,
349+
enabled: true,
350+
badge_grouping_id: 4,
351+
system: true,
352+
badge_type_id: 2
353+
}
354+
],
355+
badge_types: [
356+
{ id: 1, name: "Gold", sort_order: 9 },
357+
{ id: 2, name: "Silver", sort_order: 8 },
358+
{ id: 3, name: "Bronze", sort_order: 7 }
359+
],
360+
users: [
361+
{
362+
id: 19,
363+
username: "eviltrout",
364+
uploaded_avatar_id: null,
365+
avatar_template:
366+
"/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"
367+
},
368+
{
369+
id: -1,
370+
username: "system",
371+
uploaded_avatar_id: null,
372+
avatar_template:
373+
"/letter_avatar/system/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"
374+
}
375+
],
376+
user: {
377+
id: 19,
378+
username: "eviltrout",
379+
name: "Robin Ward",
380+
avatar_template:
381+
"/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png",
382+
last_posted_at: "2015-05-07T15:23:35.074Z",
383+
last_seen_at: "2015-05-13T14:34:23.188Z",
384+
created_at: "2013-02-03T15:19:22.704Z",
385+
can_send_private_messages: true,
386+
can_send_private_message_to_user: false,
387+
trust_level: 4,
388+
moderator: true,
389+
admin: true,
390+
title: "co-founder",
391+
badge_count: 23,
392+
custom_fields: {},
393+
bio_excerpt:
394+
'<p>Co-founder of Discourse. Previously, I created <a href="http://forumwarz.com">Forumwarz</a>. <a href="https://twitter.com/eviltrout">Follow me on Twitter</a>. I am <a class="mention" href="/u/eviltrout">@eviltrout</a>.</p>',
395+
website: "http://eviltrout.com",
396+
location: "Toronto",
397+
featured_user_badge_ids: [5870, 40673, 5868]
398+
}
399+
},
281400
"/user_actions.json": {
282401
user_actions: [
283402
{
@@ -2531,6 +2650,84 @@ export default {
25312650
}
25322651
}
25332652
},
2653+
"/u/charlie/card.json": {
2654+
user_badges: [
2655+
{
2656+
id: 17,
2657+
granted_at: "2019-03-06T19:08:28.230Z",
2658+
count: 1,
2659+
badge_id: 3,
2660+
user_id: 5,
2661+
granted_by_id: -1
2662+
}
2663+
],
2664+
badges: [
2665+
{
2666+
id: 3,
2667+
name: "Regular",
2668+
description:
2669+
'<a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Granted</a> recategorize, rename, followed links, wiki, more likes',
2670+
grant_count: 3,
2671+
allow_title: true,
2672+
multiple_grant: false,
2673+
icon: "fa-user",
2674+
image: null,
2675+
listable: true,
2676+
enabled: true,
2677+
badge_grouping_id: 4,
2678+
system: true,
2679+
slug: "regular",
2680+
manually_grantable: false,
2681+
badge_type_id: 2
2682+
}
2683+
],
2684+
badge_types: [{ id: 2, name: "Silver", sort_order: 8 }],
2685+
users: [
2686+
{
2687+
id: 5,
2688+
username: "charlie",
2689+
name: null,
2690+
avatar_template: "/letter_avatar_proxy/v3/letter/c/d6d6ee/{size}.png",
2691+
moderator: false,
2692+
admin: false
2693+
},
2694+
{
2695+
id: -1,
2696+
username: "system",
2697+
name: "system",
2698+
avatar_template: "/user_avatar/localhost/system/{size}/2_2.png",
2699+
moderator: true,
2700+
admin: true
2701+
}
2702+
],
2703+
user: {
2704+
id: 5,
2705+
username: "charlie",
2706+
name: null,
2707+
avatar_template: "/letter_avatar_proxy/v3/letter/c/d6d6ee/{size}.png",
2708+
last_posted_at: null,
2709+
last_seen_at: null,
2710+
created_at: "2019-03-06T19:06:20.340Z",
2711+
ignored: false,
2712+
can_ignore_user: false,
2713+
can_send_private_messages: true,
2714+
can_send_private_message_to_user: true,
2715+
trust_level: 3,
2716+
moderator: false,
2717+
admin: false,
2718+
title: null,
2719+
badge_count: 3,
2720+
custom_fields: {},
2721+
time_read: 0,
2722+
recent_time_read: 0,
2723+
primary_group_name: null,
2724+
primary_group_flair_url: null,
2725+
primary_group_flair_bg_color: null,
2726+
primary_group_flair_color: null,
2727+
staged: false,
2728+
featured_user_badge_ids: [17]
2729+
}
2730+
},
25342731
"/u/charlie/summary.json": {
25352732
topics: [],
25362733
badges: [

0 commit comments

Comments
 (0)