Skip to content
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.

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

Close unclosed tags and more #971

Merged
merged 1 commit into from
Oct 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified screenshots/desktop/showVerificationCode.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified screenshots/mobile/showVerificationCode.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion src/frontend/src/components/anchorInput.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { html, TemplateResult } from "lit-html";
import { withRef } from "../utils/utils";
import { createRef, ref, Ref } from "lit-html/directives/ref.js";
import { ifDefined } from "lit-html/directives/if-defined.js";
import { DirectiveResult } from "lit-html/directive.js";
import { parseUserNumber } from "../utils/userNumber";

Expand Down Expand Up @@ -106,7 +107,7 @@ export const mkAnchorInput = ({
id="${inputId}"
class="c-input c-input--vip"
placeholder="Enter anchor"
value="${userNumber}"
value="${ifDefined(userNumber?.toString())}"
@input=${inputFilter(isDigits, onBadInput)}
@keydown=${inputFilter(isDigits, onBadInput)}
@keyup=${inputFilter(isDigits, onBadInput)}
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/components/warnBox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const warnBox = ({
htmlElement = "aside",
}: warnBoxProps): TemplateResult => {
const contents: TemplateResult = html`
<span class="c-card__icon" aria-hidden>${warningIcon}</span>
<span class="c-card__icon" aria-hidden="true">${warningIcon}</span>
<div class="c-card__content">
<h3 class="t-title c-card__title">${title}</h3>
<div data-role="warning-message" class="t-paragraph c-card__paragraph">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const pageContent = (
tentativeRegistrationInfo: TentativeRegistrationInfo
) => html`
<div class="l-container c-card c-card--highlight">
<hgroup>
<hgroup>
<h1 class="t-title t-title--main">Device Verification Required</h1>
<p class="t-lead">
This device was added tentatively to the Identity Anchor
Expand All @@ -28,18 +28,19 @@ const pageContent = (
</p>
</hgroup>
<h2 class="t-title">Alias</h2>
<output class="c-input c-input--readonly t-vip t-vip--small">${alias}</output>
<h2 class="t-title">Device Verification Code</hs>
<output
id="verificationCode"
class="c-input c-input--readonly t-vip"
<output class="c-input c-input--readonly t-vip t-vip--small"
>${alias}</output
>
<h2 class="t-title">Device Verification Code</h2>
<output id="verificationCode" class="c-input c-input--readonly t-vip">
${tentativeRegistrationInfo.verification_code}
</output>
<div class="l-stack">
<p>Time remaining: <span id="timer"></span></p>
<div class="l-stack">
<button id="showCodeCancel" class="c-button c-button--secondary">Cancel</button>
<button id="showCodeCancel" class="c-button c-button--secondary">
Cancel
</button>
</div>
</div>
</div>
Expand Down
3 changes: 1 addition & 2 deletions src/frontend/src/flows/authenticate/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,7 @@ const pageContent = (
</p>
${derivationOrigin !== undefined
? html`
<p class="t-paragraph t-weak">
<span id="alternative-origin-chasm-toggle" class="t-action" @click="${chasmToggle}" >shared identity <span ${ref(
<p class="t-paragraph t-weak"><span id="alternative-origin-chasm-toggle" class="t-action" @click="${chasmToggle}" >shared identity <span ${ref(
chasmToggleRef
)} class="t-link__icon c-chasm__button">${caretDownIcon}</span></span><br/>
<div ${ref(chasmRef)} class="c-chasm c-chasm--closed">
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/src/flows/manage/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const devicesSection = (
Remove a device before you can add a new one.</span
>
<span class="t-link t-link--discreet">
<i class="t-link__icon" aria-hidden>+</i>
<i class="t-link__icon" aria-hidden=true>+</i>
Add new device
</span>
</button>
Expand All @@ -125,7 +125,7 @@ const recoverySection = (
class="t-title__complication t-title__complication--end"
id="addRecovery"
>
<i class="t-link__icon" aria-hidden>+</i>
<i class="t-link__icon" aria-hidden="true">+</i>
<span class="t-link t-link--discreet"
>Add recovery mechanism</span
>
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/src/flows/recovery/chooseRecoveryMechanism.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const pageContent = (devices: DeviceData[]) => html`
class="c-button c-button--secondary"
id="seedPhrase"
>
<span aria-hidden>${seedPhraseIcon}</span>
<span aria-hidden="true">${seedPhraseIcon}</span>
<div class="t-strong">Seed Phrase</div>
<div class="t-weak">Use your own storage</div>
</button>
Expand All @@ -27,7 +27,7 @@ const pageContent = (devices: DeviceData[]) => html`
class="c-button c-button--secondary"
id="securityKey"
>
<span aria-hidden>${securityKeyIcon}</span>
<span aria-hidden="true">${securityKeyIcon}</span>
<div class="t-strong">Security Key</div>
<div class="t-weak">Use an extra security key</div>
</button>
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/flows/recovery/pickRecoveryDevice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const pageContent = () => html`
<div class="l-container c-card c-card--highlight c-card--highlight">
<h1 class="t-title t-title--main">Choose a device</h1>
<div class="l-stack">
<h2 class="t-title">Recovery devices</div>
<h2 class="t-title">Recovery devices</h2>
<ol class="c-list l-stack" id="deviceList"></ol>
</div>
</div>
Expand Down
33 changes: 21 additions & 12 deletions src/frontend/src/flows/recovery/recoverWith/phrase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ const pageContent = (userNumber: bigint, message?: string) => html`
background-color: unset;
}
50% {
background-color: #ED1E79;
border-color: #ED1E79;
background-color: #ed1e79;
border-color: #ed1e79;
}
100% {
background-color: unset;
Expand All @@ -42,19 +42,28 @@ const pageContent = (userNumber: bigint, message?: string) => html`
<article class="l-container c-card c-card--highlight">
<hgroup>
<h1 class="t-title t-title--main">Your seed phrase</h1>
<p class="t-lead">${
message !== undefined ? message : "Please provide your seed phrase"
}</p>
<p class="t-lead">
${message !== undefined ? message : "Please provide your seed phrase"}
</p>
</hgroup>
<textarea id="inputSeedPhrase" class="c-input" placeholder="${
userNumber + " above squirrel ..."
}"></textarea>
<details data-id="phrase-warnings" class="c-card c-card--highlight is-hidden">
<summary><span class="warnings-box-summary">Phrase may not be valid<span></summary>
<div id="warnings"></div>
<textarea
id="inputSeedPhrase"
class="c-input"
placeholder="${userNumber + " above squirrel ..."}"
></textarea>
<details
data-id="phrase-warnings"
class="c-card c-card--highlight is-hidden"
>
<summary>
<span class="warnings-box-summary">Phrase may not be valid</span>
</summary>
<div id="warnings"></div>
</details>
<div class="c-button-group">
<button id="inputSeedPhraseCancel" class="c-button c-button--secondary">Cancel</button>
<button id="inputSeedPhraseCancel" class="c-button c-button--secondary">
Cancel
</button>
<button id="inputSeedPhraseContinue" class="c-button">Continue</button>
</div>
</article>
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/src/styleguide.ts
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ export const styleguide = html`
<section class="demo" aria-label="Paragraphs Demo">
<hr class="l-divider" />
<div class="l-divider l-divider--text" aria-label="Other Options">
<span class="l-divider__label" aria-hidden>Or</span>
<span class="l-divider__label" aria-hidden="true">Or</span>
</div>
</section>
<p class="t-lead">
Expand Down Expand Up @@ -183,7 +183,7 @@ export const styleguide = html`
</div>

<div class="c-card c-card--warning">
<span class="c-card__icon" aria-hidden>${warningIcon}</span>
<span class="c-card__icon" aria-hidden="true">${warningIcon}</span>
<div class="c-card__content">
<h2 class="c-card__title t-title">Warning Card with Icon</h2>
<p class="c-card__text t-paragraph">
Expand Down