Skip to content

Commit

Permalink
remove client code for linking multiple auth providers to an account
Browse files Browse the repository at this point in the history
  • Loading branch information
lmssiehdev committed Sep 4, 2024
1 parent e35f573 commit ab63653
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 55 deletions.
20 changes: 0 additions & 20 deletions client/css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -2413,15 +2413,6 @@ a:active {
display: none;
}

.account-login-desc {
padding-top: 18px;
}

.account-login-desc>p {
margin: auto;
text-align: center;
}

.account-link-desc {
margin: 12px 0;
padding-top: 18px;
Expand Down Expand Up @@ -2525,17 +2516,6 @@ a:active {
background-image: url(/img/icon_discord.png);
}

.btn-login-linked {
background-image: url(/img/gui/checked.svg);
background-position-x: 60%;
background-position-y: 50%;
background-repeat: no-repeat;
background-size: 22px;
color: inherit;
cursor: default;
filter: brightness(80%) !important;
}

.account-block {
display: block;
}
Expand Down
2 changes: 0 additions & 2 deletions client/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,6 @@ <h2 data-l10n='index-account'>Account</h2>
<div class='account-buttons-settings account-buttons-wrapper account-block-arrow modal-close'>
<div class='account-buttons'>
<div class='account-stats-link btn-player-stats-link menu-option btn-darken btn-standard ' data-l10n='index-my-stats'>My Stats</div>
<div class='btn-account-link btn-account-turq menu-option btn-darken btn-standard' data-l10n='index-link-account'>Link Account</div>
<div class='btn-account-change-name btn-account-turq menu-option btn-darken btn-standard' data-l10n='index-change-account-name'>Change Account Name</div>
<div class='btn-account-reset-stats btn-account-turq menu-option btn-darken btn-standard' data-l10n='index-reset-stats'>Reset Stats</div>
<div class='btn-account-delete btn-account-turq menu-option btn-darken btn-standard' data-l10n='index-delete-account'>Delete Account</div>
Expand Down Expand Up @@ -752,7 +751,6 @@ <h2 data-l10n='index-account'>Account</h2>
</div>
<div class='account-buttons-settings account-buttons-wrapper account-block-arrow modal-close hide-on-mobile'>
<div class='account-buttons'>
<div class='btn-account-link btn-account-turq menu-option btn-darken btn-standard' data-l10n='index-link-account'>Link Account</div>
<div class='btn-account-change-name btn-account-turq menu-option btn-darken btn-standard' data-l10n='index-change-account-name'>Change Account Name</div>
<div class='btn-account-reset-stats btn-account-turq menu-option btn-darken btn-standard' data-l10n='index-reset-stats'>Reset Stats</div>
<div class='btn-account-delete btn-account-turq menu-option btn-darken btn-standard' data-l10n='index-delete-account'>Delete Account</div>
Expand Down
1 change: 0 additions & 1 deletion client/l10n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
"index-change-avatar": "Change Avatar",
"index-change-account-name": "Change Account Name",
"index-back": "Back",
"index-link-account-to": "Link account to",
"index-log-in-desc": "Log In / Create Account",
"index-logging-in": "Logging in",
"index-leaderboards": "Leaderboards",
Expand Down
39 changes: 7 additions & 32 deletions client/src/ui/profileUi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,31 +10,19 @@ import { MenuModal } from "./menuModal";

function createLoginOptions(
parentElem: JQuery<HTMLElement>,
linkAccount: boolean | undefined,
_account: Account,
localization: Localization,
loginMethods: { method: string; linked: boolean }[],
) {
const contentsElem = parentElem.find(".login-options-content");
contentsElem.empty();
if (linkAccount) {
contentsElem.append(
$("<div/>", {
class: "account-login-desc",
}).append(
$("<p/>", {
html: localization.translate("index-link-account-to"),
}),
),
);
}

const buttonParentElem = $("<div/>", {
class: "account-buttons",
});
contentsElem.append(buttonParentElem);
const addLoginOption = function (
method: string,
linked: boolean,
_linked: boolean,
onClick: () => void,
) {
const el = $("<div/>", {
Expand All @@ -55,14 +43,9 @@ function createLoginOptions(
}),
),
);
if (linkAccount && linked) {
el.addClass("btn-login-linked");
el.find("span.login-button-name").html('<div class="icon"></div>');
} else {
el.click((_e) => {
onClick();
});
}
el.click((_e) => {
onClick();
});
buttonParentElem.append(el);
};

Expand Down Expand Up @@ -297,7 +280,6 @@ export class ProfileUi {
this.userSettingsModal!.hide();
this.showLoginMenu({
modal: false,
link: true,
});
return false;
});
Expand Down Expand Up @@ -404,11 +386,10 @@ export class ProfileUi {
}
}

showLoginMenu(opts: { modal?: boolean; link?: boolean }) {
showLoginMenu(opts: { modal?: boolean }) {
opts = Object.assign(
{
modal: false,
link: false,
},
opts,
);
Expand All @@ -423,13 +404,7 @@ export class ProfileUi {
// { method: "discord", linked: this.account.profile.linkedDiscord },
// { method: "twitch", linked: this.account.profile.linkedTwitch }
];
createLoginOptions(
modal!.selector,
opts.link,
this.account,
this.localization,
loginMethods,
);
createLoginOptions(modal!.selector, this.localization, loginMethods);

modal!.show();
}
Expand Down

0 comments on commit ab63653

Please sign in to comment.