From de5885e3b0fe17e3920c7433c0f31bf2d3ea76ca Mon Sep 17 00:00:00 2001 From: Mir <65391345+Mir-SA@users.noreply.github.com> Date: Tue, 10 Dec 2024 22:56:30 +0530 Subject: [PATCH 1/5] added login route --- app/components/header.hbs | 32 +++++--- app/components/header.js | 7 +- app/components/login.hbs | 37 +++++++++ app/components/login.js | 33 ++++++++ app/constants/urls.js | 3 +- app/router.js | 1 + app/routes/application.js | 23 +++++- app/routes/login.js | 13 ++++ app/styles/app.css | 1 + app/styles/login.module.css | 85 +++++++++++++++++++++ app/templates/login.hbs | 2 + public/assets/icons/google-logo.png | Bin 0 -> 21164 bytes tests/constants/urls.js | 1 + tests/integration/components/login-test.js | 45 +++++++++++ tests/unit/routes/login-test.js | 32 ++++++++ 15 files changed, 300 insertions(+), 15 deletions(-) create mode 100644 app/components/login.hbs create mode 100644 app/components/login.js create mode 100644 app/routes/login.js create mode 100644 app/styles/login.module.css create mode 100644 app/templates/login.hbs create mode 100644 public/assets/icons/google-logo.png create mode 100644 tests/integration/components/login-test.js create mode 100644 tests/unit/routes/login-test.js diff --git a/app/components/header.hbs b/app/components/header.hbs index 54224285..eb8f56e7 100644 --- a/app/components/header.hbs +++ b/app/components/header.hbs @@ -51,7 +51,7 @@ class="nav__element" href={{this.STATUS_URL}} >Status - {{#if @dev}} + {{#if @dev}}
  • {{! TODO - remove query for dev when it goes to production }} {{else}} - {{/if}} {{/if}} diff --git a/app/components/header.js b/app/components/header.js index f268a922..39dc264d 100644 --- a/app/components/header.js +++ b/app/components/header.js @@ -6,6 +6,7 @@ import { inject as service } from '@ember/service'; export default class HeaderComponent extends Component { @service router; + @service featureFlag; @service fastboot; @tracked isNavOpen = false; @tracked isMenuOpen = false; @@ -36,6 +37,10 @@ export default class HeaderComponent extends Component { this.isMenuOpen = false; } + get isDevMode() { + return this.featureFlag.isDevMode; + } + generateAuthURL() { const currentURL = this.fastboot.isFastBoot ? this.fastboot.request.protocol + @@ -43,6 +48,6 @@ export default class HeaderComponent extends Component { this.fastboot.request.host + this.fastboot.request.path : window.location.href; - return `${AUTH.SIGN_IN}?redirectURL=${currentURL}`; + return `${AUTH.GITHUB_SIGN_IN}?redirectURL=${currentURL}`; } } diff --git a/app/components/login.hbs b/app/components/login.hbs new file mode 100644 index 00000000..7d69788f --- /dev/null +++ b/app/components/login.hbs @@ -0,0 +1,37 @@ + \ No newline at end of file diff --git a/app/components/login.js b/app/components/login.js new file mode 100644 index 00000000..8e1835dc --- /dev/null +++ b/app/components/login.js @@ -0,0 +1,33 @@ +import Component from '@glimmer/component'; +import { tracked } from '@glimmer/tracking'; +import { AUTH } from '../constants/urls'; +import { inject as service } from '@ember/service'; + +export default class LoginComponent extends Component { + @service router; + @service fastboot; + @service login; + @tracked authURL = this.generateAuthURL(); + + AUTH_URL = this.generateAuthURL(); + + generateAuthURL() { + let currentURL = this.fastboot.isFastBoot + ? this.fastboot.request.protocol + + '//' + + this.fastboot.request.host + + this.fastboot.request.path + : window.location.href; + + if (currentURL) { + currentURL = currentURL.includes('login') + ? currentURL.replace('login', '') + : currentURL; + } + + return { + GITHUB: `${AUTH.GITHUB_SIGN_IN}?redirectURL=${currentURL}`, + GOOGLE: `${AUTH.GOOGLE_SIGN_IN}&redirectURL=${currentURL}`, + }; + } +} diff --git a/app/constants/urls.js b/app/constants/urls.js index e4eaf6e0..019846c3 100644 --- a/app/constants/urls.js +++ b/app/constants/urls.js @@ -67,7 +67,8 @@ export const ABOUT = { }; export const AUTH = { - SIGN_IN: `${APPS.API_BACKEND}/auth/github/login`, + GITHUB_SIGN_IN: `${APPS.API_BACKEND}/auth/github/login`, + GOOGLE_SIGN_IN: `${APPS.API_BACKEND}/auth/google/login?dev=true`, SIGN_UP: `${APPS.PROFILE}/new-signup`, }; diff --git a/app/router.js b/app/router.js index a78344ed..47338ac7 100644 --- a/app/router.js +++ b/app/router.js @@ -16,4 +16,5 @@ Router.map(function () { this.route('events'); this.route('debug'); this.route('subscribe'); + this.route('login'); }); diff --git a/app/routes/application.js b/app/routes/application.js index 473ef158..20556493 100644 --- a/app/routes/application.js +++ b/app/routes/application.js @@ -1,2 +1,23 @@ import Route from '@ember/routing/route'; -export default class ApplicationRoute extends Route {} +import { inject as service } from '@ember/service'; +import { TOAST_OPTIONS } from '../constants/toast-options'; + +export default class ApplicationRoute extends Route { + @service router; + @service toast; + + showToast(transition) { + this.toast.error(transition.to.queryParams.error, 'Error', TOAST_OPTIONS); + } + + beforeModel(transition) { + if ( + transition?.to?.queryParams?.dev === 'true' && + transition?.to?.queryParams?.error + ) { + if (transition?.to?.queryParams?.error !== '') { + this.showToast(transition); + } + } + } +} diff --git a/app/routes/login.js b/app/routes/login.js new file mode 100644 index 00000000..43fbe9d5 --- /dev/null +++ b/app/routes/login.js @@ -0,0 +1,13 @@ +import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; + +export default class LoginRoute extends Route { + @service router; + @service login; + + beforeModel(transition) { + if (transition?.to?.queryParams?.dev !== 'true') { + this.router.transitionTo('/page-not-found'); + } + } +} diff --git a/app/styles/app.css b/app/styles/app.css index 48c90b21..2ce11118 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -43,6 +43,7 @@ @import url("unauthenticated.module.css"); @import url("subscribe.module.css"); @import url("phone-input.module.css"); +@import url("login.module.css"); * { margin: 0; diff --git a/app/styles/login.module.css b/app/styles/login.module.css new file mode 100644 index 00000000..95dbd7ea --- /dev/null +++ b/app/styles/login.module.css @@ -0,0 +1,85 @@ +.login__container { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: white; + z-index: 9999; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; +} + +.login__container h3 { + text-align: center; + margin-top: 1rem; + font-size: 2.5rem; +} + +.link__container { + margin-top: 1.5rem; +} + +.link__container .join__link { + margin: 0; +} + +.link__container small { + font-size: medium; + margin: 0.75rem; +} + +.login__container h3 span { + font-size: 3rem; + color: var(--color-pink); +} + +.login__container a { + display: flex; + gap: 0.375rem; +} + +@media (width <= 625px) { + .logo__img { + width: 5rem; + } + + .login__container h3 { + font-size: 2rem; + } + + .login__container h3 span { + font-size: 2.5rem; + } + + .link__container small { + font-size: small; + margin: 0.5rem; + } + + .login__container a img { + height: 1.25rem; + width: 1.25rem; + } +} + +@media (width <= 425px) { + .login__container h3 { + font-size: 1.5rem; + } + + .login__container h3 span { + font-size: 2rem; + } + + .link__container { + margin-top: 1rem; + } + + .login__container a img { + height: 0.8rem; + width: 0.8rem; + } +} diff --git a/app/templates/login.hbs b/app/templates/login.hbs new file mode 100644 index 00000000..9208246d --- /dev/null +++ b/app/templates/login.hbs @@ -0,0 +1,2 @@ +{{page-title "Login"}} + \ No newline at end of file diff --git a/public/assets/icons/google-logo.png b/public/assets/icons/google-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..aa026d5fdb6de3e297d53409a50827cfffa567f9 GIT binary patch literal 21164 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 literal 0 HcmV?d00001 diff --git a/tests/constants/urls.js b/tests/constants/urls.js index eaf0a096..8c10177f 100644 --- a/tests/constants/urls.js +++ b/tests/constants/urls.js @@ -8,6 +8,7 @@ export const APPS = { TASKS: 'https://my.realdevsquad.com/tasks', IDENTITY: 'https://my.realdevsquad.com/identity', MY_STATUS: 'https://my.realdevsquad.com', + API_BACKEND: 'https://staging-api.realdevsquad.com', }; export const ABOUT = { diff --git a/tests/integration/components/login-test.js b/tests/integration/components/login-test.js new file mode 100644 index 00000000..4db76a41 --- /dev/null +++ b/tests/integration/components/login-test.js @@ -0,0 +1,45 @@ +import { module, test } from 'qunit'; +import { render } from '@ember/test-helpers'; +import { hbs } from 'ember-cli-htmlbars'; +import { setupRenderingTest } from 'website-www/tests/helpers'; +import { APPS } from '../../constants/urls'; + +module('Integration | Component | login', function (hooks) { + setupRenderingTest(hooks); + + test('it renders content', async function (assert) { + await render(hbs``); + + assert.dom('.login__container').exists(); + assert.dom('.login__container h3').hasText('Sign In to Real Dev Squad'); + + assert + .dom('[data-test-github-auth]') + .exists('Github auth button is rendered'); + assert.dom('[data-test-github-auth]').hasText('Sign In with GitHub'); + + assert + .dom('[data-test-google-auth]') + .exists('Google auth button is rendered'); + assert.dom('[data-test-google-auth]').hasText('Sign In with Google'); + }); + + test('generates correct auth URLs', async function (assert) { + await render(hbs``); + + assert + .dom('[data-test-github-auth]') + .exists() + .hasAttribute( + 'href', + `${APPS.API_BACKEND}/auth/github/login?redirectURL=${window.location.href}`, + ); + assert + .dom('[data-test-google-auth]') + .exists() + .hasAttribute( + 'href', + `${APPS.API_BACKEND}/auth/google/login?dev=true&redirectURL=${window.location.href}`, + ); + }); +}); diff --git a/tests/unit/routes/login-test.js b/tests/unit/routes/login-test.js new file mode 100644 index 00000000..253d0cec --- /dev/null +++ b/tests/unit/routes/login-test.js @@ -0,0 +1,32 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'website-www/tests/helpers'; +import { visit, currentURL } from '@ember/test-helpers'; + +module('Unit | Route | login', function (hooks) { + setupTest(hooks); + + test('it exists', function (assert) { + let route = this.owner.lookup('route:login'); + assert.ok(route); + }); + + test('it can be only visited with dev flag', async function (assert) { + await visit('/login?dev=true'); + + assert.strictEqual( + currentURL(), + '/login?dev=true', + 'User can access /login with dev flag only', + ); + }); + + test('it cannot be visited without dev flag', async function (assert) { + await visit('/login'); + + assert.strictEqual( + currentURL(), + '/page-not-found', + 'User cannot access /login without dev flag', + ); + }); +}); From ac2b348b24b6737b43b4881c2ef63998b8c0863b Mon Sep 17 00:00:00 2001 From: Mir <65391345+Mir-SA@users.noreply.github.com> Date: Tue, 17 Dec 2024 22:22:15 +0530 Subject: [PATCH 2/5] changed styles, templates & scripts --- app/components/header.hbs | 4 +- app/components/header.js | 5 -- app/components/login.hbs | 45 +++++++---------- app/components/login.js | 2 +- app/components/reusables/login-link.hbs | 14 ++++++ app/routes/application.js | 2 +- app/styles/login.module.css | 12 ++--- tests/integration/components/header-test.js | 8 ++- .../integration/components/login-link-test.js | 49 +++++++++++++++++++ tests/integration/components/login-test.js | 20 ++------ 10 files changed, 100 insertions(+), 61 deletions(-) create mode 100644 app/components/reusables/login-link.hbs create mode 100644 tests/integration/components/login-link-test.js diff --git a/app/components/header.hbs b/app/components/header.hbs index eb8f56e7..f263aacd 100644 --- a/app/components/header.hbs +++ b/app/components/header.hbs @@ -95,9 +95,9 @@
    - Sign In with GitHub - - -
    -
    - For Designers/PMs: - - Sign In with Google - - -
    + + + \ No newline at end of file diff --git a/app/components/login.js b/app/components/login.js index 8e1835dc..c34ffe9f 100644 --- a/app/components/login.js +++ b/app/components/login.js @@ -1,7 +1,7 @@ import Component from '@glimmer/component'; import { tracked } from '@glimmer/tracking'; import { AUTH } from '../constants/urls'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class LoginComponent extends Component { @service router; diff --git a/app/components/reusables/login-link.hbs b/app/components/reusables/login-link.hbs new file mode 100644 index 00000000..69e062a8 --- /dev/null +++ b/app/components/reusables/login-link.hbs @@ -0,0 +1,14 @@ +
    + {{@label}} + + {{@signInText}} + + +
    \ No newline at end of file diff --git a/app/routes/application.js b/app/routes/application.js index 20556493..3d7c4032 100644 --- a/app/routes/application.js +++ b/app/routes/application.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import { TOAST_OPTIONS } from '../constants/toast-options'; export default class ApplicationRoute extends Route { diff --git a/app/styles/login.module.css b/app/styles/login.module.css index 95dbd7ea..620f3e85 100644 --- a/app/styles/login.module.css +++ b/app/styles/login.module.css @@ -28,7 +28,7 @@ .link__container small { font-size: medium; - margin: 0.75rem; + margin: 12px; } .login__container h3 span { @@ -38,7 +38,7 @@ .login__container a { display: flex; - gap: 0.375rem; + gap: 8px; } @media (width <= 625px) { @@ -60,8 +60,8 @@ } .login__container a img { - height: 1.25rem; - width: 1.25rem; + height: 20px; + width: 20px; } } @@ -79,7 +79,7 @@ } .login__container a img { - height: 0.8rem; - width: 0.8rem; + height: 12rem; + width: 12rem; } } diff --git a/tests/integration/components/header-test.js b/tests/integration/components/header-test.js index 93058f6d..426f7ed3 100644 --- a/tests/integration/components/header-test.js +++ b/tests/integration/components/header-test.js @@ -8,11 +8,12 @@ module('Integration | Component | header', function (hooks) { setupRenderingTest(hooks); test('header elements renders', async function (assert) { - assert.expect(13); + assert.expect(15); this.setProperties({ isLoggedIn: false, isLoading: false, + dev: false, }); this.set('signOut', () => { @@ -24,6 +25,7 @@ module('Integration | Component | header', function (hooks) { @isLoggedIn={{this.isLoggedIn}} @isLoading={{this.isLoading}} @signOut={{this.signOut}} + @dev={{this.dev}} /> `); @@ -52,6 +54,10 @@ module('Integration | Component | header', function (hooks) { */ // assert.dom('[data-test-login]').hasAttribute('href', AUTH.SIGN_IN); assert.dom('[data-test-login-img]').exists(); + + this.set('dev', true); + assert.dom('[data-test-login]').hasAttribute('href', '/login?dev=true'); + assert.dom('[data-test-login]').hasText('Sign In'); }); test('toggle nav menu in mobile view', async function (assert) { diff --git a/tests/integration/components/login-link-test.js b/tests/integration/components/login-link-test.js new file mode 100644 index 00000000..a81aeecc --- /dev/null +++ b/tests/integration/components/login-link-test.js @@ -0,0 +1,49 @@ +import { module, test } from 'qunit'; +import { setupRenderingTest } from 'website-www/tests/helpers'; +import { render } from '@ember/test-helpers'; +import { hbs } from 'ember-cli-htmlbars'; + +module('Integration | Component | login-link', function (hooks) { + setupRenderingTest(hooks); + + test('it renders content', async function (assert) { + this.set('label', 'For Developers:'); + this.set('auth', 'github'); + this.set('signInText', 'Sign In with GitHub'); + this.set('iconSrc', 'assets/icons/github-logo.png'); + this.set('altText', 'GitHub'); + + await render(hbs` + `); + + assert.dom('small').exists('Label element exists'); + assert.dom('small').hasText('For Developers:', 'Label text is correct'); + + assert + .dom('.join__link span') + .hasText('Sign In with GitHub', 'Sign in text is correct'); + + assert.dom('.login__logo').exists('Logo image exists'); + assert + .dom('.login__logo') + .hasAttribute( + 'src', + 'assets/icons/github-logo.png', + 'Image has correct src', + ); + assert + .dom('.login__logo') + .hasAttribute('alt', 'GitHub', 'Image has correct alt text'); + assert + .dom('.login__logo') + .hasAttribute('height', '24px', 'Image has correct height'); + assert + .dom('.login__logo') + .hasAttribute('width', '24px', 'Image has correct width'); + }); +}); diff --git a/tests/integration/components/login-test.js b/tests/integration/components/login-test.js index 4db76a41..af7eb2bf 100644 --- a/tests/integration/components/login-test.js +++ b/tests/integration/components/login-test.js @@ -7,35 +7,21 @@ import { APPS } from '../../constants/urls'; module('Integration | Component | login', function (hooks) { setupRenderingTest(hooks); - test('it renders content', async function (assert) { + test('renders content & generates correct auth URLs', async function (assert) { await render(hbs``); assert.dom('.login__container').exists(); assert.dom('.login__container h3').hasText('Sign In to Real Dev Squad'); assert - .dom('[data-test-github-auth]') - .exists('Github auth button is rendered'); - assert.dom('[data-test-github-auth]').hasText('Sign In with GitHub'); - - assert - .dom('[data-test-google-auth]') - .exists('Google auth button is rendered'); - assert.dom('[data-test-google-auth]').hasText('Sign In with Google'); - }); - - test('generates correct auth URLs', async function (assert) { - await render(hbs``); - - assert - .dom('[data-test-github-auth]') + .dom('[data-test-login=github]') .exists() .hasAttribute( 'href', `${APPS.API_BACKEND}/auth/github/login?redirectURL=${window.location.href}`, ); assert - .dom('[data-test-google-auth]') + .dom('[data-test-login=google]') .exists() .hasAttribute( 'href', From 3936837f0582afcd890db9cceef98b6dab6eaf8b Mon Sep 17 00:00:00 2001 From: Mir <65391345+Mir-SA@users.noreply.github.com> Date: Fri, 20 Dec 2024 23:28:34 +0530 Subject: [PATCH 3/5] minor changes in scripts --- app/components/login.js | 3 --- tests/constants/urls.js | 2 +- tests/integration/components/login-test.js | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/components/login.js b/app/components/login.js index c34ffe9f..eca4ee6b 100644 --- a/app/components/login.js +++ b/app/components/login.js @@ -1,13 +1,10 @@ import Component from '@glimmer/component'; -import { tracked } from '@glimmer/tracking'; import { AUTH } from '../constants/urls'; import { service } from '@ember/service'; export default class LoginComponent extends Component { @service router; @service fastboot; - @service login; - @tracked authURL = this.generateAuthURL(); AUTH_URL = this.generateAuthURL(); diff --git a/tests/constants/urls.js b/tests/constants/urls.js index 8c10177f..399018bc 100644 --- a/tests/constants/urls.js +++ b/tests/constants/urls.js @@ -8,7 +8,7 @@ export const APPS = { TASKS: 'https://my.realdevsquad.com/tasks', IDENTITY: 'https://my.realdevsquad.com/identity', MY_STATUS: 'https://my.realdevsquad.com', - API_BACKEND: 'https://staging-api.realdevsquad.com', + STAGING_API_BACKEND: 'https://staging-api.realdevsquad.com', }; export const ABOUT = { diff --git a/tests/integration/components/login-test.js b/tests/integration/components/login-test.js index af7eb2bf..eb861ff9 100644 --- a/tests/integration/components/login-test.js +++ b/tests/integration/components/login-test.js @@ -18,14 +18,14 @@ module('Integration | Component | login', function (hooks) { .exists() .hasAttribute( 'href', - `${APPS.API_BACKEND}/auth/github/login?redirectURL=${window.location.href}`, + `${APPS.STAGING_API_BACKEND}/auth/github/login?redirectURL=${window.location.href}`, ); assert .dom('[data-test-login=google]') .exists() .hasAttribute( 'href', - `${APPS.API_BACKEND}/auth/google/login?dev=true&redirectURL=${window.location.href}`, + `${APPS.STAGING_API_BACKEND}/auth/google/login?dev=true&redirectURL=${window.location.href}`, ); }); }); From e860f4a9981efc5d8fa45b36022188880a3d47fa Mon Sep 17 00:00:00 2001 From: Mir <65391345+Mir-SA@users.noreply.github.com> Date: Thu, 26 Dec 2024 14:05:53 +0530 Subject: [PATCH 4/5] updated css --- app/styles/login.module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/login.module.css b/app/styles/login.module.css index 620f3e85..33f93c8b 100644 --- a/app/styles/login.module.css +++ b/app/styles/login.module.css @@ -5,7 +5,7 @@ width: 100%; height: 100%; background: white; - z-index: 9999; + z-index: 10; display: flex; flex-direction: column; align-items: center; From 78f6032f6c3c57b3322d9f1ef31692a7aca2984c Mon Sep 17 00:00:00 2001 From: Mir <65391345+Mir-SA@users.noreply.github.com> Date: Fri, 3 Jan 2025 20:52:12 +0530 Subject: [PATCH 5/5] css changes --- app/components/login.hbs | 8 ++++++- app/styles/login.module.css | 48 ++++++++++++++++++++++++++----------- app/styles/variables.css | 1 + 3 files changed, 42 insertions(+), 15 deletions(-) diff --git a/app/components/login.hbs b/app/components/login.hbs index 1ed11af4..f8848d8c 100644 --- a/app/components/login.hbs +++ b/app/components/login.hbs @@ -1,5 +1,11 @@