Skip to content

Add the ability to unlink discord from user profile page #2259

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

Merged
merged 17 commits into from
Sep 7, 2022
Merged

Add the ability to unlink discord from user profile page #2259

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
83ef572
feat: Add unlink to discord button to [username]
flacial Sep 3, 2022
b797ba6
test: Update username page test
flacial Sep 3, 2022
6758eb8
test: Update snapshots
flacial Sep 3, 2022
9664353
fix: Undefined element
flacial Sep 4, 2022
1a3aa25
Merge branch 'master' into unlink-discord-account
flacial Sep 4, 2022
9c4229b
fix: Storyshot throw an error (#2257)
flacial Sep 4, 2022
82830a0
style: Capitalize "discord"
flacial Sep 4, 2022
4e177b6
test: Update snapshots
flacial Sep 4, 2022
4564242
style: Update heading element
flacial Sep 4, 2022
a0c8595
Merge branch 'master' into unlink-discord-account
flacial Sep 4, 2022
29e2ad7
fix: Start signIn flow once user approve
flacial Sep 6, 2022
5226e61
Merge branch 'master' into unlink-discord-account
flacial Sep 6, 2022
0e51e19
refactor: Reduce code repetition
flacial Sep 7, 2022
c9c185f
test: Add connect story
flacial Sep 7, 2022
0a50612
style: Remove unused import
flacial Sep 7, 2022
f726fa3
test: Update snapshots
flacial Sep 7, 2022
ff928ed
Merge branch 'master' into unlink-discord-account
flacial Sep 7, 2022
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
63 changes: 39 additions & 24 deletions __tests__/__snapshots__/storyshots.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12282,7 +12282,7 @@ exports[`Storyshots Components/ProfileImageInfo Profile Image Info 1`] = `
className="card shadow-sm"
>
<div
className="ms-auto me-auto mt-4 profile_image_container"
className="ms-auto me-auto mt-4 mb-3 profile_image_container"
>
<div
className="jsx-3123111835 ms-auto me-auto mt-4"
Expand All @@ -12295,42 +12295,57 @@ exports[`Storyshots Components/ProfileImageInfo Profile Image Info 1`] = `
/>
</div>
</div>
<h2
<h4
className="text-center mt-4"
>
Rahul Kalra
</h2>
</h4>
<div
className="d-flex justify-content-center"
>
<h4
className="text-muted"
<span
className="fs-5 text-muted"
>
@noob101
</h4>
</span>
</div>
<div
className="d-flex ms-auto me-auto mb-4"
className="d-flex ms-auto me-auto mb-4 mt-3 flex-column"
>
<img
className="img-fluid"
height={20}
objectFit="contain"
src="/assets/discordClydeLogo.svg"
width={20}
/>
<h5
className="ms-2"
<div
className="d-flex align-items-center mb-2"
>
<a
href="https://discordapp.com/users/fakeDiscordId/"
onClick={[Function]}
onMouseEnter={[Function]}
onTouchStart={[Function]}
<img
className="img-fluid"
height={20}
objectFit="contain"
src="/assets/discordClydeLogo.svg"
width={20}
/>
<span
className="fs-5 ms-2 mb-0"
>
fakeDiscordUsername
</a>
</h5>
<a
href="https://discordapp.com/users/fakeDiscordId/"
onClick={[Function]}
onMouseEnter={[Function]}
onTouchStart={[Function]}
>
fakeDiscordUsername
</a>
</span>
</div>
<button
className="btn borderless btn-outline-danger btn-outline-bg-danger"
onClick={[Function]}
style={
Object {
"color": "danger",
}
}
>
Unlink Discord
</button>
</div>
</div>
`;
Expand Down
162 changes: 103 additions & 59 deletions __tests__/pages/profile/__snapshots__/username.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,31 +175,38 @@ exports[`user profile test Should render anonymous users 1`] = `
class="card shadow-sm"
>
<div
class="ms-auto me-auto mt-4 profile_image_container"
class="ms-auto me-auto mt-4 mb-3 profile_image_container"
>
<div
class="text-uppercase bg-primary rounded-circle text-light user_info_image mt-4"
>
A
</div>
</div>
<h2
<h4
class="text-center mt-4"
>
A
</h2>
</h4>
<div
class="d-flex justify-content-center"
>
<h4
class="text-muted"
<span
class="fs-5 text-muted"
>
@fake user
</h4>
</span>
</div>
<div
class="d-flex ms-auto me-auto mb-4"
/>
class="d-flex ms-auto me-auto mb-4 mt-3 flex-column"
>
<button
class="btn btn-primary btn-md btn-block mt-3"
type="button"
>
Connect to Discord
</button>
</div>
</div>
</div>
<div
Expand Down Expand Up @@ -1044,31 +1051,38 @@ exports[`user profile test Should render if no stars received 1`] = `
class="card shadow-sm"
>
<div
class="ms-auto me-auto mt-4 profile_image_container"
class="ms-auto me-auto mt-4 mb-3 profile_image_container"
>
<div
class="text-uppercase bg-primary rounded-circle text-light user_info_image mt-4"
>
fu
</div>
</div>
<h2
<h4
class="text-center mt-4"
>
fake user
</h2>
</h4>
<div
class="d-flex justify-content-center"
>
<h4
class="text-muted"
<span
class="fs-5 text-muted"
>
@fake user
</h4>
</span>
</div>
<div
class="d-flex ms-auto me-auto mb-4"
/>
class="d-flex ms-auto me-auto mb-4 mt-3 flex-column"
>
<button
class="btn btn-primary btn-md btn-block mt-3"
type="button"
>
Connect to Discord
</button>
</div>
</div>
</div>
<div
Expand Down Expand Up @@ -1918,31 +1932,38 @@ exports[`user profile test Should render nulled challenges 1`] = `
class="card shadow-sm"
>
<div
class="ms-auto me-auto mt-4 profile_image_container"
class="ms-auto me-auto mt-4 mb-3 profile_image_container"
>
<div
class="text-uppercase bg-primary rounded-circle text-light user_info_image mt-4"
>
fu
</div>
</div>
<h2
<h4
class="text-center mt-4"
>
fake user
</h2>
</h4>
<div
class="d-flex justify-content-center"
>
<h4
class="text-muted"
<span
class="fs-5 text-muted"
>
@fake user
</h4>
</span>
</div>
<div
class="d-flex ms-auto me-auto mb-4"
/>
class="d-flex ms-auto me-auto mb-4 mt-3 flex-column"
>
<button
class="btn btn-primary btn-md btn-block mt-3"
type="button"
>
Connect to Discord
</button>
</div>
</div>
</div>
<div
Expand Down Expand Up @@ -2828,31 +2849,38 @@ exports[`user profile test Should render nulled submission lessonIds 1`] = `
class="card shadow-sm"
>
<div
class="ms-auto me-auto mt-4 profile_image_container"
class="ms-auto me-auto mt-4 mb-3 profile_image_container"
>
<div
class="text-uppercase bg-primary rounded-circle text-light user_info_image mt-4"
>
fu
</div>
</div>
<h2
<h4
class="text-center mt-4"
>
fake user
</h2>
</h4>
<div
class="d-flex justify-content-center"
>
<h4
class="text-muted"
<span
class="fs-5 text-muted"
>
@fake user
</h4>
</span>
</div>
<div
class="d-flex ms-auto me-auto mb-4"
/>
class="d-flex ms-auto me-auto mb-4 mt-3 flex-column"
>
<button
class="btn btn-primary btn-md btn-block mt-3"
type="button"
>
Connect to Discord
</button>
</div>
</div>
</div>
<div
Expand Down Expand Up @@ -3697,31 +3725,38 @@ exports[`user profile test Should render profile 1`] = `
class="card shadow-sm"
>
<div
class="ms-auto me-auto mt-4 profile_image_container"
class="ms-auto me-auto mt-4 mb-3 profile_image_container"
>
<div
class="text-uppercase bg-primary rounded-circle text-light user_info_image mt-4"
>
fu
</div>
</div>
<h2
<h4
class="text-center mt-4"
>
fake user
</h2>
</h4>
<div
class="d-flex justify-content-center"
>
<h4
class="text-muted"
<span
class="fs-5 text-muted"
>
@fake user
</h4>
</span>
</div>
<div
class="d-flex ms-auto me-auto mb-4"
/>
class="d-flex ms-auto me-auto mb-4 mt-3 flex-column"
>
<button
class="btn btn-primary btn-md btn-block mt-3"
type="button"
>
Connect to Discord
</button>
</div>
</div>
<div
class="profile-comments"
Expand Down Expand Up @@ -4742,7 +4777,7 @@ exports[`user profile test should render discord avatar and username if user con
class="card shadow-sm"
>
<div
class="ms-auto me-auto mt-4 profile_image_container"
class="ms-auto me-auto mt-4 mb-3 profile_image_container"
>
<div
class="jsx-3123111835 ms-auto me-auto mt-4"
Expand All @@ -4755,37 +4790,46 @@ exports[`user profile test should render discord avatar and username if user con
/>
</div>
</div>
<h2
<h4
class="text-center mt-4"
>
fake user
</h2>
</h4>
<div
class="d-flex justify-content-center"
>
<h4
class="text-muted"
<span
class="fs-5 text-muted"
>
@fake user
</h4>
</span>
</div>
<div
class="d-flex ms-auto me-auto mb-4"
class="d-flex ms-auto me-auto mb-4 mt-3 flex-column"
>
<img
height="20"
src="/assets/discordClydeLogo.svg"
width="20"
/>
<h5
class="ms-2"
<div
class="d-flex align-items-center mb-2"
>
<a
href="https://discordapp.com/users/fakeDiscordId/"
<img
height="20"
src="/assets/discordClydeLogo.svg"
width="20"
/>
<span
class="fs-5 ms-2 mb-0"
>
fakeDiscordUser
</a>
</h5>
<a
href="https://discordapp.com/users/fakeDiscordId/"
>
fakeDiscordUser
</a>
</span>
</div>
<button
class="btn borderless btn-outline-danger btn-outline-bg-danger"
>
Unlink Discord
</button>
</div>
</div>
<div
Expand Down
Loading