From 9693cda9871cc000ad6853210e93be1181256b66 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Tue, 31 Mar 2020 16:22:34 +0200 Subject: [PATCH 1/3] MOBILE-3389 login: Improve error messages and help in login --- src/assets/img/login/faq_url.png | Bin 0 -> 19328 bytes src/assets/lang/en.json | 15 +++++++-- src/core/login/lang/en.json | 13 ++++++-- src/core/login/pages/site-help/site-help.html | 26 ++++++++++++++- src/core/login/pages/site-help/site-help.ts | 13 +++++++- src/core/login/pages/site/site.html | 31 +++++++++++++++--- src/core/login/pages/site/site.ts | 30 +++++++++++++---- src/lang/en.json | 2 ++ 8 files changed, 112 insertions(+), 18 deletions(-) create mode 100644 src/assets/img/login/faq_url.png diff --git a/src/assets/img/login/faq_url.png b/src/assets/img/login/faq_url.png new file mode 100644 index 0000000000000000000000000000000000000000..13d92cd502b89ec90b482ecf632eeebb5e8a4b84 GIT binary patch literal 19328 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 organisation or school has their own custom address for their Moodle site.

To find the address of the Moodle site you want to connect to, do the following:

  1. Open a web browser and go to your school's or organisation's Moodle site login page
  2. At the top of the page, on the address bar, you will see the URL of your Moodle site. E.g. \"campus.example.edu\".{{$image}}
  3. Copy the address (do not copy the /login and what comes after), paste it into the Moodle App and click \"Connect!\"
  4. Now you can log into your site, using your username and password
    5. ", + "core.login.faqwhatisurlquestion": "What is the URL of my Moodle site? How can I find my school’s site?", "core.login.findyoursite": "Find your site", "core.login.firsttime": "Is this your first time here?", "core.login.forcepasswordchangenotice": "You must change your password to proceed.", @@ -1736,7 +1746,6 @@ "core.login.mobileservicesnotenabled": "Mobile access is not enabled on your site. Please contact your site administrator if you think it should be enabled.", "core.login.mustconfirm": "You need to confirm your account", "core.login.newaccount": "New account", - "core.login.newsitedescription": "Please enter the URL of your Moodle site. Note that it might not be configured to work with this app.", "core.login.notloggedin": "You need to be logged in.", "core.login.password": "Password", "core.login.passwordforgotten": "Forgotten password", @@ -1762,7 +1771,7 @@ "core.login.selectacountry": "Select a country", "core.login.selectsite": "Please select your site:", "core.login.signupplugindisabled": "{{$a}} is not enabled.", - "core.login.siteaddress": "Site address", + "core.login.siteaddress": "Your site address", "core.login.sitehasredirect": "Your site contains at least one HTTP redirect. The app cannot follow redirects, this could be the issue that's preventing the app from connecting to your site.", "core.login.siteinmaintenance": "Your site is in maintenance mode", "core.login.sitepolicynotagreederror": "Site policy not agreed.", @@ -1816,6 +1825,7 @@ "core.more": "more", "core.mygroups": "My groups", "core.name": "Name", + "core.needhelp": "Need help?", "core.networkerroriframemsg": "This content is not available offline. Please connect to the internet and try again.", "core.networkerrormsg": "There was a problem connecting to the site. Please check your connection and try again.", "core.never": "Never", @@ -2090,6 +2100,7 @@ "core.warningofflinedatadeleted": "Offline data from {{component}} '{{name}}' has been deleted. {{error}}", "core.whatisyourage": "What is your age?", "core.wheredoyoulive": "In which country do you live?", + "core.whoissiteadmin": "\"Site Administrators\" are the people who manage the Moodle at your school/university/company or learning organisation. If you don't know how to contact them, please contact your teachers/trainers.", "core.whoops": "Oops!", "core.whyisthishappening": "Why is this happening?", "core.whyisthisrequired": "Why is this required?", diff --git a/src/core/login/lang/en.json b/src/core/login/lang/en.json index 054a51168..e6a0d6e2f 100644 --- a/src/core/login/lang/en.json +++ b/src/core/login/lang/en.json @@ -24,7 +24,17 @@ "emailnotmatch": "Emails do not match", "erroraccesscontrolalloworigin": "The cross-origin call you're trying to perform has been rejected. Please check https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium", "errordeletesite": "An error occurred while deleting this site. Please try again.", + "errorexampleurl": "The URL https://campus.example.edu is only an example URL, it's not a real site. Please use the URL of your school or organization's site.", "errorupdatesite": "An error occurred while updating the site's token.", + "faqcannotconnectanswer": "Please, contact your site administrator.", + "faqcannotconnectquestion": "I typed my site address correctly but I still can't connect.", + "faqsetupsiteanswer": "Visit {{$link}} to check out the different options you have to create your own Moodle site.", + "faqsetupsitelinktitle": "Get started.", + "faqsetupsitequestion": "I want to set up my own Moodle site.", + "faqtestappanswer": "To test the app in a Moodle Demo Site, type \"teacher\" or \"student\" in the \"Your site address\" field and click the \"Connect!\" button.", + "faqtestappquestion": "I just want to test the app, what can I do?", + "faqwhatisurlanswer": "

    Every organisation or school has their own custom address for their Moodle site.

    To find the address of the Moodle site you want to connect to, do the following:

    1. Open a web browser and go to your school's or organisation's Moodle site login page
    2. At the top of the page, on the address bar, you will see the URL of your Moodle site. E.g. \"campus.example.edu\".{{$image}}
    3. Copy the address (do not copy the /login and what comes after), paste it into the Moodle App and click \"Connect!\"
    4. Now you can log into your site, using your username and password
      5. ", + "faqwhatisurlquestion": "What is the URL of my Moodle site? How can I find my school’s site?", "findyoursite": "Find your site", "firsttime": "Is this your first time here?", "forcepasswordchangenotice": "You must change your password to proceed.", @@ -53,7 +63,6 @@ "mobileservicesnotenabled": "Mobile access is not enabled on your site. Please contact your site administrator if you think it should be enabled.", "mustconfirm": "You need to confirm your account", "newaccount": "New account", - "newsitedescription": "Please enter the URL of your Moodle site. Note that it might not be configured to work with this app.", "notloggedin": "You need to be logged in.", "password": "Password", "passwordforgotten": "Forgotten password", @@ -79,7 +88,7 @@ "selectacountry": "Select a country", "selectsite": "Please select your site:", "signupplugindisabled": "{{$a}} is not enabled.", - "siteaddress": "Site address", + "siteaddress": "Your site address", "sitehasredirect": "Your site contains at least one HTTP redirect. The app cannot follow redirects, this could be the issue that's preventing the app from connecting to your site.", "siteinmaintenance": "Your site is in maintenance mode", "sitepolicynotagreederror": "Site policy not agreed.", diff --git a/src/core/login/pages/site-help/site-help.html b/src/core/login/pages/site-help/site-help.html index ae21bace1..48dcf8eb7 100644 --- a/src/core/login/pages/site-help/site-help.html +++ b/src/core/login/pages/site-help/site-help.html @@ -10,5 +10,29 @@ - + + +

      {{ 'core.login.faqwhatisurlquestion' | translate }}

      +       + + + +

      {{ 'core.login.faqcannotconnectquestion' | translate }}

      +       + +

      {{ 'core.login.faqcannotconnectanswer' | translate }} {{ 'core.whoissiteadmin' | translate }}

      +       + +

      {{ 'core.login.faqsetupsitequestion' | translate }}

      +       + +

      +       + +

      {{ 'core.login.faqtestappquestion' | translate }}

      +       + +

      {{ 'core.login.faqtestappanswer' | translate }}

      +       +       diff --git a/src/core/login/pages/site-help/site-help.ts b/src/core/login/pages/site-help/site-help.ts index 90d948b75..eb489e3c2 100644 --- a/src/core/login/pages/site-help/site-help.ts +++ b/src/core/login/pages/site-help/site-help.ts @@ -14,6 +14,7 @@ import { Component } from '@angular/core'; import { IonicPage, ViewController } from 'ionic-angular'; +import { TranslateService } from '@ngx-translate/core'; /** * Component that displays some help regarding the CoreLoginSitePage. @@ -24,7 +25,17 @@ import { IonicPage, ViewController } from 'ionic-angular'; templateUrl: 'site-help.html', }) export class CoreLoginSiteHelpPage { - constructor(private viewCtrl: ViewController) { } + + urlImageHtml: string; + setupLinkHtml: string; + + constructor(protected viewCtrl: ViewController, + protected translate: TranslateService) { + + this.urlImageHtml = ''; + this.setupLinkHtml = 'https://moodle.com/getstarted/'; + } /** * Close help modal. diff --git a/src/core/login/pages/site/site.html b/src/core/login/pages/site/site.html index 8da75c237..8660611f8 100644 --- a/src/core/login/pages/site/site.html +++ b/src/core/login/pages/site/site.html @@ -6,9 +6,6 @@ - @@ -20,9 +17,9 @@
      -

      {{ 'core.login.newsitedescription' | translate }}

      - +

      {{ 'core.login.siteaddress' | translate }}

       +       @@ -50,5 +47,29 @@

      {{ 'core.login.selectsite' | translate }}

      {{site.name}} + + + + +

      {{ 'core.whoops' | translate }}

      + +       +

      +

      {{ 'core.login.problemconnectingerror' | translate }}

      +

      {{ errorUrl }}

      +

      {{ 'core.login.problemconnectingerrorcontinue' | translate }}

      +

      {{ 'core.login.stillcantconnect' | translate }}

      +

      {{ 'core.login.contactyouradministrator' | translate }}

      +

      {{ 'core.whoissiteadmin' | translate }}

      +       + + + + + {{ 'core.needhelp' | translate }} + + diff --git a/src/core/login/pages/site/site.ts b/src/core/login/pages/site/site.ts index 9e44cbd4f..d88fc5bf9 100644 --- a/src/core/login/pages/site/site.ts +++ b/src/core/login/pages/site/site.ts @@ -22,6 +22,7 @@ import { CoreConfigConstants } from '../../../../configconstants'; import { CoreLoginHelperProvider } from '../../providers/helper'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { CoreUrl } from '@classes/utils/url'; +import { TranslateService } from '@ngx-translate/core'; /** * Page to enter or select the site URL to connect to. @@ -41,6 +42,8 @@ export class CoreLoginSitePage { fixedDisplay = 'buttons'; showKeyboard = false; filter = ''; + errorUrl: string; + errorMessage: string; constructor(navParams: NavParams, protected navCtrl: NavController, @@ -50,7 +53,8 @@ export class CoreLoginSitePage { protected loginHelper: CoreLoginHelperProvider, protected modalCtrl: ModalController, protected domUtils: CoreDomUtilsProvider, - protected eventsProvider: CoreEventsProvider) { + protected eventsProvider: CoreEventsProvider, + protected translate: TranslateService) { this.showKeyboard = !!navParams.get('showKeyboard'); @@ -99,6 +103,14 @@ export class CoreLoginSitePage { url = url.trim(); + if (url.match(/^(https?:\/\/)?campus\.example\.edu/)) { + this.showLoginIssue(url, this.translate.instant('core.login.errorexampleurl')); + + return; + } + + this.hideLoginIssue(); + const modal = this.domUtils.showModalLoading(), siteData = this.sitesProvider.getDemoSiteData(url); @@ -164,6 +176,14 @@ export class CoreLoginSitePage { modal.present(); } + /** + * Hide the login error. + */ + hideLoginIssue(): void { + this.errorUrl = null; + this.errorMessage = null; + } + /** * Show an error that aims people to solve the issue. * @@ -171,12 +191,8 @@ export class CoreLoginSitePage { * @param error Error to display. */ protected showLoginIssue(url: string, error: any): void { - const modal = this.modalCtrl.create('CoreLoginSiteErrorPage', { - siteUrl: url, - issue: this.domUtils.getErrorMessage(error) - }); - - modal.present(); + this.errorUrl = url; + this.errorMessage = this.domUtils.getErrorMessage(error); } /** diff --git a/src/lang/en.json b/src/lang/en.json index 876b80259..2e932a7f8 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -167,6 +167,7 @@ "more": "more", "mygroups": "My groups", "name": "Name", + "needhelp": "Need help?", "networkerroriframemsg": "This content is not available offline. Please connect to the internet and try again.", "networkerrormsg": "There was a problem connecting to the site. Please check your connection and try again.", "never": "Never", @@ -293,6 +294,7 @@ "warningofflinedatadeleted": "Offline data from {{component}} '{{name}}' has been deleted. {{error}}", "whatisyourage": "What is your age?", "wheredoyoulive": "In which country do you live?", + "whoissiteadmin": "\"Site Administrators\" are the people who manage the Moodle at your school/university/company or learning organisation. If you don't know how to contact them, please contact your teachers/trainers.", "whoops": "Oops!", "whyisthishappening": "Why is this happening?", "whyisthisrequired": "Why is this required?", From 09e3e00bacc8f17a04613d648d9fba7a565c9539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 31 Mar 2020 17:24:25 +0200 Subject: [PATCH 2/3] MOBILE-3389 login: Style new errors on login --- src/assets/lang/en.json | 4 +- src/core/login/lang/en.json | 2 +- src/core/login/pages/site-help/site-help.html | 4 +- src/core/login/pages/site-help/site-help.scss | 5 +++ src/core/login/pages/site/site.html | 39 +++++++++++-------- src/core/login/pages/site/site.scss | 16 ++++++++ src/core/login/pages/site/site.ts | 4 +- src/lang/en.json | 2 +- 8 files changed, 53 insertions(+), 23 deletions(-) create mode 100644 src/core/login/pages/site-help/site-help.scss diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json index dc5a9f227..e33e9f8ab 100644 --- a/src/assets/lang/en.json +++ b/src/assets/lang/en.json @@ -1331,7 +1331,7 @@ "core.block.blocks": "Blocks", "core.browser": "Browser", "core.cancel": "Cancel", - "core.cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle {{$a}} or later.", + "core.cannotconnect": "Cannot connect: Verify that you have correctly typed your site address.", "core.cannotdownloadfiles": "File downloading is disabled. Please contact your site administrator.", "core.captureaudio": "Record audio", "core.capturedimage": "Taken picture.", @@ -1707,7 +1707,7 @@ "core.login.emailnotmatch": "Emails do not match", "core.login.erroraccesscontrolalloworigin": "The cross-origin call you're trying to perform has been rejected. Please check https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium", "core.login.errordeletesite": "An error occurred while deleting this site. Please try again.", - "core.login.errorexampleurl": "The URL https://campus.example.edu is only an example URL, it's not a real site. Please use the URL of your school or organization's site.", + "core.login.errorexampleurl": "The URL https://campus.example.edu is only an example URL, it's not a real site. Please use the URL of your school or organization's site.", "core.login.errorupdatesite": "An error occurred while updating the site's token.", "core.login.faqcannotconnectanswer": "Please, contact your site administrator.", "core.login.faqcannotconnectquestion": "I typed my site address correctly but I still can't connect.", diff --git a/src/core/login/lang/en.json b/src/core/login/lang/en.json index e6a0d6e2f..3624b1063 100644 --- a/src/core/login/lang/en.json +++ b/src/core/login/lang/en.json @@ -24,7 +24,7 @@ "emailnotmatch": "Emails do not match", "erroraccesscontrolalloworigin": "The cross-origin call you're trying to perform has been rejected. Please check https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium", "errordeletesite": "An error occurred while deleting this site. Please try again.", - "errorexampleurl": "The URL https://campus.example.edu is only an example URL, it's not a real site. Please use the URL of your school or organization's site.", + "errorexampleurl": "The URL https://campus.example.edu is only an example URL, it's not a real site. Please use the URL of your school or organization's site.", "errorupdatesite": "An error occurred while updating the site's token.", "faqcannotconnectanswer": "Please, contact your site administrator.", "faqcannotconnectquestion": "I typed my site address correctly but I still can't connect.", diff --git a/src/core/login/pages/site-help/site-help.html b/src/core/login/pages/site-help/site-help.html index 48dcf8eb7..2aa5a8247 100644 --- a/src/core/login/pages/site-help/site-help.html +++ b/src/core/login/pages/site-help/site-help.html @@ -14,7 +14,9 @@

      {{ 'core.login.faqwhatisurlquestion' | translate }}

       - + +
      +

      {{ 'core.login.faqcannotconnectquestion' | translate }}

      diff --git a/src/core/login/pages/site-help/site-help.scss b/src/core/login/pages/site-help/site-help.scss new file mode 100644 index 000000000..01699c80f --- /dev/null +++ b/src/core/login/pages/site-help/site-help.scss @@ -0,0 +1,5 @@ +page-core-login-site-help { + .content { + background-color: $white; + } +} \ No newline at end of file diff --git a/src/core/login/pages/site/site.html b/src/core/login/pages/site/site.html index 8660611f8..007e3ecdd 100644 --- a/src/core/login/pages/site/site.html +++ b/src/core/login/pages/site/site.html @@ -49,25 +49,32 @@ - - -

      {{ 'core.whoops' | translate }}

      - -       -

      -

      {{ 'core.login.problemconnectingerror' | translate }}

      -

      {{ errorUrl }}

      -

      {{ 'core.login.problemconnectingerrorcontinue' | translate }}

      -

      {{ 'core.login.stillcantconnect' | translate }}

      -

      {{ 'core.login.contactyouradministrator' | translate }}

      -

      {{ 'core.whoissiteadmin' | translate }}

      -       +
      + + + {{ 'core.whoops' | translate }} + + +

      + +

      {{ 'core.login.problemconnectingerror' | translate }}

      +

      {{ errorUrl }}

      +

      {{ 'core.login.problemconnectingerrorcontinue' | translate }}

      +       +       + + {{ 'core.login.stillcantconnect' | translate }} + + +

      {{ 'core.login.contactyouradministrator' | translate }}

      +

      {{ 'core.whoissiteadmin' | translate }}

      +       +       +
      - + {{ 'core.needhelp' | translate }} diff --git a/src/core/login/pages/site/site.scss b/src/core/login/pages/site/site.scss index 53fafed91..8003ae361 100644 --- a/src/core/login/pages/site/site.scss +++ b/src/core/login/pages/site/site.scss @@ -10,4 +10,20 @@ ion-app.app-root page-core-login-site { background-color: $searchbar-ios-toolbar-input-background; } } + + .core-site-error { + background: $red-light; + margin-left: 0; + margin-right: 0; + width: 100%; + user-select: text; + + p, ion-card-header { + color: $red-dark; + user-select: text; + } + ion-card-header { + font-weight: bold; + } + } } \ No newline at end of file diff --git a/src/core/login/pages/site/site.ts b/src/core/login/pages/site/site.ts index d88fc5bf9..bb007a557 100644 --- a/src/core/login/pages/site/site.ts +++ b/src/core/login/pages/site/site.ts @@ -104,7 +104,7 @@ export class CoreLoginSitePage { url = url.trim(); if (url.match(/^(https?:\/\/)?campus\.example\.edu/)) { - this.showLoginIssue(url, this.translate.instant('core.login.errorexampleurl')); + this.showLoginIssue(null, this.translate.instant('core.login.errorexampleurl')); return; } @@ -179,7 +179,7 @@ export class CoreLoginSitePage { /** * Hide the login error. */ - hideLoginIssue(): void { + protected hideLoginIssue(): void { this.errorUrl = null; this.errorMessage = null; } diff --git a/src/lang/en.json b/src/lang/en.json index 2e932a7f8..3b9ccff0f 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -12,7 +12,7 @@ "back": "Back", "browser": "Browser", "cancel": "Cancel", - "cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle {{$a}} or later.", + "cannotconnect": "Cannot connect: Verify that you have correctly typed your site address.", "cannotdownloadfiles": "File downloading is disabled. Please contact your site administrator.", "captureaudio": "Record audio", "capturedimage": "Taken picture.", From d4e30159c853e58d7588555cee39f571e79113c4 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Wed, 1 Apr 2020 11:22:46 +0200 Subject: [PATCH 3/3] MOBILE-3389 login: Make error URL clickable --- src/core/login/pages/site/site.html | 12 ++++----- src/core/login/pages/site/site.scss | 4 +++ src/core/login/pages/site/site.ts | 40 ++++++++++++++++++++++++----- 3 files changed, 43 insertions(+), 13 deletions(-) diff --git a/src/core/login/pages/site/site.html b/src/core/login/pages/site/site.html index 007e3ecdd..6d13b7507 100644 --- a/src/core/login/pages/site/site.html +++ b/src/core/login/pages/site/site.html @@ -49,16 +49,16 @@ -
      +
      {{ 'core.whoops' | translate }} -

      - +

      +

      {{ 'core.login.problemconnectingerror' | translate }}

      -

      {{ errorUrl }}

      +

      {{ error.url }}

      {{ 'core.login.problemconnectingerrorcontinue' | translate }}

             @@ -73,8 +73,8 @@
      - - + + diff --git a/src/core/login/pages/site/site.scss b/src/core/login/pages/site/site.scss index 8003ae361..0a740cead 100644 --- a/src/core/login/pages/site/site.scss +++ b/src/core/login/pages/site/site.scss @@ -26,4 +26,8 @@ ion-app.app-root page-core-login-site { font-weight: bold; } } + + .core-login-need-help { + text-decoration: underline; + } } \ No newline at end of file diff --git a/src/core/login/pages/site/site.ts b/src/core/login/pages/site/site.ts index bb007a557..ebf6cfcaf 100644 --- a/src/core/login/pages/site/site.ts +++ b/src/core/login/pages/site/site.ts @@ -18,12 +18,33 @@ import { CoreAppProvider } from '@providers/app'; import { CoreEventsProvider } from '@providers/events'; import { CoreSitesProvider, CoreSiteCheckResponse } from '@providers/sites'; import { CoreDomUtilsProvider } from '@providers/utils/dom'; +import { CoreUrlUtilsProvider } from '@providers/utils/url'; import { CoreConfigConstants } from '../../../../configconstants'; import { CoreLoginHelperProvider } from '../../providers/helper'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { CoreUrl } from '@classes/utils/url'; import { TranslateService } from '@ngx-translate/core'; +/** + * Data about an error when connecting to a site. + */ +type CoreLoginSiteError = { + /** + * The error message that ocurred. + */ + message: string; + + /** + * URL the user entered. + */ + url?: string; + + /** + * URL the user entered with protocol added if needed. + */ + fullUrl?: string; +}; + /** * Page to enter or select the site URL to connect to. */ @@ -42,8 +63,7 @@ export class CoreLoginSitePage { fixedDisplay = 'buttons'; showKeyboard = false; filter = ''; - errorUrl: string; - errorMessage: string; + error: CoreLoginSiteError; constructor(navParams: NavParams, protected navCtrl: NavController, @@ -54,7 +74,8 @@ export class CoreLoginSitePage { protected modalCtrl: ModalController, protected domUtils: CoreDomUtilsProvider, protected eventsProvider: CoreEventsProvider, - protected translate: TranslateService) { + protected translate: TranslateService, + protected urlUtils: CoreUrlUtilsProvider) { this.showKeyboard = !!navParams.get('showKeyboard'); @@ -180,8 +201,7 @@ export class CoreLoginSitePage { * Hide the login error. */ protected hideLoginIssue(): void { - this.errorUrl = null; - this.errorMessage = null; + this.error = null; } /** @@ -191,8 +211,14 @@ export class CoreLoginSitePage { * @param error Error to display. */ protected showLoginIssue(url: string, error: any): void { - this.errorUrl = url; - this.errorMessage = this.domUtils.getErrorMessage(error); + this.error = { + url: url, + message: this.domUtils.getErrorMessage(error), + }; + + if (url) { + this.error.fullUrl = this.urlUtils.isAbsoluteURL(url) ? url : 'https://' + url; + } } /**