Skip to content
This repository has been archived by the owner on Nov 28, 2022. It is now read-only.

Commit

Permalink
Removed unused body classes added by using the StyleBody mixin
Browse files Browse the repository at this point in the history
no issue
- many routes were attaching classes to the `<body>` tag via the `StyleBody` mixin but those classes were never used and applied inconsistently throughout the app
  • Loading branch information
kevinansfield committed May 20, 2019
1 parent b813b96 commit 638d631
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 44 deletions.
7 changes: 2 additions & 5 deletions app/routes/about.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
import styleBody from 'ghost-admin/mixins/style-body';

export default AuthenticatedRoute.extend(styleBody, {
titleToken: 'About',

classNames: ['view-about']
export default AuthenticatedRoute.extend({
titleToken: 'About'
});
4 changes: 1 addition & 3 deletions app/routes/settings/code-injection.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
import styleBody from 'ghost-admin/mixins/style-body';
import {inject as service} from '@ember/service';

export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
export default AuthenticatedRoute.extend(CurrentUserSettings, {
settings: service(),

titleToken: 'Settings - Code injection',
classNames: ['settings-view-code'],

beforeModel() {
this._super(...arguments);
Expand Down
4 changes: 1 addition & 3 deletions app/routes/settings/design.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@ import $ from 'jquery';
import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
import RSVP from 'rsvp';
import styleBody from 'ghost-admin/mixins/style-body';
import {inject as service} from '@ember/service';

export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
export default AuthenticatedRoute.extend(CurrentUserSettings, {
settings: service(),

titleToken: 'Settings - Design',
classNames: ['settings-view-design'],

beforeModel() {
this._super(...arguments);
Expand Down
4 changes: 1 addition & 3 deletions app/routes/settings/integration.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
import styleBody from 'ghost-admin/mixins/style-body';
import {inject as service} from '@ember/service';

export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
export default AuthenticatedRoute.extend(CurrentUserSettings, {
router: service(),

titleToken: 'Settings - Integrations',
classNames: ['settings-view-integration'],

init() {
this._super(...arguments);
Expand Down
4 changes: 1 addition & 3 deletions app/routes/settings/integrations.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
import styleBody from 'ghost-admin/mixins/style-body';
import {inject as service} from '@ember/service';

export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
export default AuthenticatedRoute.extend(CurrentUserSettings, {
settings: service(),

titleToken: 'Settings - Integrations',
classNames: ['settings-view-integrations'],

beforeModel() {
this._super(...arguments);
Expand Down
4 changes: 1 addition & 3 deletions app/routes/settings/integrations/amp.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
import styleBody from 'ghost-admin/mixins/style-body';
import {inject as service} from '@ember/service';

export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
export default AuthenticatedRoute.extend(CurrentUserSettings, {
settings: service(),

titleToken: 'AMP',
classNames: ['settings-view-integrations-amp'],

beforeModel() {
this._super(...arguments);
Expand Down
4 changes: 1 addition & 3 deletions app/routes/settings/integrations/slack.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
import CurrentUserSettings from '../../../mixins/current-user-settings';
import styleBody from 'ghost-admin/mixins/style-body';
import {inject as service} from '@ember/service';

export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
export default AuthenticatedRoute.extend(CurrentUserSettings, {
settings: service(),

titleToken: 'Slack',
classNames: ['settings-view-integrations-slack'],

beforeModel() {
this._super(...arguments);
Expand Down
4 changes: 1 addition & 3 deletions app/routes/settings/integrations/unsplash.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
import CurrentUserSettings from '../../../mixins/current-user-settings';
import UnsplashObject from 'ghost-admin/models/unsplash-integration';
import styleBody from 'ghost-admin/mixins/style-body';
import {inject as service} from '@ember/service';

export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
export default AuthenticatedRoute.extend(CurrentUserSettings, {
config: service(),
settings: service(),

titleToken: 'Unsplash',
classNames: ['settings-view-integrations-unsplash'],

// reload settings to ensure we have latest values and pre-configure
// Unsplash to be active if the server doesn't have any unsplash setting
Expand Down
4 changes: 1 addition & 3 deletions app/routes/settings/labs.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
import styleBody from 'ghost-admin/mixins/style-body';
import {inject as service} from '@ember/service';

export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
export default AuthenticatedRoute.extend(CurrentUserSettings, {
settings: service(),

titleToken: 'Settings - Labs',
classNames: ['settings'],

beforeModel() {
this._super(...arguments);
Expand Down
5 changes: 1 addition & 4 deletions app/routes/signout.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
import styleBody from 'ghost-admin/mixins/style-body';
import {inject as service} from '@ember/service';

export default AuthenticatedRoute.extend(styleBody, {
export default AuthenticatedRoute.extend({
notifications: service(),

titleToken: 'Sign Out',

classNames: ['ghost-signout'],

afterModel(/*model, transition*/) {
this.notifications.clearAll();
this.session.invalidate();
Expand Down
5 changes: 1 addition & 4 deletions app/routes/site.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
import styleBody from 'ghost-admin/mixins/style-body';

export default AuthenticatedRoute.extend(styleBody, {
export default AuthenticatedRoute.extend({
titleToken: 'Site',

classNames: ['view-site'],

model() {
return (new Date()).valueOf();
}
Expand Down
4 changes: 1 addition & 3 deletions app/routes/staff/index.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
import styleBody from 'ghost-admin/mixins/style-body';
import {inject as service} from '@ember/service';

export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
export default AuthenticatedRoute.extend(CurrentUserSettings, {
infinity: service(),
session: service(),

titleToken: 'Staff',
classNames: ['view-team'],

model() {
return this.session.user;
Expand Down
5 changes: 1 addition & 4 deletions app/routes/staff/user.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
/* eslint-disable camelcase */
import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
import styleBody from 'ghost-admin/mixins/style-body';

export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
export default AuthenticatedRoute.extend(CurrentUserSettings, {
titleToken: 'Staff - User',

classNames: ['team-view-user'],

model(params) {
return this.store.queryRecord('user', {slug: params.user_slug, include: 'count.posts'});
},
Expand Down

0 comments on commit 638d631

Please sign in to comment.