From e8785f54207c3ce3e48d9c19152b650cb8e16ea0 Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Thu, 30 Nov 2017 14:37:47 +0000 Subject: [PATCH] include auth.scss file and redirect once on logout --- gui/app/pods/auth/logout/route.js | 22 +++++++++---------- gui/app/pods/customize/template.hbs | 2 +- gui/app/pods/folder/category/template.hbs | 2 +- gui/app/pods/profile/template.hbs | 2 +- gui/app/pods/search/template.hbs | 2 +- gui/app/styles/view/auth.scss | 2 +- gui/app/styles/view/views.scss | 1 + .../components/toolbar/for-space.hbs | 2 +- .../components/toolbar/for-spaces.hbs | 2 +- 9 files changed, 19 insertions(+), 18 deletions(-) diff --git a/gui/app/pods/auth/logout/route.js b/gui/app/pods/auth/logout/route.js index b8ea194a..f0b5dc4c 100644 --- a/gui/app/pods/auth/logout/route.js +++ b/gui/app/pods/auth/logout/route.js @@ -12,23 +12,23 @@ import { inject as service } from '@ember/service'; import Route from '@ember/routing/route'; -import config from 'documize/config/environment'; +// import config from 'documize/config/environment'; export default Route.extend({ session: service(), appMeta: service(), activate: function () { - this.get('session').invalidate().then(() => { - if (config.environment === 'test') { - this.transitionTo('auth.login'); - } else { - if (this.get("appMeta.allowAnonymousAccess")) { - this.transitionTo('folders'); - } else { - this.transitionTo('auth.login'); - } - } + this.get('session').invalidate().then(() => { + // if (config.environment === 'test') { + // this.transitionTo('auth.login'); + // } else { + // if (this.get("appMeta.allowAnonymousAccess")) { + // this.transitionTo('folders'); + // } else { + // this.transitionTo('auth.login'); + // } + // } }); } }); diff --git a/gui/app/pods/customize/template.hbs b/gui/app/pods/customize/template.hbs index dd896be7..a5739031 100644 --- a/gui/app/pods/customize/template.hbs +++ b/gui/app/pods/customize/template.hbs @@ -3,7 +3,7 @@
{{#toolbar/t-toolbar}} {{#toolbar/t-links}} - {{#link-to "folders" class="link" tagName="li"}}SPACES{{/link-to}} + {{#link-to "folders" class="link" tagName="li"}}Spaces{{/link-to}} {{/toolbar/t-links}} {{#toolbar/t-actions}} {{/toolbar/t-actions}} diff --git a/gui/app/pods/folder/category/template.hbs b/gui/app/pods/folder/category/template.hbs index afa4513c..0c4d6fce 100644 --- a/gui/app/pods/folder/category/template.hbs +++ b/gui/app/pods/folder/category/template.hbs @@ -3,7 +3,7 @@
{{#toolbar/t-toolbar}} {{#toolbar/t-links}} - {{#link-to "folders" class="link" tagName="li"}}SPACES{{/link-to}} + {{#link-to "folders" class="link" tagName="li"}}Spaces{{/link-to}} {{#link-to "folder" model.folder.id model.folder.slug class="link" tagName="li"}}{{model.folder.name}}{{/link-to}} {{/toolbar/t-links}} {{/toolbar/t-toolbar}} diff --git a/gui/app/pods/profile/template.hbs b/gui/app/pods/profile/template.hbs index 48709a01..49a03b15 100644 --- a/gui/app/pods/profile/template.hbs +++ b/gui/app/pods/profile/template.hbs @@ -3,7 +3,7 @@
{{#toolbar/t-toolbar}} {{#toolbar/t-links}} - {{#link-to "folders" class="link" tagName="li"}}SPACES{{/link-to}} + {{#link-to "folders" class="link" tagName="li"}}Spaces{{/link-to}} {{/toolbar/t-links}} {{#toolbar/t-actions}} {{/toolbar/t-actions}} diff --git a/gui/app/pods/search/template.hbs b/gui/app/pods/search/template.hbs index 5497e03c..b7011ecd 100644 --- a/gui/app/pods/search/template.hbs +++ b/gui/app/pods/search/template.hbs @@ -3,7 +3,7 @@
{{#toolbar/t-toolbar}} {{#toolbar/t-links}} - {{#link-to "folders" class="link" tagName="li"}}SPACES{{/link-to}} + {{#link-to "folders" class="link" tagName="li"}}Spaces{{/link-to}} {{/toolbar/t-links}} {{#toolbar/t-actions}} {{/toolbar/t-actions}} diff --git a/gui/app/styles/view/auth.scss b/gui/app/styles/view/auth.scss index 6e97dbce..186f9c13 100644 --- a/gui/app/styles/view/auth.scss +++ b/gui/app/styles/view/auth.scss @@ -23,6 +23,6 @@ .sso-box { text-align: center; margin-top: 150px; - font-size: 24px; + font-size: 3rem; color: $color-gray; } diff --git a/gui/app/styles/view/views.scss b/gui/app/styles/view/views.scss index 8a259b4c..1ad27469 100644 --- a/gui/app/styles/view/views.scss +++ b/gui/app/styles/view/views.scss @@ -5,3 +5,4 @@ @import "onboard.scss"; @import "customize.scss"; @import "search.scss"; +@import "auth.scss"; diff --git a/gui/app/templates/components/toolbar/for-space.hbs b/gui/app/templates/components/toolbar/for-space.hbs index 6520a8b4..e809f258 100644 --- a/gui/app/templates/components/toolbar/for-space.hbs +++ b/gui/app/templates/components/toolbar/for-space.hbs @@ -1,6 +1,6 @@ {{#toolbar/t-toolbar}} {{#toolbar/t-links}} - {{#link-to "folders" class="link" tagName="li"}}SPACES{{/link-to}} + {{#link-to "folders" class="link" tagName="li"}}Spaces{{/link-to}} {{/toolbar/t-links}} {{#toolbar/t-actions}} {{#if spaceSettings}} diff --git a/gui/app/templates/components/toolbar/for-spaces.hbs b/gui/app/templates/components/toolbar/for-spaces.hbs index a02b1b3c..f5c02dbd 100644 --- a/gui/app/templates/components/toolbar/for-spaces.hbs +++ b/gui/app/templates/components/toolbar/for-spaces.hbs @@ -1,6 +1,6 @@ {{#toolbar/t-toolbar}} {{#toolbar/t-links}} - {{#link-to "folders" class="link selected" tagName="li"}}SPACES{{/link-to}} + {{#link-to "folders" class="link selected" tagName="li"}}Spaces{{/link-to}} {{/toolbar/t-links}} {{#toolbar/t-actions}} {{#if session.isEditor}}