diff --git a/core/client/routes/authenticated.js b/core/client/routes/authenticated.js new file mode 100644 index 0000000000..48b7e68fd4 --- /dev/null +++ b/core/client/routes/authenticated.js @@ -0,0 +1,3 @@ +var AuthenticatedRoute = Ember.Route.extend(SimpleAuth.AuthenticatedRouteMixin); + +export default AuthenticatedRoute; diff --git a/core/client/routes/debug.js b/core/client/routes/debug.js index a04610fe08..11dd1478f5 100644 --- a/core/client/routes/debug.js +++ b/core/client/routes/debug.js @@ -1,7 +1,8 @@ +import AuthenticatedRoute from 'ghost/routes/authenticated'; import styleBody from 'ghost/mixins/style-body'; import loadingIndicator from 'ghost/mixins/loading-indicator'; -var DebugRoute = Ember.Route.extend(SimpleAuth.AuthenticatedRouteMixin, styleBody, loadingIndicator, { +var DebugRoute = AuthenticatedRoute.extend(styleBody, loadingIndicator, { classNames: ['settings'], beforeModel: function () { diff --git a/core/client/routes/editor/edit.js b/core/client/routes/editor/edit.js index 6d987bd81d..f98005214f 100644 --- a/core/client/routes/editor/edit.js +++ b/core/client/routes/editor/edit.js @@ -1,8 +1,9 @@ +import AuthenticatedRoute from 'ghost/routes/authenticated'; import base from 'ghost/mixins/editor-route-base'; import isNumber from 'ghost/utils/isNumber'; import isFinite from 'ghost/utils/isFinite'; -var EditorEditRoute = Ember.Route.extend(SimpleAuth.AuthenticatedRouteMixin, base, { +var EditorEditRoute = AuthenticatedRoute.extend(base, { classNames: ['editor'], model: function (params) { diff --git a/core/client/routes/editor/new.js b/core/client/routes/editor/new.js index 4f55f40c68..ff4f6f6c99 100644 --- a/core/client/routes/editor/new.js +++ b/core/client/routes/editor/new.js @@ -1,6 +1,7 @@ +import AuthenticatedRoute from 'ghost/routes/authenticated'; import base from 'ghost/mixins/editor-route-base'; -var EditorNewRoute = Ember.Route.extend(SimpleAuth.AuthenticatedRouteMixin, base, { +var EditorNewRoute = AuthenticatedRoute.extend(base, { classNames: ['editor'], model: function () { diff --git a/core/client/routes/posts.js b/core/client/routes/posts.js index c62f9a9568..533e99a22d 100644 --- a/core/client/routes/posts.js +++ b/core/client/routes/posts.js @@ -1,3 +1,4 @@ +import AuthenticatedRoute from 'ghost/routes/authenticated'; import styleBody from 'ghost/mixins/style-body'; import ShortcutsRoute from 'ghost/mixins/shortcuts-route'; import loadingIndicator from 'ghost/mixins/loading-indicator'; @@ -12,7 +13,7 @@ paginationSettings = { page: 1 }; -PostsRoute = Ember.Route.extend(SimpleAuth.AuthenticatedRouteMixin, ShortcutsRoute, styleBody, loadingIndicator, PaginationRouteMixin, { +PostsRoute = AuthenticatedRoute.extend(ShortcutsRoute, styleBody, loadingIndicator, PaginationRouteMixin, { classNames: ['manage'], model: function () { diff --git a/core/client/routes/posts/post.js b/core/client/routes/posts/post.js index 46464a8973..6c6414e14a 100644 --- a/core/client/routes/posts/post.js +++ b/core/client/routes/posts/post.js @@ -1,9 +1,10 @@ +import AuthenticatedRoute from 'ghost/routes/authenticated'; import loadingIndicator from 'ghost/mixins/loading-indicator'; import ShortcutsRoute from 'ghost/mixins/shortcuts-route'; import isNumber from 'ghost/utils/isNumber'; import isFinite from 'ghost/utils/isFinite'; -var PostsPostRoute = Ember.Route.extend(SimpleAuth.AuthenticatedRouteMixin, loadingIndicator, ShortcutsRoute, { +var PostsPostRoute = AuthenticatedRoute.extend(loadingIndicator, ShortcutsRoute, { model: function (params) { var self = this, post, diff --git a/core/client/routes/settings.js b/core/client/routes/settings.js index 1b95529895..5af5592dce 100644 --- a/core/client/routes/settings.js +++ b/core/client/routes/settings.js @@ -1,7 +1,8 @@ +import AuthenticatedRoute from 'ghost/routes/authenticated'; import styleBody from 'ghost/mixins/style-body'; import loadingIndicator from 'ghost/mixins/loading-indicator'; -var SettingsRoute = Ember.Route.extend(SimpleAuth.AuthenticatedRouteMixin, styleBody, loadingIndicator, { +var SettingsRoute = AuthenticatedRoute.extend(styleBody, loadingIndicator, { classNames: ['settings'] }); diff --git a/core/client/routes/settings/about.js b/core/client/routes/settings/about.js index fe7295c8ee..8ae17f672d 100644 --- a/core/client/routes/settings/about.js +++ b/core/client/routes/settings/about.js @@ -1,7 +1,8 @@ +import AuthenticatedRoute from 'ghost/routes/authenticated'; import loadingIndicator from 'ghost/mixins/loading-indicator'; import styleBody from 'ghost/mixins/style-body'; -var SettingsAboutRoute = Ember.Route.extend(SimpleAuth.AuthenticatedRouteMixin, styleBody, loadingIndicator, { +var SettingsAboutRoute = AuthenticatedRoute.extend(styleBody, loadingIndicator, { classNames: ['settings-view-about'], cachedConfig: false, diff --git a/core/client/routes/settings/apps.js b/core/client/routes/settings/apps.js index 5a23a0ef6d..b691794639 100644 --- a/core/client/routes/settings/apps.js +++ b/core/client/routes/settings/apps.js @@ -1,7 +1,8 @@ +import AuthenticatedRoute from 'ghost/routes/authenticated'; import CurrentUserSettings from 'ghost/mixins/current-user-settings'; import styleBody from 'ghost/mixins/style-body'; -var AppsRoute = Ember.Route.extend(SimpleAuth.AuthenticatedRouteMixin, styleBody, CurrentUserSettings, { +var AppsRoute = AuthenticatedRoute.extend(styleBody, CurrentUserSettings, { classNames: ['settings-view-apps'], beforeModel: function () { diff --git a/core/client/routes/settings/general.js b/core/client/routes/settings/general.js index 9d24eb70c9..ce6a3a5475 100644 --- a/core/client/routes/settings/general.js +++ b/core/client/routes/settings/general.js @@ -1,8 +1,9 @@ +import AuthenticatedRoute from 'ghost/routes/authenticated'; import loadingIndicator from 'ghost/mixins/loading-indicator'; import CurrentUserSettings from 'ghost/mixins/current-user-settings'; import styleBody from 'ghost/mixins/style-body'; -var SettingsGeneralRoute = Ember.Route.extend(SimpleAuth.AuthenticatedRouteMixin, styleBody, loadingIndicator, CurrentUserSettings, { +var SettingsGeneralRoute = AuthenticatedRoute.extend(styleBody, loadingIndicator, CurrentUserSettings, { classNames: ['settings-view-general'], beforeModel: function () { diff --git a/core/client/routes/settings/users.js b/core/client/routes/settings/users.js index 3ef2dc2776..02512394ce 100644 --- a/core/client/routes/settings/users.js +++ b/core/client/routes/settings/users.js @@ -1,6 +1,7 @@ +import AuthenticatedRoute from 'ghost/routes/authenticated'; import CurrentUserSettings from 'ghost/mixins/current-user-settings'; -var UsersRoute = Ember.Route.extend(SimpleAuth.AuthenticatedRouteMixin, CurrentUserSettings, { +var UsersRoute = AuthenticatedRoute.extend(CurrentUserSettings, { beforeModel: function () { return this.currentUser() .then(this.transitionAuthor()); diff --git a/core/client/routes/settings/users/index.js b/core/client/routes/settings/users/index.js index 0ba5d15506..b5dcd6cad9 100644 --- a/core/client/routes/settings/users/index.js +++ b/core/client/routes/settings/users/index.js @@ -1,3 +1,4 @@ +import AuthenticatedRoute from 'ghost/routes/authenticated'; import PaginationRouteMixin from 'ghost/mixins/pagination-route'; import styleBody from 'ghost/mixins/style-body'; @@ -10,7 +11,7 @@ paginationSettings = { status: 'active' }; -UsersIndexRoute = Ember.Route.extend(SimpleAuth.AuthenticatedRouteMixin, styleBody, PaginationRouteMixin, { +UsersIndexRoute = AuthenticatedRoute.extend(styleBody, PaginationRouteMixin, { classNames: ['settings-view-users'], setupController: function (controller, model) { diff --git a/core/client/routes/settings/users/user.js b/core/client/routes/settings/users/user.js index c7ad3163fa..0a9df80841 100644 --- a/core/client/routes/settings/users/user.js +++ b/core/client/routes/settings/users/user.js @@ -1,6 +1,7 @@ +import AuthenticatedRoute from 'ghost/routes/authenticated'; import styleBody from 'ghost/mixins/style-body'; -var SettingsUserRoute = Ember.Route.extend(styleBody, { +var SettingsUserRoute = AuthenticatedRoute.extend(styleBody, { classNames: ['settings-view-user'], model: function (params) { diff --git a/core/client/routes/signout.js b/core/client/routes/signout.js index 4fd9fbaf6c..3ba5f22289 100644 --- a/core/client/routes/signout.js +++ b/core/client/routes/signout.js @@ -1,7 +1,8 @@ +import AuthenticatedRoute from 'ghost/routes/authenticated'; import styleBody from 'ghost/mixins/style-body'; import loadingIndicator from 'ghost/mixins/loading-indicator'; -var SignoutRoute = Ember.Route.extend(SimpleAuth.AuthenticatedRouteMixin, styleBody, loadingIndicator, { +var SignoutRoute = AuthenticatedRoute.extend(styleBody, loadingIndicator, { classNames: ['ghost-signout'], afterModel: function (model, transition) {