Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update notification messages for verifying account #5517

Merged
merged 2 commits into from
Nov 10, 2020

Conversation

sachinchauhan2889
Copy link
Contributor

Fixes #5516

Short description of what this resolves:

update notification mesaages for verifying account.

Frist 2 points (changes) have done in this PR.

Working on third point(change).

screenshots

5516 a

5516 b

Checklist

  • I have read the Contribution & Best practices Guide.
  • My branch is up-to-date with the Upstream development branch.
  • The acceptance, integration, unit tests and linter pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)

@vercel
Copy link

vercel bot commented Nov 7, 2020

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/eventyay/open-event-frontend/91eqs3lgn
✅ Preview: https://open-event-frontend-git-update-messages.eventyay.vercel.app

@@ -1,9 +1,9 @@
{{#if this.success}}
<div class="ui {{if this.isLoading 'loading'}} icon info message eight wide column center aligned">
<p>Your email has been verified successfully!{{#if (not this.session.isAuthenticated)}} Please login to continue. {{/if}}</p>
<p>your email has been verified successfully! You now have full access to all feature.{{#if (not this.session.isAuthenticated)}} Please login to continue. {{/if}}</p>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

English sentences start with a capital letter

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use:
Your account is unverified. Please verify it by clicking on the confirmation link that has been emailed to you.

@@ -1,9 +1,9 @@
{{#if this.success}}
<div class="ui {{if this.isLoading 'loading'}} icon info message eight wide column center aligned">
<p>Your email has been verified successfully!{{#if (not this.session.isAuthenticated)}} Please login to continue. {{/if}}</p>
<p>your email has been verified successfully! You now have full access to all feature.{{#if (not this.session.isAuthenticated)}} Please login to continue. {{/if}}</p>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all is used for plurals

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use:
Thank you, your email has been verified successfully! You now have full access to all features.

@sachinchauhan2889
Copy link
Contributor Author

@iamareebjamal @mariobehling sir, i have deleted /verify route as it will be of no use if we want to display message at front page.
i have done all neccesary changes.

I am still working on this. One thing is still missing. After registration of new user, email have verification link as localhost:4200/verify?token=abcdefcghtuheru_. This route is removed in this PR.
Instead of this link we need to send this link localhost:4200/?token=abcdefghijhkuh_. This link completes the verification work.
I think this mail can be manipulated in open-event-server. i am looking into open-event-server repo.
please test these changes. while clicking on verification link please remove verify route and pass token in index route.
please let me know if any other changes needed.

screenshots

11111111

333333   new

please remove /verify from confirmation link for testing.
222222

@iamareebjamal
Copy link
Member

That's not what we want. Please revert

@sachinchauhan2889
Copy link
Contributor Author

@iamareebjamal sir, instead of showing message on top of front page. You need front page content in this white space.
Am i thinking right sir.

@sachinchauhan2889
Copy link
Contributor Author

@iamareebjamal sir, can u tell be little bit more about desired result, so that i can think in right direction. Do we want front page content in white space area??

@iamareebjamal
Copy link
Member

i have deleted /verify route as it will be of no use

It will definitely be of use, so please revert this

@sachinchauhan2889
Copy link
Contributor Author

@iamareebjamal @mariobehling sir, i have revert my changes.
sir can you please elaborate third point.
want full-access message on front page i.e. index page
or
message remains at /verify route, and want front page index template to be below message inplace of white space.

@sachinchauhan2889
Copy link
Contributor Author

@iamareebjamal @mariobehling sir, i have revert my changes.
sir can you please elaborate third point.
want full-access message on front page i.e. index page
or
message remains at /verify route, and want front page index template to be below message inplace of white space.

@iamareebjamal sir, have a look at this.

@iamareebjamal iamareebjamal changed the title Update notification messages for verifying account fix: Update notification messages for verifying account Nov 10, 2020
@auto-label auto-label bot added the fix label Nov 10, 2020
Copy link
Member

@iamareebjamal iamareebjamal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Build is failing

@iamareebjamal
Copy link
Member

Please always fix the build before asking for reviews.

message-at-front-page

Revert "message-at-front-page"

This reverts commit 456fffe.

messages-update
@sachinchauhan2889
Copy link
Contributor Author

@iamareebjamal sir, done. Build successful.

@iamareebjamal
Copy link
Member

Are we looking at the same PR?

image

@sachinchauhan2889
Copy link
Contributor Author

sachinchauhan2889 commented Nov 10, 2020

@iamareebjamal sorry sir, it left opened in browser. I have closed.

Copy link
Member

@snitin315 snitin315 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to update tests.

test('unverified message', async function(assert) {
setShouldShowMessage.call(this, {
currentRouteName: 'else'
});
this.set('isMailSent', false);
await render(hbs`{{unverified-user-message session=session authManager=authManager isMailSent=isMailSent}}`);
assert.dom(this.element).includesText('Your account is unverified. Please verify by clicking on the confirmation link that has been emailed to you.');
});

@sachinchauhan2889
Copy link
Contributor Author

need to update tests.

@snitin315 thank you, i am updating tests.

@sachinchauhan2889
Copy link
Contributor Author

@iamareebjamal sir, test also updated. please review.

@iamareebjamal
Copy link
Member

Not until build passes

@codecov
Copy link

codecov bot commented Nov 10, 2020

Codecov Report

Merging #5517 (7fe9527) into development (ec21e62) will decrease coverage by 0.05%.
The diff coverage is n/a.

Impacted file tree graph

@@               Coverage Diff               @@
##           development    #5517      +/-   ##
===============================================
- Coverage        23.76%   23.70%   -0.06%     
===============================================
  Files              498      498              
  Lines             5256     5256              
  Branches            44       44              
===============================================
- Hits              1249     1246       -3     
- Misses            4001     4004       +3     
  Partials             6        6              
Impacted Files Coverage Δ
app/components/tabbed-navigation.js 33.33% <0.00%> (-20.00%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ec21e62...7fe9527. Read the comment docs.

@iamareebjamal iamareebjamal merged commit a079751 into fossasia:development Nov 10, 2020
@sachinchauhan2889 sachinchauhan2889 deleted the update-messages branch November 13, 2020 16:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update notification messages for verifying account and show "full access" notification on frontpage
4 participants