Thanks to visit codestin.com
Credit goes to github.com

Skip to content

settings/tokens: Display endpoint/crate scopes if they exist #6450

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 6 commits into from
May 8, 2023
Merged

settings/tokens: Display endpoint/crate scopes if they exist #6450

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
93289d3
settings/tokens/new: Extract `scopeDescription()` utility function
Turbo87 May 8, 2023
f9bf48c
settings/tokens/new: Extract `patternDescription()` utility function
Turbo87 May 8, 2023
2de7651
styles: Fix `<strong>` usage inside tooltip inside `<small>`
Turbo87 May 8, 2023
351c174
settings/tokens: Move token date metadata into shared `.metadata` ele…
Turbo87 May 8, 2023
8399e56
settings/tokens: Remove empty CSS class
Turbo87 May 8, 2023
422adae
settings/tokens: Display endpoint/crate scopes if they exist
Turbo87 May 8, 2023
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
Prev Previous commit
Next Next commit
settings/tokens: Move token date metadata into shared .metadata ele… 
…ment
  • Loading branch information
@Turbo87
Turbo87 committed May 8, 2023
commit 351c174728bd73f4f9ec71637d8bc5e347d37ae6
20 changes: 11 additions & 9 deletions app/components/settings/api-tokens.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,18 @@
{{token.name}}
</h3>

<div title={{token.last_used_at}} local-class="last-used-at" data-test-last-used-at>
{{#if token.last_used_at}}
Last used {{date-format-distance-to-now token.last_used_at addSuffix=true}}
{{else}}
Never used
{{/if}}
</div>
<div local-class="metadata">
<div title={{token.last_used_at}} local-class="last-used-at" data-test-last-used-at>
{{#if token.last_used_at}}
Last used {{date-format-distance-to-now token.last_used_at addSuffix=true}}
{{else}}
Never used
{{/if}}
</div>

<div title={{token.created_at}} local-class="created-at" data-test-created-at>
Created {{date-format-distance-to-now token.created_at addSuffix=true}}
<div title={{token.created_at}} local-class="created-at" data-test-created-at>
Created {{date-format-distance-to-now token.created_at addSuffix=true}}
</div>
</div>

{{#if token.token}}
Expand Down
17 changes: 11 additions & 6 deletions app/components/settings/api-tokens.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,19 @@
}

.name {
margin: 0 0 12px;
margin: 0 0 var(--space-s);
font-weight: 500;
}

.dates {
}

.created-at,
.last-used-at {
.metadata {
composes: small from '../../styles/shared/typography.module.css';
margin-top: 4px;

> * + * {
margin-top: var(--space-3xs);
}
}

.new-token-form {
Expand Down Expand Up @@ -168,11 +170,14 @@
display: grid;
grid-template:
"name actions" auto
"last-user actions" auto
"created-at actions" auto
"metadata actions" auto
"details details" auto
/ 1fr auto;

.metadata {
grid-area: metadata;
}

.actions {
grid-area: actions;
align-self: start;
Expand Down