From b3d77dfa5c2183646e493249af8270cee3435bbf Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Fri, 24 Nov 2017 12:31:09 +0100 Subject: [PATCH] MOBILE-2253 login: Implement site page --- src/app/app.module.ts | 4 +- src/app/app.scss | 22 +++ src/assets/img/logo.png | Bin 0 -> 18363 bytes src/classes/site.ts | 26 ++-- src/config.json | 3 +- .../login/pages/site-error/site-error.html | 27 ++++ .../pages/site-error/site-error.module.ts | 31 +++++ src/core/login/pages/site-error/site-error.ts | 41 ++++++ src/core/login/pages/site-help/site-help.html | 14 ++ .../login/pages/site-help/site-help.module.ts | 31 +++++ src/core/login/pages/site-help/site-help.ts | 35 +++++ src/core/login/pages/site/site.html | 50 +++++++ src/core/login/pages/site/site.module.ts | 33 +++++ src/core/login/pages/site/site.scss | 25 ++++ src/core/login/pages/site/site.ts | 128 ++++++++++++++++++ src/providers/sites.ts | 4 +- src/theme/variables.scss | 69 +++++----- 17 files changed, 497 insertions(+), 46 deletions(-) create mode 100644 src/assets/img/logo.png create mode 100644 src/core/login/pages/site-error/site-error.html create mode 100644 src/core/login/pages/site-error/site-error.module.ts create mode 100644 src/core/login/pages/site-error/site-error.ts create mode 100644 src/core/login/pages/site-help/site-help.html create mode 100644 src/core/login/pages/site-help/site-help.module.ts create mode 100644 src/core/login/pages/site-help/site-help.ts create mode 100644 src/core/login/pages/site/site.html create mode 100644 src/core/login/pages/site/site.module.ts create mode 100644 src/core/login/pages/site/site.scss create mode 100644 src/core/login/pages/site/site.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index ae7fe3573..ce8413a28 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -63,7 +63,9 @@ export function createTranslateLoader(http: HttpClient) { imports: [ BrowserModule, HttpClientModule, - IonicModule.forRoot(MyApp), + IonicModule.forRoot(MyApp, { + pageTransition: 'ios-transition' + }), TranslateModule.forRoot({ loader: { provide: TranslateLoader, diff --git a/src/app/app.scss b/src/app/app.scss index fe1b0ae15..e4bb994a4 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -16,6 +16,13 @@ // automatically applied to the element in the app. +// Alignment +// ------------------------- + +.text-left { text-align: left; } +.text-right { text-align: right; } +.text-center { text-align: center; } + /** * App Branding */ @@ -53,3 +60,18 @@ } } + +@media only screen and (min-width: 430px) { + .mm-center-view .scroll-content { + margin: 0 auto; + max-width: 600px; + display: table !important; + width: 100% !important; + height: 100% !important; + .mm-view-content { + display: table-cell; + vertical-align: middle; + } + } +} + diff --git a/src/assets/img/logo.png b/src/assets/img/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..8a2e142b23deeb742b4f80b89863f409fdeaf395 GIT binary patch literal 18363 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 O0000 { + if (inApp) { + this.utils.openInApp(url, options); + } else { + this.utils.openInBrowser(url); + } + }); } else { - promise = Promise.resolve(); - } - - return promise.finally(() => { if (inApp) { this.utils.openInApp(url, options); } else { this.utils.openInBrowser(url); } - }); + } }; if (!this.privateToken || !this.wsAvailable('tool_mobile_get_autologin_key') || (this.lastAutoLogin && this.timeUtils.timestamp() - this.lastAutoLogin < 6 * CoreConstants.secondsMinute)) { // No private token, WS not available or last auto-login was less than 6 minutes ago. // Open the final URL without auto-login. - return open(url); + open(url); + return Promise.resolve(); } const userId = this.getUserId(), @@ -1084,15 +1087,16 @@ export class CoreSite { return this.write('tool_mobile_get_autologin_key', params).then((data) => { if (!data.autologinurl || !data.key) { // Not valid data, open the final URL without auto-login. - return open(url); + open(url); + return; } this.lastAutoLogin = this.timeUtils.timestamp(); - return open(data.autologinurl + '?userid=' + userId + '&key=' + data.key + '&urltogo=' + url); + open(data.autologinurl + '?userid=' + userId + '&key=' + data.key + '&urltogo=' + url); }).catch(() => { // Couldn't get autologin key, open the final URL without auto-login. - return open(url); + open(url); }); } diff --git a/src/config.json b/src/config.json index 077a0f1af..163458ae7 100644 --- a/src/config.json +++ b/src/config.json @@ -2,7 +2,7 @@ "app_id" : "com.moodle.moodlemobile", "appname": "Moodle Mobile", "desktopappname": "Moodle Desktop", - "versioncode" : "3000", + "versioncode" : 3000, "versionname" : "3.3.5", "cache_expiration_time" : 300000, "default_lang" : "en", @@ -13,6 +13,7 @@ "gcmpn": "694767596569", "customurlscheme": "moodlemobile", "siteurl": "", + "multisitesdisplay": "", "skipssoconfirmation": false, "forcedefaultlanguage": false, "privacypolicy": "https://moodle.org/mod/page/view.php?id=8148" diff --git a/src/core/login/pages/site-error/site-error.html b/src/core/login/pages/site-error/site-error.html new file mode 100644 index 000000000..960233c44 --- /dev/null +++ b/src/core/login/pages/site-error/site-error.html @@ -0,0 +1,27 @@ + + + {{ 'mm.core.error' | translate }} + + + + + + + +

{{ 'mm.core.whoops' | translate }}

+

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

+

{{siteUrl}}

+

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

+ +

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

+

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

+

+ {{ 'mm.login.contactyouradministratorissue' | translate:{$a: ''} }} +

+

+ {{issue}} +

+ + diff --git a/src/core/login/pages/site-error/site-error.module.ts b/src/core/login/pages/site-error/site-error.module.ts new file mode 100644 index 000000000..30b2036d5 --- /dev/null +++ b/src/core/login/pages/site-error/site-error.module.ts @@ -0,0 +1,31 @@ +// (C) Copyright 2015 Martin Dougiamas +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import { NgModule } from '@angular/core'; +import { IonicPageModule } from 'ionic-angular'; +import { CoreLoginSiteErrorPage } from './site-error'; +import { TranslateModule } from '@ngx-translate/core'; +import { CoreDirectivesModule } from '../../../../directives/directives.module'; + +@NgModule({ + declarations: [ + CoreLoginSiteErrorPage + ], + imports: [ + CoreDirectivesModule, + IonicPageModule.forChild(CoreLoginSiteErrorPage), + TranslateModule.forChild() + ] +}) +export class CoreLoginSiteErrorPageModule {} diff --git a/src/core/login/pages/site-error/site-error.ts b/src/core/login/pages/site-error/site-error.ts new file mode 100644 index 000000000..6f248056e --- /dev/null +++ b/src/core/login/pages/site-error/site-error.ts @@ -0,0 +1,41 @@ +// (C) Copyright 2015 Martin Dougiamas +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import { Component } from '@angular/core'; +import { IonicPage, ViewController, NavParams } from 'ionic-angular'; + +/** + * Component that displays an error when trying to connect to a site. + */ +@IonicPage() +@Component({ + selector: 'page-core-login-site-error', + templateUrl: 'site-error.html', +}) +export class CoreLoginSiteErrorPage { + siteUrl: string; + issue: string; + + constructor(private viewCtrl: ViewController, params: NavParams) { + this.siteUrl = params.get('siteUrl'); + this.issue = params.get('issue'); + } + + /** + * Close modal. + */ + closeModal() : void { + this.viewCtrl.dismiss(); + } +} \ No newline at end of file diff --git a/src/core/login/pages/site-help/site-help.html b/src/core/login/pages/site-help/site-help.html new file mode 100644 index 000000000..639ad7440 --- /dev/null +++ b/src/core/login/pages/site-help/site-help.html @@ -0,0 +1,14 @@ + + + {{ 'mm.login.help' | translate }} + + + + + + + + + diff --git a/src/core/login/pages/site-help/site-help.module.ts b/src/core/login/pages/site-help/site-help.module.ts new file mode 100644 index 000000000..942199b3d --- /dev/null +++ b/src/core/login/pages/site-help/site-help.module.ts @@ -0,0 +1,31 @@ +// (C) Copyright 2015 Martin Dougiamas +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import { NgModule } from '@angular/core'; +import { IonicPageModule } from 'ionic-angular'; +import { CoreLoginSiteHelpPage } from './site-help'; +import { TranslateModule } from '@ngx-translate/core'; +import { CoreDirectivesModule } from '../../../../directives/directives.module'; + +@NgModule({ + declarations: [ + CoreLoginSiteHelpPage + ], + imports: [ + CoreDirectivesModule, + IonicPageModule.forChild(CoreLoginSiteHelpPage), + TranslateModule.forChild(), + ] +}) +export class CoreLoginSiteHelpPageModule {} diff --git a/src/core/login/pages/site-help/site-help.ts b/src/core/login/pages/site-help/site-help.ts new file mode 100644 index 000000000..a003b28e7 --- /dev/null +++ b/src/core/login/pages/site-help/site-help.ts @@ -0,0 +1,35 @@ +// (C) Copyright 2015 Martin Dougiamas +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import { Component } from '@angular/core'; +import { IonicPage, ViewController } from 'ionic-angular'; + +/** + * Component that displays some help regarding the CoreLoginSitePage. + */ +@IonicPage() +@Component({ + selector: 'page-core-login-site-help', + templateUrl: 'site-help.html', +}) +export class CoreLoginSiteHelpPage { + constructor(private viewCtrl: ViewController) {} + + /** + * Close help modal. + */ + closeHelp() : void { + this.viewCtrl.dismiss(); + } +} \ No newline at end of file diff --git a/src/core/login/pages/site/site.html b/src/core/login/pages/site/site.html new file mode 100644 index 000000000..88afa3c4c --- /dev/null +++ b/src/core/login/pages/site/site.html @@ -0,0 +1,50 @@ + + + {{ 'mm.login.connecttomoodle' | translate }} + + + + + + + +
+ +
+ +
+ + +
+

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

+ + + +
+ + +
+ + + + {{ 'mm.login.selectsite' | translate }} + + {{site.name}} + + + + +
+

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

+ {{site.name}} +
+
+ +
+ +
+ +
+ diff --git a/src/core/login/pages/site/site.module.ts b/src/core/login/pages/site/site.module.ts new file mode 100644 index 000000000..a22ceb243 --- /dev/null +++ b/src/core/login/pages/site/site.module.ts @@ -0,0 +1,33 @@ +// (C) Copyright 2015 Martin Dougiamas +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import { NgModule } from '@angular/core'; +import { IonicPageModule } from 'ionic-angular'; +import { CoreLoginSitePage } from './site'; +import { CoreLoginModule } from '../../login.module'; +import { TranslateModule } from '@ngx-translate/core'; +import { CoreDirectivesModule } from '../../../../directives/directives.module'; + +@NgModule({ + declarations: [ + CoreLoginSitePage + ], + imports: [ + CoreDirectivesModule, + CoreLoginModule, + IonicPageModule.forChild(CoreLoginSitePage), + TranslateModule.forChild() + ] +}) +export class CoreLoginSitePageModule {} diff --git a/src/core/login/pages/site/site.scss b/src/core/login/pages/site/site.scss new file mode 100644 index 000000000..e2f5f80af --- /dev/null +++ b/src/core/login/pages/site/site.scss @@ -0,0 +1,25 @@ +page-core-login-site { + .content { + background: -webkit-radial-gradient(white, $gray-light); + background: radial-gradient(white, $gray-light); + + img { + max-width: 100%; + } + + img.moodle-logo { + width: 90%; + max-width: 300px; + } + + .box { + padding: 16px; + background: $white; + border: 1px solid $gray; + } + + .item-input { + border: 1px solid $list-border-color; + } + } +} diff --git a/src/core/login/pages/site/site.ts b/src/core/login/pages/site/site.ts new file mode 100644 index 000000000..ec1d9034f --- /dev/null +++ b/src/core/login/pages/site/site.ts @@ -0,0 +1,128 @@ +// (C) Copyright 2015 Martin Dougiamas +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import { Component } from '@angular/core'; +import { IonicPage, NavController, ModalController } from 'ionic-angular'; +import { CoreAppProvider } from '../../../../providers/app'; +import { CoreSitesProvider } from '../../../../providers/sites'; +import { CoreDomUtilsProvider } from '../../../../providers/utils/dom'; +import { CoreConfigConstants } from '../../../../configconstants'; +import { CoreLoginHelperProvider } from '../../providers/helper'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; + +/** + * Page to enter or select the site URL to connect to. + */ +@IonicPage() +@Component({ + selector: 'page-core-login-site', + templateUrl: 'site.html', +}) +export class CoreLoginSitePage { + siteForm: FormGroup; + fixedSites: any[]; + displayAsButtons = false; + + constructor(private navCtrl: NavController, fb: FormBuilder, private appProvider: CoreAppProvider, + private sitesProvider: CoreSitesProvider, private loginHelper: CoreLoginHelperProvider, + private modalCtrl: ModalController, private domUtils: CoreDomUtilsProvider) { + let url = ''; + + // Load fixed sites if they're set. + if (this.loginHelper.hasSeveralFixedSites()) { + this.fixedSites = this.loginHelper.getFixedSites(); + this.displayAsButtons = CoreConfigConstants.multisitesdisplay == 'buttons'; + url = this.fixedSites[0].url; + } + + this.siteForm = fb.group({ + 'siteUrl': [url, Validators.required] + }); + } + + /** + * Try to connect to a site. + */ + connect(url: string) : void { + this.appProvider.closeKeyboard(); + + if (!url) { + this.domUtils.showErrorModal('mm.login.siteurlrequired', true); + return; + } + + if (!this.appProvider.isOnline()) { + this.domUtils.showErrorModal('mm.core.networkerrormsg', true); + return; + } + + let modal = this.domUtils.showModalLoading(), + siteData = this.sitesProvider.getDemoSiteData(url); + + if (siteData) { + // It's a demo site. + this.sitesProvider.getUserToken(siteData.url, siteData.username, siteData.password).then((data) => { + return this.sitesProvider.newSite(data.siteUrl, data.token, data.privateToken).then(() => { + return this.loginHelper.goToSiteInitialPage(this.navCtrl, true); + }, (error) => { + this.domUtils.showErrorModal(error); + }); + }, (error) => { + this.loginHelper.treatUserTokenError(siteData.url, error); + }).finally(() => { + modal.dismiss(); + }); + + } else { + // Not a demo site. + this.sitesProvider.checkSite(url).then((result) => { + + if (result.warning) { + this.domUtils.showErrorModal(result.warning, true, 4000); + } + + if (this.loginHelper.isSSOLoginNeeded(result.code)) { + // SSO. User needs to authenticate in a browser. + this.loginHelper.confirmAndOpenBrowserForSSOLogin( + result.siteUrl, result.code, result.service, result.config && result.config.launchurl); + } else { + this.navCtrl.push('CoreLoginCredentialsPage', {siteUrl: result.siteUrl, siteConfig: result.config}); + } + }, (error) => { + this.showLoginIssue(url, error); + }).finally(() => { + modal.dismiss(); + }); + } + } + + /** + * Show a help modal. + */ + showHelp() : void { + let modal = this.modalCtrl.create('CoreLoginSiteHelpPage'); + modal.present(); + } + + /** + * Show an error that aims people to solve the issue. + * + * @param {string} url The URL the user was trying to connect to. + * @param {string} error Error to display. + */ + protected showLoginIssue(url: string, error: string) : void { + let modal = this.modalCtrl.create('CoreLoginSiteErrorPage', {siteUrl: url, issue: error}); + modal.present(); + } +} diff --git a/src/providers/sites.ts b/src/providers/sites.ts index 99f138e90..bdbb7007b 100644 --- a/src/providers/sites.ts +++ b/src/providers/sites.ts @@ -301,7 +301,9 @@ export class CoreSitesProvider { } const observable = this.http.post(siteUrl + '/login/token.php', data).timeout(CoreConstants.wsTimeout); - return this.utils.observableToPromise(observable).then((data: any) => { + return this.utils.observableToPromise(observable).catch((error) => { + return Promise.reject(error.message); + }).then((data: any) => { if (data.errorcode && (data.errorcode == 'enablewsdescription' || data.errorcode == 'requirecorrectaccess')) { return Promise.reject({errorcode: data.errorcode, error: data.error}); } else if (data.error && data.error == 'Web services must be enabled in Advanced features.') { diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 21fdcf593..23fdf718a 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -15,6 +15,39 @@ $app-direction: ltr; @import "ionic.globals"; +// Color palette +$black: #3a3a3a; // Headings, standard text. +$gray-darker: #626262; // Text (emphasis-detail), placeholder, background. +$gray-dark: #9e9e9e; // Borders (never text). +$gray: #dddddd; +$gray-light: #eeeeee; // Background. +$gray-lighter: #f5f5f5; +$white: #ffffff; // Background, reversed text. + +$blue: #0064d2; // Link, background. +$blue-light: mix($blue, white, 20%); // Background. +$blue-dark: darken($blue, 10%); + +$turquoise: #007982; // Accent. +$turquoise-light: mix($turquoise, white, 20%); // Background. +$turquoise-dark: darken($turquoise, 10%); + +$green: #5e8100; // Accent. +$green-light: mix($green, white, 20%); +$green-dark: darken($green, 10%); + +$red: #cb3d4d; +$red-light: mix($red, white, 20%); +$red-dark: darken($red, 10%); + +$orange: #f98012; // Accent (never text). +$orange-light: lighten($orange, 10%); + +$yellow: #fbad1a; // Accent (never text). +$yellow-light: mix($yellow, white, 20%); +$yellow-dark: mix($yellow, black, 40%); + + // Shared Variables // -------------------------------------------------- // To customize the look and feel of this app, you can override @@ -22,6 +55,8 @@ $app-direction: ltr; // To view all the possible Ionic variables, see: // http://ionicframework.com/docs/theming/overriding-ionic-variables/ +$toolbar-background: $orange; +$content-padding: 10px; @@ -91,41 +126,11 @@ $colors: ( // Moodle Mobile variables // -------------------------------------------------- -// Color palette -$black: #3a3a3a; // Headings, standard text. -$gray-darker: #626262; // Text (emphasis-detail), placeholder, background. -$gray-dark: #9e9e9e; // Borders (never text). -$gray: #dddddd; -$gray-light: #eeeeee; // Background. -$gray-lighter: #f5f5f5; -$white: #ffffff; // Background, reversed text. - -$blue: #0064d2; // Link, background. -$blue-light: mix($blue, white, 20%); // Background. -$blue-dark: darken($blue, 10%); - -$turquoise: #007982; // Accent. -$turquoise-light: mix($turquoise, white, 20%); // Background. -$turquoise-dark: darken($turquoise, 10%); - -$green: #5e8100; // Accent. -$green-light: mix($green, white, 20%); -$green-dark: darken($green, 10%); - -$red: #cb3d4d; -$red-light: mix($red, white, 20%); -$red-dark: darken($red, 10%); - -$orange: #f98012; // Accent (never text). -$orange-light: lighten($orange, 10%); - -$yellow: #fbad1a; // Accent (never text). -$yellow-light: mix($yellow, white, 20%); -$yellow-dark: mix($yellow, black, 40%); - // Init screen. $mm-color-init-screen: #ff5c00; $mm-color-init-screen-alt: #ff7600; $mm-init-screen-spinner-color: $white; $mm-init-screen-logo-width: 60%; $mm-init-screen-logo-max-width: 300px; + +$mm-fixed-url: false;