Skip to content

catch-all: Fix broken "Go back" and "Reload" links #4314

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 3 commits into from
Dec 22, 2021
Merged

catch-all: Fix broken "Go back" and "Reload" links #4314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6488ef
styles: Make anchor tag styles reusable via composable `.link` CSS class
Turbo87 Dec 22, 2021
8393246
styles: Explicitly set `pointer` cursor for links
Turbo87 Dec 22, 2021
a21b0a2
catch-all: Convert links to buttons
Turbo87 Dec 22, 2021
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
7 changes: 5 additions & 2 deletions app/controllers/catch-all.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ import Controller from '@ember/controller';
import { action } from '@ember/object';

export default class CatchAllController extends Controller {
@action reload(event) {
event.preventDefault();
@action reload() {
this.model.transition.retry();
}

@action back() {
history.back();
}
}
3 changes: 2 additions & 1 deletion app/styles/application.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,10 @@ h1 {
}
}

a {
a, .link {
color: var(--link-color);
text-decoration: none;
cursor: pointer;

&:hover {
color: var(--link-hover-color);
Expand Down
2 changes: 2 additions & 0 deletions app/styles/catch-all.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,7 @@
}

.link {
composes: button-reset from '../styles/shared/buttons.module.css';
composes: link from '../styles/application.module.css';
font-weight: 500;
}
4 changes: 2 additions & 2 deletions app/templates/catch-all.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<h1 local-class="title" data-test-title>{{or @model.title "Page not found"}}</h1>

{{#if @model.tryAgain}}
<a href="javascript:location.reload()" local-class="link" data-test-try-again {{on "click" this.reload}}>Try Again</a>
<button type="button" local-class="link" data-test-try-again {{on "click" this.reload}}>Try Again</button>
{{else}}
<a href="javascript:history.back()" local-class="link" data-test-go-back>Go Back</a>
<button type="button" local-class="link" data-test-go-back {{on "click" this.back}}>Go Back</button>
{{/if}}
</div>
</div>