-
-
Notifications
You must be signed in to change notification settings - Fork 176
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
Improve login guidance and non authorized user experience #3407
Conversation
# Conflicts: # jsapp/js/app.es6
# Conflicts: # jsapp/js/components/sectionNotFound.es6
# Conflicts: # jsapp/js/components/accountSettings.es6
# Conflicts: # jsapp/js/stores.es6
# Conflicts: # jsapp/js/router/routerUtils.ts
# Conflicts: # jsapp/js/stores.es6
# Conflicts: # jsapp/js/components/accountSettings.es6 # jsapp/js/components/changePassword.es6 # jsapp/js/components/common/accessDeniedMessage.es6
# Conflicts: # jsapp/js/components/formSubScreens.es6 # jsapp/js/mixins.es6
6bf2958
to
c105f52
Compare
# Conflicts: # jsapp/js/mixins.es6 # jsapp/js/router/allRoutes.es6
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
accessDenied.es6
- There's a translated string that will not translate well.- I accidentally removed package-lock.json while fixing merge conflicts.
jsapp/js/router/accessDenied.scss
Outdated
.access-denied__body { | ||
max-width: 600px; | ||
|
||
.access-denied__header { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this kind of nesting normal/necessary when using BEM with scss?
this isn't really specific to this branch, maybe it's something we could discuss in Zulip (or have already discussed)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So after the discussion we had on Zulip, I've updated https://github.com/kobotoolbox/kpi/wiki/Frontend-Development and un-nested those selectors
jsapp/js/router/accessDenied.es6
Outdated
t('Please ') | ||
: | ||
t('Please try logging in using the header button or ') | ||
} | ||
|
||
{envStore.data.support_url ? | ||
<a href={envStore.data.support_url} target='_blank'>{t('contact the support team')}</a> | ||
: | ||
t('contact the support team') | ||
} | ||
{t(" if you think it's an error.")} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this translate well?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please try logging in using the header button or [contact the support team] if you think it's an error
Please [contact the support team] if you think it's an error.
I'm getting this error and it is preventing the page from rendering. @p2edwards is not getting this error, so it could be something specific to my installation. I have tried reinstalling Does it look familiar to anyone? |
@dorey could this be because of missing reflux types in |
I don't think this is because missing types. It's possible the problem came from when @p2edwards and I merged |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me.
i think this is good to merge? |
Improve login guidance and non authorized user experience
Improve login guidance and non authorized user experience
Description
Cleaner and better handling of non authorized user (or user without permissions) accessing different part of UI. Also improves behind the scenes of how we handle routes.
Additional details
Includes work from:
Related issues
Fixes #3318