Skip to content

Convert AuthenticatedRoute mixin to regular base class #2441

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 1 commit into from
Apr 19, 2020
Merged

Convert AuthenticatedRoute mixin to regular base class #2441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions app/mixins/authenticated-route.js → app/routes/-authenticated-route.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import Mixin from '@ember/object/mixin';
import Route from '@ember/routing/route';
import { inject as service } from '@ember/service';

// eslint-disable-next-line ember/no-new-mixins
export default Mixin.create({
export default Route.extend({
flashMessages: service(),
router: service(),
session: service(),
Expand Down
5 changes: 2 additions & 3 deletions app/routes/dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { A } from '@ember/array';
import Route from '@ember/routing/route';
import RSVP from 'rsvp';

import AuthenticatedRoute from '../mixins/authenticated-route';
import AuthenticatedRoute from './-authenticated-route';

export default Route.extend(AuthenticatedRoute, {
export default AuthenticatedRoute.extend({
async model() {
let user = this.session.currentUser;

Expand Down
6 changes: 2 additions & 4 deletions app/routes/me/crates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import Route from '@ember/routing/route';
import AuthenticatedRoute from '../-authenticated-route';

import AuthenticatedRoute from '../../mixins/authenticated-route';

export default Route.extend(AuthenticatedRoute, {
export default AuthenticatedRoute.extend({
queryParams: {
page: { refreshModel: true },
sort: { refreshModel: true },
Expand Down
6 changes: 2 additions & 4 deletions app/routes/me/following.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import Route from '@ember/routing/route';
import AuthenticatedRoute from '../-authenticated-route';

import AuthenticatedRoute from '../../mixins/authenticated-route';

export default Route.extend(AuthenticatedRoute, {
export default AuthenticatedRoute.extend({
queryParams: {
page: { refreshModel: true },
sort: { refreshModel: true },
Expand Down
6 changes: 2 additions & 4 deletions app/routes/me/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import Route from '@ember/routing/route';
import AuthenticatedRoute from '../-authenticated-route';

import AuthenticatedRoute from '../../mixins/authenticated-route';

export default Route.extend(AuthenticatedRoute, {
export default AuthenticatedRoute.extend({
actions: {
willTransition: function () {
this.controller
Expand Down
6 changes: 2 additions & 4 deletions app/routes/me/pending-invites.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import Route from '@ember/routing/route';
import AuthenticatedRoute from '../-authenticated-route';

import AuthenticatedRoute from '../../mixins/authenticated-route';

export default Route.extend(AuthenticatedRoute, {
export default AuthenticatedRoute.extend({
model() {
return this.store.findAll('crate-owner-invite');
},
Expand Down