From 53e31f165096e1fcde3da12036be817f12bf951d Mon Sep 17 00:00:00 2001 From: Akanksha Dharkar Date: Wed, 21 Aug 2024 00:13:07 +0530 Subject: [PATCH 1/5] Updating README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8c4bf16b..1e7210c9 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ A short introduction of this app could easily go here. You will need the following things properly installed on your computer. - [Git](https://git-scm.com/) -- [Node.js](https://nodejs.org/) (with npm) +- [Node.js](https://nodejs.org/) (with yarn) - [Ember CLI](https://cli.emberjs.com/release/) - [Google Chrome](https://google.com/chrome/) @@ -16,7 +16,7 @@ You will need the following things properly installed on your computer. - `git clone ` this repository - `cd website-www` -- `npm install` +- `yarn install` ## Running / Development From b7f687efab6b57b79f792139549b96399368495d Mon Sep 17 00:00:00 2001 From: Akanksha Dharkar Date: Wed, 21 Aug 2024 01:47:48 +0530 Subject: [PATCH 2/5] Addon addition: ember-sinon-qunit --- package.json | 2 + tests/test-helper.js | 2 + yarn.lock | 121 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 123 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 30f6fcc6..88b71842 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,7 @@ "ember-ref-bucket": "5.0.1", "ember-resolver": "11.0.1", "ember-set-helper": "2.0.1", + "ember-sinon-qunit": "^7.5.0", "ember-source": "5.9.0", "ember-template-lint": "5.13.0", "ember-toastr": "3.0.1", @@ -97,6 +98,7 @@ "prettier": "3.3.1", "qunit": "2.21.0", "qunit-dom": "2.0.0", + "sinon": "^18.0.0", "stylelint": "15.11.0", "stylelint-config-standard": "34.0.0", "stylelint-prettier": "4.1.0", diff --git a/tests/test-helper.js b/tests/test-helper.js index 7cf3a92f..1d0b521b 100644 --- a/tests/test-helper.js +++ b/tests/test-helper.js @@ -1,5 +1,6 @@ import Application from 'website-www/app'; import config from 'website-www/config/environment'; +import setupSinon from 'ember-sinon-qunit'; import * as QUnit from 'qunit'; import { setApplication } from '@ember/test-helpers'; import { setup } from 'qunit-dom'; @@ -8,5 +9,6 @@ import { start } from 'ember-qunit'; setApplication(Application.create(config.APP)); setup(QUnit.assert); +setupSinon(); start(); diff --git a/yarn.lock b/yarn.lock index 4ff1ad8f..a0e258c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3168,7 +3168,7 @@ broccoli-funnel "^3.0.8" semver "^7.3.8" -"@embroider/addon-shim@^1.8.7": +"@embroider/addon-shim@^1.8.7", "@embroider/addon-shim@^1.8.9": version "1.8.9" resolved "https://registry.yarnpkg.com/@embroider/addon-shim/-/addon-shim-1.8.9.tgz#ef37eba069d391b2d2a80aa62880c469051c4d43" integrity sha512-qyN64T1jMHZ99ihlk7VFHCWHYZHLE1DOdHi0J7lmn5waV1DoW7gD8JLi1i7FregzXtKhbDc7shyEmTmWPTs8MQ== @@ -4460,6 +4460,41 @@ resolved "https://registry.yarnpkg.com/@simple-dom/void-map/-/void-map-1.4.0.tgz#f15f07568fe1076740407266aa5e6eac249bc78c" integrity sha512-VDhLEyVCbuhOBBgHol9ShzIv9O8UCzdXeH4FoXu2DOcu/nnvTjLTck+BgXsCLv5ynDiUdoqsREEVFnoyPpFKVw== +"@sinonjs/commons@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-2.0.0.tgz#fd4ca5b063554307e8327b4564bd56d3b73924a3" + integrity sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg== + dependencies: + type-detect "4.0.8" + +"@sinonjs/commons@^3.0.0", "@sinonjs/commons@^3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.1.tgz#1029357e44ca901a615585f6d27738dbc89084cd" + integrity sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ== + dependencies: + type-detect "4.0.8" + +"@sinonjs/fake-timers@^11.2.2": + version "11.2.2" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-11.2.2.tgz#50063cc3574f4a27bd8453180a04171c85cc9699" + integrity sha512-G2piCSxQ7oWOxwGSAyFHfPIsyeJGXYtc6mFbnFA+kRXkiEnTl8c/8jul2S329iFBnDI9HGoeWWAZvuvOkZccgw== + dependencies: + "@sinonjs/commons" "^3.0.0" + +"@sinonjs/samsam@^8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-8.0.0.tgz#0d488c91efb3fa1442e26abea81759dfc8b5ac60" + integrity sha512-Bp8KUVlLp8ibJZrnvq2foVhP0IVX2CIprMJPK0vqGqgrDa0OHVKeZyBykqskkrdxV6yKBPmGasO8LVjAKR3Gew== + dependencies: + "@sinonjs/commons" "^2.0.0" + lodash.get "^4.4.2" + type-detect "^4.0.8" + +"@sinonjs/text-encoding@^0.7.2": + version "0.7.3" + resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz#282046f03e886e352b2d5f5da5eb755e01457f3f" + integrity sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA== + "@socket.io/component-emitter@~3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" @@ -4690,6 +4725,18 @@ "@types/mime" "*" "@types/node" "*" +"@types/sinon@^17.0.3": + version "17.0.3" + resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-17.0.3.tgz#9aa7e62f0a323b9ead177ed23a36ea757141a5fa" + integrity sha512-j3uovdn8ewky9kRBG19bOwaZbexJu/XjtkHyjvUgt4xfPFz18dcORIMqnYh66Fx3Powhcr85NT5+er3+oViapw== + dependencies: + "@types/sinonjs__fake-timers" "*" + +"@types/sinonjs__fake-timers@*": + version "8.1.5" + resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.5.tgz#5fd3592ff10c1e9695d377020c033116cc2889f2" + integrity sha512-mQkU2jY8jJEF7YHjHvsQO8+3ughTL1mcnn96igfhONmR+fUPSKIkefQYpSe8bsly2Ep7oQbn/6VG5/9/0qcArQ== + "@types/ssri@^7.1.1": version "7.1.5" resolved "https://registry.yarnpkg.com/@types/ssri/-/ssri-7.1.5.tgz#7147b5ba43957cb0f639a3309a3943fc1829d5e8" @@ -8031,6 +8078,14 @@ decode-uri-component@^0.2.0: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== +decorator-transforms@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/decorator-transforms/-/decorator-transforms-2.0.0.tgz#4e9178a8905c81ff79f4078dc6dfb716244ecd37" + integrity sha512-ETfQccGcotK01YJsoB0AGTdUp7kS9jI93mBzrRY5Oyo+bOJfa2UKTSjCNf+iRNwAWBmBKlbiCcyL4tkY4C4dZQ== + dependencies: + "@babel/plugin-syntax-decorators" "^7.23.3" + babel-import-util "^3.0.0" + deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" @@ -8138,6 +8193,11 @@ diff@^5.1.0: resolved "https://registry.yarnpkg.com/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40" integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw== +diff@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-5.2.0.tgz#26ded047cd1179b78b9537d5ef725503ce1ae531" + integrity sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A== + dir-glob@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" @@ -9175,6 +9235,15 @@ ember-set-helper@2.0.1: dependencies: ember-cli-babel "^7.18.0" +ember-sinon-qunit@^7.5.0: + version "7.5.0" + resolved "https://registry.yarnpkg.com/ember-sinon-qunit/-/ember-sinon-qunit-7.5.0.tgz#12e5a6a01ecfe62b185d1258a2deb7c3334c4fe7" + integrity sha512-wSoRqBbiytUtDFIE6DLPDZFYhoS4FH+kgHhr707HJMF5tUYpKPIruBusF9kWezj/yOrJLyLqoWFoaAJ2aG2FQw== + dependencies: + "@embroider/addon-shim" "^1.8.9" + "@types/sinon" "^17.0.3" + decorator-transforms "^2.0.0" + ember-source@5.9.0: version "5.9.0" resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-5.9.0.tgz#50833a3ac0fb199031864ab22e27499851531bbe" @@ -11904,6 +11973,11 @@ jsonify@~0.0.0: resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" integrity sha512-trvBk1ki43VZptdBI5rIlG4YOzyeH/WefQt5rj1grasPn4iiZWKet8nkgc4GlsAylaztn0qZfUYOiTsASJFdNA== +just-extend@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-6.2.0.tgz#b816abfb3d67ee860482e7401564672558163947" + integrity sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw== + keyv@^4.5.3: version "4.5.4" resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" @@ -12158,6 +12232,11 @@ lodash.foreach@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" integrity sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ== +lodash.get@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" + integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ== + lodash.isarguments@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" @@ -12760,6 +12839,17 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +nise@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/nise/-/nise-6.0.0.tgz#ae56fccb5d912037363c3b3f29ebbfa28bde8b48" + integrity sha512-K8ePqo9BFvN31HXwEtTNGzgrPpmvgciDsFz8aztFjt4LqKO/JeFD8tBOeuDiCMXrIl/m1YvfH8auSpxfaD09wg== + dependencies: + "@sinonjs/commons" "^3.0.0" + "@sinonjs/fake-timers" "^11.2.2" + "@sinonjs/text-encoding" "^0.7.2" + just-extend "^6.2.0" + path-to-regexp "^6.2.1" + no-case@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" @@ -13309,6 +13399,11 @@ path-to-regexp@0.1.7: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== +path-to-regexp@^6.2.1: + version "6.2.2" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.2.2.tgz#324377a83e5049cbecadc5554d6a63a9a4866b36" + integrity sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw== + path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" @@ -14585,6 +14680,18 @@ simple-html-tokenizer@^0.5.11: resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.11.tgz#4c5186083c164ba22a7b477b7687ac056ad6b1d9" integrity sha512-C2WEK/Z3HoSFbYq8tI7ni3eOo/NneSPRoPpcM7WdLjFOArFuyXEjAoCdOC3DgMfRyziZQ1hCNR4mrNdWEvD0og== +sinon@^18.0.0: + version "18.0.0" + resolved "https://registry.yarnpkg.com/sinon/-/sinon-18.0.0.tgz#69ca293dbc3e82590a8b0d46c97f63ebc1e5fc01" + integrity sha512-+dXDXzD1sBO6HlmZDd7mXZCR/y5ECiEiGCBSGuFD/kZ0bDTofPYc6JaeGmPSF+1j1MejGUWkORbYOLDyvqCWpA== + dependencies: + "@sinonjs/commons" "^3.0.1" + "@sinonjs/fake-timers" "^11.2.2" + "@sinonjs/samsam" "^8.0.0" + diff "^5.2.0" + nise "^6.0.0" + supports-color "^7" + slash@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" @@ -15118,7 +15225,7 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" -supports-color@^7.0.0, supports-color@^7.1.0: +supports-color@^7, supports-color@^7.0.0, supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== @@ -15578,6 +15685,16 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" +type-detect@4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" + integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== + +type-detect@^4.0.8: + version "4.1.0" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.1.0.tgz#deb2453e8f08dcae7ae98c626b13dddb0155906c" + integrity sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw== + type-fest@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" From 73bbecc15ed4d13c3e63164e1900b92ab71ba458 Mon Sep 17 00:00:00 2001 From: Akanksha Dharkar Date: Wed, 21 Aug 2024 01:48:17 +0530 Subject: [PATCH 3/5] Test cases: fixing broken test cases --- tests/integration/components/status-card-test.js | 14 +++++++++++++- tests/integration/components/step-five-test.js | 10 ++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/tests/integration/components/status-card-test.js b/tests/integration/components/status-card-test.js index 86843187..2c1ab781 100644 --- a/tests/integration/components/status-card-test.js +++ b/tests/integration/components/status-card-test.js @@ -3,6 +3,15 @@ import { setupRenderingTest } from 'ember-qunit'; import { render, waitFor } from '@ember/test-helpers'; import { hbs } from 'ember-cli-htmlbars'; import { ANKUSH_TWITTER } from '../../constants/urls'; +import Service from '@ember/service'; +import sinon from 'sinon'; + +class LoginStub extends Service { + userData = { id: 'fZ0itx5x2ltOSMzON9kb' }; +} +class OnboardingStub extends Service { + getApplicationDetails = sinon.spy; +} module('Integration | Component | status-card', function (hooks) { setupRenderingTest(hooks); @@ -12,9 +21,12 @@ module('Integration | Component | status-card', function (hooks) { window.open = this.spy(); }); this.set('ANKUSH_TWITTER', ANKUSH_TWITTER); + + this.owner.register('service:login', LoginStub); + this.owner.register('service:onboarding', OnboardingStub); }); - test.skip('it renders pending status', async function (assert) { + test('it renders pending status', async function (assert) { this.set('status', 'pending'); this.set('feedback', 'Feedback for pending status'); diff --git a/tests/integration/components/step-five-test.js b/tests/integration/components/step-five-test.js index 869fc8bf..c1a5a1e5 100644 --- a/tests/integration/components/step-five-test.js +++ b/tests/integration/components/step-five-test.js @@ -7,7 +7,7 @@ import { ANKUSH_TWITTER } from '../../constants/urls'; module('Integration | Component | step-five', function (hooks) { setupRenderingTest(hooks); - test.skip('it renders', async function (assert) { + test('it renders', async function (assert) { assert.expect(12); await render(hbs``); @@ -18,16 +18,14 @@ module('Integration | Component | step-five', function (hooks) { assert.dom('[data-test-copy-btn]').hasText('Copy'); assert.dom('[data-test-next-text]').hasText('Next Steps :'); assert.dom('[data-test-instructions]').hasTagName('ol'); - assert.dom('[data-test-instone]').hasText('Copy the above link'); + assert.dom('[data-test-instone]').hasText('Click on the copy button.'); assert .dom('[data-test-insttwo]') - .hasText('Follow Ankush Dharkar on Twitter'); + .hasText('Message copied link to Ankush Dharkar on Twitter'); assert.dom('[data-test-insttwo-link]').hasProperty('href', ANKUSH_TWITTER); assert .dom('[data-test-instthree]') - .hasText( - 'Message this link to him with this Real Dev Squad verification link', - ); + .hasText('Wait for him to verify the link'); assert .dom('[data-test-instfour]') .hasText('Wait for him to verify the link'); From 6aeef0e30bc37b7cd65af3ba1214627fb5bba785 Mon Sep 17 00:00:00 2001 From: Vinit khandal <111434418+vinit717@users.noreply.github.com> Date: Wed, 28 Aug 2024 01:32:19 +0530 Subject: [PATCH 4/5] chore: fix status card rendering based on user application (#921) --- app/controllers/join.js | 10 ++++++++++ app/services/onboarding.js | 3 +++ app/templates/join.hbs | 26 +++++++++++++++++--------- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/app/controllers/join.js b/app/controllers/join.js index 918cfb99..9aad34f8 100644 --- a/app/controllers/join.js +++ b/app/controllers/join.js @@ -9,9 +9,11 @@ export default class JoinController extends Controller { @service router; @service login; @service featureFlag; + @service onboarding; @tracked chaincode = 'Generate chaincode'; @tracked isChaincodeClicked = false; @tracked isLoading = false; + ANKUSH_TWITTER = ANKUSH_TWITTER; queryParams = ['step', 'dev']; @@ -20,6 +22,14 @@ export default class JoinController extends Controller { return this.featureFlag.isDevMode; } + get applicationData() { + return this.onboarding.applicationData; + } + + get loading() { + return this.login.isLoading || this.onboarding.loadingApplicationData; + } + @action async handleGenerateChaincode(e) { e.preventDefault(); diff --git a/app/services/onboarding.js b/app/services/onboarding.js index c6f21aff..09877a58 100644 --- a/app/services/onboarding.js +++ b/app/services/onboarding.js @@ -9,6 +9,7 @@ export default class OnboardingService extends Service { @service store; @service toast; @tracked applicationData; + @tracked loadingApplicationData = true; constructor() { super(...arguments); @@ -126,6 +127,8 @@ export default class OnboardingService extends Service { const applicationData = await applicationResponse.json(); this.applicationData = applicationData?.applications?.[0]; + + this.loadingApplicationData = false; } catch (err) { console.error('Error: ', err); this.toast.error('Some error occured', 'Error ocurred!', TOAST_OPTIONS); diff --git a/app/templates/join.hbs b/app/templates/join.hbs index cc144dc1..fb98942a 100644 --- a/app/templates/join.hbs +++ b/app/templates/join.hbs @@ -1,6 +1,6 @@ {{page-title 'Join'}}
- {{#if this.login.isLoading}} + {{#if this.loading}}
@@ -29,16 +29,24 @@ {{else}} - {{#if this.isDevMode}} - {{else}} - + {{#if this.isDevMode}} + + {{else}} + + {{/if}} {{/if}} {{/if}} {{/if}} -
\ No newline at end of file + From 5791be3a3854d70f537ad250fba1eb9a2076aa23 Mon Sep 17 00:00:00 2001 From: Vinit khandal <111434418+vinit717@users.noreply.github.com> Date: Wed, 28 Aug 2024 01:32:48 +0530 Subject: [PATCH 5/5] Fix users routing on /intro (#919) * chore: make users ridirect to /join when visit /intro * chore: remove optional chaining --------- Co-authored-by: Amit Prakash <34869115+iamitprakash@users.noreply.github.com> --- app/routes/intro.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/routes/intro.js b/app/routes/intro.js index 8d7ddee2..ec135241 100644 --- a/app/routes/intro.js +++ b/app/routes/intro.js @@ -29,6 +29,11 @@ export default class IntroRoute extends Route { }); userData = await userResponse.json(); + if (!userData.roles.super_user) { + this.router.transitionTo('/join'); + return; + } + const response = await fetch(APPLICATION_URL(userId), { credentials: 'include', });